Merge pull request #195 from 501st-Aux-Mod-Team/septemberpatch2

Septemberpatch2

addons - Copy/RD501_Helmets/aviation/config.cpp

@@ -74,6 +74,68 @@ class CfgWeapons
 			};
 		};
 	};
+	class macro_new_helmet(3as_pilot,base_2): H_HelmetB
+	{
+		author="$STR_3rd_Studios";
+		scope=2;
+		weaponPoolAvailable=1;
+		displayName="[501st] AVI HELM (Base 2)";
+		picture="3AS\3AS_Characters\Clones\Headgear\ui\p2pilot_ui_ca.paa";
+		model="\3AS\3AS_Characters\Clones\Headgear\3AS_Clone_Pilot_P2.p3d";
+		hiddenSelections[]=
+		{
+			"Camo"
+		};
+		hiddenSelectionsTextures[]=
+		{
+			"3AS\3AS_Characters\Clones\Headgear\Textures\PilotP2\Phase2_Pilot_Razor_co.paa"
+		};
+		class ItemInfo: HeadgearItem
+		{
+			mass=40;
+			uniformModel="\3AS\3AS_Characters\Clones\Headgear\3AS_Clone_Pilot_P2_alt.p3d";
+			hiddenSelections[]=
+			{
+				"Camo"
+			};
+			modelSides[]={3,1};
+			class HitpointsProtectionInfo
+			{
+				class Head
+				{
+					hitpointName="HitHead";
+					armor=6;
+					passThrough=0.5;
+				};
+			};
+		};
+	};
+	class macro_new_helmet(3as_pilot,base_p3): H_HelmetB
+	{
+		scope=2;
+		displayName="[501st] AVI HELM P3 (Base)";
+		model="3AS\3AS_Characters\Clones\Headgear\3AS_Clone_Pilot_P3.p3d";
+		hiddenSelections[]=
+		{
+			"Camo",
+			"Camo1"
+		};
+		hiddenSelectionsTextures[]=
+		{
+			"3AS\3AS_Characters\Clones\Headgear\Textures\PilotP3\Phase3_Pilot_Helmet_501st_co.paa",
+			"3AS\3AS_Characters\Clones\Headgear\Textures\PilotP3\Phase3_Pilot_Tubes_501st_co.paa"
+		};
+		class ItemInfo: HeadgearItem
+		{
+			mass=40;
+			uniformModel="3AS\3AS_Characters\Clones\Headgear\3AS_Clone_Pilot_P3.p3d";
+			hiddenSelections[]=
+			{
+				"Camo",
+				"Camo1"
+			};
+		};
+	};
 	NEW_501_Pilot_HELM(cxx,CX-X,pilots\cxx.paa)
 	NEW_501_Pilot_HELM(cxc,CX-C,pilots\cxc.paa)
 	NEW_501_Pilot_HELM(dylan,Dylan,pilots\Dylanhelmet.paa)

addons - Copy/RD501_Helmets/infantry/config.cpp

@@ -183,6 +183,11 @@ class CfgWeapons
 	NEW_501_Inf_Helm_JLTS(Asher,Asher,Asher.paa)
 	NEW_501_Inf_Helm_JLTS(Rupert,Rupert,Rupert.paa)
 	NEW_501_Inf_Helm_JLTS(Juggernaut,Juggernaut,Juggernaut.paa)
+	NEW_501_Inf_Helm_JLTS(Deytow,Deytow,Deytow.paa)
+	NEW_501_Inf_Helm_JLTS(Sierra,Sierra,Sierra.paa)
+	NEW_501_Inf_Helm_JLTS(Kitti,Kitti,Kitti.paa)
+	NEW_501_Inf_Helm_JLTS(Defender,Defender,Defender.paa)
+	NEW_501_Inf_Helm_JLTS(Flak,Flak,Flak.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)

addons - Copy/RD501_Units/blufor/clones/config.cpp

@@ -1249,6 +1249,49 @@ class macro_new_vest_class(501_inf,acc_1_c_rto): macro_new_vest_class(501_inf,ac
 			uniformModel = "\MRC\JLTS\characters\CloneArmor\CloneVestCommander.p3d";
 		};
 	};
