W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-17 17:20:26 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Sync near player checks

Browse Source 
Checking if the player is the closest is not always the best idea, this
fixes a few dupes and syncs the distance for all player checks
This commit is contained in:
oiad
2020-06-13 11:26:44 +12:00
parent ac79d91ca0
commit b06d3d4623
16 changed files with 147 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
SQF/dayz_code/actions/siphonFuel.sqf
View File

@@ -2,41 +2,37 @@ private ["_vehicle","_curFuel","_newFuel","_finished","_location1","_location2",
"_canNameEmpty","_canSizeEmpty","_canTypeEmpty","_canName","_canSize","_configCanEmpty","_configVeh","_capacity","_nameText",
"_availableCansEmpty","_hasHose","_PlayerNear"];
if (dayz_actionInProgress) exitWith {localize "str_player_actionslimit" call dayz_rollingMessages;};
dayz_actionInProgress = true;
_vehicle = _this select 3;
player removeAction s_player_siphonfuel;
_hasHose = "equip_hose" in magazines player;
if (!_hasHose) exitWith {localize "str_siphon_hose" call dayz_rollingMessages; };
_PlayerNear = {isPlayer _x} count ((getPosATL _vehicle) nearEntities ["CAManBase", 10]) > 1;
_PlayerNear = {isPlayer _x} count ((getPosATL _vehicle) nearEntities ["CAManBase", 12]) > 1;
if (_PlayerNear) exitWith {localize "str_pickup_limit_5" call dayz_rollingMessages;};
if (dayz_actionInProgress) exitWith {localize "str_player_actionslimit" call dayz_rollingMessages;};
dayz_actionInProgress = true;
_abort = false;
// Static vehicle fuel information
_configVeh = configFile >> "cfgVehicles" >> typeOf _vehicle;
_capacity = getNumber(_configVeh >> "fuelCapacity");
_nameText = getText(_configVeh >> "displayName");
// Loop to find containers that can could hold fuel and fill them
{
_configCanEmpty = configFile >> "CfgMagazines" >> _x;
//diag_log format["Looking for: %1", _x];
if(_x in DayZ_fuelCansEmpty) then {
// Get Empty can size
if (_x in DayZ_fuelCansEmpty) then {
_canNameEmpty = _x;
_canSizeEmpty = getNumber(_configCanEmpty >> "fuelQuantity");
_canTypeEmpty = getText(_configCanEmpty >> "displayName");
// Get Full can size
_canName = getText(_configCanEmpty >> "fullCan");
_canSize = getNumber(configFile >> "cfgMagazines" >> _canName >> "fuelQuantity");
// is empty
if(_canSizeEmpty == 0) then {
_curFuel = ((fuel _vehicle) * _capacity);
_newFuel = (_curFuel - _canSize);
if (_canSizeEmpty == 0) then {
_curFuel = ((fuel _vehicle) * _capacity);
_newFuel = (_curFuel - _canSize);
// calculate new fuel
if (_capacity == 0) then {
@@ -48,8 +44,7 @@ _nameText = getText(_configVeh >> "displayName");
if (_newFuel > 0) then {
format[localize "str_siphon_preparing",_canTypeEmpty] call dayz_rollingMessages;
_finished = false;
// alert zombies
[player,20,true,(getPosATL player)] call player_alertZombies;
if (!dayz_isSwimming) then {
@@ -66,8 +61,8 @@ _nameText = getText(_configVeh >> "displayName");
if (_finished) then {
// Get vehicle fuel levels again
_curFuel = ((fuel _vehicle) * _capacity);
_newFuel = (_curFuel - _canSize);
_curFuel = ((fuel _vehicle) * _capacity);
_newFuel = (_curFuel - _canSize);
// calculate minimum needed fuel
if (_capacity == 0) then {
@@ -87,37 +82,35 @@ _nameText = getText(_configVeh >> "displayName");
// Play sound
[player,"refuel",0,false] call dayz_zombieSpeak;
// Add filled can
player addMagazine _canName;
// Added Nutrition-Factor for work
["Working",0,[20,40,15,0]] call dayz_NutritionSystem;
format[localize "str_siphon_drained",_nameText,_canSize] call dayz_rollingMessages;
call fnc_usec_medic_removeActions;
r_action = false;
uiSleep 1;
} else {
_abort = true;
};
};
} else {
format[localize "str_siphon_notenough",_nameText] call dayz_rollingMessages;
_abort = true;
};
};
} else {
localize "str_siphon_canceled" call dayz_rollingMessages;
_abort = true;
};
};
} else {
format[localize "str_siphon_notenough",_nameText] call dayz_rollingMessages;
_abort = true;
};
};
};
if(_abort) exitWith {};
if (_abort) exitWith {};
} forEach magazines player;
dayz_actionInProgress = false;