Patch fixes

addons - Copy/RD501_Helmets/infantry/config.cpp

@@ -159,6 +159,7 @@ class CfgWeapons
 	NEW_501_Inf_Helm_JLTS(Broad,Broad,Broad.paa)
 	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_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/LAAT/common_stuff.hpp

@@ -1,9 +1,7 @@
-
-	class EventHandlers : DefaultEventhandlers 
+class EventHandlers : DefaultEventhandlers 
 	{
-		init = "_this execVM "RD501_Main\functions\autocrate\autocrate.sqf"; _this execVM "RD501_Main\functions\vehicle_lift\laat_lift_3.sqf";";
 		fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');";
-		init = "[_this select 0] execVM 'RD501_Main\functions\autocrate\autocrate.sqf';";//[_this select 0] execVM 'RD501_Main\functions\vehicle_lift\laat_lift_3.sqf';";
+		init = "[_this select 0] execVM 'RD501_Main\functions\autocrate\autocrate.sqf';";
 	};
 	
 	faction = macro_republic_faction
@@ -220,132 +218,177 @@
 	//transport
 		class TransportWeapons
 		{
-			class _xx_SWOP_DC15AGL_RD501
-			{
-				weapon = macro_new_weapon(DC,15a);
-				count = 10;
-			};
-			class _xx_RD501_DC15_Carbine
-			{
-				weapon = macro_new_weapon(DC,15s);
-				count = 10;
-			};
-			class _xx_SWOP_DC15ABlasterRifle_mod1_RD501
-			{
-				weapon =  macro_new_weapon(DC,15a_LE);
-				count = 10;
-			};
-			class _xx_SWOP_DC15ABlasterRifle_mod0_RD501
-			{
-				weapon = macro_new_weapon(DC,15a_mod_0_rifle)
-				count = 10;
-			};
-			class _xx_SWOP_Z6Blaster
-			{
-				weapon = macro_new_weapon_nofam(Z6)
-				count = 10;
-			};
-			class _xx_RocketHH15Clone_RD501
-			{
-				weapon = macro_new_weapon(hh,15)
-				count = 10;
-			};
+			class _transport_dc15a
+{
+    weapon = macro_new_weapon(DC,15a)
+    count = 5;
+};
+class _transport_dc15s
+{
+    weapon = macro_new_weapon(DC,r15s)
+    count = 5;
+};
+class _transport_dc15c
+{
+    weapon = macro_new_weapon(DC,15c)
+    count = 5;
+};
+class _transport_dc15l
+{
+    weapon = macro_new_weapon(DC,15l)
+    count = 2;
+};
+class _transport_z6
+{
+    weapon = macro_new_weapon_nofam(rz6)
+    count = 2;
+};
+class _transport_dc15gl
+{
+    weapon = macro_new_weapon(DC,15gl)
+    count = 2;
+};
+class _transport_valken38x
+{
+    weapon = macro_new_weapon_nofam(valken38x)
+    count = 2;
+};
+class _transport_rps6
+{
+    weapon = macro_new_weapon(launcher,rps6)
+    count = 2;
+};
+class _transport_rps1
+{
+    weapon = macro_new_weapon(launcher,rps1)
+    count = 2;
+};
+class _transport_plx
+{
+    weapon = macro_new_weapon(Launcher,PLX1)
+    count = 1;
+};
+class _transport_z1000
+{
+    weapon = macro_new_weapon_nofam(z1000)
+    count = 1;
+};
+class _transport_dc15x
+{
+    weapon = macro_new_weapon(DC,r15x)
+    count = 1;
+};
+class _transport_rgl6
+{
+    weapon = macro_new_weapon_nofam(rgl6)
+    count = 1;
+};
 		};
 		class TransportMagazines
 		{
-			class _xx_SWOP_DC15ABlasterRifle_Full_Mag
-			{
-				magazine = macro_new_mag(DC15a_High,15)
-				count = 15;
-			};
-			class _xx_SWOP_DC15ABlasterRifle_Mag
-			{
-				magazine = macro_new_mag(DC15a_Med,30)
-				count = 20;
-			};
-			class _xx_SWOP_DC15ABlasterRifle_Low_Mag
-			{
-				magazine = macro_new_mag(DC15a_Low,60)
-				count = 20;
-			};
-			class _xx_DC15s_Carbine
-			{
-				magazine = macro_new_mag(DC15s,60)
-				count = 30;
-			};
-			class _xx_300Rnd_BlasterLaser_Belt
-			{
-				magazine = macro_new_mag(z6,400);
-				count = 5;
-			};
-			class _xx_RD501_DC15ABlasterRifleLE_Full_Mag
-			{
-				magazine = macro_new_mag(DC15a_LE,15)
-				count = 10;
-			};
-			class _xx_SWOP_DC15ABlasterRifle_Low_highcap_box_Mag
-			{
-				magazine = macro_new_mag(DC15a_box_mag,240);
-				count = 10;
-			};
-
-			class _xx_DCStun_Mag
-			{
-				magazine = "DCStun_Mag";
-				count = 15;
-			};
-
-			class _xx_ACE_HuntIR_M203
-			{
-				magazine = "ACE_HuntIR_M203";
-				count = 10;
-			};
-
-			class _xx_5Rnd_HE_Grenade_DC15A
-			{
-				magazine = macro_new_mag(HE_GL,3)
-				count = 10;
-			};
-			class _xx_1Rnd_AT_Grenade_DC15A
-			{
-				magazine = macro_new_mag(AT_GL,2)
-				count = 10;
-			};
-
-			
-			class _xx_RocketHH15CloneHEATFF_Mag_RD501
-			{
-				magazine = macro_new_mag(RPS_AT,1);
-				count = 10;
-			};
-			class _xx_RocketHH15CloneHEATFF_Mag_RD5012
-			{
-				magazine = macro_new_mag(RPS_AA,1)
-				count = 10;
-			};
-			class _xx_C12_Remote_Mag
-			{
-				magazine = "C12_Remote_Mag";
-				count = 2;
-			};
+			class transport_2mw30
+{
+	magazine = macro_new_mag(2mw,30);
+	count = 15;
+};
+class transport_5mw15
+{
+	magazine = macro_new_mag(5mw,10);
+	count = 15;
+};
+class transport_5mw60
+{
+	magazine = 	macro_new_mag(5mw,60)
+	count = 60;
+};
+class transport_10mw30
+{
+	magazine = macro_new_mag(10mw,30);
+	count = 60;
+};
+class transport_10mw400
+{
+	magazine = macro_new_mag(10mw,400);
+	count = 15;
+};
+class _transport_20mw20
+{
+	magazine = macro_new_mag(20mw,20);
+	count = 20;
+};
+class _transport_20mwup20
+{
+	magazine =  macro_new_mag(20mwup,20);
+	count = 40;
+};		
+class _transport_20mwdp20
+{
+	magazine = macro_new_mag(20mwdp,20);
+	count = 40;
+};		
+class _transport_20mw240
+{
+	magazine = macro_new_mag(20mw,240);
+	count = 20;
+};									
+class _transport_30mw10
+{
+	magazine = macro_new_mag(30mw,10);
+	count = 15;
+}
+class _transport_30mw7
+{
+	magazine = macro_new_mag(30mw,7)
+	count = 15;
+};
+class _transport_40mw5
+{
+	magazine = macro_new_mag(40mw,5)
+	count = 10;
+};
+class _transport_stun5
+{
+	magazine =  macro_new_mag(stun,5)
+	count = 20;
+};
+class _transport_launcher_AT_mags
+{
+	magazine =  macro_new_mag(RPS_AT,1)
+	count = 20;
+};
+class _transport_launcher_AA_mags
+{
+	magazine =  macro_new_mag(RPS_AA,1)
+	count = 20;
+};
+class _transport_he3
+{
+	magazine = macro_new_mag(UGL_HE,3);
+	count = 15;
+};
+class _transport_ap2
+{
+	magazine = macro_new_mag(UGL_AP,2);
+	count = 15;
+};		
+class _transport_emp1
+{
+	magazine = macro_new_mag(UGL_EMP,1);
+	count = 3;
+};			
+class _transport_HuntIR_M203
+{
+	magazine = "ACE_HuntIR_M203";
+	count = 15;
+};
+class _transport_C12_Remote_Mag
+{
+	magazine = "C12_Remote_Mag";
+	count = 2;
+};
 		};
 		class TransportItems
 		{
-			class _xx_swop_dc15a_zoomholoscope_rd501
-			{
-				name = macro_new_weapon(scope,dc_15a_acog);
-				count = 2;
-			};
-			class _xx_swop_dc15a_zoomscopex6range_rd501
-			{
-				name = macro_new_weapon(scope,dc_15a_x4_x8);
-				count = 2;
-			};
-			class _xx_swop_dc15a_zoomscope_rd501
-			{
-				name = macro_new_weapon(scope,dc_15a_x4);
-				count = 2;
-			};
 			class _xx_SW_SquadShield_Mag
 			{
 				name = "SW_SquadShield_Mag";
@@ -356,4 +399,4 @@
 				name = "ACE_HuntIR_monitor";
 				count = 1;
 			};
-		};
+		};

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