+	class macro_new_vest_class(501_avi,acc_6): macro_new_vest_class(501_inf,acc_9)
+	{
+		displayname = "[501st] AVI ACC 06 P3 (CX-C)"
+		picture="";
+		model = "3as\3as_Characters\clones\uniforms\Model\3AS_Pilot_Vest.p3d";
+		hiddenSelections[] = {"Camo"};
+		hiddenSelectionsTextures[] = {TEXTUREPATH\Republic\clones\avi\acc\pilot_p3_cxc.paa};
+		class ItemInfo: ItemInfo
+		{
+			uniformmodel="3as\3as_Characters\clones\uniforms\Model\3AS_Pilot_Vest.p3d";
+			containerClass="Supply100";
+			hiddenSelections[]=
+			{
+				"Camo"
+			};
+		};
+	};
+	class macro_new_vest_class(501_avi,acc_7): macro_new_vest_class(501_avi,acc_6)
+	{
+		displayname = "[501st] AVI ACC 07 P3 (CX-X)"
+		hiddenSelectionsTextures[] = {TEXTUREPATH\Republic\clones\avi\acc\pilot_p3_cxx.paa};
+	};
+	class macro_new_vest_class(501_avi,acc_8): macro_new_vest_class(501_avi,acc_6)
+	{
+		displayname = "[501st] AVI ACC 08 P3 (Sr. CX-X)"
+		hiddenSelectionsTextures[] = {TEXTUREPATH\Republic\clones\avi\acc\pilot_p3_cxxx.paa};
+	};
+	class macro_new_vest_class(501_avi,acc_9): macro_new_vest_class(501_avi,acc_6)
+	{
+		displayname = "[501st] AVI ACC 09 P3 (Sr. CX-P)"
+		hiddenSelectionsTextures[] = {TEXTUREPATH\Republic\clones\avi\acc\pilot_p3_cxp.paa};
+	};
+	class macro_new_vest_class(501_avi,acc_10): macro_new_vest_class(501_avi,acc_6)
+	{
+		displayname = "[501st] AVI ACC 10 P3 (Sr. CX-S)"
+		hiddenSelectionsTextures[] = {TEXTUREPATH\Republic\clones\avi\acc\pilot_p3_cxs.paa};
+	};
+	class macro_new_vest_class(501_avi,acc_111): macro_new_vest_class(501_avi,acc_6)
+	{
+		displayname = "[501st] AVI ACC 11 P3 (Sr. CX)"
+		hiddenSelectionsTextures[] = {TEXTUREPATH\Republic\clones\avi\acc\pilot_p3_cx.paa};
+	};
+
 	// ARC
 	class macro_new_vest_class(501_arc,acc_1): macro_new_vest_class(501_inf,acc_9)
 	{
@@ -1349,7 +1392,7 @@ class macro_new_vest_class(501_inf,acc_1_c_rto): macro_new_vest_class(501_inf,ac
 				"RD501_Units\textures\Republic\clones\mats\clone_vest_arc.rvmat"
 			};
 		};
-	};
+	};	
 	//
 	class macro_new_vest_class(501_rg,acc_1): macro_new_vest_class(501_inf,acc_9)
 	{

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

@@ -48,7 +48,8 @@ class CfgPatches
 			macro_new_vehicle(laat,Mk1_lights),
 			macro_new_vehicle(laat,Mk2),
 			macro_new_vehicle(laat,Mk2_lights),
-			macro_new_vehicle(laat,LE)
+			macro_new_vehicle(laat,LE),
+			macro_new_vehicle(laat,C)
 		};
 		weapons[]=
 		{
@@ -336,11 +337,12 @@ class CfgVehicles
 				macro_new_weapon(generic,republic_aircraft_cannon),
 				"Bomb_Leaflets",
 				macro_new_weapon(wynd,ugm),
-				"Laserdesignator_pilotCamera"
+				macro_basic_air_weapons
+				
 			};
 		magazines[]=
 			{
-				"Laserbatteries",
+				macro_basic_air_mags,
 				"1Rnd_Leaflets_Civ_F",
 				"1Rnd_Leaflets_Civ_F",
 				"1Rnd_Leaflets_Civ_F",
@@ -370,4 +372,62 @@ class CfgVehicles
 			};
 		};
 	};
+	class macro_new_vehicle(laat,C):3AS_LAATC
+	{
+		displayName="Republic LAAT/C";
+		scope=2;
+		author="RD501";
+		forceInGarage = 1;
+
+		faction = macro_republic_faction
+		editorSubcategory = macro_editor_cat_air(Republic_heli)
+		vehicleClass = macro_editor_vehicle_type_air(Republic)
+		class UserActions
+		{
+			class ThrusterEngage
+			{
+				displayName = "";
+				displayNameDefault = "";
+				textToolTip = "";
+				position = "pilotview";
+				radius = 20;
+				priority = 0;
+				onlyForPlayer = 1;
+				condition = "((player == driver this) AND (alive this))";
+				statement = "this execVM ""\RD501_Main\functions\impulse\fnc_impulseIncrease_LE.sqf""";
+				shortcut="User19"
+			};
+
+			class ThrusterDisengage: ThrusterEngage
+			{
+				priority = 0;
+				displayName = "";
+				displayNameDefault = "";
+				textToolTip = "";
+				condition = "((player == driver this) AND (alive this))";
+				statement = "this execVM ""\RD501_Main\functions\impulse\fnc_impulseDecrease_LE.sqf""";
+				shortcut="User20"
+			};
+		};
+		
+		RD501_magclamp_small_1[] = {-7.0,-2.0,-2.5};
+		RD501_magclamp_large[] = {0.0,-2.0,-2.0};
+		RD501_magclamp_small_2[] = {7.0,-2.0,-2.5};
+		RD501_magclamp_small_forbidden=1;
+		RD501_magclamp_large_offset[]={0.0,1.0,-4.5};
+		
+		enableManualFire=1;
+		weapons[]=
+		{
+			macro_new_weapon(generic,republic_aircraft_cannon),
+			macro_new_weapon(cannon,laat),
+			macro_basic_air_weapons
+		};
+		magazines[]=
+		{
+			macro_basic_air_mags,
+			macro_new_mag(generic_aircraft_gun_green,1000),
+			macro_new_mag(laat_cannon,100),
+		};
+	};
 };

