Add Advanced Throwing

addons/advancedthrowing/$PBOPREFIX$

@@ -0,0 +1 @@
+z\ace\addons\advancedthrowing

addons/advancedthrowing/ACE_Settings.hpp

@@ -0,0 +1,40 @@
+class ACE_Settings {
+    class GVAR(enabled) {
+        category = CSTRING(Category);
+        displayName = CSTRING(Enable_DisplayName);
+        description = CSTRING(Enable_Description);
+        typeName = "BOOL";
+        value = 1;
+        isClientSettable = 1;
+    };
+    class GVAR(showThrowArc) {
+        category = CSTRING(Category);
+        displayName = CSTRING(ShowThrowArc_DisplayName);
+        description = CSTRING(ShowThrowArc_Description);
+        typeName = "BOOL";
+        value = 1;
+        isClientSettable = 1;
+    };
+    class GVAR(showMouseControls) {
+        category = CSTRING(Category);
+        displayName = CSTRING(ShowMouseControls_DisplayName);
+        description = CSTRING(ShowMouseControls_Description);
+        typeName = "BOOL";
+        value = 1;
+        isClientSettable = 1;
+    };
+    class GVAR(enablePickUp) {
+        category = CSTRING(Category);
+        displayName = CSTRING(EnablePickUp_DisplayName);
+        description = CSTRING(EnablePickUp_Description);
+        typeName = "BOOL";
+        value = 1;
+    };
+    class GVAR(enablePickUpAttached) {
+        category = CSTRING(Category);
+        displayName = CSTRING(EnablePickUpAttached_DisplayName);
+        description = CSTRING(EnablePickUpAttached_Description);
+        typeName = "BOOL";
+        value = 1;
+    };
+};

addons/advancedthrowing/CfgEventHandlers.hpp

@@ -0,0 +1,17 @@
+class Extended_PreStart_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_FILE(XEH_preStart));
+    };
+};
+
+class Extended_PreInit_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_FILE(XEH_preInit));
+    };
+};
+
+class Extended_PostInit_EventHandlers {
+    class ADDON {
+        clientInit = QUOTE(call COMPILE_FILE(XEH_postInitClient));
+    };
+};

addons/advancedthrowing/CfgVehicles.hpp

@@ -0,0 +1,72 @@
+class CBA_Extended_EventHandlers;
+
+class CfgVehicles {
+    class ACE_Module;
+    class GVAR(Module): ACE_Module {
+        author = ECSTRING(common,ACETeam);
+        category = "ACE";
+        displayName = CSTRING(Category);
+        function = QFUNC(moduleInit);
+        scope = 2;
+        isGlobal = 1;
+        icon = QPATHTOF(UI\Icon_Module_AdvancedThrowing_ca.paa);
+        class Arguments {
+            class enabled {
+                displayName = CSTRING(Enable_DisplayName);
+                description = CSTRING(Enable_Description);
+                typeName = "BOOL";
+                defaultValue = 1;
+            };
+            class showThrowArc {
+                displayName = CSTRING(ShowThrowArc_DisplayName);
+                description = CSTRING(ShowThrowArc_Description);
+                typeName = "BOOL";
+                defaultValue = 1;
+            };
+            class showMouseControls {
+                displayName = CSTRING(ShowMouseControls_DisplayName);
+                description = CSTRING(ShowMouseControls_Description);
+                typeName = "BOOL";
+                defaultValue = 1;
+            };
+            class enablePickUp {
+                displayName = CSTRING(EnablePickUp_DisplayName);
+                description = CSTRING(EnablePickUp_Description);
+                typeName = "BOOL";
+                defaultValue = 1;
+            };
+            class enablePickUpAttached {
+                displayName = CSTRING(EnablePickUpAttached_DisplayName);
+                description = CSTRING(EnablePickUpAttached_Description);
+                typeName = "BOOL";
+                defaultValue = 1;
+            };
+        };
+        class ModuleDescription {
+            description = CSTRING(Module_Description);
+        };
+    };
+
+
+    class Items_base_F;
+    class GVAR(pickUpHelper): Items_base_F {
+        author = ECSTRING(common,ACETeam);
+        displayName = "ACE Throwable Pick Up Helper";
+        model = "\a3\weapons_f\dummyweapon.p3d";
+        scope = 1;
+
+        class ACE_Actions {
+            class GVAR(pickUp) {
+                displayName = CSTRING(PickUp);
+                condition = QUOTE(_player call FUNC(canPrepare));
+                statement = QUOTE(_this call FUNC(pickUp));
+                distance = 1.8; // Requires >1.7 to work when standing with weapon on back
+                icon = "\a3\ui_f\data\igui\cfg\actions\obsolete\ui_action_takemine_ca.paa";
+            };
+        };
+
+        class EventHandlers {
+            class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
+        };
+    };
+};

addons/advancedthrowing/README.md

