Merge pull request #100 from 501st-Aux-Mod-Team/38patch

38patch

addons - Copy/RD501_Helmets/airborne/config.cpp

@@ -36,7 +36,6 @@ class CfgWeapons
 	NEW_501_AB_HELM_JLTS(501st_Kryptic_helmet,Kryptic,Kryptic.paa)
 	NEW_501_AB_HELM_JLTS(501st_Maurice_helmet,Maurice,Maurice.paa)
 	NEW_501_AB_HELM_JLTS(501st_Mister_helmet,Mister,Mister.paa)
-	NEW_501_AB_HELM_JLTS(501st_Riddle_helmet,Riddle,Riddle.paa)
 	NEW_501_AB_HELM_JLTS(501st_Roasty_helmet,Roasty,Roasty.paa)
 	NEW_501_AB_HELM_JLTS(501st_Shroom_helmet,Shroom,Shroom.paa)
 	NEW_501_AB_HELM_JLTS(501st_Solaire_helmet,Solaire,Solaire.paa)
@@ -73,7 +72,6 @@ class CfgWeapons
 	NEW_501_AB_HELM_JLTS(501st_Arcanist_helmet,Arcanist,Arcanist.paa)
 	NEW_501_AB_HELM_JLTS(501st_Soviet_helmet,Soviet,Soviet.paa)
 	NEW_501_AB_HELM_JLTS(501st_Ritter_helmet,Ritter,Ritter.paa)
-	NEW_501_AB_HELM_JLTS(501st_Aedan_helmet,Aedan,Aedan.paa)
 	NEW_501_AB_HELM_JLTS(501st_Arthur_helmet,Arthur,Arthur.paa)
 	NEW_501_AB_HELM_JLTS(501st_Thade_helmet,Thade,Thade.paa)
 	NEW_501_AB_HELM_JLTS(501st_Oneill_helmet,Oneill,Oneill.paa)

addons - Copy/RD501_Helmets/infantry/config.cpp

@@ -160,6 +160,8 @@ class CfgWeapons
 	NEW_501_Inf_Helm_JLTS(Jub,Jub,Jub.paa)
 	NEW_501_Inf_Helm_JLTS(Bridger,Bridger,Bridger.paa)
 	NEW_501_Inf_Helm_JLTS(Bacon,Bacon,Bacon.paa)
+	NEW_501_Inf_Helm_JLTS(Aedan,Aedan,Aedan.paa)
+	NEW_501_Inf_Helm_JLTS(Midnight,Midnight,Midnight.paa)
 	NEW_501_ARC_Helm_JLTS(Duke,Duke,Duke.paa)
 	NEW_501_ARC_Helm_JLTS(Bronson,Bronson,Bronson.paa)
 	NEW_501_ARC_Helm_JLTS(Rayne,Rayne,Rayne.paa)

addons - Copy/RD501_Vehicles/air/NuClass/config.cpp

