1.0.2.5

Added more residential, removed chopper.

README.md

@@ -16,10 +16,8 @@ Included Custom Addons
 --------------------------
 * AutoGyro - by CSJ http://www.armaholic.com/page.php?id=2359
 * Taxi by [GLT]Myke http://www.armaholic.com/page.php?id=12289
-* Sigisolda by Gnat http://www.armaholic.com/page.php?id=13417
 * SUV Colors by Python.au http://www.armaholic.com/page.php?id=17176
 * R3F Realism by http://www.team-r3f.org/
-* Modern Civilian vehicles by vilas http://www.armaholic.com/page.php?id=17447
 * ASC EU Lights Mod http://www.armaholic.com/page.php?id=12076
 * MAP Editorupgrade (EU) http://www.armaholic.com/page.php?id=6194
 * st_movement by ShackTac https://dev-heaven.net/projects/shacktac/files

SQF/dayz_anim/CfgBanned/CfgMagazines.hpp

@@ -134,7 +134,7 @@ class CfgMagazines {
 	class 1350Rnd_30mmAP_A10: FakeMagazine {};
 	class 180Rnd_30mm_GSh301: FakeMagazine {};
 	class 750Rnd_30mm_GSh301: FakeMagazine {};
-	class 48Rnd_40mm_MK19: FakeMagazine {};
+//	class 48Rnd_40mm_MK19: FakeMagazine {};
 	class 6Rnd_Grenade_Camel: FakeMagazine {};
 	class 30Rnd_105mmHE_M119: FakeMagazine {};
 	class 20Rnd_120mmHE_M1A2: FakeMagazine {};

SQF/dayz_code/$PBOPREFIX$

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

SQF/dayz_code/Configs/CfgLootSmall.hpp

@@ -368,7 +368,7 @@ class CfgLootSmall {
 			0.04,
 			0.01,
 			0.04,
-			0.01,
+			0.01
 		}
 	};
 	policeman[] = {
@@ -450,7 +450,7 @@ class CfgLootSmall {
 			"Skin_Rocker4_DZ",
 			"Skin_SurvivorW3_DZ",
 			"Skin_SurvivorWpink_DZ",
-			"Skin_SurvivorWurban_DZ",
+			"Skin_SurvivorWurban_DZ"
 			//"Skin_SurvivorWsequisha_DZ",
 			//"Skin_SurvivorWsequishaD_DZ",
 		},
@@ -465,7 +465,7 @@ class CfgLootSmall {
 			0.08,
 			0.09,
 			0.09,
-			0.07,
+			0.07
 			//0.04,
 			//0.02
 		}
@@ -518,7 +518,7 @@ class CfgLootSmall {
 			"Skin_GUE_Soldier_Sniper_DZ",
 			"Skin_GUE_Soldier_Crew_DZ",
 			"Skin_GUE_Soldier_CO_DZ",
-			"Skin_GUE_Soldier_2_DZ",
+			"Skin_GUE_Soldier_2_DZ"
 		},
 		{
 			0.1,

SQF/dayz_code/Configs/CfgMagazines.hpp

@@ -1373,6 +1373,15 @@ class CfgMagazines {
 				output[] = {{"bulk_ItemWireHalf",1}};
 				input[] = {{"bulk_empty",1},{"ItemWire",6}};
 			};
+			class Crafting5
+			{
+				text = "Pack Bacon";
+				script = ";['Crafting5','CfgMagazines', _id] spawn player_craftItem;";
+				neednearby[] = {};
+				requiretools[] = {"ItemToolbox"};
+				output[] = {{"bulk_FoodbaconCooked",1}};
+				input[] = {{"bulk_empty",1},{"FoodbaconCooked",6}};
+			};
 		};
 	};
 	class bulk_ItemSodaCoke: bulk
@@ -1445,6 +1454,41 @@ class CfgMagazines {
 			};
 		};
 	};
+	class bulk_FoodbaconCooked: bulk
+	{
+		descriptionShort = "6 x FoodbaconCooked";
+		class ItemActions
+		{
+			class CreateMags
+			{
+				text = "Open %1";
+				script = "spawn player_loadCrate;";
+				output[] = {"FoodbaconCooked",6,"magazine"};
+			};
+			class Crafting
+			{
+				text = "Pack 6 Bacon";
+				script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
+				neednearby[] = {};
+				requiretools[] = {"ItemToolbox"};
+				output[] = {{"bulk_FoodbaconCookedFull",1}};
+				input[] = {{"bulk_FoodbaconCooked",1},{"FoodbaconCooked",6}};
+			};
+		};
+	};
+	class bulk_FoodbaconCookedFull: bulk
+	{
+		descriptionshort = "12 x FoodbaconCooked";
+		class ItemActions
+		{
+			class CreateMags
+			{
+				text = "Open %1";
+				script = "spawn player_loadCrate;";
+				output[] = {"FoodbaconCooked",12,"magazine"};
+			};
+		};
+	};
 	class bulk_30Rnd_9x19_MP5SD: bulk
 	{
 		descriptionShort = "12 x 30Rnd_9x19_MP5SD";
@@ -4556,7 +4600,8 @@ class CfgMagazines {
 		shortNameMagazine = "Dummy";
 		ammo = "Dummy_Swing_Ammo";
 	};
-	class ItemTrashToiletpaper : CA_Magazine {
+	// 	class HandGrenade;
+	class ItemTrashToiletpaper : HandGrenade {
 		scope = public;
 		count = 1;
 		displayName = $STR_JUNK_NAME_TOILETPAPER;
@@ -4564,6 +4609,7 @@ class CfgMagazines {
 		model = "z\addons\dayz_communityassets\models\toiletpaper.p3d";
 		picture = "\z\addons\dayz_communityassets\pictures\equip_toiletpaper_CA.paa";
 		type = 256;
+		ammo = "JackDaniels";
 	};
 	class ItemTrashRazor : CA_Magazine {
 		scope = public;

SQF/dayz_code/Configs/CfgVehicles/DZE/Doors.hpp

@@ -12,14 +12,24 @@ class DZE_Base_Object : All {
 	ladders[] = {};
 	vehicleClass =  "";
 	displayName = "";
-	coefInside = 1;
-	coefInsideHeur = 0.25;
 	mapSize = 7.5;
 	animated = true;
 	armor = 200;
 	destrType = "DestructBuilding";
 	damageResistance = 0.004;
-
+	// static 
+	reversed = 0;
+	hasDriver = 0;
+	accuracy = 0.1;
+	cost = 1000;
+	weapons[] = {};
+	magazines[] = {};
+	irTarget = 0;
+	type = 1;
+	threat[] = {0,0,0};
+	maxSpeed = 0;
+	coefInside = 4;
+	coefInsideHeur = 4;
 	class DestructionEffects {
 		class Sound {
 			simulation = "sound";

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

@@ -748,7 +748,7 @@ class Turrets : Turrets
 	  "PKT"
 	};
 	magazines[] = {
-	  "100Rnd_762x54_PK",
+	  "100Rnd_762x54_PK"
 	};
 	soundServo[] = {
 	};

SQF/dayz_code/Configs/CfgVehicles/Zeds/Zeds.hpp

@@ -223,6 +223,7 @@ class z_soldier_pilot: z_soldier
 {
 	displayName = "Zombie Soldier (Pilot)";
 	model = "\ca\characters_d_BAF\BAF_Pilot_BAF";
+	zombieLoot = "militarypilot";
 	hiddenSelections[] = {"Camo","Camo2","Camo3"};
 	hiddenSelectionsTextures[] = {"\ca\characters_W_baf\data\camo_dpm_co.paa","\ca\characters_W_baf\data\armour_dpm_co.paa","\ca\characters_W_baf\data\equip_dpm_co.paa"};
 	class HitPoints: HitPoints

SQF/dayz_code/Configs/CfgWeapons.hpp

@@ -74,6 +74,7 @@ class CfgWeapons {
 	#include "CfgWeapons\Item\ItemSledge.hpp"
 	#include "CfgWeapons\Item\ItemKeyKit.hpp"
 	#include "CfgWeapons\Item\ItemKeys.hpp"
+	#include "CfgWeapons\Item\ItemToolbox.hpp"
 	
 	//Sniper Rifel
 	//#include "CfgWeapons\Weapon\Sniper\AS50.hpp"

SQF/dayz_code/Configs/CfgWeapons/Item/Flare.hpp

@@ -29,7 +29,8 @@ class Flare : GrenadeLauncher {
 				"ItemSodaLemonadeEmpty", 
 				"ItemSodaLvgEmpty", 
 				"ItemSodaMzlyEmpty", 
-				"ItemSodaRabbitEmpty"
+				"ItemSodaRabbitEmpty",
+				"ItemTrashToiletpaper"
 			};          
 		};
 	}; 

SQF/dayz_code/Configs/CfgWeapons/Item/ItemToolbox.hpp

@@ -0,0 +1,16 @@
+class ItemToolbox: ItemCore
+{
+	scope = 2;
+	displayName = $STR_EQUIP_NAME_2;
+	model = "\dayz_equip\models\toolbox.p3d";
+	picture = "\dayz_equip\textures\equip_toolbox_ca.paa";
+	descriptionShort = $STR_EQUIP_DESC_2;
+	class ItemActions
+	{
+		class RemoveNet
+		{
+			text="Remove Camo Net";
+			script="spawn player_removeNet;";
+		};
+	};
+};

SQF/dayz_code/Configs/CfgWeapons/Loot.hpp

@@ -6,7 +6,7 @@ class Loot: Default
 	displayName = "Use";
 	canDrop = 0;
 	muzzles[] = {"this"};
-	magazines[] = {"FoodBioMeat","ItemZombieParts","ItemBandage","ItemHeatPack","PartWoodPile","PartFueltank","PartWheel","PartGeneric","PartEngine","PartVRotor","PartGlass","ItemWaterbottle","ItemWaterbottleUnfilled","ItemEpinephrine","ItemGoldBar","ItemSilverBar","ItemCopperBar","ItemMorphine","ItemBloodbag","ItemAntibiotic","ItemPainkiller","ItemJerrycan","ItemOilBarrel","ItemGenerator","ItemTent","ItemSandbag","ItemTankTrap","ItemWire","FoodSteakRaw","TrashTinCan","ItemSodaCoke","ItemSodaPepsi","ItemSodaMdew","ItemSodaMdew","FoodEdible","FoodSteakCooked","FoodCanBakedBeans","FoodCanSardines","FoodCanFrankBeans","FoodCanPasta"};
+	magazines[] = {"FoodBioMeat","ItemZombieParts","ItemBandage","ItemHeatPack","PartWoodPile","PartFueltank","PartWheel","PartGeneric","PartEngine","PartVRotor","PartGlass","ItemWaterbottle","ItemWaterbottleUnfilled","ItemEpinephrine","ItemGoldBar","ItemSilverBar","ItemCopperBar","ItemMorphine","ItemBloodbag","ItemAntibiotic","ItemPainkiller","ItemJerrycan","ItemOilBarrel","ItemGenerator","ItemTent","ItemSandbag","ItemTankTrap","ItemWire","FoodSteakRaw","TrashTinCan","ItemSodaCoke","ItemSodaPepsi","ItemSodaMdew","FoodEdible","FoodSteakCooked","FoodCanBakedBeans","FoodCanSardines","FoodCanFrankBeans","FoodCanPasta"};
 	modes[] = {"this"};
 	useAction = 0;
 	useActionTitle = "";

SQF/dayz_code/Configs/CfgWorlds/intro.Chernarus/mission.sqm

@@ -73,13 +73,14 @@ class Intro
 		"cadata",
 		"ca_animals2_sheep",
 		"dayz_code",
-		"dayz"
+		"dayz",
+		"caair2_uh1y"
 	};
 	addOnsAuto[]=
 	{
 		"cacharacters2",
 		"dayz_code",
-		"dayz",
+		"caair2_uh1y",
 		"chernarus"
 	};
 	randomSeed=4682243;
@@ -94,7 +95,7 @@ class Intro
 	};
 	class Groups
 	{
-		items=32;
+		items=31;
 		class Item0
 		{
 			side="CIV";
@@ -717,23 +718,6 @@ class Intro
 			};
 		};
 		class Item16
-		{
-			side="WEST";
-			class Vehicles
-			{
-				items=1;
-				class Item0
-				{
-					position[]={5210.0571,0,7646.0366};
-					id=16;
-					side="WEST";
-					vehicle="UH1Wreck_DZ";
-					leader=1;
-					skill=0.60000002;
-				};
-			};
-		};
-		class Item17
 		{
 			side="CIV";
 			class Vehicles
@@ -742,7 +726,7 @@ class Intro
 				class Item0
 				{
 					position[]={5207.4028,333.79437,7622.3882};
-					id=20;
+					id=19;
 					side="CIV";
 					vehicle="z_soldier_pilot";
 					leader=1;
@@ -763,7 +747,7 @@ class Intro
 				};
 				class Item1
 				{
-					position[]={5227.9648,329.65228,7659.29};
+					position[]={5227.3052,329.73154,7657.751};
 					type="CYCLE";
 					class Effects
 					{
@@ -772,7 +756,7 @@ class Intro
 				};
 			};
 		};
-		class Item18
+		class Item17
 		{
 			side="CIV";
 			class Vehicles
@@ -781,7 +765,7 @@ class Intro
 				class Item0
 				{
 					position[]={5206.0322,333.48984,7629.2871};
-					id=19;
+					id=18;
 					side="CIV";
 					vehicle="z_soldier_pilot";
 					leader=1;
@@ -802,7 +786,7 @@ class Intro
 				};
 				class Item1
 				{
-					position[]={5221.5,330.53357,7648.3267};
+					position[]={5220.8403,330.66727,7646.7876};
 					type="CYCLE";
 					class Effects
 					{
@@ -811,7 +795,7 @@ class Intro
 				};
 			};
 		};
-		class Item19
+		class Item18
 		{
 			side="CIV";
 			class Vehicles
@@ -821,7 +805,7 @@ class Intro
 				{
 					position[]={5204.2393,331.73276,7662.8403};
 					azimut=-173.96866;
-					id=17;
+					id=16;
 					side="CIV";
 					vehicle="z_soldier_pilot";
 					leader=1;
@@ -850,7 +834,7 @@ class Intro
 				};
 			};
 		};
-		class Item20
+		class Item19
 		{
 			side="CIV";
 			class Vehicles
@@ -859,7 +843,7 @@ class Intro
 				class Item0
 				{
 					position[]={5211.0615,333.18628,7624.001};
-					id=18;
+					id=17;
 					side="CIV";
 					vehicle="z_soldier_pilot";
 					leader=1;
@@ -871,7 +855,7 @@ class Intro
 				items=2;
 				class Item0
 				{
-					position[]={5222.2231,330.13312,7659.2412};
+					position[]={5221.5635,330.22226,7657.7021};
 					speed="LIMITED";
 					class Effects
 					{
@@ -889,7 +873,7 @@ class Intro
 				};
 			};
 		};
-		class Item21
+		class Item20
 		{
 			side="CIV";
 			class Vehicles
@@ -898,7 +882,7 @@ class Intro
 				class Item0
 				{
 					position[]={5218.3164,331.83609,7630.3311};
-					id=21;
+					id=20;
 					side="CIV";
 					vehicle="z_soldier_pilot";
 					leader=1;
@@ -928,7 +912,7 @@ class Intro
 				};
 			};
 		};
-		class Item22
+		class Item21
 		{
 			side="CIV";
 			class Vehicles
@@ -938,12 +922,12 @@ class Intro
 				{
 					position[]={5189.2949,333.11401,7671.0923};
 					azimut=140.44858;
-					id=22;
+					id=21;
 					side="CIV";
 					vehicle="z_soldier_pilot";
 					leader=1;
 					skill=0.60000002;
-					synchronizations[]={22};
+					synchronizations[]={21};
 				};
 			};
 			class Waypoints
@@ -969,7 +953,7 @@ class Intro
 				};
 			};
 		};
-		class Item23
+		class Item22
 		{
 			side="CIV";
 			class Vehicles
@@ -978,7 +962,7 @@ class Intro
 				class Item0
 				{
 					position[]={4600.0322,338.9549,9611.1768};
-					id=31;
+					id=30;
 					side="CIV";
 					vehicle="zZombie_new_Base";
 					leader=1;
@@ -1016,7 +1000,7 @@ class Intro
 				};
 			};
 		};
