From dde3215f9af2811927bc65e36c60457c67a49406 Mon Sep 17 00:00:00 2001
From: icomrade <icomrade@live.com>
Date: Fri, 26 Feb 2016 11:24:20 -0500
Subject: [PATCH] CFGLoot should be done

Make sure there's no attachments or NEW _DZ weapons that support
attachments!!!!
---
 .../Configs/CfgLoot/Buildings/Military.hpp    |  1 +
 .../Configs/CfgLoot/CfgBuildingLoot.hpp       | 25 ++++-
 .../Configs/CfgLoot/CfgBuildingPos.hpp        | 35 ++++---
 SQF/dayz_code/Configs/CfgLoot/CfgLoot.hpp     | 45 ++++-----
 SQF/dayz_code/Configs/CfgLoot/Groups/Ammo.hpp |  8 +-
 .../CfgLoot/Groups/Buildings/Castle.hpp       |  6 +-
 .../CfgLoot/Groups/Buildings/Church.hpp       |  2 +-
 .../CfgLoot/Groups/Buildings/Construction.hpp | 23 +++++
 .../CfgLoot/Groups/Buildings/DZE_Other.hpp    | 55 +++++++++++
 .../Configs/CfgLoot/Groups/Buildings/Farm.hpp | 19 ++--
 .../CfgLoot/Groups/Buildings/Hangar.hpp       |  7 +-
 .../CfgLoot/Groups/Buildings/Hunting.hpp      | 19 +++-
 .../CfgLoot/Groups/Buildings/Industrial.hpp   | 11 ++-
 .../CfgLoot/Groups/Buildings/Military.hpp     | 47 ++++++---
 .../CfgLoot/Groups/Buildings/Office.hpp       | 22 ++++-
 .../CfgLoot/Groups/Buildings/Residential.hpp  | 33 ++++---
 .../CfgLoot/Groups/Buildings/Supermarket.hpp  | 10 +-
 .../Configs/CfgLoot/Groups/Consumable.hpp     | 10 +-
 .../Configs/CfgLoot/Groups/CrashSite.hpp      | 99 +++++++++++++------
 .../Configs/CfgLoot/Groups/Generic.hpp        |  6 ++
 .../Configs/CfgLoot/Groups/InfectedCamp.hpp   |  6 +-
 .../Configs/CfgLoot/Groups/Weapons.hpp        |  6 +-
 .../Configs/CfgWeapons/Tools/Hatchet.hpp      |  9 +-
 SQF/dayz_code/NOTE.txt                        | 10 +-
 24 files changed, 371 insertions(+), 143 deletions(-)
 create mode 100644 SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/DZE_Other.hpp

diff --git a/SQF/dayz_code/Configs/CfgLoot/Buildings/Military.hpp b/SQF/dayz_code/Configs/CfgLoot/Buildings/Military.hpp
index 131467c02..b0f1d1d6d 100644
--- a/SQF/dayz_code/Configs/CfgLoot/Buildings/Military.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Buildings/Military.hpp
@@ -34,6 +34,7 @@ class MilitaryIndustrial: Military {
 	maxRoaming = 6;
 	zombieClass[] = {"z_soldier","z_soldier_heavy","z_policeman","z_soldier","z_soldier_heavy","z_policeman","z_worker1","z_worker2","z_worker3"};
 	lootChance = 0.4;
+	lootGroup = MilitaryIndustrial;
 };
 class Land_a_stationhouse : Military
 {
diff --git a/SQF/dayz_code/Configs/CfgLoot/CfgBuildingLoot.hpp b/SQF/dayz_code/Configs/CfgLoot/CfgBuildingLoot.hpp
index 8e6efae96..99f7ca4ff 100644
--- a/SQF/dayz_code/Configs/CfgLoot/CfgBuildingLoot.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/CfgBuildingLoot.hpp
@@ -1,6 +1,25 @@
-#include "CfgLoot.hpp"
+//#include "CfgLoot.hpp"
 
-class CfgBuildingLoot {
+// Buildings - redifined here so it does not break mission loot table includes
+#include "Groups\Buildings\Boat.hpp"
+#include "Groups\Buildings\Castle.hpp"
+#include "Groups\Buildings\Church.hpp"
+#include "Groups\Buildings\Construction.hpp"
+#include "Groups\Buildings\Farm.hpp"
+#include "Groups\Buildings\Hospital.hpp"
+#include "Groups\Buildings\Hunting.hpp"
+#include "Groups\Buildings\Industrial.hpp"
+#include "Groups\Buildings\Military.hpp"
+#include "Groups\Buildings\Office.hpp"
+#include "Groups\Buildings\Powerlines.hpp"
+#include "Groups\Buildings\Residential.hpp"
+#include "Groups\Buildings\ResidentialRuins.hpp"
+#include "Groups\Buildings\Supermarket.hpp"
+#include "Groups\Buildings\Toilet.hpp"
+#include "Groups\Buildings\Hangar.hpp"
+#include "Groups\Buildings\DZE_Other.hpp"
+
+class CfgBuildingLootLegacy {
 	class Default {
 		zombieChance = 0.2;
 		minRoaming = 0;
@@ -688,7 +707,7 @@ class CfgBuildingLoot {
 		};
 	};
 
-	#include "CfgBuildingPos.hpp"
+	//#include "CfgBuildingPos.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 CfgBuildingPos.hpp
 
diff --git a/SQF/dayz_code/Configs/CfgLoot/CfgBuildingPos.hpp b/SQF/dayz_code/Configs/CfgLoot/CfgBuildingPos.hpp
index f4bfa936a..cd19980e9 100644
--- a/SQF/dayz_code/Configs/CfgLoot/CfgBuildingPos.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/CfgBuildingPos.hpp
@@ -1,17 +1,20 @@
 // Buildings - redifined here so it does not break mission loot table includes
-#include "Groups\Buildings\Boat.hpp"
-#include "Groups\Buildings\Castle.hpp"
-#include "Groups\Buildings\Church.hpp"
-#include "Groups\Buildings\Construction.hpp"
-#include "Groups\Buildings\Farm.hpp"
-#include "Groups\Buildings\Hospital.hpp"
-#include "Groups\Buildings\Hunting.hpp"
-#include "Groups\Buildings\Industrial.hpp"
-#include "Groups\Buildings\Military.hpp"
-#include "Groups\Buildings\Office.hpp"
-#include "Groups\Buildings\Powerlines.hpp"
-#include "Groups\Buildings\Residential.hpp"
-#include "Groups\Buildings\ResidentialRuins.hpp"
-#include "Groups\Buildings\Supermarket.hpp"
-#include "Groups\Buildings\Toilet.hpp"
-#include "Groups\Buildings\Hangar.hpp"
\ No newline at end of file
+#include "Buildings\Residential.hpp"
+#include "Buildings\Boat.hpp"
+#include "Buildings\Castle.hpp"
+#include "Buildings\Church.hpp"
+#include "Buildings\Construction.hpp"
+#include "Buildings\CrashSite.hpp"
+#include "Buildings\Farm.hpp"
+#include "Buildings\Hospital.hpp"
+#include "Buildings\Hunting.hpp"
+#include "Buildings\Industrial.hpp"
+#include "Buildings\InfectedCamp.hpp"
+#include "Buildings\Military.hpp"
+#include "Buildings\Office.hpp"
+#include "Buildings\Powerlines.hpp"
+#include "Buildings\ResidentialRuins.hpp"
+#include "Buildings\Supermarket.hpp"
+#include "Buildings\Toilet.hpp"
+#include "Buildings\Roaming.hpp"
+#include "Buildings\Misc.hpp"
\ No newline at end of file
diff --git a/SQF/dayz_code/Configs/CfgLoot/CfgLoot.hpp b/SQF/dayz_code/Configs/CfgLoot/CfgLoot.hpp
index 3d10a0c66..7588b573f 100644
--- a/SQF/dayz_code/Configs/CfgLoot/CfgLoot.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/CfgLoot.hpp
@@ -46,7 +46,7 @@ class CfgLoot
 		#include "Groups\CrashSite.hpp"
 		#include "Groups\CarePackage.hpp"
 		#include "Groups\InfectedCamp.hpp"
-		
+				
 		// Buildings
 		/*#include "Groups\Buildings\Boat.hpp"
 		#include "Groups\Buildings\Castle.hpp"
@@ -64,7 +64,7 @@ class CfgLoot
 		#include "Groups\Buildings\Supermarket.hpp"
 		#include "Groups\Buildings\Toilet.hpp"
 		#include "Groups\Buildings\Hangar.hpp"*/
-		#include "CfgBuildingPos.hpp"
+		#include "CfgBuildingLoot.hpp"
 
 		// Zombies
 		#include "Groups\Zombies\Civilian.hpp"
@@ -124,29 +124,30 @@ class CfgLoot
 		};
 	
 		// Buildings
-		#include "Buildings\Residential.hpp"
-		#include "Buildings\Boat.hpp"
-		#include "Buildings\Castle.hpp"
-		#include "Buildings\Church.hpp"
-		#include "Buildings\Construction.hpp"
-		#include "Buildings\CrashSite.hpp"
-		#include "Buildings\Farm.hpp"
-		#include "Buildings\Hospital.hpp"
-		#include "Buildings\Hunting.hpp"
-		#include "Buildings\Industrial.hpp"
-		#include "Buildings\InfectedCamp.hpp"
-		#include "Buildings\Military.hpp"
-		#include "Buildings\Office.hpp"
-		#include "Buildings\Powerlines.hpp"
-		#include "Buildings\ResidentialRuins.hpp"
-		#include "Buildings\Supermarket.hpp"
-		#include "Buildings\Toilet.hpp"
-		#include "Buildings\Roaming.hpp"
-		#include "Buildings\Misc.hpp"
+		//#include "Buildings\Residential.hpp"
+		//#include "Buildings\Boat.hpp"
+		//#include "Buildings\Castle.hpp"
+		//#include "Buildings\Church.hpp"
+		//#include "Buildings\Construction.hpp"
+		//#include "Buildings\CrashSite.hpp"
+		//#include "Buildings\Farm.hpp"
+		//#include "Buildings\Hospital.hpp"
+		//#include "Buildings\Hunting.hpp"
+		//#include "Buildings\Industrial.hpp"
+		//#include "Buildings\InfectedCamp.hpp"
+		//#include "Buildings\Military.hpp"
+		//#include "Buildings\Office.hpp"
+		//#include "Buildings\Powerlines.hpp"
+		//#include "Buildings\ResidentialRuins.hpp"
+		//#include "Buildings\Supermarket.hpp"
+		//#include "Buildings\Toilet.hpp"
+		//#include "Buildings\Roaming.hpp"
+		//#include "Buildings\Misc.hpp"
+		#include "CfgBuildingPos.hpp"
 	};
 };
 
