Merge pull request #131 from 501st-Aux-Mod-Team/tanksgiving

Tanksgiving

addons - Copy/RD501_Vehicles/land/ATAP/config.cpp

@@ -0,0 +1,80 @@
+
+//get generlized macros
+#include "../../../RD501_main/config_macros.hpp"
+
+//General name of the vehicle
+#define vehicle_addon atap
+#define patch_name MODNAME##vehicle_addon##_Patches
+#define vehicle_classname MODNAME##_##vehicle_addon
+
+class CfgPatches
+{
+	class macro_patch_name(atap)
+	{
+		addonRootClass=macro_patch_name(vehicles)
+
+		requiredAddons[]=
+		{
+			macro_patch_name(vehicles)
+		};
+		requiredVersion=0.1;
+		units[]=
+		{
+			macro_new_vehicle(walker,republic_atap_MkII)
+		};
+		weapons[]=
+		{
+			
+		};
+	};
+};
+
+class CfgVehicles
+{
+	class MBT_01_base_F;
+	class MBT_01_arty_base_F: MBT_01_base_F
+	{
+		class Turrets;
+	};
+	class 3as_ATAP_base: MBT_01_arty_base_F
+	{
+		class Turrets:Turrets
+		{
+			class MainTurret1;
+			class MainTurretBottom;
+			class MainTurretTop;
+			
+		}
+	};
+	class macro_new_vehicle(walker,republic_atap_MkII):3as_ATAP_base
+	{
+		scope=2;
+		scopeCurator=2;
+		displayName= "Republic ATAP Mk.II";
+		faction = macro_republic_faction
+		editorSubcategory = macro_editor_cat(tank)
+		vehicleClass = macro_editor_vehicle_type(tank)
+		class Turrets:Turrets
+		{
+			class MainTurretTop:MainTurretTop{};
+			class MainTurretBottom:MainTurretBottom{};
+			class MainTurret1: MainTurret1
+			{
+				elevationMode=0;
+				minElev=-25;
+				weapons[]=
+				{
+					macro_new_weapon(mynock_cannon,mbt)
+				};
+				magazines[]=
+				{
+					macro_new_mag(mynock_mbt_ap,12),
+					macro_new_mag(mynock_mbt_he,12),
+					macro_new_mag(mynock_mbt_ap,12),
+					macro_new_mag(mynock_mbt_he,12)
+				};
+			};
+		};
+	};
+	
+};

addons - Copy/RD501_Vehicles/land/mortars/config.cpp

@@ -40,7 +40,11 @@ class CfgPatches
 class DefaultEventhandlers;
 class CfgVehicles
 {
-
+	class Weapon_bag_base;
+	class JLTS_UAV_prowler_gar_backpack:Weapon_bag_base
+	{
+		class assembleInfo;
+	};
 	class B_Mortar_01_F;
 	class macro_new_vehicle(mortar,republic):B_Mortar_01_F
 	{
@@ -57,6 +61,13 @@ class CfgVehicles
 		faction = macro_republic_faction
 		editorSubcategory = macro_editor_cat(static_turrets)
 		vehicleClass = macro_editor_vehicle_type(static_turrets)
+		class assembleInfo
+		{
+			dissasembleTo[]=
+			{
+				macro_new_vehicle(stat,mortar_bag)
+			};
+		};
 	};
 
 	class macro_new_vehicle(mortar,cis):macro_new_vehicle(mortar,republic)
@@ -73,5 +84,17 @@ class CfgVehicles
 		hiddenSelectionsTextures[] = {"optre_vehicles\hev\data\pod_CO.paa"};
 		availableForSupportTypes[] = {"Artillery"};
 	};
-
+class macro_new_vehicle(stat,mortar_bag):JLTS_UAV_prowler_gar_backpack
+	{
+		displayName="Republic Mortar Bag";
+		hiddenSelectionsTextures[]=
+		{
+			"\RD501_Vehicles\static\data\rd501_backpack_staticweapons_sniper.paa"
+		};
+		class assembleInfo: assembleInfo
+		{
+			displayName="Republic Mortar";
+			assembleTo = macro_new_vehicle(mortar,republic)
+		};
+	};
 };

addons - Copy/RD501_Vehicles/land/saber/config.cpp

