From 58f97a4c629792427048adc9220723b9d732fb8c Mon Sep 17 00:00:00 2001
From: AirwavesMan <AirwavesMan@users.noreply.github.com>
Date: Mon, 30 Nov 2020 11:51:24 +0100
Subject: [PATCH] Re-arrange modular build

There are a lot more cinder and metal buildings coming. It is better to have them in seperated configs.
---
 .../CfgVehicles/Buildables/ModularBuild.hpp   |  40 +++++
 .../Buildables/ModularBuildCinder.hpp         | 103 ++++++++++++
 .../Buildables/ModularBuildMetal.hpp          |  18 ++
 ...dularBuilding.hpp => ModularBuildWood.hpp} | 158 +-----------------
 .../Configs/CfgVehicles/CfgVehicles.hpp       |   2 +-
 5 files changed, 163 insertions(+), 158 deletions(-)
 create mode 100644 SQF/dayz_code/Configs/CfgVehicles/Buildables/ModularBuild.hpp
 create mode 100644 SQF/dayz_code/Configs/CfgVehicles/Buildables/ModularBuildCinder.hpp
 create mode 100644 SQF/dayz_code/Configs/CfgVehicles/Buildables/ModularBuildMetal.hpp
 rename SQF/dayz_code/Configs/CfgVehicles/Buildables/{ModularBuilding.hpp => ModularBuildWood.hpp} (68%)