-		class Item24
+		class Item23
 		{
 			side="CIV";
 			class Vehicles
@@ -1026,7 +1010,7 @@ class Intro
 				{
 					position[]={4604.3633,338.95001,9605.8457};
 					azimut=-113.584;
-					id=23;
+					id=22;
 					side="CIV";
 					vehicle="z_villager2";
 					leader=1;
@@ -1072,7 +1056,7 @@ class Intro
 				};
 			};
 		};
-		class Item25
+		class Item24
 		{
 			side="CIV";
 			class Vehicles
@@ -1081,7 +1065,7 @@ class Intro
 				class Item0
 				{
 					position[]={4615.1289,338.93723,9580.209};
-					id=24;
+					id=23;
 					side="CIV";
 					vehicle="zZombie_new_Base";
 					leader=1;
@@ -1111,7 +1095,7 @@ class Intro
 				};
 			};
 		};
-		class Item26
+		class Item25
 		{
 			side="CIV";
 			class Vehicles
@@ -1120,7 +1104,7 @@ class Intro
 				class Item0
 				{
 					position[]={4643.1641,338.99911,9601.1494};
-					id=25;
+					id=24;
 					side="CIV";
 					vehicle="z_villager3";
 					leader=1;
@@ -1166,7 +1150,7 @@ class Intro
 				};
 			};
 		};
-		class Item27
+		class Item26
 		{
 			side="CIV";
 			class Vehicles
@@ -1176,7 +1160,7 @@ class Intro
 				{
 					position[]={4654.2002,339.01559,9579.2568};
 					azimut=55;
-					id=26;
+					id=25;
 					side="CIV";
 					vehicle="z_soldier_heavy";
 					leader=1;
@@ -1214,7 +1198,7 @@ class Intro
 				};
 			};
 		};
-		class Item28
+		class Item27
 		{
 			side="CIV";
 			class Vehicles
@@ -1223,7 +1207,7 @@ class Intro
 				class Item0
 				{
 					position[]={4616.7139,338.95935,9592.0107};
-					id=27;
+					id=26;
 					side="CIV";
 					vehicle="z_villager1";
 					leader=1;
@@ -1261,7 +1245,7 @@ class Intro
 				};
 			};
 		};
-		class Item29
+		class Item28
 		{
 			side="CIV";
 			class Vehicles
@@ -1270,7 +1254,7 @@ class Intro
 				class Item0
 				{
 					position[]={4623.8179,338.99677,9605.085};
-					id=28;
+					id=27;
 					side="CIV";
 					vehicle="z_villager2";
 					leader=1;
@@ -1300,7 +1284,7 @@ class Intro
 				};
 			};
 		};
-		class Item30
+		class Item29
 		{
 			side="CIV";
 			class Vehicles
@@ -1309,7 +1293,7 @@ class Intro
 				class Item0
 				{
 					position[]={4652.6494,339.01355,9575.4443};
-					id=29;
+					id=28;
 					side="CIV";
 					vehicle="z_villager3";
 					leader=1;
@@ -1339,7 +1323,7 @@ class Intro
 				};
 			};
 		};
-		class Item31
+		class Item30
 		{
 			side="CIV";
 			class Vehicles
@@ -1348,7 +1332,7 @@ class Intro
 				class Item0
 				{
 					position[]={4611.2588,338.95685,9591.377};
-					id=30;
+					id=29;
 					side="CIV";
 					vehicle="zZombie_new_Base";
 					leader=1;
@@ -1379,6 +1363,18 @@ class Intro
 			};
 		};
 	};
+	class Vehicles
+	{
+		items=1;
+		class Item0
+		{
+			position[]={5205.9297,332.242,7647.9438};
+			id=31;
+			side="EMPTY";
+			vehicle="UH1Wreck";
+			skill=0.60000002;
+		};
+	};
 };
 class OutroWin
 {

SQF/dayz_code/Configs/cfgLoot.hpp

@@ -387,6 +387,96 @@ class CfgLoot {
 			0.02
 		}
 	};
