Sabre fix

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

@@ -140,48 +140,83 @@ class CfgVehicles
 	//O_JM_TX130_1  empire command
 	//O_JM_TX130m1_1 normal
 	//O_JM_TX130m2_1 super
-	class Tank_F;
+class LandVehicle;
+	class Tank: LandVehicle
+	{
+		class NewTurret;
+		class Sounds;
+		class HitPoints;
+	};
+	class Tank_F: Tank
+	{
+		class Turrets
+		{
+			class MainTurret: NewTurret
+			{
+				class Turrets
+				{
+					class CommanderOptics;
+				};
+			};
+		};
+	};
 	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;
+		class Turrets:Turrets
+		{
+			class MainTurret_bottom: NewTurret{};
+			class Mainturret_top:MainTurret_bottom{};
+		};
 	};
 
 	 #include "inheritance.hpp"
-	class 3as_saber_Base:3as_saber_01_Base{};
+	class 3as_saber_Base:3as_saber_01_Base
+	{
+		class Turrets:Turrets
+		{
+			class MainTurret_bottom:MainTurret_bottom{};
+			class Mainturret_top:Mainturret_top{};
+		};
+	};
 	class 3as_saber_m1:3as_saber_Base
 	{
 		class Turrets: Turrets
 		{
-			class MainTurret_bottom;
-			class Mainturret_top;
+			class MainTurret_bottom:MainTurret_bottom{};
+			class Mainturret_top:Mainturret_top{};
 		};
 	};
-	class 3as_saber_02_Base:3as_saber_01_Base{};
-	class 3as_saber_m1G:3as_saber_02_Base
+	class 3as_saber_m1G;
+	class 3as_saber_super_base:3as_saber_01_Base
 	{
-		class Turrets: Turrets
+		class Turrets:Turrets
 		{
-			class MainTurret_bottom;
-			class MainTurret_top;
-		}
+			class Mainturret_super: MainTurret_bottom{};
+		};
 	};
-	class 3as_saber_super_base:3as_saber_01_Base{};
 	class 3as_saber_super:3as_saber_super_base
 	{
 		class Turrets: Turrets
 		{
-			class Mainturret_super;
+			class Mainturret_super: Mainturret_super{};
+		};
+	};
+	class 3as_saber_03_Base:3as_saber_01_Base
+	{
+		class Turrets:Turrets
+		{
+			class MainTurret_top: Mainturret_top{};
+			class MainTurret_bottom: MainTurret_bottom{};
 		};
 	};
-	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 MainTurret_top: Mainturret_top{};
+			class MainTurret_bottom: MainTurret_bottom{};
 		};
 	};
 	class macro_new_vehicle(saber,republic_tx130_MkII):3as_saber_m1
@@ -226,18 +261,6 @@ class CfgVehicles
 		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
 	{
@@ -293,7 +316,7 @@ class CfgVehicles
 			{
 				weapons[]=
 				{
-					macro_new_weapon(saber_gl,40mm),
+					macro_new_weapon(saber_cannon,recon),
 					macro_new_weapon(saber_mg,50cal),
 					"SmokeLauncher",
 					"missiles_DAGR"
@@ -317,243 +340,16 @@ class CfgVehicles
 			};
 		};
 	};
