From b699d2ee9ddfcf7e0ae7de9759f97979e6cbcd32 Mon Sep 17 00:00:00 2001 From: dayz10k Date: Thu, 14 Nov 2013 14:22:05 -0500 Subject: [PATCH 1/7] Update CfgMagazines.hpp fix the xx STR --- SQF/dayz_code/Configs/CfgMagazines.hpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/SQF/dayz_code/Configs/CfgMagazines.hpp b/SQF/dayz_code/Configs/CfgMagazines.hpp index 6caf3a1c9..da64d7ed3 100644 --- a/SQF/dayz_code/Configs/CfgMagazines.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines.hpp @@ -1308,6 +1308,16 @@ class CfgMagazines { displayName = "Fuel Barrel (Empty)"; picture = "\z\addons\dayz_epoch\pictures\equip_oildrum_e_CA.paa"; descriptionShort = "210 litres of fuel per barrel (Empty)"; + class ItemActions { + class Crafting + { + text = "$STR_EPOCH_PLAYER_2xx"; + script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; + neednearby[] = {"fire"}; + requiretools[] = {"ItemToolbox","ItemHatchet"}; + output[] = {{"ItemFireBarrel",1}}; + input[] = {{"ItemFuelBarrelEmpty",1},{"ItemJerryCan",1},{"PartWoodLumber",4}}; + }; }; class ItemJerrycan: CA_Magazine { From 64d1ad468ad311a766fb38535adb6ad5cd782104 Mon Sep 17 00:00:00 2001 From: dayz10k Date: Thu, 14 Nov 2013 14:25:19 -0500 Subject: [PATCH 2/7] Update stringtable.xml --- SQF/dayz_epoch_b/stringtable.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/SQF/dayz_epoch_b/stringtable.xml b/SQF/dayz_epoch_b/stringtable.xml index 9d29dfda8..e59f8b526 100644 --- a/SQF/dayz_epoch_b/stringtable.xml +++ b/SQF/dayz_epoch_b/stringtable.xml @@ -5284,5 +5284,15 @@ + + Craft Fire Barrel + Craft Fire Barrel + + + + + + + From 409c305e5992e240fb956193b4a0e73fe80b3e85 Mon Sep 17 00:00:00 2001 From: dayz10k Date: Thu, 14 Nov 2013 14:26:40 -0500 Subject: [PATCH 3/7] Update CfgMagazines.hpp --- SQF/dayz_code/Configs/CfgMagazines.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SQF/dayz_code/Configs/CfgMagazines.hpp b/SQF/dayz_code/Configs/CfgMagazines.hpp index da64d7ed3..22aac3ee4 100644 --- a/SQF/dayz_code/Configs/CfgMagazines.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines.hpp @@ -1311,11 +1311,11 @@ class CfgMagazines { class ItemActions { class Crafting { - text = "$STR_EPOCH_PLAYER_2xx"; + text = "$STR_EPOCH_PLAYER_276"; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {"fire"}; requiretools[] = {"ItemToolbox","ItemHatchet"}; - output[] = {{"ItemFireBarrel",1}}; + output[] = {{"ItemFireBarrel_kit",1}}; input[] = {{"ItemFuelBarrelEmpty",1},{"ItemJerryCan",1},{"PartWoodLumber",4}}; }; }; From 347a2d3d6e515e79836a7a498565e9145daa50d7 Mon Sep 17 00:00:00 2001 From: dayz10k Date: Thu, 14 Nov 2013 14:30:19 -0500 Subject: [PATCH 4/7] Update CfgMagazines.hpp --- SQF/dayz_code/Configs/CfgMagazines.hpp | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/SQF/dayz_code/Configs/CfgMagazines.hpp b/SQF/dayz_code/Configs/CfgMagazines.hpp index 22aac3ee4..74f30c898 100644 --- a/SQF/dayz_code/Configs/CfgMagazines.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines.hpp @@ -1319,6 +1319,27 @@ class CfgMagazines { input[] = {{"ItemFuelBarrelEmpty",1},{"ItemJerryCan",1},{"PartWoodLumber",4}}; }; }; + class ItemFireBarrel_kit: CA_Magazine + { + scope = 2; + count = 1; + type = 256; + displayName = "Fire Barrel Kit"; + descriptionShort = "Fire Barrel"; + model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; + weight = 25; + class ItemActions + { + class Build + { + text = "$STR_ACTIONS_BUILD"; + script = "spawn player_build;"; + require[] = {"ItemToolbox"}; + create = "FireBarrel_DZ"; + }; + }; + }; class ItemJerrycan: CA_Magazine { scope = 2; From 7b657419f8056e38cb9a4f5d1804c74b5e36e8ba Mon Sep 17 00:00:00 2001 From: dayz10k Date: Thu, 14 Nov 2013 15:04:09 -0500 Subject: [PATCH 5/7] Rest of FireBarrel kit and maintenance for lightpole #700, #699 --- SQF/dayz_code/Configs/cfgVehicles.hpp | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/SQF/dayz_code/Configs/cfgVehicles.hpp b/SQF/dayz_code/Configs/cfgVehicles.hpp index d1a4b9138..e6b9ea440 100644 --- a/SQF/dayz_code/Configs/cfgVehicles.hpp +++ b/SQF/dayz_code/Configs/cfgVehicles.hpp @@ -1926,7 +1926,22 @@ class CfgVehicles { }; }; }; - + class Land_Fire_barrel; + class FireBarrel_DZ: Land_Fire_barrel + { + scope = 2; + destrType = "DestructNo"; + cost = 100; + model = "\z\addons\dayz_epoch\models\oil_drum_model.p3d"; + icon = "\ca\data\data\Unknown_object.paa"; + offset[] = {0,1.5,0.5}; + mapSize = 2; + armor = 400; + displayName = "Fire Barrel"; + vehicleClass = "Fortifications"; + constructioncount = 3; + removeoutput[] = {{"ItemFuelBarrelEmpty",1}}; + }; // modular class MetalFloor_DZ: ModularItems @@ -2919,6 +2934,7 @@ class CfgVehicles { offset[] = {0,2.5,0}; displayName = "Light Pole"; vehicleClass = "Fortifications"; + maintainBuilding[] = {{"ItemPole",1}}; }; class WoodGate_DZ: BuiltItems { @@ -3198,4 +3214,4 @@ class CfgVehicles { }; -}; \ No newline at end of file +}; From 689ed396a1e7ee1191636bbc2b9846c667e2bc48 Mon Sep 17 00:00:00 2001 From: dayz10k Date: Thu, 14 Nov 2013 15:06:11 -0500 Subject: [PATCH 6/7] Removed dupe from #693 #693 --- SQF/dayz_epoch_b/stringtable.xml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/SQF/dayz_epoch_b/stringtable.xml b/SQF/dayz_epoch_b/stringtable.xml index 9d29dfda8..6cc76a940 100644 --- a/SQF/dayz_epoch_b/stringtable.xml +++ b/SQF/dayz_epoch_b/stringtable.xml @@ -4844,16 +4844,6 @@ - - Craft Wood Floor - Craft Wood Floor - - - - Creëer houten vloer - - - Craft Stair Supports Craft Stair Supports From fe9ccd3c2006d43a31ba0c32aa429f7573cbc17f Mon Sep 17 00:00:00 2001 From: Skaronator Date: Thu, 14 Nov 2013 21:23:56 +0100 Subject: [PATCH 7/7] Revert "Little sleep to fix Server Lags?" This reverts commit eabcae27b3b239d8c1448533d9fee1eb2c31f1f7. --- SQF/dayz_server/system/server_cleanup.fsm | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/SQF/dayz_server/system/server_cleanup.fsm b/SQF/dayz_server/system/server_cleanup.fsm index 5b824e59e..5e7305289 100644 --- a/SQF/dayz_server/system/server_cleanup.fsm +++ b/SQF/dayz_server/system/server_cleanup.fsm @@ -1,4 +1,4 @@ -/*%FSM*/ +/*%FSM*/ /*%FSM*/ /* item0[] = {"init",0,250,-75.000000,-400.000000,25.000000,-350.000000,0.000000,"init"}; @@ -8,10 +8,10 @@ item3[] = {"time_sync",4,218,-325.000000,-25.000000,-225.000000,25.000000,1.0000 item4[] = {"sync_the_time",2,250,-325.000000,50.000000,-225.000000,100.000000,0.000000,"sync" \n "the time"}; item5[] = {"true",8,218,-75.000000,125.000000,25.000000,175.000000,0.000000,"true"}; item6[] = {"general_cleanup",2,250,-75.000000,200.000000,25.000000,250.000000,0.000000,"general" \n "cleanup" \n "loop"}; -item7[] = {"",7,210,-341.500000,220.999985,-333.500000,229.000015,0.000000,""}; -item8[] = {"",7,210,-341.500000,-154.000000,-333.500000,-146.000000,0.000000,""}; -item9[] = {"",7,210,283.500031,-79.000000,291.500000,-71.000000,0.000000,""}; -item10[] = {"",7,210,283.500031,146.000000,291.500000,154.000000,0.000000,""}; +item7[] = {"",7,210,-304.000000,220.999985,-296.000000,229.000015,0.000000,""}; +item8[] = {"",7,210,-304.000000,-154.000000,-296.000000,-146.000000,0.000000,""}; +item9[] = {"",7,210,221.000000,-79.000000,229.000000,-71.000000,0.000000,""}; +item10[] = {"",7,210,221.000000,146.000000,229.000000,154.000000,0.000000,""}; item11[] = {"initialized",4,218,-75.000000,-325.000000,25.000000,-275.000000,0.000000,"initialized"}; item12[] = {"prepare",2,250,-75.000000,-250.000000,25.000000,-200.000000,0.000000,"prepare"}; item13[] = {"update_objects",2,250,175.000000,50.000000,275.000000,100.000000,0.000000,"update objects"}; @@ -48,8 +48,8 @@ link22[] = {17,18}; link23[] = {18,5}; link24[] = {19,20}; link25[] = {20,5}; -globals[] = {25.000000,1,0,0,0,640,480,1,33,6316128,1,-413.097137,179.503510,334.693787,-203.474945,675,613,1}; -window[] = {0,-1,-1,-1,-1,1008,250,1528,250,1,693}; +globals[] = {25.000000,1,0,0,0,640,480,1,33,6316128,1,-352.091705,309.781433,349.997772,-250.100601,675,612,1}; +window[] = {0,-1,-1,-1,-1,888,1810,3088,130,1,693}; *//*%FSM*/ class FSM { @@ -370,7 +370,6 @@ class FSM " _nearby = {(isPlayer _x) and (alive _x)} count (_x nearEntities [[""CAManBase"",""AllVehicles""], 130]);" \n " if ( (!_keep) && (_nearby==0) && (_age > 20)) then {" \n " deleteVehicle _x;" \n - " sleep 0.25;" \n " _delQty = _delQty + 1;" \n " };" \n " };" \n @@ -379,7 +378,6 @@ class FSM "{" \n " if (local _x) then {" \n " deleteVehicle _x;" \n - " sleep 0.25;" \n " _delQtyFP = _delQtyFP + 1;" \n " };" \n "} forEach _fireplaces;" \n