@@ -113,12 +113,16 @@ class CfgPatches
 		requiredVersion=0.1;
 		units[]=
 		{
-			macro_new_vehicle(saber,empire_super_saber_MkII),
+			macro_new_vehicle(saber,republic_tx130_MkII),
+			macro_new_vehicle(saber,republic_tx130_gl_MkII),
+			macro_new_vehicle(saber,republic_tx130_super_MkII),
+			macro_new_vehicle(saber,republic_tx130_recon_MkII)
+			/*macro_new_vehicle(saber,empire_super_saber_MkII),
 			macro_new_vehicle(saber,empire_saber_MkII),
 			macro_new_vehicle(saber,empire_command_saber_MkII),
 			macro_new_vehicle(saber,republic_super_saber_MkII),
 			macro_new_vehicle(saber,republic_saber_MkII),
-			macro_new_vehicle(saber,republic_command_saber_MkII)
+			macro_new_vehicle(saber,republic_command_saber_MkII)*/
 		};
 		weapons[]=
 		{
@@ -136,19 +140,185 @@ class CfgVehicles
 	//O_JM_TX130_1  empire command
 	//O_JM_TX130m1_1 normal
 	//O_JM_TX130m2_1 super
-
 	class Tank_F;
 	class 3as_saber_01_Base: Tank_F
 	{
 		RD501_magclamp_small_offset[] = {0.0,0.0,-3.0};
 		RD501_magclamp_large_offset[] = {0.0,0.0,-3.0};
+		class Turrets;
 	};
 
 	 #include "inheritance.hpp"
-
-	
+	class 3as_saber_Base:3as_saber_01_Base{};
+	class 3as_saber_m1:3as_saber_Base
+	{
+		class Turrets: Turrets
+		{
+			class MainTurret_bottom;
+			class Mainturret_top;
+		};
+	};
+	class 3as_saber_02_Base:3as_saber_01_Base{};
+	class 3as_saber_m1G:3as_saber_02_Base
+	{
+		class Turrets: Turrets
+		{
+			class MainTurret_bottom;
+			class MainTurret_top;
+		}
+	};
+	class 3as_saber_super_base:3as_saber_01_Base{};
+	class 3as_saber_super:3as_saber_super_base
+	{
+		class Turrets: Turrets
+		{
+			class Mainturret_super;
+		};
+	};
+	class 3as_saber_03_Base:3as_saber_01_Base{};
+	class 3as_saber_m1Recon:3as_saber_03_Base
+	{
+		class Turrets: Turrets
+		{
+			class MainTurret_top;
+			class MainTurret_bottom;
+		};
+	};
+	class macro_new_vehicle(saber,republic_tx130_MkII):3as_saber_m1
+	{
+		scope=2;
+		forceInGarage = 1;
+		scopeCurator=2;
+		displayName = "Saber TX-130 Mk.II"
+		faction = macro_republic_faction
+		editorSubcategory = macro_editor_cat(tank)
+		vehicleClass = macro_editor_vehicle_type(tank)
+		class Turrets: Turrets
+		{
+			class MainTurret_bottom : MainTurret_bottom{};
+			class Mainturret_top : Mainturret_top
+			{
+				weapons[]=
+				{
+					macro_new_weapon(saber_mg,50cal),
+					"SmokeLauncher"
+				};
+				magazines[]=
+				{
+					macro_new_mag(saber_mg,300),
+					macro_new_mag(saber_mg,300),
+					macro_new_mag(saber_mg,300),
+					macro_new_mag(saber_mg,300),
+					macro_new_mag(saber_mg,300),
+					macro_new_mag(saber_mg,300),
+					macro_new_mag(saber_mg,300),
+					"SmokeLauncherMag"
+				};
+			};
+		};
+	};
+	class macro_new_vehicle(saber,republic_tx130_gl_MkII):3as_saber_m1G
+	{
+		scope=2;
+		forceInGarage = 1;
+		scopeCurator=2;
+		displayName = "Saber TX-130 GL Mk.II"
+		faction = macro_republic_faction
+		editorSubcategory = macro_editor_cat(tank)
+		vehicleClass = macro_editor_vehicle_type(tank)
+		class Turrets: Turrets
+		{
+			class MainTurret_bottom:MainTurret_bottom{};
+			class MainTurret_top: Mainturret_top
+			{
+				weapons[]=
+				{
+					macro_new_weapon(saber_gl,40mm),
+					"SmokeLauncher"
+				};
+			};
+		};
+	};
+	class macro_new_vehicle(saber,republic_tx130_super_MkII):3as_saber_super
+	{
+		scope=2;
+		forceInGarage = 1;
+		scopeCurator=2;
+		displayName = "Saber TX-130 Super Mk.II"
+		faction = macro_republic_faction
+		editorSubcategory = macro_editor_cat(tank)
+		vehicleClass = macro_editor_vehicle_type(tank)
+		class Turrets: Turrets
+		{
+			class Mainturret_super: Mainturret_super
+			{
+				weapons[]=
+				{
+					macro_new_weapon(saber_cannon,supermkii),
+					macro_new_weapon(saber_mg,50cal),
+					"SmokeLauncher"
+				};
+				magazines[]=
+				{
+					"3as_25rnd_Sabre_Super_Mag",
+					"3as_25rnd_Sabre_Super_Mag",
+					"3as_25rnd_Sabre_Super_Mag",
+					"3as_25rnd_Sabre_Super_Mag",
+					"3as_25rnd_Sabre_Super_Mag",
+					"3as_25rnd_Sabre_Super_Mag",
+					"3as_25rnd_Sabre_Super_Mag",
+					macro_new_mag(saber_mg,300),
+					macro_new_mag(saber_mg,300),
+					macro_new_mag(saber_mg,300),
+					macro_new_mag(saber_mg,300),
+					macro_new_mag(saber_mg,300),
+					"SmokeLauncherMag"
+				};
+			};
+		};
+	};
+	class macro_new_vehicle(saber,republic_tx130_recon_MkII):3as_saber_m1Recon
+	{
+		scope=2;
+		forceInGarage = 1;
+		scopeCurator=2;
+		displayName = "Saber TX-130 Recon Mk.II"
+		faction = macro_republic_faction
+		editorSubcategory = macro_editor_cat(tank)
+		vehicleClass = macro_editor_vehicle_type(tank)
+		class Turrets: Turrets
+		{
+			class MainTurret_top: Mainturret_top{};
+			class MainTurret_bottom: MainTurret_bottom
+			{
+				weapons[]=
+				{
+					macro_new_weapon(saber_gl,40mm),
+					macro_new_weapon(saber_mg,50cal),
+					"SmokeLauncher",
+					"missiles_DAGR"
+				};
+				magazines[]=
+				{
+					macro_new_mag(saber_recon,100),
+					macro_new_mag(saber_recon,100),
+					macro_new_mag(saber_recon,100),
+					macro_new_mag(saber_recon,100),
+					macro_new_mag(saber_recon,100),
+					macro_new_mag(saber_recon,100),
+					macro_new_mag(saber_mg,300),
+					macro_new_mag(saber_mg,300),
+					macro_new_mag(saber_mg,300),
+					macro_new_mag(saber_mg,300),
+					macro_new_mag(saber_mg,300),
+					"SmokeLauncherMag",
+					"12Rnd_PG_missiles"
+				};
+			};
+		};
+	};
 	//empire
-	class macro_new_vehicle(saber,empire_super_saber_MkII):O_JM_TX130m2_1
+	/*class macro_new_vehicle(saber,empire_super_saber_MkII):O_JM_TX130m2_1
 	{
 		scope=2
 		forceInGarage = 1;
@@ -362,8 +532,93 @@ class CfgVehicles
 			};
 		};
 		class EventHandlers :DefaultEventhandlers {};
-	};
+	};*/
+
 
 
+};
+
+class CfgWeapons
+{
+	class 3AS_Sabre_MG;
+	class 3as_saber_gmg_40mm;
+	class 3AS_Sabre_Cannons_Super;
+	class LMG_M200;
+	class autocannon_Base_F
+	{
+		class player;
+	};
+	class 3as_saber_autocannon_30mm:LMG_M200
+	{
+		class HE: autocannon_Base_F
+		{
+			class player:player{};
+		};
+	};
+	class macro_new_weapon(saber_mg,50cal):3AS_Sabre_MG
+	{
+		magazineReloadTime=3;
+		magazines[]=
+		{
+			macro_new_mag(saber_mg,300)
+		};
+	};
+	class macro_new_weapon(saber_gl,40mm):3as_saber_gmg_40mm
+	{
+		magazineReloadTime=3;
+	};
+	class macro_new_weapon(saber_cannon,supermkii):3AS_Sabre_Cannons_Super
+	{
+		magazineReloadTime=6;
+	};
+	class macro_new_weapon(saber_cannon,super):3as_saber_autocannon_30mm
+	{
+		class HE: autocannon_Base_F
+		{
+			magazines[]=
+			{
+				macro_new_mag(saber_recon,100)
+			};
+			magazineReloadTime=3;
+		};
+	};
+};
 
