[Core] #1662 Initiate beta branch from master

Correct output for deconstruction round bagfence

CHANGE LOG 1.0.5.2.txt

@@ -1,13 +1,16 @@
 [NEW] RedRyder BB Gun by @arma2WillRobinson
-[NEW] DB Backup script. @raziel23x
+[NEW] DB Backup script. @RimBlock
 [NEW] Use DayZ_UseSteamID = false; in your init.sqf to use the old PlayerUID, instead of SteamID @icomrade
 [NEW] UI Update - Graphical and code changes, enable using Dayz_Dark_UI = true; in init.sqf. @hogscraper http://epochmod.com/forum/index.php?/topic/13654-proposed-ui-change/
 [NOTE] It's recommend to convert to the new SteamID system if possible, new servers should not use DayZ_UseSteamID = false;
-[NEW] Snap building (disabled by default), use DZE_snapBuilding = true; in your init.sqf to enable. @raymix
+[NEW] Snap building (disabled by default), use DZE_modularBuild = true; in your init.sqf to enable. @raymix
+[NEW] Modular/Function based player_build for addon makers and modders. @raymix (more info and concepts - http://epochmod.com/forum/index.php?/topic/14628-modular-function-based-player-buildsqf/ )
+[NEW] Added "RedRyder" and "350Rnd_BB_Magazine" to loot pile. #1456 #1457 @Namindu
 
 [CHANGED] An infection chance of -1 disables self-transfusion infection. 0 is always infected. (DZE_selfTransfuse_Values) @icomrade
 [CHANGED] Removed weapons from Traders hands and made them stand with arms by their side. @SilvDev
-[CHANGED] Tweaked fuel capacity variables for vehicles. @raziel23x
+[CHANGED] Tweaked fuel capacity variables for vehicles. @RimBlock
+[CHANGED] Tweaked rotate_logs.bat to incorporate the day of the week for better organization @Raziel23x 
 
 [FIXED] Backpack wipes when changing clothes. #1361 @icomrade
 [FIXED] CH53 gear when locked #1364 @icomrade
@@ -19,9 +22,19 @@
 [FIXED] Fire cleanup diag_log error in server_functions.sqf #1421 @ebaydayz
 [FIXED] NearestObjects position error in server_playerSync.sqf #1425 @ebaydayz
 [FIXED] Corrected ClassName type for CH53_DZE and BAF_Merlin_DZE. @Cinjun
+[FIXED] Some counts reverted to forEach - count loops can not be nested inside other count loops #1491-#1495 @ebaydayz
+[FIXED] Safes empty when opening after restart #1467 @ebaydayz
+[FIXED] Dynamic_vehicle spawning non-upgradable classes of hilux1 & datsun1.  @Uro1
+[FIXED] Eating while inside a vehicle did not drop empty can  @deadeye2
+[FIXED] Zombie loot error when using loot tables in mission file  @deadeye2
+[FIXED] Trader menu expected array error #1618-1620 @ebaydayz
+[FIXED] Loading screen issue where you can walk around and see a black screen #1610 @deanreid
 
 [UPDATED] .hpp files updated in dayz_epoch_b CfgLootPos > CfgBuildingPos. @Uro1
 [UPDATED] .bat files updated in Config-Examples @Raziel23x
+[UPDATED] Updated all config.cfg in Config-Examples, Added Default Steam Ports and Updated Layout. @Namindu
+[UPDATED] Epoch.sql, 1.0.5_Updates.sql & CfgServerTraders with correct classnames for upgradable hilux1 & datsun1 versions. @Uro1
+[UPDATED] mission.sqm to compact format from DayZ Mod 1.8.3 @ebaydayz
 
 [INFO] (EXTREMELY IMPORTANT) Server owners MUST update their required build and beta to 125548
 [INFO] Server admins should add requiredSecureId = 2; to their server.cfg to prevent uid spoofing.

README.md

@@ -1,6 +1,8 @@
 **DayZ Epoch**
 ================
 
+## This is the experimental beta branch
+
 Experimental DayZ mod 
 
 http://dayzepoch.com

SQF/dayz_code/Configs/CfgExtra/snappoints.hpp

@@ -123,7 +123,7 @@ class SnapBuilding {
 			"CinderWallDoorSmall_DZ",
 			"MetalFloor_DZ"
 		};
-		radius = 5;
+		radius = 7;
 	};
 	
 	class WoodFloorQuarter_Preview_DZ: FloorsWallsStairs { //fix for broken offsets in ghost
@@ -246,7 +246,7 @@ class SnapBuilding {
 		{2.752, 0, 1.5,"Right"},
 		{0, 0, 3.37042,"Top"}
 		};
-		radius = 5;
+		radius = 10;
 	};
 	class CinderWall_Preview_DZ: Cinder_DZE {};
 	class CinderWallDoorway_Preview_DZ: Cinder_DZE {};
@@ -283,7 +283,7 @@ class SnapBuilding {
 		{-2.64, 0, 0.009,"Left"},
 		{2.64, 0, 0.009,"Right"}
 		};
