From e99792d0f46c7d28a1d53a9a3580246ad2106eb9 Mon Sep 17 00:00:00 2001 From: ebayShopper Date: Fri, 14 Apr 2017 11:26:23 -0400 Subject: [PATCH] Update jerry_fill.sqf Vanilla commit: https://github.com/DayZMod/DayZ/commit/ef236938c1531e9d7ba8865fdd09bdf006adc979 --- SQF/dayz_code/actions/fill_nearestVehicle.sqf | 2 +- SQF/dayz_code/actions/fill_startGenerator.sqf | 2 +- SQF/dayz_code/actions/jerry_fill.sqf | 14 +++++++------- SQF/dayz_code/actions/refuel.sqf | 5 ++--- SQF/dayz_code/compile/fn_selfActions.sqf | 10 +++++----- SQF/dayz_code/init/variables.sqf | 1 - SQF/dayz_code/stringtable.xml | 19 +------------------ 7 files changed, 17 insertions(+), 36 deletions(-) diff --git a/SQF/dayz_code/actions/fill_nearestVehicle.sqf b/SQF/dayz_code/actions/fill_nearestVehicle.sqf index 671748ac0..73874613c 100644 --- a/SQF/dayz_code/actions/fill_nearestVehicle.sqf +++ b/SQF/dayz_code/actions/fill_nearestVehicle.sqf @@ -1,5 +1,5 @@ private ["_isFuelTruck","_fuelTruckCapacity","_started","_finished","_animState","_isMedic","_newFuel","_abort","_newFuelSrc","_canSize","_vehicle","_configVeh","_capacity","_nameText","_fuelTruck","_findNearestVehicle"]; -if (dayz_actionInProgress) exitWith {localize "str_epoch_player_24" call dayz_rollingMessages;}; +if (dayz_actionInProgress) exitWith {localize "str_player_actionslimit" call dayz_rollingMessages;}; dayz_actionInProgress = true; _fuelTruck = _this select 3; diff --git a/SQF/dayz_code/actions/fill_startGenerator.sqf b/SQF/dayz_code/actions/fill_startGenerator.sqf index 3e4471075..0d3d1a044 100644 --- a/SQF/dayz_code/actions/fill_startGenerator.sqf +++ b/SQF/dayz_code/actions/fill_startGenerator.sqf @@ -1,6 +1,6 @@ private ["_vehicle","_started","_finished","_animState","_isMedic","_soundSource","_fuelCan","_emptyCan"]; -if (dayz_actionInProgress) exitWith {localize "str_epoch_player_24" call dayz_rollingMessages;}; +if (dayz_actionInProgress) exitWith {localize "str_player_actionslimit" call dayz_rollingMessages;}; dayz_actionInProgress = true; player removeAction s_player_fillgen; diff --git a/SQF/dayz_code/actions/jerry_fill.sqf b/SQF/dayz_code/actions/jerry_fill.sqf index c1660b13e..86025e023 100644 --- a/SQF/dayz_code/actions/jerry_fill.sqf +++ b/SQF/dayz_code/actions/jerry_fill.sqf @@ -1,6 +1,6 @@ -if (dayz_actionInProgress) exitWith {localize "str_epoch_player_34" call dayz_rollingMessages;}; +if (dayz_actionInProgress) exitWith {localize "str_player_actionslimit" call dayz_rollingMessages;}; dayz_actionInProgress = true; -private ["_qty","_dis","_sfx","_started","_finished","_animState","_isRefuel","_fuelCans","_qty20","_qty5","_qty210","_magazines","_cursorTarget","_fuelAmount","_fuelNeeded"]; +private ["_qty","_dis","_sfx","_started","_finished","_animState","_isRefuel","_qty20","_qty5","_qty210","_magazines","_cursorTarget","_fuelAmount","_fuelNeeded"]; player removeAction s_player_fillfuel; //s_player_fillfuel = -1; @@ -18,17 +18,17 @@ if (isNil "_fuelAmount") then { _qty5 = {_x == "ItemFuelcanEmpty"} count _magazines; _qty20 = {_x == "ItemJerrycanEmpty"} count _magazines; _qty210 = {_x == "ItemFuelBarrelEmpty"} count _magazines; +_qty = _qty5 + _qty20 + _qty210; _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",typeOf _cursorTarget,_fuelAmount,_fuelNeeded] call dayz_rollingMessages;}; -_fuelCans = ["ItemFuelcanEmpty","ItemJerrycanEmpty","ItemFuelBarrelEmpty"]; +//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;}; -_qty = 0; -_qty = {_x in _fuelCans} count _magazines; - -if (("ItemJerrycanEmpty" in _magazines) or ("ItemFuelcanEmpty" in _magazines) or ("ItemFuelBarrelEmpty" in _magazines)) then { +if (_qty > 0) then { player playActionNow "Medic"; _dis=5; diff --git a/SQF/dayz_code/actions/refuel.sqf b/SQF/dayz_code/actions/refuel.sqf index 18ea8466b..6ca52fc5e 100644 --- a/SQF/dayz_code/actions/refuel.sqf +++ b/SQF/dayz_code/actions/refuel.sqf @@ -1,4 +1,4 @@ -if (dayz_actionInProgress) exitWith {localize "str_epoch_player_24" call dayz_rollingMessages;}; +if (dayz_actionInProgress) exitWith {localize "str_player_actionslimit" call dayz_rollingMessages;}; dayz_actionInProgress = true; private ["_vehicle","_canSize","_configVeh","_capacity","_nameType","_curFuel","_newFuel","_dis","_sfx","_fueling","_array","_cantype", "_emptycan","_started","_finished","_animState","_isRefuel","_type"]; @@ -19,7 +19,6 @@ _fueling = player getVariable ["fueling",false]; if (fuel _vehicle == 1) exitWith {dayz_actionInProgress = false;}; player removeAction s_player_fillfuel + _capacity; -a_player_jerryfilling = true; player setVariable ["fueling", true]; if (!_fueling) then { @@ -76,7 +75,7 @@ if (!_fueling) then { } else { localize "str_refuel_fail" call dayz_rollingMessages; }; -a_player_jerryfilling = false; + r_action = false; player setVariable ["fueling", false]; dayz_actionInProgress = false; diff --git a/SQF/dayz_code/compile/fn_selfActions.sqf b/SQF/dayz_code/compile/fn_selfActions.sqf index ac76f3255..3d13aef63 100644 --- a/SQF/dayz_code/compile/fn_selfActions.sqf +++ b/SQF/dayz_code/compile/fn_selfActions.sqf @@ -284,7 +284,7 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur }; //Allow player to fill Fuel can - if (_hasEmptyFuelCan && {_isFuel} && {!a_player_jerryfilling} && {_isAlive}) then { + if (_hasEmptyFuelCan && _isFuel && _isAlive) then { if (s_player_fillfuel < 0) then { s_player_fillfuel = player addAction [localize "str_actions_self_10", "\z\addons\dayz_code\actions\jerry_fill.sqf",_cursorTarget, 1, false, true]; }; @@ -295,7 +295,7 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur if (damage _cursorTarget < 1) then { //Allow player to fill vehicle 210L - if (_hasBarrel && {!_isMan} && {_isVehicle} && {fuel _cursorTarget < 1} && {!a_player_jerryfilling} && {!_isDisallowRefuel}) then { + if (_hasBarrel && {!_isMan} && {_isVehicle} && {fuel _cursorTarget < 1} && {!_isDisallowRefuel}) then { if (s_player_fillfuel210 < 0) then { s_player_fillfuel210 = player addAction [format[localize "str_actions_medical_10",_text,"210"], "\z\addons\dayz_code\actions\refuel.sqf",["ItemFuelBarrel",_cursorTarget], 0, true, true, "", "'ItemFuelBarrel' in magazines player"]; }; @@ -305,7 +305,7 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur }; //Allow player to fill vehicle 20L - if (_hasFuel20 && {!_isMan} && {_isVehicle} && {fuel _cursorTarget < 1} && {!a_player_jerryfilling} && {!_isDisallowRefuel}) then { + if (_hasFuel20 && {!_isMan} && {_isVehicle} && {fuel _cursorTarget < 1} && {!_isDisallowRefuel}) then { if (s_player_fillfuel20 < 0) then { s_player_fillfuel20 = player addAction [format[localize "str_actions_medical_10",_text,"20"], "\z\addons\dayz_code\actions\refuel.sqf",["ItemJerrycan",_cursorTarget], 0, true, true, "", "'ItemJerrycan' in magazines player"]; }; @@ -315,7 +315,7 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur }; //Allow player to fill vehicle 5L - if (_hasFuel5 && {!_isMan} && {_isVehicle} && {fuel _cursorTarget < 1} && {!a_player_jerryfilling} && {!_isDisallowRefuel}) then { + if (_hasFuel5 && {!_isMan} && {_isVehicle} && {fuel _cursorTarget < 1} && {!_isDisallowRefuel}) then { if (s_player_fillfuel5 < 0) then { s_player_fillfuel5 = player addAction [format[localize "str_actions_medical_10",_text,"5"], "\z\addons\dayz_code\actions\refuel.sqf",["ItemFuelcan",_cursorTarget], 0, true, true, "", "'ItemFuelcan' in magazines player"]; }; @@ -329,7 +329,7 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur Epoch generator fill action is below. */ //Allow player to siphon vehicles - if (_hasEmptyFuelCan && {!_isMan} && {_isVehicle} && {!_isBicycle} && {!a_player_jerryfilling} && {fuel _cursorTarget > 0}) then { + if (_hasEmptyFuelCan && {!_isMan} && {_isVehicle} && {!_isBicycle} && {fuel _cursorTarget > 0}) then { if (s_player_siphonfuel < 0) then { s_player_siphonfuel = player addAction [format[localize "str_siphon_start"], "\z\addons\dayz_code\actions\siphonFuel.sqf",_cursorTarget, 0, true, true]; }; diff --git a/SQF/dayz_code/init/variables.sqf b/SQF/dayz_code/init/variables.sqf index 2eff83cbe..973ced72e 100644 --- a/SQF/dayz_code/init/variables.sqf +++ b/SQF/dayz_code/init/variables.sqf @@ -158,7 +158,6 @@ Dayz_GUI_B = 0.26; // -0.26 //actions blockers a_player_cooking = false; a_player_boil = false; -a_player_jerryfilling = false; //Player self-action handles dayz_resetSelfActions = { diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml index 17d72718f..7e4d8cd24 100644 --- a/SQF/dayz_code/stringtable.xml +++ b/SQF/dayz_code/stringtable.xml @@ -838,7 +838,6 @@ Hacken Rozsekat Hacker - Study Body @@ -11552,14 +11551,6 @@ La cuisson est déjà en cours. Vaření již probíhá. - - Refuel is already in progress. - Betanken bereits im Gange. - Уже заправляется. - Je bent al aan het tanken. - Le ravitaillement en carburant est déjà en cours. - Doplňování paliva již probíhá. - Preparing to fuel and start generator, move to cancel. Betanken und Starten des Generators, bewege dich um den Vorgang abzubrechen. @@ -11573,7 +11564,7 @@ Abgebrochen. Отмена. Ge-annuleerd. - Annulé + Annulé Zrušeno. @@ -11629,14 +11620,6 @@ Du hast es geschafft %1 aufzubrechen. Вам удалось открыть %1 с помощью набора для угона. - - You are already filling a fuel container. - Befüllen des Kraftstoffbehälters bereits im Gange. - Канистра уже наполняется. - Je bent al een jerrycan aan het vullen. - Le remplissage du jerrycan est déjà en cours. - Plnění kanystru již probíhá. - No recent Deaths. Keine aktuellen Todesfälle.