Captives - Add modded cable tie support (#9350)

* Update fnc_canApplyHandcuffs.sqf * Update fnc_canApplyHandcuffs.sqf * Update fnc_doApplyHandcuffs.sqf * Update XEH_preStart.sqf * Update fnc_doApplyHandcuffs.sqf * Update fnc_canApplyHandcuffs.sqf * Update XEH_preInit.sqf * Update fnc_doApplyHandcuffs.sqf stray bracket * Update addons/captives/XEH_preStart.sqf Co-authored-by: Grim <[email protected]> * Update CfgWeapons.hpp * Update CfgWeapons.hpp * Update fnc_canApplyHandcuffs.sqf * Change to restraints Update XEH_preInit.sqf * Update XEH_preStart.sqf * Update fnc_canApplyHandcuffs.sqf * Update fnc_doApplyHandcuffs.sqf * Update CfgWeapons.hpp --------- Co-authored-by: Grim <[email protected]>
acemod · Aug 30, 2023 · c88695f · c88695f
1 parent bee0362
commit c88695f
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 2 deletions.
diff --git a/addons/captives/CfgWeapons.hpp b/addons/captives/CfgWeapons.hpp
@@ -4,6 +4,7 @@ class CfgWeapons {
 
     class ACE_CableTie: ACE_ItemCore {
         author = ECSTRING(common,ACETeam);
+        GVAR(restraint) = 1;
         displayName = CSTRING(CableTie);
         descriptionShort = CSTRING(CableTieDescription);
         model = QPATHTOF(models\ace_cabletie.p3d);

diff --git a/addons/captives/XEH_preInit.sqf b/addons/captives/XEH_preInit.sqf
@@ -8,6 +8,8 @@ PREP_RECOMPILE_END;
 
 GVAR(captivityEnabled) = false;
 
+GVAR(restraints) = call (uiNamespace getVariable QGVAR(restraints));
+
 #include "initSettings.sqf"
 
 ADDON = true;
diff --git a/addons/captives/XEH_preStart.sqf b/addons/captives/XEH_preStart.sqf
@@ -1,3 +1,6 @@
 #include "script_component.hpp"
 
 #include "XEH_PREP.hpp"
+
+private _restraints = (QUOTE(getNumber (_x >> QQGVAR(restraint)) > 0) configClasses (configFile >> "CfgWeapons") apply {configName _x});
+uiNamespace setVariable [QGVAR(restraints), compileFinal str _restraints];
diff --git a/addons/captives/functions/fnc_canApplyHandcuffs.sqf b/addons/captives/functions/fnc_canApplyHandcuffs.sqf
@@ -20,7 +20,7 @@ params ["_unit", "_target"];
 //Check sides, Player has cableTie, target is alive and not already handcuffed
 
 (GVAR(allowHandcuffOwnSide) || {(side _unit) != (side _target)}) &&
-{"ACE_CableTie" in (_unit call EFUNC(common,uniqueItems))} &&
+{((_unit call EFUNC(common,uniqueItems)) findAny GVAR(restraints)) != -1} &&
 {alive _target} &&
 {!(_target getVariable [QGVAR(isHandcuffed), false])} &&
 {

diff --git a/addons/captives/functions/fnc_doApplyHandcuffs.sqf b/addons/captives/functions/fnc_doApplyHandcuffs.sqf
@@ -23,4 +23,6 @@ playSound3D [QUOTE(PATHTO_R(sounds\cable_tie_zipping.ogg)), objNull, false, (get
 
 [QGVAR(setHandcuffed), [_target, true, _unit], [_target]] call CBA_fnc_targetEvent;
 
-_unit removeItem "ACE_CableTie";
+private _cuffs = (_unit call EFUNC(common,uniqueItems)) arrayIntersect GVAR(restraints);
+
+_unit removeItem (_cuffs#0);