Few more fixes

addons - Copy/RD501_Droids/B1/config.cpp

@@ -395,13 +395,11 @@ class CfgVehicles
 		};
 		magazines[]=
 		{
-			macro_grenade_launcher_mags,
-			macro_grenade_launcher_grenades
+			macro_grenade_launcher_mags
 		};
 		respawnMagazines[]=
 		{
-			macro_grenade_launcher_mags,
-			macro_grenade_launcher_grenades
+			macro_grenade_launcher_mags
 		};
 		cost=2;
 	}

addons - Copy/RD501_Droids/droid_macros.hpp

@@ -44,11 +44,9 @@
 #define macro_bx_gun_mag "JLTS_E5_mag"
 #define macro_bx_gun_mags _6(macro_bx_gun_mag)
 
-#define macro_grenade_launcher "212th_relbyv10"
-#define macro_grenade_launcher_mag "212th_E5P_Mag"
+#define macro_grenade_launcher "RD501_cis_dgl"
+#define macro_grenade_launcher_mag "RD501_UGL_HE_x6_mag"
 #define macro_grenade_launcher_mags _8(macro_grenade_launcher_mag)
-#define macro_grenade_launcher_grenade "1Rnd_HE_Grenade_shell"
-#define macro_grenade_launcher_grenades _7(macro_grenade_launcher_grenade)
 
 #define macro_thermal_det "swop_termDetDT_G"
 #define macro_thermal_imp "SWOP_BCCKtermimploder_G"

addons - Copy/RD501_Main/XEH_postinit.sqf

@@ -14,7 +14,7 @@ call macro_fnc_name(nightvision);
 #define QWEAP_LAUNCH(name) macro_quote(macro_new_weapon(launcher,name))
 
 // Drone Recharge
-RD501_DRONE_BATTERY = "lightsaberG_swing";
+RD501_DRONE_BATTERY = "RD501_10mw_x30_mag";
 
 //Force Walk
 RD501_FORCE_WALK_WEAPONS = [macro_quote(macro_new_weapon_nofam(z1000))];

addons - Copy/RD501_Units/blufor/clones/_headwear.hpp

@@ -9,9 +9,9 @@ class JLTS_CloneNVGCC;
 class JLTS_CloneNVGMC;
 class JLTS_CloneBinocular;
 class JLTS_CloneBinocular_black;
-class swop_nvchipclean;
+class JLTS_NVG_droid_chip_1;
 
-class rd501_swop_nvchipclean: swop_nvchipclean
+class rd501_swop_nvchipclean: JLTS_NVG_droid_chip_1
 {
     displayname = "Operator Class Vision Enhancement Chip";
     modelOptics="";
@@ -155,6 +155,33 @@ class rd501_JLTS_CloneNVGMC: JLTS_CloneNVGMC
         "TI"
     };
 };
+class macro_new_weapon(nvg,shock_trooper) : JLTS_NVG_droid_chip_1
+{
+	visionMode[] = {"Normal","NVG"};
+	dlc = "rd501";
+	author= "RD501";
+	displayName = "SW NVG Chip(Clear)";
+	macro_thermal_nvg_default
+};
+
+	class macro_new_weapon(nvg,shock_trooper) : JLTS_NVG_droid_chip_1
+	{
+		visionMode[] = {"Normal"};
+		dlc = "rd501";
+		author= "RD501";
+		RD501_isNV = 1;
+		displayName = "Shock Trooper Chip";
+	};
+
+	class macro_new_weapon(nvg,shock_trooper_enhanced) : JLTS_NVG_droid_chip_1
+	{
+		visionMode[] = {"Normal","TI"};
+		thermalMode[] = {0,2};
+		dlc = "rd501";
+		author= "RD501";
+		RD501_isNV = 1;
+		displayName = "Shock Trooper Enhanced Chip";
+	};
 class rd501_JLTS_CloneBinocular: JLTS_CloneBinocular
 {
     displayname = "[501st] Clone Macrobinoculars (White)";

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

@@ -92,7 +92,7 @@ class TransportWeapons
 	};
 	class _transport_dc15gl
 	{
-		weapon = macro_new_weapon(DC,15gl)
+		weapon = macro_new_weapon(DC,15cgl)
 		count = 2;
 	};
 	class _transport_valken38x
@@ -236,9 +236,9 @@ class TransportMagazines
 };
 class TransportItems
 {
-	class _xx_SW_SquadShield_Mag
+	class _xx_RD_SquadShield_Mag
 	{
-		name = "SW_SquadShield_Mag";
+		name = macro_new_mag(squad_shield_sigma,1)
 		count = 2;
 	};
 	class _xx_ACE_HuntIR_monitor

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

@@ -87,7 +87,7 @@ class CfgVehicles
 		};
 	};
 	#define ARR_2(a,b) a,b