@@ -0,0 +1,11 @@
+ace_advancedthrowing
+===================
+
+Integrates advanced throwing by [Dslyecxi](https://github.com/dslyecxi).
+
+
+## Maintainers
+
+The people responsible for merging changes to this component or answering potential questions.
+
+- [Jonpas](https://github.com/jonpas)

addons/advancedthrowing/XEH_PREP.hpp

@@ -0,0 +1,17 @@
+PREP(canPrepare);
+PREP(canThrow);
+PREP(drawArc);
+PREP(drawThrowable);
+PREP(exitThrowMode);
+PREP(getMuzzle);
+PREP(moduleInit);
+PREP(onKeyDown);
+PREP(onMouseButtonDown);
+PREP(onMouseScroll);
+PREP(pickUp);
+PREP(prepare);
+PREP(prime);
+PREP(renderPickUpInteraction);
+PREP(throw);
+PREP(throwFiredXEH);
+PREP(updateControlsHint);

addons/advancedthrowing/XEH_postInitClient.sqf

@@ -0,0 +1,107 @@
+#include "script_component.hpp"
+
+// Exit on HC
+if (!hasInterface) exitWith {};
+
+// Ammo/Magazines look-up hash for correctness of initSpeed
+GVAR(ammoMagLookup) = call CBA_fnc_createNamespace;
+{
+    {
+        private _ammo = getText (configFile >> "CfgMagazines" >> _x >> "ammo");
+        GVAR(ammoMagLookup) setVariable [_ammo, _x];
+    } count (getArray (configFile >> "CfgWeapons" >> "Throw" >> _x >> "magazines"));
+    nil
+} count getArray (configFile >> "CfgWeapons" >> "Throw" >> "muzzles");
+
+
+// Add keybinds
+["ACE3 Weapons", QGVAR(prepare), localize LSTRING(Prepare), {
+    // Condition
+    if (!([ACE_player] call FUNC(canPrepare))) exitWith {false};
+
+    // Statement
+    [ACE_player] call FUNC(prepare);
+
+    true
+}, {false}, [34, [true, false, false]], false] call CBA_fnc_addKeybind; // Shift + G
+
+["ACE3 Weapons", QGVAR(dropModeToggle), localize LSTRING(DropModeToggle), {
+    // Condition
+    if !(ACE_player getVariable [QGVAR(inHand), false]) exitWith {false};
+
+    // Statement
+    private _currentDropMode = ACE_player getVariable [QGVAR(dropMode), false];
+    ACE_player setVariable [QGVAR(dropMode), !_currentDropMode];
+
+    ACE_player setVariable [QGVAR(throwType), THROW_TYPE_DEFAULT]; // Reset for consistency when opening
+    call FUNC(updateControlsHint); // Change controls hint for MMB
+    true
+}, {false}, [34, [false, true, false]], false] call CBA_fnc_addKeybind; // Ctrl + G
+
+["ACE3 Weapons", QGVAR(dropModeHold), localize LSTRING(DropModeHold), {
+    // Condition
+    if !(ACE_player getVariable [QGVAR(inHand), false]) exitWith {false};
+
+    // Statement
+    ACE_player setVariable [QGVAR(dropMode), true];
+    ACE_player setVariable [QGVAR(throwType), THROW_TYPE_DEFAULT]; // Reset for consistency when opening
+    call FUNC(updateControlsHint); // Change controls hint for MMB
+    true
+}, {
+    // Condition
+    if !(ACE_player getVariable [QGVAR(inHand), false]) exitWith {false};
+
+    // Statement
+    ACE_player setVariable [QGVAR(dropMode), false];
+    call FUNC(updateControlsHint); // Change controls hint for MMB
+    true
+}, [0, [false, false, false]], false] call CBA_fnc_addKeybind; // Empty
+
+
+// Event handlers
+["unit", {
+    [_this select 1, "Player changed"] call FUNC(exitThrowMode);
+}] call CBA_fnc_addPlayerEventhandler;
+
+["ace_interactMenuOpened", {
+    // Exit if advanced throwing is disabled (pick up only supports advanced throwing)
+    if (!GVAR(enabled)) exitWith {};
+
+    if (ACE_player getVariable [QGVAR(inHand), false]) then {
+        [ACE_player, "Interact menu opened"] call FUNC(exitThrowMode);
+    } else {
+        params ["_interactionType"];
+        // Ignore self-interaction menu, when in vehicle and when pick up is disabled
+        if (GVAR(enablePickUp) && {_interactionType == 0} && {vehicle ACE_player == ACE_player}) then {
+            // Show pick up actions on CfgAmmo's
+            call FUNC(renderPickUpInteraction);
+        };
+    };
+}] call CBA_fnc_addEventHandler;
+
+
+// Fired XEH
+[QGVAR(throwFiredXEH), FUNC(throwFiredXEH)] call CBA_fnc_addEventHandler;
+
+
+// Display handlers
+["KeyDown", {_this call FUNC(onKeyDown)}] call CBA_fnc_addDisplayHandler;
+["MouseButtonDown", {_this call FUNC(onMouseButtonDown)}] call CBA_fnc_addDisplayHandler;
+["MouseZChanged", {_this call FUNC(onMouseScroll)}] call CBA_fnc_addDisplayHandler;
+
+
+#ifdef DRAW_THROW_PATH
+GVAR(predictedPath) = [];
+GVAR(flightPath) = [];
+
+addMissionEventHandler ["Draw3D", { // Blue is predicted before throw, red is real
+    {
+        _x params ["", "_newTrajAGL"];
+        drawIcon3D ["\a3\ui_f\data\gui\cfg\hints\icon_text\group_1_ca.paa", [0,0,1,1], _newTrajAGL, 1, 1, 0, "", 2];
+    } forEach GVAR(predictedPath);
+    {
+        _newTrajAGL = _x;
+        drawIcon3D ["\a3\ui_f\data\gui\cfg\hints\icon_text\group_1_ca.paa", [1,0,0,1], _newTrajAGL, 1, 1, 0, "", 2];
+    } forEach GVAR(flightPath)
+}];
+#endif

addons/advancedthrowing/XEH_preInit.sqf

@@ -0,0 +1,7 @@
+#include "script_component.hpp"
+
+ADDON = false;
+
+#include "XEH_PREP.hpp"
+
+ADDON = true;

addons/advancedthrowing/XEH_preStart.sqf

@@ -0,0 +1,3 @@
+#include "script_component.hpp"
+
+#include "XEH_PREP.hpp"

addons/advancedthrowing/config.cpp

@@ -0,0 +1,19 @@
+#include "script_component.hpp"
+
+class CfgPatches {
+    class ADDON {
+        name = COMPONENT_NAME;
+        units[] = {};
+        weapons[] = {};
+        requiredVersion = REQUIRED_VERSION;
+        requiredAddons[] = {"ace_common", "ace_weaponselect"};
+        author = ECSTRING(common,ACETeam);
+        authors[] = {"Jonpas", "Dslyecxi", "Zapat"};
+        url = ECSTRING(main,URL);
+        VERSION_CONFIG;
+    };
+};
+
+#include "ACE_Settings.hpp"
+#include "CfgEventHandlers.hpp"
+#include "CfgVehicles.hpp"

addons/advancedthrowing/functions/fnc_canPrepare.sqf

@@ -0,0 +1,31 @@
+/*
+ * Author: Jonpas
+ * Checks if a throwable can be prepared.
+ *
+ * Arguments:
+ * 0: Unit <OBJECT>
+ *
+ * Return Value:
+ * Can Prepare <BOOL>
+ *
+ * Example:
+ * [unit] call ace_advancedthrowing_fnc_canPrepare
+ *
+ * Public: No
+ */
+#include "script_component.hpp"
+
+params ["_unit"];
+
+GVAR(enabled) &&
+
+#ifndef DEBUG_MODE_FULL
+{_unit getVariable [QGVAR(lastThrownTime), CBA_missionTime - 3] < CBA_missionTime - 2} && // Prevent throwing in quick succession
+#else
+{true} &&
+#endif
+
+{!(call EFUNC(common,isFeatureCameraActive))} &&
+{!EGVAR(common,isReloading)} &&
+{[_unit, objNull, ["isNotInside", "isNotSitting"/*, "isNotOnLadder"*/]] call EFUNC(common,canInteractWith)} && // Ladder needs positioning fixes on throw
+{_unit call CBA_fnc_canUseWeapon} // Disable in non-FFV seats due to surface detection issues

addons/advancedthrowing/functions/fnc_canThrow.sqf

@@ -0,0 +1,31 @@
+/*
+ * Author: Jonpas
+ * Checks if a throwable can be thrown.
+ *
+ * Arguments:
+ * 0: Unit <OBJECT>
+ *
+ * Return Value:
+ * Can Throw <BOOL>
+ *
+ * Example:
+ * [unit] call ace_advancedthrowing_fnc_canThrow
+ *
+ * Public: No
+ */
+#include "script_component.hpp"
+
+params ["_unit"];
+
+if !(_unit getVariable [QGVAR(inHand), false]) exitWith {false};
+
+if (vehicle _unit != _unit) exitWith {
+    private _startPos = eyePos _unit;
+    private _aimLinePos = AGLToASL (positionCameraToWorld [0, 0, 1]);
+    private _intersections = lineIntersectsSurfaces [_startPos, _aimLinePos, _unit, objNull, false];
+    //TRACE_1("Intersections",_intersections);
+
+    (_intersections select {(vehicle _unit) in (_x select 3)}) isEqualTo []
+};
+
+true