Update defines/ApprovedAssets.hpp

Updated Approved assets.

CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project badly attempts [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [4.1.2] - 2024-04-25
+
+### Changed
+
+- Fix internal versioning
+- Swap resupply box 5.56 magazines due to mod conflict
+- Group deletion handler now properly processes empty groups and logs errors 
+
 ## [4.1.1] - 2024-04-19
 
 ### Added

defines/ApprovedAssets.hpp

@@ -1,22 +1,74 @@
 // Lists approved fixed-wing and rotary vehicle types that mission makers can use in their missions.
 
 class ApprovedAssets {
-	// Fixed-wing aircraft
+	// APC
-	class USAF_A10 {callsign = "Ares";};
+	class rhsusf_stryker_m1126_m2_d {callsign = "Katana"; category = "APC";};
-	class RHSGREF_A29B_HIDF {callsign = "Odyssey";};
+	class rhsusf_stryker_m1126_mk19_d {callsign = "Katana"; category = "APC";};
-	class USAF_C130J {callsign = "Hercules";};
+	class rhsusf_stryker_m1127_m2_wd {callsign = "Katana"; category = "APC";};
-	// Rotary aircraft
+	class rhsusf_stryker_m1132_m2_wd {callsign = "Katana"; category = "APC";};
-	class RHS_MELB_MH6M {callsign = "Apollo";};
+	class rhsusf_stryker_m1134_wd {callsign = "Katana"; category = "APC";};
-	class RHS_MELB_AH6M {callsign = "Artemis";};
+	class B_APC_Wheeled_01_cannon_F {callsign = "Rapier"; category = "APC";};
-	class RHS_MELB_H6M {callsign = "Icarus";};
+	class B_APC_Tracked_01_CRV_F {callsign = "DuctTape"; category = "APC";};
-	class RHS_CH_47F {callsign = "Achilles";};
+	// Rotary
-	class ej_MH60MDAP4 {callsign = "Hades";};
+	class TF373_SOAR_MH47G_No_Rear_Guns {callsign = "Achilles"; category = "Rotary";};
-	class RHS_UH60M {callsign = "Griffin";};
+	class TF373_SOAR_MH47G_No_Rear_Guns_EasyActions {callsign = "Achilles"; category = "Rotary";};
-	class RHS_UH60M_MEV2 {callsign = "Dustoff";};
+	class TF373_SOAR_MH47G {callsign = "Achilles"; category = "Rotary";};
-	class B_T_VTOL_01_INFANTRY_F {callsign = "Pegasus";};
+	class TF373_SOAR_MH47G_EasyActions {callsign = "Achilles"; category = "Rotary";};
-	class B_T_VTOL_01_ARMED_F {callsign = "Spartan";};
+	class RHS_CH_47F_10 {callsign = "Achilles"; category = "Rotary";};
-	class RHS_AH64D {callsign = "Orion";};
+	class RHS_MELB_AH6M {callsign = "Artemis"; category = "Rotary";};
-	class RHS_AH1Z {callsign = "Athena";};
+	class RHS_MELB_MH6M {callsign = "Apollo"; category = "Rotary";};
-	class RHS_UH1Y {callsign = "Homer";};
+	class RHS_MELB_H6M {callsign = "Icarus"; category = "Rotary";};
-	class rhsusf_CH53E_USMC {callsign = "Atlas";};
+	class RHS_UH60M {callsign = "Griffin"; category = "Rotary";};
+	class RHS_UH60M2 {callsign = "Griffin"; category = "Rotary";};
+	class RHS_UH60M_MEV {callsign = "Dustoff"; 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";};
+	// Air
+	// Truck
+	class rhsusf_M1078A1R_SOV_M2_D_fmtv_socom {callsign = "DuctTape"; category = "Truck";};
+	class rhsusf_M1084A1R_SOV_M2_D_fmtv_socom {callsign = "DuctTape"; category = "Truck";};
+	class rhsusf_M1078A1P2_B_WD_CP_fmtv_usarmy {callsign = ""; category = "Truck";};
+	// Boats
+	class rhsusf_mkvsoc {callsign = "Poseidon"; category = "Boats";};
+	class B_Boat_Armed_01_minigun_F {callsign = "Neptune"; category = "Boats";};
+	// MRAP
+	class rhsusf_M1238A1_M2_socom_d {callsign = "Tanto"; category = "MRAP";};
+	class rhsusf_M1238A1_Mk19_socom_d {callsign = "Tanto"; category = "MRAP";};
+	class rhsusf_M1239_M2_socom_d {callsign = "DuctTape"; category = "MRAP";};
+	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 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";};
+	// Water
+	// Ground Vehicle
+	// 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 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 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";};
+	// 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/BattalionInfo.hpp

@@ -4,11 +4,11 @@
 
 
 // Define the callsigns for the Battalion
-#define COMMAND_CALLSIGN SPARTAN
+#define COMMAND_CALLSIGN STORMSURGE
 #define RRC_CALLSIGN TIGER
 #define MEDIC_CALLSIGN LIFELINE
-#define ALPHA_CALLSIGN ROGUE
+#define ALPHA_CALLSIGN SAVAGE
-#define ECHO_CALLSIGN FIREBRAND
+#define ECHO_CALLSIGN NIGHTFALL
 #define WPN_CALLSIGN BLACKFOOT
 
 // Define the frequencies for the Battalion

defines/DisallowedEquipment.hpp

@@ -140,7 +140,8 @@ class DisallowedEquipment {
 			"Tier1_ATACR18_Geissele_Docter_Black_Vanilla", //Nightforce Series Optic
 			"Tier1_ATACR18_Geissele_Docter_Black", //Nightforce Series Optic
 			"Tier1_ATACR18_Geissele_Docter_Desert_Vanilla", //Nightforce Series Optic
-			"Tier1_ATACR18_Geissele_Docter_Desert" //Nightforce Series Optic
+			"Tier1_ATACR18_Geissele_Docter_Desert", //Nightforce Series Optic
+			"sps_black_hornet_01_F" // Black Hornet Drone Mod
 		};
 	};
 

defines/SupplyCrates.hpp

@@ -26,13 +26,8 @@ class SupplyCrates {
 			{"1Rnd_SmokeRed_Grenade_shell",24},
 			{"1Rnd_SmokeGreen_Grenade_shell",24},
 			{"1Rnd_SmokeYellow_Grenade_shell",12},
-			{"Tier1_30Rnd_556x45_M856A1_EMag",25},
+			{"rhs_mag_30Rnd_556x45_M855A1_Stanag",25},
 			{"ACE_30Rnd_556x45_Stanag_M995_AP_mag",75},
-			{"SMA_30Rnd_762x35_BLK_EPR",25},
-			{"SMA_20Rnd_762x51mm_M80A1_EPR",25},
-			{"SMA_20Rnd_762x51mm_M80A1_EPR_Tracer",25},
-			{"SMA_20Rnd_762x51mm_Mk316_Mod_0_Special_Long_Range",25},
-			{"SMA_20Rnd_762x51mm_Mk316_Mod_0_Special_Long_Range_Tracer",25},
 			{"Tier1_250Rnd_762x51_Belt_M993_AP",15},
 			{"ACE_20Rnd_762x51_Mag_Tracer",25},
 			{"ACE_20Rnd_762x51_M993_AP_Mag",25},
@@ -57,7 +52,7 @@ class SupplyCrates {
 			{"MRAWS_HEAT_F",35},
 			{"MRAWS_HE_F",15},
 			{"Tier1_250Rnd_762x51_Belt_M993_AP",50},
-			{"Tier1_30Rnd_556x45_M856A1_EMag",25},
+			{"rhs_mag_30Rnd_556x45_M855A1_Stanag",25},
 			{"ACE_30Rnd_556x45_Stanag_M995_AP_mag",50},
 			{"Titan_AA",10},
 			{"Titan_AT",10},

framework/performance/functions/fn_addEmptyGroupCleanupPFH.sqf

@@ -10,9 +10,39 @@
 GVAR(emptyGroupCleanupPFH) = [
 	{ 
 		{
-			if (local _x) then {
 			if ((count units _x) == 0) then {
+				if (local _x) then {
+					[
+						LEVEL_INFO,
+						QUOTE(COMPONENT),
+						"DELETING EMPTY GROUP",
+						[
+							["groupId", groupId _x],
+							["netId", netId _x]
+						]
+					] call EFUNC(common,log);
 					deleteGroup _x;
+				} else {
+					if (isServer) then {
+						[
+							LEVEL_INFO,
+							QUOTE(COMPONENT),
+							"NON LOCAL EMPTY GROUP",
+ 							[
+								["groupId", groupId _x],
+								["groupOwner", groupOwner _x]
+							]
+						] call EFUNC(common,log);
+					} else {
+						[
+							LEVEL_INFO,
+							QUOTE(COMPONENT),
+							"EMPTY REMOTE GROUP",
+							[
+								["groupId", groupId _x]
+							]
+						] call EFUNC(common,log);
+					};
 				};
 			};
 		} forEach allGroups;
@@ -39,6 +69,3 @@ GVAR(emptyGroupCleanupPFH) = [
 	{ not (missionNamespace getVariable [QGVAR(emptyGroupCleanup_enable), false]) },
 	[]
 ] call CBA_fnc_createPerFrameHandlerObject;
-
-
-

framework/script_version.hpp

@@ -1,4 +1,4 @@
 #define MAJOR 4
-#define MINOR 0
+#define MINOR 1
-#define PATCHLVL 0
+#define PATCHLVL 2
 #define BUILD 0