diff --git a/CHANGE LOG 1.0.6.1.txt b/CHANGE LOG 1.0.6.1.txt index c65b58082..8ce6ce8fb 100644 --- a/CHANGE LOG 1.0.6.1.txt +++ b/CHANGE LOG 1.0.6.1.txt @@ -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) diff --git a/SQF/dayz_code/actions/fill_nearestVehicle.sqf b/SQF/dayz_code/actions/fill_nearestVehicle.sqf index c25a2b74c..1d1b9422d 100644 --- a/SQF/dayz_code/actions/fill_nearestVehicle.sqf +++ b/SQF/dayz_code/actions/fill_nearestVehicle.sqf @@ -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 { diff --git a/SQF/dayz_code/actions/fill_startGenerator.sqf b/SQF/dayz_code/actions/fill_startGenerator.sqf index 6c2d43b4c..3e4471075 100644 --- a/SQF/dayz_code/actions/fill_startGenerator.sqf +++ b/SQF/dayz_code/actions/fill_startGenerator.sqf @@ -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 diff --git a/SQF/dayz_code/actions/modular_build.sqf b/SQF/dayz_code/actions/modular_build.sqf index d1d5b6bff..1ee6380be 100644 --- a/SQF/dayz_code/actions/modular_build.sqf +++ b/SQF/dayz_code/actions/modular_build.sqf @@ -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 diff --git a/SQF/dayz_code/actions/player_build.sqf b/SQF/dayz_code/actions/player_build.sqf index 22495501a..4e73f58a3 100644 --- a/SQF/dayz_code/actions/player_build.sqf +++ b/SQF/dayz_code/actions/player_build.sqf @@ -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]; diff --git a/SQF/dayz_code/actions/player_buildingDowngrade.sqf b/SQF/dayz_code/actions/player_buildingDowngrade.sqf index a4fb4fdbe..8d099f21e 100644 --- a/SQF/dayz_code/actions/player_buildingDowngrade.sqf +++ b/SQF/dayz_code/actions/player_buildingDowngrade.sqf @@ -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; diff --git a/SQF/dayz_code/actions/player_copyKey.sqf b/SQF/dayz_code/actions/player_copyKey.sqf index 95ba3c1a3..5fc5f92de 100644 --- a/SQF/dayz_code/actions/player_copyKey.sqf +++ b/SQF/dayz_code/actions/player_copyKey.sqf @@ -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; diff --git a/SQF/dayz_code/actions/player_craftItem.sqf b/SQF/dayz_code/actions/player_craftItem.sqf index 50495efe2..1244e62d1 100644 --- a/SQF/dayz_code/actions/player_craftItem.sqf +++ b/SQF/dayz_code/actions/player_craftItem.sqf @@ -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; diff --git a/SQF/dayz_code/actions/player_harvestPlant.sqf b/SQF/dayz_code/actions/player_harvestPlant.sqf index 7aba6f321..37b1ac5fa 100644 --- a/SQF/dayz_code/actions/player_harvestPlant.sqf +++ b/SQF/dayz_code/actions/player_harvestPlant.sqf @@ -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; }; diff --git a/SQF/dayz_code/actions/player_upgrade.sqf b/SQF/dayz_code/actions/player_upgrade.sqf index f2a5b1e1b..76c412204 100644 --- a/SQF/dayz_code/actions/player_upgrade.sqf +++ b/SQF/dayz_code/actions/player_upgrade.sqf @@ -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; diff --git a/SQF/dayz_code/actions/remove.sqf b/SQF/dayz_code/actions/remove.sqf index 32dad1909..f97ea2358 100644 --- a/SQF/dayz_code/actions/remove.sqf +++ b/SQF/dayz_code/actions/remove.sqf @@ -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 = []; diff --git a/SQF/dayz_code/actions/stopGenerator.sqf b/SQF/dayz_code/actions/stopGenerator.sqf index 6d104151e..8015d1376 100644 --- a/SQF/dayz_code/actions/stopGenerator.sqf +++ b/SQF/dayz_code/actions/stopGenerator.sqf @@ -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; diff --git a/SQF/dayz_code/actions/tow_AttachStraps.sqf b/SQF/dayz_code/actions/tow_AttachStraps.sqf index a39be796c..e032bbd8b 100644 --- a/SQF/dayz_code/actions/tow_AttachStraps.sqf +++ b/SQF/dayz_code/actions/tow_AttachStraps.sqf @@ -39,7 +39,6 @@ if(_IsNearVehicle >= 1) then { _finished = false; - ["Working",0,[20,40,15,0]] call dayz_NutritionSystem; // force animation player playActionNow "Medic"; diff --git a/SQF/dayz_code/actions/tow_DetachStraps.sqf b/SQF/dayz_code/actions/tow_DetachStraps.sqf index f64c82702..32f766655 100644 --- a/SQF/dayz_code/actions/tow_DetachStraps.sqf +++ b/SQF/dayz_code/actions/tow_DetachStraps.sqf @@ -28,7 +28,6 @@ if(_inTow) then { _finished = false; - ["Working",0,[20,40,15,0]] call dayz_NutritionSystem; // force animation player playActionNow "Medic"; diff --git a/SQF/dayz_code/actions/trade_any_bicycle.sqf b/SQF/dayz_code/actions/trade_any_bicycle.sqf index f99b45c56..cc34193cc 100644 --- a/SQF/dayz_code/actions/trade_any_bicycle.sqf +++ b/SQF/dayz_code/actions/trade_any_bicycle.sqf @@ -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; diff --git a/SQF/dayz_code/actions/trade_any_bicycle_old.sqf b/SQF/dayz_code/actions/trade_any_bicycle_old.sqf index 1f264627b..52f976451 100644 --- a/SQF/dayz_code/actions/trade_any_bicycle_old.sqf +++ b/SQF/dayz_code/actions/trade_any_bicycle_old.sqf @@ -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; diff --git a/SQF/dayz_code/actions/trade_any_boat.sqf b/SQF/dayz_code/actions/trade_any_boat.sqf index aaeb2e207..c233e6b38 100644 --- a/SQF/dayz_code/actions/trade_any_boat.sqf +++ b/SQF/dayz_code/actions/trade_any_boat.sqf @@ -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; diff --git a/SQF/dayz_code/actions/trade_any_boat_old.sqf b/SQF/dayz_code/actions/trade_any_boat_old.sqf index 2fb4727fc..330744b11 100644 --- a/SQF/dayz_code/actions/trade_any_boat_old.sqf +++ b/SQF/dayz_code/actions/trade_any_boat_old.sqf @@ -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; diff --git a/SQF/dayz_code/actions/trade_any_vehicle.sqf b/SQF/dayz_code/actions/trade_any_vehicle.sqf index 440682c2f..bdb2b70d9 100644 --- a/SQF/dayz_code/actions/trade_any_vehicle.sqf +++ b/SQF/dayz_code/actions/trade_any_vehicle.sqf @@ -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; diff --git a/SQF/dayz_code/actions/trade_any_vehicle_free.sqf b/SQF/dayz_code/actions/trade_any_vehicle_free.sqf index 83463c3e2..91cc36d06 100644 --- a/SQF/dayz_code/actions/trade_any_vehicle_free.sqf +++ b/SQF/dayz_code/actions/trade_any_vehicle_free.sqf @@ -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; diff --git a/SQF/dayz_code/actions/trade_any_vehicle_old.sqf b/SQF/dayz_code/actions/trade_any_vehicle_old.sqf index 3967cb87d..17fad7e71 100644 --- a/SQF/dayz_code/actions/trade_any_vehicle_old.sqf +++ b/SQF/dayz_code/actions/trade_any_vehicle_old.sqf @@ -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; diff --git a/SQF/dayz_code/actions/trade_backpacks.sqf b/SQF/dayz_code/actions/trade_backpacks.sqf index bc506001e..b04ba8e33 100644 --- a/SQF/dayz_code/actions/trade_backpacks.sqf +++ b/SQF/dayz_code/actions/trade_backpacks.sqf @@ -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; diff --git a/SQF/dayz_code/actions/trade_backpacks_old.sqf b/SQF/dayz_code/actions/trade_backpacks_old.sqf index a423e1d0b..f96649603 100644 --- a/SQF/dayz_code/actions/trade_backpacks_old.sqf +++ b/SQF/dayz_code/actions/trade_backpacks_old.sqf @@ -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; diff --git a/SQF/dayz_code/actions/trade_items.sqf b/SQF/dayz_code/actions/trade_items.sqf index 182512efd..0fb584eb3 100644 --- a/SQF/dayz_code/actions/trade_items.sqf +++ b/SQF/dayz_code/actions/trade_items.sqf @@ -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; diff --git a/SQF/dayz_code/actions/trade_items_old.sqf b/SQF/dayz_code/actions/trade_items_old.sqf index e4b3a3a22..c9bbbd5f8 100644 --- a/SQF/dayz_code/actions/trade_items_old.sqf +++ b/SQF/dayz_code/actions/trade_items_old.sqf @@ -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; diff --git a/SQF/dayz_code/actions/trade_items_wo_db.sqf b/SQF/dayz_code/actions/trade_items_wo_db.sqf index 3698c3226..68f61946b 100644 --- a/SQF/dayz_code/actions/trade_items_wo_db.sqf +++ b/SQF/dayz_code/actions/trade_items_wo_db.sqf @@ -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; diff --git a/SQF/dayz_code/actions/trade_weapons.sqf b/SQF/dayz_code/actions/trade_weapons.sqf index d3ca5ab57..da0f2e282 100644 --- a/SQF/dayz_code/actions/trade_weapons.sqf +++ b/SQF/dayz_code/actions/trade_weapons.sqf @@ -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; diff --git a/SQF/dayz_code/actions/trade_weapons_old.sqf b/SQF/dayz_code/actions/trade_weapons_old.sqf index da4b4d916..47c724ada 100644 --- a/SQF/dayz_code/actions/trade_weapons_old.sqf +++ b/SQF/dayz_code/actions/trade_weapons_old.sqf @@ -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; diff --git a/SQF/dayz_code/compile/player_lockVault.sqf b/SQF/dayz_code/compile/player_lockVault.sqf index e8b2b7e54..defa983c5 100644 --- a/SQF/dayz_code/compile/player_lockVault.sqf +++ b/SQF/dayz_code/compile/player_lockVault.sqf @@ -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; diff --git a/SQF/dayz_code/compile/player_packVault.sqf b/SQF/dayz_code/compile/player_packVault.sqf index 54fdd5407..f920ae8d0 100644 --- a/SQF/dayz_code/compile/player_packVault.sqf +++ b/SQF/dayz_code/compile/player_packVault.sqf @@ -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; diff --git a/SQF/dayz_code/compile/player_unlockDoor.sqf b/SQF/dayz_code/compile/player_unlockDoor.sqf index e68f608a1..215f19687 100644 --- a/SQF/dayz_code/compile/player_unlockDoor.sqf +++ b/SQF/dayz_code/compile/player_unlockDoor.sqf @@ -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; diff --git a/SQF/dayz_code/compile/player_unlockVault.sqf b/SQF/dayz_code/compile/player_unlockVault.sqf index ce8165928..dab4b3c26 100644 --- a/SQF/dayz_code/compile/player_unlockVault.sqf +++ b/SQF/dayz_code/compile/player_unlockVault.sqf @@ -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;