-	//empire
-	/*class macro_new_vehicle(saber,empire_super_saber_MkII):O_JM_TX130m2_1
-	{
-		scope=2
-		forceInGarage = 1;
-		displayName = "Super Saber Mk.II (Empire)";
-		macro_saber_smoke
-		macro_saber_driver
-
-		RD501_magclamp_small_offset[] = {0.0,2.0,-3.0};
-		RD501_magclamp_large_offset[] = {0.0,2.0,-3.0};
-
-		side=0;
-
-		faction = macro_empire_faction
-		editorSubcategory = macro_editor_cat(tank)
-		vehicleClass = macro_editor_vehicle_type(tank)
-		class Turrets:Turrets
-		{
-			class MainTurret:MainTurret
-			{
-				
-				weapons[] = {
-					macro_super_saber_weap
-				};
-				magazines[] = {
-					macro_super_saber_mag
-				};
-			};
-		};
-		class EventHandlers :DefaultEventhandlers {};
-	};
-
-	class macro_new_vehicle(saber,empire_saber_MkII):O_JM_TX130m1_1
-	{
-		scope=2
-		scopeCurator=2;
-		
-		forceInGarage = 1;
-		displayName = "Saber Mk.II (Empire)";
-		macro_saber_smoke
-		armor =1100;
-
-		RD501_magclamp_small_offset[] = {0.0,2.0,-3.0};
-		RD501_magclamp_large_offset[] = {0.0,2.0,-3.0};
-		
-		faction = macro_empire_faction
-		editorSubcategory = macro_editor_cat(tank)
-		vehicleClass = macro_editor_vehicle_type(tank)
-		side=0;
-		weapons[] = {
-			macro_saber_main_weap
-		};
-		magazines[] = {
-			macro_saber_main_mag
-		};
-		side=0;
-		class Turrets:Turrets
-		{
-			class MainTurret:MainTurret
-			{
-				
-				weapons[] = {
-					macro_saber_weap_imperial
-				};
-				magazines[] = {
-					macro_saber_mag_imperial
-				};
-			};
-		};
-		class EventHandlers :DefaultEventhandlers {};
-	};
-
-	class macro_new_vehicle(saber,empire_command_saber_MkII):O_JM_TX130_1//O_JM_TX130r_1
-	{
-		scope=2
-		scopeCurator=2;
-		forceInGarage = 1;
-		displayName = "Saber (Command) Mk.II (Empire)";
-
-		RD501_magclamp_small_offset[] = {0.0,2.0,-3.0};
-		RD501_magclamp_large_offset[] = {0.0,2.0,-3.0};
-
-		armor = 750;
-		macro_command_saber_smoke
-		macro_saber_driver
-		side=0;
-		faction = macro_empire_faction
-		editorSubcategory = macro_editor_cat(tank)
-		vehicleClass = macro_editor_vehicle_type(tank)
-	
-		class Turrets:Turrets
-		{
-			class MainTurret:MainTurret
-			{
-				weapons[] = {
-					macro_saber_weap_imperial
-				};
-				magazines[] = {
-					macro_saber_mag_imperial
-				};
-			};
-		};
-		class EventHandlers :DefaultEventhandlers {};
-	};
-
-	//republic
-	class macro_new_vehicle(saber,republic_super_saber_MkII):O_JM_TX130m2_1
-	{
-		scope=2
-		side=1;
-		forceInGarage = 1;
-		displayName = "Super Saber Mk.II (Republic)";
-		macro_republic_skin
-		crew = "SWOP_Clonetrooper_P1";
-
-		RD501_magclamp_small_offset[] = {0.0,2.0,-3.0};
-		RD501_magclamp_large_offset[] = {0.0,2.0,-3.0};
-
-		faction = macro_republic_faction
-		editorSubcategory = macro_editor_cat(tank)
-		vehicleClass = macro_editor_vehicle_type(tank)
-
-		macro_saber_driver
-		macro_saber_smoke
-		armor = 600;
-
-		class Turrets:Turrets
-		{
-			class MainTurret:MainTurret
-			{
-				weapons[] = {
-					macro_super_saber_weap
-				};
-				magazines[] = {
-					macro_super_saber_mag
-				};
-			};
-		};
-		class EventHandlers :DefaultEventhandlers {};
-	};
-
-	class macro_new_vehicle(saber,republic_saber_MkII):O_JM_TX130m1_1
-	{
-		scope=2
-		forceInGarage = 1;
-		displayName = "Saber Mk.II (Republic)";
-		macro_republic_skin
-
-		RD501_magclamp_small_offset[] = {0.0,2.0,-3.0};
-		RD501_magclamp_large_offset[] = {0.0,2.0,-3.0};
-
-		faction = macro_republic_faction
-		editorSubcategory = macro_editor_cat(tank)
-		vehicleClass = macro_editor_vehicle_type(tank)
-		
-		crew = "SWOP_Clonetrooper_P1";
-		armor =1100;
-		macro_saber_smoke
-		weapons[] = {
-			macro_saber_main_weap
-		};
-		magazines[] = {
-			macro_saber_main_mag
-		};
-
-
-		side=1;
-		class Turrets:Turrets
-		{
-			class MainTurret:MainTurret
-			{
-				weapons[] = {
-					macro_saber_weap
-				};
-				magazines[] = {
-					macro_saber_mag
-				};
-			};
-		};
-		class EventHandlers :DefaultEventhandlers {};
-	};
-
-	class macro_new_vehicle(saber,republic_command_saber_MkII):O_JM_TX130_1
-	{
-		scope=2
-		forceInGarage = 1;
-		displayName = "Saber (Command) Mk.II (Republic)";
-		macro_republic_skin
-
-		macro_saber_driver
-		macro_command_saber_smoke
-		armor = 750;
-
-		RD501_magclamp_small_offset[] = {0.0,2.0,-3.0};
-		RD501_magclamp_large_offset[] = {0.0,2.0,-3.0};
-
-		crew = "SWOP_Clonetrooper_P1";
-		faction = macro_republic_faction
-		editorSubcategory = macro_editor_cat(tank)
-		vehicleClass = macro_editor_vehicle_type(tank)
-		side=1;
-		class Turrets:Turrets
-		{
-			class MainTurret:MainTurret
-			{
-				weapons[] = {
-					macro_saber_weap
-				};
-				magazines[] = {
-					macro_saber_mag
-				};
-			};
-		};
-		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 HE;
 	};
 	class macro_new_weapon(saber_mg,50cal):3AS_Sabre_MG
 	{
@@ -563,21 +359,13 @@ class CfgWeapons
 			macro_new_mag(saber_mg,300)
 		};
 	};
-	class macro_new_weapon(saber_gl,40mm):3as_saber_gmg_40mm
-	{
-		magazineReloadTime=3;
-		magazines[]=
-		{
-			macro_new_mag(saber_recon,100)
-		};
-	};
 	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 macro_new_weapon(saber_cannon,recon):3as_saber_autocannon_30mm
 	{
-		class HE: autocannon_Base_F
+		class HE: HE
 		{
 			magazines[]=
 			{
@@ -591,14 +379,14 @@ class CfgWeapons
 class CfgMagazines
 {
 	class 3AS_300Rnd_SabreMG_Mag;
-	class 3as_saber_200Rnd_autocannon_30mm_mag;
+	class 3as_saber_80Rnd_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
+	class macro_new_mag(saber_recon,100):3as_saber_80Rnd_autocannon_30mm_mag
 	{
 		count=100;
 	};

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

@@ -21,7 +21,9 @@ class CfgPatches
 			macro_new_weapon(DC,17a),
 			macro_new_weapon(DC,r17),
 			macro_new_weapon(DC,r17a),
-			macro_new_weapon(DC,17sig)
+			macro_new_weapon(DC,17sig),
+			macro_new_weapon(DC,r17_shield),
+			macro_new_weapon(DC,r17a_shield)
 			
 		};
 	};
@@ -119,6 +121,8 @@ class cfgWeapons
 		reloadAction="GestureReloadPistol";
 		baseWeapon=macro_new_weapon(DC,r17)
 		JLTS_hasElectronics=0;
+		JLTS_canHaveShield=1;
+		JLTS_shieldedWeapon=macro_new_weapon(DC,r17_shield)
 		magazines[]=
 		{
 			macro_new_mag(5mw,10)
@@ -163,11 +167,49 @@ class cfgWeapons
 			};
 		};
 	};
+	class macro_new_weapon(DC,r17_shield): macro_new_weapon(DC,r17)
+	{
+		displayName="Republic DC-17 Shield";
+		baseWeapon=macro_new_weapon(DC,r17_shield)
+		scope=1;
+		JLTS_isShielded=1;
+		JLTS_baseWeapon=macro_new_weapon(DC,r17)
+		model="\MRC\JLTS\weapons\DC17SA\DC17SA_shielded.p3d";
+		handAnim[]=
+		{
+			"OFP2_ManSkeleton",
+			"\MRC\JLTS\weapons\DC17SA\anims\DC17SA_shielded_handanim.rtm"
+		};
+		inertia=0.80000001;
+		recoil="recoil_pdw";
+		class WeaponSlotsInfo: WeaponSlotsInfo
+		{
+			mass=110;
+			class UnderBarrelSlot
+			{
+				linkProxy="\A3\Data_F_Mark\Proxies\Weapon_Slots\UNDERBARREL";
+				iconPicture="\A3\Weapons_F_Mark\Data\UI\attachment_under.paa";
+				iconPinpoint="Bottom";
+				compatibleItems[]=
+				{
+					"JLTS_riot_shield_attachment",
+					"JLTS_riot_shield_212_attachment",
+					"JLTS_riot_shield_501_attachment",
+					"JLTS_riot_shield_101_attachment",
+					"JLTS_riot_shield_CG_attachment",
+					"JLTS_riot_shield_GD_attachment",
+					"JLTS_riot_shield_droid_attachment"
+				};
+			};
+		};
+	};
 	class macro_new_weapon(DC,r17a):JLTS_DC17SA
 	{
 		displayName="Republic DC-17A";
 		baseWeapon=macro_new_weapon(DC,r17a)
 		JLTS_hasElectronics=0;
+		JLTS_canHaveShield=1;
+		JLTS_shieldedWeapon=macro_new_weapon(DC,r17a_shield)
 		magazines[]=
 		{
 			macro_new_mag(2mw,30)
@@ -221,6 +263,42 @@ class cfgWeapons
 			};
 		};
 	};
+	class macro_new_weapon(DC,r17a_shield): macro_new_weapon(DC,r17a)
+	{
+		displayName="Republic DC-17A Shield";
+		baseWeapon=macro_new_weapon(DC,r17a_shield)
+		scope=1;
+		JLTS_isShielded=1;
+		JLTS_baseWeapon=macro_new_weapon(DC,r17a)
+		model="\MRC\JLTS\weapons\DC17SA\DC17SA_shielded.p3d";
+		handAnim[]=
+		{
+			"OFP2_ManSkeleton",
+			"\MRC\JLTS\weapons\DC17SA\anims\DC17SA_shielded_handanim.rtm"
+		};
+		inertia=0.80000001;
+		recoil="recoil_pdw";
+		class WeaponSlotsInfo: WeaponSlotsInfo
+		{
+			mass=110;
+			class UnderBarrelSlot
+			{
+				linkProxy="\A3\Data_F_Mark\Proxies\Weapon_Slots\UNDERBARREL";
+				iconPicture="\A3\Weapons_F_Mark\Data\UI\attachment_under.paa";
+				iconPinpoint="Bottom";
+				compatibleItems[]=
+				{
+					"JLTS_riot_shield_attachment",
+					"JLTS_riot_shield_212_attachment",
+					"JLTS_riot_shield_501_attachment",
+					"JLTS_riot_shield_101_attachment",
+					"JLTS_riot_shield_CG_attachment",
+					"JLTS_riot_shield_GD_attachment",
+					"JLTS_riot_shield_droid_attachment"
+				};
+			};
+		};
+	};
 	class macro_new_weapon(DC,17sig):JLTS_DC17SA
 		{
 			scope=2;