Merge pull request 'Campaign-Updates-6-9-2024' (#50) from Campaign-Updates-6-9-2024 into develop

Reviewed-on: #50

CHANGELOG.md

@@ -4,6 +4,30 @@ 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
+
+- Function to remove lightning bolt from zeus
+
+### Changed
+
+- Alpha Callsign
+- Allowed Equipment Definitions
+
+### Removed
+
+- Custom tire patch code
+- Extraneous server performance calculation broadcast to all clients
+
 ## [4.1.0] - 2024-03-01
 
 ### Added

custom_sounds.hpp

@@ -0,0 +1,8 @@
+
+// EXAMPLE
+// class uncon_alarm
+// {
+//     name = "uncon_alarm";
+//     sound[] = {"AJ_CBRN_V2\sounds\AJ_warning_1.ogg", 0.9, 1, 5}; //directory, volume, pitch, range
+//     titles[]={};
+// };

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 BLACKJACK
+#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

@@ -13,7 +13,7 @@ class DisallowedEquipment {
 		items[] = {
 			"17BN_ANPVS14", // NVG AN/PVS-14
 			"ej_PVS15D", // NVG AN/PVS-15
-			"ej_VPS15", // NVG AN/PVS-15
+			"ej_PVS15", // NVG AN/PVS-15
 			"LMG_Mk200_black_F", //Mk200 Series
 			"LMG_Mk200_F", //Mk200 Series
 			"rhs_weap_g36c", // G36 Series
@@ -34,11 +34,6 @@ class DisallowedEquipment {
 			"rhs_weap_m14_wd", // M14 Series
 			"rhs_weap_m14_weap_m14ebrri", // M14 Series
 			"rhs_weap_m14", // M14 Series
-			"rhs_weap_m16a4_carryhandle_M203", // M16 Series
-			"rhs_weap_m16a4_carryhandle", // M16 Series
-			"rhs_weap_m16a4_imod_M203", // M16 Series
-			"rhs_weap_m16a4_imod", // M16 Series
-			"rhs_weap_m16a4", // M16 Series
 			"rhs_weap_m27iar_grip", // M27 Series
 			"rhs_weap_m27iar", // M27 Series
 			"rhsusf_ANPVS_14", // NVG AN/PVS-14
@@ -100,12 +95,6 @@ class DisallowedEquipment {
 			"UK3CB_M14DMR_Railed_BLK", // M14 Series
 			"UK3CB_M14DMR_Railed", // M14 Series
 			"UK3CB_M14DMR", // M14 Series
-			"UK3CB_M16_Carbine", // M16 Series
-			"UK3CB_M16A1_LSW", // M16 Series
-			"UK3CB_M16A1", // M16 Series
-			"UK3CB_M16A2_UGL", // M16 Series
-			"UK3CB_M16A2", // M16 Series
-			"UK3CB_M16A3", // M16 Series
 			"USP_PVS_14", // NVG AN/PVS-14
 			"USP_PVS_15" // NVG AN/PVS-15
 		};
@@ -132,10 +121,9 @@ class DisallowedEquipment {
 			"optic_lrps_tna_F", //Nightforce Series Optic
 			"optic_lrps", //Nightforce Series Optic
 			"optic_Nightstalker", // Thermal Optic
-			"optic_tws_mg", // Thermal Optic
-			"optic_tws", // Thermal Optic
 			"rhsusf_acc_anpas13gv1", // Thermal Optic
 			"rhsusf_acc_anpvs27", // Thermal Optic
+			"optic_tws_mg", // Thermal Optic
 			"Tier1_ANPVS10_Tan", // Thermal Optic
 			"Tier1_ATACR18_ADM_Black_Vanilla", //Nightforce Series Optic
 			"Tier1_ATACR18_ADM_Black", //Nightforce Series Optic
@@ -152,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
 		};
 	};
 
@@ -160,6 +149,7 @@ class DisallowedEquipment {
 		label = "TABBED WEAPON";
 		description = "Items that are allowed for individuals with Ranger Tab.";
 		items[] = {
+			"optic_tws", // Thermal Optic
 			"arifle_MX_black_F", // MX Series
 			"arifle_MX_F", // MX Series
 			"arifle_MX_GL_black_F", // MX 3GL Series
@@ -208,7 +198,90 @@ class DisallowedEquipment {
 			"Tier1_SR25_ec_tan", // SR-25 Series
 			"Tier1_SR25_ec", // SR-25 Series
 			"Tier1_SR25_tan", // SR-25 Series
-			"Tier1_SR25" // SR-25 Series
+			"Tier1_SR25", // SR-25 Series
+			"rhsusf_weap_MP7A2", //MP7 Series 
+			"rhsusf_weap_MP7A2_aor1", //MP7 Series 
+			"rhsusf_weap_MP7A2_desert", //MP7 Series 
+			"rhsusf_weap_MP7A2_folded", //MP7 Series 
+			"rhsusf_weap_MP7A2_folded_aor1", //MP7 Series 
+			"rhsusf_weap_MP7A2_folded_winter", //MP7 Series 
+			"rhsusf_weap_MP7A2_folded_desert", //MP7 Series 
+			"rhsusf_weap_MP7A2_winter", //MP7 Series 
+			"UK3CB_MP510", //MP5 Series 
+			"UK3CB_MP5A2", //MP5 Series 
+			"UK3CB_MP5A3", //MP5 Series 
+			"UK3CB_MP5A4", //MP5 Series 
+			"UK3CB_MP5K", //MP5 Series 
+			"UK3CB_MP5K_PDW", //MP5 Series 
+			"UK3CB_MP5N", //MP5 Series 
+			"UK3CB_MP5N_UGL", //MP5 Series 
+			"UK3CB_MP5SD5", //MP5 Series 
+			"UK3CB_MP5SD6", //MP5 Series
+			"SMG_03C_black", //P90 Series
+			"SMG_03C_camo", //P90 Series
+			"SMG_03C_hex", //P90 Series
+			"SMG_03C_khaki", //P90 Series
+			"SMG_03C_TR_black", //P90 Series
+			"SMG_03C_TR_camo", //P90 Series
+			"SMG_03C_TR_hex", //P90 Series
+			"SMG_03C_TR_khaki", //P90 Series
+			"UK3CB_P90C_black", //P90 Series
+			"UK3CB_P90C_camo", //P90 Series
+			"UK3CB_P90C_hex", //P90 Series
+			"UK3CB_P90C_khaki", //P90 Series
+			"UK3CB_P90C_TR_black", //P90 Series
+			"UK3CB_P90C_TR_camo", //P90 Series
+			"UK3CB_P90C_TR_hex", //P90 Series
+			"UK3CB_P90C_TR_khaki", //P90 Series
+			"UK3CB_P90_black", //P90 Series
+			"UK3CB_P90_camo", //P90 Series
+			"UK3CB_P90_hex", //P90 Series
+			"UK3CB_P90_khaki", //P90 Series
+			"UK3CB_P90_TR_black", //P90 Series
+			"UK3CB_P90_TR_camo", //P90 Series
+			"UK3CB_P90_TR_hex", //P90 Series
+			"UK3CB_P90_TR_khaki", //P90 Series
+			"UK3CB_M16_Carbine", //M16 Series
+			"UK3CB_M16_Carbine_eotech_552", //M16 Series
+			"UK3CB_M16_Carbine_sup", //M16 Series
+			"UK3CB_M16A1", //M16 Series
+			"UK3CB_M16A1_LSW", //M16 Series
+			"UK3CB_M16A2", //M16 Series
+			"UK3CB_M16A2_sup", //M16 Series
+			"UK3CB_M16A2_UGL", //M16 Series
+			"UK3CB_M16A2_UGL_eotech_552", //M16 Series
+			"UK3CB_M16A2_UGL_sup", //M16 Series
+			"UK3CB_M16A3", //M16 Series
+			"UK3CB_M16A3_eotech_552", //M16 Series
+			"UK3CB_M16A3_eotech_552_sup", //M16 Series
+			"UK3CB_M16A3_sup", //M16 Series
+			"UK3CB_M16A3_UGL", //M16 Series
+			"rhs_weap_m16a4", //M16 Series
+			"rhs_weap_m16a4_grip", //M16 Series
+			"rhs_weap_m16a4_grip_acog", //M16 Series
+			"rhs_weap_m16a4_grip2", //M16 Series
+			"rhs_weap_m16a4_grip3", //M16 Series
+			"rhs_weap_m16a4_bipod", //M16 Series
+			"rhs_weap_m16a4_acog_usmc", //M16 Series
+			"rhs_weap_m16a4_carryhandle", //M16 Series
+			"rhs_weap_m16a4_carryhandle_bipod", //M16 Series
+			"rhs_weap_m16a4_carryhandle_grip", //M16 Series
+			"rhs_weap_m16a4_carryhandle_M203", //M16 Series
+			"rhs_weap_m16a4_carryhandle_M203_grip", //M16 Series
+			"rhs_weap_m16a4_m203_acog_usmc", //M16 Series
+			"uk3cb_weap_m16a4_m203s_eotech_552_anpeq15_sup", //M16 Series
+			"rhs_weap_m16a4_imod", //M16 Series
+			"rhs_weap_m16a4_imod_grip", //M16 Series
+			"rhs_weap_m16a4_imod_grip2", //M16 Series
+			"rhs_weap_m16a4_imod_grip3", //M16 Series
+			"rhs_weap_m16a4_imod_M203", //M16 Series
+			"rhs_weap_m16a4_imod_M203_grip", //M16 Series
+			"rhs_weap_m16a4_carryhandle_grip2", //M16 Series
+			"rhs_weap_m16a4_carryhandle_grip3", //M16 Series
+			"rhs_weap_m16a4_grip_acog_usmc", //M16 Series
+			"rhs_weap_m16a4_grip_acog2_usmc", //M16 Series
+			"rhs_weap_m32", //M32/MGL Series
+			"rhs_weap_m32_usmc" //M32/MGL Series
 		};
 	};
 

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},

description.ext

@@ -96,6 +96,10 @@ class CfgFunctions {
 	#include "custom_scripts.hpp"
 };
 
+class CfgSounds {
+	#include "custom_sounds.hpp"
+};
+
 class CfgLeaflets {
 	#include "custom_leaflets.hpp"
 };

framework/CfgFunctions.hpp

@@ -120,6 +120,7 @@ class DOUBLES(PREFIX,performance) {
 		class addServerStatsPFH {};
 		class calculateServerStats {};
 		class addEmptyGroupCleanupPFH {};
+		class addDeadUnitCleanupPFH {};
 	};
 };
 

framework/client/functions/fn_bindVehicleActions.sqf

@@ -29,39 +29,6 @@ _unflip =
 ["LandVehicle", 0, ["ACE_MainActions"], _unflip, true] call ace_interact_menu_fnc_addActionToClass;
 
 
-_patchTire = 
-[
-	"patchTire",
-	"Patch Tire",
-	"\a3\ui_f\data\IGUI\Cfg\Actions\repair_ca.paa",
-	{
-		[_player, "AinvPknlMstpSnonWnonDr_medic5", 0] call ace_common_fnc_doAnimation;
-
-		[
-			30,
-			[_player, _target],
-			{
-				params ["_args"];
-				_args params ["_player", "_target"];
-				hint "Tire Patched";
-				_target setDamage 0.2;
-				_target setVariable["milsim_ace_repair_wheel_canPatch", false];
-			},
-			{
-				params ["_args"];
-				_args params ["_player", "_target"];
-				hint "Stopped repair";
-				[_player, "", 0] call ace_common_fnc_doAnimation;
-			},
-			"Patching"
-		] call ace_common_fnc_progressBar
-	},
-	{ ( alive _target ) && ( [_player, "ToolKit"] call ace_common_fnc_hasItem ) && ( damage _target > 0.2 ) && ( _target getVariable["milsim_ace_repair_wheel_canPatch", true] ) }
-] call ace_interact_menu_fnc_createAction; 
-
-["ACE_Wheel", 0, ["ACE_MainActions"], _patchTire, true] call ace_interact_menu_fnc_addActionToClass;
-
-
 diag_log text "[MILSIM] (client) vehicle actions bound";
 
 nil;

framework/init/functions/fn_initServer.sqf

@@ -14,6 +14,30 @@ call EFUNC(common,logMissionInfo);
 call EFUNC(fbcb2_assets,initServer);
 call EFUNC(reinsert,initServer);
 
+// globally disable zeus lightning bolt functionality
+_curators = allMissionObjects "ModuleCurator_F";
+{
+	_x removeCuratorAddons ["CuratorOnly_Modules_F_Curator_Lightning"]; 
+	_x removeCuratorAddons ["A3_Modules_F_Curator_Lightning"]; 
+} foreach _curators;
+
+// add dead unit time marking for custom garbage cleanup function
+addMissionEventHandler ["EntityKilled", {
+	params ["_unit", "_killer", "_instigator", "_useEffects"];
+
+	if not (_unit isKindOf "CAManBase") exitWith {};
+
+	if not (isInRemainsCollector _unit)  exitWith {};
+
+	// format["%1 from group %2 died at %3", _unit, group _unit, [datetime] call BIS_fnc_timeToString] remoteExec ["systemChat"];
+	_unit setVariable["milsim_death_time", time];
+	// _unit addEventHandler ["Deleted", {
+	// 	params ["_entity"];
+	// 	isGC = _entity getVariable["milsim_garbage_collected", false];
+	// 	format["%1 from was deleted by custom gc: %2", _entity, str isGC ] remoteExec ["systemChat"];
+	// }];
+}];
+
 // declare init complete to other modules
 missionNamespace setVariable [QGVARMAIN(complete), true, true];
 

framework/performance/functions/fn_addCBASettings.sqf

@@ -1,5 +1,9 @@
 #include "..\script_component.hpp"
 
+//---------------------
+//	Garbage Collection
+//---------------------
+
 [
 	QGVAR(emptyGroupCleanup_enable),
 	"CHECKBOX",
@@ -22,6 +26,28 @@
 	}
 ] call CBA_fnc_addSetting;
 
+[
+	QGVAR(deadUnitCleanup_enable),
+	"CHECKBOX",
+	"Dead Unit Cleanup Enabled",
+	[QUOTE(SETTINGS_GROUP_NAME), QUOTE(COMPONENT_BEAUTIFIED)],
+	true,
+	true,
+	{
+		params ["_value"];
+		[
+			QGVAR(deadUnitCleanup_enable),
+			_value
+		] call EFUNC(common,logSettingChanged);
+
+		if (!isNull (missionNamespace getVariable [QGVAR(deadUnitCleanupPFH), locationNull])) then {
+			deleteLocation GVAR(deadUnitCleanupPFH);
+		};
+
+		call FUNC(addDeadUnitCleanupPFH);
+	}
+] call CBA_fnc_addSetting;
+
 //---------------------
 //	Server CPS
 //---------------------

framework/performance/functions/fn_addDeadUnitCleanupPFH.sqf

@@ -0,0 +1,55 @@
+#include "..\script_component.hpp"
+
+[
+	LEVEL_INFO,
+	QUOTE(COMPONENT),
+	"Initializing dead unit deletion PFH",
+	[]
+] call EFUNC(common,log);
+
+GVAR(deadUnitCleanupPFH) = [
+	{ 
+		_maxTime = getMissionConfigValue ["corpseRemovalMaxTime", 300] * 1.5;
+		_maxDead = getMissionConfigValue ["corpseLimit", 80];
+
+		// _dead = allDead select { (_x isKindOf "CAManBase") and ( ( (time - (_x getVariable ["milsim_death_time", time] ) ) > (_maxTime * 1.5) ) ) };
+		// _dead = _dead apply { [ (time - (_x getVariable ["milsim_death_time", time] ) ), _x ] };
+
+		_dead = [];
+		{
+			if not (_x isKindOf "CAManBase") then { continue };
+			if not (isInRemainsCollector _x) then { continue };
+			_dead pushBack [time - (_x getVariable ["milsim_death_time", time] ), _x];
+		} forEach allDead;
+
+		_dead sort false;
+		_toDelete = 0 max ( (count _dead ) - _maxDead );
+		_dead = _dead select [0, _toDelete];
+		{
+			_unit = _x#1;
+			// _unit setVariable ["milsim_garbage_collected", true];
+			deleteVehicle (_unit);
+		} foreach _dead;
+	},
+	180,
+	[],
+	{ // on creation
+		[
+			LEVEL_INFO,
+			QUOTE(COMPONENT),
+			"dead unit deletion PFH loaded",
+			[]
+		] call EFUNC(common,log);
+	},
+	{ // on deletion
+		[
+			LEVEL_INFO,
+			QUOTE(COMPONENT),
+			"dead unit deletion PFH unloaded",
+			[]
+		] call EFUNC(common,log);
+	},
+	{ (missionNamespace getVariable [QGVAR(deadUnitCleanup_enable), false]) },
+	{ false },
+	[]
+] call CBA_fnc_createPerFrameHandlerObject;

framework/performance/functions/fn_addEmptyGroupCleanupPFH.sqf

@@ -10,9 +10,39 @@
 GVAR(emptyGroupCleanupPFH) = [
 	{ 
 		{
-			if (local _x) then {
+			if ((count units _x) == 0) 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/performance/functions/fn_calculateClientStats.sqf

@@ -29,7 +29,7 @@
 	// log to RPT
 	[
 		
-		{_this call EFUNC(common,log);},
+		{_this remoteExec [QEFUNC(common,log), 2]},
 		[
 			LEVEL_INFO,
 			QUOTE(COMPONENT),

framework/performance/functions/fn_calculateServerStats.sqf

@@ -12,7 +12,6 @@
 
 	private _rawCPS = _counter / (diag_frameNo - _frameNo);
 	missionNamespace setVariable [QGVAR(server_raw_cps), _rawCPS];
-	publicVariable QGVAR(server_raw_cps);
 
 	// with suspension
 	private _counter = 0;
@@ -26,7 +25,6 @@
 
 	private _serverCPS = _counter / (diag_frameNo - _frameNo);
 	missionNamespace setVariable [QGVAR(server_cps), _counter / (diag_frameNo - _frameNo)];
-	publicVariable QGVAR(server_cps);
 
 	// log to RPT
 	[

framework/resupply/functions/fn_createBox.sqf

@@ -162,7 +162,7 @@ if (isNil "_items") exitWith {
 [_box,1] call ace_cargo_fnc_setSize;
 
 // ignore weight restrictions for carry/drag
-_box setVariable ["ace_ignoreWeightCarry", true, true];
+_box setVariable ["ace_dragging_ignoreWeightCarry", true, true];
 
 // Return the box
 _box;

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