Merge pull request 'resupply-update-5-20-2026' (#69) from resupply-update-5-20-2026 into develop

Reviewed-on: #69

defines/ApprovedAssets.hpp

@@ -7,13 +7,13 @@ class ApprovedAssets {
 	class rhsusf_stryker_m1127_m2_wd {callsign = "Katana"; category = "APC";};
 	class rhsusf_stryker_m1132_m2_wd {callsign = "Katana"; category = "APC";};
 	class rhsusf_stryker_m1134_wd {callsign = "Katana"; category = "APC";};
-        class rhsusf_stryker_m1296_d {callsign = "Katana"; category = "APC";};
 	class B_APC_Wheeled_01_cannon_F {callsign = "Rapier"; category = "APC";};
 	class B_APC_Tracked_01_CRV_F {callsign = "DuctTape"; category = "APC";};
-        class B_AFV_Wheeled_01_cannon_F {callsign = "Gladius"; category = "Armor";};
-	class B_AFV_Wheeled_01_up_cannon_F {callsign = "Gladius"; category = "Armor";};
 	// Rotary
+	class TF373_SOAR_MH47G_No_Rear_Guns {callsign = "Achilles"; category = "Rotary";};
+	class TF373_SOAR_MH47G_No_Rear_Guns_EasyActions {callsign = "Achilles"; category = "Rotary";};
 	class TF373_SOAR_MH47G {callsign = "Achilles"; category = "Rotary";};
+	class TF373_SOAR_MH47G_EasyActions {callsign = "Achilles"; category = "Rotary";};
 	class RHS_CH_47F_10 {callsign = "Achilles"; category = "Rotary";};
 	class RHS_MELB_AH6M {callsign = "Artemis"; category = "Rotary";};
 	class RHS_MELB_MH6M {callsign = "Apollo"; category = "Rotary";};
@@ -21,12 +21,11 @@ class ApprovedAssets {
 	class RHS_UH60M {callsign = "Griffin"; category = "Rotary";};
 	class RHS_UH60M2 {callsign = "Griffin"; category = "Rotary";};
 	class RHS_UH60M_MEV {callsign = "Dustoff"; category = "Rotary";};
-	class ej_MH60MDAP2 {callsign = "Hades"; category = "Rotary";};
-	class ej_MH60MDAP4DP {callsign = "Hades"; category = "Rotary";};
+	class ej_MH60MDAP {callsign = "Hades"; category = "Rotary";};
+	class ej_MH60MDAP16H {callsign = "Hades"; category = "Rotary";};
+	class ej_MH60MDAP8H {callsign = "Hades"; category = "Rotary";};
+	class ej_MH60MDAP4 {callsign = "Hades"; category = "Rotary";};
 	class RHS_AH64DGrey {callsign = "Orion"; category = "Rotary";};
-        class cwr3_b_kiowa_dyn {callsign = "Epyon"; category = "Rotary";};
-        class RHS_UH1Y_d {callsign = "Homer"; category = "Rotary";};
-        class rhsusf_CH53E_USMC_GAU21 {callsign = "Atlas"; category = "Rotary";};
 	// Air
 	// Truck
 	class rhsusf_M1078A1R_SOV_M2_D_fmtv_socom {callsign = "DuctTape"; category = "Truck";};
@@ -35,7 +34,6 @@ class ApprovedAssets {
 	// Boats
 	class rhsusf_mkvsoc {callsign = "Poseidon"; category = "Boats";};
 	class B_Boat_Armed_01_minigun_F {callsign = "Neptune"; category = "Boats";};
-        class UK3CB_AAF_B_RHIB {callsign = "Trident"; category = "Boats";};
 	// MRAP
 	class rhsusf_M1238A1_M2_socom_d {callsign = "Tanto"; category = "MRAP";};
 	class rhsusf_M1238A1_Mk19_socom_d {callsign = "Tanto"; category = "MRAP";};
@@ -43,42 +41,34 @@ class ApprovedAssets {
 	class rhsusf_M1239_MK19_socom_d {callsign = "DuctTape"; category = "MRAP";};
 	class rhsusf_m1245_m2crows_socom_d {callsign = "Dagger"; category = "MRAP";};
 	class rhsusf_m1245_mk19crows_socom_d {callsign = "Dagger"; category = "MRAP";};
-        class ONI_LR_M2_B {callsign = "Dagger"; category = "MRAP";};
 	class rhsusf_M1239_M2_Deploy_socom_d {callsign = "DuctTape"; category = "MRAP";};
 	// TiltRotor
 	class B_T_VTOL_01_infantry_F {callsign = "Pegasus"; category = "TiltRotor";};
 	class B_T_VTOL_01_armed_F {callsign = "Chimera"; category = "TiltRotor";};
-        class UK3CB_AAF_B_Osprey_G {callsign = "Pegasus"; category = "TiltRotor";};
 	// Water
 	// Ground Vehicle
 	// Cars
-	class rhsusf_m1165a1_gmv_m134d_m240_socom_d {callsign = "Marauder"; category = "Cars";};
-	class rhsusf_m1165a1_gmv_m2_m240_socom_d {callsign = "Marauder"; category = "Cars";};
-	class rhsusf_m1165a1_gmv_mk19_m240_socom_d {callsign = "Marauder"; category = "Cars";};
+	class rhsusf_m1165a1_gmv_m134d_m240_socom_d {callsign = "Dagger"; category = "Cars";};
+	class rhsusf_m1165a1_gmv_m2_m240_socom_d {callsign = "Dagger"; category = "Cars";};
+	class rhsusf_m1165a1_gmv_mk19_m240_socom_d {callsign = "Dagger"; category = "Cars";};
 	class rhsusf_mrzr4_d {callsign = ""; category = "Cars";};
 	class UK3CB_B_M1030_NATO {callsign = ""; category = "Cars";};
 	class B_T_LSV_01_AT_F {callsign = ""; category = "Cars";};
 	class B_T_LSV_01_armed_F {callsign = ""; category = "Cars";};
 	class C_Quadbike_01_F {callsign = ""; category = "Cars";};
 	// Fixed-Wing
-        class JS_JC_FA18F {callsign = "Xerxes"; category = "Fixed-Wing";};
-        class B_Plane_Fighter_01_F {callsign = "Xerxes"; category = "Fixed-Wing";};	
-        class B_Plane_CAS_01_dynamicLoadout_F {callsign = "Ares"; category = "Fixed-Wing";};
-	class FLAN_EA18G {callsign = "Thunder"; category = "Fixed-Wing";};
-        class FIR_F35B_Standard {callsign = "Zaku"; category = "Fixed-Wing";};
-        class RHSGREF_A29B_HIDF {callsign = "Odyssey"; category = "Fixed-Wing";};
+	class B_Plane_CAS_01_dynamicLoadout_F {callsign = "Ares"; category = "Fixed-Wing";};
+	class RHS_A10 {callsign = "Ares"; category = "Fixed-Wing";};
 	class USAF_AC130U {callsign = "Odin"; category = "Fixed-Wing";};
 	class USAF_C130J {callsign = "Hercules"; category = "Fixed-Wing";};
-        class USAF_C17 {callsign = "Titan"; category = "Fixed-Wing";};
+	class B_Plane_Fighter_01_F {callsign = "Xerxes"; category = "Fixed-Wing";};
 	// Artillery
 	class rhsusf_M142_usarmy_WD {callsign = "Halberd"; category = "Artillery";};
 	class UK3CB_B_M270_MLRS_HE_DES {callsign = "Halberd"; category = "Artillery";};
 	class rhsusf_m109d_usarmy {callsign = "Glaive"; category = "Artillery";};
 	class RHS_M119_D {callsign = "Mailman"; category = "Artillery";};
-        class B_Mortar_01_F {callsign = "Hammer"; category = "Artillery";};
+	class B_Mortar_01_F {callsign = "Hammer"; category = "Artillery";};
 	// Armor
-        class RHS_M2A3_BUSKIII {callsign = "Sabre"; category = "Armor";};
-        class B_M1283_M2 {callsign = "Sabre"; category = "Armor";};
-        class rhsusf_m1a2sep2wd_usarmy {callsign = "Claymore"; category = "Armor";};
-        class usarmy_LT_M10 {callsign = "Claymore"; category = "Armor";};	
+	class B_AFV_Wheeled_01_cannon_F {callsign = "Gladius"; category = "Armor";};
+	class B_AFV_Wheeled_01_up_cannon_F {callsign = "Gladius"; category = "Armor";};
 };

defines/SupplyCrates.hpp

@@ -7,6 +7,7 @@ class SupplyCrates {
 
 		backpacks[] = {};
 		weapons[] = {
+			{"MCC_MK18_URGI",2}, // m4a1 URGI
 			{"rhs_weap_M136",4},
 			{"rhs_weap_M136_hp",4},
 			//{"rhs_weap_m72a7",2}
@@ -18,6 +19,7 @@ class SupplyCrates {
 			{"1Rnd_SmokeOrange_Grenade_shell",12},
 			{"rhs_mag_M441_HE",25},
 			{"rhs_mag_M433_HEDP",15},
+			{"rhsusf_mag_6Rnd_M441_HE",10}, // M32 Ammo
 			{"ACE_40mm_Flare_ir",12},
 			{"rhsusf_200Rnd_556x45_mixed_soft_pouch_coyote",25},
 			{"rhsusf_20Rnd_762x51_m993_Mag",25},
@@ -28,18 +30,27 @@ class SupplyCrates {
 			{"1Rnd_SmokeRed_Grenade_shell",24},
 			{"1Rnd_SmokeGreen_Grenade_shell",24},
 			{"1Rnd_SmokeYellow_Grenade_shell",12},
-			{"rhs_mag_30Rnd_556x45_M855A1_Stanag",25},
-			{"ACE_30Rnd_556x45_Stanag_M995_AP_mag",75},
-			{"Tier1_250Rnd_762x51_Belt_M993_AP",15},
+			{"ACE_30Rnd_556x45_Stanag_M995_AP_mag",100}, // Removed M8556A1
+			{"rhsusf_100Rnd_762x51_m61_ap",40}, // Replaced from Tier 1
+			{"ranger_100rnd_762_M61",20}, // Replaced from Tier 1 
+			{"rhs_mag_20Rnd_SCAR_762x51_mk316_special",25}, // SCARH mags
+			{"MCC_PMAG_300_30_220OTMSUB",25}, // Added 300blk (Subsonic Mags)
 			{"ACE_20Rnd_762x51_Mag_Tracer",25},
 			{"ACE_20Rnd_762x51_M993_AP_Mag",25},
 			{"rhsusf_20Rnd_762x51_SR25_m993_Mag",25},
-			{"Tier1_20Rnd_762x51_M993_SR25_Mag",25},
+			{"JCA_20Rnd_762x51_SMAG",25}, // Swapped out Tier 1
 			{"KAR_20Rnd_Fury_blk",25},
+			{"MCC_PMAG_65x43_25_125PRT",25}, // Added 6.5
+			{"MCC_ICM_6ARC_20RD_ATIP",25}, // Added 6Arc
+			{"MCC_PMAG_68SPC_25_140VLD",25}, // Added 6.8SPC
+			{"rhsusf_5Rnd_Slug",25}, // Shotgun
+			{"lot_6Rnd_12Gauge_Slug",25}, // Shotgun
+			{"SMG_03C_khaki",15}, // PDW
+			{"CUP_30Rnd_9x19_MP5",15}, // PDW
+			{"JCA_30Rnd_9x21_MP5_Mag",15}, // PDW
+			{"rhsusf_mag_40Rnd_46x30_AP",15}, // PDW
 			{"rhsusf_m112_mag",25},
-			{"JCA_20Rnd_762x51_PMAG",25},
-			{"JCA_20Rnd_762x51_Tracer_Red_PMAG",25},
-			{"KAR_100Rnd_Fury_blk",25},
+			{"ranger_KAC_LAMG_150rnd_Box_Mixed",25} // Swaped out to 150
 		};
 		items[] = {};
 	};
@@ -55,15 +66,17 @@ class SupplyCrates {
 			{"launch_MRAWS_green_F",2}
 		};
 		magazines[] = {
+                        {"rhs_weap_m240B",2},
 			{"MRAWS_HEAT_F",35},
 			{"MRAWS_HE_F",15},
-			{"Tier1_250Rnd_762x51_Belt_M993_AP",50},
-			{"rhs_mag_30Rnd_556x45_M855A1_Stanag",25},
-			{"ACE_30Rnd_556x45_Stanag_M995_AP_mag",50},
+			{"rhsusf_100Rnd_762x51_m61_ap",60}, // Replaced from Tier 1
+			{"ranger_100rnd_762_M61",40}, // Replaced from Tier 1 
 			{"Titan_AA",10},
 			{"Titan_AT",10},
 			{"200Rnd_65x39_cased_Box_Tracer_Red",50},
-			{"KAR_100Rnd_Fury_RT_blk",50}
+			{"rhsusf_mag_6Rnd_M443_HEDP",25}, // M32 Ammo
+			{"rhsusf_mag_6Rnd_M441_HE",25}, // M32 Ammo
+			{"rhsusf_mag_6Rnd_M714_white",15} // M32 Ammo
 		};
 		items[] = {};
 	};
@@ -167,7 +180,7 @@ class SupplyCrates {
 			{"tsp_stickCharge_auto_mag",10},
 			{"ACE_CableTie",25},
 			{"DemoCharge_Remote_Mag",15},
-			{"TFAR_anprc152",3},
+			{"TFAR_anprc152",3}
 		};
 	};