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

targetEvent -> objectEvent

Browse Source
This commit is contained in:
jonpas 2016-03-05 18:16:09 +01:00
parent 881eaf951a
commit 9463b05218
6 changed files with 9 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/refuel/functions/fnc_checkFuel.sqf
View File

@ -27,9 +27,9 @@ private _fuel = [_target] call FUNC(getFuel);
params ["_args"];
_args params [["_unit", objNull, [objNull]], ["_target", objNull, [objNull]], ["_fuel", 0, [0]]];
if (_fuel > 0 ) then {
["displayTextStructured", [_unit], [[LSTRING(Hint_RemainingFuel), _fuel], 2, _unit]] call EFUNC(common,targetEvent);
["displayTextStructured", _unit, [[LSTRING(Hint_RemainingFuel), _fuel], 2, _unit]] call EFUNC(common,objectEvent);
} else {
["displayTextStructured", [_unit], [LSTRING(Hint_Empty), 2, _unit]] call EFUNC(common,targetEvent);
["displayTextStructured", _unit, [LSTRING(Hint_Empty), 2, _unit]] call EFUNC(common,objectEvent);
};
true
},

2
addons/refuel/functions/fnc_connectNozzleAction.sqf
View File

@ -119,7 +119,7 @@ _endPosTestOffset set [2, (_startingOffset select 2)];
};
};
};
["setVectorDirAndUp", _nozzle, [_nozzle, _dirAndUp]] call EFUNC(common,targetEvent);
["setVectorDirAndUp", _nozzle, [_nozzle, _dirAndUp]] call EFUNC(common,objectEvent);
_nozzle setVariable [QGVAR(sink), _target, true];
_nozzle setVariable [QGVAR(isConnected), true, true];
_target setVariable [QGVAR(nozzle), _nozzle, true];

6
addons/refuel/functions/fnc_refuel.sqf
View File

@ -76,11 +76,7 @@ private _maxFuel = getNumber (configFile >> "CfgVehicles" >> (typeOf _target) >>
};
_unit setVariable [QGVAR(tempFuel), _fuelInSink];
if !(local _sink) then {
["setFuel", _sink, [_sink, _fuelInSink]] call EFUNC(common,targetEvent);
} else {
_sink setFuel _fuelInSink;
};
["setFuel", _sink, [_sink, _fuelInSink]] call EFUNC(common,objectEvent);
[_source, _fuelInSource] call FUNC(setFuel);
} else {
_unit setVariable [QGVAR(tempFuel), fuel _sink];

13
addons/refuel/functions/fnc_reset.sqf
View File

@ -17,11 +17,8 @@
params [["_target", objNull, [objNull]]];
if (local _target) then {
_target setHitPointDamage ["HitEngine", _target getVariable [QGVAR(engineHit), 0]];
} else {
["setHitPointDamage", _target, ["HitEngine", _target getVariable [QGVAR(engineHit), 0]]] call EFUNC(common,targetEvent);
};
["setHitPointDamage", _target, ["HitEngine", _target getVariable [QGVAR(engineHit), 0]]] call EFUNC(common,objectEvent);
_target setVariable [QGVAR(engineHit), nil, true];
_target setVariable [QGVAR(isConnected), false, true];
@ -38,11 +35,7 @@ if !(isNil "_nozzle") then {
};
{
if (local _x) then {
[_x, _nozzle] call FUNC(resetLocal);
} else {
[QGVAR(resetLocal), _x, [_x, _nozzle]] call EFUNC(common,targetEvent);
};
[QGVAR(resetLocal), _x, [_x, _nozzle]] call EFUNC(common,objectEvent);
} count allPlayers;
deleteVehicle _nozzle;
};

6
addons/refuel/functions/fnc_returnNozzle.sqf
View File

@ -48,11 +48,7 @@ if (isNull _nozzle || {_source != _target}) exitWith {false};
};
deleteVehicle _nozzle;
if !(local _target) then {
["setHitPointDamage", _target, ["HitEngine", _target getVariable [QGVAR(engineHit), 0]]] call EFUNC(common,targetEvent);
} else {
_target setHitPointDamage ["HitEngine", _target getVariable [QGVAR(engineHit), 0]];
};
["setHitPointDamage", _target, ["HitEngine", _target getVariable [QGVAR(engineHit), 0]]] call EFUNC(common,objectEvent);
_target setVariable [QGVAR(engineHit), nil, true];
},
"",

6
addons/refuel/functions/fnc_takeNozzle.sqf
View File

@ -27,11 +27,7 @@ REFUEL_HOLSTER_WEAPON
private _endPosOffset = [0, 0, 0];
if (isNull _nozzle) then { // func is called on fuel truck
_target setVariable [QGVAR(engineHit), _target getHitPointDamage "HitEngine", true];
if !(local _target) then {
["setHitPointDamage", _target, ["HitEngine", 1]] call EFUNC(common,targetEvent);
} else {
_target setHitPointDamage ["HitEngine", 1];
};
["setHitPointDamage", _target, ["HitEngine", 1]] call EFUNC(common,objectEvent);
_target setVariable [QGVAR(isConnected), true, true];
_endPosOffset = getArray (configFile >> "CfgVehicles" >> typeOf _target >> QGVAR(hooks));