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

Lower or remove nutrition hit for some actions #1857

Browse Source 
Fixes #1857
This commit is contained in:
ebaydayz
2017-01-06 13:27:22 -05:00
parent 3a7744d18d
commit 33672d99ee
32 changed files with 21 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGE LOG 1.0.6.1.txt
View File

@@ -48,7 +48,7 @@
[FIXED] Duplicate matchbox or knife error when lighting a fire or gutting with multiple matchboxes or knives on toolbelt. #1849 @DeVloek
[FIXED] RU crates having zero cargo capacity and wrong classname DZ_ExplosivesBoxRU in loot table. #1852 @oiad
[FIXED] Combining M24 or 2Rnd shotgun ammo can no longer be abused to dupe mags via the method described in #1848. @DeVloek
[FIXED] Rapid starvation or dehydration when using chainsaw, chopping wood or pushing plane.
[FIXED] Rapid starvation or dehydration when using chainsaw, chopping wood or pushing plane. Also lowered or removed nutrition hit for several actions.
[FIXED] Unable to repair or salvage vehicle parts not listed in the RepairParts config, like Merlin glass and tank tracks. #1828 #1856 @ndavalos @schwanzkopfhegel @oiad
[NOTE] The fixes below are included in the 1.0.6 Build C server package released December 29th, 2016 (http://dayzepoch.com/a2dayzepoch.php)

5
SQF/dayz_code/actions/fill_nearestVehicle.sqf
View File

@@ -41,7 +41,6 @@ if (count _findNearestVehicle >= 1) then {
_finished = false;
["Working",0,[20,40,15,0]] call dayz_NutritionSystem;
// force animation
player playActionNow "Medic";
@@ -112,7 +111,9 @@ if (count _findNearestVehicle >= 1) then {
};
};
if(_abort) exitWith {};
if (_abort) exitWith {
["Working",0,[0,1,3,0]] call dayz_NutritionSystem;
};
uiSleep 1;
};
} else {

2
SQF/dayz_code/actions/fill_startGenerator.sqf
View File

@@ -9,7 +9,6 @@ s_player_fillgen = 1;
// Use target from addaction
_vehicle = _this select 3;
["Working",0,[20,40,15,0]] call dayz_NutritionSystem;
// force animation
player playActionNow "Medic";
@@ -78,6 +77,7 @@ if (_finished) then {
_vehicle setVariable ["GeneratorSound", _soundSource,true];
localize "str_epoch_player_28" call dayz_rollingMessages;
["Working",0,[0,1,3,0]] call dayz_NutritionSystem;
};
} else {
// Start generator

3
SQF/dayz_code/actions/modular_build.sqf
View File

@@ -418,7 +418,6 @@ if (_canBuild select 0) then {
format[localize "str_epoch_player_139",_text, (_counter + 1),_limit] call dayz_rollingMessages; //report how many steps are done out of total limit
["Working",0,[100,15,10,0]] call dayz_NutritionSystem;
player playActionNow "Medic"; //animation
//alert zombies
@@ -473,8 +472,8 @@ if (_canBuild select 0) then {
_num_removed = ([player,DZE_buildItem] call BIS_fnc_invRemove); //remove item's magazine from inventory
if(_num_removed == 1) then {
["Working",0,[20,10,5,0]] call dayz_NutritionSystem;
call player_forceSave;
format[localize "str_build_01",_text] call dayz_rollingMessages;
_tmpbuilt setVariable ["OEMPos",_location,true]; //store original location as a variable

3
SQF/dayz_code/actions/player_build.sqf
View File

@@ -327,7 +327,6 @@ if (_canBuild select 0) then {
format[localize "str_epoch_player_139",_text, (_counter + 1),_limit] call dayz_rollingMessages;
["Working",0,[100,15,10,0]] call dayz_NutritionSystem;
player playActionNow "Medic";
_dis=20;
@@ -381,8 +380,8 @@ if (_canBuild select 0) then {
_num_removed = ([player,_item] call BIS_fnc_invRemove);
if(_num_removed == 1) then {
["Working",0,[20,10,5,0]] call dayz_NutritionSystem;
call player_forceSave;
format[localize "str_build_01",_text] call dayz_rollingMessages;
_tmpbuilt setVariable ["OEMPos",_location,true];

2
SQF/dayz_code/actions/player_buildingDowngrade.sqf
View File

@@ -41,7 +41,7 @@ if ((count _upgrade) > 0) then {
_newclassname = _upgrade select 0;
_refund = _upgrade select 1;
["Working",0,[20,40,15,0]] call dayz_NutritionSystem;
["Working",0,[3,2,4,0]] call dayz_NutritionSystem;
player playActionNow "Medic";
[player,20,true,(getPosATL player)] spawn player_alertZombies;

1
SQF/dayz_code/actions/player_copyKey.sqf
View File

@@ -25,7 +25,6 @@ call gear_ui_init;
// require one tin bar per key
_hasTinBar = "ItemTinBar" in magazines player;
if (!_hasTinBar) exitWith {dayz_actionInProgress = false; localize "str_epoch_player_59" call dayz_rollingMessages;};
["Working",0,[20,40,15,0]] call dayz_NutritionSystem;
player playActionNow "Medic";
[player,"repair",0,false] call dayz_zombieSpeak;

1
SQF/dayz_code/actions/player_craftItem.sqf
View File

@@ -126,7 +126,6 @@ if (_canDo) then {
if (_proceed) then {
localize "str_epoch_player_62" call dayz_rollingMessages;
["Working",0,[20,40,15,0]] call dayz_NutritionSystem;
player playActionNow "Medic";
[player,_sfx,0,false] call dayz_zombieSpeak;

6
SQF/dayz_code/actions/player_harvestPlant.sqf
View File

@@ -51,8 +51,6 @@ if (count(_findNearestTree) >= 1) then {
_isOk = true;
_proceed = false;
while {_isOk} do {
["Working",0,[20,40,15,0]] call dayz_NutritionSystem;
player playActionNow "Medic";
[player,20,true,(getPosATL player)] spawn player_alertZombies;
@@ -95,6 +93,7 @@ if (count(_findNearestTree) >= 1) then {
if (_proceed) then {
//Remove melee magazines (BIS_fnc_invAdd fix)
false call dz_fn_meleeMagazines;
["Working",0,[3,2,4,0]] call dayz_NutritionSystem;
_invResult = false;
_i = 0;
for "_x" from 1 to _countOut do {
@@ -126,9 +125,6 @@ if (count(_findNearestTree) >= 1) then {
};
localize "str_epoch_player_73" call dayz_rollingMessages;
};
} else {
localize "str_epoch_player_74" call dayz_rollingMessages;
};

2
SQF/dayz_code/actions/player_upgrade.sqf
View File

@@ -51,7 +51,7 @@ if ((count _upgrade) > 0) then {
} forEach _requirements;
if (_proceed) then {
["Working",0,[20,40,15,0]] call dayz_NutritionSystem;
["Working",0,[3,2,4,0]] call dayz_NutritionSystem;
player playActionNow "Medic";
[player,20,true,(getPosATL player)] spawn player_alertZombies;

3
SQF/dayz_code/actions/remove.sqf
View File

@@ -94,7 +94,6 @@ while {_isOk} do {
format[localize "str_epoch_player_163",_nameVehicle,(_counter + 1),_limit] call dayz_rollingMessages;
["Working",0,[20,40,15,0]] call dayz_NutritionSystem;
player playActionNow "Medic";
_dis=20;
[player,_dis,true,(getPosATL player)] spawn player_alertZombies;
@@ -195,7 +194,7 @@ if (_proceed && _success) then {
};
format[localize "str_epoch_player_165",_nameVehicle] call dayz_rollingMessages;
["Working",0,[3,2,4,0]] call dayz_NutritionSystem;
_preventRefund = false;
_selectedRemoveOutput = [];

2
SQF/dayz_code/actions/stopGenerator.sqf
View File

@@ -9,8 +9,6 @@ s_player_fillgen = 1;
// Use target from addaction
_vehicle = _this select 3;
["Working",0,[20,40,15,0]] call dayz_NutritionSystem;
// force animation
player playActionNow "Medic";
r_interrupt = false;

1
SQF/dayz_code/actions/tow_AttachStraps.sqf
View File

@@ -39,7 +39,6 @@ if(_IsNearVehicle >= 1) then {
_finished = false;
["Working",0,[20,40,15,0]] call dayz_NutritionSystem;
// force animation
player playActionNow "Medic";

1
SQF/dayz_code/actions/tow_DetachStraps.sqf
View File

@@ -28,7 +28,6 @@ if(_inTow) then {
_finished = false;
["Working",0,[20,40,15,0]] call dayz_NutritionSystem;
// force animation
player playActionNow "Medic";

4
SQF/dayz_code/actions/trade_any_bicycle.sqf
View File

@@ -22,9 +22,7 @@ if(_buy_o_sell == "sell") then {
};
localize "str_epoch_player_105" call dayz_rollingMessages;
["Working",0,[3,2,8,0]] call dayz_NutritionSystem;
// force animation
player playActionNow "Medic";
r_interrupt = false;

4
SQF/dayz_code/actions/trade_any_bicycle_old.sqf
View File

@@ -28,9 +28,7 @@ if(_buy_o_sell == "buy") then {
if (_qty >= _qty_in) then {
localize "str_epoch_player_105" call dayz_rollingMessages;
["Working",0,[3,2,8,0]] call dayz_NutritionSystem;
// force animation
player playActionNow "Medic";
r_interrupt = false;

4
SQF/dayz_code/actions/trade_any_boat.sqf
View File

@@ -26,9 +26,7 @@ if(_buy_o_sell == "sell") then {
};
localize "str_epoch_player_105" call dayz_rollingMessages;
["Working",0,[3,2,8,0]] call dayz_NutritionSystem;
// force animation
player playActionNow "Medic";
r_interrupt = false;

4
SQF/dayz_code/actions/trade_any_boat_old.sqf
View File

@@ -33,9 +33,7 @@ if(_buy_o_sell == "buy") then {
if (_qty >= _qty_in) then {
localize "str_epoch_player_105" call dayz_rollingMessages;
["Working",0,[3,2,8,0]] call dayz_NutritionSystem;
// force animation
player playActionNow "Medic";
r_interrupt = false;

2
SQF/dayz_code/actions/trade_any_vehicle.sqf
View File

@@ -27,8 +27,6 @@ if(_buy_o_sell == "sell") then {
localize "str_epoch_player_105" call dayz_rollingMessages;
["Working",0,[3,2,8,0]] call dayz_NutritionSystem;
// force animation
player playActionNow "Medic";
r_interrupt = false;

2
SQF/dayz_code/actions/trade_any_vehicle_free.sqf
View File

@@ -27,8 +27,6 @@ if(_buy_o_sell == "sell") then {
localize "str_epoch_player_105" call dayz_rollingMessages;
["Working",0,[3,2,8,0]] call dayz_NutritionSystem;
// force animation
player playActionNow "Medic";
r_interrupt = false;

4
SQF/dayz_code/actions/trade_any_vehicle_old.sqf
View File

@@ -32,9 +32,7 @@ if(_buy_o_sell == "buy") then {
if (_qty >= _qty_in) then {
localize "str_epoch_player_105" call dayz_rollingMessages;
["Working",0,[3,2,8,0]] call dayz_NutritionSystem;
// force animation
player playActionNow "Medic";
r_interrupt = false;

2
SQF/dayz_code/actions/trade_backpacks.sqf
View File

@@ -24,9 +24,7 @@ if(_buy_o_sell == "sell") then {
localize "str_epoch_player_105" call dayz_rollingMessages;
// force animation
player playActionNow "Medic";
["Working",0,[3,2,8,0]] call dayz_NutritionSystem;
r_interrupt = false;
_animState = animationState player;

4
SQF/dayz_code/actions/trade_backpacks_old.sqf
View File

@@ -31,9 +31,7 @@ if(_buy_o_sell == "buy") then {
if (_qty >= _qty_in) then {
localize "str_epoch_player_105" call dayz_rollingMessages;
["Working",0,[3,2,8,0]] call dayz_NutritionSystem;
// force animation
player playActionNow "Medic";
r_interrupt = false;

1
SQF/dayz_code/actions/trade_items.sqf
View File

@@ -61,7 +61,6 @@ while {r_autoTrade} do {
localize "str_epoch_player_105" call dayz_rollingMessages;
["Working",0,[3,2,8,0]] call dayz_NutritionSystem;
player playActionNow "Medic";
//_dis=20;

2
SQF/dayz_code/actions/trade_items_old.sqf
View File

@@ -51,7 +51,7 @@ for "_x" from 1 to _total_trades do {
} else {
format[localize "str_epoch_player_187",_tradeCounter,_total_trades] call dayz_rollingMessages;
};
["Working",0,[3,2,8,0]] call dayz_NutritionSystem;
player playActionNow "Medic";
//_dis=20;

2
SQF/dayz_code/actions/trade_items_wo_db.sqf
View File

@@ -39,7 +39,7 @@ for "_x" from 1 to _total_trades do {
} else {
format[localize "str_epoch_player_187",_tradeCounter,_total_trades] call dayz_rollingMessages;
};
["Working",0,[3,2,8,0]] call dayz_NutritionSystem;
player playActionNow "Medic";
r_interrupt = false;

2
SQF/dayz_code/actions/trade_weapons.sqf
View File

@@ -75,9 +75,7 @@ if (_abort) exitWith {
localize "str_epoch_player_105" call dayz_rollingMessages;
// force animation
player playActionNow "Medic";
["Working",0,[3,2,8,0]] call dayz_NutritionSystem;
r_interrupt = false;
_animState = animationState player;

4
SQF/dayz_code/actions/trade_weapons_old.sqf
View File

@@ -27,9 +27,7 @@ if(_buy_o_sell == "buy") then {
if (_qty >= _qty_in) then {
localize "str_epoch_player_105" call dayz_rollingMessages;
["Working",0,[3,2,8,0]] call dayz_NutritionSystem;
// force animation
player playActionNow "Medic";
//_dis=20;

1
SQF/dayz_code/compile/player_lockVault.sqf
View File

@@ -18,7 +18,6 @@ _text = getText (configFile >> "CfgVehicles" >> _objType >> "displayName");
// Silently exit if object no longer exists
if (isNull _obj) exitWith { dayz_actionInProgress = false; };
["Working",0,[3,2,8,0]] call dayz_NutritionSystem;
player playActionNow "Medic";
uiSleep 1;
[player,"tentpack",0,false] call dayz_zombieSpeak;

2
SQF/dayz_code/compile/player_packVault.sqf
View File

@@ -47,7 +47,7 @@ if(_location1 distance _location2 > 0.1) exitWith {
};
if (!isNull _obj && alive _obj) then {
["Working",0,[20,40,15,0]] call dayz_NutritionSystem;
["Working",0,[3,2,4,0]] call dayz_NutritionSystem;
player playActionNow "Medic";
[player,"tentpack",0,false] call dayz_zombieSpeak;
uiSleep 3;

1
SQF/dayz_code/compile/player_unlockDoor.sqf
View File

@@ -67,7 +67,6 @@ if (!isNull dayz_selectedDoor) then {
PVDZE_handleSafeGear = [player,_obj,6,if (_doorMethod == "EYE") then {"EYESCAN"} else {DZE_Lock_Door}];
publicVariableServer "PVDZE_handleSafeGear";
["Working",0,[100,15,10,0]] call dayz_NutritionSystem;
DZE_Lock_Door = "";
[player,"combo_locked",0,false] call dayz_zombieSpeak;
[player,20,true,(getPosATL player)] spawn player_alertZombies;

2
SQF/dayz_code/compile/player_unlockVault.sqf
View File

@@ -52,7 +52,6 @@ if (_ComboMatch || (_ownerID == dayz_playerUID)) then {
if (_claimedBy == dayz_playerUID) then {
if (!isNull _obj && alive _obj) then {
_obj setVariable["packing",1];
["Working",0,[3,2,8,0]] call dayz_NutritionSystem;
disableUserInput true; // Make sure player can not modify gear while it is filling
(findDisplay 106) closeDisplay 0; // Close gear
@@ -80,7 +79,6 @@ if (_ComboMatch || (_ownerID == dayz_playerUID)) then {
PVDZE_handleSafeGear = [player,_obj,3,dayz_combination];
publicVariableServer "PVDZE_handleSafeGear";
["Working",0,[100,15,10,0]] call dayz_NutritionSystem;
player playActionNow "Medic";
uiSleep 1;
[player,"repair",0,false] call dayz_zombieSpeak;