Patch 3.47

addons - Copy/RD501_Helmets/airborne/config.cpp

@@ -42,4 +42,5 @@ class CfgWeapons
 	NEW_501_AB_HELM_JLTS(501st_Aedan_helmet,Aedan,Aedan.paa)
 	NEW_501_AB_HELM_JLTS(501st_Waze_helmet,Waze,Waze.paa)
 	NEW_501_AB_HELM_JLTS(501st_Spilberge_helmet,Spilberge,Spilberge.paa)
+	NEW_501_AB_HELM_JLTS(501st_Akira_helmet,Akira,Akira.paa)
 };

addons - Copy/RD501_Helmets/aviation/config.cpp

@@ -43,7 +43,7 @@ class CfgWeapons
 		author="$STR_3rd_Studios";
 		scope=2;
 		weaponPoolAvailable=1;
-		displayName="[AVI] Pilot Base";
+		displayName="[501st] AVI HELM (Base)";
 		picture="3AS\3AS_Characters\Clones\Headgear\ui\p2pilot_ui_ca.paa";
 		model="\3AS\3AS_Characters\Clones\Headgear\3AS_Clone_Pilot_P2.p3d";
 		hiddenSelections[]=
@@ -92,6 +92,8 @@ class CfgWeapons
 	NEW_501_Pilot_HELM(Duncan,Duncan,pilots\Duncan.paa)
 	NEW_501_Pilot_HELM(Neb,Neb,pilots\Neb.paa)
 	NEW_501_Pilot_HELM(Salvatore,Salvatore,pilots\Salvatore.paa)
+	NEW_3AS_Pilot_HELM(Kushiban,Kushiban,pilots\Kushiban1)
+	NEW_3AS_Pilot_HELM(Shnuffles,Shnuffles,pilots\Shnuffles1)
 
 	class macro_new_helmet(pilot,scuba): macro_new_helmet(pilot,base)
 	{

addons - Copy/RD501_Helmets/aviation/config_macros.cpp

@@ -19,3 +19,12 @@
 		subItems[] = {"G_B_Diving"};\
 	};
 
+#define NEW_3AS_Pilot_HELM(classname,displayname,texture)\
+	class macro_new_helmet(3as_pilot,classname): macro_new_helmet(3as_pilot,base)\
+	{\
+		scope = 2;\
+		author = "RD501";\
+		displayName = [501st] AVI HELM ('##displayname##');\
+		hiddenSelectionsTextures[] = {macro_custom_helmet_textures##\aviation\##texture};\
+		subItems[] = {"G_B_Diving"};\
+	};

addons - Copy/RD501_Helmets/infantry/config.cpp

@@ -170,6 +170,16 @@ class CfgWeapons
 	NEW_501_Inf_Helm_JLTS(Salvo,Salvo,Salvo.paa)
 	NEW_501_Inf_Helm_JLTS(Hegener,Hegener,Hegener.paa)
 	NEW_501_Inf_Helm_JLTS(Steps,Steps,Steps.paa)
+	NEW_501_Inf_Helm_JLTS(Diverge,Diverge,Diverge.paa)
+	NEW_501_Inf_Helm_JLTS(Ajax,Ajax,Ajax.paa)
+	NEW_501_Inf_Helm_JLTS(Crinkcase,Crinkcase,Crinkcase.paa)
+	NEW_501_Inf_Helm_JLTS(Great,Great,Great.paa)
+	NEW_501_Inf_Helm_JLTS(Scrungo,Scrungo,Scrungo.paa)
+	NEW_501_Inf_Helm_JLTS(Buffalo,Buffalo,Buffalo.paa)
+	NEW_501_Inf_Helm_JLTS(Jimmy,Jimmy,Jimmy.paa)
+	NEW_501_Inf_Helm_JLTS(Iron,Iron,Iron.paa)
+	NEW_501_Inf_Helm_JLTS(Brotha,Brotha,Brotha.paa)
+	NEW_501_Inf_Helm_JLTS(September,September,September.paa)
 	NEW_501_ARC_Helm_JLTS(Rayne,Rayne,Rayne.paa)
 	NEW_501_ARC_Helm_JLTS(Archaic,Archaic,Archaic.paa)
 	NEW_501_ARC_Helm_JLTS(Duke,Duke,Duke.paa)
@@ -191,4 +201,5 @@ class CfgWeapons
 	NEW_501_ARC_Helm_JLTS(Deva,Deva,Deva.paa)
 	NEW_501_ARC_Helm_JLTS(Scruff,Scruff,Scruff.paa)
 	NEW_501_ARC_Helm_JLTS(Dalton,Dalton,Dalton.paa)
+	NEW_501_ARC_Helm_JLTS(Blythe,Blythe,Blythe.paa)
 };

