m3ales 4 years ago
parent
commit
5e1ea58607

+ 115 - 0
addons - Copy/RD501_Vehicles/land/AAT/3as_import.hpp

@@ -0,0 +1,115 @@
+// 3AS AATs
+class LandVehicle;
+class Tank: LandVehicle {
+	class NewTurret;
+	class Sounds;
+	class HitPoints;
+};
+
+class Tank_F: Tank {
+	class Turrets
+	{
+		class MainTurret: NewTurret
+		{
+			class ViewGunner;
+			class Turrets
+			{
+				class CommanderOptics;
+			};
+		};
+	};
+};
+
+class 3AS_AAT_base_F : Tank_F {
+	class Turrets : Turrets {
+		class MainTurret: MainTurret {
+			class ViewGunner : ViewGunner {};
+			class Turrets : Turrets {
+				class CommanderOptics : CommanderOptics {};
+			};
+		};
+	};
+};
+
+class 3AS_CIS_AAT_base_F : 3AS_AAT_base_F {
+	class Turrets : Turrets
+	{
+		class MainTurret: MainTurret
+		{
+			class ViewGunner : ViewGunner {};
+			class Turrets : Turrets
+			{
+				class CommanderOptics : CommanderOptics {};
+			};
+		};
+	};
+};
+
+class 3AS_CIS_AAT_F : 3AS_CIS_AAT_base_F {
+	class Turrets : Turrets
+	{
+		class MainTurret: MainTurret
+		{
+			class ViewGunner : ViewGunner {};
+			class Turrets : Turrets
+			{
+				class CommanderOptics : CommanderOptics {};
+			};
+		};
+	};
+};
+
+class 3AS_AAT : 3AS_CIS_AAT_F {
+	class Turrets : Turrets {
+		class MainTurret: MainTurret {
+			class ViewGunner : ViewGunner {};
+			class Turrets : Turrets {
+				class CommanderOptics : CommanderOptics {};
+			};
+		};
+	};
+};
+
+class 3AS_AAT_snow : 3AS_AAT {
+	class Turrets : Turrets {
+		class MainTurret: MainTurret {
+			class ViewGunner : ViewGunner {};
+			class Turrets : Turrets {
+				class CommanderOptics : CommanderOptics {};
+			};
+		};
+	};
+};
+
+class 3AS_AAT_tan : 3AS_AAT {
+	class Turrets : Turrets {
+		class MainTurret: MainTurret {
+			class ViewGunner : ViewGunner {};
+			class Turrets : Turrets {
+				class CommanderOptics : CommanderOptics {};
+			};
+		};
+	};
+};
+
+class 3AS_AAT_urban : 3AS_AAT {
+	class Turrets : Turrets {
+		class MainTurret: MainTurret {
+			class ViewGunner : ViewGunner {};
+			class Turrets : Turrets {
+				class CommanderOptics : CommanderOptics {};
+			};
+		};
+	};
+};
+
+class 3AS_AAT_Tropic : 3AS_AAT {
+	class Turrets : Turrets {
+		class MainTurret: MainTurret {
+			class ViewGunner : ViewGunner {};
+			class Turrets : Turrets {
+				class CommanderOptics : CommanderOptics {};
+			};
+		};
+	};
+};

+ 119 - 0
addons - Copy/RD501_Vehicles/land/AAT/aat_templates.hpp

