diff --git a/SQF/dayz_code/actions/boil.sqf b/SQF/dayz_code/actions/boil.sqf index 0b00b65f7..fcf8cf159 100644 --- a/SQF/dayz_code/actions/boil.sqf +++ b/SQF/dayz_code/actions/boil.sqf @@ -7,21 +7,13 @@ _bottletext = getText (configFile >> "CfgMagazines" >> "ItemWaterBottle" >> "dis _tin1text = getText (configFile >> "CfgMagazines" >> "TrashTinCan" >> "displayName"); _tin2text = getText (configFile >> "CfgMagazines" >> "ItemSodaEmpty" >> "displayName"); _tintext = format["%1 / %2",_tin1text,_tin2text]; -//_hasbottleitem = (("ItemWaterBottle" in magazines player) || {"ItemWaterBottleInfected" in magazines player} || {"ItemWaterBottleSafe" in magazines player}); _qty = {_x in ["ItemWaterBottleInfected","ItemWaterBottle","ItemWaterBottleSafe","ItemWaterbottle1oz","ItemWaterbottle2oz","ItemWaterbottle3oz","ItemWaterbottle4oz","ItemWaterbottle5oz","ItemWaterbottle6oz","ItemWaterbottle7oz","ItemWaterbottle8oz","ItemWaterbottle9oz"]} count magazines player; a_player_boil = true; player removeAction s_player_boil; //s_player_boil = -1; -//_bottleInfected = ("ItemWaterBottleInfected" in magazines player); - /* //canteens are metal, we only use canteens in Epoch -_hastinitem = false; - -{ - if (_x in magazines player) exitWith {_hastinitem = true;}; -} count boil_tin_cans; - +_hastinitem = {_x in magazines player} count boil_tin_cans > 0; if (!_hastinitem) exitWith {format[localize "str_player_31",_tintext,localize "str_player_31_fill"] call dayz_rollingMessages; a_player_boil = false; dayz_actionInProgress = false;}; */ if (_qty > 0) then { @@ -41,7 +33,7 @@ if (_qty > 0) then { _WB2Add = "ItemWaterBottleBoiled"; switch (true) do { case ("ItemWaterBottleInfected" in magazines player): { player removeMagazine "ItemWaterBottleInfected"; }; - case ("ItemWaterBottleSafe" in magazines player): { player removeMagazine "ItemWaterBottleSafe"; }; + case ("ItemWaterBottleSafe" in magazines player): { player removeMagazine "ItemWaterBottleSafe"; }; case ("ItemWaterBottle" in magazines player): { player removeMagazine "ItemWaterBottle"; }; case ("ItemWaterbottle1oz" in magazines player): { player removeMagazine "ItemWaterbottle1oz"; _WB2Add = "ItemWaterbottle1ozBoiled"; }; case ("ItemWaterbottle2oz" in magazines player): { player removeMagazine "ItemWaterbottle2oz"; _WB2Add = "ItemWaterbottle2ozBoiled"; }; @@ -55,7 +47,6 @@ if (_qty > 0) then { }; if (dayz_waterBottleBreaking && {[0.1] call fn_chance}) then { player addMagazine "ItemWaterBottleDmg"; - //systemChat (localize ("str_waterbottle_broke")); localize "str_waterbottle_broke" call dayz_rollingMessages; } else { player addMagazine _WB2Add; @@ -63,7 +54,6 @@ if (_qty > 0) then { }; format [localize "str_player_boiledwater",_qty] call dayz_rollingMessages; } else { - //localize "str_player_02" call dayz_rollingMessages; format[localize "str_player_31",_bottletext,localize "str_player_31_fill"] call dayz_rollingMessages; }; diff --git a/SQF/dayz_code/actions/player_chopWood.sqf b/SQF/dayz_code/actions/player_chopWood.sqf index 621f629b7..8a454f6e8 100644 --- a/SQF/dayz_code/actions/player_chopWood.sqf +++ b/SQF/dayz_code/actions/player_chopWood.sqf @@ -34,16 +34,14 @@ if (!isNull _tree) then { //play action _finished = ["Medic",1] call fn_loopAction; - - // Working-Factor for chopping wood. - ["Working",0,[50,10,5,0]] call dayz_NutritionSystem; if(!_finished) exitWith { _isOk = false; _proceed = false; }; - if(_finished) then { + if (_finished) then { + ["Working",0,[50,10,5,0]] call dayz_NutritionSystem; _breaking = false; if (dayz_toolBreaking && {[0.09] call fn_chance}) then { _breaking = true; diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml index f9657d9ff..3ed75b665 100644 --- a/SQF/dayz_code/stringtable.xml +++ b/SQF/dayz_code/stringtable.xml @@ -2363,7 +2363,7 @@ Rusty Sheet Metal Rostige Metallplatte - Ржавый лист металла. + Ржавый лист металла Lámina de Metal Plaque de métal rouillée Zrezlý plech