Merge pull request '4.2.1 release' (#56) from develop into main

Reviewed-on: #56

CHANGELOG.md

@@ -4,6 +4,34 @@ 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.2.1] - 2024-06-23
+
+### Changed
+
+- Allowed Equipment Definition typo
+
+## [4.2.0] - 2024-06-20
+
+### Added
+
+- Custom remainsCollector script to replace and supplement the built in arma remainsCollector function
+- New Resupply Boxes
+- Ability to spawn spare tires and tracks at the arsenal and via Zeus module
+
+### Changed
+
+- Split vehicle flags into colors and shapes for additional options
+- Battalion Callsigns
+- Allowed Equipment Definitions
+- Resupply Box Contents
+- Fixed incorrect ace carry variable setting
+
+### Removed
+
+- SMA mod references
+- Extraneous server performance calculation broadcast to all clients
+- Ability for pilots to check re-insertion queue
+
 ## [4.1.2] - 2024-04-25
 
 ### Changed

defines/DisallowedEquipment.hpp

@@ -141,7 +141,7 @@ class DisallowedEquipment {
 			"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
-			"sps_black_hornet_01_F" // Black Hornet Drone Mod
+			"sps_black_hornet_01_Static_F" // Black Hornet Drone Mod
 		};
 	};
 

defines/SupplyCrates.hpp

@@ -20,7 +20,8 @@ class SupplyCrates {
 			{"ACE_40mm_Flare_ir",12},
 			{"rhsusf_200Rnd_556x45_mixed_soft_pouch_coyote",25},
 			{"rhsusf_20Rnd_762x51_m993_Mag",25},
-			{"SmokeShell",12},
+			{"SmokeShell",24},
+			{"ACE_M84",24},
 			{"rhs_mag_m67",24},
 			{"1Rnd_Smoke_Grenade_shell",24},
 			{"1Rnd_SmokeRed_Grenade_shell",24},
@@ -33,7 +34,8 @@ class SupplyCrates {
 			{"ACE_20Rnd_762x51_M993_AP_Mag",25},
 			{"rhsusf_20Rnd_762x51_SR25_m993_Mag",25},
 			{"Tier1_20Rnd_762x51_M993_SR25_Mag",25},
-			{"DemoCharge_Remote_Mag",16}
+			{"KAR_20Rnd_Fury_blk",25},
+			{"rhsusf_m112_mag",25},
 		};
 		items[] = {};
 	};
@@ -77,6 +79,7 @@ class SupplyCrates {
 			{"ACE_splint",48},
 			{"ACE_morphine",50},
 			{"ACE_epinephrine",50},
+			{"ACE_painkillers",20},
 			{"ACE_bloodIV",75},
 			{"ACE_bloodIV_500",50},
 			{"ACE_bloodIV_250",25},
@@ -127,6 +130,42 @@ class SupplyCrates {
 		items[] = {};
 	};
 
+	class SquadUtility {
+		boxClass = "Box_Syndicate_Ammo_F";
+		displayName = "Squad Utility Supply Crate";
+		tooltip = "A crate containing Flairs, Smokes, Breaching Charges";
+		icon = "\A3\ui_f\data\map\vehicleicons\iconCrateAmmo_ca.paa";
+
+		backpacks[] = {};
+		weapons[] = {};
+		magazines[] = {};
+		items[] = {
+			{"ACE_Chemlight_HiYellow",20},
+			{"ACE_Chemlight_HiBlue",20},
+			{"ACE_Chemlight_HiGreen",20},
+			{"ACE_Chemlight_HiRed",20},
+			{"ACE_Chemlight_UltraHiOrange",20},
+			{"ACE_HandFlare_Yellow",20},
+			{"ACE_HandFlare_White",20},
+			{"ACE_HandFlare_Red",20},
+			{"ACE_HandFlare_Green",20},
+			{"ACE_Chemlight_IR",20},
+			{"ACE_IR_Strobe_Item",20},
+			{"SmokeShellYellow",20},
+			{"SmokeShellBlue",20},
+			{"SmokeShellPurple",20},
+			{"SmokeShellOrange",20},
+			{"SmokeShellGreen",20},
+			{"SmokeShellRed",20},
+			{"tsp_popperCharge_auto_mag",10},
+			{"tsp_frameCharge_mag",20},
+			{"tsp_stickCharge_auto_mag",10},
+			{"ACE_CableTie",25},
+			{"DemoCharge_Remote_Mag",15},
+			{"TFAR_anprc152",3},
+		};
+	};
+
 	class MortarMk6Resupply {
 		boxClass = "Box_NATO_WpsSpecial_F";
 		displayName = "Mortar MK6 Supply Crate";
@@ -171,4 +210,28 @@ class SupplyCrates {
 		};
 		items[] = {};
 	};
+
+	class ResupplyTire {
+		boxClass = "ACE_Wheel";
+		displayName = "Vehicle Tire";
+		tooltip = "A single tire for replacement";
+		icon = "A3\ui_f\data\igui\cfg\simpletasks\types\repair_ca.paa";
+		
+		backpacks[] = {};
+		weapons[] = {};
+		magazines[] = {};
+		items[] = {};
+	};
+
+	class ResupplyTrack {
+		boxClass = "ACE_Track";
+		displayName = "Vehicle Track";
+		tooltip = "A single track for replacement";
+		icon = "z\ace\addons\repair\ui\patch_ca.paa";
+		
+		backpacks[] = {};
+		weapons[] = {};
+		magazines[] = {};
+		items[] = {};
+	};
 };