-#include "CfgLootSmall.hpp"
+#include "CfgLootSmall.hpp" //Legacy
 class CfgLootLegacy {
 	trash[] = {
 		{"TrashTinCan",0.5}
diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Ammo.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Ammo.hpp
index 79d763362..c788a6cfa 100644
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Ammo.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Ammo.hpp
@@ -18,7 +18,13 @@ AmmoCivilian[] =
 	{Loot_MAGAZINE,		3,		2Rnd_shotgun_74Pellets},
 	{Loot_MAGAZINE,		5,		2Rnd_shotgun_74Slug}
 };
-
+militaryVehicleAmmo[] = { //DZE
+	{Loot_MAGAZINE,			2,		2000Rnd_762x51_M134}
+	,{Loot_MAGAZINE,		2,		29Rnd_30mm_AGS30}
+	,{Loot_MAGAZINE,		2,		50Rnd_127x107_DSHKM}
+	,{Loot_MAGAZINE,		2,		48Rnd_40mm_MK19}
+	,{Loot_MAGAZINE,		3,		100Rnd_127x99_M2}
+};
 AmmoMilitaryLow[] =
 {
 	//Pistols
diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Castle.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Castle.hpp
index bd8691e2b..7fe2d11f3 100644
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Castle.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Castle.hpp
@@ -9,7 +9,7 @@ Castle[] =
 	{Loot_WEAPON,		2,		ItemPickaxeBroken},
 	{Loot_WEAPON,		2,		ItemShovel},
 //	{Loot_WEAPON,		1,		ItemHatchet},
-	{Loot_VEHICLE,		1,		WeaponHolder_ItemHatchet},
+	{Loot_WEAPON,		1,		ItemHatchet_DZE},
 	
 	//Weapons
 	{Loot_WEAPON,		2,		Mosin_DZ},
@@ -25,11 +25,11 @@ Castle[] =
 	{Loot_MAGAZINE,		1,		ItemPadlock},
 	{Loot_MAGAZINE,		1,		ItemTent},
 	{Loot_MAGAZINE,		1,		ItemCamoNet},
-	
+
 	//Groups
 	{Loot_GROUP,		5,		AmmoCivilian},
 	{Loot_GROUP,		10,		Trash},
-	{Loot_GROUP,		2,		AttachmentsGeneric},
+	//{Loot_GROUP,		2,		AttachmentsGeneric},
 	{Loot_GROUP,		5,		Generic},
 	{Loot_WEAPON,		3,		ItemMatchbox_DZE},
 	{Loot_GROUP,		5,		Consumable}
diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Church.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Church.hpp
index 719fe3c54..c5383da4e 100644
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Church.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Church.hpp
@@ -18,7 +18,7 @@ Church[] =
 	//Groups
 	{Loot_GROUP,		10,		Trash},
 	{Loot_GROUP,		5,		AmmoCivilian},
-	{Loot_GROUP,		2,		AttachmentsGeneric},
+	//{Loot_GROUP,		2,		AttachmentsGeneric},
 	{Loot_GROUP,		4,		Generic},
 	{Loot_WEAPON,		3,		ItemMatchbox_DZE},
 	{Loot_GROUP,		8,		Consumable}
diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Construction.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Construction.hpp
index 73cb44f80..ab5c59a6d 100644
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Construction.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Construction.hpp
@@ -13,7 +13,30 @@ Construction[] =
 	{Loot_WEAPON,		1,		ItemSledgeHammer},
 	{Loot_WEAPON,		2,		ItemSledgeHammerBroken},
 	{Loot_WEAPON,		2,		ItemShovel},
+	{Loot_WEAPON,		1,		ItemKeyKit},
 	
+	//Items
+	{Loot_MAGAZINE,		6,		ItemSandbag},
+	{Loot_MAGAZINE,		4,		ItemJerryCan},
+	{Loot_MAGAZINE,		1,		ItemWire},
+	{Loot_MAGAZINE,		4,		ItemTankTrap},
+	{Loot_MAGAZINE,		1,		equip_brick},
+	{Loot_MAGAZINE,		3,		equip_duct_tape},
+	{Loot_MAGAZINE,		2,		equip_hose},
+//	{Loot_MAGAZINE,		3,		ItemScrews},
+	{Loot_MAGAZINE,		1,		equip_scrapelectronics},
+	{Loot_MAGAZINE,		2,		equip_1inch_metal_pipe},
+	{Loot_MAGAZINE,		2,		equip_2inch_metal_pipe},
+	{Loot_MAGAZINE,		1,		MortarBucket},
+	{Loot_MAGAZINE,		2,		CinderBlocks},
+	{Loot_MAGAZINE,		3,		ItemFuelBarrelEmpty},
+	{Loot_MAGAZINE,		3,		ItemGenerator},
+	{Loot_MAGAZINE,		1,		fuel_pump_kit},
+	
+	//Other
+	{Loot_GROUP,		15,		Parts},
+	{Loot_GROUP,		7,		military},
+	{Loot_PILE,			4,		Consumable, 1, 2},
 	{Loot_GROUP,		10,		Trash},
 	//{Loot_GROUP,		6,		Parts},
 	{Loot_GROUP,		3,		Generic}
diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/DZE_Other.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/DZE_Other.hpp
new file mode 100644
index 000000000..f362e4282
--- /dev/null
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/DZE_Other.hpp
@@ -0,0 +1,55 @@
+DynamicDebris[] =
+{
+	{Loot_WEAPON,		2,		ItemWatch},
+	{Loot_WEAPON,		4,		ItemMatchbox_DZE},
+	{Loot_WEAPON,		4,		ItemFlashlight},
+	{Loot_WEAPON,		3,		Colt1911},
+	{Loot_WEAPON,		4,		Makarov},
+	{Loot_WEAPON,		2,		ItemMap},
+	{Loot_WEAPON,		5,		ItemKnife},
+	{Loot_WEAPON,		5,		ItemToolbox},
+	{Loot_WEAPON,		5,		ItemHatchet_DZE},
+	{Loot_WEAPON,		5,		ItemCompass},
+	{Loot_WEAPON,		5,		ItemHatchet_DZE},
+	{Loot_PILE,			12,		Consumable, 1, 2},
+	{Loot_MAGAZINE,		7,		ItemJerryCan},
+	{Loot_GROUP,		15,		Parts}
+};
+
+DynamicDebrisMilitary[] =
+{
+	{Loot_WEAPON,		2,		ItemWatch},
+	{Loot_WEAPON,		4,		ItemMatchbox_DZE},
+	{Loot_WEAPON,		4,		ItemFlashlight},
+	{Loot_WEAPON,		4,		ItemEtool},
+	{Loot_WEAPON,		3,		Colt1911},
+	{Loot_WEAPON,		4,		Makarov},
+	{Loot_WEAPON,		2,		MakarovSD},
+	{Loot_WEAPON,		2,		ItemMap},
+	{Loot_WEAPON,		5,		ItemKnife},
+	{Loot_WEAPON,		5,		ItemToolbox},
+	{Loot_WEAPON,		5,		ItemHatchet_DZE},
+	{Loot_WEAPON,		5,		ItemCompass},
+	{Loot_WEAPON,		5,		ItemHatchet_DZE},
+	{Loot_PILE,			12,		Consumable, 1, 2},
+	{Loot_MAGAZINE,		7,		ItemJerryCan},
+	{Loot_MAGAZINE,		7,		ItemSandbag},
+	{Loot_GROUP,		8,		military},
+	{Loot_GROUP,		15,		Parts}
+};
+SupplyDrop[] = {
+	{Loot_WEAPON,		5,		ItemSledge},
+	{Loot_PILE,			12,		Consumable, 1, 2},
+	{Loot_MAGAZINE,		7,		ItemJerryCan},
+	{Loot_MAGAZINE,		7,		bulk_ItemTankTrap},
+	{Loot_MAGAZINE,		7,		PartPlywoodPack},
+	{Loot_MAGAZINE,		7,		PartPlankPack},
+	{Loot_MAGAZINE,		7,		MortarBucket},
+	{Loot_MAGAZINE,		7,		bulk_PartGeneric},
+	{Loot_MAGAZINE,		7,		bulk_ItemSandbag},
+	{Loot_MAGAZINE,		7,		CinderBlocks}
+};
+MassGrave[] = {
+	{Loot_GROUP,		30,		MilitarySpecial},
+	{Loot_GROUP,		30,		Parts}
+};
\ No newline at end of file
diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Farm.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Farm.hpp
index d1101af58..471a1cfa2 100644
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Farm.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Farm.hpp
@@ -1,17 +1,13 @@
 Farm[] =
 {
 	//Weapons
-	{Loot_WEAPON,		5,		MR43_DZ},
-	{Loot_WEAPON,		4,		Winchester1866_DZ},
-	{Loot_WEAPON,		3,		LeeEnfield_DZ},
-	{Loot_WEAPON,		3,		Mosin_DZ},
-	{Loot_WEAPON,		2,		CZ550_DZ},
-	{Loot_WEAPON,		4,		Crossbow_DZ},
-	
+	{Loot_GROUP,		10,		farmweapons},
+	{Loot_WEAPON,		2,		ItemFishingPole},
+
 	//Tools
 	{Loot_WEAPON,		5,		ItemMachete},
 //	{Loot_WEAPON,		6,		ItemHatchet},
-	{Loot_VEHICLE,		6,		WeaponHolder_ItemHatchet},
+	{Loot_WEAPON,		6,		ItemHatchet_DZE},
 	{Loot_WEAPON,		5,		ItemKnife},
 	
 	//Items
@@ -25,11 +21,16 @@ Farm[] =
 	{Loot_MAGAZINE,		6,		equip_nails},
 	{Loot_MAGAZINE,		4,		equip_string},
 	{Loot_MAGAZINE,		2,		equip_lever},
+	{Loot_MAGAZINE,		2,		PartPlankPack},
+	{Loot_MAGAZINE,		2,		ItemFuelBarrelEmpty},
+	{Loot_MAGAZINE,		1,		ItemLightBulb},
+	{Loot_MAGAZINE,		1,		ItemSledgeHead},
+	{Loot_MAGAZINE,		1.5,	ItemSledgeHandle},
 	
 	//Groups
 	{Loot_GROUP,		10,		Trash},
 	{Loot_GROUP,		15,		AmmoCivilian},
-	{Loot_GROUP,		3,		AttachmentsGeneric},
+	//{Loot_GROUP,		3,		AttachmentsGeneric},
 	{Loot_GROUP,		8,		Consumable},
 	{Loot_WEAPON,		3,		ItemMatchbox_DZE},
 	{Loot_GROUP,		8,		Generic}
diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Hangar.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Hangar.hpp
index 7ef1b3374..4073b8469 100644
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Hangar.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Hangar.hpp
@@ -1,5 +1,6 @@
 Hangar[] =
 {
+	{Loot_GROUP,		10,		MilitarySpecial},
 	//Tools
 	{Loot_WEAPON,		2,		ItemEtool},
 	
@@ -10,8 +11,8 @@ Hangar[] =
 	{Loot_MAGAZINE,		2,		ItemTankTrap},
 	
 	//Groups
-	{Loot_GROUP,		50,		Trash},
+	{Loot_GROUP,		20,		Trash},
 	{Loot_GROUP,		20,		Consumable},
-	{Loot_GROUP,		10,		Generic},
-	{Loot_GROUP,		5,		AttachmentsGeneric}
+	{Loot_GROUP,		10,		Generic}
+	//{Loot_GROUP,		5,		AttachmentsGeneric}
 };
\ No newline at end of file
diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Hunting.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Hunting.hpp
index 04ee7bf84..45d9e7ff2 100644
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Hunting.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Hunting.hpp
@@ -1,11 +1,8 @@
 Hunting[] =
 {
 	//Weapons
-	{Loot_WEAPON,		3,		Crossbow_DZ},
-	{Loot_WEAPON,		4,		CZ550_DZ},
-	{Loot_WEAPON,		8,		MR43_DZ},
-	{Loot_WEAPON,		6,		Winchester1866_DZ},
-	{Loot_WEAPON,		2,		LeeEnfield_DZ},
+	{Loot_GROUP,		5,		farmweapons},
+	{Loot_GROUP,		3,		military},
 	{Loot_WEAPON,		2,		Mosin_DZ},
 	
 	//Tools
@@ -14,6 +11,17 @@ Hunting[] =
 	{Loot_WEAPON,		6,		ItemFlashlight},
 	{Loot_WEAPON,		7,		ItemKnife},
 	{Loot_WEAPON,		2,		ItemCompass},
+	{Loot_WEAPON,		4,		ItemHatchet_DZE},
+	{Loot_MAGAZINE,		1,		5x_22_LR_17_HMR},
+	{Loot_MAGAZINE,		1,		10x_303},
+	{Loot_MAGAZINE,		2,		ItemWaterbottleUnfilled},
+	{Loot_MAGAZINE,		2,		ItemHeatPack},
+	{Loot_MAGAZINE,		2,		FoodMRE},
+	{Loot_MAGAZINE,		2,		FoodNutmix},
+	{Loot_MAGAZINE,		1,		ItemDocument},
+	{Loot_MAGAZINE,		1,		ItemMixOil},
+	//{Loot_WEAPON,		1,		RedRyder},
+	//{Loot_MAGAZINE,		1,		350Rnd_BB_Magazine},
 	
 	//Backpacks
 	{Loot_GROUP,		5,		backpacks},
@@ -21,6 +29,7 @@ Hunting[] =
 	
 	//Other
 	{Loot_MAGAZINE,		2,		ItemTent},
+	{Loot_MAGAZINE,		2,		ItemBandage},
 	{Loot_MAGAZINE,		1,		ItemDomeTent},
 	{Loot_MAGAZINE,		3,		TrapBear},
 	{Loot_MAGAZINE,		1,		12Rnd_Quiver_Wood},
diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Industrial.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Industrial.hpp
index 089e28bc2..8e3a871c8 100644
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Industrial.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Industrial.hpp
@@ -5,13 +5,14 @@ Industrial[] =
 	{Loot_WEAPON,		6,		ItemToolbox},
 	{Loot_WEAPON,		2,		ItemFlashlight},
 //	{Loot_WEAPON,		8,		ItemCrowbar},
-	{Loot_VEHICLE,		8,		WeaponHolder_ItemCrowbar},
+	{Loot_WEAPON,		8,		ItemCrowbar},
 //	{Loot_WEAPON,		5,		ItemHatchet},
-	{Loot_VEHICLE,		5,		WeaponHolder_ItemHatchet},
+	{Loot_WEAPON,		5,		ItemHatchet_DZE},
 	{Loot_WEAPON,		1,		ItemPickaxe},
 	{Loot_WEAPON,		2,		ItemPickaxeBroken},
 	{Loot_WEAPON,		1,		ItemSledgeHammer},
 	{Loot_WEAPON,		2,		ItemSledgeHammerBroken},
+	{Loot_WEAPON,		1,		ItemKeyKit},
 	
 	//Items
 	{Loot_MAGAZINE,		6,		ItemSandbag},
@@ -28,9 +29,15 @@ Industrial[] =
 	{Loot_MAGAZINE,		2,		equip_1inch_metal_pipe},
 	{Loot_MAGAZINE,		2,		equip_2inch_metal_pipe},
 	{Loot_MAGAZINE,		12,		ItemPlank},
+	{Loot_MAGAZINE,		1,		MortarBucket},
+	{Loot_MAGAZINE,		2,		CinderBlocks},
+	{Loot_MAGAZINE,		3,		ItemFuelBarrelEmpty},
+	{Loot_MAGAZINE,		3,		ItemGenerator},
+	{Loot_MAGAZINE,		1,		fuel_pump_kit},
 	
 	//Other
 	{Loot_GROUP,		15,		Parts},
+	{Loot_GROUP,		7,		military},
 	{Loot_PILE,			10,		Trash, 1, 3},
 	{Loot_PILE,			4,		Consumable, 1, 2},
 	{Loot_GROUP,		8,		Generic}
diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Military.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Military.hpp
index 06893af05..f2f60bb02 100644
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Military.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Military.hpp
@@ -2,21 +2,23 @@ Military[] =
 {
 	//Pistols
 	{Loot_GROUP,		10,		pistols},
-	//{Loot_GROUP,		2,		shotgunsingleshot},
-	//{Loot_GROUP,		2,		sniperrifles},
-	//{Loot_GROUP,		2,		submachinegun},
-	//{Loot_GROUP,		2,		assaultrifles},
+	{Loot_GROUP,		5,		shotgunsingleshot},
+	{Loot_GROUP,		4,		sniperrifles},
+	{Loot_GROUP,		8,		submachinegun},
+	{Loot_GROUP,		13,		assaultrifles},
+	{Loot_GROUP,		4,		machineguns},
+	/*
 	//Submachineguns
 	{Loot_WEAPON,		1,		PDW_DZ},
 	{Loot_WEAPON,		3,		Bizon_DZ},
 	{Loot_WEAPON,		2,		MP5_DZ},
-	
+	//USE OLD CLASSES
 	//Assault rifles
 	{Loot_WEAPON,		2,		M16A2_DZ},
 	{Loot_WEAPON,		1,		M16A2_GL_DZ},
 	{Loot_WEAPON,		1.5,	M16A4_DZ},
 	{Loot_WEAPON,		0.5,	M4A1_DZ},
-//	{Loot_WEAPON,		3,		G36C_DZ},
+	{Loot_WEAPON,		3,		G36C_DZ},
 	{Loot_WEAPON,		3,		AK74_DZ},
 	{Loot_WEAPON,		3,		AKS74U_DZ},
 	{Loot_WEAPON,		1,		AKM_DZ},
@@ -25,7 +27,7 @@ Military[] =
 	//Shotguns
 	{Loot_WEAPON,		2,		Remington870_DZ},
 	{Loot_WEAPON,		1,		M1014_DZ},
-	
+	*/
 	//Tools
 	{Loot_TOOL,			3,		Binocular},
 	{Loot_TOOL,			4,		ItemFlashlightRed},
@@ -52,8 +54,8 @@ Military[] =
 	{Loot_MAGAZINE,		5,		ItemSandbag},
 	{Loot_PILE,			15,		AmmoMilitaryLow, 1, 3},
 	{Loot_GROUP,		4,		AmmoMilitaryHigh},
-	{Loot_GROUP,		4,		AttachmentsGeneric},
-	{Loot_GROUP,		8,		AttachmentsEast},
+	//{Loot_GROUP,		4,		AttachmentsGeneric},
+	//{Loot_GROUP,		8,		AttachmentsEast},
 	{Loot_PILE,			10,		MedicalLow, 1, 2},
 	{Loot_PILE,			15,		Trash, 1, 2},
 	{Loot_PILE,			10,		Consumable, 1, 2},
@@ -62,6 +64,7 @@ Military[] =
 
 MilitarySpecial[] =
 {
+	/*
 	//Pistols
 	{Loot_WEAPON,		3,		Makarov_DZ},
 	{Loot_WEAPON,		1,		MakarovSD},
@@ -97,9 +100,17 @@ MilitarySpecial[] =
 	{Loot_WEAPON,		1,		RPK74_DZ},
 	{Loot_WEAPON,		0.5,	UK59_DZ},
 //	{Loot_WEAPON,		0.5,	PKM_DZ},
-	
+	*/
+	{Loot_WEAPON,		2,	NVGoggles},
+	{Loot_GROUP,		10,		pistols},
+	{Loot_GROUP,		5,		shotgunsingleshot},
+	{Loot_GROUP,		9,		sniperrifles},
+	{Loot_GROUP,		12,		submachinegun},
+	{Loot_GROUP,		13,		assaultrifles},
+	{Loot_GROUP,		9,		machineguns},
 	//Tools
 	{Loot_TOOL,			4,		Binocular},
+	{Loot_TOOL,			2,		Binocular_Vector},
 	{Loot_TOOL,			3,		ItemFlashlightRed},
 	{Loot_TOOL,			5,		ItemKnife},
 	{Loot_TOOL,			1.3,	ItemGPS},
@@ -108,6 +119,7 @@ MilitarySpecial[] =
 	
 	//Backpacks
 	{Loot_GROUP,		9,		militarybackpacks},
+	{Loot_GROUP,		9,		machinegunammo},
 	
 	//Clothing
 	{Loot_GROUP,		3,		militaryclothes},
@@ -118,20 +130,23 @@ MilitarySpecial[] =
 	{Loot_CONTAINER,	2,		DZ_AmmoBoxUS, AmmoBoxUS1, 7, 14},	//5.56x45
 	{Loot_CONTAINER,	2,		DZ_AmmoBoxRU, AmmoBoxCZ1, 7, 14},	//7.62x39
 	{Loot_CONTAINER,	1,		DZ_AmmoBoxRU, AmmoBoxCZ2, 2, 5},	//7.62x54R
+	{Loot_CONTAINER,	1,		AmmoBoxSmall_556, 5},
+	{Loot_CONTAINER,	1,		AmmoBoxSmall_762, 5},
 //	{Loot_CONTAINER,	0.5,	DZ_AmmoBoxRU, AmmoBoxRU3, 3, 7},	//7.62x54R
 	{Loot_CONTAINER,	0.5,	DZ_ExplosivesBoxRU, AmmoBoxRU4, 5, 15},	//GP-25
 	{Loot_CONTAINER,	0.5,	DZ_ExplosivesBoxRU, AmmoBoxRU5, 3, 7},	//Grenades
-	
+
 	//Other
 	{Loot_MAGAZINE,		3,		FoodMRE},
 	{Loot_MAGAZINE,		2,		ItemSandbag},
 	{Loot_MAGAZINE,		0.5,	PipeBomb},
 	{Loot_MAGAZINE,		0.5,	MAAWS_HEAT},
+	{Loot_MAGAZINE,		2,		100Rnd_762x54_PK},
 	{Loot_PILE,			15,		AmmoMilitaryLow, 1, 4},
 	{Loot_PILE,			10,		AmmoMilitaryHigh, 1, 3},
-	{Loot_GROUP,		2,		AttachmentsGeneric},
-	{Loot_GROUP,		8,		AttachmentsEast},
-	{Loot_GROUP,		6,		AttachmentsWest},
+	//{Loot_GROUP,		2,		AttachmentsGeneric},
+	//{Loot_GROUP,		8,		AttachmentsEast},
+	//{Loot_GROUP,		6,		AttachmentsWest},
 	{Loot_PILE,			10,		MedicalLow, 1, 2},
 	{Loot_PILE,			10,		Trash, 1, 2},
 	{Loot_PILE,			10,		Consumable, 1, 2},
@@ -139,9 +154,9 @@ MilitarySpecial[] =
 };
 
 MilitaryIndustrial[] = {//DZE ADDED
-	{Loot_GROUP,				8,		Parts},
+	{Loot_GROUP,				15,		Parts},
 	{ItemFuelBarrelEmpty,		3,		FoodMRE},
 	{ItemGenerator,				3,		FoodMRE},
 	{fuel_pump_kit,				1,		FoodMRE},
-	{Loot_GROUP, 				8, 		Military}
+	{Loot_GROUP, 				15, 	Military}
 };
\ No newline at end of file
diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Office.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Office.hpp
index 96aa45c33..903209c3a 100644
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Office.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Office.hpp
@@ -1,24 +1,36 @@
 Office[] =
 {
 	//Tools
-	{Loot_WEAPON,		8,		ItemWatch},
+	{Loot_WEAPON,		3,		ItemWatch},
 	{Loot_WEAPON,		6,		ItemMap},
-	{Loot_WEAPON,		5,		ItemFlashlight},
-	
+	{Loot_WEAPON,		6,		ItemCompass},
+	{Loot_WEAPON,		6,		ItemKnife},
+	{Loot_WEAPON,		4,		ItemFlashlight},
+	{Loot_WEAPON,		4,		ItemMatchbox_DZE},
+	{Loot_WEAPON,		4,		Binocular},
+	{Loot_WEAPON,		3,		ItemCrowbar},
+
 	//Pistols
 	{Loot_GROUP,		10,		pistols},
+	{Loot_GROUP,		4,		military},
+	{Loot_GROUP,		6,		shotgunsingleshot},
 	
 	//Rifles
 	{Loot_WEAPON,		3,		MeleeBaseBallBat},
 	
 	//Backpacks
 	{Loot_GROUP,		4,		backpacks},
+	{Loot_GROUP,		4,		tents},
+	{Loot_GROUP,		3,		clothes},
+	{Loot_GROUP,		2,		specialclothes},
 	
 	//Items
 	{Loot_MAGAZINE,		5,		ItemAntibacterialWipe},
 	{Loot_MAGAZINE,		5,		ItemPainkiller},
 	{Loot_MAGAZINE,		1,		ItemBriefcaseEmpty},
 	{Loot_MAGAZINE,		1,		ItemLockbox},
+	{Loot_MAGAZINE,		1,		PartPlywoodPack},
+	{Loot_MAGAZINE,		1,		ItemDocument},
 	//{Loot_MAGAZINE,		3,		10x_303}, //IN GENERIC
 	//{Loot_MAGAZINE,		1,		5x_22_LR_17_HMR}, //IN GENERIC
 	
@@ -26,6 +38,6 @@ Office[] =
 	{Loot_GROUP,		8,		Consumable},
 	{Loot_GROUP,		6,		Trash},
 	{Loot_GROUP,		8,		Generic},
-	{Loot_GROUP,		5,		AmmoCivilian},
-	{Loot_GROUP,		2,		AttachmentsGeneric}
+	{Loot_GROUP,		10,		AmmoCivilian}
+	//{Loot_GROUP,		5,		AttachmentsGeneric}
 };
\ No newline at end of file
diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Residential.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Residential.hpp
index d93f8d72b..e2b3c98d0 100644
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Residential.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Residential.hpp
@@ -1,34 +1,45 @@
 Residential[] =
 {
-	//Weapons
-	{Loot_WEAPON,		4,		Makarov_DZ},
-	{Loot_WEAPON,		3,		M1911_DZ},
-	{Loot_WEAPON,		3,		Revolver_DZ},
-	{Loot_WEAPON,		2,		MR43_DZ},
-	{Loot_WEAPON,		2,		Winchester1866_DZ},
-	{Loot_WEAPON,		1,		LeeEnfield_DZ},
+	//Weapons //Don't use new weapon classes
+	//{Loot_WEAPON,		4,		Makarov_DZ},
+	//{Loot_WEAPON,		3,		M1911_DZ},
+	//{Loot_WEAPON,		3,		Revolver_DZ},
+	//{Loot_WEAPON,		2,		MR43_DZ},
+	//{Loot_WEAPON,		2,		Winchester1866_DZ},
+	//{Loot_WEAPON,		1,		LeeEnfield_DZ},
 	{Loot_WEAPON,		1,		Mosin_DZ},
 	{Loot_WEAPON,		6,		MeleeBaseBallBat},
 	
+	//Weapon Groups
+	{Loot_GROUP,		3,		military},
+	{Loot_GROUP,		8,		pistols},
+	{Loot_GROUP,		6,		shotgunsingleshot},
+	
 	//Tools
-	{Loot_WEAPON,		1,		ItemMap},
+	{Loot_WEAPON,		3,		ItemMap},
 	{Loot_WEAPON,		5,		ItemWatch},
+	{Loot_WEAPON,		5,		ItemCompass},
 	{Loot_WEAPON,		6,		ItemFlashlight},
 	{Loot_WEAPON,		5,		ItemKnife},
 	{Loot_WEAPON,		3,		ItemShovel},
-	{Loot_WEAPON,		1,		ItemDIY_wood},
-	{Loot_WEAPON,		1,		ItemDIY_Gate},
+	{Loot_WEAPON,		1,		ItemDIY_wood}, //DUPLICATE OF AN EPOCH BUILDABLE?????
+	{Loot_WEAPON,		1,		ItemDIY_Gate}, //DUPLICATE OF AN EPOCH BUILDABLE?????
+	{Loot_WEAPON,		1,		Binocular},
 	
 	//Backpacks
 	{Loot_GROUP,		4,		backpacks},
 	
 	//Other
 	{Loot_MAGAZINE,		0.5,	ItemPadlock},
+	{Loot_MAGAZINE,		1,	PartPlywoodPack},
 	
 	{Loot_PILE,			6,		AmmoCivilian, 1, 2},
 	{Loot_PILE,			10,		Trash, 1, 3},
 	{Loot_PILE,			10,		Consumable, 1, 2},
-	{Loot_GROUP,		3,		AttachmentsGeneric},
+	//{Loot_GROUP,		4,		AttachmentsGeneric},
+	{Loot_GROUP,		5,		clothes},
+	{Loot_GROUP,		3,		specialclothes},
+	{Loot_GROUP,		3,		tents},
 	{Loot_WEAPON,		3,		ItemMatchbox_DZE},
 	{Loot_GROUP,		8,		Generic}
 };
\ No newline at end of file
diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Supermarket.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Supermarket.hpp
index badc85ca9..1b267620e 100644
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Supermarket.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Supermarket.hpp
@@ -12,6 +12,7 @@ Supermarket[] =
 	
 	//Pistols
 	{Loot_GROUP,		10,		pistols},
+	{Loot_GROUP,		5,		shotgunsingleshot},
 	//Rifles
 /*	{Loot_WEAPON,		1,		LeeEnfield_DZ},
 	{Loot_WEAPON,		1,		Mosin_DZ},
@@ -23,7 +24,9 @@ Supermarket[] =
 	{Loot_GROUP,		5,		backpacks},
 	
 	//Items
-	{Loot_MAGAZINE,		1,		ItemTent},
+	//{Loot_MAGAZINE,		1,		ItemTent}, //USE TENTS GROUP
+	{Loot_MAGAZINE,		1,		ItemMixOil},
+	{Loot_MAGAZINE,		1,		PartPlywoodPack},
 	{Loot_MAGAZINE,		0.5,	ItemDomeTent},
 	{Loot_MAGAZINE,		1,		ItemCamoNet},
 	{Loot_MAGAZINE,		0.5,	ItemPadlock},
@@ -33,10 +36,11 @@ Supermarket[] =
 	{Loot_MAGAZINE,		5,		equip_nails},
 	
 	//Groups
-	{Loot_GROUP,		70,		Consumable},
+	{Loot_GROUP,		40,		Consumable},
 	{Loot_GROUP,		20,		Generic},
 	{Loot_GROUP,		10,		AmmoCivilian},
-	{Loot_GROUP,		3,		AttachmentsGeneric},
+	//{Loot_GROUP,		3,		AttachmentsGeneric},
+	{Loot_GROUP,		3,		tents},
 	{Loot_WEAPON,		3,		ItemMatchbox_DZE},
 	{Loot_GROUP,		10,		Trash}
 //	{Loot_GROUP,		3,		MedicalLow}
diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Consumable.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Consumable.hpp
index 122e2ad45..24bdf60b7 100644
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Consumable.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Consumable.hpp
@@ -6,13 +6,15 @@ Consumable[] =
 	{Loot_MAGAZINE,		3,		ItemAntibacterialWipe},*/
 	
 	{Loot_MAGAZINE,		3,		ItemWaterBottleUnfilled},
-	{Loot_MAGAZINE,		1,		ItemWaterBottleSafe},
-	{Loot_MAGAZINE,		1,		ItemWaterBottle},
-	{Loot_MAGAZINE,		1,		ItemHeatPack},
+	{Loot_MAGAZINE,		3,		ItemWaterBottleSafe},
+	{Loot_MAGAZINE,		3,		ItemWaterBottle},
+	{Loot_MAGAZINE,		3,		ItemHeatPack},
 	
 	{Loot_MAGAZINE,		3,		ItemSodaCoke},
 	{Loot_MAGAZINE,		3,		ItemSodaPepsi},
-	{Loot_MAGAZINE,		0.2,	ItemSodaMdew},
+	{Loot_MAGAZINE,		1,		ItemSodaMdew},
+	{Loot_MAGAZINE,		1,		ItemSodaRbull},
+	{Loot_MAGAZINE,		1,		ItemSodaOrangeSherbet},
 
 	{Loot_MAGAZINE,		2,		ItemSodaMtngreen},
 	{Loot_MAGAZINE,		5,		ItemSodaR4z0r},
diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/CrashSite.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/CrashSite.hpp
index c95a41f2e..242bbba02 100644
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/CrashSite.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/CrashSite.hpp
@@ -8,14 +8,12 @@ CrashSiteType[] =
 	{Loot_NONE,			1,		CrashSite_UN, CrashSiteUN}		//United Nations Mi-8
 };
 
-
-
 /* Russian */
 
 CrashSiteRU[] =
 {
-	//Weapons
-	{Loot_WEAPON,		2,		Makarov_DZ},
+	//Weapons Don't use new classes
+	/*{Loot_WEAPON,		2,		Makarov_DZ},
 	{Loot_WEAPON,		4,		PDW_DZ},
 	{Loot_WEAPON,		4,		Bizon_DZ},
 	{Loot_WEAPON,		3,		AKS74U_DZ},
@@ -26,8 +24,15 @@ CrashSiteRU[] =
 	{Loot_WEAPON,		0.7,	PKM_DZ},
 	{Loot_WEAPON,		0.7,	SVD_DZ},
 	{Loot_WEAPON,		1,		M40A3_DZ},
-	{Loot_WEAPON,		0.7,	FNFAL_DZ},
-	
+	{Loot_WEAPON,		0.7,	FNFAL_DZ}, */
+	{Loot_GROUP,		10,		assaultrifles},
+	{Loot_GROUP,		4,		submachinegun},
+	{Loot_GROUP,		7,		sniperrifles},
+	{Loot_GROUP,		6,		machineguns},
+	{Loot_GROUP,		3,		military},
+	{Loot_WEAPON,		0.2,	MAAWS},
+	{Loot_CONTAINER,	3,		AmmoBoxSmall_556},
+	{Loot_CONTAINER,	3,		AmmoBoxSmall_762},
 	//Tools
 	{Loot_WEAPON,		1.5,	ItemGPS},
 	{Loot_WEAPON,		1,		Binocular_Vector},
@@ -35,6 +40,7 @@ CrashSiteRU[] =
 	
 	//Backpacks
 	{Loot_GROUP,		4,		militarybackpacks},
+	{Loot_GROUP,		4,		militaryVehicleAmmo},
 
 	//Clothing
 	{Loot_GROUP,		3,		militaryclothes},
@@ -42,15 +48,15 @@ CrashSiteRU[] =
 	
 	//Containers
 	{Loot_CONTAINER,	3,		DZ_MedBox, MedicalBox, 10, 20},
-	{Loot_CONTAINER,	2.3,	DZ_AmmoBoxRU, AmmoBoxRU1, 10, 20},		//545x39	AK74, RPK74
-	{Loot_CONTAINER,	1.7,	DZ_AmmoBoxRU, AmmoBoxRU2, 10, 20},		//762x39	AK47
-	{Loot_CONTAINER,	1,		DZ_AmmoBoxRU, AmmoBoxRU3, 5, 10},		//762x54r	SVD, PKM
+	//{Loot_CONTAINER,	2.3,	DZ_AmmoBoxRU, AmmoBoxRU1, 10, 20},		//545x39	AK74, RPK74
+	//{Loot_CONTAINER,	1.7,	DZ_AmmoBoxRU, AmmoBoxRU2, 10, 20},		//762x39	AK47
+	//{Loot_CONTAINER,	1,		DZ_AmmoBoxRU, AmmoBoxRU3, 5, 10},		//762x54r	SVD, PKM
 	
 	//Other
 	{Loot_MAGAZINE,		1,		PartVRotor},
 	{Loot_MAGAZINE,		2,		ItemCamonet},
-	{Loot_GROUP,		7,		AttachmentsEast},
-	{Loot_GROUP,		3,		AttachmentsWest},
+	//{Loot_GROUP,		7,		AttachmentsEast},
+	//{Loot_GROUP,		3,		AttachmentsWest},
 	
 	//Piles
 	{Loot_PILE,			15,		CrashSiteRUPile, 2, 4}
@@ -80,7 +86,7 @@ CrashSiteRUPile[] =
 CrashSiteUS[] =
 {
 	//Weapons
-	{Loot_WEAPON,		4,		M9_DZ},
+	/*{Loot_WEAPON,		4,		M9_DZ},
 	{Loot_WEAPON,		6,		MP5_DZ},
 	{Loot_WEAPON,		6,		M4A1_DZ},
 	{Loot_WEAPON,		8,		M16A4_DZ},
@@ -88,8 +94,16 @@ CrashSiteUS[] =
 	{Loot_WEAPON,		0.7,	Mk48_DZ},
 	{Loot_WEAPON,		1,		M14_DZ},
 	{Loot_WEAPON,		0.5,	DMR_DZ},
-	{Loot_WEAPON,		1,		M24_DZ},
-	
+	{Loot_WEAPON,		1,		M24_DZ},*/
+	{Loot_GROUP,		10,		assaultrifles},
+	{Loot_GROUP,		4,		submachinegun},
+	{Loot_GROUP,		7,		sniperrifles},
+	{Loot_GROUP,		6,		machineguns},
+	{Loot_GROUP,		3,		military},
+	{Loot_WEAPON,		0.2,	MAAWS},
+	{Loot_CONTAINER,	3,		AmmoBoxSmall_556},
+	{Loot_CONTAINER,	3,		AmmoBoxSmall_762},
+
 	//Tools
 	{Loot_WEAPON,		1.5,	ItemGPS},
 	{Loot_WEAPON,		1,		Binocular_Vector},
@@ -97,20 +111,21 @@ CrashSiteUS[] =
 	
 	//Backpacks
 	{Loot_GROUP,		4,		militarybackpacks},
+	{Loot_GROUP,		4,		militaryVehicleAmmo},
 
 	//Clothing
 	{Loot_GROUP,		3,		militaryclothes},
 	{Loot_GROUP,		2,		specialclothes},
 
 	//Containers
-	{Loot_CONTAINER,	3,		DZ_MedBox, MedicalBox, 10, 20},
-	{Loot_CONTAINER,	3,		DZ_AmmoBoxUS, AmmoBoxUS1, 10, 20},		//556x45	STANAG, M249
-	{Loot_CONTAINER,	2,		DZ_AmmoBoxUS, AmmoBoxUS2, 5, 10},		//762x51	DMR, M240
+	//{Loot_CONTAINER,	3,		DZ_MedBox, MedicalBox, 10, 20},
+	//{Loot_CONTAINER,	3,		DZ_AmmoBoxUS, AmmoBoxUS1, 10, 20},		//556x45	STANAG, M249
+	//{Loot_CONTAINER,	2,		DZ_AmmoBoxUS, AmmoBoxUS2, 5, 10},		//762x51	DMR, M240
 	
 	//Other
 	{Loot_MAGAZINE,		1,		PartVRotor},
 	{Loot_MAGAZINE,		2,		ItemCamonet},
-	{Loot_GROUP,		10,		AttachmentsWest},
+	//{Loot_GROUP,		10,		AttachmentsWest},
 	
 	//Piles
 	{Loot_PILE,			15,		CrashSiteUSPile, 2, 4}
@@ -140,6 +155,7 @@ CrashSiteUSPile[] =
 CrashSiteEU[] =
 {
 	//Weapons
+	/*
 	{Loot_WEAPON,		4,		G17_DZ},
 	{Loot_WEAPON,		6,		MP5_DZ},
 	{Loot_WEAPON,		5,		G36C_DZ},
@@ -151,7 +167,16 @@ CrashSiteEU[] =
 	{Loot_WEAPON,		0.7,	M240_DZ},
 	{Loot_WEAPON,		0.9,	L110A1_DZ},
 	{Loot_WEAPON,		1,		M24_DZ},
-	
+	*/
+	{Loot_GROUP,		10,		assaultrifles},
+	{Loot_GROUP,		4,		submachinegun},
+	{Loot_GROUP,		7,		sniperrifles},
+	{Loot_GROUP,		6,		machineguns},
+	{Loot_GROUP,		3,		military},
+	{Loot_WEAPON,		0.2,	MAAWS},
+	{Loot_CONTAINER,	3,		AmmoBoxSmall_556},
+	{Loot_CONTAINER,	3,		AmmoBoxSmall_762},
+
 	//Tools
 	{Loot_WEAPON,		1.5,	ItemGPS},
 	{Loot_WEAPON,		1,		Binocular_Vector},
@@ -159,6 +184,7 @@ CrashSiteEU[] =
 	
 	//Backpacks
 	{Loot_GROUP,		4,		militarybackpacks},
+	{Loot_GROUP,		4,		militaryVehicleAmmo},
 
 	//Clothing
 	{Loot_GROUP,		3,		militaryclothes},
@@ -166,13 +192,13 @@ CrashSiteEU[] =
 	
 	//Containers
 	{Loot_CONTAINER,	3,		DZ_MedBox, MedicalBox, 10, 20},
-	{Loot_CONTAINER,	3,		DZ_AmmoBoxUS, AmmoBoxEU1, 10, 20},		//556x45	G36, M249
-	{Loot_CONTAINER,	2,		DZ_AmmoBoxUS, AmmoBoxEU2, 5, 10},		//762x51	FAL, M240
+	//{Loot_CONTAINER,	3,		DZ_AmmoBoxUS, AmmoBoxEU1, 10, 20},		//556x45	G36, M249
+	//{Loot_CONTAINER,	2,		DZ_AmmoBoxUS, AmmoBoxEU2, 5, 10},		//762x51	FAL, M240
 	
 	//Other
 	{Loot_MAGAZINE,		1,		PartVRotor},
 	{Loot_MAGAZINE,		2,		ItemCamonet},
-	{Loot_GROUP,		10,		AttachmentsWest},
+	//{Loot_GROUP,		10,		AttachmentsWest},
 	
 	//Piles
 	{Loot_PILE,			15,		CrashSiteEUPile, 2, 4}
@@ -202,6 +228,7 @@ CrashSiteEUPile[] =
 CrashSiteUN[] =
 {
 	//Weapons
+	/*
 	{Loot_WEAPON,		2,		Makarov_DZ},
 	{Loot_WEAPON,		2,		M9_DZ},
 	{Loot_WEAPON,		2,		G17_DZ},
@@ -214,12 +241,24 @@ CrashSiteUN[] =
 	{Loot_WEAPON,		3,		G36C_DZ},
 	{Loot_WEAPON,		2,		L85_Holo_DZ},
 	{Loot_WEAPON,		1,		RPK74_DZ},
-
-	//Backpacks
-	{Loot_GROUP,		4,		militarybackpacks},
+	*/
+	{Loot_GROUP,		10,		assaultrifles},
+	{Loot_GROUP,		4,		submachinegun},
+	{Loot_GROUP,		7,		sniperrifles},
+	{Loot_GROUP,		6,		machineguns},
+	{Loot_GROUP,		3,		military},
+	{Loot_WEAPON,		0.2,	MAAWS},
+	{Loot_CONTAINER,	3,		AmmoBoxSmall_556},
+	{Loot_CONTAINER,	3,		AmmoBoxSmall_762},
 
 	//Tools
-	{Loot_WEAPON,		2,		ItemGPS},
+	{Loot_WEAPON,		1.5,	ItemGPS},
+	{Loot_WEAPON,		1,		Binocular_Vector},
+	{Loot_WEAPON,		0.5,	NVGoggles},
+	
+	//Backpacks
+	{Loot_GROUP,		4,		militarybackpacks},
+	{Loot_GROUP,		4,		militaryVehicleAmmo},
 	
 	//Clothing
 	{Loot_GROUP,		3,		militaryclothes},
@@ -228,14 +267,14 @@ CrashSiteUN[] =
 	//Containers
 	{Loot_CONTAINER,	10,		DZ_MedBox, MedicalBox, 10, 20},
 	{Loot_CONTAINER,	10,		DZ_CardboardBox, Consumable, 10, 20},
-	{Loot_CONTAINER,	2,		DZ_AmmoBoxUS, AmmoBoxUS1, 5, 15},		//556x45	STANAG, M249
-	{Loot_CONTAINER,	2,		DZ_AmmoBoxRU, AmmoBoxRU1, 5, 15},		//545x39	AK74, RPK74
+	//{Loot_CONTAINER,	2,		DZ_AmmoBoxUS, AmmoBoxUS1, 5, 15},		//556x45	STANAG, M249
+	//{Loot_CONTAINER,	2,		DZ_AmmoBoxRU, AmmoBoxRU1, 5, 15},		//545x39	AK74, RPK74
 	
 	//Other
 	{Loot_MAGAZINE,		1,		PartVRotor},
 	{Loot_MAGAZINE,		2,		ItemCamonet},
-	{Loot_GROUP,		3,		AttachmentsEast},
-	{Loot_GROUP,		3,		AttachmentsWest},
+	//{Loot_GROUP,		3,		AttachmentsEast},
+	//{Loot_GROUP,		3,		AttachmentsWest},
 	
 	//Piles
 	{Loot_PILE,			20,		CrashSiteUNPile, 2, 4}
diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Generic.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Generic.hpp
index abd848d1a..da1f84ea1 100644
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Generic.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Generic.hpp
@@ -24,4 +24,10 @@ Generic[] =
 	{Loot_MAGAZINE,		1,		equip_nails},
 	{Loot_MAGAZINE,		1,		ItemFuelCan},
 	{Loot_MAGAZINE,		1,		PartWoodPile}
+};
+//DZE
+tents[] = {
+	{Loot_MAGAZINE,		1.1,		WeaponHolder_ItemTentOld},
+	{Loot_MAGAZINE,		1,		WeaponHolder_ItemTentDomed},
+	{Loot_MAGAZINE,		1,		WeaponHolder_ItemTentDomed2}
 };
\ No newline at end of file
diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/InfectedCamp.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/InfectedCamp.hpp
index f499483ec..04faf550d 100644
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/InfectedCamp.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/InfectedCamp.hpp
@@ -40,11 +40,9 @@ InfectedCamp[] =
 	{Loot_GROUP,		10,		pistols},
 
 	//Rifles
-	{Loot_WEAPON,		3,		LeeEnfield_DZ},
+	{Loot_GROUP,		6,		assaultrifles},
+	{Loot_GROUP,		8,		farmweapons},
 	{Loot_WEAPON,		2,		Mosin_DZ},
-	{Loot_WEAPON,		1,		CZ550_DZ},
-	{Loot_WEAPON,		3,		Winchester1866_DZ},
-	{Loot_WEAPON,		3,		MR43_DZ},
 	{Loot_WEAPON,		4,		Crossbow_DZ},
 	{Loot_WEAPON,		5,		MeleeBaseBallBat},
 	
diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp
index ebd028678..270b6a2cd 100644
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp
@@ -27,8 +27,10 @@ shotgunsingleshot[] = {
 };
 farmweapons[] = {
 	{Loot_GROUP,		5,		shotgunsingleshot},
-	,{Loot_WEAPON,		2,		huntingrifle}
-	,{Loot_WEAPON,		1,		Chainsaw}
+	{Loot_WEAPON,		2,		huntingrifle},
+	{Loot_WEAPON,		0.3,	Chainsaw},
+	{Loot_WEAPON,		3,		Mosin_DZ}
+	//{Loot_WEAPON,		2,		CZ550_DZ}, //Huntingrifle
 	//,{Loot_WEAPON,		2,		RedRyder}
 };
 sniperrifles[] = {
diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/Hatchet.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/Hatchet.hpp
index bd5e834f2..28d0fc2bd 100644
--- a/SQF/dayz_code/Configs/CfgWeapons/Tools/Hatchet.hpp
+++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/Hatchet.hpp
@@ -34,12 +34,17 @@ class ItemHatchet : ItemCore
 };
 class ItemHatchet_DZE : ItemCore {
 		scope = 2;
-		displayName = $STR_EQUIP_NAME_41;
+		displayName = $STR_EQUIP_NAME_HATCHET;
 		model = "\dayz_equip\models\hatchet.p3d";
 		picture = "\dayz_equip\textures\equip_hatchet_CA.paa";
-		descriptionShort = $STR_EQUIP_DESC_41;
+		descriptionShort = $STR_EQUIP_DESC_HATCHET;
 		class ItemActions
 		{
+			class Use
+			{
+				text = $STR_ACTIONS_CHOPWOOD;
+				script = "spawn player_chopWood;";
+			};
 			class ToBack
 			{
 				text = $STR_ACTIONS_2BACK;
diff --git a/SQF/dayz_code/NOTE.txt b/SQF/dayz_code/NOTE.txt
index 70d727bd8..5b687c7cd 100644
--- a/SQF/dayz_code/NOTE.txt
+++ b/SQF/dayz_code/NOTE.txt
@@ -20,4 +20,12 @@ Create switchable blood system with variable.
 Convert (if old system) to ItemBloodbag
 
 bloodBagANEG bloodBagAPOS bloodBagBNEG bloodBagBPOS bloodBagONEG bloodBagOPOS
-wholeBloodBagANEG wholeBloodBagAPOS wholeBloodBagBNEG wholeBloodBagBPOS wholeBloodBagONEG wholeBloodBagOPOS
\ No newline at end of file
+wholeBloodBagANEG wholeBloodBagAPOS wholeBloodBagBNEG wholeBloodBagBPOS wholeBloodBagONEG wholeBloodBagOPOS
+
+
+WEAPONHOLDE_TOOL IS NO LONGER USED! FIX BY REPLACING OCCURENCES
+I.E. ItemCrowbar replaces WeaponHolder_MeleeCrowbar
+WeaponHolder_ItemHatchet_DZE
+WeaponHolder_MeleeCrowbar
+
+REMOVE TOOL BREAKING, IT'S STUPID
\ No newline at end of file