diff --git a/CHANGE LOG 1.0.6.1.txt b/CHANGE LOG 1.0.6.1.txt index daae3e25a..a32c46a19 100644 --- a/CHANGE LOG 1.0.6.1.txt +++ b/CHANGE LOG 1.0.6.1.txt @@ -27,6 +27,7 @@ [FIXED] It is no longer possible to autoRun under ponds on Chernarus. #1827 @schwanzkopfhegel [FIXED] Hive connection error after the first and only online player disconnects during the object stream at server start up. #1822 @AirwavesMan @ebayShopper [FIXED] Vanilla player_craftItem not exiting when action is already in progress. #1826 @schwanzkopfhegel +[FIXED] Fire barrel kit can be crafted with partially full matchboxes now. #1830 @AirwavesMan [NOTE] Updated server files were released with the four hotfixes below on December 11th, 2016 (http://dayzepoch.com/a2dayzepoch.php) [FIXED] Hive child 309 errors that resulted in broken saving of newly built storage object inventory. @icomrade diff --git a/SQF/dayz_code/actions/player_destroyTent.sqf b/SQF/dayz_code/actions/player_destroyTent.sqf index 41a283e36..57ab0358a 100644 --- a/SQF/dayz_code/actions/player_destroyTent.sqf +++ b/SQF/dayz_code/actions/player_destroyTent.sqf @@ -14,7 +14,7 @@ _matchArray = []; if (_x IN items player) then { _matchArray set [count _matchArray, _x]; }; -} count Dayz_Ignators; +} count DayZ_Ignitors; //Count how many fuelcans the player has incase they have more then one. { @@ -31,8 +31,8 @@ if ((count _matchArray == 0)) exitwith { systemChat (localize ("str_setFireMatch player playActionNow "Medic"; //Actionmenu tools -player removeAction s_player_destorytent; -s_player_destorytent = -1; +player removeAction s_player_destroytent; +s_player_destroytent = -1; //Make sure you can only destory once _alreadyDestorying = _obj getVariable["alreadyDestorying",0]; diff --git a/SQF/dayz_code/compile/fn_selfActions.sqf b/SQF/dayz_code/compile/fn_selfActions.sqf index a89a43bf5..8987c498c 100644 --- a/SQF/dayz_code/compile/fn_selfActions.sqf +++ b/SQF/dayz_code/compile/fn_selfActions.sqf @@ -451,16 +451,14 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur }; //other tents if (_istypeTent) then { - //destroy tents - //Located in variables Dayz_Ignators = ["ItemMatchbox","Item5Matchbox","Item4Matchbox","Item3Matchbox","Item2Matchbox","Item1Matchbox"]; - _hasIgnators = {_x in Dayz_Ignators} count _itemsPlayer > 0; + _hasIgnators = {_x in DayZ_Ignitors} count _itemsPlayer > 0; if ((_hasFuel20 or _hasFuel5 or _hasBarrel) && _hasIgnators) then { - if (s_player_destorytent < 0) then { - s_player_destorytent = player addAction [localize "str_actions_self_destorytent", "\z\addons\dayz_code\actions\player_destroyTent.sqf",_cursorTarget, 0, false, true]; + if (s_player_destroytent < 0) then { + s_player_destroytent = player addAction [localize "str_actions_self_destroytent", "\z\addons\dayz_code\actions\player_destroyTent.sqf",_cursorTarget, 0, false, true]; }; } else { - player removeAction s_player_destorytent; - s_player_destorytent = -1; + player removeAction s_player_destroytent; + s_player_destroytent = -1; }; if (_typeOfCursorTarget in ["IC_DomeTent","IC_Tent"]) then { if (s_player_packtentinfected < 0) then { @@ -1067,8 +1065,8 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur //Allow player to gather player removeAction s_player_gather; s_player_gather = -1; - player removeAction s_player_destorytent; - s_player_destorytent = -1; + player removeAction s_player_destroytent; + s_player_destroytent = -1; // player removeAction s_player_attach_bomb; // s_player_attach_bomb = -1; //debug diff --git a/SQF/dayz_code/init/compiles.sqf b/SQF/dayz_code/init/compiles.sqf index bb2127c50..b7d948e5b 100644 --- a/SQF/dayz_code/init/compiles.sqf +++ b/SQF/dayz_code/init/compiles.sqf @@ -777,7 +777,7 @@ dayz_inflame = { }; _hasTool = true; }; - } count Dayz_Ignators; + } count DayZ_Ignitors; if (_hasTool) then { _object inflame true; }; } else { // put out the fire @@ -798,7 +798,7 @@ dayz_inflame_showMenu = { if (!_islit) then { { if (_x in items player) exitWith { _hasTool = true; }; - } count Dayz_Ignators; + } count DayZ_Ignitors; }; _ret = (_whatIwant && !_islit && _hasTool) or (!_whatIwant && _isLit); @@ -841,7 +841,7 @@ dayz_inflame_other = { }; _hasTool = true; }; - } count Dayz_Ignators; + } count DayZ_Ignitors; if (_hasTool) then { _flame inflame true; }; } else { // put out the fire @@ -864,7 +864,7 @@ dayz_inflame_showMenu_other = { if (!_islit) then { { if (_x in items player) exitWith { _hasTool = true; }; - } count Dayz_Ignators; + } count DayZ_Ignitors; }; _ret = (_whatIwant && !_islit && _hasTool) or (!_whatIwant && _isLit); //systemChat str [_flame, _hasTool, _islit, _ret]; diff --git a/SQF/dayz_code/init/variables.sqf b/SQF/dayz_code/init/variables.sqf index e65b4b9af..6da514210 100644 --- a/SQF/dayz_code/init/variables.sqf +++ b/SQF/dayz_code/init/variables.sqf @@ -52,7 +52,7 @@ Dayz_attachment_array = ["Attachment_ACG","Attachment_AIM"]; //DayZ_cutter = ["Wire_cat1","Sandbag1_DZ","Fence_DZ","Generator_DZ","Hedgehog_DZ","CamoNet_DZ"] DayZ_Backpacks = ["DZ_Patrol_Pack_EP1","DZ_Assault_Pack_EP1","DZ_Czech_Vest_Pouch","DZ_ALICE_Pack_EP1","DZ_TK_Assault_Pack_EP1","DZ_British_ACU","DZ_CivilBackpack_EP1","DZ_Backpack_EP1","DZ_TerminalPack_EP1","DZ_CompactPack_EP1","DZ_GunBag_EP1","DZ_LargeGunBag_EP1"]; Dayz_Gutting = ["ItemKnife","ItemKnife5","ItemKnife4","ItemKnife3","ItemKnife2","ItemKnife1","ItemKnifeBlunt"]; -Dayz_Ignators = ["ItemMatchbox","Item5Matchbox","Item4Matchbox","Item3Matchbox","Item2Matchbox","Item1Matchbox"]; +DayZ_Ignitors = ["ItemMatchbox","Item5Matchbox","Item4Matchbox","Item3Matchbox","Item2Matchbox","Item1Matchbox"]; DayZ_fuelCans = ["ItemJerrycan","ItemFuelcan","ItemFuelBarrel"]; DayZ_fuelCansEmpty = ["ItemJerrycanEmpty","ItemFuelcanEmpty","ItemFuelBarrelEmpty"]; DayZ_traps = ["Trap_Cans","TrapTripwireFlare","TrapBearTrapSmoke","TrapTripwireGrenade","TrapTripwireSmoke","TrapBearTrapFlare"]; @@ -195,7 +195,7 @@ dayz_resetSelfActions = { s_player_fishing_veh = -1; s_player_gather = -1; s_player_debugCheck = -1; - s_player_destorytent = -1; + s_player_destroytent = -1; s_player_attach_bomb = -1; s_player_upgradestorage = -1; s_player_Drinkfromhands = -1; diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml index cfd668fb1..6a4920f6e 100644 --- a/SQF/dayz_code/stringtable.xml +++ b/SQF/dayz_code/stringtable.xml @@ -930,7 +930,7 @@ Humanité Menschlichkeit - + Destroy Tent Уничтожить палатку Destruye Tent