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

Disable rearm,refuel on dead vehicles (#5158)

Browse Source
This commit is contained in:
PabstMirror 2017-05-13 17:36:53 -05:00 committed by GitHub
parent 0cdb2ce238
commit f69148bdc0
7 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/rearm/functions/fnc_canRearm.sqf
View File

@ -19,6 +19,8 @@
private ["_dummy","_magazineClass"]; private ["_dummy","_magazineClass"];
params [["_target", objNull, [objNull]], ["_unit", objNull, [objNull]]]; params [["_target", objNull, [objNull]], ["_unit", objNull, [objNull]]];
if (!alive _target) exitWith {false};
if (GVAR(level) == 0 || {isNull _unit} || {!(_unit isKindOf "CAManBase")} || {!local _unit} || {([_unit, _target] call EFUNC(interaction,getInteractionDistance)) > REARM_ACTION_DISTANCE} || {_target getVariable [QGVAR(disabled), false]}) exitWith {false}; if (GVAR(level) == 0 || {isNull _unit} || {!(_unit isKindOf "CAManBase")} || {!local _unit} || {([_unit, _target] call EFUNC(interaction,getInteractionDistance)) > REARM_ACTION_DISTANCE} || {_target getVariable [QGVAR(disabled), false]}) exitWith {false};
_dummy = _unit getVariable [QGVAR(dummy), objNull]; _dummy = _unit getVariable [QGVAR(dummy), objNull];

1
addons/rearm/functions/fnc_canStoreAmmo.sqf
View File

@ -19,6 +19,7 @@
params [["_target", objNull, [objNull]], ["_unit", objNull, [objNull]]]; params [["_target", objNull, [objNull]], ["_unit", objNull, [objNull]]];
!(isNull _unit || !(isNull _unit ||
{!alive _target} ||
{!(_unit isKindOf "CAManBase")} || {!(_unit isKindOf "CAManBase")} ||
{!local _unit} || {!local _unit} ||
{(_target distance _unit) > REARM_ACTION_DISTANCE} || {(_target distance _unit) > REARM_ACTION_DISTANCE} ||

1
addons/rearm/functions/fnc_canTakeAmmo.sqf
View File

@ -19,6 +19,7 @@
params [["_target", objNull, [objNull]], ["_unit", objNull, [objNull]]]; params [["_target", objNull, [objNull]], ["_unit", objNull, [objNull]]];
!(isNull _unit || !(isNull _unit ||
{!alive _target} ||
{!(_unit isKindOf "CAManBase")} || {!(_unit isKindOf "CAManBase")} ||
{!local _unit} || {!local _unit} ||
{(_target distance _unit) > REARM_ACTION_DISTANCE} || {(_target distance _unit) > REARM_ACTION_DISTANCE} ||

2
addons/refuel/CfgVehicles.hpp
View File

@ -5,7 +5,7 @@
class GVAR(Refuel) { \ class GVAR(Refuel) { \
displayName = CSTRING(Refuel); \ displayName = CSTRING(Refuel); \
distance = REFUEL_ACTION_DISTANCE; \ distance = REFUEL_ACTION_DISTANCE; \
condition = "true"; \ condition = "alive _target"; \
statement = ""; \ statement = ""; \
showDisabled = 0; \ showDisabled = 0; \
priority = 2; \ priority = 2; \

1
addons/refuel/functions/fnc_canConnectNozzle.sqf
View File

@ -26,6 +26,7 @@ if (_target isKindOf "AllVehicles") then {
}; };
!(isNull _nozzle || !(isNull _nozzle ||
{!alive _target} ||
{_engine} || {_engine} ||
{([_unit, _target] call EFUNC(interaction,getInteractionDistance)) > REFUEL_ACTION_DISTANCE} || {([_unit, _target] call EFUNC(interaction,getInteractionDistance)) > REFUEL_ACTION_DISTANCE} ||
{!isNull (_target getVariable [QGVAR(nozzle), objNull])}) {!isNull (_target getVariable [QGVAR(nozzle), objNull])})

2
optionals/compat_rhs_afrf3/CfgVehicles.hpp
View File

@ -28,7 +28,7 @@
class EGVAR(refuel,Refuel) { \ class EGVAR(refuel,Refuel) { \
displayName = ECSTRING(refuel,Refuel); \ displayName = ECSTRING(refuel,Refuel); \
distance = 7; \ distance = 7; \
condition = "true"; \ condition = "alive _target"; \
statement = ""; \ statement = ""; \
showDisabled = 0; \ showDisabled = 0; \
priority = 2; \ priority = 2; \

2
optionals/compat_rhs_usf3/CfgVehicles.hpp
View File

@ -41,7 +41,7 @@
class EGVAR(refuel,Refuel) { \ class EGVAR(refuel,Refuel) { \
displayName = ECSTRING(refuel,Refuel); \ displayName = ECSTRING(refuel,Refuel); \
distance = 7; \ distance = 7; \
condition = "true"; \ condition = "alive _target"; \
statement = ""; \ statement = ""; \
showDisabled = 0; \ showDisabled = 0; \
priority = 2; \ priority = 2; \