From e61eeaca09a8c3928810ea3e3b44fb58dc39da79 Mon Sep 17 00:00:00 2001
From: ebaydayz <ebaydayz@openmailbox.org>
Date: Tue, 8 Mar 2016 14:26:33 -0500
Subject: [PATCH] Generator_DZ no longer in BuiltItems

Needed to add it to variables.sqf lists.

@icomrade - Any reason FireBarrel_DZ was removed? I think we still need
it, since it is an epoch buildable class, unless we merge it with
Land_Fire_barrel.
---
 .../Configs/CfgVehicles/CfgVehicles.hpp       | 129 +++++++++--------
 .../Configs/CfgVehicles/DZE/Prop_Defs.hpp     |  36 +++--
 .../Configs/CfgVehicles/Helicopter/AH6.hpp    |   1 -
 .../Configs/CfgVehicles/StreetLamps.hpp       |  33 -----
 .../Configs/CfgVehicles/Zeds/NewZeds.hpp      | 135 ------------------
 SQF/dayz_code/init/variables.sqf              |   6 +-
 6 files changed, 88 insertions(+), 252 deletions(-)
 delete mode 100644 SQF/dayz_code/Configs/CfgVehicles/StreetLamps.hpp
 delete mode 100644 SQF/dayz_code/Configs/CfgVehicles/Zeds/NewZeds.hpp

diff --git a/SQF/dayz_code/Configs/CfgVehicles/CfgVehicles.hpp b/SQF/dayz_code/Configs/CfgVehicles/CfgVehicles.hpp
index 34930c6d3..b2ecba26f 100644
--- a/SQF/dayz_code/Configs/CfgVehicles/CfgVehicles.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/CfgVehicles.hpp
@@ -13,69 +13,6 @@ class CfgVehicles {
 		class Sounds { class Engine; class Movement;};
 		class DefaultEventhandlers;
 	};
-	class Land;	// External class reference
-	class LandVehicle : Land {
-		class NewTurret;
-		class Sounds;
-		class ViewOptics;
-		class ViewPilot;
-		class AnimationSources;
-		class EventHandlers;
-		class Reflectors {
-			class Left {
-				color[] = {0.9,0.8,0.8,1};
-				ambient[] = {0.1,0.1,0.1,1};
-				position = "L svetlo";
-				direction = "konec L svetla";
-				hitpoint = "L svetlo";
-				selection = "L svetlo";
-				size = 0.5;
-				brightness = 0.5;
-			};
-			class Right {
-				color[] = {0.9,0.8,0.8,1};
-				ambient[] = {0.1,0.1,0.1,1};
-				position = "P svetlo";
-				direction = "konec P svetla";
-				hitpoint = "P svetlo";
-				selection = "P svetlo";
-				size = 0.5;
-				brightness = 0.5;
-			};
-		};
-	};
-	class car: landvehicle {
-		class Turrets {
-			class MainTurret: NewTurret {
-				class Turrets;
-				class ViewOptics;
-			};
-		};
-		class HitPoints {
-			class HitEngine;
-			class HitRGlass;
-			class HitLGlass;
-			class HitBody;
-			class HitFuel;
-			class HitLFWheel;
-			class HitRFWheel;
-			class HitLF2Wheel;
-			class HitRF2Wheel;
-			class HitLMWheel;
-			class HitRMWheel;
-			class HitLBWheel;
-			class HitRBWheel;
-			class HitGlass1;
-			class HitGlass2;
-			class HitGlass3;
-			class HitGlass4;
-		};
-		class Sounds : Sounds {
-			class Engine;
-			class Movement;
-		};
-	};
-
 	class Air : AllVehicles {
 		class NewTurret;
 		class ViewPilot;
@@ -191,6 +128,69 @@ class CfgVehicles {
 			};
 		};
 	};
