From bf516a65e591d17ff5e88f236d37f0df81d4c788 Mon Sep 17 00:00:00 2001
From: AirwavesMan <AirwavesMan@users.noreply.github.com>
Date: Sun, 13 Sep 2020 16:53:36 +0200
Subject: [PATCH] Change ItemGenerator to WeaponHolder_ItemGenerator

With WeaponHolder_ItemGenerator we do not need the postion set up in the spawn.sqf
---
 SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Church.hpp | 1 -
 .../Configs/CfgLoot/Groups/Buildings/Construction.hpp     | 2 +-
 .../Configs/CfgLoot/Groups/Buildings/Industrial.hpp       | 2 +-
 .../CfgLoot/Groups/Buildings/MilitaryIndustrial.hpp       | 8 ++++----
 SQF/dayz_code/Configs/CfgVehicles/WeaponHolder.hpp        | 2 +-
 SQF/dayz_code/loot/spawn.sqf                              | 5 -----
 6 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Church.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Church.hpp
index 389b8ebf9..d1ac041e7 100644
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Church.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Church.hpp
@@ -11,7 +11,6 @@ Church[] =
 	{Loot_GROUP,		4,		backpacks},
 	
 	//Items
-//	{Loot_MAGAZINE,		1,		equip_Crossbow_Kit}, //not functional yet
 	{Loot_MAGAZINE,		4,		ItemBookBible},
 	
 	//Groups
diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Construction.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Construction.hpp
index 697022a92..edeca0c02 100644
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Construction.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Construction.hpp
@@ -1,6 +1,7 @@
 Construction[] =
 {
 	//Items
+	{Loot_VEHICLE,		3,		WeaponHolder_ItemGenerator},
 	{Loot_MAGAZINE,		1,		ItemComboLock},
 	{Loot_MAGAZINE,		6,		ItemSandbag},
 	{Loot_MAGAZINE,		1,		ItemWire},
@@ -8,7 +9,6 @@ Construction[] =
 	{Loot_MAGAZINE,		2,		equip_hose},
 	{Loot_MAGAZINE,		2,		MortarBucket},
 	{Loot_MAGAZINE,		6,		CinderBlocks},
-	{Loot_MAGAZINE,		3,		ItemGenerator},
 	{Loot_MAGAZINE,		1,		fuel_pump_kit},
 	
 	//Other
diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Industrial.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Industrial.hpp
index 2f1c18b89..c0c49fda7 100644
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Industrial.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Industrial.hpp
@@ -3,12 +3,12 @@ Industrial[] =
 	//Tools
 	{Loot_GROUP,		15,		ToolsBuilding},
 	{Loot_VEHICLE,		8,		WeaponHolder_ItemCrowbar},
+	{Loot_VEHICLE,		3,		WeaponHolder_ItemGenerator},
 	
 	//Items
 	{Loot_MAGAZINE,		2,		MortarBucket},
 	{Loot_MAGAZINE,		6,		CinderBlocks},
 	{Loot_MAGAZINE,		3,		ItemRSJ},
-	{Loot_MAGAZINE,		3,		ItemGenerator},
 	{Loot_MAGAZINE,		1,		fuel_pump_kit},
 	
 	//Other
diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/MilitaryIndustrial.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/MilitaryIndustrial.hpp
index 2da315e39..1a61d9f04 100644
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/MilitaryIndustrial.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/MilitaryIndustrial.hpp
@@ -13,7 +13,7 @@ MilitaryIndustrialRU[] = {
 	{Loot_MAGAZINE,		1,		PartVRotor},
 	{Loot_MAGAZINE,		4,		FoodMRE},
 	{Loot_GROUP,		1,		FuelBarrel},
-	{Loot_MAGAZINE,		1,		ItemGenerator},
+	{Loot_VEHICLE,		1,		WeaponHolder_ItemGenerator},
 	{Loot_MAGAZINE,		1,		fuel_pump_kit},
 	{Loot_MAGAZINE,		1,		ItemTankTrap},
 	{Loot_MAGAZINE,		4,		ItemSandbag},
@@ -33,7 +33,7 @@ MilitaryIndustrialUS[] = {
 	{Loot_MAGAZINE,		1,		PartVRotor},
 	{Loot_MAGAZINE,		4,		FoodMRE},
 	{Loot_GROUP,		1,		FuelBarrel},
-	{Loot_MAGAZINE,		1,		ItemGenerator},
+	{Loot_VEHICLE,		1,		WeaponHolder_ItemGenerator},
 	{Loot_MAGAZINE,		1,		fuel_pump_kit},
 	{Loot_MAGAZINE,		1,		ItemTankTrap},
 	{Loot_MAGAZINE,		4,		ItemSandbag},
@@ -53,7 +53,7 @@ MilitaryIndustrialEU[] = {
 	{Loot_MAGAZINE,		1,		PartVRotor},
 	{Loot_MAGAZINE,		4,		FoodMRE},
 	{Loot_GROUP,		1,		FuelBarrel},
-	{Loot_MAGAZINE,		1,		ItemGenerator},
+	{Loot_VEHICLE,		1,		WeaponHolder_ItemGenerator},
 	{Loot_MAGAZINE,		1,		fuel_pump_kit},
 	{Loot_MAGAZINE,		1,		ItemTankTrap},
 	{Loot_MAGAZINE,		4,		ItemSandbag},
@@ -73,7 +73,7 @@ MilitaryIndustrialCZ[] = {
 	{Loot_MAGAZINE,		1,		PartVRotor},
 	{Loot_MAGAZINE,		4,		FoodMRE},
 	{Loot_GROUP,		1,		FuelBarrel},
-	{Loot_MAGAZINE,		1,		ItemGenerator},
+	{Loot_VEHICLE,		1,		WeaponHolder_ItemGenerator},
 	{Loot_MAGAZINE,		1,		fuel_pump_kit},
 	{Loot_MAGAZINE,		1,		ItemTankTrap},
 	{Loot_MAGAZINE,		4,		ItemSandbag},
diff --git a/SQF/dayz_code/Configs/CfgVehicles/WeaponHolder.hpp b/SQF/dayz_code/Configs/CfgVehicles/WeaponHolder.hpp
index 4703b6ac8..2c28fb3cb 100644
--- a/SQF/dayz_code/Configs/CfgVehicles/WeaponHolder.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/WeaponHolder.hpp
@@ -248,7 +248,7 @@ class WeaponHolder_ItemGenerator : WeaponHolderBase {
 	destrType = "DestructNo";
 	
 	class eventHandlers {
-		delete init;
+		init = "[(_this select 0),'cfgMagazines','ItemGenerator'] spawn object_pickupAction";		
 	};
 };
 
diff --git a/SQF/dayz_code/loot/spawn.sqf b/SQF/dayz_code/loot/spawn.sqf
index f90af2b30..3437d17c8 100644
--- a/SQF/dayz_code/loot/spawn.sqf
+++ b/SQF/dayz_code/loot/spawn.sqf
@@ -45,11 +45,6 @@ call {
 		_vehicle = "WeaponHolder" createVehicle [0,0,0];
 		_vehicle addMagazineCargoGlobal [_item, 1];
 
-		// Fix generator spawning half way in the floor by raising z coordinate by .3 meters.
-		if (_item == "ItemGenerator") then {
-			_pos set [2, ((_pos select 2) + .3)];
-		};
-
 		if (_isWater) then {
 			_vehicle setPos (_pos);
 		} else {