@@ -0,0 +1,119 @@
+#define AAT_LIGHT_ARMOUR 800
+#define AAT_MEDIUM_ARMOUR 2000
+#define AAT_MEDIUM_MAXSPEED 75
+#define AAT_KING_ARMOUR 4000
+#define AAT_KING_MAXSPEED 25
+#define AAT_CREW macro_new_unit_class(opfor,B1_crew)
+#define AAT_VEHICLE_CLASS macro_editor_vehicle_type(tank)
+#define AAT_EDITOR_CATEGORY macro_editor_cat(tank)
+#define AAT_FACTION macro_cis_faction
+#define AAT_WEAPON_ROTATION \
+minElev = -10;\
+maxElev = 40;\
+initElev = 0;\
+minTurn = -5;\
+maxTurn = 5;\
+initTurn = 0
+
+#define AAT_LIGHT(quotedDisplayName) \
+scope=2;\
+armor = AAT_LIGHT_ARMOUR;\
+forceInGarage = 1;\
+displayName = quotedDisplayName;\
+faction = AAT_FACTION;\
+editorSubcategory = AAT_EDITOR_CATEGORY;\
+vehicleClass = AAT_VEHICLE_CLASS;\
+crew = AAT_CREW;\
+class Turrets : Turrets {\
+	class MainTurret : MainTurret {\
+		class Turrets : Turrets {\
+			class CommanderOptics : CommanderOptics {\
+				weapons[] = {"Cannon_AAT_mc"};\
+				magazines[] = {"100Rnd_Laser_Cannon_AAT_m", "100Rnd_Laser_Cannon_AAT_m", "100Rnd_Laser_Cannon_AAT_m"};\
+				AAT_WEAPON_ROTATION;\
+			};\
+		};\
+		maxHorizontalRotSpeed = 1.2*2;\
+		maxVerticalRotSpeed = 1.2*2;\
+		weapons[] = {"Cannon_EWEBSWBFgun"};\
+		magazines[] = {\
+				"1000Rnd_Laser_Cannon_EWEBSWBF",\
+				"1000Rnd_Laser_Cannon_EWEBSWBF",\
+				"1000Rnd_Laser_Cannon_EWEBSWBF",\
+				"1000Rnd_Laser_Cannon_EWEBSWBF"\
+		};\
+	};\
+}
+
+#define AAT_MEDIUM(quotedDisplayName) \
+scope=2;\
+forceInGarage = 1;\
+displayName=quotedDisplayName;\
+armor = AAT_MEDIUM_ARMOUR;\
+maxSpeed = AAT_MEDIUM_MAXSPEED;\
+faction = AAT_FACTION;\
+editorSubcategory = AAT_EDITOR_CATEGORY;\
+vehicleClass = AAT_VEHICLE_CLASS;\
+crew = AAT_CREW;\
+class Turrets : Turrets {\
+	class MainTurret : MainTurret {\
+		class Turrets : Turrets {\
+			/*Commanders guns,the side ones*/\
+			class CommanderOptics:CommanderOptics {\
+				weapons[] = {"Cannon_ITTLaser"};\
+				magazines[] = {"10000Rnd_ITTLaser_Cannon_Minigun","10000Rnd_ITTLaser_Cannon_Minigun"};\
+				AAT_WEAPON_ROTATION;\
+			};\
+		};\
+		/*main turret guns*/\
+		weapons[] = {\
+			macro_new_weapon(aat_cannon,mbt),\
+			"Cannon_ITTLaser"\
+		};\
+		magazines[] = {\
+			macro_new_mag(aat_mbt,50),\
+			macro_new_mag(aat_mbt,50),\
+			macro_new_mag(aat_mbt,50),\
+			macro_new_mag(aat_mbt,50),\
+			"10000Rnd_ITTLaser_Cannon_Minigun"\
+		};\
+		maxHorizontalRotSpeed = 1.2;\
+		maxVerticalRotSpeed = 1.2;\
+	};\
+}
+
+#define AAT_KING(quotedDisplayName) \
+scope=2;\
+forceInGarage = 1;\
+displayName = quotedDisplayName;\
+armor = AAT_KING_ARMOUR;\
+maxSpeed = AAT_KING_MAXSPEED;\
+crew = AAT_CREW;\
+faction = AAT_FACTION;\
+editorSubcategory = AAT_EDITOR_CATEGORY;\
+vehicleClass = AAT_VEHICLE_CLASS;\
+class Turrets : Turrets {\
+	class MainTurret : MainTurret {\
+		class Turrets : Turrets {\
+			class CommanderOptics : CommanderOptics {\
+				maxHorizontalRotSpeed = .1;/*1.8*/\
+				maxVerticalRotSpeed = .1;/*1.8*/\
+				AAT_WEAPON_ROTATION;\
+				weapons[] = {"Cannon_AAT_mc","Cannon_ATST"};\
+				magazines[] = {"1000Rnd_Laser_Cannon_Minigun","1000Rnd_Laser_Cannon_Minigun","100Rnd_Laser_Cannon_AAT_m", "100Rnd_Laser_Cannon_AAT_m", "100Rnd_Laser_Cannon_AAT_m"};\
+			};\
+		};\
+		maxHorizontalRotSpeed = 1.2/3;\
+		maxVerticalRotSpeed = 1.2/3;\
+		weapons[] = {\
+			macro_new_weapon(aat_cannon,king),\
+			"Cannon_EWEBSWBFgun"\
+		};\
+		magazines[] = {\
+			"1000Rnd_Laser_Cannon_EWEBSWBF",\
+			macro_new_mag(aat_mbt,10),\
+			macro_new_mag(aat_mbt,10),\
+			macro_new_mag(aat_mbt,10)\
+		};\
+	};\
+}

