diff --git a/addons/interaction/CfgVehicles.hpp b/addons/interaction/CfgVehicles.hpp index 2ec3f48312..f12054e466 100644 --- a/addons/interaction/CfgVehicles.hpp +++ b/addons/interaction/CfgVehicles.hpp @@ -383,86 +383,6 @@ class CfgVehicles { class ACE_SelfSpatialActions {}; }; - class Helicopter_Base_F: Helicopter {}; - class Helicopter_Base_H: Helicopter_Base_F {}; - class Heli_Light_01_base_F: Helicopter_Base_H { - class ACE_SelfSpatialActions: ACE_SelfSpatialActions { - class ACE_TurnEngineOn { - icon = PATHTOF(UI\btn-06.paa); - displayName = ""; - selection = ""; - position = "[0.057,1.725,-0.24]"; - distance = 1.5; - condition = "!isEngineOn _target"; - statement = QUOTE([ARR_3('ace_interaction_engineOn',_target,[ARR_2(_target, true)])] call EFUNC(common,objectEvent);); - }; - class ACE_TurnEngineOff { - icon = PATHTOF(UI\btn-05.paa); - displayName = ""; - selection = ""; - position = "[0.057,1.725,-0.24]"; - distance = 1.5; - condition = "isEngineOn _target"; - statement = QUOTE([ARR_3('ace_interaction_engineOn',_target,[ARR_2(_target, false)])] call EFUNC(common,objectEvent);); - }; - - class ACE_BatOn { - icon = PATHTOF(UI\btn-02.paa); - displayName = ""; - selection = ""; - position = "[-0.08,1.74,-0.01]"; - distance = 1.5; - condition = QUOTE(!(_target getVariable [ARR_2('ace_interact_batStatus',false)])); - statement = QUOTE(_target setVariable [ARR_2('ace_interact_batStatus',true)];); - }; - class ACE_BatOff { - icon = PATHTOF(UI\btn-01.paa); - displayName = ""; - selection = ""; - position = "[-0.08,1.74,-0.01]"; - distance = 1.5; - condition = QUOTE((_target getVariable [ARR_2('ace_interact_batStatus',false)])); - statement = QUOTE(_target setVariable [ARR_2('ace_interact_batStatus',false)];); - }; - class ACE_GenOn { - icon = PATHTOF(UI\btn-04.paa); - displayName = ""; - selection = ""; - position = "[-0.08,1.735,-0.05]"; - distance = 1.5; - condition = QUOTE(!(_target getVariable [ARR_2('ace_interact_genStatus',false)])); - statement = QUOTE(_target setVariable [ARR_2('ace_interact_genStatus',true)];); - }; - class ACE_GenOff { - icon = PATHTOF(UI\btn-03.paa); - displayName = ""; - selection = ""; - position = "[-0.08,1.735,-0.05]"; - distance = 1.5; - condition = QUOTE((_target getVariable [ARR_2('ace_interact_genStatus',false)])); - statement = QUOTE(_target setVariable [ARR_2('ace_interact_genStatus',false)];); - }; - class ACE_FuelPumpOn { - icon = PATHTOF(UI\btn-08.paa); - displayName = ""; - selection = ""; - position = "[-0.055,1.74,-0.015]"; - distance = 1.5; - condition = QUOTE(!(_target getVariable [ARR_2('ace_interact_fuelPumpStatus',false)])); - statement = QUOTE(_target setVariable [ARR_2('ace_interact_fuelPumpStatus',true)];); - }; - class ACE_FuelPumpOff { - icon = PATHTOF(UI\btn-07.paa); - displayName = ""; - selection = ""; - position = "[-0.055,1.74,-0.015]"; - distance = 1.5; - condition = QUOTE((_target getVariable [ARR_2('ace_interact_fuelPumpStatus',false)])); - statement = QUOTE(_target setVariable [ARR_2('ace_interact_fuelPumpStatus',false)];); - }; - }; - }; - class Plane: Air { class ACE_Actions { class ACE_MainActions { diff --git a/addons/interaction/UI/btn-01.paa b/addons/interaction/UI/btn-01.paa deleted file mode 100644 index 473d6b7a7b..0000000000 Binary files a/addons/interaction/UI/btn-01.paa and /dev/null differ diff --git a/addons/interaction/UI/btn-02.paa b/addons/interaction/UI/btn-02.paa deleted file mode 100644 index 1344610a00..0000000000 Binary files a/addons/interaction/UI/btn-02.paa and /dev/null differ diff --git a/addons/interaction/UI/btn-03.paa b/addons/interaction/UI/btn-03.paa deleted file mode 100644 index 3cbee80b5c..0000000000 Binary files a/addons/interaction/UI/btn-03.paa and /dev/null differ diff --git a/addons/interaction/UI/btn-04.paa b/addons/interaction/UI/btn-04.paa deleted file mode 100644 index d3e5da6f32..0000000000 Binary files a/addons/interaction/UI/btn-04.paa and /dev/null differ diff --git a/addons/interaction/UI/btn-05.paa b/addons/interaction/UI/btn-05.paa deleted file mode 100644 index d9cee8e329..0000000000 Binary files a/addons/interaction/UI/btn-05.paa and /dev/null differ diff --git a/addons/interaction/UI/btn-06.paa b/addons/interaction/UI/btn-06.paa deleted file mode 100644 index 744de61fe0..0000000000 Binary files a/addons/interaction/UI/btn-06.paa and /dev/null differ diff --git a/addons/interaction/UI/btn-07.paa b/addons/interaction/UI/btn-07.paa deleted file mode 100644 index 6c2321fcf8..0000000000 Binary files a/addons/interaction/UI/btn-07.paa and /dev/null differ diff --git a/addons/interaction/UI/btn-08.paa b/addons/interaction/UI/btn-08.paa deleted file mode 100644 index 69f2ec2503..0000000000 Binary files a/addons/interaction/UI/btn-08.paa and /dev/null differ diff --git a/addons/interaction/XEH_postInit.sqf b/addons/interaction/XEH_postInit.sqf index ed36946613..66e0cb1341 100644 --- a/addons/interaction/XEH_postInit.sqf +++ b/addons/interaction/XEH_postInit.sqf @@ -79,8 +79,3 @@ GVAR(isOpeningDoor) = false; ["isNotSwimming", {!underwater (_this select 0)}] call EFUNC(common,addCanInteractWithCondition); ["isNotOnLadder", {getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> animationState (_this select 0) >> "ACE_isLadder") != 1}] call EFUNC(common,addCanInteractWithCondition); - -[QGVAR(engineOn), { - params ["_unit", "_state"]; - _unit engineOn _state; -}] call EFUNC(common,addEventHandler);