-		radius = 10;
+		radius = 12;
 	};
 	class MetalFloor_DZ: FloorsWallsStairs{
 		points[] = {
@@ -293,7 +293,7 @@ class SnapBuilding {
 		{-2.64, 0, 0.15,"Left"},
 		{2.64, 0, 0.15,"Right"}
 		};
-		radius = 10;
+		radius = 12;
 	};
 	
 	
@@ -340,7 +340,7 @@ class SnapBuilding {
 		snapTo[] = {
 			"StickFence_DZ"
 		};
-		radius = 5;
+		radius = 10;
 		points[] = {
 		{0,0,0,"Pivot"},
 		{-2.95,0,0.3,"Left"},
@@ -352,7 +352,7 @@ class SnapBuilding {
 		snapTo[] = {
 			"Fence_corrugated_DZ"
 		};
-		radius = 5;
+		radius = 10;
 		points[] = {
 		{0,0,0,"Pivot"},
 		{-1.95,0,0.88,"Left"},
@@ -364,7 +364,7 @@ class SnapBuilding {
 		snapTo[] = {
 			"WoodRamp_DZ"
 		};
-		radius = 5;
+		radius = 7;
 		points[] = {
 		{0,0,0,"Pivot"},
 		{0.65,-1.7,1.2,"Back"},

SQF/dayz_code/Configs/CfgLoot/CfgLoot.hpp

@@ -26,6 +26,8 @@ class CfgLoot {
 		,{"FoodBioMeat",0.01}
 		,{"8Rnd_9x18_MakarovSD",0.01}
 		,{"ItemDocument",0.03}
+		,{"RedRyder",0.06}
+		,{"350Rnd_BB_Magazine",0.07}
 	};
 	office2[] = {
 		{"FoodCanUnlabeled",0.07}
@@ -47,6 +49,7 @@ class CfgLoot {
 		,{"8Rnd_9x18_MakarovSD",0.01}
 		,{"ItemBriefcaseEmpty",0.01}
 		,{"ItemDocument",0.02}
+		,{"350Rnd_BB_Magazine",0.09}
 	};
 	food[] = {
 		{"TrashTinCan",0.09}
@@ -84,6 +87,7 @@ class CfgLoot {
 		,{"8Rnd_9x18_Makarov",0.08}
 		,{"15Rnd_W1866_Slug",0.02}
 		,{"WoodenArrow",0.04}
+		,{"350Rnd_BB_Magazine",0.05}
 		,{"HandRoadFlare",0.07}
 		,{"ItemPainkiller",0.02}
 		,{"HandChemGreen",0.01}
@@ -115,12 +119,14 @@ class CfgLoot {
 		,{"8Rnd_9x18_Makarov",0.09}
 		,{"15Rnd_W1866_Slug",0.02}
 		,{"WoodenArrow",0.04}
+		,{"350Rnd_BB_Magazine",0.05}
 		,{"HandRoadFlare",0.07}
 		,{"ItemPainkiller",0.02}
 		,{"HandChemGreen",0.01}
 		,{"HandChemBlue",0.03}
 		,{"HandChemRed",0.03}
 		,{"ItemHeatPack",0.04}
+		,{"350Rnd_BB_Magazine",0.09}
 	};
 	medical[] = {
 		{"ItemBandage",0.4}
@@ -247,11 +253,14 @@ class CfgLoot {
 		,{"10x_303",0.1}
 		,{"ItemWaterbottleUnfilled",0.05}
 		,{"WoodenArrow",0.2}
+		,{"350Rnd_BB_Magazine",0.05}
 		,{"ItemHeatPack",0.02}
 		,{"FoodMRE",0.01}
 		,{"FoodNutmix",0.02}
 		,{"ItemDocument",0.01}
 		,{"ItemMixOil",0.01}
+		,{"RedRyder",0.06}
+		,{"350Rnd_BB_Magazine",0.09}
 	};
 	worker[] = {
 		{"FoodCanUnlabeled",0.09}
@@ -369,6 +378,7 @@ class CfgLoot {
 		,{"Saiga12K",0.13}
 		,{"Remington870_lamp",0.1}
 		,{"Crossbow_DZ",0.07}
+		,{"RedRyder",0.06}
 		,{"M1014",0.05}
 	};
 	farmweapons[] = {
@@ -378,8 +388,10 @@ class CfgLoot {
 		,{"Saiga12K",0.13}
 		,{"Remington870_lamp",0.1}
 		,{"Crossbow_DZ",0.07}
+		,{"RedRyder",0.06}
 		,{"huntingrifle",0.05}
 		,{"Chainsaw",0.01}
+		,{"RedRyder",0.06}
 	};
 	sniperrifles[] = {
 		{"AK_107_PSO",0.1}

SQF/dayz_code/Configs/CfgMagazines.hpp

@@ -1666,6 +1666,8 @@ class CfgMagazines {
 
 	#include "CfgMagazines\MeleeSwing.hpp"
 
+	#include "CfgMagazines\Planting.hpp"
+
 	class HandGrenade_Stone;
 	class ItemTrashToiletpaper : HandGrenade_Stone {
 		scope = public;
@@ -1707,6 +1709,15 @@ class CfgMagazines {
 				output[] = {{"ItemCanvas",1}};
 				input[] = {{"ItemKiloHemp",1}};
 			};
+			class Crafting1
+			{
+				text = "Craft Hemp Seeds";
+				script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
+				neednearby[] = {""};
+				requiretools[] = {"ItemKnife"};
+				output[] = {{"ItemHempSeed",5}};
+				input[] = {{"ItemKiloHemp",1}};
+			};
 		};
 	};
 };

SQF/dayz_code/Configs/CfgMagazines/Ammo.hpp

@@ -28,7 +28,9 @@ class 100Rnd_762x51_M240 : CA_Magazine {
 	model = "\ca\CommunityConfigurationProject_E\Gameplay_ActualModelsOfWeaponMagazinesVisibleOnTheGround\p3d\100Rnd_762x51_M240.p3d";
 };
 class 200Rnd_762x51_M240 : 100Rnd_762x51_M240 {
+	displayName = "200Rnd. M240";
 	count = 200;
+	descriptionShort = "Caliber: 7.62x51mm NATO <br/>Rounds: 200 <br/>Used in: M240, Mk 48 Mod 0";
 };
 class 200Rnd_556x45_M249 : CA_Magazine {
 	scope = 2;

SQF/dayz_code/Configs/CfgMagazines/DZE/Food.hpp

@@ -64,6 +64,18 @@ class FoodPumpkin : FoodEdible {
 	weight = 1;
 	model = "z\addons\dayz_communityassets\models\pistachio.p3d"; // TODO: model + icon
 	picture = "\z\addons\dayz_communityassets\pictures\equip_pistachios_CA.paa";
+	class ItemActions
+	{
+		class Crafting
+		{
+		text = "Craft Pumpkin Seeds";
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
+			neednearby[] = {""};
+			requiretools[] = {"ItemKnife"};
+			output[] = {{"ItemPumpkinSeed",5}};
+			input[] = {{"FoodPumpkin",1}};
+		};
+	};
 };
 class FoodSunFlowerSeed : FoodEdible {
 	scope = public;

SQF/dayz_code/Configs/CfgMagazines/Planting.hpp

@@ -0,0 +1,92 @@
+class ItemFertilizer: CA_Magazine {
+	scope = public;
+	count = 1;
+	displayName = "Fertilizer";
+	descriptionShort = "Fertilizer";
+	weight = 0.1;
+	model = "z\addons\dayz_communityassets\models\mre.p3d";	// TODO: model + icon
+	picture = "\z\addons\dayz_communityassets\pictures\equip_mre_CA.paa";
+	type = 256;
+};
+
+class ItemPumpkinSeed: CA_Magazine {
+	scope = public;
+	count = 1;
+	displayName = "A Pumpkin Seed";
+	descriptionShort = "A Pumpkin Seed";
+	weight = 0.1;
+	model = "\z\addons\dayz_epoch\models\doc_child1.p3d";	// TODO: model + icon
+	picture = "\z\addons\dayz_epoch\pictures\equip_child1_ca.paa";
+	type = 256;
+	class ItemActions {
+		class Crafting
+		{
+			text = "Craft Pumpkin Plant";
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
+			neednearby[] = {""};
+			requiretools[] = {"ItemKnife"};
+			output[] = {{"ItemPumpkinPlant",1},{"ItemWaterbottleUnfilled",1}};
+			input[] = {{"ItemPumpkinSeed",1},{"ItemFertilizer",1},{"ItemWaterbottle",1}};
+		};
+	};
+};
+
+class ItemPumpkinPlant: CA_Magazine {
+	scope = public;
+	count = 1;
+	displayName = "A Pumpkin Plant";
+	descriptionShort = "A Pumpkin Plant";
+	weight = 0.1;
+	model = "\z\addons\dayz_epoch\models\doc_child1.p3d";	// TODO: model + icon
+	picture = "\z\addons\dayz_epoch\pictures\equip_child1_ca.paa";
+	type = 256;
+	class ItemActions {
+		class Build {
+			text = "Plant Pumpkin";
+			script = "spawn player_build;";
+			require[] = {"ItemEtool"};
+			create = "Grave";			// TODO: model for Pumpkin Stage 1
+		};
+	};
+};
+
+class ItemHempSeed: CA_Magazine {
+	scope = public;
+	count = 1;
+	displayName = "A Hemp Seed";
+	descriptionShort = "A Hemp Seed";
+	weight = 0.1;
+	model = "\z\addons\dayz_epoch\models\doc_child2.p3d";	// TODO: model + icon
+	picture = "\z\addons\dayz_epoch\pictures\equip_child2_ca.paa";
+	type = 256;
+	class ItemActions {
+		class Crafting
+		{
+			text = "Craft Hemp Plant";
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
+			neednearby[] = {""};
+			requiretools[] = {"ItemKnife"};
+			output[] = {{"ItemHempPlant",1},{"ItemWaterbottleUnfilled",1}};
+			input[] = {{"ItemHempSeed",1},{"ItemFertilizer",1},{"ItemWaterbottle",1}};
+		};
+	};
+};
+
+class ItemHempPlant: CA_Magazine {
+	scope = public;
+	count = 1;
+	displayName = "A Hemp Plant";
+	descriptionShort = "A Hemp Plant";
+	weight = 0.1;
+	model = "\z\addons\dayz_epoch\models\doc_child2.p3d";	// TODO: model + icon
+	picture = "\z\addons\dayz_epoch\pictures\equip_child2_ca.paa";
+	type = 256;
+	class ItemActions {
+		class Build {
+			text = "Plant Hemp";
+			script = "spawn player_build;";
+			require[] = {"ItemEtool"};
+			create = "MAP_c_fern";			// TODO: model for Hemp Stage 1
+		};
+	};
+};

SQF/dayz_code/Configs/CfgVehicles/AIR/AH6.hpp

@@ -42,7 +42,7 @@ class AH6J_EP1_DZE: AH6J_EP1_DZ
 	scope = 2;
 	side = 2;
 	displayName = "AH6J_DZE";
-	magazines[] = {};
+	magazines[] = {"60Rnd_CMFlareMagazine"};
 };
 class AH6X_DZ: AH6_Base_EP1 {
 	displayname = "AH6X Little Bird";

SQF/dayz_code/Configs/CfgVehicles/AIR/AN2.hpp

@@ -8,7 +8,6 @@ class AN2_DZ: An2_Base_EP1
 	side = 2;
 	crew = "";
 	typicalCargo[] = {};
-	hiddenSelections[] = {};
 	class TransportMagazines{};
 	class TransportWeapons{};
 	weapons[] = {};

SQF/dayz_code/Configs/CfgVehicles/AIR/Mi17.hpp

@@ -17,7 +17,6 @@ class Mi17_DZ: Mi17_base	 {
 	side = 2;
 	crew = "";
 	typicalCargo[] = {};
-	hiddenSelections[] = {};
 	class TransportMagazines{};
 	class TransportWeapons{};
 	commanderCanSee = 2+16+32;

SQF/dayz_code/Configs/CfgVehicles/AIR/UH1.hpp

@@ -17,7 +17,6 @@ class UH1Y_DZ: UH1_Base {
 	side = 2;
 	crew = "";
 	typicalCargo[] = {};
-	hiddenSelections[] = {};
 	class TransportMagazines{};
 	class TransportWeapons{};
 	commanderCanSee = 2+16+32;
@@ -65,7 +64,6 @@ class UH1H_DZ: UH1H_base {
 	side = 2;
 	crew = "";
 	typicalCargo[] = {};
-	hiddenSelections[] = {};
 	class TransportMagazines{};
 	class TransportWeapons{};
 	commanderCanSee = 2+16+32;

SQF/dayz_code/Configs/CfgVehicles/LAND/Lada.hpp

@@ -592,7 +592,7 @@ class Lada2_DZE2: Lada2_DZE1 {
 	};
 
 	class Upgrades {
-		ItemLRK[] = {"Lada1_DZE3",{},{{"ItemLRK",1},{"PartGeneric",1},{"ItemTent",1}}};
+		ItemLRK[] = {"Lada2_DZE3",{},{{"ItemLRK",1},{"PartGeneric",1},{"ItemTent",1}}};
 	};
 };
 class LadaLM_DZE2: LadaLM_DZE1 {
@@ -639,7 +639,7 @@ class LadaLM_DZE2: LadaLM_DZE1 {
 	};
 
 	class Upgrades {
-		ItemLRK[] = {"Lada1_DZE3",{},{{"ItemLRK",1},{"PartGeneric",1},{"ItemTent",1}}};
+		ItemLRK[] = {"LadaLM_DZE3",{},{{"ItemLRK",1},{"PartGeneric",1},{"ItemTent",1}}};
 	};
 };
 class Lada1_TK_CIV_EP1_DZE2: Lada1_TK_CIV_EP1_DZE1 {
@@ -686,7 +686,7 @@ class Lada1_TK_CIV_EP1_DZE2: Lada1_TK_CIV_EP1_DZE1 {
 	};
 
 	class Upgrades {
-		ItemLRK[] = {"Lada1_DZE3",{},{{"ItemLRK",1},{"PartGeneric",1},{"ItemTent",1}}};
+		ItemLRK[] = {"Lada1_TK_CIV_EP1_DZE3",{},{{"ItemLRK",1},{"PartGeneric",1},{"ItemTent",1}}};
 	};
 };
 class Lada2_TK_CIV_EP1_DZE2: Lada2_TK_CIV_EP1_DZE1 {
@@ -733,7 +733,7 @@ class Lada2_TK_CIV_EP1_DZE2: Lada2_TK_CIV_EP1_DZE1 {
 	};
 
 	class Upgrades {
-		ItemLRK[] = {"Lada1_DZE3",{},{{"ItemLRK",1},{"PartGeneric",1},{"ItemTent",1}}};
+		ItemLRK[] = {"Lada2_TK_CIV_EP1_DZE3",{},{{"ItemLRK",1},{"PartGeneric",1},{"ItemTent",1}}};
 	};
 };
 

SQF/dayz_code/Configs/CfgVehicles/LAND/Offroad_DSHKM.hpp

@@ -333,17 +333,95 @@ class Offroad_DSHKM_Gue_DZE: Offroad_DSHKM_base
 			gunnerCompartments = "Compartment2";
 		};
 	};
+	class Upgrades
+	{
+		ItemORP[] = {"Offroad_DSHKM_Gue_DZE1",
+		{  },
+		{ 
+			{ "ItemORP",1 },
+			{ "PartEngine",2 } }};
+	};
 };
 
 // Performance 1
 class Offroad_DSHKM_Gue_DZE1: Offroad_DSHKM_Gue_DZE
 {
 	maxspeed = 170; // Offroad_DSHKM_base 150 | car 100
+	class Upgrades
+	{
+		ItemLRK[] = {"Offroad_DSHKM_Gue_DZE2",
+		{  },
+		{ 
+			{ "ItemLRK",1 },
+			{ "PartGeneric",2 },
+			{ "ItemTent",1 } }};
+	};
 };
 // Armmor 2
 class Offroad_DSHKM_Gue_DZE2: Offroad_DSHKM_Gue_DZE1
 {
 	armor = 50; // car 20
+	class HitPoints: HitPoints
+	{
+		class HitLFWheel: HitLFWheel
+		{
+			armor = 0.3;
+		};
+		class HitLBWheel: HitLBWheel
+		{
+			armor = 0.3;
+		};
+		class HitRFWheel: HitRFWheel
+		{
+			armor = 0.3;
+		};
+		class HitRBWheel: HitRBWheel
+		{
+			armor = 0.3;
+		};
+		class HitFuel
+		{
+			armor = 0.28;
+			material = -1;
+			name = "palivo";
+			visual = "";
+			passThrough = 1;
+		};
+		class HitEngine
+		{
+			armor = 1;
+			material = -1;
+			name = "motor";
+			visual = "";
+			passThrough = 1;
+		};
+		class HitGlass1: HitGlass1
+		{
+			armor = 0.1;
+		};
+		class HitGlass2: HitGlass2
+		{
+			armor = 0.1;
+		};
+		class HitGlass3: HitGlass3
+		{
+			armor = 0.1;
+		};
+		class HitGlass4: HitGlass4
+		{
+			armor = 0.1;
+		};
+	};
+	class Upgrades
+	{
+		ItemLRK[] = {"Offroad_DSHKM_Gue_DZE3",
+		{  },
+		{ 
+			{ "ItemLRK",1 },
+			{ "PartGeneric",2 },
+			{ "ItemTent",1 } }};
+	};
+
 };
 // Cargo 3
 class Offroad_DSHKM_Gue_DZE3: Offroad_DSHKM_Gue_DZE2
@@ -351,7 +429,16 @@ class Offroad_DSHKM_Gue_DZE3: Offroad_DSHKM_Gue_DZE2
 	transportMaxWeapons = 20;  // car 10
 	transportMaxMagazines = 100; // car 50 
         transportmaxbackpacks = 4; // car 2
+        class Upgrades
+	{
+		ItemTNK[] = {"Offroad_DSHKM_Gue_DZE4",
+		{  },
+		{ 
+			{ "ItemTNK",1 },
+			{ "PartFueltank",2 } }};
+	};
 };
+
 // Fuel 4
 class Offroad_DSHKM_Gue_DZE4: Offroad_DSHKM_Gue_DZE3
 {

SQF/dayz_code/Configs/CfgVehicles/LAND/UAZ.hpp

@@ -219,7 +219,8 @@ class UAZ_Unarmed_TK_CIV_EP1_DZE1: UAZ_Unarmed_TK_CIV_EP1 {
 
 // Armor 2
 class UAZ_CDF_DZE2: UAZ_CDF_DZE1 {
-	armor = 50; // car 20
+	armor = 100; // UAZ 40
+	damageResistance = 0.02099;
 	class HitPoints: HitPoints {
 		class HitLFWheel: HitLFWheel {
 			armor = 0.3;
@@ -266,7 +267,8 @@ class UAZ_CDF_DZE2: UAZ_CDF_DZE1 {
 	};
 };
 class UAZ_INS_DZE2: UAZ_INS_DZE1 {
-	armor = 50; // car 20
+	armor = 100; // UAZ 40
+	damageResistance = 0.02099;
 	class HitPoints: HitPoints {
 		class HitLFWheel: HitLFWheel {
 			armor = 0.3;
@@ -313,7 +315,8 @@ class UAZ_INS_DZE2: UAZ_INS_DZE1 {
 	};
 };
 class UAZ_RU_DZE2: UAZ_RU_DZE1 {
-	armor = 50; // car 20
+	armor = 100; // UAZ 40
+	damageResistance = 0.02099;
 	class HitPoints: HitPoints {
 		class HitLFWheel: HitLFWheel {
 			armor = 0.3;
@@ -360,7 +363,8 @@ class UAZ_RU_DZE2: UAZ_RU_DZE1 {
 	};
 };
 class UAZ_Unarmed_TK_EP1_DZE2: UAZ_Unarmed_TK_EP1_DZE1 {
-	armor = 50; // car 20
+	armor = 100; // UAZ 40
+	damageResistance = 0.02099;
 	class HitPoints: HitPoints {
 		class HitLFWheel: HitLFWheel {
 			armor = 0.3;
@@ -407,7 +411,8 @@ class UAZ_Unarmed_TK_EP1_DZE2: UAZ_Unarmed_TK_EP1_DZE1 {
 	};
 };
 class UAZ_Unarmed_UN_EP1_DZE2: UAZ_Unarmed_UN_EP1_DZE1 {
-	armor = 50; // car 20
+	armor = 100; // UAZ 40
+	damageResistance = 0.02099;
 	class HitPoints: HitPoints {
 		class HitLFWheel: HitLFWheel {
 			armor = 0.3;
@@ -454,7 +459,8 @@ class UAZ_Unarmed_UN_EP1_DZE2: UAZ_Unarmed_UN_EP1_DZE1 {
 	};
 };
 class UAZ_Unarmed_TK_CIV_EP1_DZE2: UAZ_Unarmed_TK_CIV_EP1_DZE1 {
-	armor = 50; // car 20
+	armor = 100; // UAZ 40
+	damageResistance = 0.02099;
 	class HitPoints: HitPoints {
 		class HitLFWheel: HitLFWheel {
 			armor = 0.3;

SQF/dayz_code/Configs/CfgVehicles/LAND/Volha.hpp

@@ -281,6 +281,7 @@ class Volha_2_TK_CIV_EP1_DZE1: Volha_2_TK_CIV_EP1 {
 // Armor 2
 class VolhaLimo_TK_CIV_EP1_DZE2: VolhaLimo_TK_CIV_EP1_DZE1 {
 	armor = 50; // car 20
+	damageResistance = 0.02099;
 	class HitPoints: HitPoints {
 		class HitLFWheel: HitLFWheel {
 			armor = 0.3;
@@ -328,6 +329,7 @@ class VolhaLimo_TK_CIV_EP1_DZE2: VolhaLimo_TK_CIV_EP1_DZE1 {
 };
 class Volha_1_TK_CIV_EP1_DZE2: Volha_1_TK_CIV_EP1_DZE1 {
 	armor = 50; // car 20
+	damageResistance = 0.02099;
 	class HitPoints: HitPoints {
 		class HitLFWheel: HitLFWheel {
 			armor = 0.3;
@@ -375,6 +377,7 @@ class Volha_1_TK_CIV_EP1_DZE2: Volha_1_TK_CIV_EP1_DZE1 {
 };
 class Volha_2_TK_CIV_EP1_DZE2: Volha_2_TK_CIV_EP1_DZE1 {
 	armor = 50; // car 20
+	damageResistance = 0.02099;
 	class HitPoints: HitPoints {
 		class HitLFWheel: HitLFWheel {
 			armor = 0.3;

SQF/dayz_code/Configs/CfgWeapons.hpp

@@ -279,5 +279,6 @@ class CfgWeapons {
 	#include "CfgWeapons\Weapon\LMG\M249_EP1.hpp"
 	#include "CfgWeapons\Weapon\LMG\M249_m145_EP1.hpp"
 	#include "CfgWeapons\Weapon\LMG\M60A4.hpp"
-//	#include "CfgWeapons\Weapon\Rifle\FN_FAL_ANPVS4_DZE.hpp"
+	#include "CfgWeapons\Weapon\LMG\BAF_L110A1_Aim.hpp"
+	#include "CfgWeapons\Weapon\Rifle\FN_FAL_ANPVS4_DZE.hpp"
 };

SQF/dayz_code/Configs/CfgWeapons/Weapon/LMG/BAF_L110A1_Aim.hpp

@@ -0,0 +1,4 @@
+class BAF_L110A1_Aim;
+class BAF_L110A1_Aim_DZE:BAF_L110A1_Aim {
+  type = "1";
+};

SQF/dayz_code/Configs/CfgWeapons/Weapon/Rifle/FN_FAL_ANPVS4_DZE.hpp

@@ -1,3 +1,4 @@
+class FN_FAL_ANPVS4;
 class FN_FAL_ANPVS4_DZE:FN_FAL_ANPVS4 {
-  visionMode[] = {"Normal", NVG};
+  visionMode[] = {"Normal", "NVG"};
 };

SQF/dayz_code/Configs/cfgVehicles.hpp

@@ -204,6 +204,174 @@ class CfgVehicles {
 			};
 		};
 	};
+	class Tank: landvehicle	{
+  		class Sounds: Sounds  {
+   			class Engine;
+   			class Movement;
+  		};
+  		driverOpticsModel = "\ca\Tracked\optika_tank_driver";
+  		commanderCanSee = 31;
+  		gunnerCanSee = 30;
+  		getInAction = "GetInMedium";
+  		getOutAction = "GetOutMedium";
+  		cargoGetInAction[] = {"GetInLow"};
+  		cargoGetOutAction[] = {"GetOutLow"};
+  		audible = 18;
+  		sensitivityEar = "0.0075 /3";
+  		armorStructural = 2;
+  		class AnimationSources;
+  		class HitPoints  {
+   			class HitHull {
+    				armor = 1;
+    				material = -1;
+    				name = "NEtelo";
+    				visual = "telo";
+    				passThrough = 1;
+   			};
+   			class HitLTrack {
+    				armor = 0.15;
+    				material = -1;
+    				name = "pas_L";
+    				visual = "pas_L";
+    				passThrough = 0.3;
+   			};
+   			class HitRTrack {
+    				armor = 0.15;
+    				material = -1;
+    				name = "pas_P";
+    				visual = "pas_P";
+    				passThrough = 0.3;
+   			};
+   			class HitEngine {
+    				armor = 0.35;
+    				material = -1;
+    				name = "motor";
+    				visual = "motor";
+    				passThrough = 0.2;
+    				minimalHit = 0.02;
+   			};
+  		};
+  		weapons[] = {};
+  		magazines[] = {};
+  		class Turrets  {
+   			class MainTurret: NewTurret {
+    				gunnerAction = "ManActTestDriverOut";
+    				gunnerOpticsModel = "\ca\Tracked\optika_tank_gunner";
+    				gunnerOutOpticsModel = "\ca\Weapons\optika_empty";
+    				gunBeg = "usti hlavne";
+    				gunEnd = "konec hlavne";
+				memoryPointsGetInGunner = "pos gunner";
+    				memoryPointsGetInGunnerDir = "pos gunner dir";
+    				gunnerGetInAction = "GetInHigh";
+    				gunnerGetOutAction = "GetOutHigh";
+    				viewGunnerInExternal = 0;
+    				primaryGunner = 1;
+    				gunnerOpticsEffect[] = {"TankGunnerOptics2","OpticsBlur1","OpticsCHAbera1"};
+    				gunnerOutOpticsEffect[] = {};
+    				class HitPoints {
+     					class HitTurret {
+      						armor = 1;
+      						material = -1;
+      						name = "vez";
+      						visual = "vez";
+      						passThrough = 1;
+     					};
+     					class HitGun {
+      						armor = 0.3;
+      						material = -1;
+      						name = "zbran";
+      						visual = "zbran";
+      						passThrough = 0;
+     					};
+    				};
+    				class Turrets {
+     					class CommanderOptics: NewTurret {
+      						proxyType = "CPCommander";
+      						proxyIndex = 1;
+      						gunnerName = "$STR_POSITION_COMMANDER";
+      						primaryGunner = 0;
+      						primaryObserver = 1;
+      						stabilizedInAxes = "StabilizedInAxesNone";
+      						body = "obsTurret";
+      						gun = "obsGun";
+      						animationSourceBody = "obsTurret";
+      						animationSourceGun = "obsGun";
+      						animationSourceHatch = "hatchCommander";
+      						soundServo[] = {"\ca\sounds\vehicles\servos\turret-1",0.01,1,10};
+      						gunBeg = "";
+      						gunEnd = "";
+      						minElev = -4;
+      						maxElev = 20;
+      						initElev = 0;
+      						minTurn = -360;
+      						maxTurn = 360;
+      						initTurn = 0;
+      						commanding = 2;
+      						outGunnerMayFire = 1;
+      						inGunnerMayFire = 1;
+      						viewGunnerInExternal = 0;
+      						gunnerOpticsModel = "\ca\Tracked\optika_tank_driver";
+      						gunnerOutOpticsModel = "\ca\Weapons\optika_empty";
+      						gunnerOutOpticsColor[] = {0,0,0,1};
+      						gunnerOutForceOptics = 0;
+      						gunnerOutOpticsShowCursor = 0;
+      						gunnerOpticsEffect[] = {};
+      						gunnerOutOpticsEffect[] = {};
+      						memoryPointGunnerOutOptics = "commander_weapon_view";
+      						memoryPointGunnerOptics = "commanderview";
+      						memoryPointsGetInGunner = "pos commander";
+      						memoryPointsGetInGunnerDir = "pos commander dir";
+      						gunnerGetInAction = "GetInHigh";
+      						gunnerGetOutAction = "GetOutHigh";
+      						memoryPointGun = "gun_muzzle";
+      						selectionFireAnim = "zasleh_1";
+      						class ViewOptics {
+       							initAngleX = 0;
+       							minAngleX = -30;
+       							maxAngleX = 30;
+       							initAngleY = 0;
+       							minAngleY = -100;
+       							maxAngleY = 100;
+       							initFov = 0.155;
+       							minFov = 0.0625;
+       							maxFov = 0.466;
+      						};
+      						class ViewGunner {
+       							initAngleX = 5;
+       							minAngleX = -65;
+       							maxAngleX = 85;
+						       initAngleY = 0;
+						       minAngleY = -150;
+						       maxAngleY = 150;
+						       initFov = 0.7;
+						       minFov = 0.25;
+						       maxFov = 1.1;
+      						};
+     					};
+    				};
+   			};
+  		};
+  		soundDammage[] = {"\ca\Tracked\Data\Sound\alarm_loop1",0.000316228,1};
+  		supplyRadius = 1.5;
+  		class ViewOptics: ViewOptics  {
+			initAngleX = 0;
+		        minAngleX = -30;
+		   	maxAngleX = 30;
+		   	initAngleY = 0;
+		   	minAngleY = -100;
+		   	maxAngleY = 100;
+		   	initFov = 0.466;
+		   	minFov = 0.466;
+		   	maxFov = 0.466;
+  		};
+  		class DefaultEventhandlers;
+  		class Eventhandlers: DefaultEventhandlers{};
+  		smokeLauncherGrenadeCount = 6;
+  		smokeLauncherVelocity = 15;
+  		smokeLauncherOnTurret = 1;
+  		smokeLauncherAngle = 120;
+ 	};
+
 
 	// AIR
 	#include "CfgVehicles\AIR\AN2.hpp"
@@ -672,7 +840,7 @@ class CfgVehicles {
 		displayName = "Bag fence (Round)";
 		vehicleClass = "Fortifications";
 		constructioncount = 3;
-		removeoutput[] = {{"ItemSandbag",1}};
+		removeoutput[] = {{"BagFenceRound_DZ_kit",1}};
 		nounderground = 0;
 	};
 

SQF/dayz_code/actions/dayz_spaceInterrupt.sqf

@@ -84,6 +84,14 @@ if (_dikCode in actionKeys "MoveLeft") exitWith {r_interrupt = true; if (DZE_Sur
 if (_dikCode in actionKeys "MoveRight") exitWith {r_interrupt = true; if (DZE_Surrender) then {call dze_surrender_off};};
 if (_dikCode in actionKeys "MoveBack") exitWith {r_interrupt = true; if (DZE_Surrender) then {call dze_surrender_off};};
 
+//Prevent exploit of glitching through doors
+if (_dikCode in actionKeys "Prone") then {
+	_doors = nearestObjects [player, DZE_DoorsLocked, 3];
+	if (count _doors > 0) then {
+		_handled = true;
+	};
+};
+
 //Prevent exploit of drag body
 if ((_dikCode in actionKeys "Prone") && r_drag_sqf) exitWith { force_dropBody = true; };
 if ((_dikCode in actionKeys "Crouch") && r_drag_sqf) exitWith { force_dropBody = true; };

SQF/dayz_code/actions/maintain_area.sqf

@@ -66,7 +66,7 @@ switch _option do {
 			_countIn = _x select 1;
 			_qty = { (_x == _itemIn) || (configName(inheritsFrom(configFile >> "cfgMagazines" >> _x)) == _itemIn) } count magazines player;
 			if (_qty < _countIn) exitWith { _missing = _itemIn; _missingQty = (_countIn - _qty); _proceed = false; };
-		} count _requirements;
+		} forEach _requirements;
 
 		if (_proceed) then {
 			player playActionNow "Medic";

SQF/dayz_code/actions/modular_build.sqf

@@ -0,0 +1,87 @@
+//Check if building already in progress, exit if so.
+if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_40") , "PLAIN DOWN"]; };
+DZE_ActionInProgress = true;
+
+private ["_itemConfig","_classname","_classnametmp","_require","_text","_ghost","_lockable","_requireplot","_isAllowedUnderGround","_offset","_isPole","_isLandFireDZ","_hasRequired","_hasrequireditem","_reason","_buildObject","_location1","_object","_objectHelper","_position","_controls","_cancel","_dir"];
+
+/*Basic Defines*/
+DZE_Q = false;
+DZE_Z = false;
+
+DZE_Q_alt = false;
+DZE_Z_alt = false;
+
+DZE_Q_ctrl = false;
+DZE_Z_ctrl = false;
+
+DZE_5 = false;
+DZE_4 = false;
+DZE_6 = false;
+
+DZE_F = false;
+
+DZE_cancelBuilding = false;
+
+call gear_ui_init;
+closeDialog 1;
+
+DZE_buildItem = _this; //This is a magazine! It's global to allow access to it from outside functions
+
+//count nearby objects. Returns [_cnt] number
+[] call player_build_countNearby;
+
+//Check illegal player states. Returns [_isFine] string
+[] call player_build_states;
+
+//check for nearby requirements (campfire, workshop, fueltank).
+[] call player_build_needNearby;
+
+//check config files and gather info about item (if using custom buildables, make your own similar function instead).
+_itemConfig = [] call player_build_getConfig;
+
+//define items collected from function
+_classname = _itemConfig select 0; //string
+_classnametmp = _itemConfig select 1; //string
+_require = _itemConfig select 2; // array
+_text = _itemConfig select 3; // string
+_ghost = _itemConfig select 4; //string
+_lockable = _itemConfig select 5; //int -- 0/1=No 2=lockbox, 3=combolock, 4=safe
+_requireplot = _itemConfig select 6; //int
+_isAllowedUnderGround = _itemConfig select 7; //int
+_offset = _itemConfig select 8; //array
+_isPole = _itemConfig select 9; //bool
+_isLandFireDZ = _itemConfig select 10; //bool
+
+//Check for nearby plotpoles. Returns [_IsNearPlot,_nearestPole,_ownerID,_friendlies] [int,Obj,int,array]
+[_isPole, _requireplot, _isLandFireDZ] call player_build_plotCheck;
+
+if (DZE_ActionInProgress) then { //needed otherwise _hasRequired gets RPT error
+
+//Check for build requirements (missing tools and items). Returns [_hasrequireditem,_reason] [bool,string]
+_hasRequired = [_require, _text, true, true] call player_build_buildReq;
+
+//define item collected from function
+_hasrequireditem = _hasRequired select 0; //bool
+
+	if (_hasrequireditem) then {
+		
+		//Create object that is attached to a player (i.e Ghost preview if available)
+		_buildObject = [_classname, _ghost, _offset, true] call player_build_create;
+		
+		//define items collected from function
+		_location1 = _buildObject select 0; //array
+		_object = _buildObject select 1; //Obj
+		_objectHelper = _buildObject select 2; //Obj
+		
+		_controls = [_object, _isAllowedUnderGround, _location1, _objectHelper] call player_build_controls;
+
+		//define items collected from function
+		_cancel = _controls select 0; //bool
+		_reason = _controls select 1; //string
+		_position = _controls select 2; //array
+		_dir = _controls select 3; //int
+		
+		//Publish item to a database
+		[_cancel, _position, _classnametmp,_isAllowedUnderGround, _text, _isPole, _lockable,_dir, _reason] call player_build_publish;
+	};
+};

SQF/dayz_code/actions/player_build.sqf

@@ -137,7 +137,7 @@ _findNearestPole = [];
 _IsNearPlot = count (_findNearestPole);
 
 // If item is plot pole && another one exists within 45m
-if(_isPole && _IsNearPlot > 0) exitWith {  DZE_ActionInProgress = false; cutText [(localize "str_epoch_player_44") , "PLAIN DOWN"]; };
+if(_isPole && _IsNearPlot > 0) exitWith {  DZE_ActionInProgress = false; cutText [(format [localize "str_epoch_player_44", DZE_PlotPole select 1]) , "PLAIN DOWN"]; };
 
 if(_IsNearPlot == 0) then {
 
@@ -521,7 +521,7 @@ if (_hasrequireditem) then {
 					publicVariableServer "PVDZE_obj_Publish";
 
 					cutText [format[(localize "str_epoch_player_140"),_combinationDisplay,_text], "PLAIN DOWN", 5];
-
+                                        systemChat format [(localize "str_epoch_player_140"),_combinationDisplay,_text];
 
 				} else {
 					_tmpbuilt setVariable ["CharacterID",dayz_characterID,true];

SQF/dayz_code/actions/player_build2.sqf

@@ -1,627 +0,0 @@
-/*
-	DayZ Base Building
-	Made for DayZ Epoch please ask permission to use/edit/distrubute email vbawol@veteranbastards.com.
-*/
-private ["_helperColor","_objectHelper","_objectHelperDir","_objectHelperPos","_canDo",
-"_location","_dir","_classname","_item","_hasrequireditem","_missing","_hastoolweapon","_cancel","_reason","_started","_finished","_animState","_isMedic","_dis","_sfx","_hasbuilditem","_tmpbuilt","_onLadder","_isWater","_require","_text","_offset","_IsNearPlot","_isOk","_location1","_location2","_counter","_limit","_proceed","_num_removed","_position","_object","_canBuildOnPlot","_friendlies","_nearestPole","_ownerID","_findNearestPoles","_findNearestPole","_distance","_classnametmp","_ghost","_isPole","_needText","_lockable","_zheightchanged","_rotate","_combination_1","_combination_2","_combination_3","_combination_4","_combination","_combination_1_Display","_combinationDisplay","_zheightdirection","_abort","_isNear","_need","_needNear","_vehicle","_inVehicle","_requireplot","_objHDiff","_isLandFireDZ","_isTankTrap"];
-
-if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_40") , "PLAIN DOWN"]; };
-DZE_ActionInProgress = true;
-
-// disallow building if too many objects are found within 30m
-if((count ((getPosATL player) nearObjects ["All",30])) >= DZE_BuildingLimit) exitWith {DZE_ActionInProgress = false; cutText [(localize "str_epoch_player_41"), "PLAIN DOWN"];};
-
-_onLadder =		(getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "onLadder")) == 1;
-_isWater = 		dayz_isSwimming;
-_cancel = false;
-_reason = "";
-_canBuildOnPlot = false;
-
-_vehicle = vehicle player;
-_inVehicle = (_vehicle != player);
-//snap
-helperDetach = false;
-_canDo = (!r_drag_sqf and !r_player_unconscious);
-
-DZE_Q = false;
-DZE_Z = false;
-
-DZE_Q_alt = false;
-DZE_Z_alt = false;
-
-DZE_Q_ctrl = false;
-DZE_Z_ctrl = false;
-
-DZE_5 = false;
-DZE_4 = false;
-DZE_6 = false;
-DZE_F = false;
-
-DZE_cancelBuilding = false;
-
-call gear_ui_init;
-closeDialog 1;
-
-if (_isWater) exitWith {DZE_ActionInProgress = false; cutText [localize "str_player_26", "PLAIN DOWN"];};
-if (_inVehicle) exitWith {DZE_ActionInProgress = false; cutText [(localize "str_epoch_player_42"), "PLAIN DOWN"];};
-if (_onLadder) exitWith {DZE_ActionInProgress = false; cutText [localize "str_player_21", "PLAIN DOWN"];};
-if (player getVariable["combattimeout", 0] >= time) exitWith {DZE_ActionInProgress = false; cutText [(localize "str_epoch_player_43"), "PLAIN DOWN"];};
-
-_item =	_this;
-
-// Need Near Requirements
-_abort = false;
-_reason = "";
-
-_needNear = 	getArray (configFile >> "CfgMagazines" >> _item >> "ItemActions" >> "Build" >> "neednearby");
-
-{
-	switch(_x) do{
-		case "fire":
-		{
-			_distance = 3;
-			_isNear = {inflamed _x} count (getPosATL player nearObjects _distance);
-			if(_isNear == 0) then {
-				_abort = true;
-				_reason = "fire";
-			};
-		};
-		case "workshop":
-		{
-			_distance = 3;
-			_isNear = count (nearestObjects [player, ["Wooden_shed_DZ","WoodShack_DZ","WorkBench_DZ"], _distance]);
-			if(_isNear == 0) then {
-				_abort = true;
-				_reason = "workshop";
-			};
-		};
-		case "fueltank":
-		{
-			_distance = 30;
-			_isNear = count (nearestObjects [player, dayz_fuelsources, _distance]);
-			if(_isNear == 0) then {
-				_abort = true;
-				_reason = "fuel tank";
-			};
-		};
-	};
-} forEach _needNear;
-
-
-if(_abort) exitWith {
-	cutText [format[(localize "str_epoch_player_135"),_reason,_distance], "PLAIN DOWN"];
-	DZE_ActionInProgress = false;
-};
-
-_classname = 	getText (configFile >> "CfgMagazines" >> _item >> "ItemActions" >> "Build" >> "create");
-_classnametmp = _classname;
-_require =  getArray (configFile >> "cfgMagazines" >> _this >> "ItemActions" >> "Build" >> "require");
-_text = 		getText (configFile >> "CfgVehicles" >> _classname >> "displayName");
-_ghost = getText (configFile >> "CfgVehicles" >> _classname >> "ghostpreview");
-
-_lockable = 0;
-if(isNumber (configFile >> "CfgVehicles" >> _classname >> "lockable")) then {
-	_lockable = getNumber(configFile >> "CfgVehicles" >> _classname >> "lockable");
-};
-
-_requireplot = DZE_requireplot;
-if(isNumber (configFile >> "CfgVehicles" >> _classname >> "requireplot")) then {
-	_requireplot = getNumber(configFile >> "CfgVehicles" >> _classname >> "requireplot");
-};
-
-_isAllowedUnderGround = 1;
-if(isNumber (configFile >> "CfgVehicles" >> _classname >> "nounderground")) then {
-	_isAllowedUnderGround = getNumber(configFile >> "CfgVehicles" >> _classname >> "nounderground");
-};
-
-_offset = 	getArray (configFile >> "CfgVehicles" >> _classname >> "offset");
-if((count _offset) <= 0) then {
-	_offset = [0,1.5,0];
-};
-
-_isPole = (_classname == "Plastic_Pole_EP1_DZ");
-_isLandFireDZ = (_classname == "Land_Fire_DZ");
-
-_distance = DZE_PlotPole select 0;
-_needText = localize "str_epoch_player_246";
-
-if(_isPole) then {
-	_distance = DZE_PlotPole select 1;
-};
-
-// check for near plot
-_findNearestPoles = nearestObjects [(vehicle player), ["Plastic_Pole_EP1_DZ"], _distance];
-_findNearestPole = [];
-
-{
-	if (alive _x) then {
-		_findNearestPole set [(count _findNearestPole),_x];
-	};
-} count _findNearestPoles;
-
-_IsNearPlot = count (_findNearestPole);
-
-// If item is plot pole && another one exists within 45m
-if(_isPole && _IsNearPlot > 0) exitWith {  DZE_ActionInProgress = false; cutText [(localize "str_epoch_player_44") , "PLAIN DOWN"]; };
-
-if(_IsNearPlot == 0) then {
-
-	// Allow building of plot
-	if(_requireplot == 0 || _isLandFireDZ) then {
-		_canBuildOnPlot = true;
-	};
-
-} else {
-	// Since there are plots nearby we check for ownership && then for friend status
-
-	// check nearby plots ownership && then for friend status
-	_nearestPole = _findNearestPole select 0;
-
-	// Find owner
-	_ownerID = _nearestPole getVariable ["CharacterID","0"];
-
-	// diag_log format["DEBUG BUILDING: %1 = %2", dayz_characterID, _ownerID];
-
-	// check if friendly to owner
-	if(dayz_characterID == _ownerID) then {  //Keep ownership
-		// owner can build anything within his plot except other plots
-		if(!_isPole) then {
-			_canBuildOnPlot = true;
-		};
-
-	} else {
-		// disallow building plot
-		if(!_isPole) then {
-			_friendlies		= player getVariable ["friendlyTo",[]];
-			// check if friendly to owner
-			if(_ownerID in _friendlies) then {
-				_canBuildOnPlot = true;
-			};
-		};
-	};
-};
-
-// _message
-if(!_canBuildOnPlot) exitWith {  DZE_ActionInProgress = false; cutText [format[(localize "STR_EPOCH_PLAYER_135"),_needText,_distance] , "PLAIN DOWN"]; };
-
-_missing = "";
-_hasrequireditem = true;
-{
-	_hastoolweapon = _x in weapons player;
-	if(!_hastoolweapon) exitWith { _hasrequireditem = false; _missing = getText (configFile >> "cfgWeapons" >> _x >> "displayName"); };
-} count _require;
-
-_hasbuilditem = _this in magazines player;
-if (!_hasbuilditem) exitWith {DZE_ActionInProgress = false; cutText [format[(localize "str_player_31"),_text,"build"] , "PLAIN DOWN"]; };
-
-if (!_hasrequireditem) exitWith {DZE_ActionInProgress = false; cutText [format[(localize "str_epoch_player_137"),_missing] , "PLAIN DOWN"]; };
-if (_hasrequireditem) then {
-
-	_location = [0,0,0];
-	_isOk = true;
-
-	// get inital players position
-	_location1 = getPosATL player;
-	_dir = getDir player;
-
-	// if ghost preview available use that instead
-	if (_ghost != "") then {
-		_classname = _ghost;
-	};
-
-	_object = createVehicle [_classname, _location, [], 0, "CAN_COLLIDE"];
-	//Build gizmo
-	_objectHelper = "Sign_sphere10cm_EP1" createVehicle _location;
-	_helperColor = "#(argb,8,8,3)color(0,0,0,0,ca)";
-	_objectHelper setobjecttexture [0,_helperColor];
-	_objectHelper attachTo [player,_offset];
-	_object attachTo [_objectHelper,[0,0,0]];
-	_position = getPosATL _objectHelper;
-	
-	//cutText [(localize "str_epoch_player_45"), "PLAIN DOWN"];
-
-	_objHDiff = 0;
-
-if (isClass (configFile >> "SnapBuilding" >> _classname)) then {	
-	["","","",["Init",_object,_classname,_objectHelper]] spawn snap_build;
-};
-	
-	while {_isOk} do {
-
-		_zheightchanged = false;
-		_zheightdirection = "";
-		_rotate = false;
-
-		if (DZE_Q) then {
-			DZE_Q = false;
-			_zheightdirection = "up";
-			_zheightchanged = true;
-		};
-		if (DZE_Z) then {
-			DZE_Z = false;
-			_zheightdirection = "down";
-			_zheightchanged = true;
-		};
-		if (DZE_Q_alt) then {
-			DZE_Q_alt = false;
-			_zheightdirection = "up_alt";
-			_zheightchanged = true;
-		};
-		if (DZE_Z_alt) then {
-			DZE_Z_alt = false;
-			_zheightdirection = "down_alt";
-			_zheightchanged = true;
-		};
-		if (DZE_Q_ctrl) then {
-			DZE_Q_ctrl = false;
-			_zheightdirection = "up_ctrl";
-			_zheightchanged = true;
-		};
-		if (DZE_Z_ctrl) then {
-			DZE_Z_ctrl = false;
-			_zheightdirection = "down_ctrl";
-			_zheightchanged = true;
-		};
-		if (DZE_4) then {
-			_rotate = true;
-			DZE_4 = false;
-			if (helperDetach) then {
-				_dir = -45;
-			} else {
-				_dir = 180;
-			};
-		};
-		if (DZE_6) then {
-			_rotate = true;
-			DZE_6 = false;
-			if (helperDetach) then {
-				_dir = 45;
-			} else {
-				_dir = 0;
-			};
-		};
-		
-		if (DZE_F and _canDo) then {	
-			if (helperDetach) then {
-			_objectHelperDir = getDir _objectHelper; 
-			_objectHelper attachTo [player];
-			_objectHelper setDir _objectHelperDir-(getDir player);
-			helperDetach = false;
-			} else {
-			_objectHelperPos = getPosATL _objectHelper;
-			detach _objectHelper;			
-			_objectHelper setPosATL _objectHelperPos;
-			_objectHelperDir = getDir _objectHelper;
-			_objectHelper setVelocity [0,0,0]; //fix sliding glitch
-			helperDetach = true;
-			};
-			DZE_F = false;
-		};
-
-		if(_rotate) then {
-			if (helperDetach) then {
-				_objectHelperDir = getDir _objectHelper;
-				_objectHelperPos = getPosATL _objectHelper;
-				_objectHelper setDir _objectHelperDir+_dir;
-				_objectHelper setPosATL _objectHelperPos;
-			} else {
-				_objectHelper setDir _dir;
-				_objectHelper setPosATL _position;
-				//diag_log format["DEBUG Rotate BUILDING POS: %1", _position];			
-			};
-
-		};
-
-		if(_zheightchanged) then {
-			if (!helperDetach) then {
-			detach _objectHelper;
-			};
-
-			_position = getPosATL _objectHelper;
-
-			if(_zheightdirection == "up") then {
-				_position set [2,((_position select 2)+0.1)];
-				_objHDiff = _objHDiff + 0.1;
-			};
-			if(_zheightdirection == "down") then {
-				_position set [2,((_position select 2)-0.1)];
-				_objHDiff = _objHDiff - 0.1;
-			};
-
-			if(_zheightdirection == "up_alt") then {
-				_position set [2,((_position select 2)+1)];
-				_objHDiff = _objHDiff + 1;
-			};
-			if(_zheightdirection == "down_alt") then {
-				_position set [2,((_position select 2)-1)];
-				_objHDiff = _objHDiff - 1;
-			};
-
-			if(_zheightdirection == "up_ctrl") then {
-				_position set [2,((_position select 2)+0.01)];
-				_objHDiff = _objHDiff + 0.01;
-			};
-			if(_zheightdirection == "down_ctrl") then {
-				_position set [2,((_position select 2)-0.01)];
-				_objHDiff = _objHDiff - 0.01;
-			};
-
-			_objectHelper setDir (getDir _objectHelper);
-
-			if((_isAllowedUnderGround == 0) && ((_position select 2) < 0)) then {
-				_position set [2,0];
-			};
-
-			_objectHelper setPosATL _position;
-
-			//diag_log format["DEBUG Change BUILDING POS: %1", _position];
-
-			if (!helperDetach) then {
-			_objectHelper attachTo [player];
-			};
-		};
-
-		sleep 0.5;
-
-		_location2 = getPosATL player;
-
-		if(DZE_5) exitWith {
-			_isOk = false;
-			detach _object;
-			_dir = getDir _object;
-			_position = getPosATL _object;
-			//diag_log format["DEBUG BUILDING POS: %1", _position];
-			deleteVehicle _object;
-			detach _objectHelper;
-			deleteVehicle _objectHelper;
-		};
-
-		if(_location1 distance _location2 > 10) exitWith {
-			_isOk = false;
-			_cancel = true;
-			_reason = "You've moved to far away from where you started building (within 10 meters)";
-			detach _object;
-			deleteVehicle _object;
-			detach _objectHelper;
-			deleteVehicle _objectHelper;
-		};
-		
-		if(_location1 distance _objectHelperPos > 10) exitWith {
-			_isOk = false;
-			_cancel = true;
-			_reason = "Object is placed to far away from where you started building (within 10 meters)";
-			detach _object;
-			deleteVehicle _object;
-			detach _objectHelper;
-			deleteVehicle _objectHelper;
-		};
-
-		if(abs(_objHDiff) > 10) exitWith {
-			_isOk = false;
-			_cancel = true;
-			_reason = "Cannot move up or down more than 10 meters";
-			detach _object;
-			deleteVehicle _object;
-			detach _objectHelper;
-			deleteVehicle _objectHelper;
-		};
-
-		if (player getVariable["combattimeout", 0] >= time) exitWith {
-			_isOk = false;
-			_cancel = true;
-			_reason = (localize "str_epoch_player_43");
-			detach _object;
-			deleteVehicle _object;
-			detach _objectHelper;
-			deleteVehicle _objectHelper;
-		};
-
-		if (DZE_cancelBuilding) exitWith {
-			_isOk = false;
-			_cancel = true;
-			_reason = "Cancelled building.";
-			detach _object;
-			deleteVehicle _object;
-			detach _objectHelper;
-			deleteVehicle _objectHelper;
-		};
-	};
-
-	//No building on roads unless toggled
-	if (!DZE_BuildOnRoads) then {
-		if (isOnRoad _position) then { _cancel = true; _reason = "Cannot build on a road."; };
-	};
-
-	// No building in trader zones
-	if(!canbuild) then { _cancel = true; _reason = "Cannot build in a city."; };
-
-	if(!_cancel) then {
-
-		_classname = _classnametmp;
-
-		// Start Build
-		_tmpbuilt = createVehicle [_classname, _location, [], 0, "CAN_COLLIDE"];
-
-		_tmpbuilt setdir _dir;
-
-		// Get position based on object
-		_location = _position;
-
-		if((_isAllowedUnderGround == 0) && ((_location select 2) < 0)) then {
-			_location set [2,0];
-		};
-
-		_tmpbuilt setPosATL _location;
-
-
-		cutText [format[(localize "str_epoch_player_138"),_text], "PLAIN DOWN"];
-
-		_limit = 3;
-
-		if (DZE_StaticConstructionCount > 0) then {
-			_limit = DZE_StaticConstructionCount;
-		}
-		else {
-			if (isNumber (configFile >> "CfgVehicles" >> _classname >> "constructioncount")) then {
-				_limit = getNumber(configFile >> "CfgVehicles" >> _classname >> "constructioncount");
-			};
-		};
-
-		_isOk = true;
-		_proceed = false;
-		_counter = 0;
-
-		while {_isOk} do {
-
-			[10,10] call dayz_HungerThirst;
-			player playActionNow "Medic";
-
-			_dis=20;
-			_sfx = "repair";
-			[player,_sfx,0,false,_dis] call dayz_zombieSpeak;
-			[player,_dis,true,(getPosATL player)] spawn player_alertZombies;
-
-			r_interrupt = false;
-			r_doLoop = true;
-			_started = false;
-			_finished = false;
-
-			while {r_doLoop} do {
-				_animState = animationState player;
-				_isMedic = ["medic",_animState] call fnc_inString;
-				if (_isMedic) then {
-					_started = true;
-				};
-				if (_started && !_isMedic) then {
-					r_doLoop = false;
-					_finished = true;
-				};
-				if (r_interrupt || (player getVariable["combattimeout", 0] >= time)) then {
-					r_doLoop = false;
-				};
-				if (DZE_cancelBuilding) exitWith {
-					r_doLoop = false;
-				};
-				sleep 0.1;
-			};
-			r_doLoop = false;
-
-
-			if(!_finished) exitWith {
-				_isOk = false;
-				_proceed = false;
-			};
-
-			if(_finished) then {
-				_counter = _counter + 1;
-			};
-
-			cutText [format[(localize "str_epoch_player_139"),_text, _counter,_limit], "PLAIN DOWN"];
-
-			if(_counter == _limit) exitWith {
-				_isOk = false;
-				_proceed = true;
-			};
-
-		};
-
-		if (_proceed) then {
-
-			_num_removed = ([player,_item] call BIS_fnc_invRemove);
-			if(_num_removed == 1) then {
-
-				cutText [format[localize "str_build_01",_text], "PLAIN DOWN"];
-
-				if (_isPole) then {
-					[] spawn player_plotPreview;
-				};
-
-				_tmpbuilt setVariable ["OEMPos",_location,true];
-
-				if(_lockable > 1) then {
-
-					_combinationDisplay = "";
-
-					switch (_lockable) do {
-
-						case 2: { // 2 lockbox
-							_combination_1 = (floor(random 3)) + 100; // 100=red,101=green,102=blue
-							_combination_2 = floor(random 10);
-							_combination_3 = floor(random 10);
-							_combination = format["%1%2%3",_combination_1,_combination_2,_combination_3];
-							dayz_combination = _combination;
-							if (_combination_1 == 100) then {
-								_combination_1_Display = "Red";
-							};
-							if (_combination_1 == 101) then {
-								_combination_1_Display = "Green";
-							};
-							if (_combination_1 == 102) then {
-								_combination_1_Display = "Blue";
-							};
-							_combinationDisplay = format["%1%2%3",_combination_1_Display,_combination_2,_combination_3];
-						};
-
-						case 3: { // 3 combolock
-							_combination_1 = floor(random 10);
-							_combination_2 = floor(random 10);
-							_combination_3 = floor(random 10);
-							_combination = format["%1%2%3",_combination_1,_combination_2,_combination_3];
-							dayz_combination = _combination;
-							_combinationDisplay = _combination;
-						};
-
-						case 4: { // 4 safe
-							_combination_1 = floor(random 10);
-							_combination_2 = floor(random 10);
-							_combination_3 = floor(random 10);
-							_combination_4 = floor(random 10);
-							_combination = format["%1%2%3%4",_combination_1,_combination_2,_combination_3,_combination_4];
-							dayz_combination = _combination;
-							_combinationDisplay = _combination;
-						};
-					};
-
-					_tmpbuilt setVariable ["CharacterID",_combination,true];
-
-
-					PVDZE_obj_Publish = [_combination,_tmpbuilt,[_dir,_location],_classname];
-					publicVariableServer "PVDZE_obj_Publish";
-
-					cutText [format[(localize "str_epoch_player_140"),_combinationDisplay,_text], "PLAIN DOWN", 5];
-                                        systemChat format [(localize "str_epoch_player_140"),_combinationDisplay,_text];
-
-				} else {
-					_tmpbuilt setVariable ["CharacterID",dayz_characterID,true];
-
-					// fire?
-					if(_tmpbuilt isKindOf "Land_Fire_DZ") then {
-						_tmpbuilt spawn player_fireMonitor;
-					} else {
-						PVDZE_obj_Publish = [dayz_characterID,_tmpbuilt,[_dir,_location],_classname];
-						publicVariableServer "PVDZE_obj_Publish";
-					};
-				};
-			} else {
-				deleteVehicle _tmpbuilt;
-				cutText [(localize "str_epoch_player_46") , "PLAIN DOWN"];
-			};
-
-		} else {
-			r_interrupt = false;
-			if (vehicle player == player) then {
-				[objNull, player, rSwitchMove,""] call RE;
-				player playActionNow "stop";
-			};
-
-			deleteVehicle _tmpbuilt;
-
-			cutText [(localize "str_epoch_player_46") , "PLAIN DOWN"];
-		};
-
-	} else {
-		cutText [format[(localize "str_epoch_player_47"),_text,_reason], "PLAIN DOWN"];
-	};
-};
-
-DZE_ActionInProgress = false;

SQF/dayz_code/actions/player_build_buildReq.sqf

@@ -0,0 +1,44 @@
+if(!DZE_ActionInProgress) exitWith {};
+//Check for build requirements like tools and if item is in magazines (check args to disable checks)
+private ["_passArray","_missing","_hasrequireditem","_require","_hastoolweapon","_hasbuilditem","_checkMag","_checkTools","_reason"];
+
+_require = _this select 0; //grab passed array of required items from item config function
+_text = _this select 1; //grab text string passed from config
+_checkMag = _this select 2; //check if item was built from magazine used in config file. Default is true. Set to false if building item from custom script
+_checkTools = _this select 3; //same as above, default is true, set to false if you do not need item requirements.
+
+_missing = "";
+_hasrequireditem = true;
+_reason = "ok";
+_passArray = [];
+
+{
+	_hastoolweapon = _x in weapons player; //check each required item against weapons array on player
+	if(!_hastoolweapon) exitWith { //if tool was not found, get missing tool's name from config
+		_hasrequireditem = false; _missing = getText (configFile >> "cfgWeapons" >> _x >> "displayName");
+	};
+} count _require; //count each item in requirements array
+
+_hasbuilditem = DZE_buildItem in magazines player;
+
+_passArray = [_hasrequireditem,_reason];
+
+if (_checkMag) then { //passed argument
+	if (!_hasbuilditem) exitWith { //End script if magazine was not found
+		DZE_ActionInProgress = false;
+		cutText [format[(localize "str_player_31"),_text,"build"] , "PLAIN DOWN"];
+		_reason = "missing item";
+		_passArray
+	};
+};
+
+if (_checkTools) then { //passed argument
+	if (!_hasrequireditem) exitWith { //End script if required item/tool was not found
+		DZE_ActionInProgress = false;
+		cutText [format[(localize "str_epoch_player_137"),_missing] , "PLAIN DOWN"];
+		_reason = "missing tools";
+		_passArray
+	};
+};
+_passArray //[bool,string]
+

SQF/dayz_code/actions/player_build_controls.sqf

@@ -0,0 +1,216 @@
+private ["_canDo","_passArray","_objHDiff","_isOk","_zheightchanged","_zheightdirection","_rotate","_dir","_object","_position","_isAllowedUnderGround","_location1","_location2","_cancel","_reason","_lastDir","_objectHelper","_objectHelperDir","_objectHelperPos"];
+
+_object = _this select 0;
+_isAllowedUnderGround = _this select 1;
+_location1 = _this select 2;
+_objectHelper  = _this select 3;
+
+_passArray = [];
+
+_objHDiff = 0;
+_isOk = true;
+_cancel = false;
+_reason = "";
+_dir = getDir player; //required to pass direction when building
+helperDetach = false;
+_canDo = (!r_drag_sqf and !r_player_unconscious);
+_position = [_objectHelper] call FNC_GetPos;
+
+while {_isOk} do {
+
+	_zheightchanged = false;
+	_zheightdirection = "";
+	_rotate = false;
+
+	if (DZE_Q) then {
+		DZE_Q = false;
+		_zheightdirection = "up";
+		_zheightchanged = true;
+	};
+	if (DZE_Z) then {
+		DZE_Z = false;
+		_zheightdirection = "down";
+		_zheightchanged = true;
+	};
+	if (DZE_Q_alt) then {
+		DZE_Q_alt = false;
+		_zheightdirection = "up_alt";
+		_zheightchanged = true;
+	};
+	if (DZE_Z_alt) then {
+		DZE_Z_alt = false;
+		_zheightdirection = "down_alt";
+		_zheightchanged = true;
+	};
+	if (DZE_Q_ctrl) then {
+		DZE_Q_ctrl = false;
+		_zheightdirection = "up_ctrl";
+		_zheightchanged = true;
+	};
+	if (DZE_Z_ctrl) then {
+		DZE_Z_ctrl = false;
+		_zheightdirection = "down_ctrl";
+		_zheightchanged = true;
+	};
+	if (DZE_4) then {
+		_rotate = true;
+		DZE_4 = false;
+		_dir = -45;
+	};
+	if (DZE_6) then {
+		_rotate = true;
+		DZE_6 = false;
+		_dir = 45;
+	};
+	
+	if (DZE_F and _canDo) then {	
+		if (helperDetach) then { 
+			_objectHelperDir = getDir _objectHelper;
+			_objectHelper attachTo [player];
+			_objectHelper setDir _objectHelperDir-(getDir player);
+			helperDetach = false;
+		} else {
+			_objectHelperDir = getDir _objectHelper;
+			detach _objectHelper;
+			[_objectHelper]	call FNC_GetSetPos;
+			_objectHelper setVelocity [0,0,0]; //fix sliding glitch
+			helperDetach = true;
+		};
+		DZE_F = false;
+	};
+
+	if(_rotate) then {
+		if (helperDetach) then {
+			_objectHelperDir = getDir _objectHelper;
+			_objectHelper setDir _objectHelperDir+_dir;
+			[_objectHelper]	call FNC_GetSetPos;
+		} else {
+			detach _objectHelper;
+			_objectHelperDir = getDir _objectHelper;
+			_objectHelper setDir _objectHelperDir+_dir;
+			[_objectHelper]	call FNC_GetSetPos;
+			_objectHelperDir = getDir _objectHelper;
+			_objectHelper attachTo [player];
+			_objectHelper setDir _objectHelperDir-(getDir player);
+		};
+	};
+
+	if(_zheightchanged) then {
+		if (!helperDetach) then {
+		detach _objectHelper;
+		_objectHelperDir = getDir _objectHelper;
+		};
+
+		_position = [_objectHelper] call FNC_GetPos;
+
+		if(_zheightdirection == "up") then {
+			_position set [2,((_position select 2)+0.1)];
+			_objHDiff = _objHDiff + 0.1;
+		};
+		if(_zheightdirection == "down") then {
+			_position set [2,((_position select 2)-0.1)];
+			_objHDiff = _objHDiff - 0.1;
+		};
+
+		if(_zheightdirection == "up_alt") then {
+			_position set [2,((_position select 2)+1)];
+			_objHDiff = _objHDiff + 1;
+		};
+		if(_zheightdirection == "down_alt") then {
+			_position set [2,((_position select 2)-1)];
+			_objHDiff = _objHDiff - 1;
+		};
+
+		if(_zheightdirection == "up_ctrl") then {
+			_position set [2,((_position select 2)+0.01)];
+			_objHDiff = _objHDiff + 0.01;
+		};
+		if(_zheightdirection == "down_ctrl") then {
+			_position set [2,((_position select 2)-0.01)];
+			_objHDiff = _objHDiff - 0.01;
+		};
+
+		if((_isAllowedUnderGround == 0) && ((_position select 2) < 0)) then {
+			_position set [2,0];
+		};
+
+		if (surfaceIsWater _position) then {
+			_objectHelper setPosASL _position;
+		} else {
+			_objectHelper setPosATL _position;
+		};
+
+		if (!helperDetach) then {
+		_objectHelper attachTo [player];
+		_objectHelper setDir _objectHelperDir-(getDir player);
+		};
+	};
+
+	sleep 0.5;
+
+	_location2 = [player] call FNC_GetPos;
+	_objectHelperPos = [_objectHelper] call FNC_GetPos;
+	
+	if(DZE_5) exitWith {
+		_isOk = false;
+		_position = [_object] call FNC_GetPos;
+		detach _object;
+		_dir = getDir _object;
+		deleteVehicle _object;
+		detach _objectHelper;
+		deleteVehicle _objectHelper;
+	};
+
+	if(_location1 distance _location2 > 10) exitWith {
+		_isOk = false;
+		_cancel = true;
+		_reason = "You've moved to far away from where you started building (within 10 meters)";
+		detach _object;
+		deleteVehicle _object;
+		detach _objectHelper;
+		deleteVehicle _objectHelper;
+	};
+	
+	if(_location1 distance _objectHelperPos > 10) exitWith {
+		_isOk = false;
+		_cancel = true;
+		_reason = "Object is placed to far away from where you started building (within 10 meters)";
+		detach _object;
+		deleteVehicle _object;
+		detach _objectHelper;
+		deleteVehicle _objectHelper;
+	};
+
+	if(abs(_objHDiff) > 10) exitWith {
+		_isOk = false;
+		_cancel = true;
+		_reason = "Cannot move up or down more than 10 meters";
+		detach _object;
+		deleteVehicle _object;
+		detach _objectHelper;
+		deleteVehicle _objectHelper;
+	};
+
+	if (player getVariable["combattimeout", 0] >= time) exitWith {
+		_isOk = false;
+		_cancel = true;
+		_reason = (localize "str_epoch_player_43");
+		detach _object;
+		deleteVehicle _object;
+		detach _objectHelper;
+		deleteVehicle _objectHelper;
+	};
+
+	if (DZE_cancelBuilding) exitWith {
+		_isOk = false;
+		_cancel = true;
+		_reason = "Cancelled building.";
+		detach _object;
+		deleteVehicle _object;
+		detach _objectHelper;
+		deleteVehicle _objectHelper;
+	};
+};
+
+_passArray = [_cancel,_reason,_position,_dir];
+_passArray //[bool,string,array,int]

SQF/dayz_code/actions/player_build_countNearby.sqf

@@ -0,0 +1,10 @@
+// disallow building if too many objects are found within 30m (by default)
+private ["_cnt","_pos"];
+
+_pos = [player] call FNC_GetPos;
+_cnt = count (_pos nearObjects ["All",DZE_checkNearbyRadius]); 
+if (_cnt >= DZE_BuildingLimit) exitWith { //end script if too many objects nearby
+	DZE_ActionInProgress = false;
+	cutText [(localize "str_epoch_player_41"), "PLAIN DOWN"];
+};
+_cnt //returns amount of total objects found nearby

SQF/dayz_code/actions/player_build_create.sqf

@@ -0,0 +1,37 @@
+//create an object for default build system style
+private ["_passArray","_classname","_enableGhost","_ghost","_location1","_dir","_object","_objectHelper","_helperColor"];
+
+_classname = _this select 0;
+_ghost = _this select 1;
+_offset = _this select 2;
+_enableGhost = _this select 3; //pass false trough args if not using ghost preview
+
+_passArray = [];
+_objectHelper = objNull;
+
+// get inital players position
+_location1 = [player] call FNC_GetPos;
+
+// if enabled, use ghost preview where available
+if (_enableGhost) then {
+	if (_ghost != "") then {
+		_classname = _ghost;
+	};
+};
+
+_object = createVehicle [_classname, [0,0,0], [], 0, "CAN_COLLIDE"]; //object preview, not an actual object that will be built
+
+_objectHelper = "Sign_sphere10cm_EP1" createVehicle [0,0,0];
+_helperColor = "#(argb,8,8,3)color(0,0,0,0,ca)";
+_objectHelper setobjecttexture [0,_helperColor];
+_objectHelper attachTo [player,_offset];
+_object attachTo [_objectHelper,[0,0,0]];
+
+
+if (isClass (configFile >> "SnapBuilding" >> _classname)) then {	
+	["","","",["Init",_object,_classname,_objectHelper]] spawn snap_build;
+};
+
+_passArray = [_location1,_object,_objectHelper];
+_passArray //[array,obj,array]
+

SQF/dayz_code/actions/player_build_getConfig.sqf

@@ -0,0 +1,39 @@
+if(!DZE_ActionInProgress) exitWith {};
+//Build an array of various variables gathered about build object from config files, only applies to legit buildable objects
+private ["_passArray","_classname","_classnametmp","_require","_text","_ghost","_lockable","_requireplot","_isAllowedUnderGround","_offset","_isPole","_isLandFireDZ"];
+
+_passArray = [];
+
+_classname = getText (configFile >> "CfgMagazines" >> DZE_buildItem >> "ItemActions" >> "Build" >> "create");
+_classnametmp = _classname;
+_require = getArray (configFile >> "cfgMagazines" >> DZE_buildItem >> "ItemActions" >> "Build" >> "require");
+_text = getText (configFile >> "CfgVehicles" >> _classname >> "displayName");
+_ghost = getText (configFile >> "CfgVehicles" >> _classname >> "ghostpreview");
+
+_lockable = 0; //default define if lockable not found in config file below
+if(isNumber (configFile >> "CfgVehicles" >> _classname >> "lockable")) then { //find out if item is lockable object
+	_lockable = getNumber(configFile >> "CfgVehicles" >> _classname >> "lockable"); // 2=lockbox, 3=combolock, 4=safe
+};
+
+_requireplot = DZE_requireplot; //check for plotpole requirements defined in init.sqf
+if(isNumber (configFile >> "CfgVehicles" >> _classname >> "requireplot")) then {
+	_requireplot = getNumber(configFile >> "CfgVehicles" >> _classname >> "requireplot");
+};
+
+_isAllowedUnderGround = 1; //check if allowed to build under terrain
+if(isNumber (configFile >> "CfgVehicles" >> _classname >> "nounderground")) then {
+	_isAllowedUnderGround = getNumber(configFile >> "CfgVehicles" >> _classname >> "nounderground");
+};
+
+_offset = 	getArray (configFile >> "CfgVehicles" >> _classname >> "offset"); //check default distance offset, define if does not exist
+if((count _offset) <= 0) then {
+	_offset = [0,1.5,0];
+};
+
+_isPole = (_classname == "Plastic_Pole_EP1_DZ"); //check if item is plotpole
+_isLandFireDZ = (_classname == "Land_Fire_DZ"); //check if item is campfire
+
+_passArray = [_classname,_classnametmp,_require,_text,_ghost,_lockable,_requireplot,_isAllowedUnderGround,_offset,_isPole,_isLandFireDZ]; //create new array to pass to caller
+
+_passArray //[string,string,array,string,string,int,int,int,array,bool,bool] 
+

SQF/dayz_code/actions/player_build_needNearby.sqf

@@ -0,0 +1,44 @@
+if(!DZE_ActionInProgress) exitWith {};
+//disallow building if required items (defined in config) are not found nearby
+private ["_abort","_reason","_distance","_needNear","_isNear","_pos"];
+
+_abort = false; //do not abort by default
+_reason = ""; // define to avoid RPT errors
+_needNear = getArray (configFile >> "CfgMagazines" >> DZE_buildItem >> "ItemActions" >> "Build" >> "neednearby");
+_pos = [player] call FNC_GetPos;
+{
+	switch(_x) do{
+		case "fire":
+		{
+			_distance = 3;
+			_isNear = {inflamed _x} count (_pos nearObjects _distance);
+			if(_isNear == 0) then {
+				_abort = true;
+				_reason = "fire";
+			};
+		};
+		case "workshop":
+		{
+			_distance = 3;
+			_isNear = count (nearestObjects [_pos, ["Wooden_shed_DZ","WoodShack_DZ","WorkBench_DZ"], _distance]);
+			if(_isNear == 0) then {
+				_abort = true;
+				_reason = "workshop";
+			};
+		};
+		case "fueltank":
+		{
+			_distance = 30;
+			_isNear = count (nearestObjects [_pos, dayz_fuelsources, _distance]);
+			if(_isNear == 0) then {
+				_abort = true;
+				_reason = "fuel tank";
+			};
+		};
+	};
+} forEach _needNear;
+
+if (_abort) exitWith {
+	cutText [format[(localize "str_epoch_player_135"),_reason,_distance], "PLAIN DOWN"];
+	DZE_ActionInProgress = false;
+};

SQF/dayz_code/actions/player_build_plotCheck.sqf

@@ -0,0 +1,79 @@
+if(!DZE_ActionInProgress) exitWith {};
+//Check if nearby plotpoles exists
+private ["_passArray","_isPole","_needText","_distance","_findNearestPoles","_findNearestPole","_IsNearPlot","_requireplot","_isLandFireDZ","_canBuildOnPlot","_nearestPole","_ownerID","_friendlies"];
+
+//defines
+_isPole = _this select 0;
+_requireplot = _this select 1;
+_isLandFireDZ = _this select 2;
+
+_needText = localize "str_epoch_player_246"; //text for when requirements not met
+_canBuildOnPlot = false;
+_nearestPole = objNull;
+_ownerID = 0;
+_friendlies = [];
+
+if(_isPole) then { //check if object is plotpole and adjust distance accordingly 
+	_distance = DZE_PlotPole select 1;
+} else {
+	_distance = DZE_PlotPole select 0;
+};
+
+// check for near plotpoles
+_findNearestPoles = nearestObjects [(vehicle player), ["Plastic_Pole_EP1_DZ"], _distance]; //create an array of nearby objects that are plotpoles, nearest will always be first in array
+_findNearestPole = []; //must define an empty array to avoid problems
+
+{
+	if (alive _x) then { //only look for non-destroyed plotpoles
+		_findNearestPole set [(count _findNearestPole),_x]; //build an array of live plotpoles found nearby
+	};
+} count _findNearestPoles; //count each item in previously created array of nearby plotpoles
+
+_IsNearPlot = count (_findNearestPole); //count our new array of non-destroyed plotpoles. Empty array will return 0
+
+if(_IsNearPlot == 0) then { //No live plotpoles were found nearby
+	// Allow building of plot
+	if(_requireplot == 0 || _isLandFireDZ) then {
+		_canBuildOnPlot = true;
+	};
+} else {
+	// Since there are plots nearby we check for ownership && then for friend status
+	// check nearby plots ownership && then for friend status
+	_nearestPole = _findNearestPole select 0; //nearest is always first in array when using nearestObjects check
+
+	// Find owner
+	_ownerID = _nearestPole getVariable ["CharacterID","0"];
+
+	// check if friendly to owner
+	if(dayz_characterID == _ownerID) then {  //Keep ownership
+		// owner can build anything within his plot except other plots
+		if(!_isPole) then {
+			_canBuildOnPlot = true;
+		};
+	} else {
+		// disallow building plot
+		if(!_isPole) then {
+			_friendlies		= player getVariable ["friendlyTo",[]];
+			// check if friendly to owner
+			if(_ownerID in _friendlies) then {
+				_canBuildOnPlot = true;
+			};
+		};
+	};
+};
+
+_passArray = [_IsNearPlot,_nearestPole,_ownerID,_friendlies]; //create new array and pass it to caller
+
+// End script if item is plot pole and another one exists within defined radius
+if(_isPole && _IsNearPlot > 0) exitWith { 
+	DZE_ActionInProgress = false;
+	cutText [(format [localize "str_epoch_player_44", DZE_PlotPole select 1]) , "PLAIN DOWN"];
+	_passArray
+};
+
+if(!_canBuildOnPlot) exitWith { //end script if requirements were not met
+	DZE_ActionInProgress = false;
+	cutText [format[(localize "STR_EPOCH_PLAYER_135"),_needText,_distance] , "PLAIN DOWN"];
+	_passArray
+};
+_passArray //[int,Obj,int,array]

SQF/dayz_code/actions/player_build_publish.sqf

@@ -0,0 +1,224 @@
+private ["_passArray","_cancel","_position","_reason","_classnametmp","_classname","_tmpbuilt","_dir","_location","_text","_limit","_isOk","_proceed","_counter","_dis","_sfx","_started","_finished","_animState","_isMedic","_num_removed","_lockable","_combinationDisplay","_combination_1","_combination_2","_combination_3","_combination_4","_combination","_combination_1_Display"];
+
+//defines
+_cancel = _this select 0;
+_position = _this select 1;
+_classnametmp = _this select 2;
+_isAllowedUnderGround = _this select 3;
+_text = _this select 4;
+_isPole = _this select 5;
+_lockable = _this select 6;
+_dir = _this select 7;
+_reason = _this select 8;
+
+_passArray = [];
+
+_isOk = true;
+_proceed = false;
+_counter = 0;
+_location = [0,0,0];
+
+//No building on roads unless toggled
+if (!DZE_BuildOnRoads) then {
+	if (isOnRoad _position) then {
+		_cancel = true;
+		_reason = "Cannot build on a road.";
+	};
+};
+
+// No building in trader zones
+if(!canbuild) then {
+	_cancel = true;
+	_reason = "Cannot build in a city.";
+};
+
+if(!_cancel) then {
+
+	_classname = _classnametmp;
+
+	// Start Build
+	_tmpbuilt = createVehicle [_classname, _location, [], 0, "CAN_COLLIDE"]; //create actual object that will be published to database
+
+	_tmpbuilt setdir _dir; //set direction inherited from passed args from control
+
+	// Get position based on object
+	_location = _position;
+
+	if((_isAllowedUnderGround == 0) && ((_location select 2) < 0)) then { //check Z axis if not allowed to build underground
+		_location set [2,0]; //reset Z axis to zero (above terrain)
+	};
+
+	if (surfaceIsWater _location) then {
+		_tmpbuilt setPosASL _location;
+		_location = ASLtoATL _location; //Database uses ATL
+	} else {
+		_tmpbuilt setPosATL _location;
+	};
+
+	cutText [format[(localize "str_epoch_player_138"),_text], "PLAIN DOWN"];
+
+	_limit = 3; //times it takes to build by default
+
+	if (DZE_StaticConstructionCount > 0) then { //if count is manually overridden inside init.sqf, use that instead, else use limits configured in config files
+		_limit = DZE_StaticConstructionCount;
+	}
+	else {
+		if (isNumber (configFile >> "CfgVehicles" >> _classname >> "constructioncount")) then {
+			_limit = getNumber(configFile >> "CfgVehicles" >> _classname >> "constructioncount");
+		};
+	};
+
+	while {_isOk} do { //publish phase
+
+		[10,10] call dayz_HungerThirst;
+		player playActionNow "Medic"; //animation
+		
+		//alert zombies
+		_dis=20;
+		_sfx = "repair";
+		[player,_sfx,0,false,_dis] call dayz_zombieSpeak;
+		[player,_dis,true,(getPosATL player)] spawn player_alertZombies;
+
+		r_interrupt = false;
+		r_doLoop = true;
+		_started = false;
+		_finished = false;
+
+		while {r_doLoop} do { //while player is not interrupted, go trough animations
+			_animState = animationState player;
+			_isMedic = ["medic",_animState] call fnc_inString;
+			if (_isMedic) then {
+				_started = true;
+			};
+			if (_started && !_isMedic) then {
+				r_doLoop = false;
+				_finished = true;
+			};
+			if (r_interrupt || (player getVariable["combattimeout", 0] >= time)) then {
+				r_doLoop = false;
+			};
+			if (DZE_cancelBuilding) exitWith {
+				r_doLoop = false;
+			};
+			sleep 0.1;
+		};
+		r_doLoop = false;
+
+
+		if(!_finished) exitWith { //exit if interrupted
+			_isOk = false;
+			_proceed = false;
+		};
+
+		if(_finished) then { //if animation finished, add to build count
+			_counter = _counter + 1;
+		};
+
+		cutText [format[(localize "str_epoch_player_139"),_text, _counter,_limit], "PLAIN DOWN"]; //report how many steps are done out of total limit
+
+		if(_counter == _limit) exitWith { //if all steps done proceed with next step, otherwise cancel publish
+			_isOk = false;
+			_proceed = true;
+		};
+
+	};
+
+	if (_proceed) then {
+
+		_num_removed = ([player,DZE_buildItem] call BIS_fnc_invRemove); //remove item's magazine from inventory
+		if(_num_removed == 1) then {
+
+			cutText [format[localize "str_build_01",_text], "PLAIN DOWN"];
+
+			if (_isPole) then { //if item was a plotpole, build a visual radius around it
+				[] spawn player_plotPreview;
+			};
+
+			_tmpbuilt setVariable ["OEMPos",_location,true]; //store original location as a variable
+
+			if(_lockable > 1) then { //if item has code lock on it
+
+				_combinationDisplay = ""; //define new display
+
+				switch (_lockable) do { //generate random combinations depending on item type
+
+					case 2: { // 2 lockbox
+						_combination_1 = (floor(random 3)) + 100; // 100=red,101=green,102=blue
+						_combination_2 = floor(random 10);
+						_combination_3 = floor(random 10);
+						_combination = format["%1%2%3",_combination_1,_combination_2,_combination_3];
+						dayz_combination = _combination;
+						if (_combination_1 == 100) then {
+							_combination_1_Display = "Red";
+						};
+						if (_combination_1 == 101) then {
+							_combination_1_Display = "Green";
+						};
+						if (_combination_1 == 102) then {
+							_combination_1_Display = "Blue";
+						};
+						_combinationDisplay = format["%1%2%3",_combination_1_Display,_combination_2,_combination_3];
+					};
+
+					case 3: { // 3 combolock
+						_combination_1 = floor(random 10);
+						_combination_2 = floor(random 10);
+						_combination_3 = floor(random 10);
+						_combination = format["%1%2%3",_combination_1,_combination_2,_combination_3];
+						dayz_combination = _combination;
+						_combinationDisplay = _combination;
+					};
+
+					case 4: { // 4 safe
+						_combination_1 = floor(random 10);
+						_combination_2 = floor(random 10);
+						_combination_3 = floor(random 10);
+						_combination_4 = floor(random 10);
+						_combination = format["%1%2%3%4",_combination_1,_combination_2,_combination_3,_combination_4];
+						dayz_combination = _combination;
+						_combinationDisplay = _combination;
+					};
+				};
+
+				_tmpbuilt setVariable ["CharacterID",_combination,true]; //set combination as a character ID
+
+				//call publish precompiled function with given args and send public variable to server to save item to database
+				PVDZE_obj_Publish = [_combination,_tmpbuilt,[_dir,_location],_classname];
+				publicVariableServer "PVDZE_obj_Publish";
+
+				cutText [format[(localize "str_epoch_player_140"),_combinationDisplay,_text], "PLAIN DOWN", 5]; //display new combination
+
+
+			} else { //if not lockable item
+				_tmpbuilt setVariable ["CharacterID",dayz_characterID,true];
+
+				// fire?
+				if(_tmpbuilt isKindOf "Land_Fire_DZ") then { //if campfire, then spawn, but do not publish to database
+					_tmpbuilt spawn player_fireMonitor;
+				} else {
+					PVDZE_obj_Publish = [dayz_characterID,_tmpbuilt,[_dir,_location],_classname];
+					publicVariableServer "PVDZE_obj_Publish";
+				};
+			};
+		} else { //if magazine was not removed, cancel publish
+			deleteVehicle _tmpbuilt;
+			cutText [(localize "str_epoch_player_46") , "PLAIN DOWN"];
+		};
+
+	} else { //if player was interrupted, cancel publish and stop build animations
+		r_interrupt = false;
+		if (vehicle player == player) then {
+			[objNull, player, rSwitchMove,""] call RE;
+			player playActionNow "stop";
+		};
+
+		deleteVehicle _tmpbuilt;
+
+		cutText [(localize "str_epoch_player_46") , "PLAIN DOWN"];
+	};
+
+} else { //cancel build if passed _cancel arg was true or building on roads/trader city
+	cutText [format[(localize "str_epoch_player_47"),_text,_reason], "PLAIN DOWN"];
+};
+
+DZE_ActionInProgress = false; //in any case always finish last function with this to "reset" everything.

SQF/dayz_code/actions/player_build_states.sqf

@@ -0,0 +1,39 @@
+if(!DZE_ActionInProgress) exitWith {};
+//disallow building if these conditions are not met
+private ["_isFine","_onLadder","_vehicle","_inVehicle"];
+
+_isFine = "ok"; //define variable to avoid RPT errors
+_onLadder =	(getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "onLadder")) == 1;
+_vehicle = vehicle player;
+_inVehicle = (_vehicle != player);
+
+if (dayz_isSwimming) exitWith { //end script if player is swimming
+	DZE_ActionInProgress = false;
+	cutText [localize "str_player_26", "PLAIN DOWN"];
+	_isFine = "Swimming";
+	_isFine
+};
+
+if (_inVehicle) exitWith { //end script if player is in vehicle
+	DZE_ActionInProgress = false;
+	cutText [(localize "str_epoch_player_42"), "PLAIN DOWN"];
+	_isFine = "In vehicle";
+	_isFine
+};
+
+if (_onLadder) exitWith { //end script if player is climbing on ladder
+	DZE_ActionInProgress = false;
+	cutText [localize "str_player_21", "PLAIN DOWN"];
+	_isFine = "On ladder";
+	_isFine
+};
+
+if (player getVariable["combattimeout", 0] >= time) exitWith { //end script if player is in combat
+	DZE_ActionInProgress = false;
+	cutText [(localize "str_epoch_player_43"), "PLAIN DOWN"];
+	_isFine = "In combat";
+	_isFine
+};
+
+_isFine //returns string to caller, default is "ok" if conditions were not met
+

SQF/dayz_code/actions/player_drink.sqf

@@ -48,31 +48,26 @@ if (["ItemSoda",_itemorignal] call fnc_inString) then {
     [player,_dis,true,(getPosATL player)] spawn player_alertZombies;
 };
 
-if (_hasoutput) then{
-	_itemtodrop = drink_output select(drink_with_output find _itemorignal);
-
-	if (!_invehicle) then {
+if (_hasoutput) then {
 	// Selecting output
 	_itemtodrop = drink_output select (drink_with_output find _itemorignal);
 
+	if (!_invehicle) then {
 		sleep 3;
-		_nearByPile= nearestObjects [(getPosATL player), ["WeaponHolder","WeaponHolderBase"],2];
-		if (count _nearByPile ==0) then {
+		_nearByPile = nearestObjects [(getPosATL player), ["WeaponHolder","WeaponHolderBase"],2];
+		if (count _nearByPile == 0) then {
 			_iPos = getPosATL player;
 			_radius = 0.0;
 			_item = createVehicle ["WeaponHolder", _iPos, [], _radius, "CAN_COLLIDE"];
-			_item setposATL _iPos;
+			_item setPosATL _iPos;
 		} else {
 			_item = _nearByPile select 0;
 		};
 		_item addMagazineCargoGlobal [_itemtodrop,1];
-	};
-
-	if (_invehicle) then {
+	} else {
 		sleep 2;
 		(vehicle player) addMagazineCargoGlobal [_itemtodrop,1];
 	};
-
 };
 
 //add infection chance for "ItemWaterbottle",

SQF/dayz_code/actions/player_eat.sqf

@@ -48,26 +48,26 @@ if (dayz_lastMeal < 3600) then {
 	};
 };
 
-if (_hasoutput && !_invehicle) then {
+if (_hasoutput) then {
 	// Selecting output
 	_itemtodrop = food_output select (food_with_output find _itemorignal);
 
+	if (!_invehicle) then {
 		sleep 3;
-    _nearByPile= nearestObjects [(getposATL player), ["WeaponHolder","WeaponHolderBase"],2];
-    if (count _nearByPile ==0) then {
+		_nearByPile = nearestObjects [(getPosATL player), ["WeaponHolder","WeaponHolderBase"],2];
+		if (count _nearByPile == 0) then {
 			_iPos = getPosATL player;
 			_radius = 0.0;
 			_item = createVehicle ["WeaponHolder", _iPos, [], _radius, "CAN_COLLIDE"];
-		_item setposATL _iPos;
+			_item setPosATL _iPos;
 		} else {
 			_item = _nearByPile select 0;
 		};
 		_item addMagazineCargoGlobal [_itemtodrop,1];
-};
-
-if (_hasoutput && _invehicle) then {
+	} else {
 		sleep 2;
 		(vehicle player) addMagazineCargoGlobal [_itemtodrop,1];
+	};
 };
 
 if (_rawfood && !_rawexceptions && (random 15 < 1)) then {

SQF/dayz_code/actions/player_goFishing.sqf

@@ -17,7 +17,7 @@ if(!(surfaceIsWater _position)) exitWith {DZE_ActionInProgress = false; cutText
 if((currentWeapon player) != "MeleeFishingPole") exitWith {DZE_ActionInProgress = false; cutText [(localize "str_epoch_player_67"), "PLAIN DOWN"]; };
 
 if(dayz_isSwimming) exitWith {DZE_ActionInProgress = false; cutText [localize "str_player_26", "PLAIN DOWN"]; };
-if(player getVariable["combattimeout", 0] >= time) exitWith {DZE_ActionInProgress = false; cutText [(localize "str_epoch_player_68"), "PLAIN DOWN"];};
+if(player getVariable["combattimeout", 0] >= time) exitWith {DZE_ActionInProgress = false; cutText [(localize "str_epoch_player_312"), "PLAIN DOWN"];};
 
 _isOk = true;
 _counter = 0;

SQF/dayz_code/actions/show_dialog.sqf

@@ -11,7 +11,7 @@ lbClear TraderDialogCatList;
 lbClear TraderDialogItemList;
 
 TraderCurrentCatIndex = -1;
-TraderItemList = -1;
+TraderItemList = [];
 
 TraderCatList = [];
 {
@@ -21,4 +21,4 @@ TraderCatList = [];
 } count _trader_data;
 waitUntil { !dialog };
 TraderCurrentCatIndex = -1;
-TraderCatList = -1;
+TraderCatList = [];

SQF/dayz_code/actions/snap_build.sqf

@@ -3,7 +3,7 @@
 // July 10 2014					   //
 /*--------------------------------*/
 
-private ["_object","_objectSnapGizmo","_objColorActive","_objColorInactive","_classname","_whitelist","_points","_radius","_cfg","_cnt","_pos","_findWhitelisted","_nearbyObject","_posNearby","_selectedAction","_newPos","_pointsNearby","_onWater"];
+private ["_object","_objectSnapGizmo","_objColorActive","_objColorInactive","_classname","_whitelist","_points","_radius","_cfg","_cnt","_pos","_findWhitelisted","_nearbyObject","_posNearby","_selectedAction","_newPos","_pointsNearby","_onWater","_waterBase"];
 //Args
 snapActionState = _this select 3 select 0;
 _object = _this select 3 select 1;
@@ -57,24 +57,23 @@ fnc_initSnapPoints = {
 };
 
 fnc_initSnapPointsNearby = {
-	_pos = getPosATL _object;
+	_pos = [_object] call FNC_GetPos;
 	_findWhitelisted = []; _pointsNearby = [];
-	_findWhitelisted = nearestObjects [_pos,_whitelist,_radius]-[_object];
+	_findWhitelisted = nearestObjects [_pos,_whitelist,(_radius + DZE_snapExtraRange)]-[_object];
 	snapGizmosNearby = [];	
 	{	
 		_nearbyObject = _x;
 		_pointsNearby = getArray (configFile >> "SnapBuilding" >> (typeOf _x) >> "points");
 		{
-			_onWater = surfaceIsWater position _nearbyObject;
 			_objectSnapGizmo = "Sign_sphere10cm_EP1" createVehicleLocal [0,0,0];
 			_objectSnapGizmo setobjecttexture [0,_objColorInactive];
+			_objectSnapGizmo setDir (getDir _nearbyObject);
 			_posNearby = _nearbyObject modelToWorld [_x select 0,_x select 1,_x select 2];
-			if (_onWater) then {
+			if (surfaceIsWater _posNearby) then {
 				_objectSnapGizmo setPosASL [(_posNearby) select 0,(_posNearby) select 1,(getPosASL _nearbyObject select 2) + (_x select 2)];
 			} else {
 				_objectSnapGizmo setPosATL _posNearby;
 			};
-			_objectSnapGizmo setDir (getDir _nearbyObject);
 			snapGizmosNearby set [count snapGizmosNearby,_objectSnapGizmo];
 		} count _pointsNearby;
 	} forEach _findWhitelisted;
@@ -82,7 +81,7 @@ fnc_initSnapPointsNearby = {
 
 fnc_initSnapPointsCleanup = {
 	{detach _x;deleteVehicle _x;}count snapGizmos;snapGizmos=[];
-	{deleteVehicle _x;}count snapGizmosNearby;snapGizmosNearby=[];
+	{detach _x;deleteVehicle _x;}count snapGizmosNearby;snapGizmosNearby=[];
 	snapActionState = "OFF";
 };
 
@@ -92,12 +91,7 @@ fnc_snapDistanceCheck = {
 	_distClosestPointFound = objNull; _distCheck = 0; _distClosest = 10; _distClosestPoint = objNull; _testXPos = []; _distClosestPointFoundPos =[]; _distClosestPointFoundDir = 0;
 		{	
 			if (_x !=_distClosestPointFound) then {_x setobjecttexture [0,_objColorInactive];};
-			_onWater = surfaceIsWater position _x;
-			if (_onWater) then {
-				_testXPos = [(getPosASL _x select 0),(getPosASL _x select 1),(getPosASL _x select 2)];
-			} else {
-				_testXPos = [(getPosATL _x select 0),(getPosATL _x select 1),(getPosATL _x select 2)];
-			};
+			_testXPos = [_x] call FNC_GetPos;
 			_distCheck = _objectHelper distance _testXPos;
 			_distClosestPoint = _x;
 				if (_distCheck < _distClosest) then {
@@ -127,12 +121,7 @@ fnc_snapDistanceCheck = {
 				_distClosestAttached = objNull; _distCheckAttached = 0; _distClosest = 10; _distClosestAttachedFoundPos = [];
 				{
 					if (_x !=_distClosestAttached) then {_x setobjecttexture [0,_objColorInactive];};
-					_onWater = surfaceIsWater position _x;
-					if (_onWater) then {
-						_testXPos = [(getPosASL _x select 0),(getPosASL _x select 1),(getPosASL _x select 2)];
-					} else {
-						_testXPos = [(getPosATL _x select 0),(getPosATL _x select 1),(getPosATL _x select 2)];
-					};
+					_testXPos = [_x] call FNC_GetPos;
 					_distCheckAttached = _distClosestPointFound distance _testXPos;
 					_distClosestPoint = _x;
 						if (_distCheckAttached < _distClosest) then {
@@ -242,7 +231,7 @@ switch (snapActionState) do {
 		[1,0,0] call fnc_snapActionCleanup;
 		[] spawn {
 		while {true} do {
-			if(!DZE_ActionInProgress) exitWith {call fnc_initSnapPointsCleanup;[0,0,0] call fnc_snapActionCleanup; ["",false] call fnc_initSnapTutorial; snapActionState = "OFF";};
+			if(!DZE_ActionInProgress || DZE_cancelBuilding) exitWith {call fnc_initSnapPointsCleanup;[0,0,0] call fnc_snapActionCleanup; ["",false] call fnc_initSnapTutorial; snapActionState = "OFF";};
 			sleep 2;
 			};
 		};
@@ -283,10 +272,11 @@ switch (snapActionState) do {
 		_newPos = [(getPosATL _x select 0),(getPosATL _x select 1),(getPosATL _x select 2)];
 		detach _object;
 		detach _objectHelper;
+		_objectHelper setDir (getDir _object);
 		_objectHelper setPosATL _newPos;
 		_object attachTo [_objectHelper];
 		_x setobjecttexture [0,_objColorActive];
-		if (!helperDetach) then {_objectHelper attachTo [player];};	
+		if (!helperDetach) then {_objectHelper attachTo [player]; _objectHelper setDir ((getDir _objectHelper)-(getDir player));};	
 	};
 	_cnt = _cnt+1;
 }count snapGizmos;

SQF/dayz_code/compile/fn_checkItems.sqf

@@ -41,5 +41,5 @@ _hasItems = true;
 		_textMissing = getText(configFile >> "CfgMagazines" >> _missing >> "displayName");
 		cutText [format[(localize "STR_EPOCH_ACTIONS_12"), _missingQty, _textMissing], "PLAIN DOWN"];
 	};
-} count _items;
+} forEach _items;
 _hasItems

SQF/dayz_code/compile/fn_damageActions.sqf

@@ -76,7 +76,7 @@ if (_inVehicle) then {
 
 if (!isNull _menClose && _hasPatient && !r_drag_sqf && !r_action && !_inVehicle && !r_player_unconscious && _isClose) then {
 	_unit = 		cursorTarget;
-	_isDisallowRefuel = typeOf _unit in ["M240Nest_DZ"];
+	_isDisallowRefuel = typeOf _unit in ["M240Nest_DZ","MMT_Civ","MMT_USMC","Old_bike_TK_CIV_EP1","Old_bike_TK_INS_EP1"];
 	// player reveal _unit;
 	_vehClose = 	(getPosATL player) nearEntities [["Car","Tank","Helicopter","Plane","StaticWeapon","Ship"],5]; //nearestObjects [player, ["Car","Tank","Helicopter","Plane","StaticWeapon","Ship"], 5];
 	_hasVehicle = 	({alive _x} count _vehClose > 0);

SQF/dayz_code/compile/fn_gearMenuChecks.sqf

@@ -13,7 +13,7 @@ _isOk = false;
 		_isOk = _cTarget isKindOf _x;
 	};
 } count ["LandVehicle","Air", "Ship"];
-_Dis = if (_cTarget isKindOf "USEC_ch53_E") then {25;} else {12;};
+_Dis = if (_cTarget isKindOf "USEC_ch53_E" || _cTarget isKindOf "MV22") then {25} else {12};
 if((locked _cTarget) && _isOk && (((vehicle player) distance _cTarget) < _Dis)) then {
 	cutText [(localize "str_epoch_player_7") , "PLAIN DOWN"];
 	_display closeDisplay 1;

SQF/dayz_code/compile/fn_selfActions.sqf

@@ -866,6 +866,10 @@ if (!isNull cursorTarget && !_inVehicle && !_isPZombie && (player distance curso
 	s_player_SurrenderedGear = -1;
 
 	//Others
+    	player removeAction s_player_maintain_area;
+    	s_player_maintain_area = -1;
+    	player removeAction s_player_maintain_area_preview;
+    	s_player_maintain_area_preview = -1;
 	player removeAction s_player_forceSave;
 	s_player_forceSave = -1;
 	player removeAction s_player_flipveh;

SQF/dayz_code/compile/fn_unconscious.sqf

@@ -11,7 +11,9 @@ if ((!r_player_handler1) && (r_handlerCount == 0)) then {
 	_timeout = 0;
 	r_handlerCount = r_handlerCount + 1;
 	r_player_handler1 = true;
+	if (vehicle player == player) then {
 		player playAction "CanNotMove";
+	};
 	"dynamicBlur" ppEffectEnable true;"dynamicBlur" ppEffectAdjust [2]; "dynamicBlur" ppEffectCommit 0;
 	"colorCorrections" ppEffectEnable true;"colorCorrections" ppEffectEnable true;"colorCorrections" ppEffectAdjust [1, 1, 0, [1, 1, 1, 0.0], [1, 1, 1, 0.1],  [1, 1, 1, 0.0]];"colorCorrections" ppEffectCommit 0;
 	0 fadeSound 0.05;

SQF/dayz_code/compile/local_lights_init.sqf

@@ -137,7 +137,7 @@ if(isServer)then{
 				};
 			};
 			sleep 0.001;
-		} count _missonLights;
+		} forEach _missonLights;
 		if (_delQtyLights > 0) then {
 			_qty = count _missonLights;
 			diag_log (format["CLEANUP: Deleted %1 Lights out of %2",_delQtyLights,_qty]);

SQF/dayz_code/compile/object_speak.sqf

@@ -39,11 +39,10 @@ if (count _this > 4) then {
 };
 
 _isWoman = getText(configFile >> "cfgVehicles" >> (typeOf _unit) >> "TextPlural") == "Women";
-if (_isWoman && (_type in ["scream","panic"])) then {
+if (_isWoman && (_type in ["scream","panic","cough"])) then {
 	_type = _type + "_w";
 };
 
-
 if ((round(random _chance) == _chance) || (_chance == 0)) then {
 	_rnd =(round(random _num));
 	_sound = "z_" + _type + "_" + str(_rnd);

SQF/dayz_code/compile/player_gearSync.sqf

@@ -1,5 +1,5 @@
 private ["_objects"];
-_objects = nearestObjects [getPosATL player, dayz_updateObjects, 10];
+_objects = nearestObjects [player, dayz_updateObjects, 10];
 {
 	//["PVDZE_veh_Update",[_x,"gear"]] call callRpcProcedure;
 	PVDZE_veh_Update = [_x,"gear"];

SQF/dayz_code/compile/player_onPause.sqf

@@ -31,7 +31,7 @@ while {!isNull _display} do {
 			cutText [localize "str_abort_playerclose", "PLAIN DOWN"];
 			_sleep = 1;
 		};
-		case (!r_player_dead && !canbuild) : {
+		case (!r_player_dead && isInTraderCity) : {
 			_btnAbort ctrlEnable false;
 			cutText [(localize "str_epoch_player_12"), "PLAIN DOWN"];
 			_sleep = 1;

SQF/dayz_code/compile/player_spawnCheck.sqf

@@ -150,4 +150,4 @@ if (_nearbyCount < 1) exitwith
 			};
 		};
 	};
-} count _nearby;
+} forEach _nearby;

SQF/dayz_code/compile/player_switchModel.sqf

@@ -1,4 +1,4 @@
-private ["_weapons","_backpackWpn","_backpackMag","_currentWpn","_isWeapon","_backpackWpnTypes","_backpackWpnQtys","_countr","_class","_position","_dir","_currentAnim","_tagSetting","_playerUID","_countMags","_magazines","_primweapon","_secweapon","_newBackpackType","_muzzles","_oldUnit","_group","_newUnit","_playerObjName","_wpnType","_ismelee"];
+private ["_weapons","_backpackWpn","_backpackMag","_currentWpn","_isWeapon","_backpackWpnTypes","_backpackWpnQtys","_countr","_class","_position","_dir","_currentAnim","_tagSetting","_playerUID","_countMags","_magazines","_primweapon","_secweapon","_newBackpackType","_muzzles","_oldUnit","_group","_newUnit","_playerObjName","_wpnType","_ismelee","_oldGroup"];
 if (gear_done) then {disableUserInput true;};
 _class 			= _this;
 _position 		= getPosATL player;
@@ -43,6 +43,7 @@ player setPosATL dayz_spawnPos;
 
 //BackUp Player Object
 _oldUnit = player;
+_oldGroup = group player;
 
 /**********************************/
 //DONT USE player AFTER THIS POINT//
@@ -110,6 +111,7 @@ _switchUnit = {
 	removeAllWeapons _oldUnit;
 	{_oldUnit removeMagazine _x;} count  magazines _oldUnit;
 	deleteVehicle _oldUnit;
+	if (count units _oldGroup < 1) then {deleteGroup _oldGroup;};
 	if(_currentWpn != "") then {_newUnit selectWeapon _currentWpn;};
 };
 //Add && Fill BackPack

SQF/dayz_code/compile/player_traderMenuConfig.sqf

@@ -8,12 +8,12 @@ TraderDialogSellBtn = 12005;
 TraderDialogCurrency = 12006;
 
 TraderCurrentCatIndex = -1;
-TraderCatList = -1;
-TraderItemList = -1;
+TraderCatList = [];
+TraderItemList = [];
 
 TraderDialogLoadItemList = {
 	private ["_index","_trader_id","_activatingPlayer","_distance","_objclass","_item_list"];
-	TraderItemList = -1;
+	TraderItemList = [];
 	_index = _this select 0;
 
 	if (_index < 0) exitWith {};
@@ -210,7 +210,7 @@ TraderDialogBuy = {
 	_item = TraderItemList select _index;
 	_data = [_item select 0, _item select 3, 1, _item select 2, "buy", _item select 4, _item select 1, _item select 8];
 	[0, player, '', _data] execVM (_item select 9);
-	TraderItemList = -1;
+	TraderItemList = [];
 };
 
 TraderDialogSell = {
@@ -222,5 +222,5 @@ TraderDialogSell = {
 	_item = TraderItemList select _index;
 	_data = [_item select 6, _item select 0, _item select 5, 1, "sell", _item select 1, _item select 7, _item select 8];
 	[0, player, '', _data] execVM (_item select 9);
-	TraderItemList = -1;
+	TraderItemList = [];
 };

SQF/dayz_code/compile/player_traderMenuHive.sqf

@@ -8,12 +8,12 @@ TraderDialogSellBtn = 12005;
 TraderDialogCurrency = 12006;
 
 TraderCurrentCatIndex = -1;
-TraderCatList = -1;
-TraderItemList = -1;
+TraderCatList = [];
+TraderItemList = [];
 
 TraderDialogLoadItemList = {
 	private ["_index","_trader_id","_activatingPlayer","_distance","_objclass","_item_list"];
-	TraderItemList = -1;
+	TraderItemList = [];
 	_index = _this select 0;
 
 	if (_index < 0 || TraderCurrentCatIndex == _index) exitWith {};
@@ -198,7 +198,7 @@ TraderDialogBuy = {
 	_item = TraderItemList select _index;
 	_data = [_item select 0, _item select 3, 1, _item select 2, "buy", _item select 4, _item select 1, _item select 8];
 	[0, player, '', _data] execVM (_item select 9);
-	TraderItemList = -1;
+	TraderItemList = [];
 };
 
 TraderDialogSell = {
@@ -210,5 +210,5 @@ TraderDialogSell = {
 	_item = TraderItemList select _index;
 	_data = [_item select 6, _item select 0, _item select 5, 1, "sell", _item select 1, _item select 7, _item select 8];
 	[0, player, '', _data] execVM (_item select 9);
-	TraderItemList = -1;
+	TraderItemList = [];
 };

SQF/dayz_code/compile/spawn_loot_small.sqf

@@ -64,7 +64,6 @@ switch (_iClass) do
 	case "cfglootweapon":
 	{
 		//Item is sigle, add 1 item from cfgloot
-		_item = createVehicle ["WeaponHolder", _iPos, [], _radius, "CAN_COLLIDE"];
 
 		_itemTypes = [];
 		if (DZE_MissionLootTable) then{

SQF/dayz_code/compile/wild_spawnZombies.sqf

@@ -50,11 +50,8 @@ _agent setVariable ["newDest",_newDest];
 //Add some loot
 _rnd = random 1;
 if (_rnd > 0.3) then {
-	if (DZE_MissionLootTable) then {
-		_lootType = getText (missionConfigFile >> "CfgVehicles" >> _type >> "zombieLoot");
-	} else {
+
 	_lootType = getText (configFile >> "CfgVehicles" >> _type >> "zombieLoot");
-	};
 
 	if (DZE_MissionLootTable) then {
 		_lootTypeCfg = getArray (missionConfigFile >> "CfgLoot" >> _lootType);

SQF/dayz_code/compile/zombie_generate.sqf

@@ -89,9 +89,15 @@ if ((dayz_spawnZombies < _maxControlledZombies) && (dayz_CurrentNearByZombies <
 			_lootType = configFile >> "CfgVehicles" >> _type >> "zombieLoot";
 			if (isText _lootType) then {
 				_array = [];
+				if (DZE_MissionLootTable) then {
+					{
+						_array set [count _array, _x select 0] 
+					} forEach getArray (missionConfigFile >> "cfgLoot" >> getText(_lootType));
+				} else {
 					{
 						_array set [count _array, _x select 0] 
 					} forEach getArray (configFile >> "cfgLoot" >> getText(_lootType));
+				};
 				if (count _array > 0) then {
 					_index = dayz_CLBase find getText(_lootType);
 					_weights = dayz_CLChances select _index;

SQF/dayz_code/init/compiles.sqf

@@ -99,7 +99,23 @@ if (!isDedicated) then {
 	player_makeFire =			compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_makefire.sqf";
 	player_harvestPlant =		compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_harvestPlant.sqf";
 	player_goFishing =			compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_goFishing.sqf";
+	
+	if (DZE_modularBuild) then {
+		player_build =				compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\modular_build.sqf";
+		player_build_countNearby =	compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_build_countNearby.sqf";
+		player_build_states =		compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_build_states.sqf";
+		player_build_needNearby =	compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_build_needNearby.sqf";
+		player_build_getConfig =	compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_build_getConfig.sqf";
+		player_build_plotCheck =	compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_build_plotCheck.sqf";
+		player_build_buildReq =		compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_build_buildReq.sqf";
+		player_build_create =		compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_build_create.sqf";
+		player_build_controls =		compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_build_controls.sqf";
+		player_build_publish =		compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_build_publish.sqf";
+		snap_build = 				compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\snap_build.sqf";
+	} else {
 		player_build =				compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_build.sqf";
+	};
+	
 	player_wearClothes =		compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_wearClothes.sqf";
 	object_pickup = 			compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\object_pickup.sqf";
 	player_flipvehicle = 		compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_flipvehicle.sqf";
@@ -107,12 +123,6 @@ if (!isDedicated) then {
 	player_antiWall =			compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_antiWall.sqf";
 	player_deathBoard =			compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\list_playerDeathsAlt.sqf";
 	
-	//Snap building - disabled by default, not sure about your stance towards this mod yet, feel free to edit
-	if (DZE_snapBuilding) then {
-		player_build =			compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_build2.sqf";
-		snap_build = 			compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\snap_build.sqf";
-	};
-	
 	player_plotPreview = 		compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\object_showPlotRadius.sqf";
 	player_upgradeVehicle =		compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_upgradeVehicle.sqf";
 
@@ -440,7 +450,10 @@ if (!isDedicated) then {
 
         // 120 sec timeout (12000 * 0.01)
         while { _timeOut < 12000 } do {
-            if (dayz_clientPreload && dayz_authed) exitWith { diag_log "PLOGIN: Login loop completed!"; };
+           if (dayz_clientPreload && dayz_authed) exitWith { 
+					diag_log "PLOGIN: Login loop completed!"; 
+					endLoadingScreen;
+				 };
             if (!isNil "_display") then {
                 if ( isNull _display ) then {
                         waitUntil { !dialog; };

SQF/dayz_code/init/variables.sqf

@@ -274,6 +274,10 @@ s_player_madsci 		= 	[];
 s_player_parts 			= 	[];
 s_player_combi 			= 	[];
 
+//Modular player_build
+snapGizmos = [];
+snapGizmosNearby = [];
+
 //Initialize Medical Variables
 r_interrupt = 			false;
 r_doLoop = 				false;
@@ -538,8 +542,17 @@ if(isNil "DZE_StaticConstructionCount") then {
 if (isNil "DZE_selfTransfuse_Values") then {
 	DZE_selfTransfuse_Values = [12000, 15, 300];
 };
-if (isNil "DZE_snapBuilding") then {
-	DZE_snapBuilding = false;
+if (isNil "helperDetach") then {
+	helperDetach = false;
+};
+if (isNil "DZE_modularBuild") then {
+	DZE_modularBuild = false;
+};
+if (isNil "DZE_snapExtraRange") then {
+	DZE_snapExtraRange = 0;
+};
+if (isNil "DZE_checkNearbyRadius") then {
+	DZE_checkNearbyRadius = 30;
 };
 
 // needed on server
@@ -790,6 +803,8 @@ if(!isDedicated) then {
 	DZE_4 = false;
 	DZE_6 = false;
 	
+	DZE_F = false;
+
 	DZE_cancelBuilding = false;
 	DZE_PZATTACK = false;
 

SQF/dayz_code/medical/publicEH/promptRName.sqf

@@ -1,6 +0,0 @@
-// promptRName.sqf
-
-private ["_unit"];
-_unit = _this select 0;
-
-call compile format ["server globalChat reviver_%1", _unit];

SQF/dayz_code/medical/setup_functions_med.sqf

@@ -260,7 +260,9 @@ fnc_usec_recoverUncons = {
 	sleep 1;
 
 	disableUserInput false;
+	if (vehicle player == player) then {
 		[objNull,player,rSwitchMove,"AinjPpneMstpSnonWnonDnon"] call RE;
 		player switchMove "AinjPpneMstpSnonWnonDnon";
 		player playMoveNow "AmovPpneMstpSnonWnonDnon_healed";
+	};
 };

SQF/dayz_code/system/antihack.sqf

@@ -75,7 +75,7 @@ while {1 == 1} do {
 		_distance = _lastpos distance _curpos;
 		_curtime = diag_ticktime;
 		_difftime = _curtime - _lasttime;
-		_acceptableDistance = if (_lastVehicle isKindOf "Plane") then { 15; } else { 10; };
+		_acceptableDistance = if (_lastVehicle isKindOf "Plane") then [{15},{10}];
 
 		if ((_distance > _acceptableDistance) || {(_difftime > 1)}) then {
 			_curheight = (ATLtoASL _curpos) select 2;

SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyTrucks.hpp

@@ -1,30 +1,30 @@
 class Category_495 {
-	class hilux1_civil_3_open_EP1 {
+	class hilux1_civil_3_open_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {8,"ItemGoldBar"};
 		sell[] = {4,"ItemGoldBar"};
 	};
-	class datsun1_civil_3_open {
+	class datsun1_civil_3_open_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {8,"ItemGoldBar"};
 		sell[] = {4,"ItemGoldBar"};
 	};
-	class hilux1_civil_1_open {
+	class hilux1_civil_1_open_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {8,"ItemGoldBar"};
 		sell[] = {4,"ItemGoldBar"};
 	};
-	class datsun1_civil_2_covered {
+	class datsun1_civil_2_covered_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {8,"ItemGoldBar"};
 		sell[] = {4,"ItemGoldBar"};
 	};
-	class datsun1_civil_1_open {
+	class datsun1_civil_1_open_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {8,"ItemGoldBar"};
 		sell[] = {4,"ItemGoldBar"};
 	};
-	class hilux1_civil_2_covered {
+	class hilux1_civil_2_covered_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {8,"ItemGoldBar"};
 		sell[] = {4,"ItemGoldBar"};

SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyTrucksUnarmed.hpp

@@ -1,30 +1,30 @@
 class Category_535 {
-	class hilux1_civil_3_open_EP1 {
+	class hilux1_civil_3_open_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {8,"ItemGoldBar"};
 		sell[] = {4,"ItemGoldBar"};
 	};
-	class datsun1_civil_3_open {
+	class datsun1_civil_3_open_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {8,"ItemGoldBar"};
 		sell[] = {4,"ItemGoldBar"};
 	};
-	class hilux1_civil_1_open {
+	class hilux1_civil_1_open_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {8,"ItemGoldBar"};
 		sell[] = {4,"ItemGoldBar"};
 	};
-	class datsun1_civil_2_covered {
+	class datsun1_civil_2_covered_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {8,"ItemGoldBar"};
 		sell[] = {4,"ItemGoldBar"};
 	};
-	class datsun1_civil_1_open {
+	class datsun1_civil_1_open_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {8,"ItemGoldBar"};
 		sell[] = {4,"ItemGoldBar"};
 	};
-	class hilux1_civil_2_covered {
+	class hilux1_civil_2_covered_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {8,"ItemGoldBar"};
 		sell[] = {4,"ItemGoldBar"};

SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralTrucks.hpp

@@ -1,62 +1,62 @@
 class Category_659 {
-	class hilux1_civil_3_open_EP1 {
+	class hilux1_civil_3_open_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {8,"ItemGoldBar"};
 		sell[] = {4,"ItemGoldBar"};
 	};
-	class datsun1_civil_3_open {
+	class datsun1_civil_3_open_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {8,"ItemGoldBar"};
 		sell[] = {4,"ItemGoldBar"};
 	};
-	class hilux1_civil_1_open {
+	class hilux1_civil_1_open_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {8,"ItemGoldBar"};
 		sell[] = {4,"ItemGoldBar"};
 	};
-	class datsun1_civil_2_covered {
+	class datsun1_civil_2_covered_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {8,"ItemGoldBar"};
 		sell[] = {4,"ItemGoldBar"};
 	};
-	class datsun1_civil_1_open {
+	class datsun1_civil_1_open_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {8,"ItemGoldBar"};
 		sell[] = {4,"ItemGoldBar"};
 	};
-	class hilux1_civil_2_covered {
+	class hilux1_civil_2_covered_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {8,"ItemGoldBar"};
 		sell[] = {4,"ItemGoldBar"};
 	};
 };
 class Category_590 {
-	class hilux1_civil_3_open_EP1 {
+	class hilux1_civil_3_open_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {8,"ItemGoldBar"};
 		sell[] = {4,"ItemGoldBar"};
 	};
-	class datsun1_civil_3_open {
+	class datsun1_civil_3_open_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {8,"ItemGoldBar"};
 		sell[] = {4,"ItemGoldBar"};
 	};
-	class hilux1_civil_1_open {
+	class hilux1_civil_1_open_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {8,"ItemGoldBar"};
 		sell[] = {4,"ItemGoldBar"};
 	};
-	class datsun1_civil_2_covered {
+	class datsun1_civil_2_covered_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {8,"ItemGoldBar"};
 		sell[] = {4,"ItemGoldBar"};
 	};
-	class datsun1_civil_1_open {
+	class datsun1_civil_1_open_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {8,"ItemGoldBar"};
 		sell[] = {4,"ItemGoldBar"};
 	};
-	class hilux1_civil_2_covered {
+	class hilux1_civil_2_covered_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {8,"ItemGoldBar"};
 		sell[] = {4,"ItemGoldBar"};

SQF/dayz_epoch_b/stringtable.xml

@@ -3147,14 +3147,14 @@
 			<Czech>Nelze stavět v boji.</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_PLAYER_44">
-			<Original>Cannot build plot pole within 45m of an existing plot.</Original>
-			<English>Cannot build plot pole within 45m of an existing plot.</English>
-			<German>Grundstück-Markierung kann nicht innerhalb 45m von einem bestehenden Grundstück erbaut werden.</German>
-			<Russian>Нельзя построить столб в пределах 45м. от существующего столба.</Russian>
+			<Original>Cannot build plot pole within %1m of an existing plot.</Original>
+			<English>Cannot build plot pole within %1m of an existing plot.</English>
+			<German>Grundstück-Markierung kann nicht innerhalb %1m von einem bestehenden Grundstück erbaut werden.</German>
+			<Russian>Нельзя построить столб в пределах %1м. от существующего столба.</Russian>
 			<!-- <Spanish></Spanish> -->
-			<Dutch>Kan bouw-paal niet bouwen op minder als 45m afstand van een bestaand bouwterrein.</Dutch>
-			<French>Impossible de construire un panneau de propriété privée à moins de 45m d'un autre panneau du genre.</French>
-			<Czech>Nelze postavit hraniční značku ve vzdálenosti 45 metrů od jiné značky.</Czech>
+			<Dutch>Kan bouw-paal niet bouwen op minder als %1m afstand van een bestaand bouwterrein.</Dutch>
+			<French>Impossible de construire un panneau de propriété privée à moins de %1m d'un autre panneau du genre.</French>
+			<Czech>Nelze postavit hraniční značku ve vzdálenosti %1 metrů od jiné značky.</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_PLAYER_45">
 			<Original>PgUp to raise or PgDn to lower (Hold ALT to raise faster or CTRL slower), Q or E to flip 180. Space-Bar to build.</Original>
@@ -4804,7 +4804,7 @@
       <!-- <Spanish></Spanish> -->
       <!-- <Dutch>Voeg 1 10oz Goud toe</Dutch> -->
       <!-- <French></French> -->
-      <!-- <Czech>Přidáno 1 10oz zlata</Czech> -->
+      <Czech>Přidat 1 10oz stříbra</Czech>
     </Key>
     <Key ID="STR_EPOCH_PLAYER_S_198">
       <Original>Add 10 10oz Silver</Original>
@@ -4814,7 +4814,7 @@
       <!-- <Spanish></Spanish> -->
       <!-- <Dutch>Voeg 10 10oz Goud toe</Dutch> -->
       <!-- <French></French> -->
-      <!-- <Czech>Přidáno 10 10oz zlata</Czech> -->
+      <Czech>Přidat 10 10oz stříbra</Czech>
     </Key>
     <Key ID="STR_EPOCH_PLAYER_S_199">
       <Original>Add 9 10oz Silver</Original>
@@ -4824,7 +4824,7 @@
       <!-- <Spanish></Spanish> -->
       <!-- <Dutch>Voeg 9 10oz Goud toe</Dutch> -->
       <!-- <French></French> -->
-      <!-- <Czech>Přidáno 9 10oz zlata</Czech> -->
+      <Czech>Přidat 9 10oz stříbra</Czech>
     </Key>
     <Key ID="STR_EPOCH_PLAYER_S_200">
       <Original>Remove 1 10oz Silver</Original>
@@ -4834,7 +4834,7 @@
       <!-- <Spanish></Spanish> -->
       <!-- <Dutch>Verwijder 1 10oz Goud</Dutch> -->
       <!-- <French></French> -->
-      <!-- <Czech>Odebráno 1 10oz zlato</Czech> -->
+      <Czech>Odebráno 1 10oz stříbra</Czech>
     </Key>
     <Key ID="STR_EPOCH_PLAYER_S_202">
       <Original>Add 8 10oz Silver</Original>
@@ -4844,7 +4844,7 @@
       <!-- <Spanish></Spanish> -->
       <!-- <Dutch>Voeg 8 10oz Goud toe</Dutch> -->
       <!-- <French></French> -->
-      <!-- <Czech>Přidáno 8 10oz zlata</Czech> -->
+      <Czech>Přidat 8 10oz stříbra</Czech>
     </Key>
     <Key ID="STR_EPOCH_PLAYER_S_203">
       <Original>Add 7 10oz Silver</Original>
@@ -4854,7 +4854,7 @@
       <!-- <Spanish></Spanish> -->
       <!-- <Dutch>Voeg 7 10oz Goud toe</Dutch> -->
       <!-- <French></French> -->
-      <!-- <Czech>Přidáno 7 10oz zlata</Czech> -->
+      <Czech>Přidat 7 10oz stříbra</Czech>
     </Key>
     <Key ID="STR_EPOCH_PLAYER_S_204">
       <Original>Add 6 10oz Silver</Original>
@@ -4864,7 +4864,7 @@
       <!-- <Spanish></Spanish> -->
       <!-- <Dutch>Voeg 6 10oz Goud toe</Dutch> -->
       <!-- <French></French> -->
-      <!-- <Czech>Přidáno 6 10oz zlata</Czech> -->
+      <Czech>Přidat 6 10oz stříbra</Czech>
     </Key>
     <Key ID="STR_EPOCH_PLAYER_S_205">
       <Original>Add 5 10oz Silver</Original>
@@ -4874,7 +4874,7 @@
       <!-- <Spanish></Spanish> -->
       <!-- <Dutch>Voeg 5 10oz Goud toe</Dutch> -->
       <!-- <French></French> -->
-      <!-- <Czech>Přidáno 5 10oz zlata</Czech> -->
+      <Czech>Přidat 5 10oz stříbra</Czech>
     </Key>
     <Key ID="STR_EPOCH_PLAYER_S_206">
       <Original>Add 4 10oz Silver</Original>
@@ -4884,7 +4884,7 @@
       <!-- <Spanish></Spanish> -->
       <!-- <Dutch>Voeg 4 10oz Goud toe</Dutch> -->
       <!-- <French></French> -->
-      <!-- <Czech>Přidat 4 10oz zlata</Czech> -->
+      <Czech>Přidat 4 10oz stříbra</Czech>
     </Key>
     <Key ID="STR_EPOCH_PLAYER_S_207">
       <Original>Add 3 10oz Silver</Original>
@@ -4894,7 +4894,7 @@
       <!-- <Spanish></Spanish> -->
       <!-- <Dutch>Voeg 3 10oz Goud toe</Dutch> -->
       <!-- <French></French> -->
-      <!-- <Czech>Prodat 3 10oz zlata</Czech> -->
+      <Czech>Přidat 3 10oz stříbra</Czech>
     </Key>
     <Key ID="STR_EPOCH_PLAYER_S_208">
       <Original>Add 2 10oz Silver</Original>
@@ -4904,7 +4904,7 @@
       <!-- <Spanish></Spanish> -->
       <!-- <Dutch>Voeg 2 10oz Goud toe</Dutch> -->
       <!-- <French></French> -->
-      <!-- <Czech>Přidat 2 10oz zlata</Czech> -->
+      <Czech>Přidat 2 10oz stříbra</Czech>
     </Key>
 		<Key ID="STR_EPOCH_PLAYER_209">
 			<Original>Open %1</Original>
@@ -5244,7 +5244,7 @@
 			<!-- <Spanish></Spanish> -->
 			<Dutch>Creëer houten vloer 1/2</Dutch>
 			<!-- <French></French> -->
-			<Czech>Vytvořit Poloviční dřevěnou podlahu</Czech>
+			<Czech>Vytvořit 1/2 dřevěné podlahy</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_PLAYER_233">
 			<Original>Craft Stair Supports</Original>
@@ -5444,7 +5444,7 @@
 			<!-- <Spanish></Spanish> -->
 			<!-- <Dutch></Dutch> -->
 			<!-- <French></French> -->
-			<Czech>Vytvořit Poloviční zeď</Czech>
+			<Czech>Vytvořit 1/2 zdi</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_PLAYER_253">
 			<Original>Craft Garage Doorway</Original>
@@ -5994,7 +5994,7 @@
 			<!-- <Spanish></Spanish> -->
 			<!-- <Dutch></Dutch> -->
 			<!-- <French></French> -->
-			<!-- <Czech></Czech> -->
+			<Czech>Skombinovat cihly</Czech>
 		</Key>
     <Key ID="STR_EPOCH_PLAYER_307">
 			<Original>Combined all bars in your inventory to highest denomination.</Original>
@@ -6004,7 +6004,7 @@
 			<!-- <Spanish></Spanish> -->
 			<!-- <Dutch></Dutch> -->
 			<!-- <French></French> -->
-			<!-- <Czech></Czech> -->
+			<Czech>Skombinovány cihly ve vašem inventáři na maximum.</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_PLAYER_308">
 			<Original>To driver's seat</Original>
@@ -6056,6 +6056,16 @@
 			<!-- <Dutch></Dutch> -->
 			<!-- <German></German> -->
 		</Key>
+		<Key ID="STR_EPOCH_PLAYER_312">
+			<Original>\n\nCannot fish while in combat.</Original>
+			<English>\n\nCannot fish while in combat.</English>
+			<German>\n\nSie können nicht im Kampf zu fischen.</German>
+			<Russian>\n\nВы не можете ловить рыбу в то время как в бою.</Russian>
+			<!-- <Spanish></Spanish> -->
+			<Dutch>\n\nVissen is niet mogelijk tijdens een conflictsituatie.</Dutch>
+			<French>\n\nVous ne pouvez pas pêcher pendant les combats.</French>
+			<Czech>\n\nNemůžete rybařit, když jste v boji.</Czech>
+		</Key>
 		<Key ID="STR_EPOCH_PLAYER_REPAIRV">
 			<Original>Repair Vehicle</Original>
 			<English>Repair Vehicle</English>
@@ -6214,7 +6224,7 @@
 			<!-- <Spanish></Spanish> -->
 			<!-- <Dutch></Dutch> -->
 			<!-- <French></French> -->
-			<!-- <Czech></Czech> -->
+			<Czech>Vylepšení zbraně na vozidle</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_VEHUP_ARM_DESC">
 			<Original>Weapon install guide.</Original>
@@ -6224,7 +6234,7 @@
 			<!-- <Spanish></Spanish> -->
 			<!-- <Dutch></Dutch> -->
 			<!-- <French></French> -->
-			<!-- <Czech></Czech> -->
+			<Czech>Návod na instalaci zbraně na vozidlo.</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_VEHUP_SUCCESS">
 			<Original>Vehicle Upgrade Successful.</Original>
@@ -6764,7 +6774,7 @@
 			<!-- <Spanish></Spanish> -->
 			<Dutch></Dutch>
 			<French>Vous avez acheté %3 pour %1 %2, la clé a été ajoutée à votre ceinture.</French>
-			<Czech>Koupeno %3 za 1% 2%, klíč byl přidán do opasku na nářadí.</Czech>
+			<Czech>Koupeno %3 za %1 %2, klíč byl přidán do opasku na nářadí.</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_ACTIONS_12">
 			<Original>Missing %1 more of %2</Original>
@@ -6874,7 +6884,7 @@
 			<!-- <Spanish></Spanish> -->
 			<!-- <Dutch></Dutch> -->
 			<!-- <French></French> -->
-			<!-- <Czech></Czech> -->
+			<Czech>Bedna zásob</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_BULK_DESC">
 			<Original>12 x Random Item</Original>
@@ -6884,7 +6894,7 @@
 			<!-- <Spanish></Spanish> -->
 			<!-- <Dutch></Dutch> -->
 			<!-- <French></French> -->
-			<!-- <Czech></Czech> -->
+			<Czech>12x Náhodných předmětů</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_BULK_DESC_EMPTY">
 			<Original>Empty Supply Crate</Original>
@@ -6894,7 +6904,7 @@
 			<!-- <Spanish></Spanish> -->
 			<!-- <Dutch></Dutch> -->
 			<!-- <French></French> -->
-			<!-- <Czech></Czech> -->
+			<Czech>Prázdná bedna</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_BULK_DESC_SODACOKE_HALF">
 			<Original>6 x ItemSodaCoke</Original>
@@ -6904,7 +6914,7 @@
 			<!-- <Spanish></Spanish> -->
 			<!-- <Dutch></Dutch> -->
 			<!-- <French></French> -->
-			<!-- <Czech></Czech> -->
+			<Czech>6x Soda s kolovou příchutí</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_BULK_DESC_SODACOKE_FULL">
 			<Original>12 x ItemSodaCoke</Original>
@@ -6914,7 +6924,7 @@
 			<!-- <Spanish></Spanish> -->
 			<!-- <Dutch></Dutch> -->
 			<!-- <French></French> -->
-			<!-- <Czech></Czech> -->
+			<Czech>12x Soda s kolovou příchutí</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_BULK_DESC_SODAPEPSI_HALF">
 			<Original>6 x ItemSodaPepsi</Original>
@@ -6924,7 +6934,7 @@
 			<!-- <Spanish></Spanish> -->
 			<!-- <Dutch></Dutch> -->
 			<!-- <French></French> -->
-			<!-- <Czech></Czech> -->
+			<Czech>6x Pepsi</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_BULK_DESC_SODAPEPSI_FULL">
 			<Original>12 x ItemSodaPepsi</Original>
@@ -6934,7 +6944,7 @@
 			<!-- <Spanish></Spanish> -->
 			<!-- <Dutch></Dutch> -->
 			<!-- <French></French> -->
-			<!-- <Czech></Czech> -->
+			<Czech>12x Pepsi</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_BULK_DESC_BACON_HALF">
 			<Original>6 x FoodbaconCooked</Original>
@@ -6944,7 +6954,7 @@
 			<!-- <Spanish></Spanish> -->
 			<!-- <Dutch></Dutch> -->
 			<!-- <French></French> -->
-			<!-- <Czech></Czech> -->
+			<Czech>6x Vepřové</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_BULK_DESC_BACON_FULL">
 			<Original>12 x FoodbaconCooked</Original>
@@ -6954,7 +6964,7 @@
 			<!-- <Spanish></Spanish> -->
 			<!-- <Dutch></Dutch> -->
 			<!-- <French></French> -->
-			<!-- <Czech></Czech> -->
+			<Czech>12x Vepřové</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_BULK_DESC_G17">
 			<Original>12 x 17Rnd_9x19_glock17</Original>
@@ -6964,7 +6974,7 @@
 			<!-- <Spanish></Spanish> -->
 			<!-- <Dutch></Dutch> -->
 			<!-- <French></French> -->
-			<!-- <Czech></Czech> -->
+			<Czech>12x 17Rnd_9x19_glock17</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_BULK_DESC_M9SD">
 			<Original>12 x 15Rnd_9x19_M9SD</Original>
@@ -6974,7 +6984,7 @@
 			<!-- <Spanish></Spanish> -->
 			<!-- <Dutch></Dutch> -->
 			<!-- <French></French> -->
-			<!-- <Czech></Czech> -->
+			<Czech>12x 15Rnd_9x19_M9SD</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_BULK_DESC_MP5SD">
 			<Original>12 x 30Rnd_9x19_MP5SD</Original>
@@ -6984,7 +6994,7 @@
 			<!-- <Spanish></Spanish> -->
 			<!-- <Dutch></Dutch> -->
 			<!-- <French></French> -->
-			<!-- <Czech></Czech> -->
+			<Czech>12x 30Rnd_9x19_MP5SD</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_BULK_DESC_SANDBAG">
 			<Original>12 x SandBag</Original>
@@ -6994,7 +7004,7 @@
 			<!-- <Spanish></Spanish> -->
 			<!-- <Dutch></Dutch> -->
 			<!-- <French></French> -->
-			<!-- <Czech></Czech> -->
+			<Czech>12 Pytlů s pískem</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_BULK_DESC_TANKTRAP_HALF">
 			<Original>6 x Tank Trap</Original>
@@ -7004,7 +7014,7 @@
 			<!-- <Spanish></Spanish> -->
 			<!-- <Dutch></Dutch> -->
 			<!-- <French></French> -->
-			<!-- <Czech></Czech> -->
+			<Czech>6 Zátaras</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_BULK_DESC_TANKTRAP_FULL">
 			<Original>12 x Tank Trap</Original>
@@ -7014,7 +7024,7 @@
 			<!-- <Spanish></Spanish> -->
 			<!-- <Dutch></Dutch> -->
 			<!-- <French></French> -->
-			<!-- <Czech></Czech> -->
+			<Czech>12 Zátaras</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_BULK_DESC_WIREKIT_HALF">
 			<Original>6 x Wire Kit</Original>
@@ -7024,7 +7034,7 @@
 			<!-- <Spanish></Spanish> -->
 			<!-- <Dutch></Dutch> -->
 			<!-- <French></French> -->
-			<!-- <Czech></Czech> -->
+			<Czech>6 Drátů</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_BULK_DESC_WIREKIT_FULL">
 			<Original>12 x Wire Kit</Original>
@@ -7034,7 +7044,7 @@
 			<!-- <Spanish></Spanish> -->
 			<!-- <Dutch></Dutch> -->
 			<!-- <French></French> -->
-			<!-- <Czech></Czech> -->
+			<Czech>12 Drátů</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_BULK_DESC_GENERIC_HALF">
 			<Original>6 x Scrap Metal</Original>
@@ -7044,7 +7054,7 @@
 			<!-- <Spanish></Spanish> -->
 			<!-- <Dutch></Dutch> -->
 			<!-- <French></French> -->
-			<!-- <Czech></Czech> -->
+			<Czech>6x Železný šrot</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_BULK_DESC_GENERIC_FULL">
 			<Original>12 x Scrap Metal</Original>
@@ -7054,7 +7064,7 @@
 			<!-- <Spanish></Spanish> -->
 			<!-- <Dutch></Dutch> -->
 			<!-- <French></French> -->
-			<!-- <Czech></Czech> -->
+			<Czech>12x Železný šrot</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_TRADER_ENTER">
 			<Original>Now entering %1</Original>
@@ -7064,7 +7074,7 @@
 			<!-- <Spanish></Spanish> -->
 			<!-- <Dutch></Dutch> -->
 			<!-- <French></French> -->
-			<!-- <Czech></Czech> -->
+			<Czech>Vstoupili jste do %1</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_TRADER_LEAVE">
 			<Original>Now leaving %1</Original>
@@ -7074,7 +7084,7 @@
 			<!-- <Spanish></Spanish> -->
 			<!-- <Dutch></Dutch> -->
 			<!-- <French></French> -->
-			<!-- <Czech></Czech> -->
+			<Czech>Opustili jste %1</Czech>
 		</Key>
 		<Key ID="R3F_VERSION_WEIGHTED">
 			<Original>1.04</Original>

SQF/dayz_server/compile/server_updateObject.sqf

@@ -1,16 +1,18 @@
 /*
-[_object,_type] spawn server_updateObject;
+	USAGE:
+	[_object, _type] spawn server_updateObject;
 */
+
 private ["_object","_type","_objectID","_uid","_lastUpdate","_needUpdate","_object_position","_object_inventory","_object_damage","_isNotOk","_parachuteWest","_firstTime","_object_killed","_object_repair","_isbuildable"];
 
 _object = _this select 0;
 
-if(isNull(_object)) exitWith {
-	diag_log format["Skipping Null Object: %1", _object];
+if (isNull _object) exitWith {
+	diag_log format ["Skipping Null Object: %1", _object];
 };
 
 _type = _this select 1;
-_parachuteWest = ((typeOf _object == "ParachuteWest") || (typeOf _object == "ParachuteC"));
+_parachuteWest = (typeOf _object) in ["ParachuteWest","ParachuteC"];
 _isbuildable = (typeOf _object) in dayz_allowedObjects;
 _isNotOk = false;
 _firstTime = false;
@@ -18,45 +20,37 @@ _firstTime = false;
 _objectID =	_object getVariable ["ObjectID","0"];
 _uid = 		_object getVariable ["ObjectUID","0"];
 
-if ((typeName _objectID != "string") || (typeName _uid != "string")) then
-{ 
-    diag_log(format["Non-string Object: ID %1 UID %2", _objectID, _uid]);
-    //force fail
+if (typeName _objectID != "STRING" || typeName _uid != "STRING") then {
+    diag_log format ["Non-string Object: ID %1 UID %2", _objectID, _uid];
     _objectID = "0";
     _uid = "0";
 };
-if (!_parachuteWest && !(locked _object)) then {
-	if (_objectID == "0" && _uid == "0") then
-	{
+
+if (!_parachuteWest && !locked _object) then {
+	if (_objectID == "0" && _uid == "0") then {
 		_object_position = getPosATL _object;
     		_isNotOk = true;
 	};
 };
 
-// do not update if buildable && not ok
-if (_isNotOk && _isbuildable) exitWith {  };
+if (_isNotOk && _isbuildable) exitWith {};
+if (_isNotOk) exitWith {
+	deleteVehicle _object;
+	diag_log format ["Deleting object %1 with invalid ID at pos [%2,%3,%4]", typeOf _object, _object_position select 0, _object_position select 1, _object_position select 2];
+};
 
-// delete if still not ok
-if (_isNotOk) exitWith { deleteVehicle _object; diag_log(format["Deleting object %1 with invalid ID at pos [%2,%3,%4]",typeOf _object,_object_position select 0,_object_position select 1, _object_position select 2]); };
-
-
-_lastUpdate = _object getVariable ["lastUpdate",time];
+_lastUpdate = _object getVariable ["lastUpdate", time];
 _needUpdate = _object in needUpdate_objects;
 
-// TODO ----------------------
 _object_position = {
-	private["_position","_worldspace","_fuel","_key"];
+	private ["_position","_worldspace","_fuel","_key"];
 	_position = getPosATL _object;
 	_worldspace = [
-			round(direction _object),
+		round (getDir _object),
 		_position
 	];
-		_fuel = 0;
-		if (_object isKindOf "AllVehicles") then {
-			_fuel = fuel _object;
-		};
-		_key = format["CHILD:305:%1:%2:%3:",_objectID,_worldspace,_fuel];
-		//diag_log ("HIVE: WRITE: "+ str(_key));
+	_fuel = if (_object isKindOf "AllVehicles") then { fuel _object } else { 0 };
+	_key = format ["CHILD:305:%1:%2:%3:", _objectID, _worldspace, _fuel];
 	_key call server_hiveWrite;
 };
 
@@ -67,124 +61,122 @@ _object_inventory = {
 		getMagazineCargo _object,
 		getBackpackCargo _object
 	];
-		_previous = str(_object getVariable["lastInventory",[]]);
-		if (str(_inventory) != _previous) then {
-			_object setVariable["lastInventory",_inventory];
-			if (_objectID == "0") then {
-				_key = format["CHILD:309:%1:%2:",_uid,_inventory];
-			} else {
-				_key = format["CHILD:303:%1:%2:",_objectID,_inventory];
-			};
-			//diag_log ("HIVE: WRITE: "+ str(_key));
+	_previous = str (_object getVariable ["lastInventory", []]);
+	if (str _inventory != _previous) then {
+		_object setVariable ["lastInventory", _inventory];
+		_key = if (_objectID == "0") then { format ["CHILD:309:%1:", _uid] + str _inventory + ":" } else { format ["CHILD:303:%1:", _objectID] + str _inventory + ":" };
 		_key call server_hiveWrite;
 	};
 };
 
 _object_damage = {
-	private["_hitpoints","_array","_hit","_selection","_key","_damage"];
+	private ["_hitpoints","_array","_hit","_selection","_key","_damage"];
 	_hitpoints = _object call vehicle_getHitpoints;
 	_damage = damage _object;
+
 	_array = [];
 	{
-			_hit = [_object,_x] call object_getHit;
-			_selection = getText (configFile >> "CfgVehicles" >> (typeOf _object) >> "HitPoints" >> _x >> "name");
-			if (_hit > 0) then {_array set [count _array,[_selection,_hit]]};
-			_object setHit ["_selection", _hit];
+		_hit = [_object, _x] call object_getHit;
+		_selection = getText (configFile >> "CfgVehicles" >> typeOf _object >> "HitPoints" >> _x >> "name");
+		if (_hit > 0) then {
+			_array set [count _array, [_selection,_hit]];
+		};
+		_object setHit [_selection, _hit];
 	} count _hitpoints;
 
-		_key = format["CHILD:306:%1:%2:%3:",_objectID,_array,_damage];
-		//diag_log ("HIVE: WRITE: "+ str(_key));
+	_key = "CHILD:306:" + _objectID + ":" + str _array + ":" + str _damage + ":";
 	_key call server_hiveWrite;
-	_object setVariable ["needUpdate",false,true];
-	};
+	_object setVariable ["needUpdate", false, true];
+};
 
 _object_killed = {
-	private["_hitpoints","_array","_hit","_PUID","_selection","_key","_damage"];
+	private ["_hitpoints","_array","_hit","_PUID","_selection","_key","_damage"];
 	_hitpoints = _object call vehicle_getHitpoints;
-	//_damage = damage _object;
 	_damage = 1;
+
 	_array = [];
 	{
-		_hit = [_object,_x] call object_getHit;
-		_selection = getText (configFile >> "CfgVehicles" >> (typeOf _object) >> "HitPoints" >> _x >> "name");
-		if (_hit > 0) then {_array set [count _array,[_selection,_hit]]};
-		_hit = 1;
-		_object setHit ["_selection", _hit];
+		_hit = [_object, _x] call object_getHit;
+		_selection = getText (configFile >> "CfgVehicles" >> typeOf _object >> "HitPoints" >> _x >> "name");
+		if (_hit > 0) then {
+			_array set [count _array, [_selection, _hit]];
+		};
+		_object setHit [_selection, 1];
 	} count _hitpoints;
 
-	if (_objectID == "0") then {
-		_key = format["CHILD:306:%1:%2:%3:",_uid,_array,_damage];
-	} else {
-		_key = format["CHILD:306:%1:%2:%3:",_objectID,_array,_damage];
-	};
-	//diag_log ("HIVE: WRITE: "+ str(_key));
+	_key = "CHILD:306:" + _objectID + ":" + str _array + ":" + str _damage + ":";
 	_key call server_hiveWrite;
-	_object setVariable ["needUpdate",false,true];
-	if ((count _this) > 2) then {
+
+	_object setVariable ["needUpdate", false, true];
+
+	if (count _this > 2) then {
 		_killer = _this select 2;
-		_charID = _object getVariable ['CharacterID','0'];
-		_objID 	= _object getVariable['ObjectID','0'];
-		_objUID	= _object getVariable['ObjectUID','0'];
+		_charID = _object getVariable ["CharacterID", "0"];
+		_objID 	= _object getVariable ["ObjectID", "0"];
+		_objUID	= _object getVariable ["ObjectUID", "0"];
 		_worldSpace = getPosATL _object;
 		_PUID = [_killer] call FNC_GetPlayerUID;
 		if (_PUID != "") then {
-			_name = if (alive _killer) then { name _killer; } else { format["OBJECT %1", _killer]; };
-			diag_log format["Vehicle killed: Vehicle %1 (TYPE: %2), CharacterID: %3, ObjectID: %4, ObjectUID: %5, Position: %6, Killer: %7 (UID: %8)", _object, (typeOf _object), _charID, _objID, _objUID, _worldSpace, _name, _PUID];
+			_name = if (alive _killer) then { name _killer } else { format["OBJECT %1", _killer] };
+			diag_log format ["Vehicle killed: Vehicle %1 (TYPE: %2), CharacterID: %3, ObjectID: %4, ObjectUID: %5, Position: %6, Killer: %7 (UID: %8)", _object, typeOf _object, _charID, _objID, _objUID, _worldSpace, _name, _PUID];
 		} else {
-			diag_log format["Vehicle killed: Vehicle %1 (TYPE: %2), CharacterID: %3, ObjectID: %4, ObjectUID: %5, Position: %6", _object, (typeOf _object), _charID, _objID, _objUID, _worldSpace];
+			diag_log format ["Vehicle killed: Vehicle %1 (TYPE: %2), CharacterID: %3, ObjectID: %4, ObjectUID: %5, Position: %6", _object, typeOf _object, _charID, _objID, _objUID, _worldSpace];
 		};
 	};
 };
 
 _object_repair = {
-	private["_hitpoints","_array","_hit","_selection","_key","_damage"];
+	private ["_hitpoints","_array","_hit","_selection","_key","_damage"];
 	_hitpoints = _object call vehicle_getHitpoints;
 	_damage = damage _object;
+
 	_array = [];
 	{
 		_hit = [_object,_x] call object_getHit;
 		_selection = getText (configFile >> "CfgVehicles" >> (typeOf _object) >> "HitPoints" >> _x >> "name");
-		if (_hit > 0) then {_array set [count _array,[_selection,_hit]]};
-		_object setHit ["_selection", _hit];
+		if (_hit > 0) then {
+			_array set [count _array, [_selection, _hit]];
+		};
+		_object setHit [_selection, _hit];
 	} count _hitpoints;
 
-	_key = format["CHILD:306:%1:%2:%3:",_objectID,_array,_damage];
-	//diag_log ("HIVE: WRITE: "+ str(_key));
+	_key = "CHILD:306:" + _objectID + ":" + str _array + ":" + str _damage + ":";
 	_key call server_hiveWrite;
-	_object setVariable ["needUpdate",false,true];
+	_object setVariable ["needUpdate", false, true];
 };
-// TODO ----------------------
 
-_object setVariable ["lastUpdate",time,true];
-switch (_type) do {
-	case "all": {
+_object setVariable ["lastUpdate", time, true];
+
+if (_type == "all") exitWith {
 	call _object_position;
 	call _object_inventory;
 	call _object_damage;
-		};
-	case "position": {
-		if (!(_object in needUpdate_objects)) then {
-			//diag_log format["DEBUG Position: Added to NeedUpdate=%1",_object];
+};
+
+if (_type == "position") exitWith {
+	if !(_object in needUpdate_objects) then {
 		needUpdate_objects set [count needUpdate_objects, _object];
 	};
-	};
-	case "gear": {
-		call _object_inventory;
-			};
-	case "damage": {
-		if ( (time - _lastUpdate) > 5) then {
-			call _object_damage;
-		} else {
-			if (!(_object in needUpdate_objects)) then {
-				//diag_log format["DEBUG Damage: Added to NeedUpdate=%1",_object];
-				needUpdate_objects set [count needUpdate_objects, _object];
-			};
-		};
-	};
-	case "killed": {
-		call _object_killed;
-	};
-	case "repair": {
-		call _object_damage;
-	};
+};
+
+if (_type == "gear") exitWith {
+	call _object_inventory;
+};
+
+if (_type == "damage") exitWith {
+	if (time - _lastUpdate > 5) then {
+		call _object_damage;
+	} else {
+		if !(_object in needUpdate_objects) then {
+			needUpdate_objects set [count needUpdate_objects, _object];
+		};
+	};
+};
+
+if (_type == "killed") exitWith {
+	call _object_killed;
+};
+
+if (_type == "repair") exitWith {
+	call _object_damage;
 };

SQF/dayz_server/init/server_functions.sqf

@@ -863,7 +863,7 @@ server_spawnCleanLoot = {
 			};
 		};
 		sleep 0.001;
-	} count _missionObjs;
+	} forEach _missionObjs;
 	if (_delQty > 0) then {
 		_qty = count _missionObjs;
 		diag_log (format["CLEANUP: Deleted %1 Loot Piles out of %2",_delQty,_qty]);
@@ -894,7 +894,7 @@ server_spawnCleanAnimals = {
 			};
 		};
 		sleep 0.001;
-	} count _missonAnimals;
+	} forEach _missonAnimals;
 	if (_delQtyAnimal > 0) then {
 		_qty = count _missonAnimals;
 		diag_log (format["CLEANUP: Deleted %1 Animals out of %2",_delQtyAnimal,_qty]);
@@ -914,7 +914,7 @@ server_logUnlockLockEvent = {
 			[_obj, "gear"] call server_updateObject;
 			_statusText = "LOCKED";
 		};
-		_PUID = [_killer] call FNC_GetPlayerUID;
+		_PUID = [_player] call FNC_GetPlayerUID;
 		diag_log format["SAFE %5: ID:%1 UID:%2 BY %3(%4)", _objectID, _objectUID, (name _player), _PUID, _statusText];
 	};
 };

SQF/dayz_server/missions/DayZ_Epoch_1.Takistan/dynamic_vehicle.sqf

@@ -11,9 +11,9 @@ AllowedVehiclesList = [
 ["CSJ_GyroC",3],
 ["CSJ_GyroCover",3],
 ["CSJ_GyroP",3],
-["datsun1_civil_1_open",3],
-["datsun1_civil_2_covered",3],
-["datsun1_civil_3_open",3],
+["datsun1_civil_1_open_DZE",3],
+["datsun1_civil_2_covered_DZE",3],
+["datsun1_civil_3_open_DZE",3],
 ["GAZ_Vodnik_DZE",1],
 ["GAZ_Vodnik_MedEvac",1],
 ["GLT_M300_LT",3],
@@ -22,9 +22,9 @@ AllowedVehiclesList = [
 ["GNT_C185C",1],
 ["GNT_C185R",1],
 ["GNT_C185U",1],
-["hilux1_civil_1_open",3],
-["hilux1_civil_2_covered",3],
-["hilux1_civil_3_open_EP1",3],
+["hilux1_civil_1_open_DZE",3],
+["hilux1_civil_2_covered_DZE",3],
+["hilux1_civil_3_open_DZE",3],
 ["HMMWV_Ambulance",1],
 ["HMMWV_Ambulance_CZ_DES_EP1",1],
 ["HMMWV_DES_EP1",3],

SQF/dayz_server/missions/DayZ_Epoch_10.Mountains_ACR/dynamic_vehicle.sqf

@@ -11,9 +11,9 @@ AllowedVehiclesList = [
 ["CSJ_GyroC",3],
 ["CSJ_GyroCover",3],
 ["CSJ_GyroP",3],
-["datsun1_civil_1_open",3],
-["datsun1_civil_2_covered",3],
-["datsun1_civil_3_open",3],
+["datsun1_civil_1_open_DZE",3],
+["datsun1_civil_2_covered_DZE",3],
+["datsun1_civil_3_open_DZE",3],
 ["GAZ_Vodnik_DZE",1],
 ["GAZ_Vodnik_MedEvac",1],
 ["GLT_M300_LT",3],
@@ -22,9 +22,9 @@ AllowedVehiclesList = [
 ["GNT_C185C",1],
 ["GNT_C185R",1],
 ["GNT_C185U",1],
-["hilux1_civil_1_open",3],
-["hilux1_civil_2_covered",3],
-["hilux1_civil_3_open_EP1",3],
+["hilux1_civil_1_open_DZE",3],
+["hilux1_civil_2_covered_DZE",3],
+["hilux1_civil_3_open_DZE",3],
 ["HMMWV_Ambulance",1],
 ["HMMWV_Ambulance_CZ_DES_EP1",1],
 ["HMMWV_DES_EP1",3],

SQF/dayz_server/missions/DayZ_Epoch_11.Chernarus/dynamic_vehicle.sqf

@@ -11,9 +11,9 @@ AllowedVehiclesList = [
 ["CSJ_GyroC",3],
 ["CSJ_GyroCover",3],
 ["CSJ_GyroP",3],
-["datsun1_civil_1_open",3],
-["datsun1_civil_2_covered",3],
-["datsun1_civil_3_open",3],
+["datsun1_civil_1_open_DZE",3],
+["datsun1_civil_2_covered_DZE",3],
+["datsun1_civil_3_open_DZE",3],
 ["Fishing_Boat",3],
 ["GAZ_Vodnik_DZE",1],
 ["GAZ_Vodnik_MedEvac",1],
@@ -23,9 +23,9 @@ AllowedVehiclesList = [
 ["GNT_C185C",1],
 ["GNT_C185R",1],
 ["GNT_C185U",1],
-["hilux1_civil_1_open",3],
-["hilux1_civil_2_covered",3],
-["hilux1_civil_3_open_EP1",3],
+["hilux1_civil_1_open_DZE",3],
+["hilux1_civil_2_covered_DZE",3],
+["hilux1_civil_3_open_DZE",3],
 ["HMMWV_Ambulance",1],
 ["HMMWV_Ambulance_CZ_DES_EP1",1],
 ["HMMWV_DES_EP1",3],

SQF/dayz_server/missions/DayZ_Epoch_12.isladuala/dynamic_vehicle.sqf

@@ -11,9 +11,9 @@ AllowedVehiclesList = [
 ["CSJ_GyroC",3],
 ["CSJ_GyroCover",3],
 ["CSJ_GyroP",3],
-["datsun1_civil_1_open",3],
-["datsun1_civil_2_covered",3],
-["datsun1_civil_3_open",3],
+["datsun1_civil_1_open_DZE",3],
+["datsun1_civil_2_covered_DZE",3],
+["datsun1_civil_3_open_DZE",3],
 ["Fishing_Boat",3],
 ["GAZ_Vodnik_DZE",1],
 ["GAZ_Vodnik_MedEvac",1],
@@ -23,9 +23,9 @@ AllowedVehiclesList = [
 ["GNT_C185C",1],
 ["GNT_C185R",1],
 ["GNT_C185U",1],
-["hilux1_civil_1_open",3],
-["hilux1_civil_2_covered",3],
-["hilux1_civil_3_open_EP1",3],
+["hilux1_civil_1_open_DZE",3],
+["hilux1_civil_2_covered_DZE",3],
+["hilux1_civil_3_open_DZE",3],
 ["HMMWV_Ambulance",1],
 ["HMMWV_Ambulance_CZ_DES_EP1",1],
 ["HMMWV_DES_EP1",3],

SQF/dayz_server/missions/DayZ_Epoch_13.Tavi/dynamic_vehicle.sqf

@@ -11,9 +11,9 @@ AllowedVehiclesList = [
 ["CSJ_GyroC",3],
 ["CSJ_GyroCover",3],
 ["CSJ_GyroP",3],
-["datsun1_civil_1_open",3],
-["datsun1_civil_2_covered",3],
-["datsun1_civil_3_open",3],
+["datsun1_civil_1_open_DZE",3],
+["datsun1_civil_2_covered_DZE",3],
+["datsun1_civil_3_open_DZE",3],
 ["Fishing_Boat",3],
 ["GAZ_Vodnik_DZE",1],
 ["GAZ_Vodnik_MedEvac",1],
@@ -23,9 +23,9 @@ AllowedVehiclesList = [
 ["GNT_C185C",1],
 ["GNT_C185R",1],
 ["GNT_C185U",1],
-["hilux1_civil_1_open",3],
-["hilux1_civil_2_covered",3],
-["hilux1_civil_3_open_EP1",3],
+["hilux1_civil_1_open_DZE",3],
+["hilux1_civil_2_covered_DZE",3],
+["hilux1_civil_3_open_DZE",3],
 ["HMMWV_Ambulance",1],
 ["HMMWV_Ambulance_CZ_DES_EP1",1],
 ["HMMWV_DES_EP1",3],

SQF/dayz_server/missions/DayZ_Epoch_15.namalsk/dynamic_vehicle.sqf

@@ -11,9 +11,9 @@ AllowedVehiclesList = [
 ["CSJ_GyroC",3],
 ["CSJ_GyroCover",3],
 ["CSJ_GyroP",3],
-["datsun1_civil_1_open",3],
-["datsun1_civil_2_covered",3],
-["datsun1_civil_3_open",3],
+["datsun1_civil_1_open_DZE",3],
+["datsun1_civil_2_covered_DZE",3],
+["datsun1_civil_3_open_DZE",3],
 ["Fishing_Boat",3],
 ["GAZ_Vodnik_DZE",1],
 ["GAZ_Vodnik_MedEvac",1],
@@ -23,9 +23,9 @@ AllowedVehiclesList = [
 ["GNT_C185C",1],
 ["GNT_C185R",1],
 ["GNT_C185U",1],
-["hilux1_civil_1_open",3],
-["hilux1_civil_2_covered",3],
-["hilux1_civil_3_open_EP1",3],
+["hilux1_civil_1_open_DZE",3],
+["hilux1_civil_2_covered_DZE",3],
+["hilux1_civil_3_open_DZE",3],
 ["HMMWV_Ambulance",1],
 ["HMMWV_Ambulance_CZ_DES_EP1",1],
 ["HMMWV_DES_EP1",3],

SQF/dayz_server/missions/DayZ_Epoch_16.Panthera2/dynamic_vehicle.sqf

@@ -11,9 +11,9 @@ AllowedVehiclesList = [
 ["CSJ_GyroC",3],
 ["CSJ_GyroCover",3],
 ["CSJ_GyroP",3],
-["datsun1_civil_1_open",3],
-["datsun1_civil_2_covered",3],
-["datsun1_civil_3_open",3],
+["datsun1_civil_1_open_DZE",3],
+["datsun1_civil_2_covered_DZE",3],
+["datsun1_civil_3_open_DZE",3],
 ["Fishing_Boat",3],
 ["GAZ_Vodnik_DZE",1],
 ["GAZ_Vodnik_MedEvac",1],
@@ -23,9 +23,9 @@ AllowedVehiclesList = [
 ["GNT_C185C",1],
 ["GNT_C185R",1],
 ["GNT_C185U",1],
-["hilux1_civil_1_open",3],
-["hilux1_civil_2_covered",3],
-["hilux1_civil_3_open_EP1",3],
+["hilux1_civil_1_open_DZE",3],
+["hilux1_civil_2_covered_DZE",3],
+["hilux1_civil_3_open_DZE",3],
 ["HMMWV_Ambulance",1],
 ["HMMWV_Ambulance_CZ_DES_EP1",1],
 ["HMMWV_DES_EP1",3],

SQF/dayz_server/missions/DayZ_Epoch_17.Chernarus/dynamic_vehicle.sqf

@@ -11,9 +11,9 @@ AllowedVehiclesList = [
 ["CSJ_GyroC",3],
 ["CSJ_GyroCover",3],
 ["CSJ_GyroP",3],
-["datsun1_civil_1_open",3],
-["datsun1_civil_2_covered",3],
-["datsun1_civil_3_open",3],
+["datsun1_civil_1_open_DZE",3],
+["datsun1_civil_2_covered_DZE",3],
+["datsun1_civil_3_open_DZE",3],
 ["Fishing_Boat",3],
 ["GAZ_Vodnik_DZE",1],
 ["GAZ_Vodnik_MedEvac",1],
@@ -23,9 +23,9 @@ AllowedVehiclesList = [
 ["GNT_C185C",1],
 ["GNT_C185R",1],
 ["GNT_C185U",1],
-["hilux1_civil_1_open",3],
-["hilux1_civil_2_covered",3],
-["hilux1_civil_3_open_EP1",3],
+["hilux1_civil_1_open_DZE",3],
+["hilux1_civil_2_covered_DZE",3],
+["hilux1_civil_3_open_DZE",3],
 ["HMMWV_Ambulance",1],
 ["HMMWV_Ambulance_CZ_DES_EP1",1],
 ["HMMWV_DES_EP1",3],

SQF/dayz_server/missions/DayZ_Epoch_18.Sara/dynamic_vehicle.sqf

@@ -11,9 +11,9 @@ AllowedVehiclesList = [
 ["CSJ_GyroC",3],
 ["CSJ_GyroCover",3],
 ["CSJ_GyroP",3],
-["datsun1_civil_1_open",3],
-["datsun1_civil_2_covered",3],
-["datsun1_civil_3_open",3],
+["datsun1_civil_1_open_DZE",3],
+["datsun1_civil_2_covered_DZE",3],
+["datsun1_civil_3_open_DZE",3],
 ["Fishing_Boat",3],
 ["GAZ_Vodnik_DZE",1],
 ["GAZ_Vodnik_MedEvac",1],
@@ -23,9 +23,9 @@ AllowedVehiclesList = [
 ["GNT_C185C",1],
 ["GNT_C185R",1],
 ["GNT_C185U",1],
-["hilux1_civil_1_open",3],
-["hilux1_civil_2_covered",3],
-["hilux1_civil_3_open_EP1",3],
+["hilux1_civil_1_open_DZE",3],
+["hilux1_civil_2_covered_DZE",3],
+["hilux1_civil_3_open_DZE",3],
 ["HMMWV_Ambulance",1],
 ["HMMWV_Ambulance_CZ_DES_EP1",1],
 ["HMMWV_DES_EP1",3],

SQF/dayz_server/missions/DayZ_Epoch_19.FDF_Isle1_a/dynamic_vehicle.sqf

@@ -11,9 +11,9 @@ AllowedVehiclesList = [
 ["CSJ_GyroC",3],
 ["CSJ_GyroCover",3],
 ["CSJ_GyroP",3],
-["datsun1_civil_1_open",3],
-["datsun1_civil_2_covered",3],
-["datsun1_civil_3_open",3],
+["datsun1_civil_1_open_DZE",3],
+["datsun1_civil_2_covered_DZE",3],
+["datsun1_civil_3_open_DZE",3],
 ["Fishing_Boat",3],
 ["GAZ_Vodnik_DZE",1],
 ["GAZ_Vodnik_MedEvac",1],
@@ -23,9 +23,9 @@ AllowedVehiclesList = [
 ["GNT_C185C",1],
 ["GNT_C185R",1],
 ["GNT_C185U",1],
-["hilux1_civil_1_open",3],
-["hilux1_civil_2_covered",3],
-["hilux1_civil_3_open_EP1",3],
+["hilux1_civil_1_open_DZE",3],
+["hilux1_civil_2_covered_DZE",3],
+["hilux1_civil_3_open_DZE",3],
 ["HMMWV_Ambulance",1],
 ["HMMWV_Ambulance_CZ_DES_EP1",1],
 ["HMMWV_DES_EP1",3],

SQF/dayz_server/missions/DayZ_Epoch_2.Utes/dynamic_vehicle.sqf

@@ -11,9 +11,9 @@ AllowedVehiclesList = [
 ["CSJ_GyroC",3],
 ["CSJ_GyroCover",3],
 ["CSJ_GyroP",3],
-["datsun1_civil_1_open",3],
-["datsun1_civil_2_covered",3],
-["datsun1_civil_3_open",3],
+["datsun1_civil_1_open_DZE",3],
+["datsun1_civil_2_covered_DZE",3],
+["datsun1_civil_3_open_DZE",3],
 ["Fishing_Boat",3],
 ["GAZ_Vodnik_DZE",1],
 ["GAZ_Vodnik_MedEvac",1],
@@ -23,9 +23,9 @@ AllowedVehiclesList = [
 ["GNT_C185C",1],
 ["GNT_C185R",1],
 ["GNT_C185U",1],
-["hilux1_civil_1_open",3],
-["hilux1_civil_2_covered",3],
-["hilux1_civil_3_open_EP1",3],
+["hilux1_civil_1_open_DZE",3],
+["hilux1_civil_2_covered_DZE",3],
+["hilux1_civil_3_open_DZE",3],
 ["HMMWV_Ambulance",1],
 ["HMMWV_Ambulance_CZ_DES_EP1",1],
 ["HMMWV_DES_EP1",3],

SQF/dayz_server/missions/DayZ_Epoch_20.fapovo/dynamic_vehicle.sqf

@@ -11,9 +11,9 @@ AllowedVehiclesList = [
 ["CSJ_GyroC",3],
 ["CSJ_GyroCover",3],
 ["CSJ_GyroP",3],
-["datsun1_civil_1_open",3],
-["datsun1_civil_2_covered",3],
-["datsun1_civil_3_open",3],
+["datsun1_civil_1_open_DZE",3],
+["datsun1_civil_2_covered_DZE",3],
+["datsun1_civil_3_open_DZE",3],
 ["Fishing_Boat",3],
 ["GAZ_Vodnik_DZE",1],
 ["GAZ_Vodnik_MedEvac",1],
@@ -23,9 +23,9 @@ AllowedVehiclesList = [
 ["GNT_C185C",1],
 ["GNT_C185R",1],
 ["GNT_C185U",1],
-["hilux1_civil_1_open",3],
-["hilux1_civil_2_covered",3],
-["hilux1_civil_3_open_EP1",3],
+["hilux1_civil_1_open_DZE",3],
+["hilux1_civil_2_covered_DZE",3],
+["hilux1_civil_3_open_DZE",3],
 ["HMMWV_Ambulance",1],
 ["HMMWV_Ambulance_CZ_DES_EP1",1],
 ["HMMWV_DES_EP1",3],

SQF/dayz_server/missions/DayZ_Epoch_21.Caribou/dynamic_vehicle.sqf

@@ -11,9 +11,9 @@ AllowedVehiclesList = [
 ["CSJ_GyroC",3],
 ["CSJ_GyroCover",3],
 ["CSJ_GyroP",3],
-["datsun1_civil_1_open",3],
-["datsun1_civil_2_covered",3],
-["datsun1_civil_3_open",3],
+["datsun1_civil_1_open_DZE",3],
+["datsun1_civil_2_covered_DZE",3],
+["datsun1_civil_3_open_DZE",3],
 ["Fishing_Boat",3],
 ["GAZ_Vodnik_DZE",1],
 ["GAZ_Vodnik_MedEvac",1],
@@ -23,9 +23,9 @@ AllowedVehiclesList = [
 ["GNT_C185C",1],
 ["GNT_C185R",1],
 ["GNT_C185U",1],
-["hilux1_civil_1_open",3],
-["hilux1_civil_2_covered",3],
-["hilux1_civil_3_open_EP1",3],
+["hilux1_civil_1_open_DZE",3],
+["hilux1_civil_2_covered_DZE",3],
+["hilux1_civil_3_open_DZE",3],
 ["HMMWV_Ambulance",1],
 ["HMMWV_Ambulance_CZ_DES_EP1",1],
 ["HMMWV_DES_EP1",3],

SQF/dayz_server/missions/DayZ_Epoch_22.smd_sahrani_A2/dynamic_vehicle.sqf

@@ -11,9 +11,9 @@ AllowedVehiclesList = [
 ["CSJ_GyroC",3],
 ["CSJ_GyroCover",3],
 ["CSJ_GyroP",3],
-["datsun1_civil_1_open",3],
-["datsun1_civil_2_covered",3],
-["datsun1_civil_3_open",3],
+["datsun1_civil_1_open_DZE",3],
+["datsun1_civil_2_covered_DZE",3],
+["datsun1_civil_3_open_DZE",3],
 ["Fishing_Boat",3],
 ["GAZ_Vodnik_DZE",1],
 ["GAZ_Vodnik_MedEvac",1],
@@ -23,9 +23,9 @@ AllowedVehiclesList = [
 ["GNT_C185C",1],
 ["GNT_C185R",1],
 ["GNT_C185U",1],
-["hilux1_civil_1_open",3],
-["hilux1_civil_2_covered",3],
-["hilux1_civil_3_open_EP1",3],
+["hilux1_civil_1_open_DZE",3],
+["hilux1_civil_2_covered_DZE",3],
+["hilux1_civil_3_open_DZE",3],
 ["HMMWV_Ambulance",1],
 ["HMMWV_Ambulance_CZ_DES_EP1",1],
 ["HMMWV_DES_EP1",3],

SQF/dayz_server/missions/DayZ_Epoch_23.cmr_ovaron/dynamic_vehicle.sqf

@@ -11,9 +11,9 @@ AllowedVehiclesList = [
 ["CSJ_GyroC",3],
 ["CSJ_GyroCover",3],
 ["CSJ_GyroP",3],
-["datsun1_civil_1_open",3],
-["datsun1_civil_2_covered",3],
-["datsun1_civil_3_open",3],
+["datsun1_civil_1_open_DZE",3],
+["datsun1_civil_2_covered_DZE",3],
+["datsun1_civil_3_open_DZE",3],
 ["Fishing_Boat",3],
 ["GAZ_Vodnik_DZE",1],
 ["GAZ_Vodnik_MedEvac",1],
@@ -23,9 +23,9 @@ AllowedVehiclesList = [
 ["GNT_C185C",1],
 ["GNT_C185R",1],
 ["GNT_C185U",1],
-["hilux1_civil_1_open",3],
-["hilux1_civil_2_covered",3],
-["hilux1_civil_3_open_EP1",3],
+["hilux1_civil_1_open_DZE",3],
+["hilux1_civil_2_covered_DZE",3],
+["hilux1_civil_3_open_DZE",3],
 ["HMMWV_Ambulance",1],
 ["HMMWV_Ambulance_CZ_DES_EP1",1],
 ["HMMWV_DES_EP1",3],

SQF/dayz_server/missions/DayZ_Epoch_24.Napf/dynamic_vehicle.sqf

@@ -11,9 +11,9 @@ AllowedVehiclesList = [
 ["CSJ_GyroC",3],
 ["CSJ_GyroCover",3],
 ["CSJ_GyroP",3],
-["datsun1_civil_1_open",3],
-["datsun1_civil_2_covered",3],
-["datsun1_civil_3_open",3],
+["datsun1_civil_1_open_DZE",3],
+["datsun1_civil_2_covered_DZE",3],
+["datsun1_civil_3_open_DZE",3],
 ["Fishing_Boat",3],
 ["GAZ_Vodnik_DZE",1],
 ["GAZ_Vodnik_MedEvac",1],
@@ -23,9 +23,9 @@ AllowedVehiclesList = [
 ["GNT_C185C",1],
 ["GNT_C185R",1],
 ["GNT_C185U",1],
-["hilux1_civil_1_open",3],
-["hilux1_civil_2_covered",3],
-["hilux1_civil_3_open_EP1",3],
+["hilux1_civil_1_open_DZE",3],
+["hilux1_civil_2_covered_DZE",3],
+["hilux1_civil_3_open_DZE",3],
 ["HMMWV_Ambulance",1],
 ["HMMWV_Ambulance_CZ_DES_EP1",1],
 ["HMMWV_DES_EP1",3],

SQF/dayz_server/missions/DayZ_Epoch_25.sauerland/dynamic_vehicle.sqf

@@ -11,9 +11,9 @@ AllowedVehiclesList = [
 ["CSJ_GyroC",3],
 ["CSJ_GyroCover",3],
 ["CSJ_GyroP",3],
-["datsun1_civil_1_open",3],
-["datsun1_civil_2_covered",3],
-["datsun1_civil_3_open",3],
+["datsun1_civil_1_open_DZE",3],
+["datsun1_civil_2_covered_DZE",3],
+["datsun1_civil_3_open_DZE",3],
 ["GAZ_Vodnik_DZE",1],
 ["GAZ_Vodnik_MedEvac",1],
 ["GLT_M300_LT",3],
@@ -22,9 +22,9 @@ AllowedVehiclesList = [
 ["GNT_C185C",1],
 ["GNT_C185R",1],
 ["GNT_C185U",1],
-["hilux1_civil_1_open",3],
-["hilux1_civil_2_covered",3],
-["hilux1_civil_3_open_EP1",3],
+["hilux1_civil_1_open_DZE",3],
+["hilux1_civil_2_covered_DZE",3],
+["hilux1_civil_3_open_DZE",3],
 ["HMMWV_Ambulance",1],
 ["HMMWV_Ambulance_CZ_DES_EP1",1],
 ["HMMWV_DES_EP1",3],

SQF/dayz_server/missions/DayZ_Epoch_3.Shapur_BAF/dynamic_vehicle.sqf

@@ -11,9 +11,9 @@ AllowedVehiclesList = [
 ["CSJ_GyroC",3],
 ["CSJ_GyroCover",3],
 ["CSJ_GyroP",3],
-["datsun1_civil_1_open",3],
-["datsun1_civil_2_covered",3],
-["datsun1_civil_3_open",3],
+["datsun1_civil_1_open_DZE",3],
+["datsun1_civil_2_covered_DZE",3],
+["datsun1_civil_3_open_DZE",3],
 ["GAZ_Vodnik_DZE",1],
 ["GAZ_Vodnik_MedEvac",1],
 ["GLT_M300_LT",3],
@@ -22,9 +22,9 @@ AllowedVehiclesList = [
 ["GNT_C185C",1],
 ["GNT_C185R",1],
 ["GNT_C185U",1],
-["hilux1_civil_1_open",3],
-["hilux1_civil_2_covered",3],
-["hilux1_civil_3_open_EP1",3],
+["hilux1_civil_1_open_DZE",3],
+["hilux1_civil_2_covered_DZE",3],
+["hilux1_civil_3_open_DZE",3],
 ["HMMWV_Ambulance",1],
 ["HMMWV_Ambulance_CZ_DES_EP1",1],
 ["HMMWV_DES_EP1",3],

SQF/dayz_server/missions/DayZ_Epoch_4.Zargabad/dynamic_vehicle.sqf

@@ -11,9 +11,9 @@ AllowedVehiclesList = [
 ["CSJ_GyroC",3],
 ["CSJ_GyroCover",3],
 ["CSJ_GyroP",3],
-["datsun1_civil_1_open",3],
-["datsun1_civil_2_covered",3],
-["datsun1_civil_3_open",3],
+["datsun1_civil_1_open_DZE",3],
+["datsun1_civil_2_covered_DZE",3],
+["datsun1_civil_3_open_DZE",3],
 ["GAZ_Vodnik_DZE",1],
 ["GAZ_Vodnik_MedEvac",1],
 ["GLT_M300_LT",3],
@@ -22,9 +22,9 @@ AllowedVehiclesList = [
 ["GNT_C185C",1],
 ["GNT_C185R",1],
 ["GNT_C185U",1],
-["hilux1_civil_1_open",3],
-["hilux1_civil_2_covered",3],
-["hilux1_civil_3_open_EP1",3],
+["hilux1_civil_1_open_DZE",3],
+["hilux1_civil_2_covered_DZE",3],
+["hilux1_civil_3_open_DZE",3],
 ["HMMWV_Ambulance",1],
 ["HMMWV_Ambulance_CZ_DES_EP1",1],
 ["HMMWV_DES_EP1",3],

SQF/dayz_server/missions/DayZ_Epoch_5.Bootcamp_ACR/dynamic_vehicle.sqf

@@ -11,9 +11,9 @@ AllowedVehiclesList = [
 ["CSJ_GyroC",3],
 ["CSJ_GyroCover",3],
 ["CSJ_GyroP",3],
-["datsun1_civil_1_open",3],
-["datsun1_civil_2_covered",3],
-["datsun1_civil_3_open",3],
+["datsun1_civil_1_open_DZE",3],
+["datsun1_civil_2_covered_DZE",3],
+["datsun1_civil_3_open_DZE",3],
 ["GAZ_Vodnik_DZE",1],
 ["GAZ_Vodnik_MedEvac",1],
 ["GLT_M300_LT",3],
@@ -22,9 +22,9 @@ AllowedVehiclesList = [
 ["GNT_C185C",1],
 ["GNT_C185R",1],
 ["GNT_C185U",1],
-["hilux1_civil_1_open",3],
-["hilux1_civil_2_covered",3],
-["hilux1_civil_3_open_EP1",3],
+["hilux1_civil_1_open_DZE",3],
+["hilux1_civil_2_covered_DZE",3],
+["hilux1_civil_3_open_DZE",3],
 ["HMMWV_Ambulance",1],
 ["HMMWV_Ambulance_CZ_DES_EP1",1],
 ["HMMWV_DES_EP1",3],

SQF/dayz_server/missions/DayZ_Epoch_6.Dingor/dynamic_vehicle.sqf

@@ -11,9 +11,9 @@ AllowedVehiclesList = [
 ["CSJ_GyroC",3],
 ["CSJ_GyroCover",3],
 ["CSJ_GyroP",3],
-["datsun1_civil_1_open",3],
-["datsun1_civil_2_covered",3],
-["datsun1_civil_3_open",3],
+["datsun1_civil_1_open_DZE",3],
+["datsun1_civil_2_covered_DZE",3],
+["datsun1_civil_3_open_DZE",3],
 ["Fishing_Boat",3],
 ["GAZ_Vodnik_DZE",1],
 ["GAZ_Vodnik_MedEvac",1],
@@ -23,9 +23,9 @@ AllowedVehiclesList = [
 ["GNT_C185C",1],
 ["GNT_C185R",1],
 ["GNT_C185U",1],
-["hilux1_civil_1_open",3],
-["hilux1_civil_2_covered",3],
-["hilux1_civil_3_open_EP1",3],
+["hilux1_civil_1_open_DZE",3],
+["hilux1_civil_2_covered_DZE",3],
+["hilux1_civil_3_open_DZE",3],
 ["HMMWV_Ambulance",1],
 ["HMMWV_Ambulance_CZ_DES_EP1",1],
 ["HMMWV_DES_EP1",3],

SQF/dayz_server/missions/DayZ_Epoch_7.Lingor/dynamic_vehicle.sqf

@@ -11,9 +11,9 @@ AllowedVehiclesList = [
 ["CSJ_GyroC",3],
 ["CSJ_GyroCover",3],
 ["CSJ_GyroP",3],
-["datsun1_civil_1_open",3],
-["datsun1_civil_2_covered",3],
-["datsun1_civil_3_open",3],
+["datsun1_civil_1_open_DZE",3],
+["datsun1_civil_2_covered_DZE",3],
+["datsun1_civil_3_open_DZE",3],
 ["Fishing_Boat",3],
 ["GAZ_Vodnik_DZE",1],
 ["GAZ_Vodnik_MedEvac",1],
@@ -23,9 +23,9 @@ AllowedVehiclesList = [
 ["GNT_C185C",1],
 ["GNT_C185R",1],
 ["GNT_C185U",1],
-["hilux1_civil_1_open",3],
-["hilux1_civil_2_covered",3],
-["hilux1_civil_3_open_EP1",3],
+["hilux1_civil_1_open_DZE",3],
+["hilux1_civil_2_covered_DZE",3],
+["hilux1_civil_3_open_DZE",3],
 ["HMMWV_Ambulance",1],
 ["HMMWV_Ambulance_CZ_DES_EP1",1],
 ["HMMWV_DES_EP1",3],

SQF/dayz_server/missions/DayZ_Epoch_8.ProvingGrounds_PMC/dynamic_vehicle.sqf

@@ -11,9 +11,9 @@ AllowedVehiclesList = [
 ["CSJ_GyroC",3],
 ["CSJ_GyroCover",3],
 ["CSJ_GyroP",3],
-["datsun1_civil_1_open",3],
-["datsun1_civil_2_covered",3],
-["datsun1_civil_3_open",3],
+["datsun1_civil_1_open_DZE",3],
+["datsun1_civil_2_covered_DZE",3],
+["datsun1_civil_3_open_DZE",3],
 ["GAZ_Vodnik_DZE",1],
 ["GAZ_Vodnik_MedEvac",1],
 ["GLT_M300_LT",3],
@@ -22,9 +22,9 @@ AllowedVehiclesList = [
 ["GNT_C185C",1],
 ["GNT_C185R",1],
 ["GNT_C185U",1],
-["hilux1_civil_1_open",3],
-["hilux1_civil_2_covered",3],
-["hilux1_civil_3_open_EP1",3],
+["hilux1_civil_1_open_DZE",3],
+["hilux1_civil_2_covered_DZE",3],
+["hilux1_civil_3_open_DZE",3],
 ["HMMWV_Ambulance",1],
 ["HMMWV_Ambulance_CZ_DES_EP1",1],
 ["HMMWV_DES_EP1",3],

SQF/dayz_server/missions/DayZ_Epoch_9.Woodland_ACR/dynamic_vehicle.sqf

@@ -11,9 +11,9 @@ AllowedVehiclesList = [
 ["CSJ_GyroC",3],
 ["CSJ_GyroCover",3],
 ["CSJ_GyroP",3],
-["datsun1_civil_1_open",3],
-["datsun1_civil_2_covered",3],
-["datsun1_civil_3_open",3],
+["datsun1_civil_1_open_DZE",3],
+["datsun1_civil_2_covered_DZE",3],
+["datsun1_civil_3_open_DZE",3],
 ["GAZ_Vodnik_DZE",1],
 ["GAZ_Vodnik_MedEvac",1],
 ["GLT_M300_LT",3],
@@ -22,9 +22,9 @@ AllowedVehiclesList = [
 ["GNT_C185C",1],
 ["GNT_C185R",1],
 ["GNT_C185U",1],
-["hilux1_civil_1_open",3],
-["hilux1_civil_2_covered",3],
-["hilux1_civil_3_open_EP1",3],
+["hilux1_civil_1_open_DZE",3],
+["hilux1_civil_2_covered_DZE",3],
+["hilux1_civil_3_open_DZE",3],
 ["HMMWV_Ambulance",1],
 ["HMMWV_Ambulance_CZ_DES_EP1",1],
 ["HMMWV_DES_EP1",3],

SQF/dayz_server/system/server_monitor.sqf

@@ -1,4 +1,4 @@
-private ["_nul","_result","_pos","_wsDone","_dir","_isOK","_countr","_objWpnTypes","_objWpnQty","_dam","_selection","_totalvehicles","_object","_idKey","_type","_ownerID","_worldspace","_intentory","_hitPoints","_fuel","_damage","_key","_vehLimit","_hiveResponse","_objectCount","_codeCount","_data","_status","_val","_traderid","_retrader","_traderData","_id","_lockable","_debugMarkerPosition","_vehicle_0","_bQty","_vQty","_BuildingQueue","_objectQueue","_superkey","_shutdown","_res","_hiveLoaded"];
+private ["_nul","_result","_pos","_wsDone","_dir","_isOK","_countr","_objWpnTypes","_objWpnQty","_dam","_selection","_totalvehicles","_object","_idKey","_type","_ownerID","_worldspace","_inventory","_hitPoints","_fuel","_damage","_key","_vehLimit","_hiveResponse","_objectCount","_codeCount","_data","_status","_val","_traderid","_retrader","_traderData","_id","_lockable","_debugMarkerPosition","_vehicle_0","_bQty","_vQty","_BuildingQueue","_objectQueue","_superkey","_shutdown","_res","_hiveLoaded"];
 
 dayz_versionNo = 		getText(configFile >> "CfgMods" >> "DayZ" >> "version");
 dayz_hiveVersionNo = 	getNumber(configFile >> "CfgMods" >> "DayZ" >> "hiveVersion");
@@ -91,7 +91,7 @@ if (isServer && isNil "sm_done") then {
 		_ownerID = 		_x select 3;
 
 		_worldspace = 	_x select 4;
-		_intentory =	_x select 5;
+		_inventory =	_x select 5;
 		_hitPoints =	_x select 6;
 		_fuel =			_x select 7;
 		_damage = 		_x select 8;
@@ -176,17 +176,17 @@ if (isServer && isNil "sm_done") then {
 				
 			};
 
-			if (count _intentory > 0) then {
+			if (count _inventory > 0) then {
 				if (_type in DZE_LockedStorage) then {
 					// Fill variables with loot
-					_object setVariable ["WeaponCargo", (_intentory select 0),true];
-					_object setVariable ["MagazineCargo", (_intentory select 1),true];
-					_object setVariable ["BackpackCargo", (_intentory select 2),true];
+					_object setVariable ["WeaponCargo", (_inventory select 0),true];
+					_object setVariable ["MagazineCargo", (_inventory select 1),true];
+					_object setVariable ["BackpackCargo", (_inventory select 2),true];
 				} else {
 
 					//Add weapons
-					_objWpnTypes = (_intentory select 0) select 0;
-					_objWpnQty = (_intentory select 0) select 1;
+					_objWpnTypes = (_inventory select 0) select 0;
+					_objWpnQty = (_inventory select 0) select 1;
 					_countr = 0;					
 					{
 						if(_x in (DZE_REPLACE_WEAPONS select 0)) then {
@@ -200,8 +200,8 @@ if (isServer && isNil "sm_done") then {
 					} count _objWpnTypes; 
 				
 					//Add Magazines
-					_objWpnTypes = (_intentory select 1) select 0;
-					_objWpnQty = (_intentory select 1) select 1;
+					_objWpnTypes = (_inventory select 1) select 0;
+					_objWpnQty = (_inventory select 1) select 1;
 					_countr = 0;
 					{
 						if (_x == "BoltSteel") then { _x = "WoodenArrow" }; // Convert BoltSteel to WoodenArrow
@@ -214,8 +214,8 @@ if (isServer && isNil "sm_done") then {
 					} count _objWpnTypes;
 
 					//Add Backpacks
-					_objWpnTypes = (_intentory select 2) select 0;
-					_objWpnQty = (_intentory select 2) select 1;
+					_objWpnTypes = (_inventory select 2) select 0;
+					_objWpnQty = (_inventory select 2) select 1;
 					_countr = 0;
 					{
 						_isOK = 	isClass(configFile >> "CfgVehicles" >> _x);
@@ -256,7 +256,7 @@ if (isServer && isNil "sm_done") then {
 			//Monitor the object
 			PVDZE_serverObjectMonitor set [count PVDZE_serverObjectMonitor,_object];
 		};
-	} count (_BuildingQueue + _objectQueue);
+	} forEach (_BuildingQueue + _objectQueue);
 	// # END SPAWN OBJECTS #
 
 	// preload server traders menu data into cache

SQF/dayz_sfx/CfgSounds.hpp

@@ -145,6 +145,21 @@ class CfgSounds {
 		sound[] = {"\dayz_sfx\effects\cough_2.ogg",0.3,1,40};
 		titles[] = {};
 	};
+	class z_cough_w_0 {
+		name = "";
+		sound[] = {"\dayz_sfx\effects\cough_w_0.ogg",0.5,1.5,40};
+		titles[] = {};
+	};
+	class z_cough_w_1 {
+		name = "";
+		sound[] = {"\dayz_sfx\effects\cough_w_1.ogg",0.4,1.5,40};
+		titles[] = {};
+	};
+	class z_cough_w_2 {
+		name = "";
+		sound[] = {"\dayz_sfx\effects\cough_w_2.ogg",0.3,1.5,40};
+		titles[] = {};
+	};
 	class z_bandage_0 {
 		name = "";
 		sound[] = {"\dayz_sfx\effects\bandage_0.ogg",0.3,1,40};

SQF/redryder/$PBOPREFIX$

@@ -0,0 +1 @@
+z\addons\redryder

SQF/redryder/config.cpp

@@ -17,30 +17,31 @@ class CfgPatches
 	class RedRyder
 	{
 		units[] = {};
-		weapons[] = {RedRyder};
+		weapons[] = {"RedRyder"};
 		requiredVersion = 1.00000;
 	};
 };
 class CfgModels
 {
-	class Default{};
- 	class Weapon: Default{};
+	class Default {};
+ 	class Weapon : Default {};
  	class RedRyder : Weapon{};
-
 };
 
 class CfgAmmo
 {
     class BulletBase;
-	class 177_BB: BulletBase {
-		model= \addons\redryder\models\BB_Round.p3d; //will need to be changed
-		simulation=shotShell;
-		soundHit[]={,0,1};
-		hit=3.7;indirectHit=0;indirectHitRange=0;
-		visibleFire=10;
-		audibleFire=10;
-		visibleFireTime=3;
-		deflecting=5;
+	class 177_BB : BulletBase {
+		model = "\z\addons\redryder\models\BB_Round.p3d";
+		simulation = shotShell;
+		soundHit[] = {0, 1};
+		hit = 4.5;
+		indirectHit = 0;
+		indirectHitRange = 0;
+		visibleFire = 10;
+		audibleFire = 0.5;
+		visibleFireTime = 3;
+		deflecting = 5;
 		airFriction = -0.001064;
 		fuseDistance = 0;
 		CraterEffects = "";
@@ -52,39 +53,45 @@ class CfgAmmo
 class CfgMagazines
 {
 	class CA_Magazine;
-	class 350Rnd_BB_Magazine: CA_Magazine {   
+	class 350Rnd_BB_Magazine : CA_Magazine 
+	{   
 		scope = 2;
-		model= \addons\redryder\models\bb_magazine.p3d;	//will need to be changed
-		picture="\addons\redryder\textures\bb_magazine_picture.paa"; //will need to be changed
-		displayName = 350 Count 177 Cal. BBs;
-		count=350;
+		model = "\z\addons\redryder\models\bb_magazine.p3d";	
+		picture = "\z\addons\redryder\textures\bb_magazine_picture.paa"; 
+		displayName = "350 Count .177 BBs";
+		count = 350;
 		ammo = 177_BB;
 		initSpeed = 175;
-		sound[]={"\addons\redryder\M9SD_S1", db8, 1,60}; //will need to be changed
-		reloadMagazineSound[]={"Ca\sounds\Weapons\rifles\M1014-reload",db-40,1,20};
-		descriptionShort = 350 Zink Coated .177, 4.5mm BBs;
-};
+		sound[] = {"\z\addons\redryder\M9SD_S1", db + 8, 1,60}; 
+		reloadMagazineSound[] = {"Ca\sounds\Weapons\rifles\M1014-reload", db - 40, 1, 20};
+		descriptionShort = "350 Zinc Coated .177, 4.5mm BBs";
+		weight = 0.2;
+	};
 };
 class CfgWeapons
 {
 	class Default {};
-	class Rifle: Default {};
-	class RedRyder: Rifle {
+	class Rifle : Default {};
+	class RedRyder : Rifle {
 		scope = 2;
-		model="\addons\redryder\models\RedRyder.p3d"; //will need to be changed
+		model = "z\addons\redryder\models\RedRyder.p3d"; 
 		displayName = "RedRyder BB Gun";
-		displayNameMagazine="BB";
-		magazines[]={"350Rnd_BB_Magazine"};
+		displayNameMagazine = "BB";
+		magazines[] = {"350Rnd_BB_Magazine"};
 		recoil = "recoil_single_pistol_2outof3";
 		recoilProne = "recoil_single_pistol_prone_2outof3";
-		reloadTime=0.45;
-		sound[]={"\addons\redryder\RedRyder\M9SD_S1", db8, 1,60}; //will need to be changed
-		dispersion=0.00045;
-		minRange=0;minRangeProbab=0.30;
-		midRange=39;midRangeProbab=0.7;
-		maxRange=75;maxRangeProbab=0.05;
-		picture="\addons\redryder\textures\redryder_picture.paa"; //will need to be changed
-		handAnim[]={"OFP2_ManSkeleton","\Ca\weapons\data\Anim\M24.rtm"};
-		
+		reloadTime = 0.45;
+		sound[] = {"\z\addons\redryder\M9SD_S1", db + 8, 1, 60}; 
+		autoFire = 0;
+		dexterity = 0.4;
+		dispersion = 0.00045;
+		minRange = 0;
+		minRangeProbab = 0.30;
+		midRange = 39;
+		midRangeProbab = 0.7;
+		maxRange = 75;
+		maxRangeProbab = 0.05;
+		picture = "\z\addons\redryder\textures\redryder_picture.paa"; 
+		handAnim[] = {"OFP2_ManSkeleton", "\Ca\weapons\data\Anim\M24.rtm"};
 	};
 };