addons - Copy/RD501_Vehicle_Weapons/_ammo/config.cpp

@@ -533,11 +533,12 @@ class CfgAmmo
 	};
 	class macro_new_ammo(generic_aircraft_laser_gun_praetorian) : macro_new_ammo(generic_aircraft_laser_gun_red)
 	{
-		hit = 75;
+		hit = 100;
 		caliber = 1;
 		indirectHit = 0;
 		indirectHitRange = 0;
 		explosive = 0;
+		allowAgainstInfantry = 0;
 		model="RD501_Vehicle_Weapons\_ammo\data\laser_medium_purple.p3d"
 	};
 	class macro_new_ammo(generic_aircraft_laser_cannon_dual_green): macro_new_ammo(generic_aircraft_laser_gun_red)

addons - Copy/RD501_Vehicle_Weapons/aircraft/generic/aircraft_laser_gun.hpp

@@ -126,54 +126,4 @@
 			maxRange=2;
 			maxRangeProbab=0.0099999998;
 		};
-	};
-
-	class macro_new_weapon(generic,rebel_aircraft_laser) : macro_new_weapon(generic,aircraft_laser)
-	{
-		displayName = "Rebel Aircraft Laser Gun";
-		class LowROF: LowROF
-		{
-			class StandardSound
-			{
-				soundBegin[] = {"begin1",1};
-			};
-		};
-	};
-
-	class macro_new_weapon(generic,ion_aircraft_laser) : macro_new_weapon(generic,aircraft_laser)
-	{
-		displayName = "ION Aircraft Laser Gun";
-		ballisticsComputer = "1+4";
-		class LowROF: LowROF
-		{
-			class StandardSound
-			{
-				soundBegin[] = {"begin1",0.33,"begin2",0.33,"begin3",0.34};
-			};
-		};
-	};
-
-	class macro_new_weapon(generic,purple_aircraft_laser) : macro_new_weapon(generic,aircraft_laser)
-	{
-		displayName = "Aircraft Laser Gun";
-		class LowROF: LowROF
-		{
-			class StandardSound
-			{
-				soundBegin[] = {"begin1",1};
-			};
-		};
-	};
-
-	class macro_new_weapon(generic,plasma_aircraft_laser) : macro_new_weapon(generic,aircraft_laser)
-	{
-		displayName = "Aircraft Laser Gun";
-		class LowROF: LowROF
-		{
-			class StandardSound
-			{
-				begin1[] = {"rd501_vehicle_weapons\_sounds\laser_cannon\laser_cannon_shot.ogg",1.5,1,2500};
-				soundBegin[] = {"begin1",1};
-			};
-		};
 	};

addons - Copy/RD501_Vehicle_Weapons/aircraft/generic/config.cpp

@@ -32,7 +32,8 @@ class CfgPatches
 			macro_new_weapon(generic,preatorian_gun_opfor),
 			macro_new_weapon(aa_gun,aa_gun_base),
 			macro_new_weapon(generic,blue_dual_aircraft_laser),
-			macro_new_weapon(generic,green_dual_aircraft_laser)
+			macro_new_weapon(generic,green_dual_aircraft_laser),
+			macro_new_weapon(generic,preatorian_turret_opfor)
 		};
 	};
 };
@@ -170,10 +171,16 @@ class CfgWeapons
 		magazines[] = {
 			macro_new_mag(generic_aircraft_gun_preatorian,1000)
 		};
+	};
+	class macro_new_weapon(generic,preatorian_turret_opfor): autocannon_35mm
+	{
+		displayName = "Heavy Turret";
+		magazines[] = {
+			macro_new_mag(generic_aircraft_gun,1000)
+		};
 		
 	};
 
