Merge pull request #199 from KoffeinFlummi/canInteractWith

solve canInteract conflicts, fix #198

addons/captives/XEH_postInit.sqf

@@ -29,3 +29,9 @@ if (isServer) then {
 
 //Medical Integration Events???
 ["medical_onUnconscious", {_this call ACE_Captives_fnc_handleOnUnconscious}] call EFUNC(common,addEventHandler);
+
+if (!hasInterface) exitWith {};
+
+["isNotEscorting", {!(GETVAR(_this select 0,GVAR(isEscorting),false))}] call EFUNC(common,addCanInteractWithCondition);
+["isNotHandcuffed", {!(GETVAR(_this select 0,GVAR(isHandcuffed),false))}] call EFUNC(common,addCanInteractWithCondition);
+["isNotSurrendering", {!(GETVAR(_this select 0,GVAR(isSurrendering),false))}] call EFUNC(common,addCanInteractWithCondition);

addons/captives/config.cpp

@@ -16,16 +16,3 @@ class CfgPatches {
 #include "CfgMoves.hpp"
 #include "CfgVehicles.hpp"
 #include "CfgWeapons.hpp"
-
-
-class ACE_canInteractConditions {
-    class GVAR(isNotEscorting) {
-        condition = QUOTE(!(GETVAR(player,QGVAR(isEscorting),false)));
-    };
-    class GVAR(isNotHandcuffed) {
-        condition = QUOTE(!(GETVAR(player,QGVAR(isHandcuffed),false)));
-    };
-    class GVAR(isNotSurrendering) {
-        condition = QUOTE(!(GETVAR(player,QGVAR(isSurrendering),false)));
-    };
-};

addons/common/XEH_postInit.sqf

@@ -55,8 +55,6 @@ if (_currentVersion != _previousVersion) then {
 if (!hasInterface) exitWith {};
 
 call COMPILE_FILE(scripts\assignedItemFix);
-
-call COMPILE_FILE(scripts\initCanInteractFunction);
 call COMPILE_FILE(scripts\initScrollWheel);
 
 0 spawn {
@@ -161,3 +159,5 @@ _vehicle setFuel _fuelLevel;
 
 ["displayTextStructured", FUNC(displayTextStructured)] call FUNC(addEventhandler);
 ["displayTextPicture", FUNC(displayTextPicture)] call FUNC(addEventhandler);
+
+["notOnMap", {!visibleMap}] call FUNC(addCanInteractWithCondition);

addons/common/XEH_preInit.sqf

@@ -7,6 +7,7 @@ ADDON = false;
 PREP(addActionEventHandler);
 PREP(addActionMenuEventHandler);
 PREP(addCameraEventHandler);
+PREP(addCanInteractWithCondition);
 PREP(addCustomEventHandler);
 PREP(addLineToDebugDraw);
 PREP(addMapMarkerCreatedEventHandler);
@@ -147,6 +148,7 @@ PREP(receiveRequest);
 PREP(removeActionEventHandler);
 PREP(removeActionMenuEventHandler);
 PREP(removeCameraEventHandler);
+PREP(removeCanInteractWithCondition);
 PREP(removeCustomEventHandler);
 PREP(removeMapMarkerCreatedEventHandler);
 PREP(removeScrollWheelEventHandler);

addons/common/config.cpp

@@ -51,12 +51,6 @@ class ACE_Rsc_Control_Base {
     h = 0;
 };
 
-class ACE_canInteractConditions {
-    class GVAR(notOnMap) {
-        condition = "!visibleMap";
-    };
-};
-
 class ACE_Settings {
     /*
     *class GVAR(sampleSetting) {

addons/common/functions/fnc_addCanInteractWithCondition.sqf

@@ -0,0 +1,38 @@
+/*
+ * Author: commy2
+ *
+ * Add a condition that gets checked by ace_common_fnc_canInteractWith.
+ *
+ * Arguments:
+ * 0: The conditions id. Used to remove later or as exception name. An already existing name overwrites. (String)
+ * 1: The condition to check. format of "_this" is "[_player, _target]". (Code)
+ *
+ * Return Value:
+ * Unit can interact?
+ *
+ */
+#include "script_component.hpp"
+
+private ["_conditionName", "_conditionFunc"];
+
+_conditionName = toLower (_this select 0);
+_conditionFunc = _this select 1;
+
+private ["_conditions", "_conditionNames", "_conditionFuncs"];
+
+_conditions = missionNamespace getVariable [QGVAR(InteractionConditions), [[],[]]];
+
+_conditionNames = _conditions select 0;
+_conditionFuncs = _conditions select 1;
+
+private "_index";
+_index = _conditionNames find _conditionName;
+
+if (_index == -1) then {
+	_index = count _conditionNames;
+};
+
+_conditionNames set [_index, _conditionName];
+_conditionFuncs set [_index, _conditionFunc];
+
+GVAR(InteractionConditions) = [_conditionNames, _conditionFuncs];

addons/common/functions/fnc_canInteractWith.sqf

@@ -1,11 +1,49 @@
-// by commy2
+/*
+ * Author: commy2
+ *
+ * Check if the unit can interact.
+ *
+ * Arguments:
+ * 0: The player. (Object)
+ * 1: The interaction target. objNull to ignore. (Object)
+ * 2: Exceptions. What general conditions are to skip? (Array)
+ *
+ * Return Value:
+ * Unit can interact?
+ *
+ */
 #include "script_component.hpp"
 
-private ["_unit", "_target", "_owner"];
+private ["_unit", "_target", "_exceptions"];
 
 _unit = _this select 0;
 _target = _this select 1;
+_exceptions = _this select 2;
 
-_owner = _target getVariable ["ACE_isUsedBy", objNull];
+_exceptions = [_exceptions, {toLower _this}] call FUNC(map);
 
-isNull _owner || {_unit == _owner} || {!isPlayer _owner}
+// exit if the target is not free to interact
+private "_owner";
+_owner = _target getVariable [QGVAR(owner), objNull];
+
+if (!isNull _owner && {_unit != _owner} && {!([_owner] call FUNC(isPlayer))}) exitWith {false};
+
+// check general conditions
+
+private ["_conditions", "_conditionNames", "_conditionFuncs"];
+
+_conditions = missionNamespace getVariable [QGVAR(InteractionConditions), [[],[]]];
+
+_conditionNames = _conditions select 0;
+_conditionFuncs = _conditions select 1;
+
+private "_canInteract";
+_canInteract = true;
+
+{
+    if (!(_x in _exceptions) && {!([_unit, _target] call (_conditionFuncs select _forEachIndex))}) exitWith {
+        _canInteract = false;
+    };
+} forEach _conditionNames;
+
+_canInteract

addons/common/functions/fnc_claim.sqf

@@ -1,7 +1,20 @@
-// by commy2
+/*
+ * Author: commy2
+ *
+ * Unit claims the ownership over an object. This is used to prevent multiple players from draging the same ammo box or using up the same wheel when repairing etc.
+ *
+ * Arguments:
+ * 0: Unit that claims another object. ObjNull to remove claim. (Object)
+ * 1: The object that gets claimed. (Object)
+ * 2: Lock the claimed object aswell? (Bool)
+ *
+ * Return Value:
+ * NONE
+ *
+ */
 #include "script_component.hpp"
 
-private ["_unit", "_target", "_lockTarget", "_owner"];
+private ["_unit", "_target", "_lockTarget"];
 
 _unit = _this select 0;
 _target = _this select 1;
@@ -9,20 +22,26 @@ _lockTarget = _this select 2;
 
 if (isNil "_lockTarget") then {_lockTarget = false};
 
-_owner = _target getVariable ["ACE_isUsedBy", objNull];
+private "_owner";
+_owner = _target getVariable [QGVAR(owner), objNull];
 
 if (!isNull _owner && {!isNull _unit} && {_unit != _owner}) then {
   diag_log text "[ACE] ERROR: Claiming already owned object.";
 };
 
-_target setVariable ["ACE_isUsedBy", _unit, true];
+// transfer this immediately
+_target setVariable [QGVAR(owner), _unit, true];
 
+// lock target object
 if (_lockTarget) then {
-  if (!isNull _unit) then {
-    [_target, "{_locked = locked _this; _this setVariable ['ACE_lockStatus', _locked]; _this lock 2}", _target] call FUNC(execRemoteFnc);
-  } else {
-    [_target, "{_this lock (_this getVariable ['ACE_lockStatus', locked _this])}", _target] call FUNC(execRemoteFnc);
-  };
+    if (!isNull _unit) then {
+        ["lockVehicle", _target, _target] call FUNC(targetEvent);
+    } else {
+        ["unlockVehicle", _target, _target] call FUNC(targetEvent);
+    };
 };
 
-//systemChat str locked _target; systemChat str (_target getVariable ['ACE_lockStatus', locked _target]);
+/*
+systemChat str locked _target;
+systemChat str (_target getVariable [QGVAR(lockStatus), locked _target]);
+*/

addons/common/functions/fnc_owned.sqf

@@ -1,8 +1,19 @@
-// by commy2
+/*
+ * Author: commy2
+ *
+ * Counterpart of ace_common_fnc_claim. Check if the given object is claimed by another unit.
+ *
+ * Arguments:
+ * 0: Any object. (Object)
+ *
+ * Return Value:
+ * Is this object claimed by someone?
+ *
+ */
 #include "script_component.hpp"
 
-private "_object";
+private "_target";
 
-_object = _this select 0;
+_target = _this select 0;
 
-!isNull (_object getVariable ["ACE_isUsedBy", objNull])
+!isNull (_target getVariable [QGVAR(owner), objNull])

addons/common/functions/fnc_progressBar.sqf

@@ -11,7 +11,7 @@
 * 3: CODE or STRING - On Failure: Code called or STRING raised as event.
 * 4: STRING - (Optional) Localized Title
 * 5: CODE - (Optional) Code to check each frame
-* 6: ARRAY - (Optional) Exceptions for checking EGVAR(common,canInteract)
+* 6: ARRAY - (Optional) Exceptions for checking EGVAR(common,canInteractWith)
 *
 * Return value:
 * Nothing
@@ -62,7 +62,7 @@ _perFrameFunction = {
       if (!([_args, _elapsedTime, _totalTime, _errorCode] call _condition)) then {
         _errorCode = 3;
       } else {
-        if (!(_exceptions call EGVAR(common,canInteract))) then {
+        if (!([_player, objNull, _exceptions] call EGVAR(common,canInteractWith))) then {
           _errorCode = 4;
         } else {
           if (_elapsedTime >= _totalTime) then {

addons/common/functions/fnc_removeCanInteractWithCondition.sqf

@@ -0,0 +1,34 @@
+/*
+ * Author: commy2
+ *
+ * Remove a condition that gets checked by ace_common_fnc_canInteractWith.
+ *
+ * Arguments:
+ * 0: The conditions id. (String)
+ *
+ * Return Value:
+ * Unit can interact?
+ *
+ */
+#include "script_component.hpp"
+
+private "_conditionName";
+
+_conditionName = toLower (_this select 0);
+
+private ["_conditions", "_conditionNames", "_conditionFuncs"];
+
+_conditions = missionNamespace getVariable [QGVAR(InteractionConditions), [[],[]]];
+
+_conditionNames = _conditions select 0;
+_conditionFuncs = _conditions select 1;
+
+private "_index";
+_index = _conditionNames find _conditionName;
+
+if (_index == -1) exitWith {};
+
+_conditionNames deleteAt _index;
+_conditionFuncs deleteAt _index;
+
+GVAR(InteractionConditions) = [_conditionNames, _conditionFuncs];

addons/common/scripts/initCanInteractFunction.sqf

@@ -1,20 +0,0 @@
-// by commy2
-#include "script_component.hpp"
-
-private ["_function", "_configFile", "_count", "_index", "_config", "_configName", "_condition"];
-
-_function = "private '_exceptions'; _exceptions = _this; alive ACE_player";
-
-_configFile = configFile >> "ACE_canInteractConditions";
-_count = count _configFile;
-
-for "_index" from 0 to (_count -1) do {
-  _config = _configFile select _index;
-  _configName = configName _config;
-
-  _condition = getText (_config >> "condition");
-
-  _function = _function + format ["&& {%1 || {'%2' in _exceptions}}", _condition, _configName];
-};
-
-GVAR(canInteract) = compileFinal _function;

addons/fcs/initKeybinds.sqf

@@ -3,8 +3,7 @@
 ["ACE3", QGVAR(lazeTarget), localize "STR_ACE_FCS_LaseTarget",
 {
     // Conditions: canInteract
-    _exceptions = [];
-    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    if !([ACE_player, objNull, []] call EGVAR(common,canInteractWith)) exitWith {false};
     // Conditions: specific
     if !((!GVAR(enabled) && FUNC(canUseFCS)) || FUNC(canUseRangefinder)) exitWith {false};
 
@@ -21,8 +20,7 @@
     GVAR(isDownStateKey1) = false;
 
     // Conditions: canInteract
-    _exceptions = [];
-    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    if !([ACE_player, objNull, []] call EGVAR(common,canInteractWith)) exitWith {false};
     // Conditions: specific
     if !(GVAR(enabled) && FUNC(canUseFCS)) exitWith {false};
 
@@ -35,8 +33,7 @@
 ["ACE3", QGVAR(adjustRangeUp), localize "STR_ACE_FCS_AdjustRangeUp",
 {
     // Conditions: canInteract
-    _exceptions = [];
-    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    if !([ACE_player, objNull, []] call EGVAR(common,canInteractWith)) exitWith {false};
     // Conditions: specific
     if !(call FUNC(canUseRangefinder) || FUNC(canUseFCS)) exitWith {false};
 
@@ -50,8 +47,7 @@
 ["ACE3", QGVAR(adjustRangDown), localize "STR_ACE_FCS_AdjustRangeDown",
 {
     // Conditions: canInteract
-    _exceptions = [];
-    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    if !([ACE_player, objNull, []] call EGVAR(common,canInteractWith)) exitWith {false};
     // Conditions: specific
     if !(call FUNC(canUseRangefinder) || FUNC(canUseFCS)) exitWith {false};
 

addons/grenades/XEH_postInit.sqf

@@ -13,8 +13,7 @@ GVAR(flashbangPPEffectCC) ppEffectForceInNVG true;
 ["ACE3", QGVAR(switchGrenadeMode), localize "STR_ACE_Grenades_SwitchGrenadeMode",
 {
     // Conditions: canInteract
-    _exceptions = [QEGVAR(captives,isNotEscorting)];
-    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    if !([ACE_player, objNull, ["isNotEscorting"]] call EGVAR(common,canInteractWith)) exitWith {false};
     // Conditions: specific
     if (!([ACE_player] call EFUNC(common,canUseWeapon))) exitWith {false};
 

addons/interact_menu/functions/fnc_compileMenu.sqf

@@ -46,7 +46,7 @@ _recurseFnc = {
             if (_condition == "") then {_condition = "true"};
 
             // Add canInteract (including exceptions) and canInteractWith to condition
-            _condition = _condition + format [QUOTE( && {%1 call EGVAR(common,canInteract)} && {[ARR_2(ACE_player, _target)] call EFUNC(common,canInteractWith)} ), getArray (_entryCfg >> "exceptions")];
+            _condition = _condition + format [QUOTE( && {[ARR_3(ACE_player, _target, %1)] call EGVAR(common,canInteractWith)} ), getArray (_entryCfg >> "exceptions")];
 
             _showDisabled = (getNumber (_entryCfg >> "showDisabled")) > 0;
             _enableInside = (getNumber (_entryCfg >> "enableInside")) > 0;

addons/interact_menu/functions/fnc_compileMenuSelfAction.sqf

@@ -43,7 +43,7 @@ _recurseFnc = {
             if (_condition == "") then {_condition = "true"};
 
             // Add canInteract (including exceptions) and canInteractWith to condition
-            _condition = _condition + format [QUOTE( && {%1 call EGVAR(common,canInteract)} && {[ARR_2(ACE_player, _target)] call EFUNC(common,canInteractWith)} ), getArray (_entryCfg >> "exceptions")];
+            _condition = _condition + format [QUOTE( && {[ARR_3(ACE_player, objNull, %1)] call EGVAR(common,canInteractWith)} ), getArray (_entryCfg >> "exceptions")];
 
             _showDisabled = (getNumber (_entryCfg >> "showDisabled")) > 0;
             _enableInside = (getNumber (_entryCfg >> "enableInside")) > 0;

addons/interaction/XEH_clientInit.sqf

@@ -19,8 +19,7 @@ GVAR(isOpeningDoor) = false;
 ["ACE3", QGVAR(openDoor), localize "STR_ACE_Interaction_OpenDoor",
 {
     // Conditions: canInteract
-    _exceptions = [];
-    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    if !([ACE_player, objNull, []] call EGVAR(common,canInteractWith)) exitWith {false};
     // Conditions: specific
     if (GVAR(isOpeningDoor) || {[2] call FUNC(getDoor) select 1 == ''}) exitWith {false};
 
@@ -40,8 +39,7 @@ GVAR(isOpeningDoor) = false;
 ["ACE3", QGVAR(tapShoulder), localize "STR_ACE_Interaction_TapShoulder",
 {
     // Conditions: canInteract
-    _exceptions = [];
-    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    if !([ACE_player, objNull, []] call EGVAR(common,canInteractWith)) exitWith {false};
     // Conditions: specific
     if !([ACE_player, cursorTarget] call FUNC(canTapShoulder)) exitWith {false};
 
@@ -55,8 +53,7 @@ GVAR(isOpeningDoor) = false;
 ["ACE3", QGVAR(modifierKey), localize "STR_ACE_Interaction_ModifierKey",
 {
     // Conditions: canInteract
-    _exceptions = ["ACE_Drag_isNotDragging"];
-    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    if !([ACE_player, objNull, ["isNotDragging"]] call EGVAR(common,canInteractWith)) exitWith {false};
 
     // Statement
     ACE_Modifier = 1;
@@ -69,3 +66,5 @@ GVAR(isOpeningDoor) = false;
     false;
 },
 [29, [false, false, false]], false] call cba_fnc_addKeybind;
+
+["isNotSwimming", {!underwater (_this select 0)}] call EFUNC(common,addCanInteractWithCondition);

addons/interaction/config.cpp

@@ -24,9 +24,3 @@ class ACE_Settings {
     typeName = "BOOL";
   };
 };
-
-class ACE_canInteractConditions {
-  class GVAR(isNotSwimming) {
-    condition = QUOTE( !underwater ACE_player );
-  };
-};

addons/interaction/functions/fnc_openDoor.sqf

@@ -47,7 +47,7 @@ playSound "ACE_Sound_Click";
 		!GVAR(isOpeningDoor) || {getPosASL ACE_player distance _position > 1}
 	};
 
-	if (!_usedMouseWheel && {time < _time} && {[] call EGVAR(common,canInteract)}) then {
+	if (!_usedMouseWheel && {time < _time} && {[ACE_player, objNull, []] call EGVAR(common,canInteractWith)}) then {
 		_phase = [0, 1] select (_house animationPhase (_animations select 0) < 0.5);
 
 		{_house animate [_x, _phase]} forEach _animations;

addons/movement/XEH_postInit.sqf

@@ -21,8 +21,7 @@
 ["ACE3", QGVAR(climb), localize "STR_ACE_Movement_Climb",
 {
     // Conditions: canInteract
-    _exceptions = [];
-    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    if !([ACE_player, objNull, []] call EGVAR(common,canInteractWith)) exitWith {false};
     // Conditions: specific
     if (ACE_player != (vehicle ACE_player)) exitWith {false};
 

addons/nametags/XEH_postInit.sqf

@@ -10,8 +10,7 @@ if (!hasInterface) exitWith {};
 ["ACE3", QGVAR(showNameTags), localize "STR_ACE_NameTags_ShowNames",
 {
     // Conditions: canInteract
-    _exceptions = [];
-    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    if !([ACE_player, objNull, []] call EGVAR(common,canInteractWith)) exitWith {false};
 
     // Statement
     GVAR(ShowNamesTime) = time;

addons/nightvision/XEH_postInitClient.sqf

@@ -40,8 +40,7 @@ GVAR(ppEffectMuzzleFlash) ppEffectCommit 0;
 ["ACE3", QGVAR(IncreaseNVGBrightness), localize "STR_ACE_NightVision_IncreaseNVGBrightness",
 {
     // Conditions: canInteract
-    _exceptions = [QEGVAR(captives,isNotEscorting)];
-    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    if !([ACE_player, objNull, ["isNotEscorting"]] call EGVAR(common,canInteractWith)) exitWith {false};
     // Conditions: specific
     if ((currentVisionMode _player != 1)) exitWith {false};
 
@@ -55,8 +54,7 @@ GVAR(ppEffectMuzzleFlash) ppEffectCommit 0;
 ["ACE3", QGVAR(DecreaseNVGBrightness), localize "STR_ACE_NightVision_DecreaseNVGBrightness",
 {
     // Conditions: canInteract
-    _exceptions = [QEGVAR(captives,isNotEscorting)];
-    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    if !([ACE_player, objNull, ["isNotEscorting"]] call EGVAR(common,canInteractWith)) exitWith {false};
     // Conditions: specific
     if ((currentVisionMode _player != 1)) exitWith {false};
 

addons/overheating/XEH_postInit.sqf

@@ -7,8 +7,7 @@ if !(hasInterface) exitWith {};
 ["ACE3", QGVAR(unjamWeapon), localize "STR_ACE_Overheating_UnjamWeapon",
 {
     // Conditions: canInteract
-    _exceptions = [];
-    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    if !([ACE_player, objNull, []] call EGVAR(common,canInteractWith)) exitWith {false};
     // Conditions: specific
     if !([ACE_player] call EFUNC(common,canUseWeapon) &&
     {currentWeapon ACE_player in (ACE_player getVariable [QGVAR(jammedWeapons), []])}

addons/parachute/XEH_postInit.sqf

@@ -19,8 +19,7 @@ if (!hasInterface) exitWith {};
 ["ACE3", QGVAR(showAltimeter), localize "STR_ACE_Parachute_showAltimeter",
 {
     // Conditions: canInteract
-    _exceptions = [QEGVAR(interaction,isNotEscorting)];
-    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    if !([ACE_player, objNull, ["isNotEscorting"]] call EGVAR(common,canInteractWith)) exitWith {false};
     if (!('ACE_Altimeter' in assignedItems ace_player)) exitWith {false};
     if (!(missionNamespace getVariable [QGVAR(AltimeterActive), false])) then {
         [ace_player] call FUNC(showAltimeter);

addons/reload/XEH_postInit.sqf

@@ -7,8 +7,7 @@ if !(hasInterface) exitWith {};
 ["ACE3", QGVAR(checkAmmo), localize "STR_ACE_Reload_checkAmmo",
 {
     // Conditions: canInteract
-    _exceptions = [];
-    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    if !([ACE_player, objNull, []] call EGVAR(common,canInteractWith)) exitWith {false};
     // Conditions: specific
     if !([ACE_player] call EFUNC(common,canUseWeapon) ||
     {(vehicle ACE_player) isKindOf 'StaticWeapon'}) exitWith {false};

addons/reload/functions/fnc_startLinkingBelt.sqf

@@ -42,7 +42,7 @@ if (_maxAmmo == 0) exitWith {};
 // Condition to call each frame
 _condition = {
     EXPLODE_2_PVT((_this select 0),_player,_target);
-    ([_player, _target] call EFUNC(common,canInteract)) && ((_player distance _target) < 3) && ((speed _target) < 1)
+    ([_player, _target, []] call EFUNC(common,canInteractWith)) && ((_player distance _target) < 3) && ((speed _target) < 1)
 };
 
 _onFinish = {

addons/resting/XEH_postInit.sqf

@@ -7,8 +7,7 @@ if !(hasInterface) exitWith {};
 ["ACE3", QGVAR(RestWeapon), localize "STR_ACE_Resting_RestWeapon",
 {
     // Conditions: canInteract
-    _exceptions = [];
-    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    if !([ACE_player, objNull, []] call EGVAR(common,canInteractWith)) exitWith {false};
     // Conditions: specific
     if !([ACE_player] call EFUNC(common,canUseWeapon) &&
     {inputAction 'reloadMagazine' == 0} &&

addons/safemode/XEH_postInit.sqf

@@ -9,8 +9,7 @@
 ["ACE3", QGVAR(safeMode), localize "STR_ACE_SafeMode_SafeMode",
 {
     // Conditions: canInteract
-    _exceptions = [QEGVAR(interaction,isNotEscorting)];
-    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    if !([ACE_player, objNull, ["isNotEscorting"]] call EGVAR(common,canInteractWith)) exitWith {false};
     // Conditions: specific
     if !([ACE_player] call EFUNC(common,canUseWeapon)) exitWith {false};
 

addons/scopes/XEH_postInit.sqf

@@ -36,8 +36,7 @@ if !(hasInterface) exitWith {};
 ["ACE3", QGVAR(AdjustUp), localize "STR_ACE_Scopes_AdjustUp",
 {
     // Conditions: canInteract
-    _exceptions = [];
-    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    if !([ACE_player, objNull, []] call EGVAR(common,canInteractWith)) exitWith {false};
     // Conditions: specific
     [ACE_player] call FUNC(inventoryCheck);
     if !([ACE_player, 0, 0.1] call FUNC(canAdjustScope)) exitWith {false};
@@ -52,8 +51,7 @@ if !(hasInterface) exitWith {};
 ["ACE3", QGVAR(AdjustDown), localize "STR_ACE_Scopes_AdjustDown",
 {
     // Conditions: canInteract
-    _exceptions = [];
-    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    if !([ACE_player, objNull, []] call EGVAR(common,canInteractWith)) exitWith {false};
     // Conditions: specific
     [ACE_player] call FUNC(inventoryCheck);
     if !([ACE_player, 0, -0.1] call FUNC(canAdjustScope)) exitWith {false};
@@ -68,8 +66,7 @@ if !(hasInterface) exitWith {};
 ["ACE3", QGVAR(AdjustLeft), localize "STR_ACE_Scopes_AdjustLeft",
 {
     // Conditions: canInteract
-    _exceptions = [];
-    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    if !([ACE_player, objNull, []] call EGVAR(common,canInteractWith)) exitWith {false};
     // Conditions: specific
     [ACE_player] call FUNC(inventoryCheck);
     if !([ACE_player, -0.1, 0] call FUNC(canAdjustScope)) exitWith {false};
@@ -84,8 +81,7 @@ if !(hasInterface) exitWith {};
 ["ACE3", QGVAR(AdjustRight), localize "STR_ACE_Scopes_AdjustRight",
 {
     // Conditions: canInteract
-    _exceptions = [];
-    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    if !([ACE_player, objNull, []] call EGVAR(common,canInteractWith)) exitWith {false};
     // Conditions: specific
     [ACE_player] call FUNC(inventoryCheck);
     if !([ACE_player, 0.1, 0] call FUNC(canAdjustScope)) exitWith {false};

addons/vector/initKeybinds.sqf

@@ -3,8 +3,7 @@
 ["ACE3", QGVAR(AzimuthKey), localize "STR_ACE_Vector_AzimuthKey",
 {
     // Conditions: canInteract
-    _exceptions = [];
-    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    if !([ACE_player, objNull, []] call EGVAR(common,canInteractWith)) exitWith {false};
     // Conditions: specific
     if !(currentWeapon ACE_player == "ACE_Vector" && {ACE_player == cameraOn} && {cameraView == "GUNNER"}) exitWith {false};
 
@@ -21,8 +20,7 @@
     GVAR(isDownStateKey1) = false;
 
     // Conditions: canInteract
-    _exceptions = [];
-    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    if !([ACE_player, objNull, []] call EGVAR(common,canInteractWith)) exitWith {false};
 
     // Statement
     ["azimuth"] call FUNC(onKeyUp);
@@ -34,8 +32,7 @@
 ["ACE3", QGVAR(DistanceKey), localize "STR_ACE_Vector_DistanceKey",
 {
     // Conditions: canInteract
-    _exceptions = [];
-    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    if !([ACE_player, objNull, []] call EGVAR(common,canInteractWith)) exitWith {false};
     // Conditions: specific
     if !(currentWeapon ACE_player == "ACE_Vector" && {ACE_player == cameraOn} && {cameraView == "GUNNER"}) exitWith {false};
 
@@ -52,8 +49,7 @@
     GVAR(isDownStateKey2) = false;
 
     // Conditions: canInteract
-    _exceptions = [];
-    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    if !([ACE_player, objNull, []] call EGVAR(common,canInteractWith)) exitWith {false};
 
     // Statement
     ["distance"] call FUNC(onKeyUp);

addons/vehiclelock/functions/fnc_lockpick.sqf

@@ -64,7 +64,7 @@ case (_funcType == "startLockpick"): {
     _condition = {
       PARAMS_1(_args);
       EXPLODE_2_PVT(_args,_unit,_veh);
-      ([_unit] call EFUNC(common,canInteract)) && ((_unit distance _veh) < 5) && ((speed _veh) < 1)
+      ([_unit, objNull, []] call EFUNC(common,canInteractWith)) && ((_unit distance _veh) < 5) && ((speed _veh) < 1)
     };
     [_vehLockpickStrenth, [_unit, _veh, "finishLockpick"], {(_this select 0) call FUNC(lockpick)}, {}, (localize "STR_ACE_Vehicle_Action_LockpickInUse"), _condition] call EFUNC(common,progressBar);
   };

addons/vehicles/XEH_postInit.sqf

@@ -7,8 +7,7 @@ if !(hasInterface) exitWith {};
 ["ACE3", QGVAR(speedLimiter), localize "STR_ACE_SpeedLimiter",
 {
     // Conditions: canInteract
-    _exceptions = [];
-    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    if !([ACE_player, objNull, []] call EGVAR(common,canInteractWith)) exitWith {false};
     // Conditions: specific
     if !(ACE_player == driver vehicle ACE_player &&
     {vehicle ACE_player isKindOf 'Car' ||

addons/weaponselect/XEH_postInit.sqf

@@ -7,8 +7,7 @@ if !(hasInterface) exitWith {};
 ["ACE3", QGVAR(SelectPistol), localize "STR_ACE_WeaponSelect_SelectPistol",
 {
     // Conditions: canInteract
-    _exceptions = [QEGVAR(interaction,isNotEscorting)];
-    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    if !([ACE_player, objNull, ["isNotEscorting"]] call EGVAR(common,canInteractWith)) exitWith {false};
     // Conditions: specific
     if !([ACE_player] call EFUNC(common,canUseWeapon)) exitWith {false};
 
@@ -22,8 +21,7 @@ if !(hasInterface) exitWith {};
 ["ACE3", QGVAR(SelectRifle), localize "STR_ACE_WeaponSelect_SelectRifle",
 {
     // Conditions: canInteract
-    _exceptions = [QEGVAR(interaction,isNotEscorting)];
-    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    if !([ACE_player, objNull, ["isNotEscorting"]] call EGVAR(common,canInteractWith)) exitWith {false};
     // Conditions: specific
     if !([ACE_player] call EFUNC(common,canUseWeapon)) exitWith {false};
 
@@ -37,8 +35,7 @@ if !(hasInterface) exitWith {};
 ["ACE3", QGVAR(SelectRifleMuzzle), localize "STR_ACE_WeaponSelect_SelectRifleMuzzle",
 {
     // Conditions: canInteract
-    _exceptions = [QEGVAR(interaction,isNotEscorting)];
-    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    if !([ACE_player, objNull, ["isNotEscorting"]] call EGVAR(common,canInteractWith)) exitWith {false};
     // Conditions: specific
     if !([ACE_player] call EFUNC(common,canUseWeapon)) exitWith {false};
 
@@ -52,8 +49,7 @@ if !(hasInterface) exitWith {};
 ["ACE3", QGVAR(SelectLauncher), localize "STR_ACE_WeaponSelect_SelectLauncher",
 {
     // Conditions: canInteract
-    _exceptions = [QEGVAR(interaction,isNotEscorting)];
-    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    if !([ACE_player, objNull, ["isNotEscorting"]] call EGVAR(common,canInteractWith)) exitWith {false};
     // Conditions: specific
     if !([ACE_player] call EFUNC(common,canUseWeapon)) exitWith {false};
 
@@ -67,8 +63,7 @@ if !(hasInterface) exitWith {};
 ["ACE3", QGVAR(SelectBinocular), localize "STR_ACE_WeaponSelect_SelectBinocular",
 {
     // Conditions: canInteract
-    _exceptions = [QEGVAR(interaction,isNotEscorting)];
-    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    if !([ACE_player, objNull, ["isNotEscorting"]] call EGVAR(common,canInteractWith)) exitWith {false};
     // Conditions: specific
     if !([ACE_player] call EFUNC(common,canUseWeapon)) exitWith {false};
 
@@ -82,8 +77,7 @@ if !(hasInterface) exitWith {};
 ["ACE3", QGVAR(SelectGrenadeFrag), localize "STR_ACE_WeaponSelect_SelectGrenadeFrag",
 {
     // Conditions: canInteract
-    _exceptions = [QEGVAR(interaction,isNotEscorting)];
-    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    if !([ACE_player, objNull, ["isNotEscorting"]] call EGVAR(common,canInteractWith)) exitWith {false};
     // Conditions: specific
     if !([ACE_player] call EFUNC(common,canUseWeapon)) exitWith {false};
 
@@ -97,8 +91,7 @@ if !(hasInterface) exitWith {};
 ["ACE3", QGVAR(SelectGrenadeOther), localize "STR_ACE_WeaponSelect_SelectGrenadeOther",
 {
     // Conditions: canInteract
-    _exceptions = [QEGVAR(interaction,isNotEscorting)];
-    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    if !([ACE_player, objNull, ["isNotEscorting"]] call EGVAR(common,canInteractWith)) exitWith {false};
     // Conditions: specific
     if !([ACE_player] call EFUNC(common,canUseWeapon)) exitWith {false};
 
@@ -112,8 +105,7 @@ if !(hasInterface) exitWith {};
 ["ACE3", QGVAR(HolsterWeapon), localize "STR_ACE_WeaponSelect_HolsterWeapon",
 {
     // Conditions: canInteract
-    _exceptions = [QEGVAR(interaction,isNotEscorting)];
-    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    if !([ACE_player, objNull, ["isNotEscorting"]] call EGVAR(common,canInteractWith)) exitWith {false};
     // Conditions: specific
     if !([ACE_player] call EFUNC(common,canUseWeapon)) exitWith {false};
 
@@ -127,8 +119,7 @@ if !(hasInterface) exitWith {};
 ["ACE3", QGVAR(EngineOn), localize "STR_ACE_WeaponSelect_EngineOn",
 {
     // Conditions: canInteract
-    _exceptions = [];
-    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    if !([ACE_player, objNull, []] call EGVAR(common,canInteractWith)) exitWith {false};
     // Conditions: specific
     if !(ACE_player != vehicle ACE_player && {ACE_player == driver vehicle ACE_player} && {!isEngineOn vehicle ACE_player}) exitWith {false};
 
@@ -142,8 +133,7 @@ if !(hasInterface) exitWith {};
 ["ACE3", QGVAR(EngineOff), localize "STR_ACE_WeaponSelect_EngineOff",
 {
     // Conditions: canInteract
-    _exceptions = [];
-    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    if !([ACE_player, objNull, []] call EGVAR(common,canInteractWith)) exitWith {false};
     // Conditions: specific
     if !(ACE_player != vehicle ACE_player && {ACE_player == driver vehicle ACE_player} && {isEngineOn vehicle ACE_player}) exitWith {false};
 
@@ -157,8 +147,7 @@ if !(hasInterface) exitWith {};
 ["ACE3", QGVAR(SelectMainGun), localize "STR_ACE_WeaponSelect_SelectMainGun",
 {
     // Conditions: canInteract
-    _exceptions = [];
-    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    if !([ACE_player, objNull, []] call EGVAR(common,canInteractWith)) exitWith {false};
     // Conditions: specific
     if !(ACE_player != vehicle ACE_player) exitWith {false};
 
@@ -172,8 +161,7 @@ if !(hasInterface) exitWith {};
 ["ACE3", QGVAR(SelectMachineGun), localize "STR_ACE_WeaponSelect_SelectMachineGun",
 {
     // Conditions: canInteract
-    _exceptions = [];
-    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    if !([ACE_player, objNull, []] call EGVAR(common,canInteractWith)) exitWith {false};
     // Conditions: specific
     if !(ACE_player != vehicle ACE_player) exitWith {false};
 
@@ -187,8 +175,7 @@ if !(hasInterface) exitWith {};
 ["ACE3", QGVAR(SelectMissiles), localize "STR_ACE_WeaponSelect_SelectMissiles",
 {
     // Conditions: canInteract
-    _exceptions = [];
-    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    if !([ACE_player, objNull, []] call EGVAR(common,canInteractWith)) exitWith {false};
     // Conditions: specific
     if !(ACE_player != vehicle ACE_player) exitWith {false};
 
@@ -202,8 +189,7 @@ if !(hasInterface) exitWith {};
 ["ACE3", QGVAR(FireSmokeLauncher), localize "STR_ACE_WeaponSelect_FireSmokeLauncher",
 {
     // Conditions: canInteract
-    _exceptions = [];
-    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    if !([ACE_player, objNull, []] call EGVAR(common,canInteractWith)) exitWith {false};
     // Conditions: specific
     if !(ACE_player != vehicle ACE_player && {ACE_player == commander vehicle ACE_player}) exitWith {false};