@@ -296,4 +296,4 @@ class CfgVehicles
 	reskined_laat_mk4_full_path(muunilinst,Muunilinst,LAAT\textures\gunship_2_arc_d.paa,LAAT\textures\gunship_1_arc_d.paa)
 
 	reskined_laat_mk4_full_path(blue,Blue,LAAT\textures\gunship_2_blue.paa,LAAT\textures\gunship_1_blue.paa)
-};
+};

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

@@ -0,0 +1,46 @@
+//get generlized macros
+#include "../../../RD501_main/config_macros.hpp"
+
+//General name of the vehicle
+#define vehicle_addon nuclass
+class CfgPatches
+{
+	class macro_patch_name(nuclass)
+	{
+		addonRootClass=macro_patch_name(vehicles)
+
+		requiredAddons[]=
+		{
+			macro_patch_name(vehicles)
+		};
+		requiredVersion=0.1;
+		units[]=
+		{
+			macro_new_vehicle(nuclass,mk1)
+		};
+		weapons[]=
+		{
+			
+		};
+	};
+};
+class CfgVehicles
+{
+	class 3as_nuclass_f;
+	class 3AS_Nuclass : 3as_nuclass_f
+	{
+		class UserActions;
+	};
+	class macro_new_vehicle(nuclass,mk1):3AS_Nuclass
+	{
+		scope=2;
+		displayName="Republic NuClass Mk.I"
+		faction = macro_republic_faction
+		editorSubcategory = macro_editor_cat_air(Republic_heli)
+		vehicleClass = macro_editor_vehicle_type_air(Republic)
+		class UserActions:UserActions
+		{
+			#include "user_action.hpp"
+		};	
+	};
+};