+class CfgMagazines
+{
+	class 3AS_300Rnd_SabreMG_Mag;
+	class 3as_saber_200Rnd_autocannon_30mm_mag;
+	class macro_new_mag(saber_mg,300):3AS_300Rnd_SabreMG_Mag
+	{
+		displayName="300 Rnd Heavy MG Ammo";
+		displayNameShort="Heavy MG";
+		ammo=macro_new_ammo(saber_mg)
+	};
+	class macro_new_mag(saber_recon,100):3as_saber_200Rnd_autocannon_30mm_mag
+	{
+		count=100;
+		ammo=macro_new_ammo(saber_mg);
+	};
+};
+class CfgAmmo
+{
+	class 3AS_EC60_BluePlasma;
+	class macro_new_ammo(saber_mg):3AS_EC60_BluePlasma
+	{
+		hit=30;
+		indirectHit=0;
+		indirectHitRange=0;
+		cartridge="FxCartridge_127";
+		visibleFire=8;
+		audibleFire=120;
+		dangerRadiusBulletClose=12;
+		dangerRadiusHit=16;
+		suppressionRadiusBulletClose=8;
+		suppressionRadiusHit=12;
+		cost=5;
+		airLock=1;
+		caliber=2.5999999;
+		typicalSpeed=880;
+		timeToLive=10;
+	};
 };

