Change Range a bit

Got a issue with a person where build a large camo net on a tower in devels carstel

.gitignore

@@ -4,6 +4,6 @@
 /SQF/dayz_equip
 /SQF/dayz_vehicles
 /SQF/dayz_weapons
-*.rtm
-*.p3d
+#*.rtm
+#*.p3d
 *.komodoproject

CHANGE LOG 1.0.4.2.txt

@@ -0,0 +1,20 @@
+[ADDED] BTR90 HQ ride in back option. @Fank
+[ADDED] Version check for dayz.pbo. @Skaronator
+[ADDED] Updated dayZ Lighting by Axeman disabled by default, uncomment line in init.sqf to enable. @andgregor
+[ADDED] Added upgrade in place option for stairs with railings. @Sequisha @vbawol
+
+[FIXED] Fix server startup issues when using "CA folder fix" on some A2 and A2 free installs. @icomrade
+[FIXED] Geomety of wood walls changed to fix players phasing though the wood walls. @Sequisha
+[FIXED] Completed trade counter was incorrectly returning output count instead of actual number of trades. @vbawol 
+[FIXED] Incremental water bottle had a typo in the picture path. fixes: https://github.com/vbawol/DayZ-Epoch/issues/1084 @vbawol
+[FIXED] second attempt at fixing <NULL> kill messages from vehicles. @icomrade
+[FIXED] remove setdamage 0 on godmode/indestructible base objects so they can be maintained. @vbawol
+[FIXED] Fixed error in expression when removing buildings. @Fank
+[FIXED] Was possible to fill a mixed gas with an empty jerry can. @Fank
+[FIXED] Fixed undefined variables s_player_tamedog and dayz_myLiftVehicle. @Fank @vbawol
+[FIXED] Typo in server_traders.sqf for Napf, Sauerland, and panthera. @vbawol
+
+[REMOVED] Old Towngenerator Config. @Skaronator
+
+[INFO] Models/textures by Paul Tomany. @Sequisha.
+[INFO] Special thanks to http://verthosting.com for hosting our development server.

README.md

@@ -51,6 +51,7 @@ Developers
 --------------------------
 Contributors
 --------------------------
+* Fank - Fixes - https://github.com/Fank
 * facoptere - Extra Security - https://github.com/facoptere
 * Torndeco - Fixes - https://github.com/Torndeco
 * Armifer - Humanity changes. - https://github.com/Armifer

SQF/dayz/$PBOPREFIX$

@@ -0,0 +1 @@
+dayz

SQF/dayz/credits.txt

@@ -0,0 +1 @@
+Musical Sound Samples		Dan Oberbauer		http://www.freesound.org/people/DJ%20Chronos/

SQF/dayz_code/Configs/CfgBuildingLoot/CfgBuildingLoot.hpp

@@ -1167,4 +1167,8 @@ class CfgBuildingLoot {
 		};
 	};
 	#include "CfgLootPos.hpp"
+	//If you want to copypast your loottable to your mission w/o
+	//changing something on the lootPos then use the a include instead of copypasting the CfgLootPos.hpp
+	
+	//#include "\dayz_epoch_b\CfgLootPos.hpp"
 };

SQF/dayz_code/Configs/CfgBuildingLoot/CfgLootPos.hpp

@@ -71,7 +71,20 @@ class Land_A_GeneralStore_01: Supermarket {
 };
 class Land_Farm_Cowshed_a: Farm {
 	lootPos[] = {{-1.06836,-5.92163,-3.08763},{1.69043,-4.91089,-3.08763},{5.8833,-6.15381,-3.08763},{8.83984,-5.60278,-3.08763},{9.74023,-2.48657,-3.08763},{2.88428,-2.34546,-3.08763},{7.88037,2.94214,-3.08763}};
+	lootPosZombie[] = {{-7.52783,0.260742,-2.21265},{4.53271,-5.17969,-2.21265}};
+	lootPosSmall[] = {{-6.74829,-2.98145,-3.03766},{1.34399,3.79199,-3.03766}};
 };
+class Land_Farm_Cowshed_b: Farm {
+	lootPos[] = {{-3.26782,2.71875,-3.0311},{5.41699,-2.57813,-3.04111}};
+	lootPosZombie[] = {{-2.55957,0.0683594,-2.2261}};
+	lootPosSmall[] = {{3.46802,3.36621,-3.05112},{-9.98511,-3.2793,-3.09109}};
+};
+class Land_Farm_Cowshed_c: Farm {
+	lootPos[] = {{0.625,-2.61133,-3.06583}};
+	lootPosZombie[] = {{-2.09741,0.564453,-2.25082}};
+	lootPosSmall[] = {{-2.82446,3.18457,-3.11581}};
+};
+
 class Land_stodola_open: Farm {
 	lootPos[] = {{-3.77881,6.2478,-4.11348},{1.59106,6.31494,-4.10928},{-3.94727,-1.95605,-4.15359},{-0.440918,-3.91187,-4.1938}};
 	lootPosZombie[] = {{1.66333,4.70776,-3.24809},{1.57202,-6.3313,-3.23413}};
@@ -1089,6 +1102,34 @@ class Land_MBG_Shanty_BIG: Residential
 		{ 23.2319,11.6201,27.9672 },
 		{ -33.3779,-11.3564,5.81198 }};
 };
