Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Create Defuse Helpers on demand

Browse Source
This commit is contained in:
PabstMirror 2015-05-27 14:09:06 -05:00
parent adf29d75e3
commit 5f2bee09e4
6 changed files with 61 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
addons/explosives/XEH_postInit.sqf
View File

@ -15,47 +15,10 @@
*/
#include "script_component.hpp"
//Event system to add the defuse object to all explosive devices (defuse is local)
GVAR(explosivesHelped) = [];
GVAR(defuseOjbects) = [];
["explosive_placed", {
PARAMS_1(_explosive);
if (_explosive in GVAR(explosivesHelped)) exitWith {};
private ["_defuseHelper"];
_defuseHelper = "ACE_DefuseObject" createVehicleLocal (getPos _explosive);
_defuseHelper attachTo [_explosive, [0,0,0]];
_defuseHelper setVariable [QGVAR(Explosive),_explosive];
TRACE_3("Added local defuse to helper",_explosive,(typeOf _explosive),_defuseHelper);
GVAR(explosivesHelped) pushBack _explosive;
GVAR(defuseOjbects) pushBack _defuseHelper;
}] call EFUNC(common,addEventHandler);
//Start up a PFEH that scans all mines/explosives without defuseObjects attached and adds them
//Handles Editor Placed / Zeus / Scripted / JIP
[{
private ["_modeAdd"];
_modeAdd = (_this select 0) select 0;
if (_modeAdd) then {
TRACE_2("Adding Helpers",(count allMines),(count GVAR(explosivesHelped)));
{
TRACE_2("Explosive without helper",_explosive,(typeOf _explosive));
["explosive_placed", [_x]] call EFUNC(common,localEvent);
} forEach (allMines - GVAR(explosivesHelped));
} else {
TRACE_2("Cleaning Helpers",(count allMines),(count GVAR(explosivesHelped)));
{
if (isNull _x) then {
deleteVehicle (GVAR(defuseObjects) select _forEachIndex);
};
} forEach GVAR(explosivesHelped);
GVAR(explosivesHelped) = GVAR(explosivesHelped) - [objNull];
GVAR(defuseOjbects) = GVAR(defuseOjbects) - [objNull];
};
(_this select 0) set [0, !_modeAdd];
}, 5, [true]] call CBA_fnc_addPerFrameHandler;
if !(hasInterface) exitWith {};
["interactMenuOpened", {_this call FUNC(interactEH)}] call EFUNC(common,addEventHandler);
GVAR(PlacedCount) = 0;
GVAR(Setup) = objNull;
GVAR(pfeh_running) = false;

2
addons/explosives/XEH_preInit.sqf
View File

@ -36,6 +36,8 @@ PREP(handleScrollWheel);
PREP(hasExplosives);
PREP(hasPlacedExplosives);
PREP(interactEH);
PREP(getDetonators);
PREP(getPlacedExplosives);
PREP(getSpeedDialExplosive);

6
addons/explosives/functions/fnc_defuseExplosive.sqf
View File

@ -21,10 +21,4 @@ if (getNumber (ConfigFile >> "CfgAmmo" >> typeof _explosive >> "ACE_explodeOnDef
[_unit, -1, [_explosive, 1], true] call FUNC(detonateExplosive);
};
{
detach _x;
deleteVehicle _x;
false
} count (attachedObjects (_explosive));
_unit action ["Deactivate", _unit, _explosive];

6
addons/explosives/functions/fnc_detonateExplosive.sqf
View File

@ -26,12 +26,6 @@ _result = true;
if (!_ignoreRange && {(_unit distance (_item select 0)) > _range}) exitWith {false};
_helpers = attachedObjects (_item select 0);
{
detach _x;
deleteVehicle _x;
} forEach _helpers;
if (getNumber (ConfigFile >> "CfgAmmo" >> typeof (_item select 0) >> "TriggerWhenDestroyed") == 0) then {
private ["_exp", "_previousExp"];
_previousExp = _item select 0;

56
addons/explosives/functions/fnc_interactEH.sqf Normal file
View File

@ -0,0 +1,56 @@
/*
* Author: PabstMirror
* When interact_menu starts rendering (from "interact_keyDown" event)
* Add defuse helpers to all nearby mines
*
* Arguments:
* Interact Menu Type (0 - world, 1 - self) <NUMBER>
*
* Return Value:
* Nothing
*
* Example:
* [0] call ace_explosives_fnc_interactEH
*
* Public: Yes
*/
#include "script_component.hpp"
PARAMS_1(_interactionType);
//Ignore self-interaction menu
if (_interactionType != 0) exitWith {};
//Ignore while mounted:
if ((vehicle ACE_player) != ACE_player) exitWith {};
//Ignore if we don't have defuse kit
if (!("ACE_DefusalKit" in (items ACE_player))) exitWith {};
[{
PARAMS_2(_args,_pfID);
EXPLODE_3_PVT(_args,_setPosition,_addedDefuseHelpers,_minesHelped);
if (!EGVAR(interact_menu,keyDown)) then {
TRACE_1("Cleaning Defuse Helpers",(count _addedDefuseHelpers));
{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 {};
//If player moved >5 meters from last pos, then rescan
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);
_defuseHelper attachTo [_x, [0,0,0]];
_defuseHelper setVariable [QGVAR(Explosive),_x];
_addedDefuseHelpers pushBack _defuseHelper;
_minesHelped pushBack _x;
};
} forEach allMines;
_args set [0, (getPosASL ace_player)];
};
};
}, 0.5, [((getPosASL ace_player) vectorAdd [-100,0,0]), [], []]] call CBA_fnc_addPerFrameHandler;

2
addons/explosives/functions/fnc_placeExplosive.sqf
View File

@ -55,8 +55,6 @@ _triggerSpecificVars pushBack _triggerConfig;
_explosive = createVehicle [_ammo, _pos, [], 0, "NONE"];
_explosive setPosATL _pos;
["explosive_placed", [_explosive]] call EFUNC(common,globalEvent);
if (!isNull _attachedTo) then {
TRACE_1("Attaching Live Explosive",_attachedTo);
_explosive attachTo [_attachedTo];