-
 	//Kannon
 	class macro_new_weapon(generic,kannon) : macro_new_weapon(generic,republic_aircraft_cannon)
 	{

addons - Copy/RD501_Vehicles/_init_functions/cis_aircraft_turrets.hpp

@@ -18,13 +18,13 @@
 
     class macro_new_vehicle(HMP,gunship) {
 		class turret1 {
-			init = [_this select 0,macro_single_quote(macro_new_vehicle(Praetorian_Variant,normal)),[0,5,-.5]] spawn macro_fnc_name(apply_aircraft_turrets);
+			init = [_this select 0,macro_single_quote(macro_new_vehicle(Praetorian_Variant,opfor)),[0,5,-.5]] spawn macro_fnc_name(apply_aircraft_turrets);
 		};
 		class turret2 {
-			init = [_this select 0,macro_single_quote(macro_new_vehicle(Praetorian_Variant,normal)),[5,0,-.5]] spawn macro_fnc_name(apply_aircraft_turrets);
+			init = [_this select 0,macro_single_quote(macro_new_vehicle(Praetorian_Variant,opfor)),[5,0,-.5]] spawn macro_fnc_name(apply_aircraft_turrets);
 		};
 		class turret3 {
-			init = [_this select 0,macro_single_quote(macro_new_vehicle(Praetorian_Variant,normal)),[-5,0,-.5]] spawn macro_fnc_name(apply_aircraft_turrets);
+			init = [_this select 0,macro_single_quote(macro_new_vehicle(Praetorian_Variant,opfor)),[-5,0,-.5]] spawn macro_fnc_name(apply_aircraft_turrets);
 		};
 		macro_standard_eh
         class swop_init {

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

@@ -327,37 +327,10 @@ class CfgVehicles
 		class EventHandlers :DefaultEventhandlers{};
 	};
 
-	class  macro_new_vehicle(Praetorian_Variant,blufor) :  macro_new_vehicle(Praetorian_Variant,normal)
-	{
-		side = 1;
-		displayName = "Laser Turret (AA)";
-		faction = macro_republic_faction
-		//editorSubcategory = macro_editor_cat(AA)
-		//vehicleClass = macro_editor_vehicle_type(AA)
-		//faction = "RD501Faction";
-		hiddenSelectionsTextures[] = 
-		{
-			macro_vehicle_textures\Fast_Infantry_Transport\FAT.paa,
-			macro_vehicle_textures\Fast_Infantry_Transport\FAT.paa
-		};
-		class Turrets: Turrets
-		{
-			class MainTurret: MainTurret
-			{
-				weapons[] = {
-					macro_new_weapon(generic,preatorian_gun_opfor)
-				};
-				magazines[] = {
-					macro_new_mag(generic_aircraft_gun_preatorian,1000),
-					macro_new_mag(generic_aircraft_gun_preatorian,1000)
-				};
-			};
-		};
-	};
 	class macro_new_vehicle(Praetorian_Variant,opfor): macro_new_vehicle(Praetorian_Variant,normal)
 	{
 		displayName = "Laser Cannons (opfor)";
-		faction = "";
+		/*faction = "";
 		scope = 1;//?
 		scopecurator = 1;
 		weaponLockSystem = "2+4+8";
@@ -374,7 +347,7 @@ class CfgVehicles
 			class MainTurret: MainTurret
 			{
 				weapons[] = {
-					macro_new_weapon(generic,aircraft_laser)
+					macro_new_weapon(generic,preatorian_turret_opfor)
 				};
 				magazines[] = {
 					macro_new_mag(generic_aircraft_gun,1000),
@@ -391,51 +364,4 @@ class CfgVehicles
 			};
 		};
 	};	
-	class macro_new_vehicle(Praetorian_Variant,Ion): macro_new_vehicle(Praetorian_Variant,normal)//
-	{
-		side = 1;
-
-		faction = macro_resistance_faction
-		editorSubcategory = macro_editor_cat(AA)
-		vehicleClass = macro_editor_vehicle_type(AA)
-		displayName = "Laser Cannons (I.O.N)";
-		class Turrets: Turrets
-		{
-			class MainTurret: MainTurret
-			{
-				weapons[] = {
-					macro_new_weapon(generic,ion_aircraft_laser)
-				};
-				magazines[] = {
-					macro_new_mag(generic_aircraft_gun_blue,1000),
-					macro_new_mag(generic_aircraft_gun_blue,1000)
-				};
-			};
-		};
-	};
-	class macro_new_vehicle(Praetorian_Variant,Purple): macro_new_vehicle(Praetorian_Variant,normal)//
-	{
-		displayName = "Laser Cannons (PURPLEE)";
-
-		faction = "";
-	//	editorSubcategory = macro_editor_cat(AA)
-	//	vehicleClass = macro_editor_vehicle_type(AA)
-
-		class Turrets: Turrets
-		{
-			class MainTurret: MainTurret
-			{
-				weapons[] = {
-					macro_new_weapon(generic,purple_aircraft_laser)
-					};
-				magazines[] = {
-					macro_new_mag(generic_aircraft_gun_purple,1000),
-					macro_new_mag(generic_aircraft_gun_purple,1000)
-				};
-			};
-		};
-	};
-	
-
-
 };

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

@@ -195,7 +195,7 @@ class CfgVehicles
 			{
 				weapons[]=
 				{
-					macro_new_weapon(generic,tank_repeater)
+					macro_new_weapon(generic,preatorian_turret_opfor)
 				};
 				magazines[]={macro_new_mag(generic_aircraft_gun,1000),macro_new_mag(generic_aircraft_gun,1000),macro_new_mag(generic_aircraft_gun,1000),macro_new_mag(generic_aircraft_gun,1000),macro_new_mag(generic_aircraft_gun,1000)};
 			};

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

@@ -42,6 +42,7 @@ class cfgWeapons
 		descriptionShort = "DC-15X Scope (12-20x)";
 		baseWeapon=macro_new_weapon(DC,r15x)
 		canShootInWater=1;
+		JLTS_hasElectronics=0;
 		magazines[]=
 		{
 			macro_new_mag(40mw,5),

addons - Copy/RD501_Weapons/Drexi/config.cpp

@@ -43,10 +43,10 @@ class CfgWeapons
 		handAnim[] = {"OFP2_ManSkeleton","\A3\Weapons_F_beta\Rifles\MK20\Data\Anim\mk20G.rtm"};
 		magazines[] =
 		{
-			macro_new_mag(shotgun_scatter,6),
-			macro_new_mag(shotgun_HE,6),
+			macro_new_mag(shotgun_scatter,12),
+			macro_new_mag(shotgun_HE,12),
 			macro_new_mag(shotgun_EMP,2),
-			macro_new_mag(shotgun_slug,6)
+			macro_new_mag(shotgun_slug,15)
 		};
 		reloadAction = "ReloadMagazine";
 		displayName = "Republic SX17 Drexl";

addons - Copy/RD501_Weapons/_mag/config.cpp

@@ -554,6 +554,33 @@ class CfgMagazines
 		ammo = macro_new_ammo(30mw)
 		descriptionShort = "6 Rnd Slug";
 	};
+	class macro_new_mag(shotgun_scatter,12):2Rnd_12Gauge_Pellets
+	{
+		scope=2;
+		displayName = "12 Rnd SP Magazine";
+		displayNameShort = "12 Rnd SP Mag";
+		count=12;
+		ammo = macro_new_ammo(shotgun_scatter)
+		descriptionShort = "12 Rnd SP";
+	};
+	class macro_new_mag(shotgun_HE,12):2Rnd_12Gauge_Pellets
+	{
+		scope=2;
+		displayName = "12 Rnd UP Magazine";
+		displayNameShort = "12 Rnd UP Mag";
+		count=12;
+		ammo = macro_new_ammo(shotgun_HE)
+		descriptionShort = "12 Rnd UP";
+	};
+	class macro_new_mag(shotgun_slug,15):2Rnd_12Gauge_Pellets
+	{
+		scope=2;
+		displayName = "15 Rnd Slug Magazine";
+		displayNameShort = "15 Rnd Slug Mag";
+		count=15;
+		ammo = macro_new_ammo(30mw)
+		descriptionShort = "15 Rnd Slug";
+	};
 	////////////////////////////////////////////////////
 	/////////////Flare    Magazines/////////////////////
 	////////////////////////////////////////////////////

addons - Copy/RD501_Weapons/config.cpp

@@ -67,7 +67,8 @@ class CfgMagazineWells
 			"3Rnd_SmokePurple_Grenade_shell",
 			"3Rnd_SmokeBlue_Grenade_shell",
 			"3Rnd_SmokeOrange_Grenade_shell",
-			"ACE_HuntIR_M203"
+			"ACE_HuntIR_M203",
+			"1Rnd_Leaflets_Civ_F"