From be3afe6eb38cbbd3e03571f097ffe99b3d259b5d Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Tue, 2 Aug 2016 18:29:31 -0500 Subject: [PATCH] Increase defuse range for underwater mines (#4195) Fix #4144 - Adds a 2nd defuse helper with increased range --- addons/explosives/CfgVehicles.hpp | 7 +++++++ addons/explosives/functions/fnc_interactEH.sqf | 9 ++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/addons/explosives/CfgVehicles.hpp b/addons/explosives/CfgVehicles.hpp index a4a331aa26..b5cd201d7a 100644 --- a/addons/explosives/CfgVehicles.hpp +++ b/addons/explosives/CfgVehicles.hpp @@ -60,6 +60,13 @@ class CfgVehicles { icon = QPATHTOF(UI\Defuse_ca.paa); }; }; + }; + class ACE_DefuseObject_Large: ACE_DefuseObject { + class ACE_Actions: ACE_Actions { + class ACE_Defuse: ACE_Defuse { + distance = 1.5; + }; + }; }; class ACE_Explosives_Place: Items_base_F { diff --git a/addons/explosives/functions/fnc_interactEH.sqf b/addons/explosives/functions/fnc_interactEH.sqf index da5e5ec149..c8486adc09 100644 --- a/addons/explosives/functions/fnc_interactEH.sqf +++ b/addons/explosives/functions/fnc_interactEH.sqf @@ -35,7 +35,6 @@ if (!("ACE_DefusalKit" in (items ACE_player))) exitWith {}; {deleteVehicle _x;} forEach _addedDefuseHelpers; [_pfID] call CBA_fnc_removePerFrameHandler; } else { - private ["_defuseHelper"]; // Prevent Rare Error when ending mission with interact key down: if (isNull ace_player) exitWith {}; @@ -43,8 +42,12 @@ if (!("ACE_DefusalKit" in (items ACE_player))) exitWith {}; if (((getPosASL ace_player) distance _setPosition) > 5) then { { if (((_x distance ACE_player) < 15) && {!(_x in _minesHelped)}) then { - TRACE_2("Making Defuse Helper",(_x),(typeOf _x)); - _defuseHelper = "ACE_DefuseObject" createVehicleLocal (getPos _x); + TRACE_3("Making Defuse Helper",(_x),(typeOf _x),(_x isKindOf "UnderwaterMine_Range_Ammo")); + private _defuseHelper = if (_x isKindOf "UnderwaterMine_Range_Ammo") then { + "ACE_DefuseObject_Large" createVehicleLocal (getPos _x); + } else { + "ACE_DefuseObject" createVehicleLocal (getPos _x); + }; private _config = configFile >> "CfgAmmo" >> typeOf _x;