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

Update various actions and add switch to standing pose

Browse Source 
Made by @Victor-the-Cleaner
This commit is contained in:
A Man
2022-04-19 19:33:51 +02:00
parent b46711bc18
commit 6ccf68c6aa
4 changed files with 141 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
SQF/dayz_code/actions/jerry_fill.sqf
View File

@@ -1,36 +1,37 @@
if (dayz_actionInProgress) exitWith {localize "str_player_actionslimit" call dayz_rollingMessages;};
dayz_actionInProgress = true;
private ["_qty","_finished","_qty20","_qty5","_qty210","_magazines","_cursorTarget","_fuelAmount","_fuelNeeded"];
player removeAction s_player_fillfuel;
//s_player_fillfuel = -1;
_cursorTarget = _this select 3;
_magazines = magazines player;
local _cursorTarget = _this select 3;
local _magazines = magazines player;
local _wasStanding = ["perc", animationState player] call fnc_inString;
local _finished = true;
//Limit Fuel in tankers
_fuelAmount = _cursorTarget getVariable "FuelAmount";
// Limit Fuel in tankers
local _fuelAmount = _cursorTarget getVariable "FuelAmount";
if (isNil "_fuelAmount") then {
_fuelAmount = floor(Random dayz_randomMaxFuelAmount) max (dayz_randomMaxFuelAmount * 0.10);
_cursorTarget setVariable ["FuelAmount",_fuelAmount,true];
_fuelAmount = floor(random dayz_randomMaxFuelAmount) max (dayz_randomMaxFuelAmount * 0.10);
_cursorTarget setVariable ["FuelAmount", _fuelAmount, true];
};
_qty5 = {_x == "ItemFuelcanEmpty"} count _magazines;
_qty20 = {_x == "ItemJerrycanEmpty"} count _magazines;
_qty210 = {_x == "ItemFuelBarrelEmpty"} count _magazines;
_qty = _qty5 + _qty20 + _qty210;
local _qty5 = {_x == "ItemFuelcanEmpty"} count _magazines;
local _qty20 = {_x == "ItemJerrycanEmpty"} count _magazines;
local _qty210 = {_x == "ItemFuelBarrelEmpty"} count _magazines;
local _qty = _qty5 + _qty20 + _qty210;
_fuelNeeded = (_qty5 * 5) + (_qty20 * 20) + (_qty210 * 210);
local _fuelNeeded = (_qty5 * 5) + (_qty20 * 20) + (_qty210 * 210);
//Inform if there is not enough to fill all containers in inventory, then proceed to fill available containers
if (_fuelAmount < _fuelNeeded) then {format[localize "str_fill_notenough",_fuelAmount,_fuelNeeded] call dayz_rollingMessages;};
// Inform if there is not enough to fill all containers in inventory, then proceed to fill available containers
if (_fuelAmount < _fuelNeeded) then {format [localize "str_fill_notenough", _fuelAmount, _fuelNeeded] call dayz_rollingMessages;};
//If there is not enough to fill any of their cans then exit
// If there is not enough to fill any of their cans then exit
if (_fuelAmount < 5 or (_fuelAmount < 20 && _qty5 == 0) or (_fuelAmount < 210 && (_qty5 == 0 && _qty20 == 0))) exitWith {dayz_actionInProgress = false;};
scopeName "main";
if (_qty > 0) then {
[player,(getPosATL player),20,"refuel"] spawn fnc_alertZombies;
[player, (getPosATL player), 20, "refuel"] spawn fnc_alertZombies;
_finished = ["Medic",1] call fn_loopAction;
if (!_finished) exitWith {};
@@ -38,47 +39,68 @@ if (_qty > 0) then {
// Added Nutrition-Factor for work
["Working",0,[20,40,15,0]] call dayz_NutritionSystem;
for "_x" from 1 to _qty5 do {
for "_j" from 1 to _qty5 do {
_fuelAmount = _cursorTarget getVariable "FuelAmount";
if (_fuelAmount >= 5) then {
_fuelAmount = _fuelAmount - 5;
_cursorTarget setVariable ["FuelAmount",_fuelAmount,true];
player removeMagazine "ItemFuelcanEmpty";
_cursorTarget setVariable ["FuelAmount", _fuelAmount, true];
local _removed = [player, "ItemFuelcanEmpty", 1] call BIS_fnc_invRemove;
if (_removed == 0) then {
_finished = false;
breakTo "main";
};
player addMagazine "ItemFuelcan";
} else {
_qty = _qty - 1;
};
};
for "_x" from 1 to _qty20 do {
for "_j" from 1 to _qty20 do {
_fuelAmount = _cursorTarget getVariable "FuelAmount";
if (_fuelAmount >= 20) then {
_fuelAmount = _fuelAmount - 20;
_cursorTarget setVariable ["FuelAmount",_fuelAmount,true];
player removeMagazine "ItemJerrycanEmpty";
_cursorTarget setVariable ["FuelAmount", _fuelAmount, true];
local _removed = [player, "ItemJerrycanEmpty", 1] call BIS_fnc_invRemove;
if (_removed == 0) then {
_finished = false;
breakTo "main";
};
player addMagazine "ItemJerrycan";
} else {
_qty = _qty - 1;
};
};
for "_x" from 1 to _qty210 do {
for "_j" from 1 to _qty210 do {
_fuelAmount = _cursorTarget getVariable "FuelAmount";
if (_fuelAmount >= 210) then {
_fuelAmount = _fuelAmount - 210;
_cursorTarget setVariable ["FuelAmount",_fuelAmount,true];
player removeMagazine "ItemFuelBarrelEmpty";
_cursorTarget setVariable ["FuelAmount", _fuelAmount, true];
local _removed = [player, "ItemFuelBarrelEmpty", 1] call BIS_fnc_invRemove;
if (_removed == 0) then {
_finished = false;
breakTo "main";
};
player addMagazine "ItemFuelBarrel";
} else {
_qty = _qty - 1;
};
};
//format[localize "str_player_09",_qty] call dayz_rollingMessages;
format[localize "str_fill_success",_qty,typeOf _cursorTarget,_fuelAmount] call dayz_rollingMessages;
//diag_log format[localize "str_fill_success",_qty,typeOf _cursorTarget,_fuelAmount];
format [localize "str_fill_success", _qty, _fuelAmount] call dayz_rollingMessages;
} else {
localize "str_player_10" call dayz_rollingMessages;
};
if (!_finished) then {
localize "STR_EPOCH_ACTION_CANCELED" call dayz_rollingMessages;
} else {
if (_wasStanding) then {
player playActionNow "PlayerStand"; // once the action has completed, return player to a standing pose if they were standing before the action
};
};
dayz_actionInProgress = false;