diff --git a/SQF/dayz_code/Configs/CfgVehicles/Buildables/ModularBuild.hpp b/SQF/dayz_code/Configs/CfgVehicles/Buildables/ModularBuild.hpp
new file mode 100644
index 000000000..8cb05634c
--- /dev/null
+++ b/SQF/dayz_code/Configs/CfgVehicles/Buildables/ModularBuild.hpp
@@ -0,0 +1,40 @@
+class ModularItems: NonStrategic {
+	scope = 0;
+	destrType = "DestructBuilding";
+	placement = "vertical";
+	icon = "\ca\data\data\Unknown_object.paa";
+	mapSize = 2;
+	vehicleClass = "DayZ Epoch Buildables";
+	
+	class DestructionEffects {
+		class Sound {
+			simulation = "sound";
+			type = "DestrHouse";
+			position = "destructionEffect1";
+			intensity = 1;
+			interval = 1;
+			lifeTime = 0.05;
+		};
+		class DestroyPhase1 {
+			simulation = "destroy";
+			type = "DelayedDestruction";
+			lifeTime = 2.5;
+			position = "";
+			intensity = 1;
+			interval = 1;
+		};
+		class DamageAround1 {
+			simulation = "damageAround";
+			type = "DamageAroundHouse";
+			position = "";
+			intensity = 0.1;
+			interval = 1;
+			lifeTime = 1;
+		};
+	};
+};
+
+#include "ModularBuildMetal.hpp"
+#include "ModularBuildCinder.hpp"
+#include "ModularBuildWood.hpp"
+#include "ModularPreviews.hpp"
diff --git a/SQF/dayz_code/Configs/CfgVehicles/Buildables/ModularBuildCinder.hpp b/SQF/dayz_code/Configs/CfgVehicles/Buildables/ModularBuildCinder.hpp
new file mode 100644
index 000000000..e640c7df8
--- /dev/null
+++ b/SQF/dayz_code/Configs/CfgVehicles/Buildables/ModularBuildCinder.hpp
@@ -0,0 +1,103 @@
+class CinderWallHalf_DZ: ModularItems {
+	scope = 2;
+	offset[] = {0,2,0};
+	model = "\z\addons\dayz_epoch\models\cinder_wall_half.p3d";
+	armor = 2200;
+	displayName = $STR_EPOCH_CINDERBLOCKWALL_HALF;
+	upgradeBuilding[] = {"CinderWall_DZ",{"ItemToolbox"},{{"CinderBlocks",4},{"MortarBucket",1}}};
+	maintainBuilding[] = {{"MortarBucket",1}};
+	GhostPreview = "CinderWallHalf_Preview_DZ";
+	class DestructionEffects : DestructionEffects {
+		class Ruin1 {
+			simulation = "ruin";
+			type = "\z\addons\dayz_epoch\models\wreck_cinder.p3d";
+			position = "";
+			intensity = 1;
+			interval = 1;
+			lifeTime = 1;
+		};
+	};
+};
+
+class CinderWall_DZ: ModularItems {
+	scope = 2;
+	offset[] = {0,2,0};
+	model = "\z\addons\dayz_epoch\models\cinder_wall_full.p3d";
+	armor = 3400;
+	displayName = $STR_EPOCH_CINDERBLOCKWALL;
+	maintainBuilding[] = {{"MortarBucket",1}};
+	GhostPreview = "CinderWall_Preview_DZ";
+	class DestructionEffects : DestructionEffects {
+		class Ruin1 {
+			simulation = "ruin";
+			type = "\z\addons\dayz_epoch\models\wreck_cinder.p3d";
+			position = "";
+			intensity = 1;
+			interval = 1;
+			lifeTime = 1;
+		};
+	};
+};
+
+class CinderWallDoorway_DZ: ModularItems {
+	scope = 2;
+	offset[] = {0,2,0};
+	model = "\z\addons\dayz_epoch\models\steel_garage_frame.p3d";
+	armor = 3400;
+	displayName = $STR_EPOCH_BLOCKGARAGEDOORWAY;
+	maintainBuilding[] = {{"MortarBucket",1}};
+	upgradeBuilding[] = {"CinderWallDoor_DZ",{"ItemToolbox"},{{"ItemPole",3},{"ItemTankTrap",3}}};
+	GhostPreview = "CinderWallDoorway_Preview_DZ";
+	class DestructionEffects : DestructionEffects {
+		class Ruin1 {
+			simulation = "ruin";
+			type = "\z\addons\dayz_epoch\models\wreck_cinder.p3d";
+			position = "";
+			intensity = 1;
+			interval = 1;
+			lifeTime = 1;
+		};
+	};
+};
+
+class CinderWallSmallDoorway_DZ: ModularItems {
+	scope = 2;
+	offset[] = {0,2,0};
+	model = "\z\addons\dayz_epoch\models\Steel_door_frame.p3d";
+	armor = 3400;
+	displayName = $STR_EPOCH_BLOCKDOORWAY;
+	maintainBuilding[] = {{"MortarBucket",1}};
+	upgradeBuilding[] = {"CinderWallDoorSmall_DZ",{"ItemToolbox"},{{"ItemPole",1},{"ItemTankTrap",1}}};
+	GhostPreview = "CinderWallSmallDoorway_Preview_DZ";
+	class DestructionEffects : DestructionEffects {
+		class Ruin1 {
+			simulation = "ruin";
+			type = "\z\addons\dayz_epoch\models\wreck_cinder.p3d";
+			position = "";
+			intensity = 1;
+			interval = 1;
+			lifeTime = 1;
+		};
+	};
+};
+
+class CinderGateFrame_DZ: ModularItems {
+	scope = 2;
+	offset[] = {0,3,0};
+	model = "\z\addons\dayz_epoch_v\base_building\cinder\cinder_high_garage\high_steel_garage_frame.p3d";
+	armor = 4000;
+	displayName = $STR_EPOCH_CINDERGATEFRAME;
+	maintainBuilding[] = {{"MortarBucket",3}};
+	upgradeBuilding[] = {"CinderGate_DZ",{"ItemToolbox"},{{"equip_metal_sheet",6},{"ItemRSJ",2},{"ItemScrews",2}}};
+	GhostPreview = "CinderGate_Preview_DZ";
+	class DestructionEffects : DestructionEffects {
+		class Ruin1 {
+			simulation = "ruin";
+			type = "\z\addons\dayz_epoch\models\wreck_cinder.p3d";
+			position = "";
+			intensity = 1;
+			interval = 1;
+			lifeTime = 1;
+		};
+	};
+};
\ No newline at end of file
diff --git a/SQF/dayz_code/Configs/CfgVehicles/Buildables/ModularBuildMetal.hpp b/SQF/dayz_code/Configs/CfgVehicles/Buildables/ModularBuildMetal.hpp
new file mode 100644
index 000000000..592f1e9ad
--- /dev/null
+++ b/SQF/dayz_code/Configs/CfgVehicles/Buildables/ModularBuildMetal.hpp
@@ -0,0 +1,18 @@
+class MetalFloor_DZ: ModularItems {
+	scope = 2;	
+	offset[] = {0,4,0};
+	model = "\z\addons\dayz_epoch\models\metal_floor.p3d";
+	armor = 3000;
+	displayName = $STR_EPOCH_METALFLOOR;	
+	GhostPreview = "MetalFloor_Preview_DZ";
+	class DestructionEffects : DestructionEffects {
+		class Ruin1 {
+			simulation = "ruin";
+			type = "\z\addons\dayz_epoch\models\wreck_metal_floor.p3d";
+			position = "";
+			intensity = 1;
+			interval = 1;
+			lifeTime = 1;
+		};
+	};
+};
\ No newline at end of file
diff --git a/SQF/dayz_code/Configs/CfgVehicles/Buildables/ModularBuilding.hpp b/SQF/dayz_code/Configs/CfgVehicles/Buildables/ModularBuildWood.hpp
similarity index 68%
rename from SQF/dayz_code/Configs/CfgVehicles/Buildables/ModularBuilding.hpp
rename to SQF/dayz_code/Configs/CfgVehicles/Buildables/ModularBuildWood.hpp
index 27d7a7b88..10750cb74 100644
--- a/SQF/dayz_code/Configs/CfgVehicles/Buildables/ModularBuilding.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/Buildables/ModularBuildWood.hpp
@@ -1,56 +1,3 @@
-class ModularItems: NonStrategic {
-	scope = 0;
-	destrType = "DestructBuilding";
-	placement = "vertical";
-	icon = "\ca\data\data\Unknown_object.paa";
-	mapSize = 2;
-	vehicleClass = "DayZ Epoch Buildables";
-	
-	class DestructionEffects {
-		class Sound {
-			simulation = "sound";
-			type = "DestrHouse";
-			position = "destructionEffect1";
-			intensity = 1;
-			interval = 1;
-			lifeTime = 0.05;
-		};
-		class DestroyPhase1 {
-			simulation = "destroy";
-			type = "DelayedDestruction";
-			lifeTime = 2.5;
-			position = "";
-			intensity = 1;
-			interval = 1;
-		};
-		class DamageAround1 {
-			simulation = "damageAround";
-			type = "DamageAroundHouse";
-			position = "";
-			intensity = 0.1;
-			interval = 1;
-			lifeTime = 1;
-		};
-	};
-};
-class MetalFloor_DZ: ModularItems {
-	scope = 2;	
-	offset[] = {0,4,0};
-	model = "\z\addons\dayz_epoch\models\metal_floor.p3d";
-	armor = 3000;
-	displayName = $STR_EPOCH_METALFLOOR;	
-	GhostPreview = "MetalFloor_Preview_DZ";
-	class DestructionEffects : DestructionEffects {
-		class Ruin1 {
-			simulation = "ruin";
-			type = "\z\addons\dayz_epoch\models\wreck_metal_floor.p3d";
-			position = "";
-			intensity = 1;
-			interval = 1;
-			lifeTime = 1;
-		};
-	};
-};
 class WoodRamp_DZ: ModularItems {
 	scope = 2;
 	offset[] = {0,4,0};
@@ -59,86 +6,6 @@ class WoodRamp_DZ: ModularItems {
 	displayName = $STR_EPOCH_WOODRAMP;
 	GhostPreview = "WoodRamp_Preview_DZ";
 };
-class CinderWallHalf_DZ: ModularItems {
-	scope = 2;
-	offset[] = {0,2,0};
-	model = "\z\addons\dayz_epoch\models\cinder_wall_half.p3d";
-	armor = 2200;
-	displayName = $STR_EPOCH_CINDERBLOCKWALL_HALF;
-	upgradeBuilding[] = {"CinderWall_DZ",{"ItemToolbox"},{{"CinderBlocks",4},{"MortarBucket",1}}};
-	maintainBuilding[] = {{"MortarBucket",1}};
-	GhostPreview = "CinderWallHalf_Preview_DZ";
-	class DestructionEffects : DestructionEffects {
-		class Ruin1 {
-			simulation = "ruin";
-			type = "\z\addons\dayz_epoch\models\wreck_cinder.p3d";
-			position = "";
-			intensity = 1;
-			interval = 1;
-			lifeTime = 1;
-		};
-	};
-};
-class CinderWall_DZ: ModularItems {
-	scope = 2;
-	offset[] = {0,2,0};
-	model = "\z\addons\dayz_epoch\models\cinder_wall_full.p3d";
-	armor = 3400;
-	displayName = $STR_EPOCH_CINDERBLOCKWALL;
-	maintainBuilding[] = {{"MortarBucket",1}};
-	GhostPreview = "CinderWall_Preview_DZ";
-	class DestructionEffects : DestructionEffects {
-		class Ruin1 {
-			simulation = "ruin";
-			type = "\z\addons\dayz_epoch\models\wreck_cinder.p3d";
-			position = "";
-			intensity = 1;
-			interval = 1;
-			lifeTime = 1;
-		};
-	};
-};
-
-class CinderWallDoorway_DZ: ModularItems {
-	scope = 2;
-	offset[] = {0,2,0};
-	model = "\z\addons\dayz_epoch\models\steel_garage_frame.p3d";
-	armor = 3400;
-	displayName = $STR_EPOCH_BLOCKGARAGEDOORWAY;
-	maintainBuilding[] = {{"MortarBucket",1}};
-	upgradeBuilding[] = {"CinderWallDoor_DZ",{"ItemToolbox"},{{"ItemPole",3},{"ItemTankTrap",3}}};
-	GhostPreview = "CinderWallDoorway_Preview_DZ";
-	class DestructionEffects : DestructionEffects {
-		class Ruin1 {
-			simulation = "ruin";
-			type = "\z\addons\dayz_epoch\models\wreck_cinder.p3d";
-			position = "";
-			intensity = 1;
-			interval = 1;
-			lifeTime = 1;
-		};
-	};
-};
-class CinderWallSmallDoorway_DZ: ModularItems {
-	scope = 2;
-	offset[] = {0,2,0};
-	model = "\z\addons\dayz_epoch\models\Steel_door_frame.p3d";
-	armor = 3400;
-	displayName = $STR_EPOCH_BLOCKDOORWAY;
-	maintainBuilding[] = {{"MortarBucket",1}};
-	upgradeBuilding[] = {"CinderWallDoorSmall_DZ",{"ItemToolbox"},{{"ItemPole",1},{"ItemTankTrap",1}}};
-	GhostPreview = "CinderWallSmallDoorway_Preview_DZ";
-	class DestructionEffects : DestructionEffects {
-		class Ruin1 {
-			simulation = "ruin";
-			type = "\z\addons\dayz_epoch\models\wreck_cinder.p3d";
-			position = "";
-			intensity = 1;
-			interval = 1;
-			lifeTime = 1;
-		};
-	};
-};
 
 class WoodFloor_DZ: ModularItems {
 	scope = 2;
@@ -443,27 +310,4 @@ class WoodGateFrame_DZ: ModularItems {
 			lifeTime = 1;
 		};
 	};
-};
-
-class CinderGateFrame_DZ: ModularItems {
-	scope = 2;
-	offset[] = {0,3,0};
-	model = "\z\addons\dayz_epoch_v\base_building\cinder\cinder_high_garage\high_steel_garage_frame.p3d";
-	armor = 4000;
-	displayName = $STR_EPOCH_CINDERGATEFRAME;
-	maintainBuilding[] = {{"MortarBucket",3}};
-	upgradeBuilding[] = {"CinderGate_DZ",{"ItemToolbox"},{{"equip_metal_sheet",6},{"ItemRSJ",2},{"ItemScrews",2}}};
-	GhostPreview = "CinderGate_Preview_DZ";
-	class DestructionEffects : DestructionEffects {
-		class Ruin1 {
-			simulation = "ruin";
-			type = "\z\addons\dayz_epoch\models\wreck_cinder.p3d";
-			position = "";
-			intensity = 1;
-			interval = 1;
-			lifeTime = 1;
-		};
-	};
-};
-
-#include "ModularPreviews.hpp"
+};
\ No newline at end of file
diff --git a/SQF/dayz_code/Configs/CfgVehicles/CfgVehicles.hpp b/SQF/dayz_code/Configs/CfgVehicles/CfgVehicles.hpp
index a25b38f89..99475962c 100644
--- a/SQF/dayz_code/Configs/CfgVehicles/CfgVehicles.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/CfgVehicles.hpp
@@ -487,7 +487,7 @@ class CfgVehicles
 	#include "Buildables\Generator.hpp"	
 	#include "Buildables\Doors.hpp"
 	#include "Buildables\Bridges.hpp"
-	#include "Buildables\ModularBuilding.hpp"	
+	#include "Buildables\ModularBuild.hpp"	
 	#include "Buildables\ModularWrecks.hpp"	
 	#include "Buildables\FencesWood.hpp"
 	#include "Buildables\FencesMetal.hpp"