+	militarypilot[] = {
+		{
+			"FoodCanUnlabeled",
+			"ItemSodaEmpty",
+			"ItemSodaCoke",
+			"ItemSodaPepsi",
+			"ItemBandage",
+			"ItemAntibiotic",
+			"ItemPainkiller",
+			"ItemMorphine",
+			"30Rnd_556x45_Stanag",
+			"20Rnd_762x51_DMR",
+			"17Rnd_9x19_glock17",
+			"15Rnd_9x19_M9SD",
+			"15Rnd_9x19_M9",
+			"30Rnd_762x39_AK47",
+			"30Rnd_545x39_AK",
+			"5Rnd_762x51_M24",
+			"5Rnd_86x70_L115A1",
+			"8Rnd_B_Beneli_74Slug",
+			"1Rnd_HE_M203",
+			"FlareWhite_M203",
+			"FlareGreen_M203",
+			"1Rnd_Smoke_M203",		
+			"200Rnd_556x45_M249",
+			"HandGrenade_west",
+			"HandGrenade_east",
+			"SmokeShell",
+			"SmokeShellRed",
+			"SmokeShellGreen",
+			"8Rnd_B_Beneli_Pellets",
+			"30Rnd_556x45_StanagSD",
+			"30Rnd_9x19_MP5",
+			"30Rnd_9x19_MP5SD",
+			"100Rnd_762x51_M240",
+			"HandChemGreen",
+			"HandChemBlue",
+			"HandChemRed",
+			"ItemHeatPack",
+			"FoodMRE",
+			"8Rnd_9x18_MakarovSD",
+			"20Rnd_B_765x17_Ball",
+			"30Rnd_9x19_UZI_SD",
+			"ItemHotwireKit"
+		},
+		{
+			0.07,
+			0.04,
+			0.01,
+			0.01,
+			0.04,
+			0.04,
+			0.04,
+			0.01,
+			0.04,
+			0.04,
+			0.05,
+			0.01,
+			0.02,
+			0.04,
+			0.04,
+			0.01,
+			0.01,
+			0.04,
+			0.01,
+			0.01,
+			0.01,
+			0.01,
+			0.01,
+			0.01,
+			0.01,
+			0.04,
+			0.02,
+			0.02,
+			0.04,
+			0.01,
+			0.02,
+			0.01,
+			0.01,
+			0.02,
+			0.02,
+			0.02,
+			0.04,
+			0.03,
+			0.01,
+			0.04,
+			0.01,
+			0.02
+		}
+	};
 	policeman[] = {
 		{
 			"ItemBandage",
@@ -495,7 +585,7 @@ class CfgLoot {
 			"Skin_Rocker4_DZ",
 			"Skin_SurvivorW3_DZ",
 			"Skin_SurvivorWpink_DZ",
-			"Skin_SurvivorWurban_DZ",
+			"Skin_SurvivorWurban_DZ"
 			//"Skin_SurvivorWsequisha_DZ",
 			//"Skin_SurvivorWsequishaD_DZ",
 		},
@@ -510,7 +600,7 @@ class CfgLoot {
 			0.08,
 			0.09,
 			0.09,
-			0.07,
+			0.07
 			//0.04,
 			//0.02
 		}
@@ -563,7 +653,7 @@ class CfgLoot {
 			"Skin_GUE_Soldier_Sniper_DZ",
 			"Skin_GUE_Soldier_Crew_DZ",
 			"Skin_GUE_Soldier_CO_DZ",
-			"Skin_GUE_Soldier_2_DZ",
+			"Skin_GUE_Soldier_2_DZ"
 		},
 		{
 			0.1,
@@ -587,12 +677,12 @@ class CfgLoot {
 		{
 			"ItemTentOld",
 			"ItemTentDomed",
-			"ItemTentDomed2",
+			"ItemTentDomed2"
 		},
 		{
 			0.34,
 			0.33,
-			0.33,
+			0.33
 		}
 	};
 	backpacks[] = {
@@ -602,7 +692,7 @@ class CfgLoot {
 			"DZ_TerminalPack_EP1", // 1-15
 			"DZ_ALICE_Pack_EP1", // 2-20
 			"DZ_TK_Assault_Pack_EP1", // 2-22
-			"DZ_CompactPack_EP1", // 2-25
+			"DZ_CompactPack_EP1" // 2-25
 		},
 		{
 			0.22,
@@ -610,7 +700,7 @@ class CfgLoot {
 			0.18,
 			0.16,
 			0.13,
-			0.11,
+			0.11
 		}
 	};
 	militarybackpacks[] = {
@@ -626,7 +716,23 @@ class CfgLoot {
 			0.25,
 			0.20,
 			0.15,
+			0.10
+		}
+	};
+	militaryammo[] = {
+		{
+			"2000Rnd_762x51_M134",
+			"29Rnd_30mm_AGS30",
+			"50Rnd_127x107_DSHKM",
+			"48Rnd_40mm_MK19",
+			"100Rnd_127x99_M2"
+		},
+		{
 			0.10,
+			0.20,
+			0.20,
+			0.20,
+			0.30
 		}
 	};
 };

SQF/dayz_code/Configs/cfgVehicles.hpp

@@ -192,13 +192,6 @@ class CfgVehicles {
         };
 	};
 	
-
-	class VIL_asistvan;
-	class VIL_asistvan_DZE: VIL_asistvan 
-	{
-		transportrepair = 0;
-	};
-	
 	class Mi17_base: Helicopter 
 	{
 		class Turrets: Turrets

SQF/dayz_code/Configs/rscTitles.hpp

@@ -149,7 +149,7 @@ class RscDisplayMain : RscStandardDisplay
 		class DAYZ_Version : CA_Version
 		{
 			idc = -1;
-			text = "DayZ Epoch 1.0.2.4";
+			text = "DayZ Epoch 1.0.2.5";
 			y = "(SafeZoneH + SafeZoneY) - (1 - 0.95)";
 		};
 		delete CA_TitleMainMenu;
@@ -1783,50 +1783,7 @@ class RscTitles
 				w = 0.5;
 				h = 0.1;
 			};
-			class RscPicture_1201: RscPictureGUI
+			
-			{
-				idc = 1201;
-				text = "\z\addons\dayz_code\gui\status_food_border_ca.paa";
-				x = 0.955313 * safezoneW + safezoneX;
-				y = 0.93 * safezoneH + safezoneY; //1
-				w = 0.06;
-				h = 0.08;
-			};
-			class RscPicture_1200: RscPictureGUI
-			{
-				idc = 1200;
-				text = "\z\addons\dayz_code\gui\status_blood_border_ca.paa";
-				x = 0.955313 * safezoneW + safezoneX;
-				y = 0.86 * safezoneH + safezoneY;//2
-				w = 0.06;
-				h = 0.08;
-			};
-			class RscPicture_1202: RscPictureGUI
-			{
-				idc = 1202;
-				text = "\z\addons\dayz_code\gui\status_thirst_border_ca.paa";
-				x = 0.955313 * safezoneW + safezoneX;
-				y = 0.79 * safezoneH + safezoneY; //3
-				w = 0.06;
-				h = 0.08;
-			};
-			class RscPicture_1208: RscPictureGUI
-			{
-				idc = 1208;
-				text = "\z\addons\dayz_code\gui\status_temp_outside_ca.paa";
-				x = 0.955313 * safezoneW + safezoneX;
-				y = 0.72 * safezoneH + safezoneY; //3
-				w = 0.06;
-				h = 0.08;
-			};
-			class RscPicture_1207 : RscPictureGUI {
-				idc = 1207;
-				text = "\z\addons\dayz_code\gui\status_combat_border_ca.paa";
-				x = "0.955313 * safezoneW + safezoneX";
-				y = "0.65 * safezoneH + safezoneY";
-				w = 0.06;
-				h = 0.08;
-			};
 			class RscPicture_1203: RscPictureGUI
 			{
 				idc = 1203;
@@ -1865,24 +1822,7 @@ class RscTitles
 				w = 0.06;
 				h = 0.08;
 			};
-			class RscPicture_1501: RscPictureGUI
+			
-			{
-				idc = 1501;
-				text = "\z\addons\dayz_code\gui\status_food_border_ca.paa";
-				x = 0.945313 * safezoneW + safezoneX;
-				y = 0.95 * safezoneH + safezoneY; //1
-				w = 0.04;
-				h = 0.053333;
-			};
-			class RscPicture_1502: RscPictureGUI
-			{
-				idc = 1502;
-				text = "\z\addons\dayz_code\gui\status_thirst_border_ca.paa";
-				x = 0.945313 * safezoneW + safezoneX;
-				y = 0.816666 * safezoneH + safezoneY; //3
-				w = 0.04;
-				h = 0.053333;
-			};
 		};
 		class Controls{
 			class RscPicture_1301: RscPictureGUI

SQF/dayz_code/actions/buy_db.sqf

@@ -5,7 +5,7 @@ if (TradeInprogress) exitWith {}; // Do not allow if any script is running.
 {player removeAction _x} forEach s_player_parts;s_player_parts = [];
 
 // [ _trader_id, _category, _action ];
-_activatingPlayer = _this select 1;
+_activatingPlayer = player;
 
 _trader_id = (_this select 3) select 0;
 // _category = (_this select 3) select 1;

SQF/dayz_code/actions/cook.sqf

@@ -1,4 +1,4 @@
-private ["_text","_rawmeat","_cookedmeat","_meat","_meatcooked","_qty","_started","_finished","_animState","_isMedic","_removed","_dis","_sfx"];
+private ["_text","_rawmeat","_cookedmeat","_meat","_meatcooked","_qty","_started","_finished","_animState","_isMedic","_removed","_dis","_sfx","_textraw"];
 
 if(TradeInprogress) exitWith { cutText ["Cooking already in progress." , "PLAIN DOWN"]; };
 TradeInprogress = true;

SQF/dayz_code/actions/dog/warn.sqf

@@ -10,6 +10,7 @@ s_player_warndog = -1;
 _handle setFSMVariable ["_watchDog",_watchDog];
 
 _warn = {
+	private ["_watchDog","_dog","_nearby","_senseSkill","_handle"];
     _handle = _this select 0;
 	while {_watchDog and alive _dog} do {
 		_watchDog = _handle getFSMVariable "_watchDog";

SQF/dayz_code/actions/fill_nearestVehicle.sqf

@@ -1,4 +1,4 @@
-private ["_vehicle","_curFuel","_newFuel","_started","_finished","_animState","_isMedic","_abort","_canSize","_configVeh","_capacity","_nameText","_isOk","_findNearestVehicles","_findNearestVehicle","_IsNearVehicle"];
+private ["_vehicle","_curFuel","_newFuel","_started","_finished","_animState","_isMedic","_abort","_canSize","_configVeh","_capacity","_nameText","_isOk","_findNearestVehicles","_findNearestVehicle","_IsNearVehicle","_isVehicle","_configSrcVeh","_capacitySrc","_nameTextSrc","_isFillok","_curFuelSrc","_newFuelSrc","_vehicleSrc"];
 
 if(TradeInprogress) exitWith { cutText ["Refuel already in progress." , "PLAIN DOWN"] };
 TradeInprogress = true;
@@ -12,8 +12,8 @@ if(!(isNull _vehicleSrc)) then {
 	_isVehicle = ((_vehicleSrc isKindOf "AllVehicles") and !(_vehicleSrc isKindOf "Man"));
 	// If fuel source is vehicle get actual capacity
 	_configSrcVeh = 	configFile >> "cfgVehicles" >> TypeOf(_vehicleSrc);
-	_capacitySrc = 	getNumber(_configVeh >> "fuelCapacity");
+	_capacitySrc = 	getNumber(_configSrcVeh >> "fuelCapacity");
-	_nameTextSrc = 	getText(_configVeh >> "displayName");
+	_nameTextSrc = 	getText(_configSrcVeh >> "displayName");
 };
 
 // Get all nearby vehicles within 30m

SQF/dayz_code/actions/gather_meat.sqf

@@ -1,4 +1,4 @@
-private ["_item","_hasKnife","_hasKnifeBlunt","_hasHarvested","_qty","_text","_string","_type","_started","_finished","_animState","_isMedic","_array","_isListed","_config"];
+private ["_item","_hasKnife","_hasKnifeBlunt","_hasHarvested","_qty","_text","_string","_type","_started","_finished","_animState","_isMedic","_isListed","_config"];
 
 if(TradeInprogress) exitWith { cutText ["Gutting animal already in progress." , "PLAIN DOWN"]; };
 TradeInprogress = true;

SQF/dayz_code/actions/gather_zparts.sqf

@@ -1,4 +1,4 @@
-private ["_hasKnife","_qty","_item","_text","_string","_type","_started","_finished","_animState","_isMedic","_array","_hasHarvested","_hasKnifeBlunt","_humanity"];
+private ["_hasKnife","_qty","_item","_text","_string","_type","_started","_finished","_animState","_isMedic","_hasHarvested","_hasKnifeBlunt","_humanity"];
 
 if(TradeInprogress) exitWith { cutText ["Gutting zombie already in progress." , "PLAIN DOWN"]; };
 TradeInprogress = true;

SQF/dayz_code/actions/hotwire_veh.sqf

@@ -1,4 +1,4 @@
-private["_vehicle"];
+private ["_vehicle","_removed"];
 _vehicle = _this select 3;
 
 if(TradeInprogress) exitWith { cutText ["Hotwire vehicle already in progress." , "PLAIN DOWN"]; };

SQF/dayz_code/actions/jerry_fill.sqf

@@ -1,4 +1,4 @@
-private ["_qty","_started","_finished","_animState","_isMedic","_abort","_fillCounter","_dis","_sfx"];
+private ["_qty","_started","_finished","_animState","_isMedic","_abort","_fillCounter","_dis","_sfx","_displayName","_fuelCans"];
 
 if(TradeInprogress) exitWith { cutText ["Fill Jerry already in progress." , "PLAIN DOWN"]; };
 TradeInprogress = true;

SQF/dayz_code/actions/list_playerDeaths.sqf

@@ -1,7 +1,7 @@
 private ["_activatingPlayer"];
 
 // [ _trader_id, _category, _action ];
-_activatingPlayer = _this select 1;
+_activatingPlayer = player;
 
 //diag_log format["DEBUG DEATH OBJ: %1", _this select 0];
 

SQF/dayz_code/actions/object_pickup.sqf

@@ -1,4 +1,4 @@
-private ["_array","_type","_classname","_holder","_config","_isOk","_muzzles","_playerID","_claimedBy","_text","_broken","_playerNear","_obj","_qty"];
+private ["_array","_type","_classname","_holder","_config","_isOk","_muzzles","_playerID","_claimedBy","_text","_playerNear","_obj","_qty"];
 
 // Exit if player zombie
 if(player isKindOf "PZombie_VB") exitWith {};

SQF/dayz_code/actions/player_build.sqf

@@ -2,7 +2,7 @@
 	DayZ Base Building
 	Made for DayZ Epoch please ask permission to use/edit/distrubute email vbawol@veteranbastards.com.
 */
-private ["_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","_objHupDiff","_objHdwnDiff","_needNear"];
+private ["_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","_objHupDiff","_objHdwnDiff","_needNear","_vehicle","_inVehicle","_previewCounter"];
 
 if(TradeInprogress) exitWith { cutText ["\n\nBuilding already in progress." , "PLAIN DOWN"]; };
 TradeInprogress = true;
@@ -16,6 +16,9 @@ _cancel = false;
 _reason = "";
 _canBuildOnPlot = false;
 
+_vehicle = vehicle player;
+_inVehicle = (_vehicle != player);
+
 DZE_Q = false;
 DZE_Z = false;
 
@@ -35,6 +38,7 @@ call gear_ui_init;
 closeDialog 1;
 
 if(_isWater) exitWith {TradeInprogress = false; cutText [localize "str_player_26", "PLAIN DOWN"];};
+if (_inVehicle) exitWith {TradeInprogress = false; cutText ["Cannot build while in a vehicle.", "PLAIN DOWN"];};
 if(_onLadder) exitWith {TradeInprogress = false; cutText [localize "str_player_21", "PLAIN DOWN"];};
 if(player getVariable["combattimeout", 0] >= time) exitWith {TradeInprogress = false; cutText ["Cannot build while in combat.", "PLAIN DOWN"];};
 
@@ -159,7 +163,7 @@ _missing = "";
 _hasrequireditem = true;
 {
 	_hastoolweapon = _x in weapons player;
-	if(!_hastoolweapon) exitWith { _hasrequireditem = false; _missing = _x; }
+	if(!_hastoolweapon) exitWith { _hasrequireditem = false; _missing = getText (configFile >> "cfgWeapons" >> _x >> "displayName"); }
 } forEach _require;
 
 _hasbuilditem = _this in magazines player;

SQF/dayz_code/actions/player_buildingDowngrade.sqf

@@ -25,6 +25,8 @@ _findNearestPole = [];
 
 _IsNearPlot = count (_findNearestPole);
 
+_canBuildOnPlot = false;
+
 if(_IsNearPlot == 0) then {
 	_canBuildOnPlot = true;
 } else {
@@ -138,7 +140,7 @@ if ((count _upgrade) > 0) then {
 		player reveal _object;
 			
 	} else {
-		cutText [format["\n\n%1 of %2 could not be added to your inventory. (not enough room?)", _i,_itemOut], "PLAIN DOWN"];
+		cutText [format["\n\n%1 of %2 could not be added to your inventory. (not enough room?)", _i,(getText(configFile >> "CfgMagazines" >> _itemOut >> "displayName"))], "PLAIN DOWN"];
 		{
 			[player,(_x select 0),(_x select 1)] call BIS_fnc_invRemove;
 		} forEach _addedItems;

SQF/dayz_code/actions/player_chopWood.sqf

@@ -3,7 +3,7 @@
 	Usage: spawn player_chopWood;
 	Made for DayZ Epoch please ask permission to use/edit/distrubute email vbawol@veteranbastards.com.
 */
-private ["_isOk","_i","_objName","_objInfo","_lenInfo","_started","_finished","_animState","_isMedic","_proceed","_counter","_itemOut","_countOut","_tree","_distance2d","_distance3d","_trees","_findNearestTree"];
+private ["_isOk","_objName","_finished","_proceed","_counter","_itemOut","_countOut","_tree","_distance2d","_distance3d","_trees","_findNearestTree","_finishedTime","_item"];
 
 if(TradeInprogress) exitWith { cutText ["\n\nHarvest wood already in progress." , "PLAIN DOWN"]; };
 TradeInprogress = true;
@@ -116,6 +116,8 @@ if (count(_findNearestTree) >= 1) then {
 
 			cutText [format["\n\n%1 piles of wood has been successfully added in front of you.", _countOut], "PLAIN DOWN"];
 
+			player action ["Gear", _item];
+
 		} else {
 			r_interrupt = false;
 			if (vehicle player == player) then {

SQF/dayz_code/actions/player_craftItem.sqf

@@ -19,7 +19,7 @@ class ItemActions
 	};
 };	
 */
-private ["_tradeComplete","_onLadder","_canDo","_selectedRecipeOutput","_proceed","_itemIn","_countIn","_missing","_missingQty","_qty","_itemOut","_countOut","_started","_finished","_animState","_isMedic","_removed","_tobe_removed_total","_textCreate","_textMissing","_selectedRecipeInput","_num_removed","_removed_total","_temp_removed_array","_abort","_reason","_isNear","_missingTools","_hastoolweapon","_selectedRecipeTools","_distance","_crafting","_needNear","_item","_baseClass","_num_removed_weapons","_outputWeapons","_inputWeapons","_randomOutput","_craft_doLoop","_selectedWeapon","_selectedMag"];
+private ["_tradeComplete","_onLadder","_canDo","_selectedRecipeOutput","_proceed","_itemIn","_countIn","_missing","_missingQty","_qty","_itemOut","_countOut","_started","_finished","_animState","_isMedic","_removed","_tobe_removed_total","_textCreate","_textMissing","_selectedRecipeInput","_num_removed","_removed_total","_temp_removed_array","_abort","_reason","_isNear","_missingTools","_hastoolweapon","_selectedRecipeTools","_distance","_crafting","_needNear","_item","_baseClass","_num_removed_weapons","_outputWeapons","_inputWeapons","_randomOutput","_craft_doLoop","_selectedWeapon","_selectedMag","_sfx"];
 
 if(TradeInprogress) exitWith { cutText ["\n\nCrafting already in progress." , "PLAIN DOWN"]; };
 TradeInprogress = true;

SQF/dayz_code/actions/player_drink.sqf

@@ -1,4 +1,4 @@
-private ["_onLadder","_itemorignal","_hasdrinkitem","_hasoutput","_config","_text","_sfx","_dis","_itemtodrop","_nearByPile","_item","_display"];
+private ["_onLadder","_itemorignal","_hasdrinkitem","_hasoutput","_config","_text","_sfx","_dis","_itemtodrop","_nearByPile","_item","_display","_invehicle"];
 
 disableserialization;
 call gear_ui_init;

SQF/dayz_code/actions/player_eat.sqf

@@ -1,4 +1,4 @@
-private ["_onLadder","_itemorignal","_hasfooditem","_rawfood","_hasoutput","_config","_text","_regen","_dis","_sfx","_itemtodrop","_nearByPile","_item","_display","_rawexceptions","_badfood"];
+private ["_onLadder","_itemorignal","_hasfooditem","_rawfood","_hasoutput","_config","_text","_regen","_dis","_sfx","_itemtodrop","_nearByPile","_item","_display","_rawexceptions","_badfood","_invehicle"];
 disableserialization;
 call gear_ui_init;
 _onLadder =		(getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "onLadder")) == 1;

SQF/dayz_code/actions/player_goFishing.sqf

@@ -45,11 +45,17 @@ while {_isOk} do {
 		_inVehicle = (_vehicle != player);
 		if(_inVehicle) then {
 			if(_vehicle isKindOf "Ship") then {
+				// higher chance to catch if water is deeper than 25m
+				if(((getPosATL _vehicle) select 2) > 25) then {
+					_rnd = 12;
+				} else {
 					_rnd = 25;
 				};
 			};
+		};
 
-		// 1% chance to catch anything
+
+		// chance to catch anything
 		if((random _rnd) <= 1) then {
 			// Just the one fish for now
 			_itemOut = ["ItemTrout","ItemTrout","ItemTrout","ItemTrout","ItemTrout","ItemTrout","ItemTrout","ItemSeaBass","ItemSeaBass","ItemTuna"] call BIS_fnc_selectRandom;
@@ -67,7 +73,7 @@ while {_isOk} do {
 		} else {
 			cutText ["\n\nNibble... Nibble...", "PLAIN DOWN"];
 			_counter = _counter + 1;
-			if(_counter == 5) then {
+			if(_counter == 10) then {
 				_isOk = false;
 				sleep 2;
 				cutText ["\n\nYou didn't catch anything.", "PLAIN DOWN"];

SQF/dayz_code/actions/player_harvestPlant.sqf

@@ -3,7 +3,7 @@
 	Usage: spawn player_harvestPlant;
 	Made for DayZ Epoch please ask permission to use/edit/distrubute email vbawol@veteranbastards.com.
 */
-private ["_isOk","_i","_objName","_started","_finished","_animState","_isMedic","_proceed","_itemOut","_countOut","_tree","_trees","_findNearestTree","_index","_invResult","_treesOutput"];
+private ["_isOk","_i","_objName","_started","_finished","_animState","_isMedic","_proceed","_itemOut","_countOut","_tree","_trees","_findNearestTree","_index","_invResult","_treesOutput","_text"];
 
 if(TradeInprogress) exitWith { cutText ["\n\nHarvest already in progress." , "PLAIN DOWN"]; };
 TradeInprogress = true;
@@ -102,6 +102,8 @@ if (count(_findNearestTree) >= 1) then {
 			};
 		};
 
+		_text = getText (configFile >> "CfgMagazines" >> _itemOut >> "displayName");
+		
 		if(_i != 0) then {
 			// chop down tree
 			if("" == typeOf _tree) then {
@@ -109,9 +111,9 @@ if (count(_findNearestTree) >= 1) then {
 			};
 			//diag_log format["DEBUG TREE DAMAGE: %1", _tree];
 		
-			cutText [format["\n\n%1 of %2 has been successfully added to your inventory.", _i,_itemOut], "PLAIN DOWN"];
+			cutText [format["\n\n%1 of %2 has been successfully added to your inventory.", _i,_text], "PLAIN DOWN"];
 		} else {
-			cutText [format["\n\n%1 of %2 could not be added to your inventory. (not enough room?)", _i,_itemOut], "PLAIN DOWN"];
+			cutText [format["\n\n%1 of %2 could not be added to your inventory. (not enough room?)", _i,_text], "PLAIN DOWN"];
 		};
 	} else {
 		r_interrupt = false;

SQF/dayz_code/actions/player_loadCrate.sqf

@@ -11,7 +11,7 @@ if(!_hasTool) exitWith {
 
 _item =     _this;
 _hasCrate = 	_item in magazines player;
-if (!_hasCrate) then {
+if (!_hasCrate) exitWith {
 	cutText ["\n\nMissing supply crate.", "PLAIN DOWN"];
 	TradeInprogress = false;
 };
@@ -51,6 +51,8 @@ if(_type == "backpack") then {
 
 player reveal _box;
 
+player action ["Gear", _box];
+		
 cutText ["\n\nOpened supply crate.", "PLAIN DOWN"];
 	
 TradeInprogress = false;

SQF/dayz_code/actions/player_mineOre.sqf

@@ -3,7 +3,7 @@
 	Usage: spawn player_mineOre;
 	Made for DayZ Epoch please ask permission to use/edit/distrubute email vbawol@veteranbastards.com.
 */
-private ["_isOk","_i","_objName","_objInfo","_lenInfo","_started","_finished","_animState","_isMedic","_proceed","_counter","_itemOut","_countOut","_rock","_distance2d","_rockBox","_rocks","_findNearestRock"];
+private ["_isOk","_objName","_started","_finished","_animState","_isMedic","_proceed","_counter","_itemOut","_countOut","_rock","_distance2d","_rockBox","_rocks","_findNearestRock","_item","_rnd"];
 
 if(TradeInprogress) exitWith { cutText ["\n\nOre Mining already in progress." , "PLAIN DOWN"]; };
 TradeInprogress = true;

SQF/dayz_code/actions/player_reloadMags.sqf

@@ -1,4 +1,4 @@
-private ["_item","_config","_consume","_create","_item_ammo","_consume_magsize","_create_magsize","_consume_type","_slotstart","_slotend","_dialog","_qty_total_ammo","_qty_consume_ammo","_qty_create_ammo","_qty_consume_mags","_qty_create_mags","_qty_free_slots","_control","_mag","_qtynew_create_ammo","_qtynew_consume_ammo","_qtynew_create_mags","_qtynew_consume_mags","_qtynew_consume_mags_full","_qtynew_create_mags_full","_qtynew_consume_ammo_rest","_qtynew_create_ammo_rest","_avaliable_slots"];
+private ["_item","_config","_consume","_create","_item_ammo","_consume_magsize","_create_magsize","_consume_type","_slotstart","_slotend","_dialog","_qty_total_ammo","_qty_consume_ammo","_qty_create_ammo","_qty_consume_mags","_qty_create_mags","_qty_free_slots","_control","_mag","_qtynew_create_ammo","_qtynew_consume_ammo","_qtynew_create_mags","_qtynew_consume_mags","_qtynew_consume_mags_full","_qtynew_create_mags_full","_qtynew_consume_ammo_rest","_qtynew_create_ammo_rest"];
 
 disableSerialization;
 call gear_ui_init;
@@ -83,14 +83,17 @@ if ( _consume_magsize > _create_magsize) then {
     _qtynew_consume_ammo = 0;
 };
 
-if ((_qtynew_create_mags + _qtynew_consume_mags) > _avaliable_slots) exitWith {
+if ((_qtynew_create_mags + _qtynew_consume_mags) > (_qty_create_mags + _qty_consume_mags + _qty_free_slots)) exitWith {
-    cutText [localize "STR_DAYZ_CODE_2", "PLAIN DOWN"];
+    cutText [localize "str_player_24", "PLAIN DOWN"];
 };
 _qtynew_consume_mags_full = floor(_qtynew_consume_ammo/_consume_magsize);
 _qtynew_create_mags_full = floor(_qtynew_create_ammo/_create_magsize);
 _qtynew_consume_ammo_rest = _qtynew_consume_ammo - (_qtynew_consume_mags_full*_consume_magsize);
 _qtynew_create_ammo_rest = _qtynew_create_ammo - (_qtynew_create_mags_full*_create_magsize);
 
+// abort if no complete mags or partial mag is less than 15% full
+if(_qtynew_create_ammo_rest > 0 and _qtynew_create_ammo_rest < (_create_magsize*0.85)) exitWith { cutText ["\n\nCombine ammo failed you need at least 85% capacity to fill a mag", "PLAIN DOWN"]; };
+
 //remove all _consume and _create mags (we already have total ammo count) 
 player removeMagazines _consume;
 player removeMagazines _create; 

SQF/dayz_code/actions/player_upgrade.sqf

@@ -26,6 +26,8 @@ _findNearestPole = [];
 
 _IsNearPlot = count (_findNearestPole);
 
+_canBuildOnPlot = false;
+
 if(_IsNearPlot == 0) then {
 	_canBuildOnPlot = true;
 } else {

SQF/dayz_code/actions/pzombie/pz_feed.sqf

@@ -88,7 +88,7 @@ if(!(alive _item)) then {
 	_control ctrlShow true;
 
 
-	cutText [format[(localize  "str_player_consumed"),_animalType], "PLAIN DOWN"];
+	cutText [format[(localize  "str_player_consumed"),(getText (configFile >> "CfgVehicles" >> _animalType >> "displayName"))], "PLAIN DOWN"];
 	player switchmove "";
 };
 

SQF/dayz_code/actions/remove.sqf

@@ -2,7 +2,7 @@
 delete object from db with extra waiting by [VB]AWOL
 parameters: _obj
 */
-private ["_obj","_objectID","_objectUID","_started","_finished","_animState","_isMedic","_isOk","_proceed","_counter","_limit","_objType","_sfx","_dis","_itemOut","_countOut","_selectedRemoveOutput","_friendlies","_nearestPole","_ownerID","_refundpart","_isWreck","_findNearestPoles","_findNearestPole","_IsNearPlot","_brokenTool","_removeTool","_isDestructable","_isRemovable","_objOwnerID","_isOwnerOfObj","_preventRefund","_ipos","_item","_radius","_isWreckBuilding"];
+private ["_activatingPlayer","_obj","_objectID","_objectUID","_started","_finished","_animState","_isMedic","_isOk","_proceed","_counter","_limit","_objType","_sfx","_dis","_itemOut","_countOut","_selectedRemoveOutput","_friendlies","_nearestPole","_ownerID","_refundpart","_isWreck","_findNearestPoles","_findNearestPole","_IsNearPlot","_brokenTool","_removeTool","_isDestructable","_isRemovable","_objOwnerID","_isOwnerOfObj","_preventRefund","_ipos","_item","_radius","_isWreckBuilding","_nameVehicle"];
 
 if(TradeInprogress) exitWith { cutText ["Remove already in progress." , "PLAIN DOWN"]; };
 TradeInprogress = true;
@@ -12,6 +12,8 @@ s_player_deleteBuild = 1;
 
 _obj = _this select 3;
 
+_activatingPlayer = player;
+
 _objOwnerID = _obj getVariable["CharacterID","0"];
 _isOwnerOfObj = (_objOwnerID == dayz_characterID);
 
@@ -59,7 +61,9 @@ if(_IsNearPlot >= 1) then {
 	};
 };
 
-cutText [format["Starting de-construction of %1.",_objType], "PLAIN DOWN"];
+_nameVehicle = getText(configFile >> "CfgVehicles" >> _objType >> "displayName");
+
+cutText [format["Starting de-construction of %1.",_nameVehicle], "PLAIN DOWN"];
 
 // Alert zombies once.
 [player,50,true,(getPosATL player)] spawn player_alertZombies;
@@ -125,7 +129,7 @@ while {_isOk} do {
 		_proceed = false;
 	};
 
-	cutText [format["De-constructing %1 stage %2 of %3 walk away at anytime to cancel.",_objType, _counter,_limit], "PLAIN DOWN"];
+	cutText [format["De-constructing %1 stage %2 of %3 walk away at anytime to cancel.", _nameVehicle, _counter,_limit], "PLAIN DOWN"];
 
 	if(_counter == _limit) exitWith {
 		_isOk = false;
@@ -134,6 +138,8 @@ while {_isOk} do {
 	
 };
 
+
+
 if(_brokenTool) then {
 	if(_isWreck) then {
 		_removeTool = "ItemToolbox";
@@ -141,7 +147,7 @@ if(_brokenTool) then {
 		_removeTool = ["ItemCrowbar","ItemToolbox"] call BIS_fnc_selectRandom;
 	};
 	if(([player,_removeTool,1] call BIS_fnc_invRemove) > 0) then {
-		cutText [format["Tool (%1) broke cannot remove %2.",_removeTool,_objType], "PLAIN DOWN"];
+		cutText [format["%1 broke cannot remove %2.",getText(configFile >> "CfgWeapons" >> _removeTool >> "displayName"),_nameVehicle], "PLAIN DOWN"];
 	};
 };
 
@@ -151,14 +157,16 @@ if (_proceed) then {
 	// Double check that object is not null
 	if(!isNull(_obj)) then {
 		
+		_ipos = getPosATL _obj;
+
 		deleteVehicle _obj;
 		
 		if(!_isWreck) then {
-			PVDZE_obj_Delete = [_objectID,_objectUID];
+			PVDZE_obj_Delete = [_objectID,_objectUID,_activatingPlayer];
 			publicVariableServer "PVDZE_obj_Delete";
 		};
 
-		cutText [format["De-constructing %1.",_objType], "PLAIN DOWN"];
+		cutText [format["De-constructing %1.",_nameVehicle], "PLAIN DOWN"];
 		
 		_preventRefund = false;
 
@@ -181,10 +189,8 @@ if (_proceed) then {
 			cutText ["No parts found.", "PLAIN DOWN"];
 		};
 
-		_ipos = getPosATL player;
+		if (_ipos select 2 < 0) then {
-
+			_ipos set [2,0];
-		if (_ipos select 2 < 2) then {
-			_ipos = [_ipos select 0,_ipos select 1,0];
 		};
 
 		_radius = 1;
@@ -201,6 +207,8 @@ if (_proceed) then {
 				_item addMagazineCargoGlobal [_itemOut,_countOut];				
 			} forEach _selectedRemoveOutput;
 			player reveal _item;
+
+			player action ["Gear", _item];
 		};
 	} else {
 		cutText ["Failed object not longer exists.", "PLAIN DOWN"];

SQF/dayz_code/actions/repair_vehicle.sqf

@@ -1,7 +1,7 @@
 private ["_part","_cancel","_color","_allFixed","_percent","_string","_handle","_damage","_cmpt","_vehicle","_hitpoints"];
 
 // [ _trader_id, _category, _action ];
-// _activatingPlayer = _this select 1;
+// _activatingPlayer = player;
 
 _vehicle = _this select 3;
 

SQF/dayz_code/actions/salvage_vehicle.sqf

@@ -1,7 +1,7 @@
 private ["_part","_cancel","_color","_percent","_string","_handle","_damage","_cmpt","_vehicle","_hitpoints"];
 
 // [ _trader_id, _category, _action ];
-// _activatingPlayer = _this select 1;
+// _activatingPlayer = player;
 
 _vehicle = _this select 3;
 

SQF/dayz_code/actions/sell_db.sqf

@@ -6,7 +6,7 @@ TradeInprogress = true;
 {player removeAction _x} forEach s_player_parts;s_player_parts = [];
 
 // [ _trader_id, _category, _action ];
-_activatingPlayer = _this select 1;
+_activatingPlayer = player;
 
 _trader_id = (_this select 3) select 0;
 //_category = (_this select 3) select 1;

SQF/dayz_code/actions/tow_AttachStraps.sqf

@@ -1,4 +1,4 @@
-private ["_vehicle","_started","_finished","_animState","_isMedic","_abort","_configVeh","_nameText","_findNearestVehicles","_findNearestVehicle","_IsNearVehicle","_towTruck","_vehicleFits","_worldPos","_veh","_box","_p1","_p2","_maxX","_maxY","_location1","_location2","_location3","_location4","_towTruckSize","_allowedSize"];
+private ["_vehicle","_started","_finished","_animState","_isMedic","_abort","_configVeh","_nameText","_findNearestVehicles","_findNearestVehicle","_IsNearVehicle","_towTruck","_towTruckSize","_allowedSize"];
 
 if(TradeInprogress) exitWith { cutText ["Already in progress." , "PLAIN DOWN"] };
 TradeInprogress = true;
@@ -78,7 +78,7 @@ if(_IsNearVehicle >= 1) then {
 		
 		if((sizeOf typeOf _vehicle) <= _allowedSize) then {
 			if([_vehicle,_towTruck] call fnc_isInsideBuilding2 and ((vectorUp _vehicle) select 2) > 0.5) then {
-				if(typeOf _towTruck == "VIL_asistvan_DZE" ) then {
+				if(typeOf _towTruck == "TOW_DZE" ) then {
 					_vehicle attachTo [_towTruck,[1.3,-2,2.3]];
 					_towTruck setVariable ["DZEinTow", true, true];
 					_towTruck setVariable ["DZEvehicleInTow", _vehicle, true];

SQF/dayz_code/actions/trade_any_bicycle.sqf

@@ -1,4 +1,4 @@
-private ["_veh","_location","_isOk","_part_out","_part_in","_qty_out","_qty_in","_qty","_buy_o_sell","_obj","_objectID","_objectUID","_bos","_started","_finished","_animState","_isMedic","_dir","_helipad","_removed","_keyColor","_keyNumber","_isKeyOK","_config","_damage","_tireDmg","_tires","_okToSell","_hitpoints","_needed","_activatingPlayer","_textPartIn","_textPartOut","_traderID"];
+private ["_veh","_location","_part_out","_part_in","_qty_out","_qty_in","_qty","_buy_o_sell","_obj","_objectID","_objectUID","_bos","_started","_finished","_animState","_isMedic","_dir","_helipad","_removed","_damage","_tireDmg","_tires","_okToSell","_hitpoints","_needed","_activatingPlayer","_textPartIn","_textPartOut","_traderID","_playerNear"];
 
 if(TradeInprogress) exitWith { cutText ["Trade already in progress." , "PLAIN DOWN"]; };
 TradeInprogress = true;
@@ -9,7 +9,7 @@ if(_playerNear) exitWith { TradeInprogress = false; cutText ["Cannot trade while
 
 // [part_out,part_in, qty_out, qty_in, loc];
 
-_activatingPlayer = _this select 1;
+_activatingPlayer = player;
 
 _part_out = (_this select 3) select 0;
 _part_in = (_this select 3) select 1;
@@ -111,7 +111,7 @@ if (_qty >= _qty_in) then {
 						_location = (getPosATL _veh);
 
 						//["PVDZE_veh_Publish",[_veh,[_dir,_location],_part_out,false,_keySelected]] call callRpcProcedure;
-						PVDZE_veh_Publish2 = [_veh,[_dir,_location],_part_out,true,dayz_characterID];
+						PVDZE_veh_Publish2 = [_veh,[_dir,_location],_part_out,true,dayz_characterID,_activatingPlayer];
 						publicVariableServer  "PVDZE_veh_Publish2";
 
 						player reveal _veh;
@@ -160,8 +160,7 @@ if (_qty >= _qty_in) then {
 							_objectID 	= _obj getVariable ["ObjectID","0"];
 							_objectUID	= _obj getVariable ["ObjectUID","0"];
 
-							//["PVDZE_obj_Delete",[_objectID,_objectUID]] call callRpcProcedure;
+							PVDZE_obj_Delete = [_objectID,_objectUID,_activatingPlayer];
-							PVDZE_obj_Delete = [_objectID,_objectUID];
 							publicVariableServer "PVDZE_obj_Delete";
 
 							deleteVehicle _obj; 

SQF/dayz_code/actions/trade_any_boat.sqf

@@ -1,4 +1,4 @@
-private ["_veh","_location","_isOk","_part_out","_part_in","_qty_out","_qty_in","_qty","_buy_o_sell","_obj","_objectID","_objectUID","_bos","_started","_finished","_animState","_isMedic","_dir","_helipad","_removed","_keyColor","_keyNumber","_keySelected","_isKeyOK","_config","_okToSell","_needed","_activatingPlayer","_textPartIn","_textPartOut","_traderID"];
+private ["_veh","_location","_isOk","_part_out","_part_in","_qty_out","_qty_in","_qty","_buy_o_sell","_obj","_objectID","_objectUID","_bos","_started","_finished","_animState","_isMedic","_dir","_helipad","_removed","_keyColor","_keyNumber","_keySelected","_isKeyOK","_config","_okToSell","_needed","_activatingPlayer","_textPartIn","_textPartOut","_traderID","_playerNear"];
 
 if(TradeInprogress) exitWith { cutText ["Trade already in progress." , "PLAIN DOWN"]; };
 TradeInprogress = true;
@@ -9,7 +9,7 @@ if(_playerNear) exitWith { TradeInprogress = false; cutText ["Cannot trade while
 
 // [part_out,part_in, qty_out, qty_in, loc];
 
-_activatingPlayer = _this select 1;
+_activatingPlayer = player;
 
 _part_out = (_this select 3) select 0;
 _part_in = (_this select 3) select 1;
@@ -128,7 +128,7 @@ if (_qty >= _qty_in) then {
 							_location = (getPosATL _veh);
 					
 							//["PVDZE_veh_Publish",[_veh,[_dir,_location],_part_out,false,_keySelected]] call callRpcProcedure;
-							PVDZE_veh_Publish2 = [_veh,[_dir,_location],_part_out,false,_keySelected];
+							PVDZE_veh_Publish2 = [_veh,[_dir,_location],_part_out,false,_keySelected,_activatingPlayer];
 							publicVariableServer  "PVDZE_veh_Publish2";
 
 							player reveal _veh;
@@ -154,8 +154,7 @@ if (_qty >= _qty_in) then {
 						_objectID 	= _obj getVariable ["ObjectID","0"];
 						_objectUID	= _obj getVariable ["ObjectUID","0"];
 
-						//["PVDZE_obj_Delete",[_objectID,_objectUID]] call callRpcProcedure;
+						PVDZE_obj_Delete = [_objectID,_objectUID,_activatingPlayer];
-						PVDZE_obj_Delete = [_objectID,_objectUID];
 						publicVariableServer "PVDZE_obj_Delete";
 
 						deleteVehicle _obj;

SQF/dayz_code/actions/trade_any_vehicle.sqf

@@ -1,4 +1,4 @@
-private ["_veh","_location","_isOk","_part_out","_part_in","_qty_out","_qty_in","_qty","_buy_o_sell","_obj","_objectID","_objectUID","_bos","_started","_finished","_animState","_isMedic","_dir","_helipad","_removed","_keyColor","_keyNumber","_keySelected","_isKeyOK","_config","_damage","_tireDmg","_tires","_okToSell","_hitpoints","_needed","_activatingPlayer","_textPartIn","_textPartOut","_traderID"];
+private ["_veh","_location","_isOk","_part_out","_part_in","_qty_out","_qty_in","_qty","_buy_o_sell","_obj","_objectID","_objectUID","_bos","_started","_finished","_animState","_isMedic","_dir","_helipad","_removed","_keyColor","_keyNumber","_keySelected","_isKeyOK","_config","_damage","_tireDmg","_tires","_okToSell","_hitpoints","_needed","_activatingPlayer","_textPartIn","_textPartOut","_traderID","_playerNear"];
 
 if(TradeInprogress) exitWith { cutText ["Trade already in progress." , "PLAIN DOWN"]; };
 TradeInprogress = true;
@@ -9,7 +9,7 @@ if(_playerNear) exitWith { TradeInprogress = false; cutText ["Cannot trade while
 
 // [part_out,part_in, qty_out, qty_in, loc];
 
-_activatingPlayer = _this select 1;
+_activatingPlayer = player;
 
 _part_out = (_this select 3) select 0;
 _part_in = (_this select 3) select 1;
@@ -127,7 +127,7 @@ if (_qty >= _qty_in) then {
 							_location = (getPosATL _veh);
 
 							//["PVDZE_veh_Publish",[_veh,[_dir,_location],_part_out,false,_keySelected]] call callRpcProcedure;
-							PVDZE_veh_Publish2 = [_veh,[_dir,_location],_part_out,false,_keySelected];
+							PVDZE_veh_Publish2 = [_veh,[_dir,_location],_part_out,false,_keySelected,_activatingPlayer];
 							publicVariableServer  "PVDZE_veh_Publish2";
 
 							player reveal _veh;
@@ -180,8 +180,7 @@ if (_qty >= _qty_in) then {
 							_objectID 	= _obj getVariable ["ObjectID","0"];
 							_objectUID	= _obj getVariable ["ObjectUID","0"];
 
-							//["PVDZE_obj_Delete",[_objectID,_objectUID]] call callRpcProcedure;
+							PVDZE_obj_Delete = [_objectID,_objectUID,_activatingPlayer];
-							PVDZE_obj_Delete = [_objectID,_objectUID];
 							publicVariableServer "PVDZE_obj_Delete";
 
 							deleteVehicle _obj; 

SQF/dayz_code/actions/trade_backpacks.sqf

@@ -4,7 +4,7 @@ private ["_part_out","_part_in","_qty_out","_qty_in","_qty","_bos","_bag","_clas
 if(TradeInprogress) exitWith { cutText ["Trade already in progress." , "PLAIN DOWN"]; };
 TradeInprogress = true;
 
-_activatingPlayer = _this select 1;
+_activatingPlayer = player;
 
 _part_out = (_this select 3) select 0;
 _part_in = (_this select 3) select 1;

SQF/dayz_code/actions/trade_items.sqf

@@ -6,7 +6,7 @@ TradeInprogress = true;
 
 _total_parts_out = 0;
 
-_activatingPlayer = _this select 1;
+_activatingPlayer = player;
 
 _part_out = (_this select 3) select 0;
 _part_in = (_this select 3) select 1;

SQF/dayz_code/actions/trade_items_wo_db.sqf

@@ -4,7 +4,7 @@ private ["_part_out","_part_in","_qty_out","_qty_in","_textPartIn","_textPartOut
 if(TradeInprogress) exitWith { cutText ["Trade already in progress." , "PLAIN DOWN"]; };
 TradeInprogress = true;
 
-//_activatingPlayer = _this select 1;
+//_activatingPlayer = player;
 
 _part_out = (_this select 3) select 0;
 _part_in = (_this select 3) select 1;

SQF/dayz_code/actions/trade_weapons.sqf

@@ -1,10 +1,10 @@
-private ["_part_out","_part_in","_qty_out","_qty_in","_qty","_buy_o_sell","_traderID","_bos","_needed","_activatingPlayer","_textPartIn","_textPartOut","_started","_finished","_animState","_isMedic"];
+private ["_part_out","_part_in","_qty_out","_qty_in","_qty","_buy_o_sell","_traderID","_bos","_needed","_activatingPlayer","_textPartIn","_textPartOut","_started","_finished","_animState","_isMedic","_removed"];
 // [part_out,part_in, qty_out, qty_in,"buy"];
 
 if(TradeInprogress) exitWith { cutText ["Trade already in progress." , "PLAIN DOWN"]; };
 TradeInprogress = true;
 
-_activatingPlayer = _this select 1;
+_activatingPlayer = player;
 
 _part_out = (_this select 3) select 0;
 _part_in = (_this select 3) select 1;

SQF/dayz_code/actions/vault_combination_1.sqf

@@ -1,4 +1,4 @@
-private ["_buy","_number"];
+private ["_ok"];
 dayz_selectedVault = _this select 3;
 dayz_combination = "";
 

SQF/dayz_code/compile/BIS_fnc/fn_vectorAdd.sqf

@@ -14,7 +14,7 @@ Returns a vector that is the sum of <vector1> and <vector2>.
 
 ************************************************************/
 
-private["_p1","_p2","_return"];
+private ["_p1","_p2","_return","_c"];
 
 _p1 = _this select 0;
 _p2 = _this select 1;

SQF/dayz_code/compile/building_spawnLoot.sqf

@@ -1,4 +1,4 @@
-private ["_obj","_type","_config","_positions","_iPos","_nearBy","_itemType","_itemTypes","_lootChance","_weights","_cntWeights","_index"];
+private ["_obj","_type","_config","_positions","_iPos","_nearBy","_itemType","_itemTypes","_lootChance","_weights","_cntWeights","_index","_itemTypesSmall","_positionsSmall"];
 //_t1 = diag_tickTime;
 
 _obj = 			_this select 0;

SQF/dayz_code/compile/building_spawnZombies.sqf

@@ -1,4 +1,4 @@
-private["_t1","_obj","_type","_config","_canLoot","_unitTypes","_min","_max","_num","_zombieChance","_rnd","_noPlayerNear","_position","_clean","_positions","_iPos","_nearBy","_nearByPlayer"];
+private ["_obj","_type","_config","_canLoot","_unitTypes","_min","_max","_num","_zombieChance","_rnd","_position","_positions","_iPos","_nearBy","_noOneNear"];
 //_t1 = diag_tickTime;
 
 if (dayz_maxCurrentZeds > dayz_maxZeds) exitwith {};

SQF/dayz_code/compile/fn_curTimeStr.sqf

@@ -1,4 +1,4 @@
-private ["_hrStr","_minStr","_curDate","_hr","_min"];
+private ["_hrStr","_minStr","_curDate","_hr","_min","_strTime"];
 _curDate = date;
 _hr = _curDate select 3;
 _min = _curDate select 4;

SQF/dayz_code/compile/fn_gearMenuChecks.sqf

@@ -1,3 +1,4 @@
+private ["_cTarget","_isOk","_display","_inVehicle"];
 disableSerialization;
 _display = (_this select 0);
 _inVehicle = (vehicle player) != player;
@@ -11,7 +12,7 @@ _isOk = false;
 	if(!_isOk) then {
 		_isOk = _cTarget isKindOf _x;
 	};
-} forEach ["LandVehicle","Air"];
+} forEach ["LandVehicle","Air", "Ship"];
 
 if((locked _cTarget) and _isOk and (((vehicle player) distance _cTarget) < 12)) then {
 	cutText ["Cannot access gear in a locked vehicle." , "PLAIN DOWN"];

SQF/dayz_code/compile/fn_selfActions.sqf

@@ -4,7 +4,7 @@ scriptName "Functions\misc\fn_selfActions.sqf";
 	- Function
 	- [] call fnc_usec_selfActions;
 ************************************************************/
-private ["_isWreckBuilding","_temp_keys","_magazinesPlayer","_isPZombie","_vehicle","_inVehicle","_hasFuelE","_hasRawMeat","_hasKnife","_hasToolbox","_onLadder","_nearLight","_canPickLight","_canDo","_text","_isHarvested","_isVehicle","_isVehicletype","_isMan","_traderType","_ownerID","_isAnimal","_isDog","_isZombie","_isDestructable","_isTent","_isFuel","_isAlive","_Unlock","_lock","_buy","_dogHandle","_lieDown","_warn","_hastinitem","_allowedDistance","_menu","_menu1","_humanity_logic","_low_high","_cancel","_metals_trader","_traderMenu","_isWreck","_isRemovable","_isDisallowRepair","_rawmeat","_humanity","_speed","_dog","_hasbottleitem","_isAir","_isShip","_playersNear","_findNearestGens","_findNearestGen","_IsNearRunningGen","_cursorTarget","_isnewstorage","_itemsPlayer","_ownerKeyId","_typeOfCursorTarget","_hasKey","_oldOwner","_combi","_key_colors","_player_deleteBuild","_player_flipveh","_player_lockUnlock_crtl","_player_butcher","_player_studybody","_player_cook","_player_boil","_hasFuelBarrelE"];
+private ["_isWreckBuilding","_temp_keys","_magazinesPlayer","_isPZombie","_vehicle","_inVehicle","_hasFuelE","_hasRawMeat","_hasKnife","_hasToolbox","_onLadder","_nearLight","_canPickLight","_canDo","_text","_isHarvested","_isVehicle","_isVehicletype","_isMan","_traderType","_ownerID","_isAnimal","_isDog","_isZombie","_isDestructable","_isTent","_isFuel","_isAlive","_Unlock","_lock","_buy","_dogHandle","_lieDown","_warn","_hastinitem","_allowedDistance","_menu","_menu1","_humanity_logic","_low_high","_cancel","_metals_trader","_traderMenu","_isWreck","_isRemovable","_isDisallowRepair","_rawmeat","_humanity","_speed","_dog","_hasbottleitem","_isAir","_isShip","_playersNear","_findNearestGens","_findNearestGen","_IsNearRunningGen","_cursorTarget","_isnewstorage","_itemsPlayer","_ownerKeyId","_typeOfCursorTarget","_hasKey","_oldOwner","_combi","_key_colors","_player_deleteBuild","_player_flipveh","_player_lockUnlock_crtl","_player_butcher","_player_studybody","_player_cook","_player_boil","_hasFuelBarrelE","_hasHotwireKit"];
 
 if (TradeInprogress) exitWith {}; // Do not allow if any script is running.
 
@@ -37,9 +37,16 @@ if (_canPickLight and !dayz_hasLight and !_isPZombie) then {
 	s_player_removeflare = -1;
 };
 
-if (s_player_showname < 0 and !_isPZombie) then {
+if (!DZE_ForceNameTagsOff) then {
+	if (s_player_showname < 0 and !_isPZombie) then {
+		if (DZE_ForceNameTags) then {
+			s_player_showname = 1;
+			player setVariable["DZE_display_name",true,true];
+		} else {
 			s_player_showname = player addAction ["Display Name (Yes)", "\z\addons\dayz_code\actions\display_name.sqf",true, 0, true, false, "",""];
 			s_player_showname1 = player addAction ["Display Name (No)", "\z\addons\dayz_code\actions\display_name.sqf",false, 0, true, false, "",""];
+		};
+	};
 };
 
 if(_isPZombie) then {
@@ -560,7 +567,8 @@ if (!isNull cursorTarget and !_inVehicle and !_isPZombie and (player distance cu
 	};
 
 	//Towing with tow truck
-	if(_typeOfCursorTarget == "VIL_asistvan_DZE") then {
+	/*
+	if(_typeOfCursorTarget == "TOW_DZE") then {
 		if (s_player_towing < 0) then {
 			if(!(_cursorTarget getVariable ["DZEinTow", false])) then {
 				s_player_towing = player addAction ["Attach Straps", "\z\addons\dayz_code\actions\tow_AttachStraps.sqf",_cursorTarget, 0, false, true, "",""];				
@@ -572,6 +580,7 @@ if (!isNull cursorTarget and !_inVehicle and !_isPZombie and (player distance cu
 		player removeAction s_player_towing;
 		s_player_towing = -1;
 	};
+	*/
 
 
     //Sleep

SQF/dayz_code/compile/local_gutObject.sqf

@@ -1,4 +1,4 @@
-private["_animalbody","_qty","_rawfoodtype","_ehLoc"];
+private ["_animalbody","_qty","_rawfoodtype"];
 _animalbody = _this select 0;
 
 if (local _animalbody) then {

SQF/dayz_code/compile/local_gutObjectZ.sqf

@@ -1,4 +1,4 @@
-private ["_zombiebody","_ehLoc"];
+private ["_zombiebody"];
 _zombiebody = _this select 0;
 // _qty = _this select 1;
 

SQF/dayz_code/compile/local_lights_house.sqf

@@ -2,8 +2,7 @@
 	DayZ Epoch Lighting System - House Lights
 	Made for DayZ Epoch by axeman please ask permission to use/edit/distribute email gregory.andrew@gmail.com or vbawol@veteranbastards.com.
 */
-private ["_objLightPoint","_pos","_objHouse","_dir","_rng","_lpDist","_nrstTrig","_rndLights","_lmpCol","_hsAnimPer","_brtns","_lightPcnt","_hsLPDist"];
+private ["_objLightPoint","_pos","_objHouse","_dir","_rng","_lpDist","_nrstTrig","_rndLights","_lmpCol","_hsAnimPer","_brtns","_lightPcnt","_hsLPDist","_hsTime","_hsCount","_litCount","_hsAnimPer2","_chnGCount","_debug"];
-private ["_base","_mLights","_mLightsBlink","_hsTime","_hsCount","_litCount","_hsAnimPer2","_chnGCount","_plLogin","_hcName"];
 _hsCount = 0;
 _litCount = 0;
 _chnGCount = 0;

SQF/dayz_code/compile/local_lights_init.sqf

@@ -5,7 +5,7 @@
 	To Do - Light poles - Automatic lighting for bases (with or without generator) - Menu action to switch off house and tower lights - Add sparks and electrical sound - Add slight randomness to 'reliable' light source - Try and use ASC_EU lights for map based streetlights so they have bulbs and look better - Towers within 20m of 3 house light sources may not always light up - Add Custom (enterable) buildings and items (water pump). Maybe create brighter house lightpoints at further distances to compensate for engine limits.
 	Wishlist - Detect weather to make lights fail in thunder :)
 */
-private ["_sunrise","_slpTime","_lpRange","_hsRange","_nrGen","_genCount","_rndLightsIn","_rndLightsOut","_genClass","_doHouse","_doTower","_doLight","_fnHr","_stHr","_plyr","_hndlDelLights","_hndlFailLights","_ndGen","_trgRng","_rngPlyr","_lightTrig","_lmpCol"];
+private ["_sunrise","_slpTime","_lpRange","_hsRange","_nrGen","_genCount","_rndLightsIn","_rndLightsOut","_genClass","_doHouse","_doTower","_doLight","_fnHr","_stHr","_plyr","_ndGen","_trgRng","_rngPlyr","_lightTrig","_lmpCol"];
 
 //Start / Stop Time
 _stHr = _this select 0;

SQF/dayz_code/compile/local_lights_tower.sqf

@@ -1,4 +1,4 @@
-/*
+./*
 	DayZ Epoch Lighting System - Illuminant Tower Lights
 	Made for DayZ Epoch by axeman please ask permission to use/edit/distribute email gregory.andrew@gmail.com or vbawol@veteranbastards.com.
 */

SQF/dayz_code/compile/object_removeNet.sqf

@@ -0,0 +1,13 @@
+private ["_nearNets","_nearNet"];
+
+_onLadder =		(getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "onLadder")) == 1;
+_canDo = (!r_drag_sqf and !r_player_unconscious and !_onLadder);
+
+_nearNets = nearestObjects [player, ["DesertLargeCamoNet", "ForestCamoNet_DZ","DesertLargeCamoNet_DZ",  "ForestLargeCamoNet_DZ"], 10];
+_nearNet = _nearNets select 0;
+
+ if (!isNull _nearNet and _canDo) then {
+	 [0,1,2,_nearNet] spawn player_removeObject;
+ } else {
+	cutText ["No camo nets found nearby.", "PLAIN DOWN"];
+ };

SQF/dayz_code/compile/object_setHit.sqf

@@ -1,4 +1,4 @@
-private ["_unit","_selection","_strH","_dam"];
+private ["_unit","_selection","_strH","_dam","_damage"];
 _unit =			_this select 0;
 _selection =	_this select 1;
 _damage =		_this select 2;

SQF/dayz_code/compile/object_setHitLocal.sqf

@@ -1,4 +1,4 @@
-private ["_unit","_selection","_strH","_dam","_total"];
+private ["_unit","_selection","_strH","_dam","_total","_damage"];
 _unit =			_this select 0;
 _selection =	_this select 1;
 _damage =		_this select 2;

SQF/dayz_code/compile/object_speak.sqf

@@ -20,6 +20,7 @@ _num = switch (_type) do {
 	case "dog_growl":	{3};
 	case "dog_qq":		{2};
 	case "keypad_tick":	{2};
+	case "flysound": 		{1};
     case "open_backpack":  {4};
     case "open_inventory": {4};
 };

SQF/dayz_code/compile/player_humanityMorph.sqf

@@ -91,4 +91,8 @@ player addWeapon "Loot";
 player addWeapon "Flare";
 
 sleep 0.1;
-deleteVehicle _old;
+
+if (!isNull _old) then {
+	// this should not be needed as player is deleted in player_switchModel?
+	deleteVehicle _old;
+};

SQF/dayz_code/compile/player_packTent.sqf

@@ -1,7 +1,7 @@
 /*
 [_obj] spawn player_packTent;
 */
-private ["_objectID","_objectUID","_obj","_ownerID","_dir","_pos","_object","_holder","_weapons","_magazines","_backpacks","_objWpnTypes","_objWpnQty","_countr","_alreadyPacking","_dis","_sfx","_classname","_location"];
+private ["_activatingPlayer","_objectID","_objectUID","_obj","_ownerID","_dir","_pos","_object","_holder","_weapons","_magazines","_backpacks","_objWpnTypes","_objWpnQty","_countr","_alreadyPacking","_dis","_sfx","_classname","_location"];
 
 if(TradeInprogress) exitWith { cutText ["Pack tent already in progress." , "PLAIN DOWN"]; };
 TradeInprogress = true;
@@ -9,6 +9,8 @@ TradeInprogress = true;
 player removeAction s_player_packtent;
 s_player_packtent = 1;
 
+_activatingPlayer = player;
+
 _obj = _this;
 _ownerID = _obj getVariable["CharacterID","0"];
 _objectID 	= _obj getVariable["ObjectID","0"];
@@ -43,6 +45,10 @@ if(!isNull _obj and alive _obj) then {
 
 	_location = _pos;
 
+	if (_location select 2 < 0) then {
+		_location set [2,0];
+	};
+
 	//place tent (local)
 	//_bag = createVehicle ["WeaponHolder_ItemTent",_pos,[], 0, "CAN_COLLIDE"];
 	_object = createVehicle [_classname, _location, [], 0, "CAN_COLLIDE"];
@@ -57,7 +63,7 @@ if(!isNull _obj and alive _obj) then {
 	_backpacks = 	getBackpackCargo _obj;
 
 	deleteVehicle _obj;
-	PVDZE_obj_Delete = [_objectID,_objectUID];
+	PVDZE_obj_Delete = [_objectID,_objectUID,_activatingPlayer];
 	publicVariableServer "PVDZE_obj_Delete";
 	if (isServer) then {
 		PVDZE_obj_Delete call server_deleteObj;
@@ -91,6 +97,8 @@ if(!isNull _obj and alive _obj) then {
 	} forEach _objWpnTypes;
 	
 	cutText [localize "str_success_tent_pack", "PLAIN DOWN"];
+
+	player action ["Gear", _holder];
 };
 
 s_player_packtent = -1;

SQF/dayz_code/compile/player_packVault.sqf

@@ -1,11 +1,13 @@
 /*
 [_obj] spawn player_packVault;
 */
-private ["_obj","_ownerID","_objectID","_objectUID","_alreadyPacking","_location1","_location2","_dir","_pos","_bag","_holder","_weapons","_magazines","_backpacks","_objWpnTypes","_objWpnQty","_countr","_packedClass","_text","_playerNear"];
+private ["_activatingPlayer","_obj","_ownerID","_objectID","_objectUID","_alreadyPacking","_location1","_location2","_dir","_pos","_bag","_holder","_weapons","_magazines","_backpacks","_objWpnTypes","_objWpnQty","_countr","_packedClass","_text","_playerNear"];
 
 if(TradeInprogress) exitWith { cutText ["That is already being packed." , "PLAIN DOWN"]; };
 TradeInprogress = true;
 
+_activatingPlayer = player;
+
 _obj = _this;
 
 _packedClass = getText (configFile >> "CfgVehicles" >> (typeOf _obj) >> "packedClass");
@@ -60,7 +62,7 @@ if(!isNull _obj and alive _obj) then {
 	_backpacks = 	getBackpackCargo _obj;
 	
 	// Remove from database
-	PVDZE_obj_Delete = [_objectID,_objectUID];
+	PVDZE_obj_Delete = [_objectID,_objectUID,_activatingPlayer];
 	publicVariableServer "PVDZE_obj_Delete";
 	
 	// Set down vault "take" item
@@ -104,6 +106,8 @@ if(!isNull _obj and alive _obj) then {
 	} forEach _objWpnTypes;
 	
 	cutText [format["Your %1 has been packed",_text], "PLAIN DOWN"];
+
+	player action ["Gear", _holder];
 };
 s_player_packvault = -1;
 TradeInprogress = false;

SQF/dayz_code/compile/player_spawnCheck.sqf

@@ -1,11 +1,10 @@
-private ["_t1","_type","_isAir","_inVehicle","_dateNow","_maxZombies","_maxWildZombies","_age","_radius","_position","_markerstr","_markerstr1","_markerstr2","_markerstr3","_nearByObj","_handle","_looted","_cleared","_zombied","_config","_canLoot","_dis","_players","_spawnZombies","_nearby","_nearbyCount"];
+private ["_type","_inVehicle","_dateNow","_maxWildZombies","_age","_radius","_position","_markerstr","_markerstr1","_markerstr2","_markerstr3","_nearByObj","_handle","_looted","_cleared","_zombied","_config","_canLoot","_dis","_players","_nearby","_nearbyCount","_onTheMove","_soundLimit"];
 //_t1 = diag_tickTime;
 
 _type = _this select 0;
 _inVehicle = (vehicle player != player);
 _onTheMove = (speed (vehicle player) > 10);
 _dateNow = (DateToNumber date);
-_maxZombies = dayz_maxLocalZombies;
 _maxWildZombies = 3;
 _age = -1;
 _radius = 200; 
@@ -14,6 +13,16 @@ _position = getPosATL player;
 dayz_spawnZombies = 0;
 dayz_CurrentZombies = 0;
 
+// experiment with adding fly sounds locally for both zombies and players.
+_soundLimit = 3;
+{
+	if (!alive _x) then {
+		[player,"flysound",0,true] call dayz_zombieSpeak;
+		_soundLimit = _soundLimit - 1;
+	};
+	if (_soundLimit == 0) exitWith {};
+} foreach (nearestObjects [player, ["CAManBase"], 8]);
+
 _players = _position nearEntities ["CAManBase",_radius+200];
 dayz_maxGlobalZombies = dayz_maxGlobalZombiesInit;
 {

SQF/dayz_code/compile/player_unlockDoor.sqf

@@ -3,7 +3,7 @@
 	Usage: [_obj] call player_unlockDoor;
 	Made for DayZ Epoch please ask permission to use/edit/distrubute email vbawol@veteranbastards.com.
 */
-private ["_ok"];
+private ["_display","_obj","_objectCharacterID"];
 
 if(!isNull dayz_selectedDoor) then {
 

SQF/dayz_code/compile/player_unlockVault.sqf

@@ -3,7 +3,7 @@
 	Usage: [_obj] spawn player_unlockVault;
 	Made for DayZ Epoch please ask permission to use/edit/distrubute email vbawol@veteranbastards.com.
 */
-private ["_objectID","_objectUID","_obj","_ownerID","_dir","_pos","_holder","_weapons","_magazines","_backpacks","_objWpnTypes","_objWpnQty","_countr","_alreadyPacking"];
+private ["_objectID","_objectUID","_obj","_ownerID","_dir","_pos","_holder","_weapons","_magazines","_backpacks","_objWpnTypes","_objWpnQty","_countr","_alreadyPacking","_playerNear","_playerID","_claimedBy","_unlockedClass","_text"];
 
 if(TradeInprogress) exitWith { cutText ["Unlock already in progress." , "PLAIN DOWN"]; };
 TradeInprogress = true;

SQF/dayz_code/compile/player_updateGui.sqf

@@ -1,4 +1,4 @@
-private ["_display","_ctrlBlood","_ctrlBleed","_bloodVal","_ctrlFood","_ctrlThirst","_thirstVal","_foodVal","_ctrlTemp","_tempVal","_combatVal","_array","_ctrlEar","_ctrlEye","_ctrlCombat","_ctrlFracture","_visualText","_visual","_audibleText","_audible","_blood","_thirstLvl","_foodLvl","_tempImg","_thirst","_food","_temp","_bloodLvl","_tempLvl"];
+private ["_display","_ctrlBlood","_ctrlBleed","_bloodVal","_ctrlFood","_ctrlThirst","_thirstVal","_foodVal","_ctrlTemp","_tempVal","_combatVal","_array","_ctrlEar","_ctrlEye","_ctrlCombat","_ctrlFracture","_visualText","_visual","_audibleText","_audible","_blood","_thirstLvl","_foodLvl","_tempImg","_thirst","_food","_temp","_bloodLvl","_tempLvl","_color","_string","_humanity","_size","_friendlies","_charID","_rcharID","_rfriendlies","_rfriendlyTo","_distance","_targetControl","_humanityTarget"];
 disableSerialization;
 
 _foodVal = 		1 - (dayz_hunger / SleepFood);

SQF/dayz_code/compile/player_weaponCheck.sqf

@@ -1,4 +1,4 @@
-private ["_currentObjects","_newObjects","_checkObjects","_type","_qtyNow","_qtyBefore"];
+private ["_currentObjects","_newObjects","_checkObjects","_type","_qtyNow","_qtyBefore","_change"];
 //_newObjects = [_previous,weapons player] call player_weaponCheck;
 _currentObjects = 	_this select 0;
 _checkObjects = 	_this select 1;

SQF/dayz_code/compile/player_zombieAttack.sqf

@@ -1,4 +1,4 @@
-private ["_unit","_move","_damage","_wound","_index","_cnt","_dir","_hpList","_hp","_strH","_dam","_total","_vehicle","_tPos","_zPos","_cantSee","_inAngle","_rnd","_openVehicles","_chance","_attackanimations","_type","_targets"];
+private ["_unit","_move","_damage","_wound","_index","_cnt","_dir","_hpList","_hp","_strH","_dam","_vehicle","_tPos","_zPos","_cantSee","_inAngle","_rnd","_openVehicles","_chance","_attackanimations","_type","_targets"];
 _unit = _this select 0;
 _type = _this select 1;
 _vehicle = (vehicle player);

SQF/dayz_code/compile/spawn_loot.sqf

@@ -19,7 +19,7 @@ switch (_iClass) do
 		_weights = dayz_CLChances select _index;
 		_cntWeights = count _weights;
 		_qty = 0;
-		_max = 1 + ceil(random 2);
+		_max = 1 + round(random 2);
 		while {_qty < _max} do
 		{
 			_tQty = 1 + round(random 1);

SQF/dayz_code/compile/spawn_loot_small.sqf

@@ -1,5 +1,5 @@
 
-private ["_iItem","_iClass","_iPos","_radius","_item","_itemTypes","_index","_weights","_cntWeights","_qty","_max","_tQty","_canType","_mags"];
+private ["_iItem","_iClass","_iPos","_radius","_item","_itemTypes","_index","_weights","_cntWeights","_canType","_dateNow"];
 
 _iItem = 	_this select 0;
 _iClass = 	_this select 1;

SQF/dayz_code/compile/stream_locationCheck.sqf

@@ -1,5 +1,6 @@
 //diag_log "running location check...";
-{private ["_location","_distCfg","_configClass","_distAct","_config","_position"];
+private ["_config","_locHdr","_position","_location","_distCfg","_configClass","_distAct"];
+{
 	_location = 	_x select 0;
 	_distCfg = 		(_x select 2) + 200;
 	_configClass =  _x select 1;

SQF/dayz_code/compile/vehicle_handleDamage.sqf

@@ -3,7 +3,7 @@ ASSIGN DAMAGE TO A UNIT
 - Function Vehicle_HandleDamage
 - [unit, selectionName, damage, source, projectile] call Vehicle_HandleDamage;
 ************************************************************/
-private["_unit","_selection","_strH","_dam","_total","_damage","_needUpdate"];
+private ["_unit","_selection","_strH","_dam","_total","_needUpdate"];
 _unit = _this select 0;
 _selection = _this select 1;
 _total = _this select 2;

SQF/dayz_code/compile/wild_spawnZombies.sqf

@@ -1,4 +1,4 @@
-private["_position","_doLoiter","_unitTypes","_isNoone","_loot","_array","_agent","_type","_radius","_method","_nearByPlayer","_attempt","_myDest","_newDest","_lootType"];
+private ["_position","_doLoiter","_unitTypes","_loot","_array","_agent","_type","_radius","_method","_myDest","_newDest","_lootType","_player","_isAlive","_rnd","_id"];
 _player = _this select 0;
 _unitTypes = 	[]+ getArray (configFile >> "CfgBuildingLoot" >> "Default" >> "zombieClass");
 _doLoiter = 	true;

SQF/dayz_code/compile/zombie_findTarget.sqf

@@ -1,4 +1,4 @@
-private["_group","_target","_targetMen","_targetDis","_c","_man","_manDis","_targets","_lead","_leadheight","_nearEnts","_rnd","_assigned"];
+private ["_group","_target","_targetMen","_targetDis","_c","_man","_manDis","_targets","_lead","_rnd","_assigned","_fires","_range"];
 _group = _this;
 _target = objNull;
 _lead = leader _group;

SQF/dayz_code/compile/zombie_findTargetAgent.sqf

@@ -1,4 +1,4 @@
-private["_agent","_target","_targets","_targetDis","_c","_man","_manDis","_targets","_agent","_agentheight","_nearEnts","_rnd","_assigned","_range","_objects"];
+private ["_agent","_target","_targets","_targetDis","_man","_manDis","_range","_objects","_refobj"];
 _agent = _this;
 _target = objNull;
 /*

SQF/dayz_code/compile/zombie_generate.sqf

@@ -1,4 +1,4 @@
-private["_position","_doLoiter","_unitTypes","_isNoone","_loot","_array","_agent","_type","_radius","_method","_nearByPlayer","_attempt","_myDest","_newDest","_lootType"];
+private ["_position","_doLoiter","_unitTypes","_isNoone","_loot","_array","_agent","_type","_radius","_method","_nearByPlayer","_myDest","_newDest","_lootType","_isAlive","_rnd","_id"];
 _position = 	_this select 0;
 _doLoiter = 	_this select 1;
 _unitTypes = 	_this select 2;

SQF/dayz_code/compile/zombie_initialize.sqf

@@ -1,4 +1,4 @@
-private["_unit"];
+private ["_unit","_position"];
 _unit = _this select 0;
 if (isServer) then {
 	_unit addEventHandler ["local", {_this call zombie_findOwner}];

SQF/dayz_code/compile/zombie_loiter.sqf

@@ -1,4 +1,4 @@
-private["_unit","_originalPos","_pos"];
+private ["_unit","_originalPos","_pos","_chance","_playerpos"];
 _unit = 		_this select 0;
 _originalPos = 	_this select 1;
 _pos = 			getPosATL _unit;

SQF/dayz_code/config.cpp

@@ -21,7 +21,7 @@ class CfgPatches {
 		units[] = {};
 		weapons[] = {};
 		requiredVersion = 0.1;
-		requiredAddons[] = {"dayz_equip","dayz_weapons","dayz_sfx","CAMisc3","CABuildingParts","CABuildingParts_Signs","CAStructuresHouse","CAStructuresLand_Ind_Stack_Big","CAStructures_Misc_Powerlines","CAStructures","CABuildings","CABuildings2","Ind_MalyKomin","CAStructures_A_CraneCon","CAStructures_Mil","CAStructures_Nav","CAStructures_Rail","A_Crane_02","A_TVTower","CAStructures_Railway","CAStructuresHouse","CAStructuresHouse_HouseBT","asc_eu_lights","vilas_pl_cars","gnt_c185"};
+		requiredAddons[] = {"dayz_equip","dayz_weapons","dayz_sfx","CAMisc3","CABuildingParts","CABuildingParts_Signs","CAStructuresHouse","CAStructuresLand_Ind_Stack_Big","CAStructures_Misc_Powerlines","CAStructures","CABuildings","CABuildings2","Ind_MalyKomin","CAStructures_A_CraneCon","CAStructures_Mil","CAStructures_Nav","CAStructures_Rail","A_Crane_02","A_TVTower","CAStructures_Railway","CAStructuresHouse","CAStructuresHouse_HouseBT","asc_eu_lights","gnt_c185"};
 	};
 	class DZ_DebriefingRemoved
 	{
@@ -41,7 +41,7 @@ class CfgMods
 		hidePicture = 0;
 		hideName = 0;
 		action = "http://www.dayzepoch.com";
-		version = "1.0.2.4";
+		version = "1.0.2.5";
 		hiveVersion = 0.96; //0.93
 	};
 };
@@ -536,7 +536,7 @@ class CfgBuildingLoot {
 				{ "Colt1911","weapon" },
 				{ "ItemFlashlight","generic" },
 				{ "ItemKnife","generic" },
-				{ "ItemMatchbox","generic" },
+				{ "ItemMatchbox_DZE","generic" },
 				{ "","generic" },
 				{ "LeeEnfield","weapon" },
 				{ "revolver_EP1","weapon" },
@@ -551,7 +551,7 @@ class CfgBuildingLoot {
 				{ "clothes","single" },
 				{ "specialclothes","single" },
 				{ "WeaponHolder_MeleeCrowbar","object" },
-				{"MR43","weapon"},
+				{"MR43","weapon"}
 		};
 		itemChance[] =	{
 			0.04,
@@ -591,14 +591,14 @@ class CfgBuildingLoot {
 			{ "Colt1911","weapon" },
 			{ "ItemFlashlight","weapon" },
 			{ "ItemKnife","weapon" },
-			{ "ItemMatchbox","weapon" },
+			{ "ItemMatchbox_DZE","weapon" },
 			{ "","generic" },
 			{ "revolver_EP1","weapon" },
 			{ "","military" },
 			{ "","trash" },
 			{ "Binocular","weapon" },
 			{ "clothes","single" },
-			{ "specialclothes","single" },
+			{ "specialclothes","single" }
 		};
 		itemChanceSmall[] =	{
 			0.01,
@@ -637,7 +637,7 @@ class CfgBuildingLoot {
 			{ "Colt1911","weapon" },
 			{ "ItemFlashlight","generic" },
 			{ "ItemKnife","generic" },
-			{ "ItemMatchbox","generic" },
+			{ "ItemMatchbox_DZE","generic" },
 			{ "","generic" },
 			{ "LeeEnfield","weapon" },
 			{ "revolver_EP1","weapon" },
@@ -692,7 +692,7 @@ class CfgBuildingLoot {
 			{ "Colt1911","weapon" },
 			{ "ItemFlashlight","weapon" },
 			{ "ItemKnife","weapon" },
-			{ "ItemMatchbox","weapon" },
+			{ "ItemMatchbox_DZE","weapon" },
 			{ "","generic" },
 			{ "revolver_EP1","weapon" },
 			{ "","military" },
@@ -920,7 +920,7 @@ class CfgBuildingLoot {
 			{ "Colt1911","weapon" },
 			{ "ItemFlashlight","generic" },
 			{ "ItemKnife","generic" },
-			{ "ItemMatchbox","generic" },
+			{ "ItemMatchbox_DZE","generic" },
 			{ "","generic" },
 			{ "LeeEnfield","weapon" },
 			{ "revolver_EP1","weapon" },
@@ -967,12 +967,12 @@ class CfgBuildingLoot {
 			{ "Colt1911","weapon" },
 			{ "ItemFlashlight","weapon" },
 			{ "ItemKnife","weapon" },
-			{ "ItemMatchbox","weapon" },
+			{ "ItemMatchbox_DZE","weapon" },
 			{ "","generic" },
 			{ "revolver_EP1","weapon" },
 			{ "","food" },
 			{ "","trash" },
-			{ "Binocular","weapon" },
+			{ "Binocular","weapon" }
 		};
 		itemChanceSmall[] =	{
 			0.01,
@@ -1026,7 +1026,7 @@ class CfgBuildingLoot {
 			{"29Rnd_30mm_AGS30","magazine"},
 			{"50Rnd_127x107_DSHKM","magazine"},
 			{"48Rnd_40mm_MK19","magazine"},
-			{"100Rnd_127x99_M2","magazine"},
+			{"100Rnd_127x99_M2","magazine"}
 		};
 		itemChance[] =	{
 			0.02,
@@ -1090,7 +1090,7 @@ class CfgBuildingLoot {
 			{"29Rnd_30mm_AGS30","magazine"},
 			{"50Rnd_127x107_DSHKM","magazine"},
 			{"48Rnd_40mm_MK19","magazine"},
-			{"100Rnd_127x99_M2","magazine"},
+			{"100Rnd_127x99_M2","magazine"}
 		};
 		itemChance[] =	{
 			0.01,
@@ -1430,11 +1430,7 @@ class CfgBuildingLoot {
 			{"100Rnd_762x54_PK","magazine"},
 			{ "militaryclothes","single" },
 			{"NVGoggles","weapon"},
-			{"2000Rnd_762x51_M134","magazine"},
+			{ "militaryammo","single" }
-			{"29Rnd_30mm_AGS30","magazine"},
-			{"50Rnd_127x107_DSHKM","magazine"},
-			{"48Rnd_40mm_MK19","magazine"},
-			{"100Rnd_127x99_M2","magazine"},
 		};
 		itemChance[] =	{
 			0.01,
@@ -1472,21 +1468,17 @@ class CfgBuildingLoot {
 			0.01,
 			0.01,
 			0.05,
-			0.03,
+			0.04,
 			0.08,
-			0.30,
+			0.3,
 			0.01,
 			0.01,
 			0.01,
 			0.01,
+			0.02,
 			0.01,
 			0.01,
-			0.01,
+			0.03
-			0.01,
-			0.01,
-			0.01,
-			0.01,
-			0.01
 		};
 		itemTypeSmall[] = {
 			{ "M9SD","weapon" },
@@ -1508,7 +1500,7 @@ class CfgBuildingLoot {
 			{"29Rnd_30mm_AGS30","magazine"},
 			{"50Rnd_127x107_DSHKM","magazine"},
 			{"48Rnd_40mm_MK19","magazine"},
-			{"100Rnd_127x99_M2","magazine"},
+			{"100Rnd_127x99_M2","magazine"}
 		};
 		itemChanceSmall[] =	{
 			0.04,
@@ -1544,7 +1536,7 @@ class CfgBuildingLoot {
 			{"ItemMap","weapon"},
 			{"ItemFlashlight","generic"},
 			{"ItemKnife","generic"},
-			{"ItemMatchbox","generic"},
+			{"ItemMatchbox_DZE","generic"},
 			{"Crossbow_DZ","weapon"},
 			{"","military"},
 			{"WeaponHolder_ItemMachete", "object"},
@@ -1566,7 +1558,7 @@ class CfgBuildingLoot {
 			{"ItemMap","weapon"},
 			{"ItemFlashlight","weapon"},
 			{"ItemKnife","weapon"},
-			{"ItemMatchbox","weapon"},
+			{"ItemMatchbox_DZE","weapon"},
 			{"","military"},
 			{"","hunter"}
 		};
@@ -1609,16 +1601,15 @@ class CfgBuildingLoot {
 		lootPosSmall[] = {{1.65283,1.66846,-1.42742},{-1.75757,-1.08887,-1.43804}};
 	};
 	class Land_Ind_Workshop01_04: Industrial {
-		//lootPos[] = {{-1.37415,4.18896,-1.53123},{0.695435,4.24561,-1.52934},{-1.06677,2.69531,-1.53062},{0.79248,-4.60742,-1.49341},{-1.84424,-6.1709,-1.44427},{-1.05566,-4.08398,-1.51927},{1.43774,-6.59424,-1.41742}};
+		lootPos[] = {{-1.62207,-6.37305,-1.52724},{-0.118408,-3.88281,-1.52788},{-1.01611,2.13428,-1.53099}};
-		lootPos[] = {{-0.189453,-3.99463,-1.52963},{-1.67578,-6.41895,-1.52492},{-0.942383,2.12158,-1.53041}};
+		lootPosZombie[] = {{-0.403076,-6.74121,-0.649656},{1.03564,-3.41113,-0.656917},{-0.902344,4.50293,-0.655569}};
-		lootPosZombie[] = {{1.28125,-3.46533,-0.657176},{-0.240723,-6.66113,-0.649875},{-0.89209,4.54102,-0.655517}};
+		lootPosSmall[] = {{-1.3833,-3.02734,-0.298156},{-1.9519,-3.37891,-1.52803},{1.60425,4.75244,-1.52979},{-0.324219,1.91504,-0.680825},{-0.302734,2.08545,0.0790772},{-1.61523,-3.03809,0.0718207}};
-		lootPosSmall[] = {{-1.99658,-3.45264,-1.52679},{-1.2876,-3.00049,-0.308164},{-0.341309,1.90088,-0.300898},{-0.322754,2.05444,-1.06085},{1.57666,4.70117,-1.52986}};
 		hangPos[] = {{-0.541748,4.01221,-2.03068}};
 	};
 	class Land_Ind_Workshop01_L: Industrial {
-		lootPos[] = {{3.94922,-4.13086,-1.31341},{-0.858643,4.4834,-1.30616},{1.88843,-1.96143,-1.31489}};
+		lootPos[] = {{3.89063,-4.09888,-1.31299},{1.80273,-1.88599,-1.31412},{-0.928223,4.50635,-1.31364}};
-		lootPosZombie[] = {{0.875977,-3.71094,-0.438292},{-2.04419,2.07178,-0.429501},{-2.36011,4.6792,-0.428821}};
+		lootPosZombie[] = {{0.876465,-3.66699,-0.438329},{-2.28223,4.8623,-0.429002},{-2.24268,2.19189,-0.429238}};
-		lootPosSmall[] = {{4.38013,-5.28223,-1.31348},{0.596191,-1.45605,-1.23428},{0.8479,-1.44727,-0.0941839},{-0.0100098,5.0835,0.284557},{0.220459,5.00098,-0.475653}};
+		lootPosSmall[] = {{0.62793,-1.49097,-1.23395},{0.805664,-1.45605,-0.0939465},{4.56055,-5.29443,-1.31279},{0.0273438,5.04443,-0.47565},{0.25,5.00342,0.284006}};
 	};
 	class Land_Hangar_2: Industrial {
 		lootPos[] = {{-13.1816,10.4204,-2.56318},{-0.127441,-2.88794,-2.56318},{0.291992,3.94775,-2.56318},{8.94482,6.87793,-2.56318},{-13.688,-4.67871,-2.56318},{3.4248,-8.1499,-2.56318}};
@@ -1709,7 +1700,9 @@ class CfgBuildingLoot {
 		lootPosSmall[] = {{-0.602051,2.69214,-5.48623},{2.0708,1.98486,-5.19622},{1.37744,7.89722,-5.01622},{3.28076,-1.51782,-4.75623},{2.79395,-1.90845,-4.75622},{1.19043,-1.97632,-4.7562},{4.03418,-5.81592,-5.30621},{1.46143,-6.27979,-5.01621},{-4.8252,-2.66309,-1.78122},{1.16504,1.125,-1.19122},{2.73486,0.744873,-0.701225},{5.04053,-2.60938,-1.78122},{5.00293,2.03491,-1.78122},{2.89844,5.78613,-1.37122},{1.44482,6.51831,-1.31123},{1.77734,7.88013,-1.79123},{5.81934,5.90967,-1.41122},{-3.41016,1.26123,-1.78123},{-7.37891,-1.24756,-5.28622}};
 	};
 	class Land_HouseB_Tenement: Office {
-		lootPos[] = {{4.02954,12.0869,-18.7345},{7.12988,11.7734,-20.3445},{2.4187,4.88037,-19.8245},{-1.08154,4.7002,-19.8245},{-4.54492,4.87012,-19.8245},{-10.4272,-0.536621,-20.3445},{5.40576,9.89551,-20.7845},{5.99023,14.1689,-20.7845},{12.9609,14.0718,-20.7845},{14.6069,8.92383,-20.7845},{-2.75635,-2.08594,-20.7845}};
+		lootPos[] = {{2.39063,4.80322,-19.8245},{-10.2041,-0.48877,-20.3445},{4.65625,-2.125,-20.3445},{7.27734,11.5957,-20.8045},{-4.50854,5.10645,-19.8245},{5.11865,12.0298,-20.8045},{13.5625,12.1631,-20.8045}};
+		lootPosZombie[] = {{-10.75,5.90088,-19.9095},{-9.99756,5.92529,-19.9095},{-8.12207,5.97852,-19.9095},{-7.31445,6.00879,-19.9095},{5.53882,10.6328,-19.9095},{4.28247,8.729,-19.9095}};
+		lootPosSmall[] = {{-1.7771,4.57861,-19.8245},{-0.338623,4.80322,-19.8245},{-11.0986,-0.365234,-20.3445},{2.38574,5.15869,-20.2245},{14.2202,4.91895,-20.3945},{6.7251,11.6895,-20.3445},{3.2915,-1.90088,-20.3445},{12.9602,10.0479,-20.8045},{13.3726,0.939453,-20.8045}};
 	};
 	class Land_A_Hospital: hospital {
 		lootChance = 0.8;
@@ -1747,9 +1740,9 @@ class CfgBuildingLoot {
 		lootPosSmall[] = {{0.728516,-2.01514,-2.86235}};
 	};
 	class Land_Tovarna2: Industrial {
-		lootPos[] = {{-2.02222,7.87256,-5.62933},{-12.2107,-8.15527,-5.62469},{-12.2112,7.7998,-5.62933},{-8.99805,7.72168,-2.31135},{-6.54077,8.80469,-2.31156},{-12.6907,8.04932,1.58661},{-9.06421,8.10645,1.58661},{-5.39453,9.02783,1.56174},{-8.26465,-0.520508,0.37684},{-3.83984,4.99121,-2.31156},{-6.6416,8.03174,-5.62933}};
+		lootPos[] = {{-2.02222,7.87256,-5.62933},{-12.2107,-8.15527,-5.62469},{-12.2112,7.7998,-5.62933},{-8.99805,7.72168,-2.31135},{-6.54077,8.80469,-2.31156},{-12.6907,8.04932,1.58661},{-9.06421,8.10645,1.58661},{-5.39453,9.02783,1.56174},{-8.26465,-0.520508,0.37684},{-3.83984,4.99121,-2.31156},{-6.6416,8.03174,-5.62933},{-3.31763,-1.80762,-5.59492},{-6.66382,7.57861,1.56174},{-12.8,4.30664,1.58661},{-12.8074,-0.535156,0.374299},{-12.4324,5.15918,-2.31135},{-12.8635,1.78174,-5.61933},{-3.19507,-8.49707,-5.63091},{6.43872,-3.48145,-4.62884},{9.97998,-2.35059,-4.62604}};
 		lootPosZombie[] = {{2.07422,8.08594,-4.68601},{-8.604,8.22559,-4.68433},{-8.79053,6.47461,-4.68433},{-12.7864,2.26172,-1.35635},{-4.00415,8.89844,-1.35656},{-12.7346,2,2.54161},{-3.98218,5.14697,2.49674}};
-		lootPosSmall[] = {{-3.22974,9.69678,1.56174},{-10.2683,8.87354,1.58661},{-13.2981,7.09912,-2.31135},{-7.51001,9.64307,-2.31156},{-8.13623,5.60693,-5.62933},{-13.2112,0.257813,-5.62933},{2.41431,-2.05469,-5.62689},{1.64185,8.75879,0.374298},{-13.2427,-8.98438,3.3743},{-4.927,0.368164,0.372077},{-3.88208,-3.81641,6.62795}};
+		lootPosSmall[] = {{-3.22974,9.69678,1.56174},{-10.2683,8.87354,1.58661},{-13.2981,7.09912,-2.31135},{-7.51001,9.64307,-2.31156},{-8.13623,5.60693,-5.62933},{-13.2112,0.257813,-5.62933},{2.41431,-2.05469,-5.62689},{1.64185,8.75879,0.374298},{-13.2427,-8.98438,3.3743},{-4.927,0.368164,0.372077},{-3.88208,-3.81641,6.62795},{-7.47241,4.50391,1.56174},{-8.28833,4.20068,1.58661},{-13.2944,-9.01514,0.374299},{-7.38672,4.53418,-2.31156},{-5.28125,2.875,-5.62933},{2.42627,-8.75684,-5.62154}};
 	};
 	class Land_rail_station_big: Office {
 		lootPos[] = {{2.11914,-0.13208,-4.98439},{0.712402,0.718994,-4.98439},{2.45654,3.80566,-4.98439},{7.45947,1.49683,-5.04438}};
@@ -1768,6 +1761,8 @@ class CfgBuildingLoot {
 		zombieClass[] = {"z_soldier","z_soldier_heavy","z_policeman"};
 		lootChance = 0.4;
 		lootPos[] = {{-4.66113,-6.27173,-18.429},{3.31641,-5.77417,-18.429},{-0.20752,-6.48682,-18.429},{-9.72412,-4.88745,-3.78903},{-9.57813,3.55615,-3.78903},{-7.16797,11.0737,-3.78903},{5.07422,11.1838,-3.78903},{9.3208,5.38623,-3.78903},{9.65332,-4.82056,-3.78903},{3.23535,-0.105957,-0.169027},{4.85205,-3.69019,-0.169027},{-0.80127,-7.89087,-0.169027},{-4.4082,-4.91772,-0.169027},{-4.90771,-2.23169,-0.169027}};
+		lootPosZombie[] = {{-3.04883,-6.00903,-17.554},{2.26807,-6.87524,-17.554},{0.310059,10.1396,-17.5491},{-0.589355,10.1394,-17.5491}};
+		lootPosSmall[] = {{4.34521,-8.81567,-18.439},{-1.06787,-5.11499,-18.439},{1.3291,9.86938,-18.4413},{-1.54395,9.90649,-18.4353}};
 	};
 	class Land_A_Office01: Office {
 		lootPos[] = {{-7.84912,6.3855,-4.528},{3.84424,3.27051,-4.528},{-0.0383301,3.51733,-4.528},{5.37695,5.63379,-4.528},{15.5393,-1.90015,-4.528},{13.8057,-2.3811,-4.528},{10.114,3.44849,-4.528},{10.3008,6.32495,-4.528},{1.71021,1.66675,-4.528},{1.58032,5.87671,-2.028},{-0.599854,7.08984,-2.028},{3.87769,6.84229,-2.028},{-7.6709,6.72485,-2.038},{-4.729,4.19556,-2.028},{-7.93091,3.2041,-2.038},{10.2354,-1.9187,-2.018},{6.9812,-4.30933,-2.038},{15.4075,6.03198,-2.038},{13.9285,3.40649,-2.038},{0.163086,3.43286,0.472002},{7.13892,3.64844,0.471998},{1.71973,-1.40967,6.72491},{-0.443359,0.61499,-2.028},{-5.22144,-3.69971,-2.028}};
@@ -1787,9 +1782,9 @@ class CfgBuildingLoot {
 	};
 	class Land_A_BuildingWIP: Industrial {
 		lootChance = 0.5;
-		lootPos[] = {{-15.4871,-9.755,-6.53698},{-10.4043,-9.76697,-6.53213},{-12.0098,-5.50208,-6.53936},{-21.5681,-9.69409,-6.54067},{-23.7563,8.18347,-6.45811},{2.82544,11.3822,-6.47826},{-7.49634,-9.24609,-6.52115},{6.21216,7.7356,-6.41615},{-9.29541,0.683716,-6.53778},{16.8376,2.03186,-2.54291},{4.77661,-9.35681,-1.50389},{-20.3762,-2.86389,-2.53182},{-14.3564,-9.68604,-2.5341},{-24.1724,7.65405,-2.53182},{1.15796,8.03552,-2.53182},{-24.0901,11.4227,1.47364},{-22.1218,11.8442,1.47786},{-22.7849,10.4189,1.47402},{-8.66797,5.81238,1.47396},{-11.4856,-2.29419,2.50674},{-15.6948,-13.5236,5.46682},{-8.00171,-1.07678,5.31147},{8.66626,-8.14514,5.344},{11.5269,2.50977,-6.52237}};
+		lootPos[] = {{-15.4871,-9.755,-6.53698},{-10.4043,-9.76697,-6.53213},{-12.0098,-5.50208,-6.53936},{-21.5681,-9.69409,-6.54067},{-23.7563,8.18347,-6.45811},{2.82544,11.3822,-6.47826},{-7.49634,-9.24609,-6.52115},{6.21216,7.7356,-6.41615},{-9.29541,0.683716,-6.53778},{16.8376,2.03186,-2.54291},{4.77661,-9.35681,-1.50389},{-20.3762,-2.86389,-2.53182},{-14.3564,-9.68604,-2.5341},{-24.1724,7.65405,-2.53182},{1.15796,8.03552,-2.53182},{-24.0901,11.4227,1.47364},{-22.1218,11.8442,1.47786},{-22.7849,10.4189,1.47402},{-8.66797,5.81238,1.47396},{-11.4856,-2.29419,2.50674},{-15.6948,-13.5236,5.46682},{-8.00171,-1.07678,5.31147},{8.66626,-8.14514,5.344},{11.5269,2.50977,-6.52237},{-15.926,-17.5713,-6.53193},{-23.8391,0.109863,-6.47638},{-24.2957,2.29199,-2.53182},{-7.6853,11.9902,-2.53182},{-17.7314,1.81299,-2.53182},{2.94116,6.97754,1.47579},{-9.39014,-9.62451,1.47428},{-24.1311,9.47656,5.46242}};
 		lootPosZombie[] = {{2.2063,0.501709,-5.53659},{-4.65991,0.766846,-5.53039},{-17.9524,-3.8678,-5.63485},{-14.4016,-16.0522,-3.64149},{-14.2686,-16.675,0.360519},{-14.6934,-16.019,4.36047},{-10.7161,3.77234,2.37796},{-16.876,-2.25098,2.3687},{-16.8928,10.2216,-1.65682},{1.67065,10.3689,-1.65682},{-14.3699,-7.90063,-1.65894}};
-		lootPosSmall[] = {{-10.4377,-8.03418,-6.54007},{-15.9675,-6.70959,-6.54014},{-15.8289,7.37451,-6.46946},{-6.89136,-5.30615,-6.52994},{-7.37231,0.36084,-5.627},{-20.3455,-4.8197,-2.24182},{-13.9419,-5.02502,-2.53268},{-6.2439,11.7518,-1.50182},{-23.1213,12.5128,1.47477},{-24.5806,9.80115,1.47403},{4.63794,-0.358765,2.17724},{-5.92505,11.8485,2.50079},{-11.2415,4.78796,6.37765},{-24.7756,-10.0265,5.46264},{5.75464,-9.76001,1.47425}};
+		lootPosSmall[] = {{-10.4377,-8.03418,-6.54007},{-15.9675,-6.70959,-6.54014},{-15.8289,7.37451,-6.46946},{-6.89136,-5.30615,-6.52994},{-7.37231,0.36084,-5.627},{-20.3455,-4.8197,-2.24182},{-13.9419,-5.02502,-2.53268},{-6.2439,11.7518,-1.50182},{-23.1213,12.5128,1.47477},{-24.5806,9.80115,1.47403},{4.63794,-0.358765,2.17724},{-5.92505,11.8485,2.50079},{-11.2415,4.78796,6.37765},{-24.7756,-10.0265,5.46264},{5.75464,-9.76001,1.47425},{-23.0313,2.87158,-5.43137},{-0.398193,7.37256,-6.52535},{13.678,1.89307,-6.54251},{-7.79321,-9.53564,-2.53376},{15.3154,11.478,-2.54182},{-19.8633,12.3149,-2.54182},{-21.0286,-11.563,5.46691}};
 	};
 	class Land_Church_01: Church {
 		lootPos[] = {{-6.92822,0.516602,-4.2191}};
@@ -1797,7 +1792,9 @@ class CfgBuildingLoot {
 		lootPosSmall[] = {{-7.27332,-1.16895,-4.22726}};
 	};
 	class Land_Church_03: Church {
-		lootPos[] = {{5.15332,-6.96875,-14.3021},{-1.79053,-7.68018,-14.3021},{-0.0263672,-2.98438,-14.3021},{-0.00341797,2.02246,-14.3021},{5.49878,7.20508,-14.3021},{5.38892,3.4043,-14.3021},{3.23657,2.76074,-14.3021},{-1.51001,7.66309,-14.3021},{-7.6416,4.8125,-14.3021},{-6.56592,-4.59131,-14.3021},{9.552,2.22363,-13.7588},{9.93262,-3.85254,-13.7588}};
+		lootPos[] = {{-0.665527,-3.02832,-14.3021},{2.90771,3.07422,-14.3021},{9.75342,0.0117188,-13.7588},{4.74609,8.1582,-14.3021},{-2.41943,1.72168,-14.3049}};
+		lootPosZombie[] = {{-8.01465,-4.29297,-13.4271},{-8.01074,4.1123,-13.4271},{6.23047,-0.046875,-13.4199},{-4.29785,0.00488281,-13.4199}};
+		lootPosSmall[] = {{-0.791992,2.21191,-13.7321},{2.93945,-1.59766,-13.7349},{6.21191,3.48535,-13.7321},{6.56787,-3.55176,-14.3021},{-0.741211,-8.75684,-14.3021},{-0.126465,5.94434,-14.3021},{-1.14893,-3.6416,-14.3021},{-2.71484,-1.56055,-13.7349}};
 		hangPos[] = {{1.72168,-8.39771,-0.172569},{2.08838,-14.4236,-0.27536},{-13.7158,-10.4808,-0.795174},{-12.9072,-16.4105,-0.895065}};
 	};
 	class Land_Church_02: Church {
@@ -2332,7 +2329,7 @@ class CfgBuildingLoot {
 			{ "Colt1911","weapon" },
 			{ "ItemFlashlight","generic" },
 			{ "ItemKnife","generic" },
-			{ "ItemMatchbox","generic" },
+			{ "ItemMatchbox_DZE","generic" },
 			{ "ItemToolbox","weapon" },
 			{ "","generic" },
 			{ "","food" },
@@ -2382,7 +2379,7 @@ class CfgBuildingLoot {
 			{ "Colt1911","weapon" },
 			{ "ItemFlashlight","generic" },
 			{ "ItemKnife","generic" },
-			{ "ItemMatchbox","generic" },
+			{ "ItemMatchbox_DZE","generic" },
 			{ "ItemToolbox","weapon" },
 			{ "","generic" },
 			{ "","food" },

SQF/dayz_code/init/compiles.sqf

@@ -3,9 +3,6 @@
 */
 //Player only
 if (!isDedicated) then {
-	_config = 	configFile >> "CfgLoot";
-	_config1 = 	configFile >> "CfgMagazines" >> "FoodEdible";
-	_config2 = 	configFile >> "CfgWeapons" >> "Loot";
 
 	"filmic" setToneMappingParams [0.07, 0.31, 0.23, 0.37, 0.011, 3.750, 6, 4]; setToneMapping "Filmic";
 
@@ -33,6 +30,9 @@ if (!isDedicated) then {
 	player_packVault =			compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_packVault.sqf";
 	player_unlockVault =		compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_unlockVault.sqf";
 	
+	player_removeObject =		compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\remove.sqf";
+	player_removeNet =		compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\object_removeNet.sqf";
+
 	player_unlockDoor =		compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_unlockDoor.sqf";
 	player_changeCombo =		compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_changeCombo.sqf";
 	
@@ -312,7 +312,7 @@ if (!isDedicated) then {
 		};
 		
 		if (_dikCode in actionKeys "ForceCommandingMode") then {_handled = true};
-		if (_dikCode in actionKeys "PushToTalk" and (diag_tickdiag_tickTime - dayz_lastCheckBit > 10)) then {
+		if (_dikCode in actionKeys "PushToTalk" and (diag_tickTime - dayz_lastCheckBit > 10)) then {
 			dayz_lastCheckBit = diag_tickTime;
 			[player,50,true,(getPosATL player)] spawn player_alertZombies;
 		};
@@ -395,6 +395,17 @@ if (!isDedicated) then {
 		_handled
 	};
 	
+	player_setDate = {
+		private ["_setdatebool"];
+		_setdatebool = false;
+		if (!([_this, date] call BIS_fnc_areEqual)) exitWith {
+			_setdatebool = true;
+		};
+		if (_setdatebool) then {
+			setDate _this;
+		};
+	};
+
 	player_serverModelChange = {
 		private["_object","_model"];
 		_object = _this select 0;

SQF/dayz_code/init/loot_init.sqf

@@ -1,4 +1,4 @@
-private["_cfgCount","_config","_i","_itemChances","_itemCount","_weighted","_j","_weight","_l","_k","_type","_canZombie","_canLoot"];
+private ["_config","_itemChances","_itemCount","_weighted","_j","_weight","_type","_canZombie","_canLoot","_classname","_itemChancesSmall","_itemCountSmall"];
 dayz_CBLChances = [];
 dayz_CBLBase = [];
 

SQF/dayz_code/init/publicEH.sqf

@@ -29,8 +29,8 @@
 //Server only
 if (isServer) then {
 	"PVDZE_plr_Died"		addPublicVariableEventHandler {_id = (_this select 1) spawn server_playerDied};
-	"PVDZE_plr_DiscAdd"		addPublicVariableEventHandler {dayz_disco set [count dayz_disco,(_this select 1)];};
+	//"PVDZE_plr_DiscAdd"		addPublicVariableEventHandler {dayz_disco set [count dayz_disco,(_this select 1)];};
-	"PVDZE_plr_DiscRem"		addPublicVariableEventHandler {dayz_disco = dayz_disco - [(_this select 1)];};
+	//"PVDZE_plr_DiscRem"		addPublicVariableEventHandler {dayz_disco = dayz_disco - [(_this select 1)];};
 	"PVDZE_plr_Save"		addPublicVariableEventHandler {_id = (_this select 1) spawn server_playerSync;};
 	"PVDZE_obj_Publish"		addPublicVariableEventHandler {(_this select 1) call server_publishObj};
 	"PVDZE_veh_Update"		addPublicVariableEventHandler {_id = (_this select 1) spawn server_updateObject};
@@ -58,7 +58,7 @@ if (isServer) then {
 
 //Client only
 if (!isDedicated) then {
-	"PVDZE_plr_SetDate"		addPublicVariableEventHandler {setDate (_this select 1)};
+	"PVDZE_plr_SetDate"		addPublicVariableEventHandler {(_this select 1) call player_setDate};
 	"PVDZE_obj_RoadFlare"	addPublicVariableEventHandler {(_this select 1) spawn object_roadFlare};
 	"PVDZE_plr_Morph2"		addPublicVariableEventHandler {(_this select 1) call player_serverModelChange};
 	"PVDZE_plr_Morph"		addPublicVariableEventHandler {(_this select 1) call server_switchPlayer};

SQF/dayz_code/init/variables.sqf

@@ -618,6 +618,12 @@ if(!isDedicated) then {
 	if(isNil "DZE_AllowCargoCheck") then {
 		DZE_AllowCargoCheck = true;
 	};
+	if(isNil "DZE_ForceNameTags") then {
+		DZE_ForceNameTags = false;
+	};
+	if(isNil "DZE_ForceNameTagsOff") then {
+		DZE_ForceNameTagsOff = false;
+	};
 
 	DZE_CanPickup = true;
 	DZE_Q = false;

SQF/dayz_code/init/vehicle_init.sqf

@@ -3,7 +3,7 @@ ASSIGN DAMAGE HANDLER TO A UNIT
 - Function set_EH
 - unit call set_EH;
 ************************************************************/
-private["_unit","_eh1","_eh2","_dir","_location"];
+private ["_unit","_eh1","_eh2","_dir","_location","_eh3","_eh4","_eh5","_eh6"];
 _unit = _this;
 _dir = getdir _this;
 _location = getPosATL _this;

SQF/dayz_code/init/zombie_init.sqf

@@ -1,4 +1,4 @@
-private["_unit"];
+private ["_unit","_id"];
 _unit = _this select 0;
 _id = _unit addeventhandler ["HandleDamage",{_this call local_zombieDamage}];
 _id = _unit addeventhandler ["Killed",{[_this,"zombieKills"] call local_eventKill}];

SQF/dayz_code/medical/antibiotics.sqf

@@ -1,4 +1,4 @@
-private["_hasMeds","_med","_effect"];
+private ["_hasMeds","_med"];
 _med = "ItemAntibiotic";
 _hasMeds = _med in magazines player;
 if (_hasMeds) then {

SQF/dayz_code/medical/bandage.sqf

@@ -1,4 +1,7 @@
 // bleed.sqf
+
+private ["_started","_finished","_animState","_isMedic","_id","_unit"];
+
 _unit = (_this select 3) select 0;
 player removeMagazine "ItemBandage";