Merge branch 'master' of https://github.com/vbawol/DayZ-Epoch

SQF/dayz_code/Configs/CfgMagazines.hpp

@@ -1308,6 +1308,37 @@ 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_276";
+                                script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
+                                neednearby[] = {"fire"};
+                                requiretools[] = {"ItemToolbox","ItemHatchet"};
+                                output[] = {{"ItemFireBarrel_kit",1}};
+                                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
 	{

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
@@ -2935,6 +2950,7 @@ class CfgVehicles {
 		offset[] = {0,2.5,0};
 		displayName = "Light Pole";
 		vehicleClass = "Fortifications";
+		maintainBuilding[] = {{"ItemPole",1}};
 	};
 	class WoodGate_DZ: BuiltItems
 	{

SQF/dayz_epoch_b/stringtable.xml

@@ -4844,16 +4844,6 @@
 		  <French></French>
 		  <Czech></Czech>
 		</Key>
-		<Key ID="STR_EPOCH_PLAYER_232">
-		  <Original>Craft Wood Floor</Original>
-		  <English>Craft Wood Floor</English>
-		  <German></German>
-		  <Russian></Russian>
-		  <Spanish></Spanish>
-		  <Dutch>Creëer houten vloer</Dutch>
-		  <French></French>
-		  <Czech></Czech>
-		</Key>
 		<Key ID="STR_EPOCH_PLAYER_233">
 		  <Original>Craft Stair Supports</Original>
 		  <English>Craft Stair Supports</English>
@@ -5284,5 +5274,15 @@
 		  <French></French>
 		  <Czech></Czech>
 		</Key>
+		<Key ID="STR_EPOCH_PLAYER_276">
+                 <Original>Craft Fire Barrel</Original>
+                 <English>Craft Fire Barrel</English>
+                 <German></German>
+                 <Russian></Russian>
+                 <Spanish></Spanish>
+                 <Dutch></Dutch>
+                 <French></French>
+                 <Czech></Czech>
+                </Key>
 	</Package>
 </Project>

SQF/dayz_server/system/server_cleanup.fsm

@@ -1,4 +1,4 @@
-/*%FSM<COMPILE "D:\Programme\Bohemia Interactive\Tools\FSM Editor Personal Edition\scriptedFSM.cfg, DayZ Server Cleanup">*/
+/*%FSM<COMPILE "F:\Program Files (x86)\Bohemia Interactive\Tools\FSM Editor Personal Edition\scriptedFSM.cfg, DayZ Server Cleanup">*/
 /*%FSM<HEAD>*/
 /*
 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,""};
+item7[] = {"",7,210,-304.000000,220.999985,-296.000000,229.000015,0.000000,""};
-item8[] = {"",7,210,-341.500000,-154.000000,-333.500000,-146.000000,0.000000,""};
+item8[] = {"",7,210,-304.000000,-154.000000,-296.000000,-146.000000,0.000000,""};
-item9[] = {"",7,210,283.500031,-79.000000,291.500000,-71.000000,0.000000,""};
+item9[] = {"",7,210,221.000000,-79.000000,229.000000,-71.000000,0.000000,""};
-item10[] = {"",7,210,283.500031,146.000000,291.500000,154.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};
+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,1008,250,1528,250,1,693};
+window[] = {0,-1,-1,-1,-1,888,1810,3088,130,1,693};
 *//*%FSM</HEAD>*/
 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