+	class Land;	// External class reference
+	class LandVehicle : Land {
+		class NewTurret;
+		class Sounds;
+		class ViewOptics;
+		class ViewPilot;
+		class AnimationSources;
+		class EventHandlers;
+		class Reflectors {
+			class Left {
+				color[] = {0.9,0.8,0.8,1};
+				ambient[] = {0.1,0.1,0.1,1};
+				position = "L svetlo";
+				direction = "konec L svetla";
+				hitpoint = "L svetlo";
+				selection = "L svetlo";
+				size = 0.5;
+				brightness = 0.5;
+			};
+			class Right {
+				color[] = {0.9,0.8,0.8,1};
+				ambient[] = {0.1,0.1,0.1,1};
+				position = "P svetlo";
+				direction = "konec P svetla";
+				hitpoint = "P svetlo";
+				selection = "P svetlo";
+				size = 0.5;
+				brightness = 0.5;
+			};
+		};
+	};
+	class car: landvehicle {
+		class Turrets {
+			class MainTurret: NewTurret {
+				class Turrets;
+				class ViewOptics;
+			};
+		};
+		class HitPoints {
+			class HitEngine;
+			class HitRGlass;
+			class HitLGlass;
+			class HitBody;
+			class HitFuel;
+			class HitLFWheel;
+			class HitRFWheel;
+			class HitLF2Wheel;
+			class HitRF2Wheel;
+			class HitLMWheel;
+			class HitRMWheel;
+			class HitLBWheel;
+			class HitRBWheel;
+			class HitGlass1;
+			class HitGlass2;
+			class HitGlass3;
+			class HitGlass4;
+		};
+		class Sounds : Sounds {
+			class Engine;
+			class Movement;
+		};
+	};
+
 	class Tank: landvehicle	{
   		class Sounds: Sounds  {
    			class Engine;
@@ -380,7 +380,7 @@ class CfgVehicles {
 	class RubberBoat;
 	//class UAZ_Unarmed_Base;
 	//class HMMWV_Base;
-	//class AH6_Base_EP1;
+	class AH6_Base_EP1;
 	class An2_Base_EP1;
 	class TT650_Base;
 	class V3S_Base;
@@ -431,7 +431,6 @@ class CfgVehicles {
 	#include "Zeds\WildZeds.hpp" //Viral type zeds
 	#include "Zeds\SwarmZeds.hpp" //Swarm
 	#include "Zeds\PlayerZeds.hpp"
-	//#include "Zeds\NewZeds.hpp"
 	#include "Females\females.hpp"
 	//Survivor Skins
 	#include "Skins.hpp"
diff --git a/SQF/dayz_code/Configs/CfgVehicles/DZE/Prop_Defs.hpp b/SQF/dayz_code/Configs/CfgVehicles/DZE/Prop_Defs.hpp
index 7bc66fef4..df8a9d97c 100644
--- a/SQF/dayz_code/Configs/CfgVehicles/DZE/Prop_Defs.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/DZE/Prop_Defs.hpp
@@ -4,10 +4,6 @@ class Mass_grave_DZ: Mass_grave
 	displayName = "Mass Grave W/ Zombies";
 };
 
-//class Strategic;
-//class NonStrategic;
-
-
 class Land_Ind_FuelStation_Feed_EP1: Strategic
 {
 	model = "\ca\Structures_E\Ind\Ind_FuelStation\Ind_FuelStation_Feed_ep1.p3d";
@@ -69,8 +65,6 @@ class Land_benzina_schnell: Strategic
 	nameSound = "fuelstation";
 };
 
-//class NonStrategic;
-//class BuiltItems: NonStrategic{};
 class MiningItems: NonStrategic{
 	class DestructionEffects {
 		class Sound {
@@ -132,7 +126,6 @@ class DebugBoxPlayer_DZ: NonStrategic
 	};
 };
 
-//class TrapItems: NonStrategic{};
 // buildables
 class Hedgehog_DZ: BuiltItems
 {
@@ -398,6 +391,26 @@ class Supply_Crate_DZE: MiningItems
 		};
 	};
 };
+
+class FireBarrel_DZ:Land_Fire_barrel
+{
+	// destrType = "DestructNo";
+	cost = 100;
+	offset[] = {0,2,0.5};
+	//model = "\z\addons\dayz_epoch\models\oil_drum_model.p3d";
+	icon = "\ca\data\data\Unknown_object.paa";
+	mapSize = 2;
+	armor = 400;
+	vehicleClass = "Fortifications";
+	constructioncount = 2;
+	removeoutput[] = {{"ItemFuelBarrelEmpty",1}};
+	nounderground = 0;
+	/*class EventHandlers
+		{
+			init = "(_this select 0) inflame 1";
+		};*/
+};
+	
 class Gunrack1;
 class GunRack_DZ: Gunrack1
 {
@@ -567,14 +580,7 @@ class OutHouse_DZ: Land_KBud
 	transportMaxWeapons = 4;
 	transportMaxBackpacks = 4;
 	constructioncount = 2;
-	class transportmagazines
-	{
-		class _xx_ItemTrashToiletpaper
-		{
-			magazine = "ItemTrashToiletpaper";
-			count = 1;
-		};
-	};
+	class transportmagazines {};
 };
 class Land_Shed_M01;
 class StorageShed_DZ: Land_Shed_M01
diff --git a/SQF/dayz_code/Configs/CfgVehicles/Helicopter/AH6.hpp b/SQF/dayz_code/Configs/CfgVehicles/Helicopter/AH6.hpp
index 80c8eeea3..798fd47f3 100644
--- a/SQF/dayz_code/Configs/CfgVehicles/Helicopter/AH6.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/Helicopter/AH6.hpp
@@ -1,4 +1,3 @@
-class AH6_Base_EP1;
 class AH6J_EP1_DZ: AH6_Base_EP1
 {
 	scope = public;
diff --git a/SQF/dayz_code/Configs/CfgVehicles/StreetLamps.hpp b/SQF/dayz_code/Configs/CfgVehicles/StreetLamps.hpp
deleted file mode 100644
index 984d1a408..000000000
--- a/SQF/dayz_code/Configs/CfgVehicles/StreetLamps.hpp
+++ /dev/null
@@ -1,33 +0,0 @@
-access = 0;
-class StreetLamp
-{
-	scope = private;
-	model = "";
-	destrType = "DestructTree";
-	simulation = "thing";
-};
-class Land_lampa_sidl: StreetLamp
-{
-	scope = protected;
-	model = "\ca\buildings\Misc\lampa_sidl";
-};
-class Land_lampa_sidl_2: StreetLamp
-{
-	scope = protected;
-	model = "\ca\buildings\Misc\lampa_sidl_2";
-};
-class Land_lampa_sidl_3: StreetLamp
-{
-	scope = protected;
-	model = "\ca\buildings\Misc\lampa_sidl_3";
-};
-class Land_lampa_ind: StreetLamp
-{
-	scope = protected;
-	model = "\ca\buildings\Misc\lampa_ind";
-};
-class Land_lampa_ind_zebr: StreetLamp
-{
-	scope = protected;
-	model = "\ca\buildings\Misc\lampa_ind_zebr";
-};
\ No newline at end of file
diff --git a/SQF/dayz_code/Configs/CfgVehicles/Zeds/NewZeds.hpp b/SQF/dayz_code/Configs/CfgVehicles/Zeds/NewZeds.hpp
deleted file mode 100644
index b19fbde45..000000000
--- a/SQF/dayz_code/Configs/CfgVehicles/Zeds/NewZeds.hpp
+++ /dev/null
@@ -1,135 +0,0 @@
-	class zZombie_new_Base : zZombie_Base {
-		scope = public;
-		glassesEnabled = 0;
-		identityTypes[] = {"Zombie3"};
-		class TalkTopics {};
-		languages[] = {};
-		//Armor * hitpointArmor = Total Armor
-		armor = 10; 
-		
-		class Eventhandlers {
-			init = "_this call zombie_initialize;";
-			local = "if(_this select 1) then {[(position (_this select 0)),(_this select 0),true] execFSM '\z\AddOns\dayz_code\system\zombie_agent.fsm'};";
-		};
-		
-		class HitPoints {
-			class HitHead {
-				armor = 0.1;
-				material = -1;
-				name = "head_hit";
-				passThrough = true;
-				memoryPoint = "pilot";
-			};
-			
-			class HitBody : HitHead {
-				armor = 2;
-				name = "body";
-				memoryPoint = "aimPoint";
-			};
-			
-			class HitSpine : HitHead {
-				armor = 2;
-				name = "Spine2";
-				memoryPoint = "aimPoint";
-			};
-			
-			class HitHands : HitHead {
-				armor = 0.5;
-				material = -1;
-				name = "hands";
-				passThrough = true;
-			};
-			class HitLArm : HitHands {
-				name = "LeftArm";
-				memoryPoint = "lelbow";
-			};
-			
-			class HitRArm : HitHands {
-				name = "RightArm";
-				memoryPoint = "relbow";
-			};
-			
-			class HitLForeArm : HitHands {
-				name = "LeftForeArm";
-				memoryPoint = "lwrist";
-			};
-			
-			class HitRForeArm : HitHands {
-				name = "RightForeArm";
-				memoryPoint = "rwrist";
-			};
-			
-			class HitLHand : HitHands {
-				name = "LeftHand";
-				memoryPoint = "LeftHandMiddle1";
-			};
-			
-			class HitRHand : HitHands {
-				name = "RightHand";
-				memoryPoint = "RightHandMiddle1";
-			};
-			
-			class HitLegs : HitHands {
-				armor = 10;
-				name = "legs";
-				memoryPoint = "pelvis";
-			};
-			
-			class HitLLeg : HitHands {
-				name = "LeftLeg";
-				memoryPoint = "lknee";
-			};
-			
-			class HitLLegUp : HitHands {
-				name = "LeftUpLeg";
-				memoryPoint = "lfemur";
-			};
-			
-			class HitRLeg : HitHands {
-				name = "RightLeg";
-				memoryPoint = "rknee";
-			};
-			
-			class HitRLegUp : HitHands {
-				name = "RightUpLeg";
-				memoryPoint = "rfemur";
-			};
-		};
-	};
-	
-	class z_villager1 : zZombie_new_Base {
-		zombieLoot = "civilian";
-		model = "\ca\characters2\civil\Villager\Villager";
-		hiddenSelections[] = {"Camo"};
-		hiddenSelectionsTextures[] = {"z\addons\dayz_communityassets\zeds\villager\villager_v4_co.paa"};
-		
-		class Wounds {
-			tex[] = {};
-			mat[] = {"ca\characters\heads\male\defaulthead\data\hhl.rvmat", "ca\characters\heads\male\defaulthead\data\hhl_Wounds.rvmat", "ca\characters\heads\male\defaulthead\data\hhl_Wounds.rvmat", "ca\characters2\Civil\Villager\Data\villager.RVmat", "ca\characters2\Civil\Villager\Data\villager_w1.RVmat", "ca\characters2\Civil\Villager\Data\villager_w2.RVmat"};
-		};
-	};
-	class z_villager2 : z_villager1 {
-		hiddenSelectionsTextures[] = {"z\addons\dayz_communityassets\zeds\villager\villager_v2_co.paa"};
-	};
-	class z_villager3 : z_villager1 {
-		hiddenSelectionsTextures[] = {"z\addons\dayz_communityassets\zeds\villager\villager_v3_co.paa"};
-	};
-	
-	class z_worker1 : zZombie_new_Base {
-		zombieLoot = "worker";
-		model = "\Ca\characters_E\Overall\Overall";
-		hiddenSelections[] = {"Camo"};
-		hiddenSelectionsTextures[] = {"z\addons\dayz_communityassets\zeds\overall\Overall_4_co.paa"};
-		
-		class Wounds {
-			tex[] = {};
-			mat[] = {"Ca\characters_E\Overall\Data\Overall.rvmat", "Ca\characters_E\Overall\Data\W1_Overall.rvmat", "Ca\characters_E\Overall\Data\W2_Overall.rvmat"};
-		};
-	};
-	
-	class z_worker2 : z_worker1 {
-		hiddenSelectionsTextures[] = {"z\addons\dayz_communityassets\zeds\overall\overall_2_co.paa"};
-	};
-	class z_worker3 : z_worker1 {
-		hiddenSelectionsTextures[] = {"z\addons\dayz_communityassets\zeds\overall\Overall_3_co.paa"};
-	};
\ No newline at end of file
diff --git a/SQF/dayz_code/init/variables.sqf b/SQF/dayz_code/init/variables.sqf
index 03fc85459..b322e2d72 100644
--- a/SQF/dayz_code/init/variables.sqf
+++ b/SQF/dayz_code/init/variables.sqf
@@ -830,14 +830,14 @@ if (isNil "DZE_slowZombies") then {
 
 // update objects
 dayz_updateObjects = ["Plane","Tank","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_disallowedVault = ["TentStorage", "BuiltItems","ModularItems","DZE_Base_Object","Generator_DZ"];
+dayz_reveal = ["AllVehicles","WeaponHolder","Land_A_tent","BuiltItems","ModularItems","DZE_Base_Object","Generator_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"];
 DZE_UnLockedStorage = ["VaultStorage","LockboxStorage"];
-DZE_maintainClasses = ["ModularItems","DZE_Housebase","LightPole_DZ","BuiltItems","Plastic_Pole_EP1_DZ","Fence_corrugated_DZ","CanvasHut_DZ","ParkBench_DZ","MetalGate_DZ","StickFence_DZ","DesertCamoNet_DZ","ForestCamoNet_DZ","DesertLargeCamoNet_DZ","ForestLargeCamoNet_DZ","DeerStand_DZ","Scaffolding_DZ","FireBarrel_DZ"];
+DZE_maintainClasses = ["ModularItems","DZE_Housebase","LightPole_DZ","BuiltItems","Generator_DZ","Plastic_Pole_EP1_DZ","Fence_corrugated_DZ","CanvasHut_DZ","ParkBench_DZ","MetalGate_DZ","StickFence_DZ","DesertCamoNet_DZ","ForestCamoNet_DZ","DesertLargeCamoNet_DZ","ForestLargeCamoNet_DZ","DeerStand_DZ","Scaffolding_DZ","FireBarrel_DZ"];
 
 DZE_DoorsLocked = ["Land_DZE_GarageWoodDoorLocked","Land_DZE_LargeWoodDoorLocked","Land_DZE_WoodDoorLocked","CinderWallDoorLocked_DZ","CinderWallDoorSmallLocked_DZ"];