framework/init/functions/fn_initServer.sqf

@@ -27,17 +27,31 @@ addMissionEventHandler ["EntityKilled", {
 
 	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"];
-	// }];
+	
+	_unit addEventHandler ["Deleted", {
+		params ["_entity"];
+		_remainsCollector = _entity getVariable["milsim_garbage_collected", false];
+		_decayTime = time - (_entity getVariable ["milsim_death_time", time]);
+
+		_i = allUsers select { (getUserInfo _x)#1 isEqualTo _ownerId;};
+		_owner = if ( _i isEqualTo []) then [ { "server" }, { (getUserInfo (_i#0))#3 }];
+
+		diag_log format["isServer: %5, deleted object owned by: %1 via remainsCollector: %2 after %3 seconds of type: %4", _owner, str (not _remainsCollector), _decayTime, _entity, isServer];
+	}];
 }];
 
+
+// add zeus deletion logging to curator objects
+{
+	_x addEventHandler ["CuratorObjectDeleted", {
+		params ["_curator", "_entity"];
+
+		_decayTime = time - (_entity getVariable ["milsim_death_time", time]);
+		diag_log format["deleted object: %1 via curator: %2 after %3 seconds", _entity, name _curator, _decayTime];
+	}];
+} foreach _curators;
+
 // declare init complete to other modules
 missionNamespace setVariable [QGVARMAIN(complete), true, true];
 

framework/performance/functions/fn_addDeadUnitCleanupPFH.sqf

@@ -27,11 +27,11 @@ GVAR(deadUnitCleanupPFH) = [
 		_dead = _dead select [0, _toDelete];
 		{
 			_unit = _x#1;
-			// _unit setVariable ["milsim_garbage_collected", true];
+			_unit setVariable ["milsim_garbage_collected", true];
 			deleteVehicle (_unit);
 		} foreach _dead;
 	},
-	180,
+	450,
 	[],
 	{ // on creation
 		[

framework/reinsert/client/fn_initClient.sqf

@@ -14,7 +14,7 @@ localNamespace setVariable [QGVAR(checkReinsertQueueClassesAdded), []];
 localNamespace setVariable [QGVAR(lastReinsertQueueCheck), diag_tickTime];
 
 // add actions to pilot classes, and don't apply to child classes
-[["B_Helipilot_F", "B_helicrew_F"], false] call FUNC(addCheckQueueSelfAction);
+// [["B_Helipilot_F", "B_helicrew_F"], false] call FUNC(addCheckQueueSelfAction);
 /////////////////////////////////////////////////////
 
 

framework/script_version.hpp

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

framework/vehicleFlags/functions/fn_compileFlagAction.sqf

@@ -1,3 +1,5 @@
+#include "..\script_component.hpp"
+
 params ["_target", "_player", "_params", "_flagOptionCfg"];
 _params params ["_rootActionID", "_flagCategoryActionID", "_flagSubclassesCfgs"];
 

framework/vehicleFlags/functions/fn_compileFlagCategoryAction.sqf

@@ -1,3 +1,5 @@
+#include "..\script_component.hpp"
+
 // diag_log format ["NewFlagCategory: %1 %2", _flagCategory, _flagOptions];
 
 params ["_rootActionID", "_flagCategoryCfg"];

framework/vehicleFlags/functions/fn_getActionsFlagCategories.sqf

@@ -5,6 +5,7 @@
 		0: STRING - Parent action ID
 		1: ARRAY - Flag category configs
 */
+#include "..\script_component.hpp"
 
 params ["_rootActionID", "_flagCategoryCfgs"];
 
@@ -17,7 +18,7 @@ private _allCategoryActions = [];
 			_flagCategoryActions pushBack ([_rootActionID, _x] call FUNC(compileFlagCategoryAction));
 		} forEach (_x call BIS_fnc_returnChildren);
 	} else {
-		_flagCategoryActions pushBack (_x call FUNC(compileFlagCategoryAction));
+		_flagCategoryActions pushBack ([_rootActionID, _x] call FUNC(compileFlagCategoryAction));
 	};
 	// add category to all category actions array
 	{