Convert from cba to internal disposable script, add icon

addons - Copy/RD501_Main/XEH_postinit.sqf

@@ -10,10 +10,16 @@
 // Add nightvision event handler
 call macro_fnc_name(nightvision);
 
+#define QWEAP_NOFAM(name) macro_quote(macro_new_weapon_nofam(name))
+#define QWEAP_LAUNCH(name) macro_quote(macro_new_weapon(launcher,name))
+
 // Drone Recharge
 RD501_DRONE_BATTERY = "lightsaberG_swing";
+
+//Force Walk
 RD501_FORCE_WALK_WEAPONS = [macro_quote(macro_new_weapon_nofam(z1000))];
 ["weapon", macro_fnc_name(heavyWeaponHandlePlayerWeaponChanged)] call CBA_fnc_addPlayerEventHandler;
 
-RD501_AUTO_RELOAD_ON_EQUIP = [macro_quote(macro_new_weapon_nofam(z1000))];
+//Auto Reload On Equip
+RD501_AUTO_RELOAD_ON_EQUIP = [QWEAP_NOFAM(z1000),QWEAP_LAUNCH(RPS_Disposable)];
 ["weapon", macro_fnc_name(reloadWeaponOnFirstSelected)] call CBA_fnc_addPlayerEventHandler;

addons - Copy/RD501_Weapons/RPS_Disposable/config.cpp

@@ -22,7 +22,6 @@ class CfgPatches
 		units[]={};
 		weapons[]={
 			macro_quote(DISPOSABLE_BASE(RPS_Disposable)),
-			macro_quote(DISPOSABLE_LOADED(RPS_Disposable)),
 			macro_quote(DISPOSABLE_USED(RPS_Disposable))
 		};
 	};
@@ -38,36 +37,26 @@ class cfgWeapons
 	class DISPOSABLE_BASE(RPS_disposable) : Launcher_Base_F
 	{
 		author= "RD501";
-		scope = 1;
-		scopeArsenal=1;
+		scope = 2;
+		scopeArsenal=2;
+		displayName = "Republic RPS Disposable";
 		model = "\3AS\3AS_Weapons\RPS6\3AS_RPS6_F.p3d";
 		modelOptics = "\A3\Weapons_F\acc\reticle_RPG_F";
+        icon = "\RD501_Weapons\RPS_Disposable\rps_disposable_icon.paa";
+		picture = "\RD501_Weapons\RPS_Disposable\rps_disposable_icon.paa";
 		recoil = "recoil_single_law";
-		baseWeapon = macro_quote(DISPOSABLE_LOADED(RPS_Disposable));
-        class EventHandlers {
-            fired = "_this call CBA_fnc_firedDisposable";
-        };
-		magazines[] = {macro_quote(macro_new_mag(RPS_Disposable,1))};
+		baseWeapon = macro_quote(DISPOSABLE_BASE(RPS_Disposable));
+		RD501_Empty_Weapon = macro_quote(DISPOSABLE_USED(RPS_Disposable));
+		magazines[] = { "MRAWS_HEAT55_F" };
 
 		magazineReloadTime = 0.1;
         reloadMagazineSound[] = {"",1,1};
         
+		class EventHandlers {
+			fired = macro_quote(_this call macro_fnc_name(onWeaponFiredSwapToEmpty));
+		};
         class WeaponSlotsInfo: WeaponSlotsInfo {
-            mass = 10;
-        };
-	};
-
-	class DISPOSABLE_LOADED(RPS_Disposable) : DISPOSABLE_BASE(RPS_Disposable)
-	{
-		author= "RD501";
-		scope = 2;
-		scopeArsenal=2;
-		displayName = "Republic RPS6 Disposable Loaded";
-		baseWeapon = macro_quote(DISPOSABLE_LOADED(RPS_Disposable));
-
-		magazines[] = { "CBA_FakeLauncherMagazine" };
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            mass = 20;
+            mass = 80;
         };
 	};
 	class DISPOSABLE_USED(RPS_Disposable) : DISPOSABLE_BASE(RPS_Disposable)
@@ -75,7 +64,7 @@ class cfgWeapons
 		author= "RD501";
 		scope = 1;
 		scopeArsenal=1;
-		displayName = "Republic RPS6 Disposable Used";
+		displayName = "Republic RPS Disposable (Used)";
 		baseWeapon = macro_quote(DISPOSABLE_USED(RPS_Disposable));
 
 		magazines[] = { "CBA_FakeLauncherMagazine" };
@@ -83,28 +72,4 @@ class cfgWeapons
             mass = 10;
         };
 	};
-
-};
-class CBA_DisposableLaunchers {
-	DISPOSABLE_BASE(RPS_Disposable)[] = {
-		macro_quote(DISPOSABLE_LOADED(RPS_Disposable)),
-		macro_quote(DISPOSABLE_USED(RPS_Disposable))
-	};
-};
-
-class CfgMagazines {
-	class CA_LauncherMagazine;
-	class macro_new_mag(RPS_Disposable,1) : CA_LauncherMagazine {
-		author = "RD501";
-		scope = 2;
-        ammo = "MRAWS_HEAT55_F";
-		type = "2 *   256";
-		count = 1;
-		picture = "\A3\weapons_f\launchers\nlaw\data\UI\gear_nlaw_rocket_ca.paa";
-		model = "\A3\weapons_f\launchers\nlaw\nlaw_proxy";
-		initSpeed = 60;
-		maxLeadSpeed = 60;
-		mass = 70;
-		nameSound = "missiles";
-	};
 };