-	class macro_new_vehicle(drone,Clone_Recon_Droid): swclonerecondroid
+	class macro_new_vehicle(drone,Clone_Recon_Droid): JLTS_UAV_prowler_gar
 	{
 		author = "RD501";
 		scope=2
@@ -107,17 +107,19 @@ class CfgVehicles
         {
             "\SW_CloneWarsWeapons\Recon\com_weap_probedroid.paa"
         };*/
-		 class ACE_Actions: ACE_Actions {
-            class ACE_MainActions: ACE_MainActions {
-				condition = macro_quote(true);
+		class ACE_Actions {
+            distance = 4;
+            condition = macro_quote(true);
+            class ACE_MainActions {
+                condition = macro_quote(true);
                 class RD501_Drone_Refuel
-				{
-					displayName = "Refuel Drone";
-					distance = 4;
-					condition = macro_quote([ARR_2(_player,_target)] call macro_fnc_name(canRefuel));
-					statement = macro_quote([ARR_2(_player,_target)] call macro_fnc_name(refuelUAVDrone));
-					position = macro_quote(call ace_interaction_fnc_getVehiclePos);
-				};
+                {
+                    displayName = "Refuel Drone";
+                    distance = 4;
+                    condition = macro_quote([ARR_2(_player,_target)] call macro_fnc_name(canRefuel));
+                    statement = macro_quote([ARR_2(_player,_target)] call macro_fnc_name(refuelUAVDrone));
+                    position = macro_quote(call ace_interaction_fnc_getVehiclePos);
+                };
             };
         };
 		class assembleInfo

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

@@ -106,11 +106,11 @@ class CfgVehicles
 		editorSubcategory = macro_editor_cat(AA)
 		vehicleClass = macro_editor_vehicle_type(AA)
 		//faction = "RD501FactionOpfor";
-		hiddenSelectionsTextures[] = 
+		/*hiddenSelectionsTextures[] = 
 		{
 			"awing\t_awing_03_cw.paa",
 			"awing\t_awing_03_cw.paa"
-		};
+		};*/
 		class Turrets: Turrets
 		{
 			class MainTurret: MainTurret
@@ -347,11 +347,11 @@ class CfgVehicles
 		scopecurator = 1;
 		weaponLockSystem = "2+4+8";
 		 
-		hiddenSelectionsTextures[] = 
+		/*hiddenSelectionsTextures[] = 
 		{
 			"awing\t_awing_03_cw.paa",
 			"awing\t_awing_03_cw.paa"
-		};
+		};*/
 		
 		
 		class Turrets: Turrets
@@ -376,71 +376,6 @@ class CfgVehicles
 			};
 		};
 	};	
-	class macro_new_vehicle(Praetorian_Variant,rebel): macro_new_vehicle(Praetorian_Variant,normal)//
-	{
-		side = 1;
-		displayName = "Laser Cannons (rebel)";
-
-		faction = macro_rebel_faction
-		editorSubcategory = macro_editor_cat(AA)
-		vehicleClass = macro_editor_vehicle_type(AA)
-		class Turrets: Turrets
-		{
-			class MainTurret: MainTurret
-			{
-				weapons[] = {
-					macro_new_weapon(generic,rebel_aircraft_laser)
-				};
-				magazines[] = {
-					macro_new_mag(generic_aircraft_gun,1000),
-					macro_new_mag(generic_aircraft_gun,1000)
-				};
-			};
-		};
-	};
-	class macro_new_vehicle(Praetorian_Variant,republic): macro_new_vehicle(Praetorian_Variant,normal)//
-	{
-		displayName = "Laser Cannons (republic)";
-		side = 1;
-
-		faction = 
-		editorSubcategory = macro_editor_cat(AA)
-		vehicleClass = macro_editor_vehicle_type(AA)
-		class Turrets: Turrets
-		{
-			class MainTurret: MainTurret
-			{
-				weapons[] = {
-					macro_new_weapon(generic,tie_aircraft_laser)
-				};
-				magazines[] = {
-					macro_new_mag(generic_aircraft_gun_green,1000),
-					macro_new_mag(generic_aircraft_gun_green,1000)
-				};
-			};
-		};
-	};
-	class macro_new_vehicle(Praetorian_Variant,imperial): macro_new_vehicle(Praetorian_Variant,normal)//
-	{
-		displayName = "Laser Cannons (Imperial)";
-
-		faction = macro_empire_faction
-		editorSubcategory = macro_editor_cat(AA)
-		vehicleClass = macro_editor_vehicle_type(AA)
-		class Turrets: Turrets
-		{
-			class MainTurret: MainTurret
-			{
-				weapons[] = {
-					macro_new_weapon(generic,tie_aircraft_laser)
-				};
-				magazines[] = {
-					macro_new_mag(generic_aircraft_gun_green,1000),
-					macro_new_mag(generic_aircraft_gun_green,1000)
-				};
-			};
-		};
-	};
 	class macro_new_vehicle(Praetorian_Variant,Ion): macro_new_vehicle(Praetorian_Variant,normal)//
 	{
 		side = 1;

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

@@ -25,7 +25,7 @@ class _transport_z6
 };
 class _transport_dc15gl
 {
-    weapon = macro_new_weapon(DC,15gl)
+    weapon = macro_new_weapon(DC,15cgl)
     count = 2;
 };
 class _transport_valken38x

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

@@ -123,7 +123,7 @@ class CfgVehicles
 			};
 		};
 	};
