From eadb3566c46e8f315a3816dc6ef0a4ee7d46df61 Mon Sep 17 00:00:00 2001
From: ebaydayz <ebaydayz@openmailbox.org>
Date: Sat, 5 Mar 2016 21:04:06 -0500
Subject: [PATCH] Split hatchback and sedan into separate files

Using 1.8.7 style now. If it was erroring out before it's because Skoda
needed to be defined before hatchback.
---
 .../Configs/CfgVehicles/Car/CAR_HATCHBACK.hpp |  79 +++
 .../Configs/CfgVehicles/Car/CAR_SEDAN.hpp     | 568 ++----------------
 .../Configs/CfgVehicles/CfgVehicles.hpp       |   4 +-
 3 files changed, 115 insertions(+), 536 deletions(-)

diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/CAR_HATCHBACK.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/CAR_HATCHBACK.hpp
index d93b8e752..02b9f2ce2 100644
--- a/SQF/dayz_code/Configs/CfgVehicles/Car/CAR_HATCHBACK.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/Car/CAR_HATCHBACK.hpp
@@ -167,4 +167,83 @@
 	class Library {
 		libtextdesc = "Civilian Car";
 	};
+
+	class Upgrades {
+		ItemORP[] = {"car_hatchback_DZE1",{},{{"ItemORP",1},{"PartEngine",2}}};
+	};
+};
+
+// Performance 1
+class car_hatchback_DZE1: car_hatchback {
+	maxspeed = 150; // max engine limit 125-130
+	terrainCoef = 2.5;
+
+	class Upgrades {
+		ItemAVE[] = {"car_hatchback_DZE2",{},{{"ItemAVE",1},{"PartGeneric",4},{"ItemTankTrap",2}}};
+	};
+};
+
+// Armor 2
+class car_hatchback_DZE2: car_hatchback_DZE1 {
+	armor = 50; // car 20
+	class HitPoints: HitPoints {
+		class HitLFWheel: HitLFWheel {
+			armor = 0.3;
+		};
+		class HitLBWheel: HitLBWheel {
+			armor = 0.3;
+		};
+		class HitRFWheel: HitRFWheel {
+			armor = 0.3;
+		};
+		class HitRBWheel: HitRBWheel {
+			armor = 0.3;
+		};
+		class HitFuel {
+			armor = 0.28;
+			material = -1;
+			name = "palivo";
+			visual = "";
+			passThrough = 1;
+		};
+		class HitEngine {
+			armor = 1;
+			material = -1;
+			name = "motor";
+			visual = "";
+			passThrough = 1;
+		};
+		class HitGlass1: HitGlass1 {
+			armor = 0.1;
+		};
+		class HitGlass2: HitGlass2 {
+			armor = 0.1;
+		};
+		class HitGlass3: HitGlass3 {
+			armor = 0.1;
+		};
+		class HitGlass4: HitGlass4 {
+			armor = 0.1;
+		};
+	};
+
+	class Upgrades {
+		ItemLRK[] = {"car_hatchback_DZE3",{},{{"ItemLRK",1},{"PartGeneric",1},{"ItemTent",1}}};
+	};
+};
+
+// Cargo 3
+class car_hatchback_DZE3: car_hatchback_DZE2 {
+	transportMaxWeapons = 20;  // car 10
+	transportMaxMagazines = 100; // car 50
+    transportmaxbackpacks = 4; // car 2
+
+	class Upgrades {
+		ItemTNK[] = {"car_hatchback_DZE4",{},{{"ItemTNK",1},{"PartFueltank",2}}};
+	};
+};
+
+// Fuel 4
+class car_hatchback_DZE4: car_hatchback_DZE3 {
+	fuelCapacity = 210; // car 100
 };
\ No newline at end of file
diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/CAR_SEDAN.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/CAR_SEDAN.hpp
index 46f5d3a80..541ad47a8 100644
--- a/SQF/dayz_code/Configs/CfgVehicles/Car/CAR_SEDAN.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/Car/CAR_SEDAN.hpp
@@ -548,8 +548,8 @@ class SkodaGreen_DZE4: SkodaGreen_DZE3 {
 	fuelCapacity = 210; // car 100
 };
 