addons - Copy/RD501_Vehicles/air/NuClass/user_action.hpp

@@ -0,0 +1,56 @@
+
+
+	class ThrusterEngage
+	{
+		displayName = "<t color='#4C9900'>[Impulsor On]</t>";
+		displayNameDefault = "<t color='#4C9900'>[Impulsor On]</t>";
+		textToolTip = "<t color='#4C9900'>[Impulsor On]</t>";
+		position = "pilotview";
+		radius = 20;
+		priority = 21;
+		onlyForPlayer = 1;
+		condition = "(!(this getvariable [""impulsorStatus"",false]) AND (player == driver this) AND (alive this) AND (speed this >10) )";
+		statement = "this execVM ""\LAAT\initTE.sqf""";
+	
+	};
+
+	class ThrusterDisngage: ThrusterEngage
+	{
+		priority = 21;
+		displayName = "<t color='#FF9933'>[RepulsorBrake On]</t>";
+		displayNameDefault = "<t color='#FF9933'>[RepulsorBrake On]</t>";
+		textToolTip = "<t color='#FF9933'>[RepulsorBrake On]</t>";
+		condition = "((this getvariable [""impulsorStatus"",false]) AND (player == driver this) AND (alive this))";
+		statement = "this execVM ""\LAAT\initTD.sqf""";
+	
+	};
+
+
+	class ThrusterEngage_spam: ThrusterEngage
+	{
+		displayName = "";
+		displayNameDefault = "";
+		textToolTip = "";
+		position = "pilotview";
+		radius = 20;
+		priority = 0;
+		onlyForPlayer = 1;
+		condition = "((player == driver this) AND (alive this) AND (speed this >10) )";
+		statement = "this execVM ""\LAAT\initTE.sqf""";
+		shortcut="User19"
+	};
+
+
+
+	class ThrusterDisngage_spam: ThrusterEngage
+	{
+		priority = 0;
+		displayName = "";
+		displayNameDefault = "";
+		textToolTip = "";
+		condition = "((player == driver this) AND (alive this))";
+		statement = "this execVM ""\LAAT\initTD.sqf""";
+		shortcut="User20"
+	};
+
+	