addons - Copy/RD501_Vehicles/air/LAAT/inheritance.hpp

@@ -100,3 +100,4 @@ class 3as_LAAT_Mk1: 3as_laat_Base{};
 class 3as_LAAT_Mk1Lights: 3as_laatFloodLight_Base{};
 class 3as_LAAT_Mk2: 3as_laatUnarmed_Base{};
 class 3as_LAAT_Mk2Lights: 3as_laatFloodLight_Base{};
+class 3AS_LAATC;

addons - Copy/RD501_Weapons/Drexi/config.cpp

@@ -30,6 +30,7 @@ class CfgWeapons
 	{
 		class WeaponSlotsInfo;
 	};
+	class JLTS_DP23;
 	class macro_new_weapon_nofam(drexl): Rifle_Base_F
 	{
 		ACE_Overheating_JamChance = 0;
@@ -163,4 +164,56 @@ class CfgWeapons
 			};
 		};*/
 	};
+	class macro_new_weapon(republic,dp23): JLTS_DP23
+	{
+		scope=2;
+        scopeArsenal=2;
+		JLTS_hasElectronics=0;
+		JLTS_canHaveShield=1;
+		JLTS_shieldedWeapon=macro_new_weapon(dp23,shield)
+		baseWeapon=macro_new_weapon(republic,dp23)
+        displayName="Republic DP23";
+		ACE_Overheating_mrbs = 450000;
+		magazines[]=
+		{
+			macro_new_mag(shotgun_scatter,12)
+		};
+	};
+	class macro_new_weapon(dp23,shield): macro_new_weapon(republic,dp23)
+	{
+		displayName="Republic DP23 Shield";
+		baseWeapon=macro_new_weapon(DC,r17_shield)
+		scope=1;
+		JLTS_isShielded=1;
+		JLTS_baseWeapon=macro_new_weapon(republic,dp23)
+		model="\MRC\JLTS\weapons\DP23\DP23_shielded.p3d";
+		handAnim[]=
+		{
+			"OFP2_ManSkeleton",
+			"\MRC\JLTS\weapons\DP23\anims\DP23_shielded_handanim.rtm"
+		};
+		inertia=0.80000001;
+		recoil="recoil_pdw";
+		canShootInWater=1;
+		class 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"
+				};
+			};
+		};
+	};
 };

addons - Copy/RD501_Weapons/_ammo/config.cpp

@@ -175,7 +175,8 @@ class CfgAmmo
 		caliber=1;
 		airFriction=0;
 		explosive = 0;
-		JLTS_isEMPAmmo=1;
+		rd501_emp_vehicle_enabled=1;
+		rd501_emp_vehicle_duration=15;
 	};
 	class macro_new_ammo(50mw) : 3AS_EC80_BluePlasma
 	{
@@ -611,7 +612,7 @@ class CfgAmmo
 		CraterEffects="";
 		explosionEffects="JLTS_fx_exp_EMP";
 		rd501_emp_vehicle_enabled=1;
-		rd501_emp_vehicle_duration=15;
+		rd501_emp_vehicle_duration=25;
 	};
 	class macro_new_ammo(rps4burst):R_PG32V_F
 	{

addons - Copy/RD501_Zeus/config.cpp

@@ -193,8 +193,17 @@ class CfgAmmo
 	class ModuleOrdnanceHowitzer_F_ammo;
 	class ModuleOrdnanceMortar_F_ammo;
 	class ModuleOrdnanceRocket_F_ammo;
-	class RD501_ShadowMag;
-
+	class macro_new_ammo(blueshadow);
+	class macro_new_ammo(dioxis);
+	
+	class macro_new_ordnance_ammo(Dioxis_long): macro_new_ammo(dioxis)
+	{
+		timeToLive = 300;
+	};
+	class macro_new_ordnance_ammo(Shadow_long): macro_new_ammo(blueshadow)
+	{
+		timeToLive = 300;
+	};
 	class macro_new_ordnance_ammo(IonBomb): ModuleOrdnanceMortar_F_ammo
 	{
 		caliber = 1100;