+class land_mbg_apartments_big_04: Office {
+	lootPos[] = {{10.1953,-2.47656,-3.19898},{3.14453,-0.197266,-3.19898},{0.949219,5.58789,5.94502},{-0.888672,2.47461,2.69382},{3.99414,-0.273438,2.89702},{10.7344,-0.351563,2.89702},{-10.4961,-5.46484,2.89702},{-3.25391,0.669922,2.89702},{10.6816,-2.26367,-0.15098},{-3.48828,0.31543,-0.15098},{-2.97461,-2.35547,-0.15098}};
+	lootPosZombie[] = {{-0.0898438,4.67773,-7.08873},{0.890625,-5.13965,-6.90238}};
+	lootPosSmall[] = {{4.52734,1.46289,-3.19898},{2.90234,5.90918,2.89702},{5.46875,-0.703125,2.89702},{-4.46875,-0.686523,2.89702},{5.17383,-1.80566,-0.15098},{-7.44531,5.68359,-0.15098}};
+};
+class land_mbg_killhouse_4: Residential {
+	lootPos[] = {{7.22266,-4.10205,-3.84318},{-2.04883,0.195313,-3.84318},{-6.33398,2.08691,-3.84318},{3.6582,0.32666,-3.84318},{7.24805,6.55469,-3.84318},{6.74023,2.40967,-0.543176},{-1.83203,2.08301,-0.543176},{6.85742,0.0131836,-0.543176},{-1.89258,-0.352051,-0.543176}};
+	lootPosZombie[] = {{0.597656,-6.93311,-3.62662},{-8.15625,1.8877,-3.62662}};
+	lootPosSmall[] = {{2.41992,-4.59082,-3.84318},{-1.61133,-4.5249,-3.84318},{2.61719,3.53076,-3.84318},{7.63867,6.79102,-0.543176},{2.54883,6.95605,-0.543176},{-1.70898,6.92188,-0.543176},{2.70313,-1.13672,-0.543176},{-6.58008,-4.49268,-0.543176}};
+};
+class land_mbg_ger_estate_2: Office {
+	lootPos[] = {{-0.847656,-5.23291,-2.13187},{-0.615234,3.95996,-1.55187},{8.30859,0.642578,-2.02187},{7.60547,6.6792,-2.13187},{6.38867,-5.31396,-2.13187},{-4.74023,3.71582,-2.13187}};
+	lootPosZombie[] = {{2.12695,-8.60791,-1.5208},{1.33984,9.18945,-1.25071}};
+	lootPosSmall[] = {{-6.3125,-6.48145,-1.43187},{-4.81445,-2.0293,-1.43187},{-3.47852,4.58789,-2.13187},{0.107422,3.45947,-1.55187},{4.23438,-1.42188,-1.83187},{4.97461,1.09229,-1.30187},{6.53711,-2.07227,-1.29187},{6.35547,-4.70117,-1.65187},{-7.55273,3.99268,-1.65187}};
+};
+class land_mbg_ger_rhus_1: Residential {
+	lootChance = 0.3;
+	lootPos[] = {{-1.85156,3.59961,-0.0356913},{3.04688,1.85254,-0.465693},{3.36328,0.257813,-0.465693},{-2.74023,-3.26465,-0.465693},{1.23828,-4.19531,-2.38569},{1.56055,2.37012,-2.86569},{-10.4941,3.8916,-0.454963},{-9.91797,-4.14453,-0.454963},{-5.84375,0.373047,-0.174962},{-4.50977,0.0859375,-3.35496}};
+	lootPosZombie[] = {{-2.03125,6.38867,-2.93606},{-8.33398,-5.82813,-2.73209}};
+	lootPosSmall[] = {{-1.4707,4.39844,-0.0356913},{1.56055,0.314453,-0.185692},{2.53516,0.682617,-3.25569},{3.62695,0.696289,-2.50569},{-3.34375,3.22852,-2.43569},{-3.32031,2.38086,-1.95569},{-4.81055,1.39453,-0.454963},{-6.64844,-4.29102,-0.454963},{-4.32617,-1.61035,-2.51496},{-6.30664,-4.11328,-2.37496}};
+};
+class land_mbg_garage_single_b: Industrial {
+	lootPos[] = {{2.54492,3.97607,-1.03899},{4.13672,-0.0625,-1.03899}};
+	lootPosZombie[] = {{2.96094,6.3374,-0.133815}};
+	lootPosSmall[] = {{4.50586,2.56982,-1.03899}};
+};
+
+
 class Land_dum_istan3_hromada2: Residential
 {
 	lootPos[] = {

SQF/dayz_code/Configs/CfgBuildingLoot/CfgLootSmall.hpp

@@ -308,7 +308,7 @@ class CfgLootSmall {
 			"1Rnd_HE_M203",
 			"FlareWhite_M203",
 			"FlareGreen_M203",
-			"1Rnd_Smoke_M203",		
+			"1Rnd_Smoke_M203",
 			"200Rnd_556x45_M249",
 			"HandGrenade_west",
 			"HandGrenade_east",
@@ -542,7 +542,7 @@ class CfgLootSmall {
 		{
 			"100Rnd_556x45_BetaCMag",
 			"75Rnd_545x39_RPK",
-			"100Rnd_556x45",
+			"100Rnd_556x45_M249",
 			"100Rnd_762x51_M240",
 			"100Rnd_762x54_PK",
 			"200Rnd_556x45_M249",
@@ -560,4 +560,26 @@ class CfgLootSmall {
 			0.01,
 		}
 	};
+	pistols[] = {
+		{
+			"Makarov",
+			"Colt1911",
+			"revolver_EP1",
+			"glock17_EP1",
+			"MakarovSD",
+			"M9",
+			"M9SD",
+			"revolver_gold_EP1"
+		},
+		{
+			0.25,
+			0.23,
+			0.20,
+			0.10,
+			0.10,
+			0.07,
+			0.04,
+			0.01
+		}
+	};
 };

SQF/dayz_code/Configs/CfgBuildingLoot/cfgLoot.hpp

@@ -872,10 +872,12 @@ class CfgLoot {
 		},
 		{
 			0.18,
+			0.08,
+			0.07,
 			0.15,
 			0.20,
-			0.15,
 			0.10,
+			0.15,
 			0.10,
 			0.07,
 			0.05
@@ -1024,7 +1026,7 @@ class CfgLoot {
 		{
 			"100Rnd_556x45_BetaCMag",
 			"75Rnd_545x39_RPK",
-			"100Rnd_556x45",
+			"100Rnd_556x45_M249",
 			"100Rnd_762x51_M240",
 			"100Rnd_762x54_PK",
 			"200Rnd_556x45_M249"
@@ -1042,7 +1044,7 @@ class CfgLoot {
 		{
 			"100Rnd_556x45_BetaCMag",
 			"75Rnd_545x39_RPK",
-			"100Rnd_556x45",
+			"100Rnd_556x45_M249",
 			"100Rnd_762x51_M240",
 			"100Rnd_762x54_PK",
 			"200Rnd_556x45_M249",

SQF/dayz_code/Configs/CfgMagazines/DZE/Currency/Briefcase.hpp

@@ -4,8 +4,9 @@ class ItemBriefcase_Base: CA_Magazine {
 	type = 256;
 	displayName = "Briefcase";
 	model = "\z\addons\dayz_epoch\models\briefcase.p3d";
-	picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_CA.paa";
+	picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_E_CA.paa";
 };
+// Gold
 class ItemBriefcaseEmpty: ItemBriefcase_Base {
 	picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_E_CA.paa";
 	descriptionShort = "Empty Briefcase";
@@ -413,9 +414,13 @@ class ItemBriefcase100oz: ItemBriefcase_Base {
 		};
 	};
 };
-// Silver 
-class ItemBriefcaseS10oz: ItemBriefcase_Base {
-	picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_10oz_CA.paa";
+// Silver
+class ItemSilvercase_Base: ItemBriefcase_Base {
+	model = "\z\addons\dayz_epoch\models\silvercase.p3d";
+	picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_E_CA.paa";
+};
+class ItemBriefcaseS10oz: ItemSilvercase_Base {
+	picture = "\z\addons\dayz_epoch\pictures\equip_silvercase_10oz_CA.paa";
 	descriptionShort = "Briefcase (Contains: 1 x 10oz Silver Bar)";
 	weight = 1.2;
 	worth = 10;
@@ -446,8 +451,8 @@ class ItemBriefcaseS10oz: ItemBriefcase_Base {
 		};
 	};
 };
-class ItemBriefcaseS20oz: ItemBriefcase_Base {
-	picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_20oz_CA.paa";
+class ItemBriefcaseS20oz: ItemSilvercase_Base {
+	picture = "\z\addons\dayz_epoch\pictures\equip_silvercase_20oz_CA.paa";
 	descriptionShort = "Briefcase (Contains: 2 x 10oz Silver Bar)";
 	weight = 1.5;
 	worth = 20;
@@ -486,8 +491,8 @@ class ItemBriefcaseS20oz: ItemBriefcase_Base {
 		};
 	};
 };
-class ItemBriefcaseS30oz: ItemBriefcase_Base {
-	picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_30oz_CA.paa";
+class ItemBriefcaseS30oz: ItemSilvercase_Base {
+	picture = "\z\addons\dayz_epoch\pictures\equip_silvercase_30oz_CA.paa";
 	descriptionShort = "Briefcase (Contains: 3 x 10oz Silver Bar)";
 	weight = 1.8;
 	worth = 30;
@@ -526,8 +531,8 @@ class ItemBriefcaseS30oz: ItemBriefcase_Base {
 		};
 	};
 };
-class ItemBriefcaseS40oz: ItemBriefcase_Base {
-	picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_40oz_CA.paa";
+class ItemBriefcaseS40oz: ItemSilvercase_Base {
+	picture = "\z\addons\dayz_epoch\pictures\equip_silvercase_40oz_CA.paa";
 	descriptionShort = "Briefcase (Contains: 4 x 10oz Silver Bar)";
 	weight = 2.1;
 	worth = 40;
@@ -566,8 +571,8 @@ class ItemBriefcaseS40oz: ItemBriefcase_Base {
 		};
 	};
 };
-class ItemBriefcaseS50oz: ItemBriefcase_Base {
-	picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_50oz_CA.paa";
+class ItemBriefcaseS50oz: ItemSilvercase_Base {
+	picture = "\z\addons\dayz_epoch\pictures\equip_silvercase_50oz_CA.paa";
 	descriptionShort = "Briefcase (Contains: 5 x 10oz Silver Bar)";
 	weight = 2.4;
 	worth = 50;
@@ -606,8 +611,8 @@ class ItemBriefcaseS50oz: ItemBriefcase_Base {
 		};
 	};
 };
-class ItemBriefcaseS60oz: ItemBriefcase_Base {
-	picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_60oz_CA.paa";
+class ItemBriefcaseS60oz: ItemSilvercase_Base {
+	picture = "\z\addons\dayz_epoch\pictures\equip_silvercase_60oz_CA.paa";
 	descriptionShort = "Briefcase (Contains: 6 x 10oz Silver Bar)";
 	weight = 2.7;
 	worth = 60;
@@ -646,8 +651,8 @@ class ItemBriefcaseS60oz: ItemBriefcase_Base {
 		};
 	};
 };
-class ItemBriefcaseS70oz: ItemBriefcase_Base {
-	picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_70oz_CA.paa";
+class ItemBriefcaseS70oz: ItemSilvercase_Base {
+	picture = "\z\addons\dayz_epoch\pictures\equip_silvercase_70oz_CA.paa";
 	descriptionShort = "Briefcase (Contains: 7 x 10oz Silver Bar)";
 	weight = 2.9;
 	worth = 70;
@@ -686,8 +691,8 @@ class ItemBriefcaseS70oz: ItemBriefcase_Base {
 		};
 	};
 };
-class ItemBriefcaseS80oz: ItemBriefcase_Base {
-	picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_80oz_CA.paa";
+class ItemBriefcaseS80oz: ItemSilvercase_Base {
+	picture = "\z\addons\dayz_epoch\pictures\equip_silvercase_80oz_CA.paa";
 	descriptionShort = "Briefcase (Contains: 8 x 10oz Silver Bar)";
 	weight = 3.2;
 	worth = 80;
@@ -726,8 +731,8 @@ class ItemBriefcaseS80oz: ItemBriefcase_Base {
 		};
 	};
 };
-class ItemBriefcaseS90oz: ItemBriefcase_Base {
-	picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_90oz_CA.paa";
+class ItemBriefcaseS90oz: ItemSilvercase_Base {
+	picture = "\z\addons\dayz_epoch\pictures\equip_silvercase_90oz_CA.paa";
 	descriptionShort = "Briefcase (Contains: 9 x 10oz Silver Bar)";
 	weight = 3.5;
 	worth = 90;
@@ -758,8 +763,8 @@ class ItemBriefcaseS90oz: ItemBriefcase_Base {
 		};
 	};
 };
-class ItemBriefcaseS100oz: ItemBriefcase_Base {
-	picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_100oz_CA.paa";
+class ItemBriefcaseS100oz: ItemSilvercase_Base {
+	picture = "\z\addons\dayz_epoch\pictures\equip_silvercase_100oz_CA.paa";
 	descriptionShort = "Briefcase (Contains: 10 x 10oz Silver Bar)";
 	weight = 3.8;
 	worth = 100;

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

@@ -1,7 +1,7 @@
 class ItemWaterbottle1oz : ItemWaterbottle {
 	displayName = "Water Bottle (1oz)";
 	descriptionShort = "Watter Bottle with 1oz of water";
-	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle1oz_ca.paa";
+	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_1oz_ca.paa";
 	wateroz = 1;
 	class ItemActions {
 		class Fill {
@@ -13,7 +13,7 @@ class ItemWaterbottle1oz : ItemWaterbottle {
 class ItemWaterbottle2oz : ItemWaterbottle {
 	displayName = "Water Bottle (2oz)";
 	descriptionShort = "Watter Bottle with 2oz of water";
-	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle2oz_ca.paa";
+	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_2oz_ca.paa";
 	wateroz = 2;
 	class ItemActions {
 		class Fill {
@@ -25,7 +25,7 @@ class ItemWaterbottle2oz : ItemWaterbottle {
 class ItemWaterbottle3oz : ItemWaterbottle {
 	displayName = "Water Bottle (3oz)";
 	descriptionShort = "Watter Bottle with 3oz of water";
-	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle3oz_ca.paa";
+	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_3oz_ca.paa";
 	wateroz = 3;
 	class ItemActions {
 		class Fill {
@@ -37,7 +37,7 @@ class ItemWaterbottle3oz : ItemWaterbottle {
 class ItemWaterbottle4oz : ItemWaterbottle {
 	displayName = "Water Bottle (4oz)";
 	descriptionShort = "Watter Bottle with 4oz of water";
-	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle4oz_ca.paa";
+	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_4oz_ca.paa";
 	wateroz = 4;
 	class ItemActions {
 		class Fill {
@@ -49,7 +49,7 @@ class ItemWaterbottle4oz : ItemWaterbottle {
 class ItemWaterbottle5oz : ItemWaterbottle {
 	displayName = "Water Bottle (5oz)";
 	descriptionShort = "Watter Bottle with 5oz of water";
-	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle5oz_ca.paa";
+	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_5oz_ca.paa";
 	wateroz = 5;
 	class ItemActions {
 		class Fill {
@@ -61,7 +61,7 @@ class ItemWaterbottle5oz : ItemWaterbottle {
 class ItemWaterbottle6oz : ItemWaterbottle {
 	displayName = "Water Bottle (6oz)";
 	descriptionShort = "Watter Bottle with 6oz of water";
-	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle6oz_ca.paa";
+	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_6oz_ca.paa";
 	wateroz = 6;
 	class ItemActions {
 		class Fill {
@@ -73,7 +73,7 @@ class ItemWaterbottle6oz : ItemWaterbottle {
 class ItemWaterbottle7oz : ItemWaterbottle {
 	displayName = "Water Bottle (7oz)";
 	descriptionShort = "Watter Bottle with 7oz of water";
-	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle7oz_ca.paa";
+	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_7oz_ca.paa";
 	wateroz = 7;
 	class ItemActions {
 		class Fill {
@@ -85,7 +85,7 @@ class ItemWaterbottle7oz : ItemWaterbottle {
 class ItemWaterbottle8oz : ItemWaterbottle {
 	displayName = "Water Bottle (8oz)";
 	descriptionShort = "Watter Bottle with 8oz of water";
-	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle8oz_ca.paa";
+	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_8oz_ca.paa";
 	wateroz = 8;
 	class ItemActions {
 		class Fill {
@@ -97,7 +97,7 @@ class ItemWaterbottle8oz : ItemWaterbottle {
 class ItemWaterbottle9oz : ItemWaterbottle {
 	displayName = "Water Bottle (9oz)";
 	descriptionShort = "Watter Bottle with 9oz of water";
-	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle9oz_ca.paa";
+	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_9oz_ca.paa";
 	wateroz = 9;
 	class ItemActions {
 		class Fill {

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

@@ -16,6 +16,7 @@ class ItemMixOil : CA_Magazine {
 			requiretools[] = {};
 			output[] = {{"ItemJerryMixed",1}};
 			input[] = {{"ItemMixOil",1},{"ItemJerrycan",1}};
+			inputstrict = true;
 		};
 	};
 };

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

@@ -434,6 +434,7 @@ class WoodStairs_DZ: ModularItems {
 	displayName = "Wood Stairs";
 	vehicleClass = "Fortifications";
 	maintainBuilding[] = {{"PartWoodLumber",1}};
+	upgradeBuilding[] = {"WoodStairsRails_DZ",{{"PartWoodLumber",2}}};
 	GhostPreview = "WoodStairs_Preview_DZ";
 };
 class WoodLadder_DZ: ModularItems {
@@ -452,6 +453,21 @@ class WoodLadder_DZ: ModularItems {
 	ladders[] = {{"start1","end1"}};
 };
 
+class WoodStairsRails_DZ: ModularItems {
+	scope = 2;
+	destrType = "DestructBuilding";
+	cost = 100;
+	offset[] = {0,1.5,0};
+	model="\z\addons\dayz_epoch\models\wood_stairs_rail.p3d";
+	icon = "\ca\data\data\Unknown_object.paa";
+	mapSize = 2;
+	armor = 700;
+	displayName = "Wood Stairs Rail";
+	vehicleClass = "Fortifications";
+	maintainBuilding[] = {{"PartWoodLumber",1}};
+	GhostPreview = "WoodStairs_Preview_DZ";
+};
+
 class WoodStairsSans_DZ: ModularItems {
 	scope = 2;
 	destrType = "DestructBuilding";

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

@@ -33,6 +33,8 @@ class BTR90_HQ_DZ: BTR90_HQ {
 	typicalCargo[] = {};
 	class TransportMagazines{};
 
+	transportSoldier = 6;
+
 	transportMaxMagazines = 100; // Default: 100
 	transportMaxWeapons = 10; // Default: 10
 	//transportmaxbackpacks = ; // Default:
@@ -45,7 +47,7 @@ class BTR90_HQ_DZ: BTR90_HQ {
 class BTR90_DZE: BTR90_DZ {
 	displayName = "BTR-90 AL";
 	class Turrets: Turrets {
-		class MainTurret : MainTurret {
+		class MainTurret: MainTurret {
 			magazines[] = {};
 		};
 	};
@@ -53,7 +55,7 @@ class BTR90_DZE: BTR90_DZ {
 class BTR90_HQ_DZE: BTR90_HQ_DZ {
 	displayName = "BTR-90 (HQ) AL";
 	class Turrets: Turrets {
-		class MainTurret : MainTurret {
+		class MainTurret: MainTurret {
 			magazines[] = {};
 		};
 	};

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

@@ -33,6 +33,8 @@ class LAV25_HQ_DZ: LAV25_HQ {
 	typicalCargo[] = {};
 	class TransportMagazines{};
 
+	transportSoldier = 6;
+
 	transportMaxMagazines = 100; // Default: 100
 	transportMaxWeapons = 10; // Default: 10
 	//transportmaxbackpacks = ; // Default:

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

@@ -46,7 +46,7 @@ class M113_TK_EP1_DZ: M113_TK_EP1 {
 class M113_UN_EP1_DZE: M113_UN_EP1_DZ {
 	displayName = "M113 AL";
 	class Turrets: Turrets {
-		class MainTurret : MainTurret {
+		class MainTurret: MainTurret {
 			magazines[] = {};
 		};
 	};
@@ -54,7 +54,7 @@ class M113_UN_EP1_DZE: M113_UN_EP1_DZ {
 class M113_TK_EP1_DZE: M113_TK_EP1_DZ {
 	displayName = "M113 AL";
 	class Turrets: Turrets {
-		class MainTurret : MainTurret {
+		class MainTurret: MainTurret {
 			magazines[] = {};
 		};
 	};

SQF/dayz_code/Configs/rscTitles.hpp

@@ -166,7 +166,7 @@ class RscDisplayMain : RscStandardDisplay
 		class DAYZ_Version : CA_Version
 		{
 			idc = -1;
-			text = "DayZ Epoch 1.0.4.1";
+			text = "DayZ Epoch 1.0.4.2";
 			y = "(SafeZoneH + SafeZoneY) - (1 - 0.95)";
 		};
 		delete CA_TitleMainMenu;

SQF/dayz_code/actions/player_addToolbelt.sqf

@@ -49,7 +49,7 @@ if (_isOk) then {
 		_display = findDisplay 106;
 		_display closeDisplay 0;
 	};
-	
+
 	//Add magazines if needed
 	if (_create in ["MeleeHatchet_DZE","MeleeCrowbar","MeleeMachete","MeleeFishingPole","MeleeSledge"]) then {
 		if (_create == "MeleeCrowbar") then {
@@ -67,20 +67,11 @@ if (_isOk) then {
 		if (_create == "MeleeFishingPole") then {
 				player addMagazine 'Fishing_Swing';
 		};
-		if (_type == "cfgWeapons") then {
-			_muzzles = getArray(configFile >> "cfgWeapons" >> _create >> "muzzles");
-			_wtype = ((weapons player) select 0);
-			if (count _muzzles > 1) then {
-				player selectWeapon (_muzzles select 0);
-			} else {
-				player selectWeapon _wtype;
-			};
-		};
-	};		
+	};
 
 } else {
 	cutText [localize "STR_DAYZ_CODE_2", "PLAIN DOWN"];
-	
+
 	//Add magazines back
 	if (_item in ["MeleeHatchet_DZE","MeleeCrowbar","MeleeMachete","MeleeFishingPole","MeleeSledge"]) then {
 		if (_item == "MeleeCrowbar") then {
@@ -98,6 +89,6 @@ if (_isOk) then {
 		if (_item == "MeleeFishingPole") then {
 			player addMagazine 'Fishing_Swing';
 		};
-	};	
+	};
 };
 DZE_ActionInProgress = false;

SQF/dayz_code/actions/player_build.sqf

@@ -365,7 +365,6 @@ if (_hasrequireditem) then {
 
 	// No building in trader zones
 	if(!canbuild) then { _cancel = true; _reason = "Cannot build in a city."; };
-	if(!placevault) then { _cancel = true; _reason = "Cannot build in a city."; };
 
 	if(!_cancel) then {
 
@@ -553,7 +552,6 @@ if (_hasrequireditem) then {
 		};
 
 	} else {
-		deleteVehicle _tmpbuilt;
 		cutText [format[(localize "str_epoch_player_47"),_text,_reason], "PLAIN DOWN"];
 	};
 };

SQF/dayz_code/actions/player_craftItem.sqf

@@ -14,12 +14,13 @@ class ItemActions
 		requiretools[] = {"ItemToolbox","ItemKnife"}; // (cfgweapons only)
 		output[] = {{"ItemTent",1}}; // (CfgMagazines, qty)
 		input[] = {{"ItemCanvas",2},{"ItemPole",2}}; // (CfgMagazines, qty)
+		inputstrict = true; // (CfgMagazines input without inheritsFrom) Optional
 		inputweapons[] = {"ItemToolbox"}; // consume toolbox (cfgweapons only)
 		outputweapons[] = {"ItemToolbox"}; // return toolbox (cfgweapons only)
 	};
-};	
+};
 */
-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"];
+private ["_tradeComplete","_onLadder","_canDo","_selectedRecipeOutput","_proceed","_itemIn","_countIn","_missing","_missingQty","_qty","_itemOut","_countOut","_started","_finished","_animState","_isMedic","_removed","_tobe_removed_total","_textCreate","_textMissing","_selectedRecipeInput","_selectedRecipeInputStrict","_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(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_63") , "PLAIN DOWN"]; };
 DZE_ActionInProgress = true;
@@ -44,14 +45,14 @@ _canDo = (!r_drag_sqf and !r_player_unconscious and !_onLadder);
 _needNear = getArray (configFile >> _baseClass >> _item >> "ItemActions" >> _crafting >> "neednearby");
 if("fire" in _needNear) then {
 	_isNear = {inflamed _x} count (getPosATL player nearObjects _distance);
-	if(_isNear == 0) then {  
+	if(_isNear == 0) then {
 		_abort = true;
 		_reason = "fire";
 	};
 };
 if("workshop" in _needNear) then {
 	_isNear = count (nearestObjects [player, ["Wooden_shed_DZ","WoodShack_DZ","WorkBench_DZ"], _distance]);
-	if(_isNear == 0) then {  
+	if(_isNear == 0) then {
 		_abort = true;
 		_reason = "workshop";
 	};
@@ -64,10 +65,11 @@ if(_abort) exitWith {
 // diag_log format["Checking for fire: %1", _isFireNear];
 
 if (_canDo) then {
-	
+
 	_selectedRecipeTools = getArray (configFile >> _baseClass >> _item >> "ItemActions" >> _crafting >> "requiretools");
-	_selectedRecipeOutput = getArray (configFile >> _baseClass >> _item >> "ItemActions" >> _crafting >> "output");	
-	_selectedRecipeInput = getArray (configFile >> _baseClass >> _item >> "ItemActions" >> _crafting >> "input");	
+	_selectedRecipeOutput = getArray (configFile >> _baseClass >> _item >> "ItemActions" >> _crafting >> "output");
+	_selectedRecipeInput = getArray (configFile >> _baseClass >> _item >> "ItemActions" >> _crafting >> "input");
+	_selectedRecipeInputStrict = if ((isNumber (configFile >> _baseClass >> _item >> "ItemActions" >> _crafting >> "inputstrict")) && (getNumber (configFile >> _baseClass >> _item >> "ItemActions" >> _crafting >> "inputstrict") > 0)) then {true} else {false};
 	_outputWeapons = getArray (configFile >> _baseClass >> _item >> "ItemActions" >> _crafting >> "outputweapons");
 	_inputWeapons = getArray (configFile >> _baseClass >> _item >> "ItemActions" >> _crafting >> "inputweapons");
 
@@ -80,24 +82,24 @@ if (_canDo) then {
 	if(isNumber (configFile >> _baseClass >> _item >> "ItemActions" >> _crafting >> "randomOutput")) then {
 		_randomOutput = getNumber(configFile >> _baseClass >> _item >> "ItemActions" >> _crafting >> "randomOutput");
 	};
-	
+
 	_craft_doLoop = true;
 	_tradeComplete = 0;
 
 	while {_craft_doLoop} do {
 
 		_temp_removed_array = [];
-	
+
 		_missing = "";
 		_missingTools = false;
 		{
 			_hastoolweapon = _x in weapons player;
 			if(!_hastoolweapon) exitWith { _craft_doLoop = false; _missingTools = true; _missing = _x; };
 		} forEach _selectedRecipeTools;
-	
+
 		if(!_missingTools) then {
-	
-		
+
+
 			// Dry run to see if all parts are available.
 			_proceed = true;
 			if (count _selectedRecipeInput > 0) then {
@@ -105,30 +107,30 @@ if (_canDo) then {
 					_itemIn = _x select 0;
 					_countIn = _x select 1;
 
-					_qty = { (_x == _itemIn) || (configName(inheritsFrom(configFile >> "cfgMagazines" >> _x)) == _itemIn) } count magazines player;	
-	
+					_qty = { (_x == _itemIn) || (!_selectedRecipeInputStrict && configName(inheritsFrom(configFile >> "cfgMagazines" >> _x)) == _itemIn) } count magazines player;
+
 					if(_qty < _countIn) exitWith { _missing = _itemIn; _missingQty = (_countIn - _qty); _proceed = false; };
-	
+
 				} forEach _selectedRecipeInput;
 			};
-	
+
 			// If all parts proceed
 			if (_proceed) then {
-	
+
 				cutText [(localize "str_epoch_player_62"), "PLAIN DOWN"];
-	
+
 				[1,1] call dayz_HungerThirst;
 				player playActionNow "Medic";
-	
+
 				[player,_sfx,0,false] call dayz_zombieSpeak;
 				[player,50,true,(getPosATL player)] spawn player_alertZombies;
-				
+
 				r_interrupt = false;
 				_animState = animationState player;
 				r_doLoop = true;
 				_started = false;
 				_finished = false;
-		
+
 				while {r_doLoop} do {
 					_animState = animationState player;
 					_isMedic = ["medic",_animState] call fnc_inString;
@@ -145,9 +147,9 @@ if (_canDo) then {
 					sleep 0.1;
 				};
 				r_doLoop = false;
-	
+
 				if (_finished) then {
-	
+
 					_removed_total = 0; // count total of removed items
 					_tobe_removed_total = 0; // count total of all to be removed items
 					// Take items
@@ -157,10 +159,10 @@ if (_canDo) then {
 						_countIn = _x select 1;
 						// diag_log format["Recipe Finish: %1 %2", _itemIn,_countIn];
 						_tobe_removed_total = _tobe_removed_total + _countIn;
-	
-						{					
+
+						{
 							_configParent = configName(inheritsFrom(configFile >> "cfgMagazines" >> _x));
-							if( (_removed < _countIn) && ((_x == _itemIn) || _configParent == _itemIn)) then {
+							if( (_removed < _countIn) && ((_x == _itemIn) || (!_selectedRecipeInputStrict && _configParent == _itemIn))) then {
 								_num_removed = ([player,_x] call BIS_fnc_invRemove);
 								_removed = _removed + _num_removed;
 								_removed_total = _removed_total + _num_removed;
@@ -172,20 +174,20 @@ if (_canDo) then {
 									_temp_removed_array set [count _temp_removed_array,_x];
 								};
 							};
-	
+
 						} forEach magazines player;
-	
+
 					} forEach _selectedRecipeInput;
-					
+
 					//diag_log format["removed: %1 of: %2", _removed, _tobe_removed_total];
-	
+
 					// Only proceed if all parts were removed successfully
 					if(_removed_total == _tobe_removed_total) then {
 						_num_removed_weapons = 0;
 						{
 							_num_removed_weapons = _num_removed_weapons + ([player,_x] call BIS_fnc_invRemove);
 						} forEach _inputWeapons;
-						if (_num_removed_weapons == (count _inputWeapons)) then {	
+						if (_num_removed_weapons == (count _inputWeapons)) then {
 							if(_randomOutput == 1) then {
 								_selectedWeapon = _outputWeapons call BIS_fnc_selectRandom;
 								_outputWeapons = [_selectedWeapon];
@@ -195,19 +197,19 @@ if (_canDo) then {
 								_craft_doLoop = false;
 							};
 							{
-								player addWeapon _x; 
+								player addWeapon _x;
 							} forEach _outputWeapons;
-							{	
-	
+							{
+
 								_itemOut = _x select 0;
 								_countOut = _x select 1;
-		
+
 								if (_itemOut == "ItemWaterbottleUnfilled") then {
-									
+
 									if (_waterLevel > 0) then {
 										_itemOut = format["ItemWaterbottle%1oz",_waterLevel];
 									};
-									
+
 								};
 
 								 diag_log format["Checking for water level: %1", _waterLevel];
@@ -216,25 +218,25 @@ if (_canDo) then {
 									player addMagazine _itemOut;
 								};
 
-								_tradeComplete = _tradeComplete+1;
-
 								_textCreate = getText(configFile >> "CfgMagazines" >> _itemOut >> "displayName");
-	
+
 								// Add crafted item
 								cutText [format[(localize "str_epoch_player_150"),_textCreate,_countOut], "PLAIN DOWN"];
-								// sleep here 
+								// sleep here
 								sleep 1;
-	
+
 							} forEach _selectedRecipeOutput;
+
+							_tradeComplete = _tradeComplete+1;
 						};
-						
+
 					} else {
-						// Refund parts since we failed 
+						// Refund parts since we failed
 						{player addMagazine _x;} forEach _temp_removed_array;
-	
+
 						cutText [format[(localize "str_epoch_player_151"),_removed_total,_tobe_removed_total], "PLAIN DOWN"];
 					};
-	
+
 				} else {
 					r_interrupt = false;
 					if (vehicle player == player) then {
@@ -244,7 +246,7 @@ if (_canDo) then {
 					cutText [(localize "str_epoch_player_64"), "PLAIN DOWN"];
 					_craft_doLoop = false;
 				};
-	
+
 			} else {
 				_textMissing = getText(configFile >> "CfgMagazines" >> _missing >> "displayName");
 				cutText [format[(localize "str_epoch_player_152"),_missingQty, _textMissing,_tradeComplete], "PLAIN DOWN"];

SQF/dayz_code/actions/remove.sqf

@@ -41,7 +41,7 @@ if (DZE_StaticConstructionCount > 0) then {
 }
 else {
 	if (isNumber (configFile >> "CfgVehicles" >> _objType >> "constructioncount")) then {
-		_limit = getNumber(configFile >> "_objType" >> _classname >> "constructioncount");
+		_limit = getNumber(configFile >> "CfgVehicles" >> _objType >> "constructioncount");
 	};
 };
 

SQF/dayz_code/actions/trade_any_vehicle_free.sqf

@@ -136,8 +136,8 @@ if (_finished) then {
 
 					_location = (getPosATL _veh);
 
-					//["PVDZE_veh_Publish",[_veh,[_dir,_location],_part_out,false,0]] call callRpcProcedure;
-					PVDZE_veh_Publish2 = [_veh,[_dir,_location],_part_out,false,0,_activatingPlayer];
+					//["PVDZE_veh_Publish",[_veh,[_dir,_location],_part_out,true,0]] call callRpcProcedure;
+					PVDZE_veh_Publish2 = [_veh,[_dir,_location],_part_out,true,0,_activatingPlayer];
 					publicVariableServer  "PVDZE_veh_Publish2";
 				};
 

SQF/dayz_code/compile/fn_damageActions.sqf

@@ -95,7 +95,6 @@ if (!isNull _menClose and _hasPatient and !r_drag_sqf and !r_action and !_inVehi
 	//Allow player to bandage
 	if(_injured and _hasBandage) then {
 		r_action = true;
-		//_unit setdamage 0.8;
 		_action = _unit addAction [localize "str_actions_medical_04", "\z\addons\dayz_code\medical\bandage.sqf",[_unit], 0, true, true, "", ""];
 		r_player_actions set [count r_player_actions,_action];
 	};
@@ -142,32 +141,6 @@ if (!isNull _menClose and _hasPatient and !r_drag_sqf and !r_action and !_inVehi
 			r_player_actions set [count r_player_actions,_action];
 		};
 
-		//CAN WE ISSUE ANOTHER KIND OF AMMUNITION?
-		if (count weapons _unit > 0) then {
-			//Get mag array
-			_weapon = weapons _unit select 0;
-			_magTypes = getArray(configFile >> "cfgWeapons" >> _weapon >> "magazines");
-			{
-				_ammoSerial = (USEC_LogisticsItems find _x);
-				if (_ammoSerial > -1) then {
-					//Have the item type
-					_ammoQty = ((USEC_LogisticsDetail select _ammoSerial) select 1);
-					if (_ammoQty > 0) then {
-						//Have at least one
-						r_action = true;
-						_displayName = getText(configFile >> "cfgMagazines" >> _x >> "displayName");
-						_action = _unit addAction [format[localize "str_actions_medical_11",_displayName], "\z\addons\dayz_code\actions\logistics_loadmag.sqf",[_unit,_x], 0, false, true];
-						r_player_actions set [count r_player_actions,_action];
-					};
-				};
-			} forEach _magTypes;
-		};
-		//CAN CARRY BACKPACK
-		if ((_type in USEC_PackableObjects) and (_classbag == "")) then {
-			r_action = true;
-			_action = _unit addAction [format[localize "str_actions_medical_12",_typeVeh], "\z\addons\dayz_code\actions\pack.sqf",[_unit], 0, true, true];
-			r_player_actions set [count r_player_actions,_action];
-		};
 	} else {
 	
 		// should only fire if cursor target is man and not vehicle
@@ -234,4 +207,4 @@ if ((!_isClose or !_hasPatient) and r_action) then {
 //if (r_player_inpain and !r_player_unconscious) then {
 //	playSound "breath_1";
 //	addCamShake [2, 1, 25];
-//};
+//};

SQF/dayz_code/compile/fn_lightFunctions.sqf

@@ -1,14 +1,13 @@
 /*
 	DayZ Epoch Lighting System - Light Functions
-	Made for DayZ Epoch by axeman please ask permission to use/edit/distribute email gregory.andrew@gmail.com or vbawol@veteranbastards.com.
+	Made for DayZ Epoch by axeman please ask permission to use/edit/distribute email gregory.andrew@gmail.com.
 */
-axe_returnStreetLights={
-private["_lights","_objName","_rng","_nrstGen","_rndLights","_sleeptime"];
-_rng = _this select 0;
-_nrstGen = _this select 1;
-_rndLights = _this select 2;
+axe_NoStreetLights={//For testing - Need to see brightness of house lights
+private["_lights","_rng","_target","_objName"];
+_target = _this select 0;
+_rng = _this select 1;
+
 _lights = ["a_fuelstation_sign.p3d","lampa_ind_zebr.p3d","lampa_ind.p3d","lampa_sidl_3.p3d","lampa_sidl_2.p3d","lampa_sidl.p3d","powlines_concl.p3d","powlines_woodl.p3d"];
-axe_streetLamps=[];
 
 	{
 		if("" != typeOf _x) then {
@@ -18,40 +17,16 @@ axe_streetLamps=[];
 				_objName = _x call DZE_getModelName;
 
 				if (_objName in _lights) then {
-					if(_rndLights<random 100)then{
-						if(_rndLights/3>random 100)then{//Reduce chance more due to speed of script
-						
-							for "_s" from 1 to 8 do {
-								if(_s%2==0)then{
-								_x switchlight "off";
-								
-								}else{
-								_x switchlight "on";
-								;
-								};
-							_sleeptime=(random 100)/100;
-							sleep _sleeptime;
-							};
-							_x switchlight "off";
-							//axeDiagLog = format["FN:SL NEW OFF:%1",_x];
-							//publicVariable "axeDiagLog";
-						}else{
-						_x switchlight "on";
-						//axeDiagLog = format["FN:SL NEW ON:%1",_x];
-						//publicVariable "axeDiagLog";
-						};
-					}else{
-					_x switchlight "on";
-					//axeDiagLog = format["FN:SL NEW ON:%1",_x];
-					//publicVariable "axeDiagLog";
-					};
-				[axe_streetLamps , [_x]] call BIS_fnc_arrayPush;
+
+					_x switchlight "off";
+
 				};
 			};
 		};
-	} foreach nearestObjects [getPos _nrstGen, [], _rng];
-axe_streetLamps
+	} foreach nearestObjects [getPos _target, [], _rng];
+
 };
+
 axe_newLightPoint={
 private ["_lp","_pos","_col","_brt","_amb","_pos","_dir","_vect"];
 _col = _this select 0;
@@ -60,16 +35,18 @@ _amb = _this select 2;
 _pos = _this select 3;
 _dir = _this select 4;
 _vect = _this select 5;
-_lp = "#lightpoint" createVehicleLocal _pos;
+_lp = "#lightpoint" createVehicleLocal _pos;//Only create locally now.
 _lp setLightColor _col;
 _lp setLightBrightness _brt;
 _lp setLightAmbient _amb;
 _lp setDir _dir;
 _lp setVectorUp _vect;
-//axeDiagLog = format["FN:LP NEW CREATE:%1",_lp];
+//_lp enableSimulation false;//Using this stops lights from illuminating for local player (not tried moving it to before parameters set) - Makes no difference to network broadcast, other players DO NOT see the object anyway
+//axeDiagLog = format["FN:LP NEW CREATE:BRIGHT:%3 | %1 for %2",_lp,player,_brt];
 //publicVariable "axeDiagLog";
 _lp
 };
+
 axe_lightPoint={
 private ["_lp","_col","_brt","_amb"];
 _col = _this select 0;
@@ -82,6 +59,26 @@ _lp setLightAmbient _amb;
 //axeDiagLog = format["FN:LP EXISTS LIGHT:%1",_lp];
 //publicVariable "axeDiagLog";
 };
+
+//return brightness of light attached to object
+axe_lightBrightness={
+private["_plyr","_brtns","_lightPcnt","_target"];
+_plyr = _this select 0;
+_target = _this select 1;
+
+if(isNil "dayz_fullMoonNights")then{dayz_fullMoonNights = false;};
+if(dayz_fullMoonNights)then{
+_brtns = 0.024;
+}else{
+_brtns = 0.018;
+};
+_brtns = _brtns + ((_brtns/100) * ((_plyr distance _target)/15)); //Add percentage of brightness based on distance from player
+//Min / Max Levels
+//if (_brtns > 0.025)then{_brtns = 0.025;};
+//if (_brtns < 0.015)then{_brtns = 0.015;};
+_brtns
+};
+
 axe_towerLight={
 private["_twr","_lCol","_lbrt","_lamb","_oset","_twrPos","_rad","_a","_b","_ang","_nrTLs","_doLit"];
 _twr = _this select 3 select 0;

SQF/dayz_code/compile/local_lights_house.sqf

@@ -1,102 +1,164 @@
 /*
 	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.
+	Made for DayZ Epoch by axeman please ask permission to use/edit/distribute email gregory.andrew@gmail.com.
 */
-private ["_objLightPoint","_pos","_objHouse","_dir","_rng","_lpDist","_nrstTrig","_rndLights","_lmpCol","_hsAnimPer","_brtns","_lightPcnt","_hsLPDist","_hsTime","_hsCount","_litCount","_hsAnimPer2","_chnGCount","_debug"];
-_hsCount = 0;
-_litCount = 0;
-_chnGCount = 0;
-//_debug = false;
+private ["_validHouses","_animPhase","_maxHouses","_houseNum","_plyr","_objLightPoint","_pos","_objHouse","_dir","_rng","_rngPlyr","_lpRange","_nrstTrig","_lmpCol","_hsAnimPer","_brtns","_lightPcnt","_hsLPDist","_notLitHouses","_areaLit","_litHouses","_hsAnimPhase","_litWindowFound","_currLighting"];
 
-_rng = _this select 0;//player range to light windows
-_nrstTrig = _this select 1;
-_rndLights = _this select 2;
-_lmpCol = _this select 3;
-_lpDist =  _this select 4;//Range to create lightpoints at
-_hsLPDist = 2; //Distance to dettect local lightpoint from house center
-_objHouse = nearestObjects [_nrstTrig, ["House"], _rng]; 
-if(!isNil "_objHouse")then{
-	_hsTime = time;
-	{
-	//axeDiagLog = format["HL:ATTEMPT typeof _x:%1 | _x:%2",typeof _x,_x];
-	//publicVariable "axeDiagLog";
-	_hsAnimPer = getNumber (configFile >> "CfgVehicles" >> (typeof _x) >> "AnimationSources" >> "Lights_1" >> "animPeriod");
-	_hsAnimPer2 = getNumber (configFile >> "CfgVehicles" >> (typeof _x) >> "AnimationSources" >> "Lights_2" >> "animPeriod");
-	//axeDiagLog = format["HL:CONFIG:%1 | Base:%2 | MLight Bright:%3 | MLight Blink:%4 | Alive:%5 | Lights_2:%6",_hsAnimPer,_base,_mLights,_mLightsBlink, alive _x,_hsAnimPer2];
-	//publicVariable "axeDiagLog";
-		if(_hsAnimPer>0 && alive _x)then{//Is house with window
-				
-		_brtns = 0.0025;
-		_lightPcnt = (player distance _x)/10;
-		_brtns = _brtns * _lightPcnt;//Light brightness by percentage
-		//Min / Max Levels
-		if (_brtns > 0.06)then{_brtns = 0.06;};
-		if (_brtns < 0.015)then{_brtns = 0.015;};
+
+//test
+private["_animPhase2"];
 		
-		_objLightPoint = nearestObject [_x, "#lightpoint"];
-		_pos = getPos _x;
-		_dir = getDir _x;
-					
-			if(_x getVariable ["axeHLight", 0]<1)then{
-				if(_rndLights>random 100)then{
-				_litCount = _litCount +1;
-					if(_x animationPhase "Lights_1"==0) then{
-						_x animate ["Lights_1",1];
-						if(_hsAnimPer2>0)then{
-							if(42 > random 100) then{_x animate ["Lights_2",1];};//Randomly light second set of windows if house has the option
-						};
-						//Wait for animation phase
-						while{true}do{sleep .1;if (_x animationPhase "Lights_1"==1) exitWith {};};
-					};
-					//axeDiagLog = format["HL: animPhase:%1",_x animationPhase "Lights_1"];
-					//publicVariable "axeDiagLog";
-					if((_x animationPhase "Lights_1">0))then{
-					
-						if((abs ([_pos, _objLightPoint] call BIS_fnc_distance2D))>_hsLPDist)then{
-							if(player distance _x < _lpDist)then{
-							//if(_debug)then{axeDiagLog = format["HL:NEW LP:%1 | _brtns:%2",_x,_brtns];publicVariable "axeDiagLog";};
-							//[_lmpCol,0.01,_lmpCol,[_pos select 0,_pos select 1,1],_dir,[0,0,-1]] call axe_newLightPoint;
-							[_lmpCol,_brtns,_lmpCol,getPos _x,_dir,[0,0,-2.6]] call axe_newLightPoint;
-							_x setVariable ["brtns", _brtns, false];
-							_x setVariable ["axeHLight", 1, false];
-							};
-						}else{
-							if(player distance _x < _lpDist)then{
-							//if(_debug)then{axeDiagLog = format["HL:EXISTS LP:%1 | _brtns:%2",_x,_brtns];publicVariable "axeDiagLog";};
-							//[_lmpCol,_brtns,_lmpCol,_objLightPoint] call axe_lightPoint;
-							_objLightPoint setLightColor _lmpCol;
-							_objLightPoint setLightBrightness _brtns;
-							_objLightPoint setLightAmbient _lmpCol;
-							_chnGCount = _chnGCount + 1;
-							_x setVariable ["brtns", _brtns, false];
-							_x setVariable ["axeHLight", 1, false];
-							};
-						};
+		
+//_debug = false;
+_rng = _this select 0;//player range to light windows - REDUCE if individual players experience lag (Is client based)
+_nrstTrig = _this select 1;
+_lightPcnt = _this select 2;
+_lmpCol = _this select 3;
+_lpRange = round(_rng - ((_rng/100)*16));//Create an outer radius to cleanup lightpoints in
+_plyr = _this select 4;
+_houseNum = _this select 5;
+_hsLPDist = 2; //Distance to detect local lightpoint from house center
+_notLitHouses = [];
+_litHouses = [];
+_areaLit = false;
+_litWindowFound = false;
+_currLighting = 0;
+_validHouses = 0;
+_maxHouses = 0;
+//Create a routine to reduce range if house amount limit is hit, reduce lag in cities..
+
+
+//TESTING
+//if(_houseNum>200)then{_rng = _rng - (_rng/100)*(_houseNum/10)};//Reduce range by % of housenum. If 600 houses reduce range by 60%, 400 house reduce by 40% etc.. - USAGE: In cities where visible houses are lower
+//TESTING
+
+
+
+_objHouse = nearestObjects [_nrstTrig, ["House"], _rng]; 
+
+//axeDiagLog = format["HL:HOUSE NUM:%1 (From Last Run) | Range:%2 | Total House Objs:%3",_houseNum,_rng, count _objHouse];
+//publicVariable "axeDiagLog";
+
+_houseNum = count _objHouse;
+
+
+		
+if(!isNil "_objHouse")then{
+
+	{
+		_animPhase = getNumber(configFile >> "cfgVehicles" >> typeOf _x >> "AnimationSources" >> "Lights_1" >> "animPeriod");
+		
+		//test
+		
+		//axeDiagLog = format["HL:House Found: InitPhase: %3 | InPhase2:%4 | Phase:%1 for %2",_x animationPhase "Lights_1", _x,_animPhase,_animPhase2];
+		//publicVariable "axeDiagLog";
+				
+		if(_animPhase>0)then{//Only if has a window (Lights_1)
+			if(_x animationPhase "Lights_1" == 0)then{//If not lit
+				[_notLitHouses , _x] call BIS_fnc_arrayPush;
+			}else{//Already Lit - Do your thing.. later
+				[_litHouses , _x] call BIS_fnc_arrayPush;
+				_currLighting = _currLighting + 1;
+			};
+		_validHouses = _validHouses +1;
+		};
+		
+	} forEach _objHouse;
+	
+	_maxHouses = ((_validHouses/100)*_lightPcnt);
+
+	//axeDiagLog = format["HL:START(%5): Max Houses: %1 | Previous Houses: %2 | LIT HOUSES:%3 | Not Lit:%4",_maxHouses, _houseNum,count _litHouses,count _notLitHouses, name player];
+	//publicVariable "axeDiagLog";
+				
+	if(count _litHouses < _maxHouses)then{
+	_currLighting = count _litHouses;
+	
+		{	
+			if(_currLighting < _maxHouses)then{
+				
+				
+				if(_lightPcnt > floor (random 100))then{//Randomness required or first nearest houses to player get lit in a block - Needs to be based on range !
+				
+				//axeDiagLog = format["HL:Lighting New House: %3 Num:%1 Type: %4 for %2 | Dist:%5",_currLighting, name player,_x,typeOf _x,player distance _x];
+				//publicVariable "axeDiagLog";
+				
+				//_x enableSimulation false;//Attempt to stop Arma from broadcasting animationphase. DOESN'T WORK - House lights_1 animationphase is still broadcast regardless  - Using that as the basis for lights ! Removed as it may stop destruction of building.. (For Now)
+				_x animate ["Lights_1",1];
+				
+				//Randomly light second window(s)
+				if(42 > floor (random 100)) then{
+				//Only light if available otherwise animate 'attempt' may continue indefinitely..
+				_animPhase2 = getNumber(configFile >> "cfgVehicles" >> typeOf _x >> "AnimationSources" >> "Lights_2" >> "animPeriod");
+					if(_animPhase2>0)then{
+					_x animate ["Lights_2",1];
 					};
 				};
-			}else{//change brightness
-				if(player distance _x < _lpDist)then{
-					if((abs ([_pos, _objLightPoint] call BIS_fnc_distance2D))<_hsLPDist)then{
-					_litCount = _litCount +1;
-					//if(_debug)then{axeDiagLog = format["HL:EXISTS LP:%1 | _brtns:%2",_x,_brtns];publicVariable "axeDiagLog";};
-					_chnGCount = _chnGCount + 1;
-					_x setVariable ["brtns", _brtns, false];
-					//[_lmpCol,_brtns,_lmpCol,_objLightPoint] call axe_lightPoint;
-					_objLightPoint setLightColor _lmpCol;
-					_objLightPoint setLightBrightness _brtns;
-					_objLightPoint setLightAmbient _lmpCol;
+
+				_brtns = [_plyr,_x] call axe_lightBrightness;
+				while{true}do{sleep .1;if (_x animationPhase "Lights_1"==1) exitWith {};};
+				
+				//axeDiagLog = format["HL:NEW HOUSE LIT:%1",_x];
+				//publicVariable "axeDiagLog";
+				
+				_objLightPoint = nearestObject [_x, "#lightpoint"];
+				_pos = getPos _x;
+				_dir = getDir _x;
+					
+					if(_plyr distance _x < _lpRange)then{//If within create radius
+					[_lmpCol,_brtns,_lmpCol,getPos _x,_dir,[0,0,-1]] call axe_newLightPoint;
+					//_x setVariable ["axeHLight", 1, false];		
 					};
-				}else{
-				deleteVehicle _objLightPoint;
-				_x setVariable ["axeHLight", 0, false];
+					
+				_currLighting=_currLighting+1;
+			
 				};
 			};
-		};
-		//axeDiagLog = "-------------------------------------------";
-		_hsCount = _hsCount + 1;
-	} forEach _objHouse;
-	if(_debug)then{
-	//axeDiagLog = format["HL:FINISHED: Time:%1 | Total Houses:%2 | Lit Houses:%3",time - _hsTime,_hsCount,_litCount];
+
+		}forEach _notLitHouses;
+	
+	}else{
+	//axeDiagLog = format["House Limit Reached(%3): Max:%1 | Count:%2",_maxHouses,count _litHouses,name player];
 	//publicVariable "axeDiagLog";
 	};
+	
+	if(count _litHouses > 0 )then{
+		{
+			_objLightPoint = nearestObject [_x, "#lightpoint"];
+			_pos = getPos _x;
+			if((abs ([_pos, _objLightPoint] call BIS_fnc_distance2D))<_hsLPDist)then{//In House
+				
+				if(_plyr distance _x < _lpRange)then{//If within range and outside band
+				_brtns = [_plyr,_x] call axe_lightBrightness;
+				_objLightPoint enableSimulation false;//Attempt to stop Arma from broadcasting lightpoint, just reminding it here ! DO NOT USE ! Will stop light from being visible to player (At least upon creation) !
+				_objLightPoint setLightColor _lmpCol;
+				_objLightPoint setLightBrightness _brtns;
+				_objLightPoint setLightAmbient _lmpCol;
+				//_x setVariable ["axeHLight", 1, false];
+				//axeDiagLog = format["HL:Resetting brightness (%3) of house %1 for player %2 at %4m distance",_x,player,_brtns,_x distance player];
+				//publicVariable "axeDiagLog";
+				}else{//If outside create radius delete light that IS in house
+				
+				//axeDiagLog = format["HL:Deleteing old light %1 for %2 ",_objLightPoint,name player];
+				//publicVariable "axeDiagLog";
+				deleteVehicle _objLightPoint;//Clean up lightpoints as player leaves area.
+				
+				};
+			
+			}else{
+				if(_plyr distance _x < _lpRange)then{//If within create radius recreate lightpoint (after logging)
+				_brtns = [_plyr,_x] call axe_lightBrightness;
+				[_lmpCol,_brtns,_lmpCol,getPos _x,_dir,[0,0,-2.6]] call axe_newLightPoint;
+				//axeDiagLog = format["HL:Recreating light %1 for %2 ",_x,name player];
+				//publicVariable "axeDiagLog";
+				};
+			};
+			
+		}forEach _litHouses;
+	};
+	
+}else{
+_houseNum = 0;
 };
+//axeDiagLog = format["HL:EXIT: Max Houses%1", _maxHouses];
+//publicVariable "axeDiagLog";
+_houseNum

SQF/dayz_code/compile/local_lights_init.sqf

@@ -1,109 +1,153 @@
 /*
 	DayZ Epoch Lighting System - Light Init
-	Made for DayZ Epoch by axeman please ask permission to use/edit/distribute email gregory.andrew@gmail.com or vbawol@veteranbastards.com.
-	
-	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 :)
+	Made for DayZ Epoch by axeman please ask permission to use/edit/distribute email gregory.andrew@gmail.com.
+
 */
-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;
-_fnHr = _this select 1;
-_doHouse = _this select 2;
-_doTower = _this select 3;
-_ndGen = _this select 4;
-_rndLightsIn = _this select 5;
-_trgRng = _this select 6;
-_rngPlyr = _this select 7;
-_lmpCol = _this select 8;
-_genClass = _this select 9;
-_slpTime = _this select 10;
-_lpRange = _rngPlyr -20;
-_doLight = true;
-_nrGen = [];
-_genCount = 0;
-_hsRange = 250;
-_lightTrig = vehicle player;//Central point around which to run the lights
-call compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_lightFunctions.sqf";
-axeTowerLights = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\local_lights_tower.sqf";
-axeHouseLights = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\local_lights_house.sqf";
-//axeStreetLights = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\local_lights_street.sqf";
-axeDeleteLights = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\local_lights_off.sqf";
-waitUntil {getPos Player select 0 > 0};
+if(!isDedicated)then{
+	private ["_plyPos","_sunrise","_slpTime","_lpRange","_hsRange","_nrGen","_genCount","_rndLights","_genClass","_doHouse","_doTower","_doLight","_fnHr","_stHr","_plyr","_ndGen","_trgRng","_rngPlyr","_lightTrig","_lmpCol","_houseNum"];
 
-//Detect Dusk and Dawn
-_sunrise = call world_sunRise;
-if(_fnHr < 1)then{_fnHr =  _sunrise + 0.5;};
-if(_stHr < 1)then{_stHr =  (24 - _sunrise) - 0.5;};
+	//Start / Stop Time
+	_doHouse = true;
+	_doTower = true;
+	_noStreetLights = true;
+	_ndGen = _this select 0;
+	_rndLights = _this select 1;//Default 12
+	if(_rndLights<1)exitWith{};//EXIT
+	_trgRng = 280;//Distance from Gen
+	_rngPlyr = 480;//Distance from Player
+	_lmpCol = [0.698, 0.556, 0.419];//Light colour
+	_genClass = "Generator_DZ";
+	_slpTime = 6;
+	_doLight = true;
+	_nrGen = [];
+	_genCount = 0;
+	_hsRange = 250;//set var
+	_houseNum = 0;//Monitor house numbers in range.. Pass around and reduce range if too many and/or client lag (NOT server / client lag)
+	_lightTrig = vehicle player;//Central point around which to run the lights
+	_plyPos = [0,0,0];
+	call compile preprocessFileLineNumbers "lights\fn_lightFunctions.sqf";
+	axeTowerLights = compile preprocessFileLineNumbers "lights\local_lights_tower.sqf";
+	axeHouseLights = compile preprocessFileLineNumbers "lights\local_lights_house.sqf";
 
-//axeDiagLog = format["IL:LIGHTS STARTED: _stHr:%1 | _fnHr:%2 | time:%3 | for:%4",_stHr,_fnHr, dayTime, vehicle player];
-//publicVariable "axeDiagLog";
-			
-while {alive player}do{
-	if(daytime<_fnHr||daytime>_stHr)then{
-	_plyr = vehicle player;
-	_rndLightsOut = _rndLightsIn;
-	_nrGen = nearestObjects [_plyr, [_genClass], _rngPlyr];
-	_genCount = count _nrGen;
-	
-	//Set Generator to use and Assign trigger object
-	_lightTrig = _plyr;
-	if(_genCount>0)then{
-		{
-			if(_x getVariable["GeneratorRunning",false])then{
-			_lightTrig = _x;
-			};
-		}forEach _nrGen;
-	};
-	
-	if(!_ndGen)then{_lightTrig = _plyr;};
-	
-	//Nearby Generator ?
-	if(_ndGen && _genCount<1)then{_doLight = false;}else{_doLight=true;};
-	
-	//Generator not required !
-	if(!_ndGen)then{_doLight = true;};
-	
-	//Choose range, player or generator
-	if(_ndGen)then{_hsRange = _trgRng;}else{_hsRange = _rngPlyr;};
-	
-	//100% chance of lights with nearby generator - ToDo, make this slightly lower.
-	if(_genCount>0&&(_lightTrig getVariable["GeneratorRunning",false]))then{
-	_rndLightsOut = 100;
-	};
-	
-	//Do streetlight stuff
-	[_trgRng,player,_rndLightsOut] call axe_returnStreetLights;	
-	
-	if(_ndGen && !(_lightTrig getVariable["GeneratorRunning",false]))then{_doLight = false;};//Final check - Not run if nearest gen isn't running
-	
-	//axeDiagLog = format["IL:RUNNING: _doLight:%1 | _ndGen:%2 | _lightTrig:%3 | _rndLightsOut:%4",_doLight,_ndGen,_lightTrig,_rndLightsOut];
+	waitUntil {getPos Player select 0 > 0};
+
+	//Detect Dusk and Dawn
+	_sunrise = call world_sunRise;
+	_fnHr =  _sunrise + 0.5;
+	_stHr =  (24 - _sunrise) - 0.5;
+	if(_rndLights>75)then{_rndLights=75;};//Max allowed
+	//axeDiagLog = format["IL:LIGHTS STARTED: _stHr:%1 | _fnHr:%2 | time:%3 | for:%4",_stHr,_fnHr, dayTime, vehicle player];
 	//publicVariable "axeDiagLog";
+				
+	while {alive player}do{
+		if(daytime<_fnHr||daytime>_stHr)then{
+		_plyr = vehicle player;
+			//if(_plyPos distance _plyr > 6)then{//Only run if player moves
+			_lightTrig = _plyr;
 			
-			if(_doLight)then{
-				//if(speed _plyr > 0 )then{
-				if(_doHouse)then{
-				//axeDiagLog = format["IL:RUNNING HOUSE: _doLight:%1 | _ndGen:%2 | _lightTrig:%3 | _rndLightsOut:%4",_doLight,_ndGen,_lightTrig,_rndLightsOut];
-				//publicVariable "axeDiagLog";
-				[_hsRange,_lightTrig,_rndLightsOut,_lmpCol,_lpRange] call axeHouseLights;
-				};
-				//};
-				if(_doTower)then{
-				//axeDiagLog = format["IL:RUNNING TOWER: _doLight:%1 | _ndGen:%2 | _lightTrig:%3 | _rndLightsOut:%4",_doLight,_ndGen,_lightTrig,_rndLightsOut];
-				//publicVariable "axeDiagLog";
-				[_rngPlyr,_lightTrig,_rndLightsOut] call axeTowerLights;
+			if(_ndGen)then{
+			_nrGen = nearestObjects [_plyr, [_genClass], _rngPlyr];
+			_genCount = count _nrGen;
+			
+			//Set Generator to use and Assign trigger object
+			
+				if(_genCount>0)then{
+					{
+						if(_x getVariable["GeneratorRunning",false])exitWith{
+						_lightTrig = _x;
+						};
+					}forEach _nrGen;
 				};
 			};
 			
-			//Decide how and if to turn lights off
-			if(_ndGen && !(_lightTrig getVariable["GeneratorRunning",false]))then{
-			[_rngPlyr,_lightTrig,false,_genCount,_lpRange] call axeDeleteLights;
+			//if(!_ndGen)then{_lightTrig = _plyr;};
+			
+			//Nearby Generator ?
+			if(_ndGen && _genCount<1)then{_doLight = false;}else{_doLight=true;};
+			
+			//Generator not required !
+			if(!_ndGen)then{_doLight = true;};
+			
+			//Choose range, player or generator
+			if(_ndGen)then{_hsRange = _trgRng;}else{_hsRange = _rngPlyr;};
+			
+			//100% chance of lights with nearby generator - ToDo, make this slightly lower.
+			if(_ndGen && _genCount>0&&(_lightTrig getVariable["GeneratorRunning",false]))then{
+			_rndLights = 75;
 			};
 			
-			if(_rndLightsOut<random 100)then{
-			[_rngPlyr,_lightTrig,true,_genCount,_lpRange] call axeDeleteLights;
-			};
-	};	
-sleep _slpTime;
+			if(_ndGen && !(_lightTrig getVariable["GeneratorRunning",false]))then{_doLight = false;};//Final check - Not run if nearest gen isn't running
+			
+			//axeDiagLog = format["IL:RUNNING: _doLight:%1 | _ndGen:%2 | _lightTrig:%3 | _rndLights:%4",_doLight,_ndGen,_lightTrig,_rndLights];
+			//publicVariable "axeDiagLog";
+					
+					if(_doLight)then{
+						//if(speed _plyr > 0 )then{
+						if(_doHouse)then{
+						//axeDiagLog = format["IL:RUNNING HOUSE: _doLight:%1 | _ndGen:%2 | _lightTrig:%3 | _rndLights:%4",_doLight,_ndGen,_lightTrig,_rndLights];
+						//publicVariable "axeDiagLog";
+						_houseNum = [_hsRange,_lightTrig,_rndLights,_lmpCol,_plyr,_houseNum] call axeHouseLights;
+						};
+						//};
+						if(_doTower)then{
+						//axeDiagLog = format["IL:RUNNING TOWER: _doLight:%1 | _ndGen:%2 | _lightTrig:%3 | _rndLights:%4",_doLight,_ndGen,_lightTrig,_rndLights];
+						//publicVariable "axeDiagLog";
+						[_rngPlyr,_lightTrig,_rndLights] call axeTowerLights;
+						};
+						
+						if(_noStreetLights)then{
+						[player,_rngPlyr] call axe_NoStreetLights
+						};
+					};
+			//};
+		_plyPos = getPos player;
+		};	
+	sleep _slpTime;
+	};
 };
+//Attempt a server cleanup - Not detectable..
+/*
+if(isServer)then{
+
+	server_spawnCleanLightpoints = {
+		private ["_pos","_delQtyLights","_qty","_missonLights","_nearby","_missionObjs"];
+		if(!isNil "DZE_DYN_cleanLightpoints") exitWith { };
+		DZE_DYN_cleanLightpoints = true;
+		_missonLights = entities "#lightpoint";
+		_missionObjs =  allMissionObjects "#lightpoint";
+		diag_log (format["CLEANUP: Attempting Cleanup of Lights out of %1 or %2",count _missonLights, count _missionObjs]);
+		_delQtyLights = 0;
+		{
+			if (local _x) then {
+				_x call dayz_perform_purge;
+				sleep 0.025;
+				_delQtyLights = _delQtyLights + 1;
+			} else {
+				if (!alive _x) then {
+					_pos = getPosATL _x;
+					if (count _pos > 0) then {
+						_nearby = {(isPlayer _x) and (alive _x)} count (_pos nearEntities [["CAManBase","AllVehicles"], 420]);//Use calculated range here.
+						if (_nearby==0) then {
+							_x call dayz_perform_purge;
+							sleep 0.025;
+							_delQtyLights = _delQtyLights + 1;
+						};
+					};
+				};
+			};
+			sleep 0.001;
+		} forEach _missonLights;
+		if (_delQtyLights > 0) then {
+			_qty = count _missonLights;
+			diag_log (format["CLEANUP: Deleted %1 Lights out of %2",_delQtyLights,_qty]);
+		};
+		DZE_DYN_cleanLightpoints = nil;
+	};
+	
+	while{true}do{
+	[] spawn server_spawnCleanLightpoints;
+	sleep 30;
+	};
+};
+*/

SQF/dayz_code/compile/local_lights_tower.sqf

@@ -1,6 +1,6 @@
 /*
 	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.
+	Made for DayZ Epoch by axeman please ask permission to use/edit/distribute email gregory.andrew@gmail.com.
 */
 private ["_nrTowers","_nrstTrig","_lCol","_lbrt","_lamb","_twrCl"]; 
 _nrstTrig = _this select 1;
@@ -8,12 +8,10 @@ _lCol = [1, 0.88, 0.73];
 _lbrt = 0.04;
 _lamb = [1, 0.88, 0.73]; 
 _twrCl = "Land_Ind_IlluminantTower";
-_nrTowers = nearestObjects [_nrstTrig, [_twrCl], 1000];
+_nrTowers = nearestObjects [_nrstTrig, [_twrCl], 600];
 if(count _nrTowers >0)then{
 	{
 		if((_x getVariable ["axeTLight", 0])<1)then{
-		//axeDiagLog = format["TL: FOUND:%1",_x];
-		//publicVariable "axeDiagLog";
 		[_lCol,_lbrt,_lamb,[_x],[true]] call axe_towerLight;	
 		_x setVariable ["axeTLight", 1, false];
 		};	

SQF/dayz_code/compile/object_removeNet.sqf

@@ -3,7 +3,7 @@ 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"], 3];
+_nearNets = nearestObjects [player, ["DesertLargeCamoNet","ForestCamoNet_DZ","DesertLargeCamoNet_DZ","ForestLargeCamoNet_DZ"], 5];
 _nearNet = _nearNets select 0;
 
 if (!isNull _nearNet and _canDo) then {

SQF/dayz_code/compile/player_death.sqf

@@ -113,16 +113,11 @@ if (count _array > 0) then {
 };
 
 terminate dayz_musicH;
-terminate dayz_lootCheck;
 terminate dayz_slowCheck;
 terminate dayz_animalCheck;
 terminate dayz_monitor1;
 terminate dayz_medicalH;
 terminate dayz_gui;
-terminate dayz_zedCheck;
-terminate dayz_locationCheck;
-terminate dayz_combatCheck;
-terminate dayz_friendliesCheck;
 
 //Reset (just in case)
 //deleteVehicle dayz_playerTrigger;

SQF/dayz_code/compile/player_packTent.sqf

@@ -63,10 +63,12 @@ if(!isNull _obj and alive _obj) then {
 	_backpacks = 	getBackpackCargo _obj;
 
 	deleteVehicle _obj;
-	PVDZE_obj_Delete = [_objectID,_objectUID,_activatingPlayer];
-	publicVariableServer "PVDZE_obj_Delete";
+	
 	if (isServer) then {
 		PVDZE_obj_Delete call server_deleteObj;
+	} else {
+		PVDZE_obj_Delete = [_objectID,_objectUID,_activatingPlayer];
+		publicVariableServer "PVDZE_obj_Delete";
 	};
 	
 	//Add weapons
@@ -102,4 +104,4 @@ if(!isNull _obj and alive _obj) then {
 };
 
 s_player_packtent = -1;
-DZE_ActionInProgress = false;
+DZE_ActionInProgress = false;

SQF/dayz_code/compile/player_traderMenuHive.sqf

@@ -28,13 +28,18 @@ TraderDialogLoadItemList = {
 
 	lbAdd [TraderDialogItemList, "Loading items..."];
 
-	PVDZE_plr_TradeMenuResult = call compile format["tcacheBuy_%1;",_trader_id];
+	//PVDZE_plr_TradeMenuResult = call compile format["tcacheBuy_%1;",_trader_id];
+	PVDZE_plr_TradeMenuResult = missionNamespace getVariable (format["tcacheBuy_%1;",_trader_id]);
+
 	//[[5969,["Ikarus",2],10003,[5,"ItemGoldBar",1],[3,"ItemGoldBar",1],0,588,"trade_any_vehicle"],[5970,["Ikarus_TK_CIV_EP1",2],10006,[5,"ItemGoldBar",1],[3,"ItemGoldBar",1],0,588,"trade_any_vehicle"],[5971,["S1203_TK_CIV_EP1",2],10004,[4,"ItemGoldBar",1],[2,"ItemGoldBar",1],0,588,"trade_any_vehicle"],[5972,["S1203_ambulance_EP1",2],10002,[4,"ItemGoldBar",1],[2,"ItemGoldBar",1],0,588,"trade_any_vehicle"]]
 
 	if(isNil "PVDZE_plr_TradeMenuResult") then {
 		PVDZE_plr_TradeMenu = [_activatingPlayer,_trader_id];
 		publicVariableServer  "PVDZE_plr_TradeMenu";
 		waitUntil {!isNil "PVDZE_plr_TradeMenuResult"};
+		if (count PVDZE_plr_TradeMenuResult > 0) then {
+			missionNamespace setVariable [(format["tcacheBuy_%1;",_trader_id]),PVDZE_plr_TradeMenuResult];
+		};
 	};
 
 	lbClear TraderDialogItemList;

SQF/dayz_code/config.cpp

@@ -41,7 +41,7 @@ class CfgMods
 		hidePicture = 0;
 		hideName = 0;
 		action = "http://www.dayzepoch.com";
-		version = "1.0.4.1";
+		version = "1.0.4.2";
 		hiveVersion = 0.96; //0.93
 	};
 };

SQF/dayz_code/init/variables.sqf

@@ -212,6 +212,7 @@ dayz_resetSelfActions = {
 	s_player_removeflare = 	-1;
 	s_player_painkiller =	-1;
 	s_player_studybody = 	-1;
+	s_player_tamedog =		-1;
 	s_player_madsci_crtl =	-1;
 	s_player_parts_crtl =	-1;
 	s_build_Sandbag1_DZ = 	-1;
@@ -248,6 +249,7 @@ dayz_resetSelfActions = {
 	s_player_maintain_area_preview = -1;
 	s_player_heli_lift = -1;
 	s_player_heli_detach = -1;
+	s_player_lockUnlock_crtl = -1;
 };
 call dayz_resetSelfActions;
 
@@ -534,7 +536,7 @@ if(isNil "dayz_zedsAttackVehicles") then {
 dayz_updateObjects = ["Plane","Car", "Helicopter", "Motorcycle", "Ship", "TentStorage", "VaultStorage","LockboxStorage","OutHouse_DZ","Wooden_shed_DZ","WoodShack_DZ","StorageShed_DZ","GunRack_DZ","WoodCrate_DZ","Scaffolding_DZ"];
 dayz_disallowedVault = ["TentStorage", "BuiltItems","ModularItems","DZE_Base_Object"];
 dayz_reveal = ["AllVehicles","WeaponHolder","Land_A_tent","BuiltItems","ModularItems","DZE_Base_Object"];
-dayz_allowedObjects = ["TentStorage","TentStorageDomed","TentStorageDomed2", "VaultStorageLocked", "Hedgehog_DZ", "Sandbag1_DZ","BagFenceRound_DZ","TrapBear","Fort_RazorWire","WoodGate_DZ","Land_HBarrier1_DZ","Land_HBarrier3_DZ","Land_HBarrier5_DZ","Fence_corrugated_DZ","M240Nest_DZ","CanvasHut_DZ","ParkBench_DZ","MetalGate_DZ","OutHouse_DZ","Wooden_shed_DZ","WoodShack_DZ","StorageShed_DZ","Plastic_Pole_EP1_DZ","Generator_DZ","StickFence_DZ","LightPole_DZ","FuelPump_DZ","DesertCamoNet_DZ","ForestCamoNet_DZ","DesertLargeCamoNet_DZ","ForestLargeCamoNet_DZ","SandNest_DZ","DeerStand_DZ","MetalPanel_DZ","WorkBench_DZ","WoodFloor_DZ","WoodLargeWall_DZ","WoodLargeWallDoor_DZ","WoodLargeWallWin_DZ","WoodSmallWall_DZ","WoodSmallWallWin_DZ","WoodSmallWallDoor_DZ","LockboxStorageLocked","WoodFloorHalf_DZ","WoodFloorQuarter_DZ","WoodStairs_DZ","WoodStairsSans_DZ","WoodSmallWallThird_DZ","WoodLadder_DZ","Land_DZE_GarageWoodDoor","Land_DZE_LargeWoodDoor","Land_DZE_WoodDoor","Land_DZE_GarageWoodDoorLocked","Land_DZE_LargeWoodDoorLocked","Land_DZE_WoodDoorLocked","CinderWallHalf_DZ","CinderWall_DZ","CinderWallDoorway_DZ","CinderWallDoor_DZ","CinderWallDoorLocked_DZ","CinderWallSmallDoorway_DZ","CinderWallDoorSmall_DZ","CinderWallDoorSmallLocked_DZ","MetalFloor_DZ","WoodRamp_DZ","GunRack_DZ","FireBarrel_DZ","WoodCrate_DZ","Scaffolding_DZ"];
+dayz_allowedObjects = ["TentStorage","TentStorageDomed","TentStorageDomed2", "VaultStorageLocked", "Hedgehog_DZ", "Sandbag1_DZ","BagFenceRound_DZ","TrapBear","Fort_RazorWire","WoodGate_DZ","Land_HBarrier1_DZ","Land_HBarrier3_DZ","Land_HBarrier5_DZ","Fence_corrugated_DZ","M240Nest_DZ","CanvasHut_DZ","ParkBench_DZ","MetalGate_DZ","OutHouse_DZ","Wooden_shed_DZ","WoodShack_DZ","StorageShed_DZ","Plastic_Pole_EP1_DZ","Generator_DZ","StickFence_DZ","LightPole_DZ","FuelPump_DZ","DesertCamoNet_DZ","ForestCamoNet_DZ","DesertLargeCamoNet_DZ","ForestLargeCamoNet_DZ","SandNest_DZ","DeerStand_DZ","MetalPanel_DZ","WorkBench_DZ","WoodFloor_DZ","WoodLargeWall_DZ","WoodLargeWallDoor_DZ","WoodLargeWallWin_DZ","WoodSmallWall_DZ","WoodSmallWallWin_DZ","WoodSmallWallDoor_DZ","LockboxStorageLocked","WoodFloorHalf_DZ","WoodFloorQuarter_DZ","WoodStairs_DZ","WoodStairsSans_DZ","WoodStairsRails_DZ","WoodSmallWallThird_DZ","WoodLadder_DZ","Land_DZE_GarageWoodDoor","Land_DZE_LargeWoodDoor","Land_DZE_WoodDoor","Land_DZE_GarageWoodDoorLocked","Land_DZE_LargeWoodDoorLocked","Land_DZE_WoodDoorLocked","CinderWallHalf_DZ","CinderWall_DZ","CinderWallDoorway_DZ","CinderWallDoor_DZ","CinderWallDoorLocked_DZ","CinderWallSmallDoorway_DZ","CinderWallDoorSmall_DZ","CinderWallDoorSmallLocked_DZ","MetalFloor_DZ","WoodRamp_DZ","GunRack_DZ","FireBarrel_DZ","WoodCrate_DZ","Scaffolding_DZ"];
 
 DZE_LockableStorage = ["VaultStorage","VaultStorageLocked","LockboxStorageLocked","LockboxStorage"];
 DZE_LockedStorage = ["VaultStorageLocked","LockboxStorageLocked"];
@@ -709,6 +711,7 @@ if(!isDedicated) then {
 	DZE_FreshSpawn = false;
 
 	DZE_myHaloVehicle = objNull;
+	dayz_myLiftVehicle = objNull;
 
 	DZE_Friends = [];
 

SQF/dayz_code/medical/load_wounded.sqf

@@ -1,53 +0,0 @@
-// Load_wounded.sqf
-// OCTOBER 2010 - norrin
-
-private ["_wounded","_vcl"];
-
-_wounded 	= _this select 0;
-
-//if (!local _wounded) exitWith {};
-
-r_action = false;
-
-sleep 1;
-_vcl = _wounded getVariable "NORRN_loadVcl";
-_wounded setVariable ["NORRN_unit_dragged", true, true];
-
-_wounded assignAsCargo _vcl; 
-_wounded moveInCargo _vcl;
-sleep 1;
-//["norrnRALW",_wounded] call broadcastRpcCallAll;
-	norrnRALW = [_wounded];
-	publicVariable "norrnRALW";
-
-if (local _wounded) then 
-{	
-	waitUntil {!(_wounded getVariable "NORRN_unconscious")|| !alive _wounded || vehicle _wounded == _wounded || (assignedVehicleRole _wounded) select 0 != "Cargo"};
-	
-	if (vehicle _wounded == _wounded || (assignedVehicleRole _wounded) select 0 != "Cargo") exitWith 
-	{
-		if (_wounded getVariable "NORRN_AIunconscious") then
-		{	
-			if (vehicle _wounded != _wounded) then
-			{
-				unassignVehicle _wounded;
-				sleep 0.05;
-				_wounded action ["EJECT", _vcl];
-				sleep 1;
-			};
-			//DayZ CE: PublicVariables are removed in DayZ CE -> Could we also do here - Commit by Skaronator
-			norrinRAlie = _wounded;
-			publicVariable "norrinRAlie";
-			_wounded switchMove "ainjppnemstpsnonwrfldnon";
-			_wounded setVariable ["NORRN_unit_dragged", false, true];
-			sleep 1;
-		};
-	};
-	
-	if (vehicle _wounded != _wounded && alive _wounded) then
-	{	
-		_wounded  playMove "BasicDriver";
-	};
-};
-sleep 0.01;
-

SQF/dayz_code/system/ca/functions/fn_initCounter.sqf

@@ -0,0 +1,45 @@
+private ["_mode", "_activationCount", "_maxCount", "_timesActivated", "_keyString"];
+_mode = _this;
+_activationCount = 4;
+_maxCount = 25;
+_timesActivated = 1;
+_keyString = "BIS_IAmBeingNaughty";
+
+for "_i" from 1 to (_maxCount - 1) do 
+{
+	if (isKeyActive (_keyString + (str _i))) then 
+	{
+		_timesActivated = _timesActivated + 1
+	};
+};
+
+if (_mode) then 
+{
+	if (_timesActivated <= _maxCount) then 
+	{
+		activateKey (_keyString + (str _timesActivated));
+	};
+
+	if (_timesActivated >= _activationCount) then 
+	{
+		private ["_handle"];
+		_handle = [_timesActivated] execVM "ca\modules\functions\systems\fn_enableSystem.sqf";
+		
+		if ((random 5) < 1) then 
+		{
+			_handle = [_timesActivated] execVM "ca\modules\functions\systems\fn_enableAnotherSystem.sqf";
+		};
+	};
+} 
+else 
+{
+	if ((configName (configFile >> "CfgPatches" >> "CA_E")) != "") then 
+	{
+		for "_i" from 1 to (_timesActivated - 1) do 
+		{
+			call (compile "deactivateKey (_keyString + (str _i))");
+		};
+	};
+};
+
+true

SQF/dayz_code/system/ca/functions/init.sqf

@@ -92,7 +92,12 @@ for "_t" from 0 to 2 do {
 private ["_test", "_test2"];
 _test = (_this select 0) setPos (position (_this select 0)); if (isnil "_test") then {_test = false};
 _test2 = (_this select 0) playMove ""; if (isnil "_test2") then {_test2 = false};
-(_test || _test2) call (compile (preprocessFileLineNumbers "ca\modules\functions\misc\fn_initCounter.sqf"));
+_testvar = getText (configFile >> "CfgMissions" >> "Missions" >> "SP_BearRising" >> "directory");
+if (_testvar != "") then {
+	(_test || _test2) call (compile (preprocessFileLineNumbers "\z\addons\dayz_code\system\ca\functions\fn_initCounter.sqf"));
+} else { // Player has A2 Free
+	if (_test || _test2) then {0 call (compile (preprocessFileLineNumbers "ca\modules\functions\misc\fn_initCounter.sqf"))};
+};
 
 //--------------------------------------------------------------------------------------------------------
 //--- INIT COMPLETE --------------------------------------------------------------------------------------

SQF/dayz_code/system/player_monitor.fsm

@@ -47,7 +47,7 @@ item42[] = {"New_Character",4,218,-325.000000,400.000000,-225.000000,450.000000,
 item43[] = {"Gender_Selection",2,250,-575.000000,400.000000,-475.000000,450.000000,0.000000,"Gender Selection" \n "Dialog"};
 item44[] = {"Selected",4,218,-575.000000,475.000000,-475.000000,525.000000,0.000000,"Selected"};
 item45[] = {"Process",2,250,-575.000000,550.000000,-475.000000,600.000000,0.000000,"Process"};
-item46[] = {"no_PlayerID",4,218,50.000000,-100.000000,150.000000,-50.000000,2.000000,"no PlayerID"};
+item46[] = {"no_PlayerID",4,4314,50.000000,-100.000000,150.000000,-50.000000,2.000000,"no PlayerID"};
 item47[] = {"ERROR__No_Player_1",2,250,175.000000,-100.000000,275.000000,-50.000000,0.000000,"ERROR:" \n "No PlayerID"};
 item48[] = {"Too_Long",4,218,300.000000,-100.000000,400.000000,-50.000000,0.000000,"Too" \n "Long"};
 item49[] = {"Stream",2,250,-75.000000,900.000000,25.000000,950.000000,0.000000,"Stream"};
@@ -169,8 +169,8 @@ link85[] = {75,57};
 link86[] = {76,78};
 link87[] = {77,76};
 link88[] = {78,57};
-globals[] = {25.000000,1,0,0,0,640,480,1,143,6316128,1,-158.844666,996.923462,645.150146,-280.887787,1137,911,1};
-window[] = {2,-1,-1,-1,-1,908,150,1428,150,3,1155};
+globals[] = {25.000000,1,0,0,0,640,480,1,143,6316128,1,-400.773193,754.994873,294.455383,-631.582458,1137,911,1};
+window[] = {2,-1,-1,-1,-1,958,200,1478,200,3,1155};
 *//*%FSM</HEAD>*/
 class FSM
 {
@@ -1341,7 +1341,7 @@ class FSM
        "_myEpoch = getText(configFile >> ""CfgPatches"" >> ""dayz_epoch"" >> ""dayzVersion"");" \n
        "_myEpochB = getText(configFile >> ""CfgPatches"" >> ""dayz_epoch_b"" >> ""dayzVersion"");" \n
        "_myEpochSfx = getText(configFile >> ""CfgPatches"" >> ""dayz_sfx"" >> ""dayzVersion"");" \n
-       "" \n
+       "_myEpochDayZ = getText(configFile >> ""CfgPatches"" >> ""dayz"" >> ""dayzVersion"");" \n
        "" \n
        "player enableSimulation true;"/*%FSM</STATEINIT""">*/;
       precondition = /*%FSM<STATEPRECONDITION""">*/""/*%FSM</STATEPRECONDITION""">*/;
@@ -1353,7 +1353,7 @@ class FSM
           priority = 2.000000;
           to="ERROR__No_Player_1";
           precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
-          condition=/*%FSM<CONDITION""">*/"(_myEpochAnim != ""1.0.4"") || (_myEpoch != ""1.0.4"") || (_myEpochB != ""1.0.4.1"") || (_myEpochSfx != ""1.0.4.1"")"/*%FSM</CONDITION""">*/;
+          condition=/*%FSM<CONDITION""">*/"(_myEpochAnim != ""1.0.4.2"") || (_myEpoch != ""1.0.4.2"") || (_myEpochB != ""1.0.4.2"") || (_myEpochSfx != ""1.0.4.2"") || (_myEpochDayZ != ""1.0.4.2"")"/*%FSM</CONDITION""">*/;
           action=/*%FSM<ACTION""">*/""/*%FSM</ACTION""">*/;
         };
         /*%FSM</LINK>*/

SQF/dayz_code/system/player_spawn_2.sqf

@@ -1,4 +1,4 @@
-private ["_refObj","_size","_vel","_speed","_hunger","_thirst","_result","_factor","_mylastPos","_distance","_lastTemp","_rnd","_listTalk","_id","_messTimer","_combatdisplay","_combatcontrol","_timeleft","_inVehicle","_lastUpdate","_foodVal","_thirstVal","_lowBlood","_startcombattimer","_combattimeout","_isPZombie","_outsideMap","_radsound","_bloodloss","_radTimer","_currentBlood","_wpnType"];
+private ["_refObj","_size","_vel","_speed","_hunger","_thirst","_result","_factor","_distance","_lastTemp","_rnd","_listTalk","_id","_messTimer","_combatdisplay","_combatcontrol","_timeleft","_inVehicle","_lastUpdate","_foodVal","_thirstVal","_lowBlood","_startcombattimer","_combattimeout","_isPZombie","_outsideMap","_radsound","_bloodloss","_radTimer","_currentBlood","_wpnType"];
 disableSerialization;
 
 _messTimer = 0;
@@ -73,7 +73,7 @@ while {true} do {
 	if (!r_player_infected and !_isPZombie) then {
 		//Infectionriskstart
 		if (dayz_temperatur < ((80 / 100) * (dayz_temperaturnormal - dayz_temperaturmin) + dayz_temperaturmin)) then {	//TeeChange
-			_listTalk = _mylastPos nearEntities ["CAManBase",8];
+			_listTalk = (getPosATL _refObj) nearEntities ["CAManBase",8];
 			{
 				if (_x getVariable["USEC_infected",false]) then {
 					_rnd = (random 1) * (((dayz_temperaturnormal - dayz_temperatur) * (100 /(dayz_temperaturnormal - dayz_temperaturmin)))/ 50);	//TeeChange

SQF/dayz_epoch_b/CfgLootPos.hpp

@@ -71,7 +71,20 @@ class Land_A_GeneralStore_01: Supermarket {
 };
 class Land_Farm_Cowshed_a: Farm {
 	lootPos[] = {{-1.06836,-5.92163,-3.08763},{1.69043,-4.91089,-3.08763},{5.8833,-6.15381,-3.08763},{8.83984,-5.60278,-3.08763},{9.74023,-2.48657,-3.08763},{2.88428,-2.34546,-3.08763},{7.88037,2.94214,-3.08763}};
+	lootPosZombie[] = {{-7.52783,0.260742,-2.21265},{4.53271,-5.17969,-2.21265}};
+	lootPosSmall[] = {{-6.74829,-2.98145,-3.03766},{1.34399,3.79199,-3.03766}};
 };
+class Land_Farm_Cowshed_b: Farm {
+	lootPos[] = {{-3.26782,2.71875,-3.0311},{5.41699,-2.57813,-3.04111}};
+	lootPosZombie[] = {{-2.55957,0.0683594,-2.2261}};
+	lootPosSmall[] = {{3.46802,3.36621,-3.05112},{-9.98511,-3.2793,-3.09109}};
+};
+class Land_Farm_Cowshed_c: Farm {
+	lootPos[] = {{0.625,-2.61133,-3.06583}};
+	lootPosZombie[] = {{-2.09741,0.564453,-2.25082}};
+	lootPosSmall[] = {{-2.82446,3.18457,-3.11581}};
+};
+
 class Land_stodola_open: Farm {
 	lootPos[] = {{-3.77881,6.2478,-4.11348},{1.59106,6.31494,-4.10928},{-3.94727,-1.95605,-4.15359},{-0.440918,-3.91187,-4.1938}};
 	lootPosZombie[] = {{1.66333,4.70776,-3.24809},{1.57202,-6.3313,-3.23413}};
@@ -1089,6 +1102,34 @@ class Land_MBG_Shanty_BIG: Residential
 		{ 23.2319,11.6201,27.9672 },
 		{ -33.3779,-11.3564,5.81198 }};
 };
+class land_mbg_apartments_big_04: Office {
+	lootPos[] = {{10.1953,-2.47656,-3.19898},{3.14453,-0.197266,-3.19898},{0.949219,5.58789,5.94502},{-0.888672,2.47461,2.69382},{3.99414,-0.273438,2.89702},{10.7344,-0.351563,2.89702},{-10.4961,-5.46484,2.89702},{-3.25391,0.669922,2.89702},{10.6816,-2.26367,-0.15098},{-3.48828,0.31543,-0.15098},{-2.97461,-2.35547,-0.15098}};
+	lootPosZombie[] = {{-0.0898438,4.67773,-7.08873},{0.890625,-5.13965,-6.90238}};
+	lootPosSmall[] = {{4.52734,1.46289,-3.19898},{2.90234,5.90918,2.89702},{5.46875,-0.703125,2.89702},{-4.46875,-0.686523,2.89702},{5.17383,-1.80566,-0.15098},{-7.44531,5.68359,-0.15098}};
+};
+class land_mbg_killhouse_4: Residential {
+	lootPos[] = {{7.22266,-4.10205,-3.84318},{-2.04883,0.195313,-3.84318},{-6.33398,2.08691,-3.84318},{3.6582,0.32666,-3.84318},{7.24805,6.55469,-3.84318},{6.74023,2.40967,-0.543176},{-1.83203,2.08301,-0.543176},{6.85742,0.0131836,-0.543176},{-1.89258,-0.352051,-0.543176}};
+	lootPosZombie[] = {{0.597656,-6.93311,-3.62662},{-8.15625,1.8877,-3.62662}};
+	lootPosSmall[] = {{2.41992,-4.59082,-3.84318},{-1.61133,-4.5249,-3.84318},{2.61719,3.53076,-3.84318},{7.63867,6.79102,-0.543176},{2.54883,6.95605,-0.543176},{-1.70898,6.92188,-0.543176},{2.70313,-1.13672,-0.543176},{-6.58008,-4.49268,-0.543176}};
+};
+class land_mbg_ger_estate_2: Office {
+	lootPos[] = {{-0.847656,-5.23291,-2.13187},{-0.615234,3.95996,-1.55187},{8.30859,0.642578,-2.02187},{7.60547,6.6792,-2.13187},{6.38867,-5.31396,-2.13187},{-4.74023,3.71582,-2.13187}};
+	lootPosZombie[] = {{2.12695,-8.60791,-1.5208},{1.33984,9.18945,-1.25071}};
+	lootPosSmall[] = {{-6.3125,-6.48145,-1.43187},{-4.81445,-2.0293,-1.43187},{-3.47852,4.58789,-2.13187},{0.107422,3.45947,-1.55187},{4.23438,-1.42188,-1.83187},{4.97461,1.09229,-1.30187},{6.53711,-2.07227,-1.29187},{6.35547,-4.70117,-1.65187},{-7.55273,3.99268,-1.65187}};
+};
+class land_mbg_ger_rhus_1: Residential {
+	lootChance = 0.3;
+	lootPos[] = {{-1.85156,3.59961,-0.0356913},{3.04688,1.85254,-0.465693},{3.36328,0.257813,-0.465693},{-2.74023,-3.26465,-0.465693},{1.23828,-4.19531,-2.38569},{1.56055,2.37012,-2.86569},{-10.4941,3.8916,-0.454963},{-9.91797,-4.14453,-0.454963},{-5.84375,0.373047,-0.174962},{-4.50977,0.0859375,-3.35496}};
+	lootPosZombie[] = {{-2.03125,6.38867,-2.93606},{-8.33398,-5.82813,-2.73209}};
+	lootPosSmall[] = {{-1.4707,4.39844,-0.0356913},{1.56055,0.314453,-0.185692},{2.53516,0.682617,-3.25569},{3.62695,0.696289,-2.50569},{-3.34375,3.22852,-2.43569},{-3.32031,2.38086,-1.95569},{-4.81055,1.39453,-0.454963},{-6.64844,-4.29102,-0.454963},{-4.32617,-1.61035,-2.51496},{-6.30664,-4.11328,-2.37496}};
+};
+class land_mbg_garage_single_b: Industrial {
+	lootPos[] = {{2.54492,3.97607,-1.03899},{4.13672,-0.0625,-1.03899}};
+	lootPosZombie[] = {{2.96094,6.3374,-0.133815}};
+	lootPosSmall[] = {{4.50586,2.56982,-1.03899}};
+};
+
+
 class Land_dum_istan3_hromada2: Residential
 {
 	lootPos[] = {

SQF/dayz_epoch_b/config.cpp

@@ -3,7 +3,7 @@ class CfgPatches {
 		units[] = {};
 		weapons[] = {};
 		requiredVersion = 0.1;
-		dayzVersion = "1.0.4.1";
+		dayzVersion = "1.0.4.2";
 		requiredAddons[] = {"dayz_code"};
 	};
 };

SQF/dayz_server/compile/fnc_plyrHit.sqf

@@ -16,8 +16,8 @@ else
 	_weapon = _weapon select 0;
 };
 
-if (_weapon == "" or isNil "_weapon") then {
-	_vehicle = typeOf (vehicle _attacker); 
+_vehicle = typeOf (vehicle _attacker); 
+if ((getText (configFile >> "CfgVehicles" >> _vehicle >> "vehicleClass")) in ["CarW","Car","CarD","Armored","Ship","Support","Air","ArmouredW","ArmouredD","SupportWoodland_ACR"]) then {
 	_weapon = getText (configFile >> "CfgVehicles" >> _vehicle >> "displayName");
 };
 

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

@@ -163,7 +163,7 @@ if (true) then
 _unit_13 = objNull;
 if (true) then
 {
-  _this = _group_1 createAgent ["Profiteer4", [17176.229, 13586.87, -9.1552734e-005], [], 0, "CAN_COLLIDE"];
+  _this =  createAgent ["Profiteer4", [17176.229, 13586.87, -9.1552734e-005], [], 0, "CAN_COLLIDE"];
   _unit_13 = _this;
   _this setDir 73.497665;
   _this setVehicleInit "this allowDammage false; this disableAI 'FSM'; this disableAI 'MOVE'; this disableAI 'AUTOTARGET'; this disableAI 'TARGET'; this setBehaviour 'CARELESS'; this forceSpeed 0;";
@@ -173,7 +173,7 @@ _this allowDammage false; _this disableAI 'FSM'; _this disableAI 'MOVE'; _this d
 _unit_17 = objNull;
 if (true) then
 {
-  _this = _group_1 createAgent ["RU_Villager3", [19245.633, 13586.95, 3.1938891], [], 0, "CAN_COLLIDE"];
+  _this =  createAgent ["RU_Villager3", [19245.633, 13586.95, 3.1938891], [], 0, "CAN_COLLIDE"];
   _unit_17 = _this;
   _this setDir -84.586914;
   _this setVehicleInit "this allowDammage false; this disableAI 'FSM'; this disableAI 'MOVE'; this disableAI 'AUTOTARGET'; this disableAI 'TARGET'; this setBehaviour 'CARELESS'; this forceSpeed 0;";
@@ -237,7 +237,7 @@ if (true) then
 _unit_56 = objNull;
 if (true) then
 {
-  _this = _group_1 createAgent ["Worker3", [14280.453, 12382.589, 0.69716024], [], 0, "CAN_COLLIDE"];
+  _this =  createAgent ["Worker3", [14280.453, 12382.589, 0.69716024], [], 0, "CAN_COLLIDE"];
   _unit_56 = _this;
   _this setDir 345.39899;
   _this setVehicleInit "this allowDammage false; this disableAI 'FSM'; this disableAI 'MOVE'; this disableAI 'AUTOTARGET'; this disableAI 'TARGET'; this setBehaviour 'CARELESS'; this forceSpeed 0;";
@@ -247,7 +247,7 @@ _this allowDammage false; _this disableAI 'FSM'; _this disableAI 'MOVE'; _this d
 _unit_57 = objNull;
 if (true) then
 {
-  _this = _group_1 createAgent ["CIV_EuroMan01_EP1", [14281.469, 12438.899, -0.038146973], [], 0, "CAN_COLLIDE"];
+  _this =  createAgent ["CIV_EuroMan01_EP1", [14281.469, 12438.899, -0.038146973], [], 0, "CAN_COLLIDE"];
   _unit_57 = _this;
   _this setDir 272.80331;
   _this setVehicleInit "this allowDammage false; this disableAI 'FSM'; this disableAI 'MOVE'; this disableAI 'AUTOTARGET'; this disableAI 'TARGET'; this setBehaviour 'CARELESS'; this forceSpeed 0;";
@@ -257,7 +257,7 @@ _this allowDammage false; _this disableAI 'FSM'; _this disableAI 'MOVE'; _this d
 _unit_58 = objNull;
 if (true) then
 {
-  _this = _group_1 createAgent ["RU_WorkWoman5", [14264.426, 12423.233, 0.54440308], [], 0, "CAN_COLLIDE"];
+  _this =  createAgent ["RU_WorkWoman5", [14264.426, 12423.233, 0.54440308], [], 0, "CAN_COLLIDE"];
   _unit_58 = _this;
   _this setDir 825.94824;
   _this setVehicleInit "this allowDammage false; this disableAI 'FSM'; this disableAI 'MOVE'; this disableAI 'AUTOTARGET'; this disableAI 'TARGET'; this setBehaviour 'CARELESS'; this forceSpeed 0;";
@@ -267,7 +267,7 @@ _this allowDammage false; _this disableAI 'FSM'; _this disableAI 'MOVE'; _this d
 _unit_59 = objNull;
 if (true) then
 {
-  _this = _group_1 createAgent ["TK_GUE_Soldier_5_EP1", [14265.977, 12375.616, -0.51617432], [], 0, "CAN_COLLIDE"];
+  _this =  createAgent ["TK_GUE_Soldier_5_EP1", [14265.977, 12375.616, -0.51617432], [], 0, "CAN_COLLIDE"];
   _unit_59 = _this;
   _this setDir 381.45752;
   _this setVehicleInit "this allowDammage false; this disableAI 'FSM'; this disableAI 'MOVE'; this disableAI 'AUTOTARGET'; this disableAI 'TARGET'; this setBehaviour 'CARELESS'; this forceSpeed 0;";
@@ -277,7 +277,7 @@ _this allowDammage false; _this disableAI 'FSM'; _this disableAI 'MOVE'; _this d
 _unit_60 = objNull;
 if (true) then
 {
-  _this = _group_1 createAgent ["CIV_EuroMan02_EP1", [14282.494, 12434.631, 0.33944702], [], 0, "CAN_COLLIDE"];
+  _this =  createAgent ["CIV_EuroMan02_EP1", [14282.494, 12434.631, 0.33944702], [], 0, "CAN_COLLIDE"];
   _unit_60 = _this;
   _this setDir 270.93637;
   _this setVehicleInit "this allowDammage false; this disableAI 'FSM'; this disableAI 'MOVE'; this disableAI 'AUTOTARGET'; this disableAI 'TARGET'; this setBehaviour 'CARELESS'; this forceSpeed 0;";
@@ -287,7 +287,7 @@ _this allowDammage false; _this disableAI 'FSM'; _this disableAI 'MOVE'; _this d
 _unit_62 = objNull;
 if (true) then
 {
-  _this = _group_1 createAgent ["Dr_Hladik_EP1", [12568.642, 8359.8574, 0.51730686], [], 0, "CAN_COLLIDE"];
+  _this =  createAgent ["Dr_Hladik_EP1", [12568.642, 8359.8574, 0.51730686], [], 0, "CAN_COLLIDE"];
   _unit_62 = _this;
   _this setDir 671.35419;
   _this setVehicleInit "this allowDammage false; this disableAI 'FSM'; this disableAI 'MOVE'; this disableAI 'AUTOTARGET'; this disableAI 'TARGET'; this setBehaviour 'CARELESS'; this forceSpeed 0;";
@@ -335,7 +335,7 @@ if (true) then
 _unit_73 = objNull;
 if (true) then
 {
-  _this = _group_1 createAgent ["RU_Functionary1", [17269.762, 9570.75, 2.0980835e-005], [], 0, "CAN_COLLIDE"];
+  _this =  createAgent ["RU_Functionary1", [17269.762, 9570.75, 2.0980835e-005], [], 0, "CAN_COLLIDE"];
   _unit_73 = _this;
   _this setDir 177.47417;
   _this setVehicleInit "this allowDammage false; this disableAI 'FSM'; this disableAI 'MOVE'; this disableAI 'AUTOTARGET'; this disableAI 'TARGET'; this setBehaviour 'CARELESS'; this forceSpeed 0;";
@@ -345,7 +345,7 @@ _this allowDammage false; _this disableAI 'FSM'; _this disableAI 'MOVE'; _this d
 _unit_74 = objNull;
 if (true) then
 {
-  _this = _group_1 createAgent ["Woodlander1", [17175.852, 13602.271, -9.1552734e-005], [], 0, "CAN_COLLIDE"];
+  _this =  createAgent ["Woodlander1", [17175.852, 13602.271, -9.1552734e-005], [], 0, "CAN_COLLIDE"];
   _unit_74 = _this;
   _this setDir 87.902885;
   _this setVehicleInit "this allowDammage false; this disableAI 'FSM'; this disableAI 'MOVE'; this disableAI 'AUTOTARGET'; this disableAI 'TARGET'; this setBehaviour 'CARELESS'; this forceSpeed 0;";
@@ -355,7 +355,7 @@ _this allowDammage false; _this disableAI 'FSM'; _this disableAI 'MOVE'; _this d
 _unit_75 = objNull;
 if (true) then
 {
-  _this = _group_1 createAgent ["RU_WorkWoman1", [17175.6, 13598.431, 0.94462103], [], 0, "CAN_COLLIDE"];
+  _this =  createAgent ["RU_WorkWoman1", [17175.6, 13598.431, 0.94462103], [], 0, "CAN_COLLIDE"];
   _unit_75 = _this;
   _this setDir 88.896126;
   _this setVehicleInit "this allowDammage false; this disableAI 'FSM'; this disableAI 'MOVE'; this disableAI 'AUTOTARGET'; this disableAI 'TARGET'; this setBehaviour 'CARELESS'; this forceSpeed 0;";
@@ -365,7 +365,7 @@ _this allowDammage false; _this disableAI 'FSM'; _this disableAI 'MOVE'; _this d
 _unit_78 = objNull;
 if (true) then
 {
-  _this = _group_1 createAgent ["Rocker4", [17175.785, 13593.929], [], 0, "CAN_COLLIDE"];
+  _this =  createAgent ["Rocker4", [17175.785, 13593.929], [], 0, "CAN_COLLIDE"];
   _unit_78 = _this;
   _this setDir 83.451462;
   _this setVehicleInit "this allowDammage false; this disableAI 'FSM'; this disableAI 'MOVE'; this disableAI 'AUTOTARGET'; this disableAI 'TARGET'; this setBehaviour 'CARELESS'; this forceSpeed 0;";
@@ -375,7 +375,7 @@ _this allowDammage false; _this disableAI 'FSM'; _this disableAI 'MOVE'; _this d
 _unit_79 = objNull;
 if (true) then
 {
-  _this = _group_1 createAgent ["RU_Citizen3", [17182.684, 13599.278, 3.0517578e-005], [], 0, "CAN_COLLIDE"];
+  _this =  createAgent ["RU_Citizen3", [17182.684, 13599.278, 3.0517578e-005], [], 0, "CAN_COLLIDE"];
   _unit_79 = _this;
   _this setDir 613.98407;
   _this setVehicleInit "this allowDammage false; this disableAI 'FSM'; this disableAI 'MOVE'; this disableAI 'AUTOTARGET'; this disableAI 'TARGET'; this setBehaviour 'CARELESS'; this forceSpeed 0;";
@@ -385,7 +385,7 @@ _this allowDammage false; _this disableAI 'FSM'; _this disableAI 'MOVE'; _this d
 _unit_82 = objNull;
 if (true) then
 {
-  _this = _group_1 createAgent ["Dr_Annie_Baker_EP1", [17179.426, 13574.901], [], 0, "CAN_COLLIDE"];
+  _this =  createAgent ["Dr_Annie_Baker_EP1", [17179.426, 13574.901], [], 0, "CAN_COLLIDE"];
   _unit_82 = _this;
   _this setDir 433.92062;
   _this setVehicleInit "this allowDammage false; this disableAI 'FSM'; this disableAI 'MOVE'; this disableAI 'AUTOTARGET'; this disableAI 'TARGET'; this setBehaviour 'CARELESS'; this forceSpeed 0;";
@@ -395,7 +395,7 @@ _this allowDammage false; _this disableAI 'FSM'; _this disableAI 'MOVE'; _this d
 _unit_84 = objNull;
 if (true) then
 {
-  _this = _group_1 createAgent ["TK_CIV_Takistani04_EP1", [12575.749, 8356.5449, 0.98069924], [], 0, "CAN_COLLIDE"];
+  _this =  createAgent ["TK_CIV_Takistani04_EP1", [12575.749, 8356.5449, 0.98069924], [], 0, "CAN_COLLIDE"];
   _unit_84 = _this;
   _this setDir 269.78232;
   _this setVehicleInit "this allowDammage false; this disableAI 'FSM'; this disableAI 'MOVE'; this disableAI 'AUTOTARGET'; this disableAI 'TARGET'; this setBehaviour 'CARELESS'; this forceSpeed 0;";
@@ -486,7 +486,7 @@ if (true) then
 _unit_90 = objNull;
 if (true) then
 {
-  _this = _group_1 createAgent ["RU_Citizen4", [11453.74, 5420.5854, 0.13881789], [], 0, "CAN_COLLIDE"];
+  _this =  createAgent ["RU_Citizen4", [11453.74, 5420.5854, 0.13881789], [], 0, "CAN_COLLIDE"];
   _unit_90 = _this;
   _this setDir 202.66867;
   _this setVehicleInit "this allowDammage false; this disableAI 'FSM'; this disableAI 'MOVE'; this disableAI 'AUTOTARGET'; this disableAI 'TARGET'; this setBehaviour 'CARELESS'; this forceSpeed 0;";
@@ -496,7 +496,7 @@ _this allowDammage false; _this disableAI 'FSM'; _this disableAI 'MOVE'; _this d
 _unit_91 = objNull;
 if (true) then
 {
-  _this = _group_1 createAgent ["RU_Citizen1", [13558.33, 8684.3281, 3.8146973e-006], [], 0, "CAN_COLLIDE"];
+  _this =  createAgent ["RU_Citizen1", [13558.33, 8684.3281, 3.8146973e-006], [], 0, "CAN_COLLIDE"];
   _unit_91 = _this;
   _this setDir 184.64287;
   _this setVehicleInit "this allowDammage false; this disableAI 'FSM'; this disableAI 'MOVE'; this disableAI 'AUTOTARGET'; this disableAI 'TARGET'; this setBehaviour 'CARELESS'; this forceSpeed 0;";
@@ -506,7 +506,7 @@ _this allowDammage false; _this disableAI 'FSM'; _this disableAI 'MOVE'; _this d
 _unit_94 = objNull;
 if (true) then
 {
-  _this = _group_1 createAgent ["Pilot_EP1", [12569.598, 8353.5137, -0.3298558], [], 0, "CAN_COLLIDE"];
+  _this =  createAgent ["Pilot_EP1", [12569.598, 8353.5137, -0.3298558], [], 0, "CAN_COLLIDE"];
   _unit_94 = _this;
   _this setDir 396.39563;
   _this setVehicleInit "this allowDammage false; this disableAI 'FSM'; this disableAI 'MOVE'; this disableAI 'AUTOTARGET'; this disableAI 'TARGET'; this setBehaviour 'CARELESS'; this forceSpeed 0;";
@@ -516,7 +516,7 @@ _this allowDammage false; _this disableAI 'FSM'; _this disableAI 'MOVE'; _this d
 _unit_95 = objNull;
 if (true) then
 {
-  _this = _group_1 createAgent ["Rita_Ensler_EP1", [12556.018, 8352.8145, 0.88001078], [], 0, "CAN_COLLIDE"];
+  _this =  createAgent ["Rita_Ensler_EP1", [12556.018, 8352.8145, 0.88001078], [], 0, "CAN_COLLIDE"];
   _unit_95 = _this;
   _this setDir -9.2696304;
   _this setVehicleInit "this allowDammage false; this disableAI 'FSM'; this disableAI 'MOVE'; this disableAI 'AUTOTARGET'; this disableAI 'TARGET'; this setBehaviour 'CARELESS'; this forceSpeed 0;";
@@ -646,7 +646,7 @@ if (true) then
 _unit_97 = objNull;
 if (true) then
 {
-  _this = _group_1 createAgent ["Worker2", [9908.458, 10003.673, 0.020880492], [], 0, "CAN_COLLIDE"];
+  _this =  createAgent ["Worker2", [9908.458, 10003.673, 0.020880492], [], 0, "CAN_COLLIDE"];
   _unit_97 = _this;
   _this setDir 3.0190864;
   _this setVehicleInit "this allowDammage false; this disableAI 'FSM'; this disableAI 'MOVE'; this disableAI 'AUTOTARGET'; this disableAI 'TARGET'; this setBehaviour 'CARELESS'; this forceSpeed 0;";
@@ -713,7 +713,7 @@ if (true) then
 _unit_108 = objNull;
 if (true) then
 {
-  _this = _group_2 createAgent ["GUE_Soldier_MG", [6411.2759, 7476.5024, 0.25734121], [], 0, "CAN_COLLIDE"];
+  _this =  createAgent ["GUE_Soldier_MG", [6411.2759, 7476.5024, 0.25734121], [], 0, "CAN_COLLIDE"];
   _unit_108 = _this;
   _this setDir 262.28711;
   _this setVehicleInit "this allowDammage false; this disableAI 'FSM'; this disableAI 'MOVE'; this disableAI 'AUTOTARGET'; this disableAI 'TARGET'; this setBehaviour 'CARELESS'; this forceSpeed 0;  ";
@@ -791,7 +791,7 @@ if (true) then
 _unit_118 = objNull;
 if (true) then
 {
-  _this = _group_1 createAgent ["RU_Profiteer4", [12548.382, 8353.6436], [], 0, "CAN_COLLIDE"];
+  _this =  createAgent ["RU_Profiteer4", [12548.382, 8353.6436], [], 0, "CAN_COLLIDE"];
   _unit_118 = _this;
   _this setDir -50.706394;
   _this setVehicleInit "this allowDammage false; this disableAI 'FSM'; this disableAI 'MOVE'; this disableAI 'AUTOTARGET'; this disableAI 'TARGET'; this setBehaviour 'CARELESS'; this forceSpeed 0;";
@@ -819,7 +819,7 @@ if (true) then
 _unit_122 = objNull;
 if (true) then
 {
-  _this = _group_1 createAgent ["Woodlander3", [12565.632, 8350.7012, 3.0517578e-005], [], 0, "CAN_COLLIDE"];
+  _this =  createAgent ["Woodlander3", [12565.632, 8350.7012, 3.0517578e-005], [], 0, "CAN_COLLIDE"];
   _unit_122 = _this;
   _this setDir -59.927212;
   _this setVehicleInit "this allowDammage false; this disableAI 'FSM'; this disableAI 'MOVE'; this disableAI 'AUTOTARGET'; this disableAI 'TARGET'; this setBehaviour 'CARELESS'; this forceSpeed 0;";
@@ -849,7 +849,7 @@ if (true) then
 _unit_124 = objNull;
 if (true) then
 {
-  _this = _group_1 createAgent ["HouseWife1", [13488.928, 6891.0576, 3.5405161], [], 0, "CAN_COLLIDE"];
+  _this =  createAgent ["HouseWife1", [13488.928, 6891.0576, 3.5405161], [], 0, "CAN_COLLIDE"];
   _unit_124 = _this;
   _this setDir -91.741302;
   _this setVehicleInit "this allowDammage false; this disableAI 'FSM'; this disableAI 'MOVE'; this disableAI 'AUTOTARGET'; this disableAI 'TARGET'; this setBehaviour 'CARELESS'; this forceSpeed 0;";
@@ -876,7 +876,7 @@ if (true) then
 _unit_128 = objNull;
 if (true) then
 {
-  _this = _group_1 createAgent ["Doctor", [14263.656, 12434.905], [], 0, "CAN_COLLIDE"];
+  _this =  createAgent ["Doctor", [14263.656, 12434.905], [], 0, "CAN_COLLIDE"];
   _unit_128 = _this;
   _this setDir 455.85672;
   _this setVehicleInit "this allowDammage false; this disableAI 'FSM'; this disableAI 'MOVE'; this disableAI 'AUTOTARGET'; this disableAI 'TARGET'; this setBehaviour 'CARELESS'; this forceSpeed 0;";
@@ -1571,7 +1571,7 @@ if (true) then
 _unit_193 = objNull;
 if (true) then
 {
-  _this = _group_2 createAgent ["Soldier_GL_PMC", [13243.781, 11189.826, 9.9182129e-005], [], 0, "CAN_COLLIDE"];
+  _this =  createAgent ["Soldier_GL_PMC", [13243.781, 11189.826, 9.9182129e-005], [], 0, "CAN_COLLIDE"];
   _unit_193 = _this;
   _this setDir -99.240112;
   _this setVehicleInit "this allowDammage false; this disableAI 'FSM'; this disableAI 'MOVE'; this disableAI 'AUTOTARGET'; this disableAI 'TARGET'; this setBehaviour 'CARELESS'; this forceSpeed 0;  ";

SQF/dayz_server/system/server_monitor.sqf

@@ -150,7 +150,6 @@ if (isServer and isNil "sm_done") then {
 			if ((typeOf _object) in dayz_allowedObjects) then {
 				if (DZE_GodModeBase) then {
 					_object addEventHandler ["HandleDamage", {false}];
-					_object setDamage 0;
 				} else {
 					_object addMPEventHandler ["MPKilled",{_this call object_handleServerKilled;}];
 				};
@@ -179,10 +178,7 @@ if (isServer and isNil "sm_done") then {
 						};
 						_isOK = 	isClass(configFile >> "CfgWeapons" >> _x);
 						if (_isOK) then {
-							_block = 	getNumber(configFile >> "CfgWeapons" >> _x >> "stopThis") == 1;
-							if (!_block) then {
-								_object addWeaponCargoGlobal [_x,(_objWpnQty select _countr)];
-							};
+							_object addWeaponCargoGlobal [_x,(_objWpnQty select _countr)];
 						};
 						_countr = _countr + 1;
 					} forEach _objWpnTypes; 
@@ -196,10 +192,7 @@ if (isServer and isNil "sm_done") then {
 						if (_x == "ItemTent") then { _x = "ItemTentOld" };
 						_isOK = 	isClass(configFile >> "CfgMagazines" >> _x);
 						if (_isOK) then {
-							_block = 	getNumber(configFile >> "CfgMagazines" >> _x >> "stopThis") == 1;
-							if (!_block) then {
-								_object addMagazineCargoGlobal [_x,(_objWpnQty select _countr)];
-							};
+							_object addMagazineCargoGlobal [_x,(_objWpnQty select _countr)];
 						};
 						_countr = _countr + 1;
 					} forEach _objWpnTypes;
@@ -211,10 +204,7 @@ if (isServer and isNil "sm_done") then {
 					{
 						_isOK = 	isClass(configFile >> "CfgVehicles" >> _x);
 						if (_isOK) then {
-							_block = 	getNumber(configFile >> "CfgVehicles" >> _x >> "stopThis") == 1;
-							if (!_block) then {
-								_object addBackpackCargoGlobal [_x,(_objWpnQty select _countr)];
-							};
+							_object addBackpackCargoGlobal [_x,(_objWpnQty select _countr)];
 						};
 						_countr = _countr + 1;
 					} forEach _objWpnTypes;

SQF/dayz_sfx/config.cpp

@@ -22,7 +22,7 @@ class CfgPatches {
 		units[] = {};
 		weapons[] = {};
 		requiredVersion = 0.1;
-		dayzVersion = "1.0.4.1";
+		dayzVersion = "1.0.4.2";
 		requiredAddons[] = {};
 	};
 };

SQF/mod.cpp

@@ -1,5 +1,5 @@
 dir = "@DayZ_Epoch";
-name = "DayZ Epoch 1.0.4.1";
+name = "DayZ Epoch 1.0.4.2";
 actionName = "Website";
 picture = "dayz_logo_ca.paa";
 action = "http://www.dayzepoch.com";

Server Files/Battleye/scripts.txt

@@ -1,4 +1,5 @@
 //new
+5 "setDamage" !"player setdamage 0;" !"player setDamage 1;" !"_vehicle setDamage 0; "!"if\("""" == typeOf _tree\) then \{\n_tree setDamage 1;\n\};" !"if\("""" == typeOf _tree\) then \{\n_tree setDamage 0.99;\n\};" !"if \(_ent isKindOf ""Animal""\) then \{\n_ent setDamage 1;\n" !"if \(_ent isKindOf ""Animal"" or _isZombie\) then \{\n_ent setDamage 1;"
 1 "addBackpackCargoGlobal" !"_holder addbackpackcargoGlobal \[_x,\(_objWpnQty select _countr\)\];"
 1 HelicopterExplo !"_expl=createVehicle \[\"HelicopterExploSmall\",\(getPosATL _v\),\[\],0,\"CAN_COLLIDE\"\];"
 5 "Logic" !"\"Logic\" createVehicleLocal" !"sideLogic" !"BIS_MPF_clientJIPlogic" !"_humanity_logic"

Server Files/Config-Examples/instance_11_Chernarus/config.cfg

@@ -1,4 +1,4 @@
-hostName = "DayZ Epoch Chernarus Server (1.0.4.1/103718)";
+hostName = "DayZ Epoch Chernarus Server (1.0.4.2/103718)";
 password = "";
 passwordAdmin = "changeme";
 maxPlayers = 50;

Server Files/Config-Examples/instance_12_duala/config.cfg

@@ -1,4 +1,4 @@
-hostName = "DayZ Epoch Isla Duala Server (1.0.4.1/103718)";
+hostName = "DayZ Epoch Isla Duala Server (1.0.4.2/103718)";
 password = "";
 passwordAdmin = "changeme";
 maxPlayers = 50;

Server Files/Config-Examples/instance_13_tavi/config.cfg

@@ -1,4 +1,4 @@
-hostName = "DayZ Epoch Taviana Server (1.0.4.1/103718)";
+hostName = "DayZ Epoch Taviana Server (1.0.4.2/103718)";
 password = "";
 passwordAdmin = "changeme";
 maxPlayers = 50;

Server Files/Config-Examples/instance_15_namalsk/config.cfg

@@ -1,4 +1,4 @@
-hostName = "DayZ Epoch Namalsk Server (1.0.4.1/103718)";
+hostName = "DayZ Epoch Namalsk Server (1.0.4.2/103718)";
 password = "";
 passwordAdmin = "changeme";
 maxPlayers = 50;

Server Files/Config-Examples/instance_16_panthera/config.cfg

@@ -1,4 +1,4 @@
-hostName = "DayZ Epoch Panthera Server (1.0.4.1/103718)";
+hostName = "DayZ Epoch Panthera Server (1.0.4.2/103718)";
 password = "";
 passwordAdmin = "changeme";
 maxPlayers = 50;

Server Files/Config-Examples/instance_18_sahrani/config.cfg

@@ -1,4 +1,4 @@
-hostName = "DayZ Epoch Sahrani Server (1.0.4.1/103718)";
+hostName = "DayZ Epoch Sahrani Server (1.0.4.2/103718)";
 password = "";
 passwordAdmin = "changeme";
 maxPlayers = 50;

Server Files/Config-Examples/instance_19_poda/config.cfg

@@ -1,4 +1,4 @@
-hostName = "DayZ Epoch Podagorsk Server (1.0.4.1/103718)";
+hostName = "DayZ Epoch Podagorsk Server (1.0.4.2/103718)";
 password = "";
 passwordAdmin = "changeme";
 maxPlayers = 50;

Server Files/Config-Examples/instance_1_takistan/config.cfg

@@ -1,4 +1,4 @@
-hostName = "DayZ Epoch Takistan Server (1.0.4.1/103718)";
+hostName = "DayZ Epoch Takistan Server (1.0.4.2/103718)";
 password = "";
 passwordAdmin = "changeme";
 maxPlayers = 50;

Server Files/Config-Examples/instance_20_fapovo/config.cfg

@@ -1,4 +1,4 @@
-hostName = "DayZ Epoch Fapovo Server (1.0.4.1/103718)";
+hostName = "DayZ Epoch Fapovo Server (1.0.4.2/103718)";
 password = "";
 passwordAdmin = "changeme";
 maxPlayers = 50;

Server Files/Config-Examples/instance_21_caribou/config.cfg

@@ -1,4 +1,4 @@
-hostName = "DayZ Epoch Caribou Server (1.0.4.1/103718)";
+hostName = "DayZ Epoch Caribou Server (1.0.4.2/103718)";
 password = "";
 passwordAdmin = "changeme";
 maxPlayers = 50;

Server Files/Config-Examples/instance_22_SMDsahrani/config.cfg

@@ -1,4 +1,4 @@
-hostName = "DayZ Epoch SMD Sahrani Server (1.0.4.1/103718)";
+hostName = "DayZ Epoch SMD Sahrani Server (1.0.4.2/103718)";
 password = "";
 passwordAdmin = "changeme";
 maxPlayers = 50;

Server Files/Config-Examples/instance_24_Napf/config.cfg

@@ -1,4 +1,4 @@
-hostName = "DayZ Epoch Napf Server (1.0.4.1/103718)";
+hostName = "DayZ Epoch Napf Server (1.0.4.2/103718)";
 password = "";
 passwordAdmin = "changeme";
 maxPlayers = 50;

Server Files/Config-Examples/instance_25_sauerland/config.cfg

@@ -1,4 +1,4 @@
-hostName = "DayZ Epoch Sauerland Server (1.0.4.1/103718)";
+hostName = "DayZ Epoch Sauerland Server (1.0.4.2/103718)";
 password = "";
 passwordAdmin = "changeme";
 maxPlayers = 50;

Server Files/Config-Examples/instance_2_utes/config.cfg

@@ -1,4 +1,4 @@
-hostName = "DayZ Epoch Utes Server (1.0.4.1/103718/No Traders)";
+hostName = "DayZ Epoch Utes Server (1.0.4.2/103718/No Traders)";
 password = "";
 passwordAdmin = "changeme";
 maxPlayers = 50;

Server Files/Config-Examples/instance_3_shapur_baf/config.cfg

@@ -1,4 +1,4 @@
-hostName = "DayZ Epoch Shapur BAF Server (1.0.4.1/103718/No Traders)";
+hostName = "DayZ Epoch Shapur BAF Server (1.0.4.2/103718/No Traders)";
 password = "";
 passwordAdmin = "changeme";
 maxPlayers = 24;

Server Files/Config-Examples/instance_4_zargabad/config.cfg

@@ -1,4 +1,4 @@
-hostName = "DayZ Epoch Zargabad Server (1.0.4.1/103718)";
+hostName = "DayZ Epoch Zargabad Server (1.0.4.2/103718)";
 password = "";
 passwordAdmin = "changeme";
 maxPlayers = 50;

Server Files/Config-Examples/instance_6_Dingor/config.cfg

@@ -1,4 +1,4 @@
-hostName = "DayZ Epoch Dingor Server (1.0.4.1/103718)";
+hostName = "DayZ Epoch Dingor Server (1.0.4.2/103718)";
 password = "";
 passwordAdmin = "changeme";
 maxPlayers = 50;

Server Files/Config-Examples/instance_7_Lingor/config.cfg

@@ -1,4 +1,4 @@
-hostName = "DayZ Epoch Lingor Server (1.0.4.1/103718)";
+hostName = "DayZ Epoch Lingor Server (1.0.4.2/103718)";
 password = "";
 passwordAdmin = "changeme";
 maxPlayers = 50;

Server Files/Config-Examples/instance_8_ProvingGrounds_PMC/config.cfg

@@ -1,4 +1,4 @@
-hostName = "DayZ Epoch ProvingGrounds_PMC Server (1.0.4.1/103718)";
+hostName = "DayZ Epoch ProvingGrounds_PMC Server (1.0.4.2/103718)";
 password = "";
 passwordAdmin = "changeme";
 maxPlayers = 50;

Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf

@@ -83,7 +83,7 @@ if (!isDedicated) then {
 	[] execVM "\z\addons\dayz_code\system\antihack.sqf";
 
 	//Lights
-	//[0,0,true,true,true,58,280,600,[0.698, 0.556, 0.419],"Generator_DZ",0.1] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
+	//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
 };
 #include "\z\addons\dayz_code\system\REsec.sqf"
 //Start Dynamic Weather

Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/init.sqf

@@ -82,7 +82,7 @@ if (!isDedicated) then {
 	[] execVM "\z\addons\dayz_code\system\antihack.sqf";
 
 	//Lights
-	//[0,0,true,true,true,58,280,600,[0.698, 0.556, 0.419],"Generator_DZ",0.1] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
+	//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
 };
 #include "\z\addons\dayz_code\system\REsec.sqf"
 //Start Dynamic Weather

Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf

@@ -84,7 +84,7 @@ if (!isDedicated) then {
 	[] execVM "\z\addons\dayz_code\system\antihack.sqf";
 
 	//Lights
-	//[0,0,true,true,true,58,280,600,[0.698, 0.556, 0.419],"Generator_DZ",0.1] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
+	//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
 	
 };
 

Server Files/MPMissions/DayZ_Epoch_11.Chernarus/server_traders.sqf

@@ -1,5 +1,5 @@
 // DayZ Epoch TRADERS for 11
-serverTraders = ["RU_Functionary1","RU_Citizen3","Rocker4","Profiteer4","Rita_Ensler_EP1","CIV_EuroMan01_EP1","CIV_EuroMan02_EP1","TK_GUE_Soldier_5_EP1","GUE_Soldier_MG","Worker2","Worker3","Soldier_GL_M16A2_PMC","Woodlander1","UN_CDF_Soldier_Pilot_EP1","RU_WorkWoman1","Dr_Annie_Baker_EP1","RU_Citizen4","RU_WorkWoman5","RU_Citizen1","RU_Villager3","TK_CIV_Takistani04_EP1","Pilot_EP1","RU_Profiteer4","Woodlander3","Dr_Hladik_EP1","Doctor","HouseWife1","GUE_Woodlander2"];
+serverTraders = ["RU_Functionary1","RU_Citizen3","Rocker4","Profiteer4","Rita_Ensler_EP1","CIV_EuroMan01_EP1","CIV_EuroMan02_EP1","TK_GUE_Soldier_5_EP1","GUE_Soldier_MG","Worker2","Worker3","Woodlander1","UN_CDF_Soldier_Pilot_EP1","RU_WorkWoman1","Dr_Annie_Baker_EP1","RU_Citizen4","RU_WorkWoman5","RU_Citizen1","RU_Villager3","TK_CIV_Takistani04_EP1","Pilot_EP1","RU_Profiteer4","Woodlander3","Dr_Hladik_EP1","Doctor","HouseWife1","GUE_Woodlander2"];
 // Hero Vendor
 menu_RU_Functionary1 = [
 	[["Ammunition",478],["Clothes",476],["Helicopter Armed",493],["Military Armed",562],["Trucks Armed",479],["Weapons",477]],
@@ -66,12 +66,6 @@ menu_Worker3 = [
 	[],
 	"neutral"
 ];
-// Black Market Vendor
-menu_Soldier_GL_M16A2_PMC = [
-	[["Black Market Ammo",527],["Black Market Weapons",526],["Explosives",529]],
-	[],
-	"neutral"
-];
 // Friendly Building/Parts
 menu_Woodlander1 = [
 	[["Building Supplies",530],["Toolbelt Items",532],["Vehicle Parts",531]],