addons - Copy/RD501_Vehicles/land/resupply_box/ammo_small_weap.hpp

@@ -1,6 +1,6 @@
 class _transport_dc15a
 {
-    weapon = macro_new_weapon(DC,r15a)
+    weapon = macro_new_weapon(DC,15a)
     count = 5;
 };
 class _transport_dc15s

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

@@ -114,11 +114,11 @@ class cfgWeapons
 			class PointerSlot;
 		};
 	};
-	class macro_new_weapon(DC,r15a):3AS_DC15A_F
+	class macro_new_weapon(DC,15a):3AS_DC15A_F
 	{
 		displayName="Republic DC-15A";
 		reloadTime=0.1;
-		ACE_overheating_mrbs = 3000000000;
+		ACE_Overheating_mrbs = 300000;
 		recoil="recoil_mx";
 		magazines[]=
 		{

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

@@ -39,7 +39,7 @@ class CfgWeapons
 	{
 		displayName="Republic DC-15C";
 		dispersion=0.00116;
-		ACE_overheating_mrbs = 3000000000;
+		ACE_Overheating_mrbs = 300000;
 		recoil="recoil_mxc";
 		magazines[]=
 		{

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

@@ -40,7 +40,7 @@ class CfgWeapons
 	{
 		displayName="Republic DC-15A UGL";
 		JLTS_hasElectronics=0;
-		ACE_Overheating_JamChance = 0;
+		ACE_Overheating_mrbs = 300000;
 		magazines[]=
 		{
 			macro_new_mag(10mw,30)

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

@@ -42,7 +42,7 @@ class CfgWeapons
 		recoil="recoil_mmg_02";
 		deployedPivot="bipod";
 		dispersion=0.00145;
-		ACE_overheating_mrbs = 3000000000;
+		ACE_Overheating_mrbs = 450000;
 		magazines[]=
 		{
 			macro_new_mag(20mw,240)

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

@@ -195,7 +195,7 @@ class cfgWeapons
 		reloadTime=0.66;
 		recoil="recoil_smg_01";
 		reloadAction="ReloadMagazine";
-		ACE_overheating_mrbs = 3000000000;
+		ACE_Overheating_mrbs = 300000;
 		magazines[]=
 		{
 			macro_new_mag(5mw,60)

addons - Copy/RD501_Weapons/Launchers/RPS6/config.cpp

@@ -35,6 +35,7 @@ class CfgWeapons
 		icon = "\RD501_Weapons\Launchers\RPS6\icon.paa";
 		picture = "\RD501_Weapons\Launchers\RPS6\icon.paa";
 		nameSound="aalauncher";
+		recoil="";
 		magazines[]=
 		{
 			macro_new_mag(RPS_AT,1),

addons - Copy/RD501_Weapons/Valken/config.cpp

@@ -116,7 +116,8 @@ class CfgWeapons
 				{
 					"RD501_DMS",
 					"RD501_DMS_2",
-					"RD501_DMS_3"
+					"RD501_DMS_3",
+					"RD501_DMS_4"
 				};
 			};
 			class MuzzleSlot: MuzzleSlot

addons - Copy/RD501_Weapons/Z6/config.cpp

@@ -121,7 +121,7 @@ class cfgWeapons
 		recoil="recoil_lim"
 		baseWeapon=macro_new_weapon_nofam(rZ6)
         displayName="Republic Z6 Chaingun";
-		ACE_Overheating_JamChance = 0;
+		ACE_Overheating_mrbs = 450000;
 		magazines[]=
 		{
 			macro_new_mag(10mw,400)

addons - Copy/RD501_Weapons/_acc/config.cpp

@@ -399,6 +399,16 @@ class CfgWeapons
 			modelOptics="RD501_Weapons\_acc\data\RD501_scope3_DMS";
 		};
 	};
+	class RD501_DMS_4: RD501_DMS
+	{
+		picture="RD501_Weapons\_acc\data\rd501_ico_lr_03_ca.paa";
+		model="RD501_Weapons\_acc\data\rd501_dms_4.p3d";
+		displayName="DMS LR 6-12x Scope D";
+		class ItemInfo: ItemInfo
+		{
+			modelOptics="RD501_Weapons\_acc\data\RD501_scope4_DMS";
+		};
+	};
 	class optic_MRD:ItemCore
 	{
 		class ItemInfo;

addons - Copy/RD501_Weapons/_ammo/config.cpp

@@ -25,6 +25,7 @@ class CfgAmmo
 	class 3AS_EC60_BluePlasma;
 	class 3AS_EC70_BluePlasma;
 	class 3AS_EC80_BluePlasma;
+	class JLTS_bullet_carbine_red;
 	class G_40mm_HE;
 	class SWOP_BCCKtermimploder;
 	class SWOP_termDet;
@@ -74,6 +75,14 @@ class CfgAmmo
 		airFriction=0;
 		explosive = 0.4;
 	};
+	class macro_new_ammo(20mw_d) : JLTS_bullet_carbine_red
+	{
+		hit=12;
+		airLock=1;
+		typicalSpeed=700;
+		caliber=2.8;
+		airFriction=0;
+	};
 	class macro_new_ammo(20mwup) : 3AS_EC50_BluePlasma
 	{
 		hit=10;
@@ -103,6 +112,14 @@ class CfgAmmo
 		airFriction=0;
 		explosive = 0.4;
 	};
+	class macro_new_ammo(30mw_d) : JLTS_bullet_carbine_red
+	{
+		hit=35;
+		airLock=1;
+		typicalSpeed=1000;
+		caliber=2.4;
+		airFriction=0;
+	};
 	class macro_new_ammo(40mw) : 3AS_EC70_BluePlasma
 	{
 		hit=60;

addons - Copy/RD501_Weapons/_mag/config.cpp

@@ -112,7 +112,7 @@ class CfgMagazines
 	{
 		displayName="90 Round E5C Cell";
 		count = 90;
-		ammo=macro_new_ammo(20mw)
+		ammo=macro_new_ammo(20mw_d)
 		typicalSpeed=800;
 		descriptionShort="Medium power box magazine";
 	};
@@ -128,7 +128,7 @@ class CfgMagazines
 	{
 		displayName="15 Round E5S Cell";
 		count = 15;
-		ammo=macro_new_ammo(30mw)
+		ammo=macro_new_ammo(30mw_d)
 		typicalSpeed=1000;
 		descriptionShort="High power magazine";
 	};