-		class StaticMortar: StaticWeapon
+	/*class StaticMortar: StaticWeapon
 	{
 		class Turrets: Turrets
 		{
@@ -155,7 +155,7 @@ class CfgVehicles
 			class MainTurret: MainTurret
 			{};
 		};
-	};
+	};*/
 	/*class macro_new_vehicle(mortar,cis):3AS_Republic_Mortar
 	{
 		author = "RD501";

addons - Copy/RD501_Weapons/Droid_weapons/DGL/config.cpp

@@ -0,0 +1,56 @@
+#define COMPONENT DGL
+#include "../../../RD501_main/config_macros.hpp"
+#include "../../_common/common.hpp"
+
+
+
+class CfgPatches
+{
+	class macro_patch_name(dgl)
+	{
+		author=DANKAUTHORS;
+		addonRootClass= macro_patch_name(weapons)
+		requiredAddons[]=
+		{
+			macro_patch_name(weapons)
+		};
+		requiredVersion=0.1;
+		units[]={};
+		weapons[]={
+			macro_new_weapon(cis,dgl)
+		};
+	};
+};
+class Mode_SemiAuto;
+class Mode_FullAuto;
+class cfgWeapons 
+{
+	
+	class Rifle_Base_F;
+	class arifle_MX_Base_F: Rifle_Base_F
+	{	};
+	class JLTS_SBB3: arifle_MX_Base_F
+	{
+		class Single: Mode_SemiAuto
+		{};
+	};
+	class macro_new_weapon(cis,dgl): JLTS_SBB3
+	{
+		scope=2;
+        scopeArsenal=2;
+		JLTS_hasElectronics=0;
+		recoil="recoil_mxm"
+		baseWeapon=macro_new_weapon(cis,dgl)
+        displayName="CIS Droid GL";
+		ACE_Overheating_mrbs = 450000;
+		magazines[]=
+		{
+			macro_new_mag(UGL_HE,6),
+			macro_new_mag(UGL_AP,6)
+		};
+		class Single : Single
+		{
+			reloadTime=0.5;
+		};
+	};
+};

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

@@ -19,11 +19,8 @@ class CfgPatches
 	};
 };
 class CfgWeapons
-{	class Launcher_Base_F;
-	class 3AS_RPS6_HP:Launcher_Base_F
-	{
-		class OpticsModes{class optic;};
-	};
+{
+	class 3AS_RPS6_HP;
 	class macro_new_weapon(launcher,RPS6):3AS_RPS6_HP
 	{
 		scope=2;

addons - Copy/RD501_Weapons/NVG/config.cpp

@@ -1,4 +1,4 @@
-#define COMPONENT nvg
+/*#define COMPONENT nvg
 #include "../../RD501_main/config_macros.hpp"
 #include "../_common/common.hpp"
 
@@ -189,23 +189,7 @@ class cfgWeapons
 		macro_thermal_nvg_default
  	};
 
-	class macro_new_weapon(nvg,shock_trooper) : SWOP_NVChip2
-	{
-		visionMode[] = {"Normal"};
-		dlc = "rd501";
-		author= "RD501";
-		RD501_isNV = 1;
-		displayName = "Shock Trooper Chip";
-	};
 
-	class macro_new_weapon(nvg,shock_trooper_enhanced) : SWOP_NVChip2
-	{
-		visionMode[] = {"Normal","TI"};
-		thermalMode[] = {0,2};
-		dlc = "rd501";
-		author= "RD501";
-		RD501_isNV = 1;
-		displayName = "Shock Trooper Enhanced Chip";
-	};
 };
 
+*/

addons - Copy/RD501_Weapons/_ammo/config.cpp

@@ -184,7 +184,7 @@ class CfgAmmo
 		indirectHit = 0;
 		indirectHitRange = .1;
 		timeToLive =30;
-		model = "\GeonFighter\LaserGeon.p3d";
+		model="\3AS\3AS_Equipment\model\3AS_coredetonator.p3d";
 		fuseDistance = 3;
 
 		explosive = 0.0001;
@@ -206,7 +206,7 @@ class CfgAmmo
 		indirectHit = 50;
 		indirectHitRange = 5;
 		timeToLive =30;