+ 22 - 255
addons - Copy/RD501_Vehicles/land/AAT/config.cpp

@@ -55,6 +55,11 @@ class CfgPatches
 		requiredVersion=0.1;
 		units[]=
 		{
+			macro_new_vehicle(AAT,Light_MkIII),
+			macro_new_vehicle(AAT,Medium_MkIII_Snow),
+			macro_new_vehicle(AAT,Medium_MkIII_Tropical),
+			macro_new_vehicle(AAT,King_MkIII),
+			macro_new_vehicle(AAT,King_MkIII_Urban),
 			macro_new_vehicle(AAT,Light_MkII),
 			macro_new_vehicle(AAT,Medium_MkII),
 			macro_new_vehicle(AAT,King_MkII),
@@ -62,10 +67,7 @@ class CfgPatches
 			macro_new_vehicle(AAT,Medium_urban_MkII),
 			macro_new_vehicle(AAT,Medium_snow_MkII),
 			macro_new_vehicle(AAT,King_red_MkII),
-			macro_new_vehicle(AAT,King_green_MkII),
-			macro_new_vehicle(AAT,Light_MkIII),
-			macro_new_vehicle(AAT,Medium_MkIII),
-			macro_new_vehicle(AAT,King_MkIII)
+			macro_new_vehicle(AAT,King_green_MkII)
 		};
 		weapons[]=
 		{
@@ -76,11 +78,9 @@ class CfgPatches
 
 
 #include "../../common/sensor_templates.hpp"
-class DefaultEventhandlers ;
+class DefaultEventhandlers;
 class CfgVehicles
 {
-
-
 	#include "inheritance.hpp"
 	class macro_new_vehicle(AAT,Light_MkII):O_SWOP_AAT_1
 	{
@@ -233,8 +233,6 @@ class CfgVehicles
 				macro_vehicle_textures\AAT\king_AAT\blue\king_AAT_gun.paa
 		};
 		class EventHandlers :DefaultEventhandlers {};
-
-		
 	};
 
 	macro_new_medium_aat(macro_new_vehicle(AAT,Medium_tropical_MkII),"Medium (Tropical Thunder) AAT MKII",medium_aat\tropical\Trop_aat2.paa,medium_aat\tropical\Trop_aat1.paa)
@@ -244,260 +242,29 @@ class CfgVehicles
 	macro_new_king_aat(macro_new_vehicle(AAT,King_red_MkII),"King (Red Bull) AAT MKII",king_AAT\red\king_AAT_body.paa,king_AAT\red\king_AAT_gun.paa)
 	macro_new_king_aat(macro_new_vehicle(AAT,King_green_MkII),"King (Green Bean) AAT MKII",king_AAT\green\king_AAT_body.paa,king_AAT\green\king_AAT_gun.paa)
 
+	/*		--------	*/
+	/*	  | 3AS AATs |	*/
+	/*		--------	*/
+	#include "3as_import.hpp"
+	#include "aat_templates.hpp"
 
-// 3AS AATs
-class LandVehicle;
-	class Tank: LandVehicle
-	{
-		class NewTurret;
-		class Sounds;
-		class HitPoints;
-	};
-
-	class Tank_F: Tank
-	{
-		class Turrets
-		{
-			class MainTurret: NewTurret
-			{
-				class ViewGunner;
-				class Turrets
-				{
-					class CommanderOptics;
-				};
-			};
-		};
-	};
 
-	class 3AS_AAT_base_F : Tank_F {
-		class Turrets : Turrets
-		{
-			class MainTurret: MainTurret
-			{
-				class ViewGunner : ViewGunner {};
-				class Turrets : Turrets
-				{
-					class CommanderOptics : CommanderOptics {};
-				};
-			};
-		};
+	class macro_new_vehicle(AAT,King_MkIII) : 3AS_AAT {
+		AAT_KING("King AAT Mk.III");
 	};
-	class 3AS_CIS_AAT_base_F : 3AS_AAT_base_F {
-		class Turrets : Turrets
-		{
-			class MainTurret: MainTurret
-			{
-				class ViewGunner : ViewGunner {};
-				class Turrets : Turrets
-				{
-					class CommanderOptics : CommanderOptics {};
-				};
-			};
-		};
-	};
-	class 3AS_CIS_AAT_F : 3AS_CIS_AAT_base_F {
-		class Turrets : Turrets
-		{
-			class MainTurret: MainTurret
-			{
-				class ViewGunner : ViewGunner {};
-				class Turrets : Turrets
-				{
-					class CommanderOptics : CommanderOptics {};
-				};
-			};
-		};
-	};
-
-	class 3AS_AAT : 3AS_CIS_AAT_F {
-		class Turrets : Turrets
-		{
-			class MainTurret: MainTurret
-			{
-				class ViewGunner : ViewGunner {};
-				class Turrets : Turrets
-				{
-					class CommanderOptics : CommanderOptics {};
-				};
-			};
-		};
-	};
-
-	class 3AS_AAT_snow : 3AS_AAT {
-		class Turrets : Turrets
-		{
-			class MainTurret: MainTurret
-			{
-				class ViewGunner : ViewGunner {};
-				class Turrets : Turrets
-				{
-					class CommanderOptics : CommanderOptics {};
-				};
-			};
-		};
+	class macro_new_vehicle(AAT,King_MkIII_Urban) : 3AS_AAT_urban {
+		AAT_KING("King AAT Mk.III (Urban)");
 	};
 
-	class 3AS_AAT_tan : 3AS_AAT {
-		class Turrets : Turrets
-		{
-			class MainTurret: MainTurret
-			{
-				class ViewGunner : ViewGunner {};
-				class Turrets : Turrets
-				{
-					class CommanderOptics : CommanderOptics {};
-				};
-			};
-		};
+	class macro_new_vehicle(AAT,Medium_MkIII_Snow) : 3AS_AAT_snow {
+		AAT_MEDIUM("Medium AAT Mk.III (Snow)");
 	};
 
-	class 3AS_AAT_urban : 3AS_AAT {
-		class Turrets : Turrets
-		{
-			class MainTurret: MainTurret
-			{
-				class ViewGunner : ViewGunner {};
-				class Turrets : Turrets
-				{
-					class CommanderOptics : CommanderOptics {};
-				};
-			};
-		};
+	class macro_new_vehicle(AAT,Medium_MkIII_Tropical) : 3AS_AAT_Tropic {
+		AAT_MEDIUM("Medium AAT Mk.III (Tropical)");
 	};
 
 	class macro_new_vehicle(AAT,Light_MkIII) : 3AS_AAT_tan {
-
-		scope=2
-		armor = 800;
-		forceInGarage = 1;
-		displayName="Light AAT Mk.III";
-
-		faction = macro_cis_faction
-		editorSubcategory = macro_editor_cat(tank)
-		vehicleClass = macro_editor_vehicle_type(tank)
-		
-		crew=macro_new_unit_class(opfor,B1_crew)
-		class Turrets:Turrets
-		{
-			class MainTurret:MainTurret
-			{
-				class Turrets:Turrets
-				{
-					class CommanderOptics:CommanderOptics
-					{
-						weapons[] = {"Cannon_AAT_mc"};
-						magazines[] = {"100Rnd_Laser_Cannon_AAT_m", "100Rnd_Laser_Cannon_AAT_m", "100Rnd_Laser_Cannon_AAT_m"};
-						macro_enable_rotation
-					};
-				};
-				maxHorizontalRotSpeed = 1.2*2;
-				maxVerticalRotSpeed = 1.2*2;
-				weapons[] = {"Cannon_EWEBSWBFgun"};
-				magazines[] = 
-				{
-					 "1000Rnd_Laser_Cannon_EWEBSWBF",
-					 "1000Rnd_Laser_Cannon_EWEBSWBF",
-					 "1000Rnd_Laser_Cannon_EWEBSWBF",
-					 "1000Rnd_Laser_Cannon_EWEBSWBF"
-				};
-				
-			};
-		};
+		AAT_LIGHT("Light AAT Mk.III");
 	};
-
-	class macro_new_vehicle(AAT,Medium_MkIII) : 3AS_AAT_snow {
-
-		scope=2
-		forceInGarage = 1;
-		displayName="Medium AAT Mk.III";
-		armor = 2000;
-		maxSpeed = 75;
-
-		faction = macro_cis_faction
-		editorSubcategory = macro_editor_cat(tank)
-		vehicleClass = macro_editor_vehicle_type(tank)
-
-		crew=macro_new_unit_class(opfor,B1_crew)
-		class Turrets:Turrets
-		{
-			class MainTurret:MainTurret
-			{
-				class Turrets:Turrets
-				{
-					//commanders guns,the side ones
-					class CommanderOptics:CommanderOptics
-					{
-						weapons[] = {"Cannon_ITTLaser"};
-						magazines[] = {"10000Rnd_ITTLaser_Cannon_Minigun","10000Rnd_ITTLaser_Cannon_Minigun"};
-						macro_enable_rotation	
-					};
-					
-				};
-				//main turret guns
-				weapons[] = {
-					macro_new_weapon(aat_cannon,mbt),
-					"Cannon_ITTLaser"
-				};
-				magazines[] = 
-				{
-					macro_new_mag(aat_mbt,50),
-					macro_new_mag(aat_mbt,50),
-					macro_new_mag(aat_mbt,50),
-					macro_new_mag(aat_mbt,50),
-					"10000Rnd_ITTLaser_Cannon_Minigun"
-				};
-				maxHorizontalRotSpeed = 1.2;
-				maxVerticalRotSpeed = 1.2;
-				
-			};
-		};
-	};
-
-	class macro_new_vehicle(AAT,King_MkIII) : 3AS_AAT_urban {
-
-		scope=2
-		forceInGarage = 1;
-		displayName="King AAT Mk.III";
-		armor = 4000;
-		maxSpeed = 30;
-
-		crew=macro_new_unit_class(opfor,B1_crew)
-
-		faction = macro_cis_faction
-		editorSubcategory = macro_editor_cat(tank)
-		vehicleClass = macro_editor_vehicle_type(tank)
-		class Turrets:Turrets
-		{
-			class MainTurret:MainTurret
-			{
-				class Turrets:Turrets
-				{
-					class CommanderOptics:CommanderOptics
-					{
-						maxHorizontalRotSpeed = .1;//1.8
-						maxVerticalRotSpeed = .1;//1.8
-						macro_enable_rotation
-						weapons[] = {"Cannon_AAT_mc","Cannon_ATST"};
-						magazines[] = {"1000Rnd_Laser_Cannon_Minigun","1000Rnd_Laser_Cannon_Minigun","100Rnd_Laser_Cannon_AAT_m", "100Rnd_Laser_Cannon_AAT_m", "100Rnd_Laser_Cannon_AAT_m"};
-						
-					};
-					
-				};
-
-				maxHorizontalRotSpeed = 1.2/3;
-				maxVerticalRotSpeed = 1.2/3;
-				weapons[] = {
-					macro_new_weapon(aat_cannon,king),
-					"Cannon_EWEBSWBFgun"
-				};
-				magazines[] = {
-					"1000Rnd_Laser_Cannon_EWEBSWBF",
-					macro_new_mag(aat_mbt,10),
-					macro_new_mag(aat_mbt,10),
-					macro_new_mag(aat_mbt,10)
-				};
-			};
-		};
-	};
-
-};
+};

+ 0 - 2
addons - Copy/RD501_Vehicles/land/AAT/inheritance.hpp

@@ -262,5 +262,3 @@ class O_SWOP_AAT_1:O_O_SWOP_AAT_base
 
 	};
 };
-
-