-class car_hatchback: SkodaBase {
-	armorcrash0[] = {"Ca\sounds\Vehicles\Crash\crash_vehicle_01", 0.707946, 1, 200};
+class car_sedan : SkodaBase {
+    armorcrash0[] = {"Ca\sounds\Vehicles\Crash\crash_vehicle_01", 0.707946, 1, 200};
 	armorcrash1[] = {"Ca\sounds\Vehicles\Crash\crash_vehicle_02", 0.707946, 1, 200};
 	armorcrash2[] = {"Ca\sounds\Vehicles\Crash\crash_vehicle_03", 0.707946, 1, 200};
 	armorcrash3[] = {"Ca\sounds\Vehicles\Crash\crash_vehicle_04", 0.707946, 1, 200};
@@ -558,19 +558,17 @@ class car_hatchback: SkodaBase {
 	buildcrash1[] = {"Ca\sounds\Vehicles\Crash\crash_building_02", 0.707946, 1, 200};
 	buildcrash2[] = {"Ca\sounds\Vehicles\Crash\crash_building_03", 0.707946, 1, 200};
 	buildcrash3[] = {"Ca\sounds\Vehicles\Crash\crash_building_04", 0.707946, 1, 200};
-	cargoaction[] = {"Hatchback_Cargo01"};
-	cargoiscodriver[] = {1, 0};
 	crew = "";
-	displayname = "Old hatchback";
-	driveraction = "Hatchback_Driver";
+	displayname = $STR_VEH_NAME_SEDAN;
+	driveraction = "Sedan_Driver";
 	faction = "CIV";
 	hiddenselections[] = {"Camo1"};
-	hiddenselectionstextures[] = {"\ca\wheeled\data\hatchback_co.paa"};
+	hiddenselectionstextures[] = {"\ca\wheeled\data\sedan_ext_co.paa"};
 	icon = "\Ca\wheeled\data\map_ico\icomap_skoda_CA.paa";
 	mapsize = 6;
 	maxspeed = 125;
-	model = "\ca\Wheeled\car_hatchback";
-	picture = "\Ca\wheeled\data\ico\car_hatchback_CA.paa";
+	model = "\ca\Wheeled\car_sedan";
+	picture = "\Ca\wheeled\data\ico\car_sedan_CA.paa";
 	rarityurban = 0.6;
 	scope = public;
 	soundarmorcrash[] = {"ArmorCrash0", 0.25, "ArmorCrash1", 0.25, "ArmorCrash2", 0.25, "ArmorCrash3", 0.25};
@@ -583,8 +581,8 @@ class car_hatchback: SkodaBase {
 	soundgetin[] = {"ca\sounds\vehicles\Wheeled\sedan\ext\ext-sedan-getout-1", 0.316228, 1};
 	soundgetout[] = {"ca\sounds\vehicles\Wheeled\sedan\ext\ext-sedan-getout-1", 0.316228, 1, 30};
 	soundwoodcrash[] = {"woodCrash0", 0.166, "woodCrash1", 0.166, "woodCrash2", 0.166, "woodCrash3", 0.166, "woodCrash4", 0.166, "woodCrash5", 0.166};
-	typicalcargo[] = {};
-	wheelcircumference = 2.148;
+	typicalcargo[] = {"Citizen4"};
+	wheelcircumference = 1.947;
 	woodcrash0[] = {"Ca\sounds\Vehicles\Crash\crash_mix_wood_01", 0.707946, 1, 200};
 	woodcrash1[] = {"Ca\sounds\Vehicles\Crash\crash_mix_wood_02", 0.707946, 1, 200};
 	woodcrash2[] = {"Ca\sounds\Vehicles\Crash\crash_mix_wood_03", 0.707946, 1, 200};
@@ -595,108 +593,108 @@ class car_hatchback: SkodaBase {
 		class AccelerationIn {
 			expression = "(engineOn*(1-camPos))*gmeterZ";
 			limit = 0.5;
-			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\sedan\int\int-sedan-acce-1", 0.398107, 1};
+			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\sedan\int\int-sedan-acce-2", 0.398107, 1};
 		};
 		class AccelerationOut {
 			expression = "(engineOn*camPos)*gmeterZ";
 			limit = 0.5;
-			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\sedan\ext\ext-sedan-acce-1", 0.398107, 1, 250};
+			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\sedan\ext\ext-sedan-acce-2", 0.398107, 1, 250};
 		};
 	};
 	class Sounds {
 		class Engine {
 			frequency = "(randomizer*0.05+0.95)*rpm";
-			sound[] = {"\ca\sounds\Vehicles\Wheeled\sedan\ext\ext-sedan-low-1", 0.398107, 0.9, 300};
+			sound[] = {"\ca\sounds\Vehicles\Wheeled\sedan\ext\ext-sedan-low-1", 0.562341, 0.95, 300};
 			volume = "engineOn*camPos*(rpm factor[0.6, 0.2])";
 		};
 		class EngineHighOut {
-			frequency = "(randomizer*0.05+0.95)*rpm";
-			sound[] = {"\ca\sounds\Vehicles\Wheeled\sedan\ext\ext-sedan-high-1", 0.398107, 0.8, 380};
+			frequency = "(randomizer*0.05+0.98)*rpm";
+			sound[] = {"\ca\sounds\Vehicles\Wheeled\sedan\ext\ext-sedan-high-1", 0.562341, 0.95, 399};
 			volume = "engineOn*camPos*(rpm factor[0.45, 0.9])";
 		};
 		class IdleOut {
 			frequency = 1;
-			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\sedan\ext\ext-sedan-idle-1", 0.281838, 1, 200};
+			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\sedan\ext\ext-sedan-idle-1", 0.354813, 1, 200};
 			volume = "engineOn*camPos*(rpm factor[0.3, 0])";
 		};
 		class TiresRockOut {
 			frequency = 1;
-			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\ext\ext-tires-rock2", 0.316228, 1, 30};
+			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\ext\ext-tires-rock2", 0.1, 1, 30};
 			volume = "camPos*rock*(speed factor[2, 20])";
 		};
 		class TiresSandOut {
 			frequency = 1;
-			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\ext\ext-tires-sand2", 0.316228, 1, 30};
+			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\ext\ext-tires-sand2", 0.1, 1, 30};
 			volume = "camPos*sand*(speed factor[2, 20])";
 		};
 		class TiresGrassOut {
 			frequency = 1;
-			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\ext\ext-tires-grass3", 0.316228, 1, 30};
+			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\ext\ext-tires-grass3", 0.1, 1, 30};
 			volume = "camPos*grass*(speed factor[2, 20])";
 		};
 		class TiresMudOut {
 			frequency = 1;
-			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\ext\ext-tires-mud2", 0.316228, 1, 30};
+			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\ext\ext-tires-mud2", 0.1, 1, 30};
 			volume = "camPos*mud*(speed factor[2, 20])";
 		};
 		class TiresGravelOut {
 			frequency = 1;
-			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\ext\ext-tires-gravel2", 0.316228, 1, 30};
+			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\ext\ext-tires-gravel2", 0.1, 1, 30};
 			volume = "camPos*gravel*(speed factor[2, 20])";
 		};
 		class TiresAsphaltOut {
 			frequency = 1;
-			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\ext\ext-tires-asphalt3", 0.316228, 1, 30};
+			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\ext\ext-tires-asphalt3", 0.1, 1, 30};
 			volume = "camPos*asphalt*(speed factor[2, 20])";
 		};
 		class NoiseOut {
 			frequency = 1;
-			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Noises\ext\int-noise3", 0.316228, 1, 30};
+			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Noises\ext\int-noise3", 0.1, 1, 30};
 			volume = "camPos*(damper0 max 0.04)*(speed factor[0, 8])";
 		};
 		class EngineLowIn {
 			frequency = "(randomizer*0.05+0.95)*rpm";
-			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\sedan\int\int-sedan-low-1", 0.562341, 0.8};
+			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\sedan\int\int-sedan-low-1", 0.562341, 0.95};
 			volume = "((engineOn*thrust) factor[0.65, 0.2])*(1-camPos)";
 		};
 		class EngineHighIn {
 			frequency = "(randomizer*0.05+0.95)*rpm";
-			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\sedan\int\int-sedan-high-1", 0.562341, 0.8};
+			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\sedan\int\int-sedan-high-1", 0.562341, 0.95};
 			volume = "((engineOn*thrust) factor[0.55, 0.95])*(1-camPos)";
 		};
 		class IdleIn {
 			frequency = 1;
-			sound[] = {"\ca\sounds\Vehicles\Wheeled\sedan\int\int-sedan-idle-1", 0.316228, 1};
+			sound[] = {"\ca\sounds\Vehicles\Wheeled\sedan\int\int-sedan-idle-1", 0.354813, 1};
 			volume = "engineOn*(rpm factor[0.3, 0])*(1-camPos)";
 		};
 		class TiresRockIn {
 			frequency = 1;
-			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\int\int-tires-rock2", 0.177828, 1};
+			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\int\int-tires-rock2", 0.1, 1};
 			volume = "(1-camPos)*rock*(speed factor[2, 20])";
 		};
 		class TiresSandIn {
 			frequency = 1;
-			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\int\int-tires-sand2", 0.177828, 1};
+			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\int\int-tires-sand2", 0.1, 1};
 			volume = "(1-camPos)*sand*(speed factor[2, 20])";
 		};
 		class TiresGrassIn {
 			frequency = 1;
-			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\int\int-tires-grass3", 0.177828, 1};
+			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\int\int-tires-grass3", 0.1, 1};
 			volume = "(1-camPos)*grass*(speed factor[2, 20])";
 		};
 		class TiresMudIn {
 			frequency = 1;
-			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\int\int-tires-mud2", 0.177828, 1};
+			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\int\int-tires-mud2", 0.1, 1};
 			volume = "(1-camPos)*mud*(speed factor[2, 20])";
 		};
 		class TiresGravelIn {
 			frequency = 1;
-			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\int\int-tires-gravel2", 0.177828, 1};
+			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\int\int-tires-gravel2", 0.1, 1};
 			volume = "(1-camPos)*gravel*(speed factor[2, 20])";
 		};
 		class TiresAsphaltIn {
 			frequency = 1;
-			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\int\int-tires-asphalt3", 0.177828, 1};
+			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\int\int-tires-asphalt3", 0.1, 1};
 			volume = "(1-camPos)*asphalt*(speed factor[2, 20])";
 		};
 		class NoiseIn {
@@ -710,511 +708,13 @@ class car_hatchback: SkodaBase {
 			volume = 0;
 		};
 	};
-	class Damage {
-		mat[] = {"ca\wheeled\data\hatchback.rvmat", "ca\wheeled\data\hatchback.rvmat", "ca\wheeled\data\hatchback_destruct.rvmat", "ca\wheeled\data\hatchback.rvmat", "ca\wheeled\data\hatchback.rvmat", "ca\wheeled\data\hatchback_destruct.rvmat", "ca\wheeled\data\detailmapy\auta_skla.rvmat", "ca\wheeled\data\detailmapy\auta_skla_damage.rvmat", "ca\wheeled\data\detailmapy\auta_skla_damage.rvmat", "ca\wheeled\data\detailmapy\auta_skla_in.rvmat", "ca\wheeled\data\detailmapy\auta_skla_in_damage.rvmat", "ca\wheeled\data\detailmapy\auta_skla_in_damage.rvmat"};
-		tex[] = {};
-	};
 	class Library {
 		libtextdesc = "Civilian Car";
 	};
-
-	class Upgrades {
-		ItemORP[] = {"car_hatchback_DZE1",{},{{"ItemORP",1},{"PartEngine",2}}};
+	class Damage {
+		mat[] = {"ca\wheeled\data\sedan_ext.rvmat", "ca\wheeled\data\sedan_ext.rvmat", "ca\wheeled\data\sedan_ext_destruct.rvmat", "ca\wheeled\data\sedan_int.rvmat", "ca\wheeled\data\sedan_int.rvmat", "ca\wheeled\data\sedan_int_destruct.rvmat", "ca\wheeled\data\detailmapy\auta_skla.rvmat", "ca\wheeled\data\detailmapy\auta_skla_damage.rvmat", "ca\wheeled\data\detailmapy\auta_skla_damage.rvmat", "ca\wheeled\data\detailmapy\auta_skla_in.rvmat", "ca\wheeled\data\detailmapy\auta_skla_in_damage.rvmat", "ca\wheeled\data\detailmapy\auta_skla_in_damage.rvmat"};
+		tex[] = {};
 	};
-};
-
-// Performance 1
-class car_hatchback_DZE1: car_hatchback {
-	maxspeed = 150; // max engine limit 125-130
-	terrainCoef = 2.5;
-
-	class Upgrades {
-		ItemAVE[] = {"car_hatchback_DZE2",{},{{"ItemAVE",1},{"PartGeneric",4},{"ItemTankTrap",2}}};
-	};
-};
-
-// Armor 2
-class car_hatchback_DZE2: car_hatchback_DZE1 {
-	armor = 50; // car 20
-	class HitPoints: HitPoints {
-		class HitLFWheel: HitLFWheel {
-			armor = 0.3;
-		};
-		class HitLBWheel: HitLBWheel {
-			armor = 0.3;
-		};
-		class HitRFWheel: HitRFWheel {
-			armor = 0.3;
-		};
-		class HitRBWheel: HitRBWheel {
-			armor = 0.3;
-		};
-		class HitFuel {
-			armor = 0.28;
-			material = -1;
-			name = "palivo";
-			visual = "";
-			passThrough = 1;
-		};
-		class HitEngine {
-			armor = 1;
-			material = -1;
-			name = "motor";
-			visual = "";
-			passThrough = 1;
-		};
-		class HitGlass1: HitGlass1 {
-			armor = 0.1;
-		};
-		class HitGlass2: HitGlass2 {
-			armor = 0.1;
-		};
-		class HitGlass3: HitGlass3 {
-			armor = 0.1;
-		};
-		class HitGlass4: HitGlass4 {
-			armor = 0.1;
-		};
-	};
-
-	class Upgrades {
-		ItemLRK[] = {"car_hatchback_DZE3",{},{{"ItemLRK",1},{"PartGeneric",1},{"ItemTent",1}}};
-	};
-};
-
-// Cargo 3
-class car_hatchback_DZE3: car_hatchback_DZE2 {
-	transportMaxWeapons = 20;  // car 10
-	transportMaxMagazines = 100; // car 50
-    transportmaxbackpacks = 4; // car 2
-
-	class Upgrades {
-		ItemTNK[] = {"car_hatchback_DZE4",{},{{"ItemTNK",1},{"PartFueltank",2}}};
-	};
-};
-
-// Fuel 4
-class car_hatchback_DZE4: car_hatchback_DZE3 {
-	fuelCapacity = 210; // car 100
-};
-
-class car_sedan : SkodaBase {
-    scope = public;
-    faction = "CIV";
-    maxSpeed = 125;
-    model = "\ca\Wheeled\car_sedan";
-    picture = "\Ca\wheeled\data\ico\car_sedan_CA.paa";
-    Icon = "\Ca\wheeled\data\map_ico\icomap_skoda_CA.paa";
-    mapSize = 6;
-    typicalCargo[] = {
-      "Citizen4"
-    };
-    crew = "Citizen4";
-    displayName = "Sedan";
-    driverAction = "Sedan_Driver";
-    wheelCircumference = 1.947;
-    soundGear[] = {
-      "",
-      5.62341e-005,
-      1
-    };
-    soundGetIn[] = {
-      "ca\sounds\vehicles\Wheeled\sedan\ext\ext-sedan-getout-1",
-      0.316228,
-      1
-    };
-    soundGetOut[] = {
-      "ca\sounds\vehicles\Wheeled\sedan\ext\ext-sedan-getout-1",
-      0.316228,
-      1,
-      30
-    };
-    soundEngineOnInt[] = {
-      "ca\sounds\vehicles\Wheeled\sedan\int\int-sedan-start-1",
-      0.398107,
-      1
-    };
-    soundEngineOnExt[] = {
-      "ca\sounds\vehicles\Wheeled\sedan\ext\ext-sedan-start-1",
-      0.398107,
-      1,
-      250
-    };
-    soundEngineOffInt[] = {
-      "ca\sounds\vehicles\Wheeled\sedan\int\int-sedan-stop-1",
-      0.398107,
-      1
-    };
-    soundEngineOffExt[] = {
-      "ca\sounds\vehicles\Wheeled\sedan\ext\ext-sedan-stop-1",
-      0.398107,
-      1,
-      250
-    };
-    buildCrash0[] = {
-      "Ca\sounds\Vehicles\Crash\crash_building_01",
-      0.707946,
-      1,
-      200
-    };
-    buildCrash1[] = {
-      "Ca\sounds\Vehicles\Crash\crash_building_02",
-      0.707946,
-      1,
-      200
-    };
-    buildCrash2[] = {
-      "Ca\sounds\Vehicles\Crash\crash_building_03",
-      0.707946,
-      1,
-      200
-    };
-    buildCrash3[] = {
-      "Ca\sounds\Vehicles\Crash\crash_building_04",
-      0.707946,
-      1,
-      200
-    };
-    soundBuildingCrash[] = {
-      "buildCrash0",
-      0.25,
-      "buildCrash1",
-      0.25,
-      "buildCrash2",
-      0.25,
-      "buildCrash3",
-      0.25
-    };
-    WoodCrash0[] = {
-      "Ca\sounds\Vehicles\Crash\crash_mix_wood_01",
-      0.707946,
-      1,
-      200
-    };
-    WoodCrash1[] = {
-      "Ca\sounds\Vehicles\Crash\crash_mix_wood_02",
-      0.707946,
-      1,
-      200
-    };
-    WoodCrash2[] = {
-      "Ca\sounds\Vehicles\Crash\crash_mix_wood_03",
-      0.707946,
-      1,
-      200
-    };
-    WoodCrash3[] = {
-      "Ca\sounds\Vehicles\Crash\crash_mix_wood_04",
-      0.707946,
-      1,
-      200
-    };
-    WoodCrash4[] = {
-      "Ca\sounds\Vehicles\Crash\crash_mix_wood_05",
-      0.707946,
-      1,
-      200
-    };
-    WoodCrash5[] = {
-      "Ca\sounds\Vehicles\Crash\crash_mix_wood_06",
-      0.707946,
-      1,
-      200
-    };
-    soundWoodCrash[] = {
-      "woodCrash0",
-      0.166,
-      "woodCrash1",
-      0.166,
-      "woodCrash2",
-      0.166,
-      "woodCrash3",
-      0.166,
-      "woodCrash4",
-      0.166,
-      "woodCrash5",
-      0.166
-    };
-    ArmorCrash0[] = {
-      "Ca\sounds\Vehicles\Crash\crash_vehicle_01",
-      0.707946,
-      1,
-      200
-    };
-    ArmorCrash1[] = {
-      "Ca\sounds\Vehicles\Crash\crash_vehicle_02",
-      0.707946,
-      1,
-      200
-    };
-    ArmorCrash2[] = {
-      "Ca\sounds\Vehicles\Crash\crash_vehicle_03",
-      0.707946,
-      1,
-      200
-    };
-    ArmorCrash3[] = {
-      "Ca\sounds\Vehicles\Crash\crash_vehicle_04",
-      0.707946,
-      1,
-      200
-    };
-    soundArmorCrash[] = {
-      "ArmorCrash0",
-      0.25,
-      "ArmorCrash1",
-      0.25,
-      "ArmorCrash2",
-      0.25,
-      "ArmorCrash3",
-      0.25
-    };
-    class SoundEvents {
-      class AccelerationIn {
-        sound[] = {
-          "\ca\SOUNDS\Vehicles\Wheeled\sedan\int\int-sedan-acce-2",
-          0.398107,
-          1
-        };
-        limit = "0.5";
-        expression = "(engineOn*(1-camPos))*gmeterZ";
-      };
-      class AccelerationOut {
-        sound[] = {
-          "\ca\SOUNDS\Vehicles\Wheeled\sedan\ext\ext-sedan-acce-2",
-          0.398107,
-          1,
-          250
-        };
-        limit = "0.5";
-        expression = "(engineOn*camPos)*gmeterZ";
-      };
-    };
-    class Sounds {
-      class Engine {
-        sound[] = {
-          "\ca\sounds\Vehicles\Wheeled\sedan\ext\ext-sedan-low-1",
-          0.562341,
-          0.95,
-          300
-        };
-        frequency = "(randomizer*0.05+0.95)*rpm";
-        volume = "engineOn*camPos*(rpm factor[0.6, 0.2])";
-      };
-      class EngineHighOut {
-        sound[] = {
-          "\ca\sounds\Vehicles\Wheeled\sedan\ext\ext-sedan-high-1",
-          0.562341,
-          0.95,
-          399
-        };
-        frequency = "(randomizer*0.05+0.98)*rpm";
-        volume = "engineOn*camPos*(rpm factor[0.45, 0.9])";
-      };
-      class IdleOut {
-        sound[] = {
-          "\ca\SOUNDS\Vehicles\Wheeled\sedan\ext\ext-sedan-idle-1",
-          0.354813,
-          1,
-          200
-        };
-        frequency = "1";
-        volume = "engineOn*camPos*(rpm factor[0.3, 0])";
-      };
-      class TiresRockOut {
-        sound[] = {
-          "\ca\SOUNDS\Vehicles\Wheeled\Tires\ext\ext-tires-rock2",
-          0.1,
-          1,
-          30
-        };
-        frequency = "1";
-        volume = "camPos*rock*(speed factor[2, 20])";
-      };
-      class TiresSandOut {
-        sound[] = {
-          "\ca\SOUNDS\Vehicles\Wheeled\Tires\ext\ext-tires-sand2",
-          0.1,
-          1,
-          30
-        };
-        frequency = "1";
-        volume = "camPos*sand*(speed factor[2, 20])";
-      };
-      class TiresGrassOut {
-        sound[] = {
-          "\ca\SOUNDS\Vehicles\Wheeled\Tires\ext\ext-tires-grass3",
-          0.1,
-          1,
-          30
-        };
-        frequency = "1";
-        volume = "camPos*grass*(speed factor[2, 20])";
-      };
-      class TiresMudOut {
-        sound[] = {
-          "\ca\SOUNDS\Vehicles\Wheeled\Tires\ext\ext-tires-mud2",
-          0.1,
-          1,
-          30
-        };
-        frequency = "1";
-        volume = "camPos*mud*(speed factor[2, 20])";
-      };
-      class TiresGravelOut {
-        sound[] = {
-          "\ca\SOUNDS\Vehicles\Wheeled\Tires\ext\ext-tires-gravel2",
-          0.1,
-          1,
-          30
-        };
-        frequency = "1";
-        volume = "camPos*gravel*(speed factor[2, 20])";
-      };
-      class TiresAsphaltOut {
-        sound[] = {
-          "\ca\SOUNDS\Vehicles\Wheeled\Tires\ext\ext-tires-asphalt3",
-          0.1,
-          1,
-          30
-        };
-        frequency = "1";
-        volume = "camPos*asphalt*(speed factor[2, 20])";
-      };
-      class NoiseOut {
-        sound[] = {
-          "\ca\SOUNDS\Vehicles\Wheeled\Noises\ext\int-noise3",
-          0.1,
-          1,
-          30
-        };
-        frequency = "1";
-        volume = "camPos*(damper0 max 0.04)*(speed factor[0, 8])";
-      };
-      class EngineLowIn {
-        sound[] = {
-          "\ca\SOUNDS\Vehicles\Wheeled\sedan\int\int-sedan-low-1",
-          0.562341,
-          0.95
-        };
-        frequency = "(randomizer*0.05+0.95)*rpm";
-        volume = "((engineOn*thrust) factor[0.65, 0.2])*(1-camPos)";
-      };
-      class EngineHighIn {
-        sound[] = {
-          "\ca\SOUNDS\Vehicles\Wheeled\sedan\int\int-sedan-high-1",
-          0.562341,
-          0.95
-        };
-        frequency = "(randomizer*0.05+0.95)*rpm";
-        volume = "((engineOn*thrust) factor[0.55, 0.95])*(1-camPos)";
-      };
-      class IdleIn {
-        sound[] = {
-          "\ca\sounds\Vehicles\Wheeled\sedan\int\int-sedan-idle-1",
-          0.354813,
-          1
-        };
-        frequency = "1";
-        volume = "engineOn*(rpm factor[0.3, 0])*(1-camPos)";
-      };
-      class TiresRockIn {
-        sound[] = {
-          "\ca\SOUNDS\Vehicles\Wheeled\Tires\int\int-tires-rock2",
-          0.1,
-          1
-        };
-        frequency = "1";
-        volume = "(1-camPos)*rock*(speed factor[2, 20])";
-      };
-      class TiresSandIn {
-        sound[] = {
-          "\ca\SOUNDS\Vehicles\Wheeled\Tires\int\int-tires-sand2",
-          0.1,
-          1
-        };
-        frequency = "1";
-        volume = "(1-camPos)*sand*(speed factor[2, 20])";
-      };
-      class TiresGrassIn {
-        sound[] = {
-          "\ca\SOUNDS\Vehicles\Wheeled\Tires\int\int-tires-grass3",
-          0.1,
-          1
-        };
-        frequency = "1";
-        volume = "(1-camPos)*grass*(speed factor[2, 20])";
-      };
-      class TiresMudIn {
-        sound[] = {
-          "\ca\SOUNDS\Vehicles\Wheeled\Tires\int\int-tires-mud2",
-          0.1,
-          1
-        };
-        frequency = "1";
-        volume = "(1-camPos)*mud*(speed factor[2, 20])";
-      };
-      class TiresGravelIn {
-        sound[] = {
-          "\ca\SOUNDS\Vehicles\Wheeled\Tires\int\int-tires-gravel2",
-          0.1,
-          1
-        };
-        frequency = "1";
-        volume = "(1-camPos)*gravel*(speed factor[2, 20])";
-      };
-      class TiresAsphaltIn {
-        sound[] = {
-          "\ca\SOUNDS\Vehicles\Wheeled\Tires\int\int-tires-asphalt3",
-          0.1,
-          1
-        };
-        frequency = "1";
-        volume = "(1-camPos)*asphalt*(speed factor[2, 20])";
-      };
-      class NoiseIn {
-        sound[] = {
-          "\ca\SOUNDS\Vehicles\Wheeled\BUS\int\noise3",
-          0.177828,
-          1
-        };
-        frequency = "1";
-        volume = "(damper0 max 0.04)*(speed factor[0, 8])*(1-camPos)";
-      };
-      class Movement {
-        sound = "soundEnviron";
-        frequency = "1";
-        volume = "0";
-      };
-    };
-    class Library {
-      libTextDesc = "Civilian Car";
-    };
-    class Damage {
-      tex[] = {
-      };
-      mat[] = {
-        "ca\wheeled\data\sedan_ext.rvmat",
-        "ca\wheeled\data\sedan_ext.rvmat",
-        "ca\wheeled\data\sedan_ext_destruct.rvmat",
-        "ca\wheeled\data\sedan_int.rvmat",
-        "ca\wheeled\data\sedan_int.rvmat",
-        "ca\wheeled\data\sedan_int_destruct.rvmat",
-        "ca\wheeled\data\detailmapy\auta_skla.rvmat",
-        "ca\wheeled\data\detailmapy\auta_skla_damage.rvmat",
-        "ca\wheeled\data\detailmapy\auta_skla_damage.rvmat",
-        "ca\wheeled\data\detailmapy\auta_skla_in.rvmat",
-        "ca\wheeled\data\detailmapy\auta_skla_in_damage.rvmat",
-        "ca\wheeled\data\detailmapy\auta_skla_in_damage.rvmat"
-      };
-    };
-    hiddenSelections[] = {
-      "Camo1"
-    };
-    hiddenSelectionsTextures[] = {
-      "\ca\wheeled\data\sedan_ext_co.paa"
-    };
-    rarityUrban = 0.6;
 
 	class Upgrades {
 		ItemORP[] = {"car_sedan_DZE1",{},{{"ItemORP",1},{"PartEngine",2}}};
diff --git a/SQF/dayz_code/Configs/CfgVehicles/CfgVehicles.hpp b/SQF/dayz_code/Configs/CfgVehicles/CfgVehicles.hpp
index 1c4ad13e7..a51430e7b 100644
--- a/SQF/dayz_code/Configs/CfgVehicles/CfgVehicles.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/CfgVehicles.hpp
@@ -458,9 +458,9 @@ class CfgVehicles {
 	#include "Car\UAZ_MG.hpp"
 	#include "Car\Volha.hpp"
 	#include "Car\VWGolf.hpp"
-	//#include "Car\CAR_HATCHBACK.hpp" //contained in CAR_SEDAN
 	#include "Car\UAZ.hpp"
-	#include "Car\CAR_SEDAN.hpp"
+	#include "Car\CAR_SEDAN.hpp" //SEDAN/Skoda must be first, hatchback is based on it
+	#include "Car\CAR_HATCHBACK.hpp"
 	#include "Car\V3S_Civ.hpp"
 	#include "Car\SUV.hpp"
 	#include "Car\Pickup_PK_INS.hpp"