@@ -35,9 +35,35 @@ class CfgVehicles
 	{
 		scope=2;
 		displayName="Republic NuClass Mk.I"
+		armor=1300;
 		faction = macro_republic_faction
 		editorSubcategory = macro_editor_cat_air(Republic_heli)
 		vehicleClass = macro_editor_vehicle_type_air(Republic)
+		weapons[]=
+		{
+			"ParticleBeamCannon_Nu",
+			"CMFlareLauncher",
+			"missiles_DAR",
+			macro_new_weapon(generic,kannon),
+			"Laserdesignator_pilotCamera"
+		};
+		magazines[]=
+		{
+			"240Rnd_CMFlare_Chaff_Magazine",
+			"240Rnd_CMFlare_Chaff_Magazine",
+			"240Rnd_CMFlare_Chaff_Magazine",
+			"240Rnd_CMFlare_Chaff_Magazine",
+			"Laser_Battery_F",
+			"Laser_Battery_F",
+			"Laser_Battery_F",
+			"24Rnd_missiles",
+			"24Rnd_missiles",
+			"24Rnd_missiles",
+			"24Rnd_missiles",
+			macro_new_mag(Kannon,100),
+			macro_new_mag(Kannon,100),
+			"Laserbatteries"
+		};
 		class UserActions:UserActions
 		{
 			#include "user_action.hpp"

addons - Copy/RD501_Weapons/Valken/config.cpp

@@ -46,12 +46,12 @@ class CfgWeapons
 		};
 		class Single : Single
 		{
-			reloadTime=0.35;
+			reloadTime=0.24;
 			dispersion=0.00045;
 		};
 		class WeaponSlotsInfo: WeaponSlotsInfo
 		{
-			mass = 30;
+			mass = 80;
 			class CowsSlot: CowsSlot
 			{
 				access = 1;
@@ -96,12 +96,12 @@ class CfgWeapons
 		muzzles[]={"this"};
 		class Single : Single
 		{
-			reloadTime=0.35;
+			reloadTime=0.24;
 			dispersion=0.00045;
 		};
 		class WeaponSlotsInfo: WeaponSlotsInfo
 		{
-			mass = 30;
+			mass = 80;
 			class CowsSlot: CowsSlot
 			{
 				displayName = "Optics Slot";

addons - Copy/RD501_Weapons/_mag/config.cpp

@@ -31,6 +31,7 @@ class CfgMagazines
 	class macro_new_mag(2mw,30) : 3AS_45Rnd_EC50_Mag
 	{
 		displayName="30 Round 2MW Cell";
+		picture="\RD501_Weapons\_mag\data\rd501_icon_mag_dc17a.paa";
 		count = 30;
 		ammo=macro_new_ammo(2mw)
 		typicalSpeed=400;
@@ -38,8 +39,9 @@ class CfgMagazines
 	};
 	class macro_new_mag(5mw,60) : 3AS_45Rnd_EC50_Mag
 	{
-		displayName="60 Round 5MW Cell";
-		count = 60;
+		displayName="75 Round 5MW Cell";
+		picture="\RD501_Weapons\_mag\data\rd501_icon_mag_dc15s.paa";
+		count = 75;
 		ammo=macro_new_ammo(5mw)
 		typicalSpeed=400;
 		descriptionShort="Low power magazine";
@@ -47,6 +49,7 @@ class CfgMagazines
 	class macro_new_mag(5mw,10) : 3AS_45Rnd_EC50_Mag
 	{
 		displayName="15 Round 5MW Cell";
+		picture="\RD501_Weapons\_mag\data\rd501_icon_mag_dc17.paa";
 		count = 15;
 		ammo=macro_new_ammo(5mw)
 		typicalSpeed=400;
@@ -54,16 +57,18 @@ class CfgMagazines
 	};
 	class macro_new_mag(10mw,30) : 3AS_45Rnd_EC50_Mag
 	{
-		displayName="30 Round 10MW Cell";
-		count = 30;
+		displayName="40 Round 10MW Cell";
+		picture="\RD501_Weapons\_mag\data\rd501_icon_mag_dc15c.paa";
+		count = 40;
 		ammo=macro_new_ammo(10mw)
 		typicalSpeed=450;
 		descriptionShort="Medium power magazine";
 	};
 	class macro_new_mag(10mws,30) : 3AS_45Rnd_EC50_Mag
 	{
-		displayName="30 Round 10MW Stealth Cell";
-		count = 30;
+		displayName="40 Round 10MW Stealth Cell";
+		picture="\RD501_Weapons\_mag\data\rd501_icon_mag_dc15c.paa";
+		count = 40;
 		ammo=macro_new_ammo(10mws)
 		typicalSpeed=450;
 		descriptionShort="Medium power magazine";
@@ -71,6 +76,7 @@ class CfgMagazines
 	class macro_new_mag(10mw,400) : 3AS_45Rnd_EC50_Mag
 	{
 		displayName="400 Round 10MW Cell";
+		picture="\RD501_Weapons\_mag\data\rd501_icon_mag_z6.paa";
 		count = 400;
 		ammo=macro_new_ammo(10mw)
 		typicalSpeed=450;
@@ -86,16 +92,18 @@ class CfgMagazines
 	};
 	class macro_new_mag(20mwup,20) : 3AS_45Rnd_EC50_Mag
 	{
-		displayName="20 Round 20MW UP Cell";
-		count = 20;
+		displayName="25 Round 20MW UP Cell";
+		picture="\RD501_Weapons\_mag\data\rd501_icon_mag_dc15a_up.paa";
+		count = 25;
 		ammo=macro_new_ammo(20mwup)
 		typicalSpeed=500;
 		descriptionShort="Medium power unstable plasma magazine";
 	};
 	class macro_new_mag(20mwdp,20) : 3AS_45Rnd_EC50_Mag
 	{
-		displayName="20 Round 20MW DP Cell";
-		count = 20;
+		displayName="25 Round 20MW DP Cell";
+		picture="\RD501_Weapons\_mag\data\rd501_icon_mag_dc15a_dp.paa";
+		count = 25;
 		ammo=macro_new_ammo(20mwdp)
 		typicalSpeed=700;
 		descriptionShort="Medium power dense plasma magazine";
@@ -103,6 +111,7 @@ class CfgMagazines
 	class macro_new_mag(20mw,240) : 3AS_45Rnd_EC50_Mag
 	{
 		displayName="240 Round 20MW Cell";
+		picture="\RD501_Weapons\_mag\data\rd501_icon_mag_dc15l.paa";
 		count = 240;
 		ammo=macro_new_ammo(20mw)
 		typicalSpeed=800;
@@ -119,6 +128,7 @@ class CfgMagazines
 	class macro_new_mag(30mw,10) : 3AS_45Rnd_EC50_Mag
 	{
 		displayName="10 Round 30MW Cell";
+		picture="\RD501_Weapons\_mag\data\rd501_icon_mag_valken38.paa";
 		count = 10;
 		ammo=macro_new_ammo(30mw)
 		typicalSpeed=1000;
@@ -178,7 +188,7 @@ class CfgMagazines
 		descriptionShort = "5 Round Stun Cell";
 		displayNameShort = "5 Round Stun Cell";
 		count=5;
-		picture="\MRC\JLTS\weapons\Core\data\ui\stun_mag_ui_ca.paa";
+		picture="\MRC\JLTS\weapons\Core\data\ui\stun_mag_ui_ca";
 	};
 	////////////////////////////////////////////////////
 	/////////Grenade Launcher Magazines/////////////////