-		model = "SW_AV7\ion.p3d";
+		model="\3AS\3AS_Equipment\model\3AS_thermaldet.p3d";
 		fuseDistance = 3;
 	};
 	class RD501_grenade_emp_ammo: G_40mm_HE
@@ -216,7 +216,7 @@ class CfgAmmo
 		indirectHit = 0.01;
 		indirectHitRange = 12;
 		timeToLive =30;
-		model = "\thermalD\EMP_Grenade_ammo.p3d";
+		model = "\MRC\JLTS\weapons\Core\effects\emp_blue.p3d";
 		fuseDistance = 1
 		explosive = 0.0001;
 		deflecting = 5;
@@ -262,6 +262,7 @@ class CfgAmmo
 		hit=50;
 		indirectHit=45;
 		indirectHitRange=2;
+		simulation="shotShell";
 	}
 	class macro_new_ammo(thermaldet) : 3AS_Detonator_1RND
 	{

addons - Copy/RD501_Weapons/_mag/config.cpp

@@ -20,7 +20,7 @@ class CfgMagazines
 {
 	class 3AS_45Rnd_EC50_Mag;
 	class 1Rnd_HE_Grenade_shell;
-	class DCStun_Mag;
+	class JLTS_stun_mag_long;
 	class 1Rnd_Smoke_Grenade_shell;
 	class UGL_FlareWhite_F;
 	class SWOP_DC15SA_Ammo;
@@ -188,7 +188,7 @@ class CfgMagazines
 		initSpeed=1100;
 		descriptionShort="High power magazine";
 	};
-	class macro_new_mag(stun,5):DCStun_Mag
+	class macro_new_mag(stun,5):JLTS_stun_mag_long
 	{
 		displayName="5 Round Stun Cell";
 		descriptionShort = "5 Round Stun Cell";
@@ -321,6 +321,7 @@ class CfgMagazines
 	////////////////////////////////////////////////////
 	class macro_new_mag(imploder,1):3AS_BaridumCore
 	{
+		author="RD501";
 		scope=2;
 		displayName = "Republic Thermal Imploder";
 		displayNameShort = "Thermal Imploder";
@@ -330,6 +331,7 @@ class CfgMagazines
 	};
 	class macro_new_mag(thermaldet,1):3AS_ThermalDetonator
 	{
+		author="RD501";
 		scope=2;
 		displayName = "Republic Thermal Detonator";
 		displayNameShort = "Thermal Detonator";
@@ -339,6 +341,7 @@ class CfgMagazines
 	};
 	class macro_new_mag(squad_shield_sigma,1):3AS_BaridumCore
 	{
+		author="RD501";
 		scope=2;
 		displayName = "Republic Squad Shield Sigma";
 		displayNameShort = "Squad Shield Sigma";
@@ -354,6 +357,7 @@ class CfgMagazines
 	class RPG32_HE_F;
 	class macro_new_mag(rps1,1):RPG32_F
 	{
+		author="RD501";
 		scope=1;
 		weight=1;
 		mass=1;

addons - Copy/RD501_Weapons/rocket/config.cpp

@@ -16,50 +16,15 @@ class CfgPatches
 		requiredVersion=0.1;
 		units[]={};
 		weapons[]={
-			macro_new_weapon(hh,15),
-			macro_new_weapon(rps,6),
-			macro_new_weapon(Launcher,PLX1),
+			macro_new_weapon(Launcher,PLX1)
 		};
 	};
 };
 
 class cfgWeapons 
 {	
-	class launch_RPG32_F;
-	class RocketHH15Clone;
-	class RocketRPS6_F;
 	class JLTS_PLX1_AT;
 
-	/*class macro_new_weapon(hh,15):RocketHH15Clone
-	{
-		author= "RD501";
-		_generalMacro = macro_new_weapon(hh,15)
-		scope = 2;
-		scopeCurator=2;
-		scopeArsenal=2;
-		displayName = "Republic HH-15 Rocket Launcher.";
-
-		#include "rocket_scope_fix.hpp"
-
-		magazineWell[] += {macro_new_magwell(rocket_RPS)};
-	};
-
-	class macro_new_weapon(rps,6):RocketRPS6_F
-	{
-		author= "RD501";
-		_generalMacro = macro_new_weapon(rps,6)
-		scope = 2;
-		scopeCurator=2;
-		scopeArsenal=2;
-		displayName = "Republic RPS 6 Rocket Launcher.";
-
-		recoil = "recoil_single_law";
-		
-		#include "rocket_scope_fix.hpp"
-
-		magazineWell[] += {macro_new_magwell(rocket_RPS)};
-	};*/
-
     class macro_new_weapon(Launcher,PLX1): JLTS_PLX1_AT
     {
 		author= "RD501";