addons - Copy/RD501_Vehicles/static/config.cpp

@@ -245,7 +245,7 @@ class CfgVehicles
 		};
 		class assembleInfo: assembleInfo
 		{
-			displayName="Assemble E-Web Bag";
+			displayName="E-Web";
 			assembleTo = macro_new_vehicle(stat,reweb)
 		};
 	};
@@ -258,7 +258,7 @@ class CfgVehicles
 		};
 		class assembleInfo: assembleInfo
 		{
-			displayName="Assemble Boomer";
+			displayName="Boomer";
 			assembleTo = macro_new_vehicle(stat,ragl40)
 		};
 	};
@@ -271,7 +271,7 @@ class CfgVehicles
 		};
 		class assembleInfo: assembleInfo
 		{
-			displayName="Assemble Striker";
+			displayName="Striker";
 			assembleTo = macro_new_vehicle(stat,Striker)
 		};
 	};
@@ -284,7 +284,7 @@ class CfgVehicles
 		};
 		class assembleInfo: assembleInfo
 		{
-			displayName="Assemble Driver";
+			displayName="Driver";
 			assembleTo = macro_new_vehicle(stat,Railgun)
 		};
 	};

addons - Copy/RD501_Weapons/DC_Family/DC_15gl/config.cpp

@@ -181,7 +181,7 @@ class CfgWeapons
 	};
 	class macro_new_weapon(DC,15cgl):3AS_DC15C_GL
 	{
-		displayName="Republic DC-15C UGL";
+		displayName="Republic DC-15C US";
 		dispersion=0.00116;
 		ACE_Overheating_mrbs = 300000;
 		recoil="recoil_mxc";

addons - Copy/RD501_Weapons/config.cpp

@@ -833,6 +833,9 @@ class CfgAmmo
 	{
 		hit=57.45;
 		caliber=3.5999999;
+		indirectHit = 3;
+		indirectHitRange = 0.5;
+		explosive = 0.4;
 		ACE_caliber=1;
 		typicalSpeed=860;
 		model="\A3\Weapons_f\Data\bullettracer\tracer_green";