Merge pull request 'Draw 3D icons representing triage status of unconscious units (visible to medics only)' (#4) from feature/triagestatus-draw3d into main

Reviewed-on: https://17th-gs.iceberg-gaming.com:5443/hizumi/MissionTemplate/pulls/4

functions/CfgFunctions.hpp

@@ -32,7 +32,7 @@ class milsim
 		class bindEventHandlers { postInit = 1; };
 		class bindVehicleActions { postInit = 1; };
 		class addClientStatsPFH {};
-		class addMedicalOverlayPFH { postInit = 1; }; // nees refactor
+		class addMedicalOverlayPFH { postInit = 1; };
 		class calculateClientStats {};
 		class initVehicleFlags { postInit = 1; };
 		class bindEmptyGroupGarbageCleanup { postInit = 1; };

functions/client/fn_addClientStatsPFH.sqf

@@ -8,7 +8,7 @@ _cpsPFH = [
 	},
 	"milsim_client_cps_interval" call CBA_settings_fnc_get,
 	[],
-	{ diag_log text format ["[MILSIM] (client) PFH loaded with interval %1 seconds", "milsim_client_cps_interval" call CBA_settings_fnc_get ], },
+	{ diag_log text format ["[MILSIM] (client) PFH loaded with interval %1 seconds", "milsim_client_cps_interval" call CBA_settings_fnc_get ] },
 	{ diag_log text format ["[MILSIM] (client) PFH unloaded"] },
 	{ "milsim_client_cps_enable" call CBA_settings_fnc_get },
 	{ false },

functions/client/fn_addMedicalOverlayPFH.sqf

@@ -1,14 +1,28 @@
-// Enable/Disable the script
+/*
+
+milsim_fnc_addMedicalOverlayPFH
+
+Author: IndigoFox
+
+Description:
+    Affects players with medical permissions. Will see a 3D colored dot over nearby (5-10m)
+	unconscious players who are not in a vehicle
+	which indicates their current ACE Triage Card status.
+	Designed to increase efficiency of CCPs.
+
+*/
+
+// Force setting if CBA doesn't work?
 if (isNil "milsim_client_medState3D_enabled") then {
 	milsim_client_medState3D_enabled = true;
 };
+if (isNil "milsim_client_medState3D_drawRange") then {
+	milsim_client_medState3D_drawRange = 10;
+};
 
 // List of units to draw icons for
 milsim_client_medState3D_drawTargets = []; 
 
-// Range to draw icons for
-milsim_client_medState3D_drawRange = 10;
-
 // ACE Triage colors, for consistency across UIs and functions
 // #define TRIAGE_COLOR_NONE      0.5, 0.5, 0.5, 0.1
 // #define TRIAGE_COLOR_MINIMAL   0, 0.5, 0, 0.9
@@ -26,28 +40,28 @@ milsim_client_medState3D_colors = [
 ];
 
 // Per-frame handler to draw icons
-milsim_client_medState3D_pfh = [
+// cleanup
-	{
+[milsim_client_medState3D_drawTargetsPfh] call CBA_fnc_removePerFrameHandler;
+// add pfh
+milsim_client_medState3D_pfh =	[{
 	// if disabled, skip processing
-		if (!milsim_client_medState3D_enabled) exitWith {};
+	if (!milsim_client_medState3D_enabled) exitWith {false};
-
 	// if no targets, skip processing
-		if (count milsim_client_medState3D_drawTargets == 0) exitWith {};
+	if (count milsim_client_medState3D_drawTargets == 0) exitWith {false};
-
+	if !([player] call ace_medical_treatment_fnc_isMedic) exitWith {false};
-		if !([player] call ace_medical_treatment_fnc_isMedic) exitWith {};
-
 	{
 		// distance within 10 meters
 		if (player distance _x > milsim_client_medState3D_drawRange) then {continue};
 		// check unit not null, not conscious, and not in a vehicle
 		if (
-				isNull _x ||
 			!(_x getVariable ["ACE_isUnconscious", false]) ||
 			!isNull (objectParent _x)
 		) then {continue};
 
 		// color based on triage level
-			private _color = milsim_client_medState3D_colors select ((_x getVariable ["ace_medical_triageLevel", -1]) -1);
+		private _color = milsim_client_medState3D_colors select (
+			(_x getVariable ["ace_medical_triageLevel", -1]) -1
+		);
 		// draw position, slightly above the prone unit
 		private _drawPos = (visiblePosition _x) vectorAdd [0, 0, 0.5];
 		// draw icon
@@ -61,19 +75,19 @@ milsim_client_medState3D_pfh = [
 			// further params optional, omitted
 		];
 	} forEach milsim_client_medState3D_drawTargets;
-	},
+}, 0, []] call CBA_fnc_addPerFrameHandler;
-	0,
-	[]
-] call CBA_fnc_addPerFrameHandler;
 
-[
+// subroutine to gather nearest 50 units every 5 seconds and store in milsim_client_medState3D_drawTargets
-	"Man",
+// cleanup
-	"InitPost",
+[milsim_client_medState3D_drawTargetsPfh] call CBA_fnc_removePerFrameHandler;
-	{
+// add pfh
-		params ["_unit"];
+milsim_client_medState3D_drawTargetsPfh = [{
-		milsim_client_medState3D_drawTargets pushBack _unit;
+	milsim_client_medState3D_drawTargets = (
-	},
+		(allUnits + allDeadMen) select {
-	true,
+			_x isKindOf "CAManBase" && 
-	[],
+			player distance _x < 50 &&
-	true
+			!isNull _x &&
-] call CBA_fnc_addClassEventHandler;
+			player isNotEqualTo _x
+		}
+	);
+}, 5, false] call CBA_fnc_addPerFrameHandler;

functions/settings/fn_addCBASettings.sqf

@@ -109,13 +109,22 @@
 //---------------------
 
 [
-	"milsim_client_medState3D_enabled",
+	"milsim_client_medState3D_enabled", // variable
-	"CHECKBOX",
+	"CHECKBOX", // type
-	["Enable 3D Triage Card State", "Draws a colored dot over units within 10m indicating current ACE Triage State"],
+	["Enable 3D Triage Card State", "Draws a colored dot over units within 10m indicating current ACE Triage State"], // title
-	"Medical",
+	["17th Battalion", "Medical"], // category
-	true
+	true // default value
 ] call CBA_fnc_addSetting;
 
+[
+	"milsim_client_medState3D_drawRange", // variable
+	"LIST", // type
+	["Range To Draw Icons", "Determines range at which dots are visible"], // title
+	["17th Battalion", "Medical"], // category
+	[[2, 4, 6, 8, 10], ["2", "4", "6", "8", "10"], 4] // option values, option labels, default index
+] call CBA_fnc_addSetting;
+
+
 diag_log text "[MILSIM] (settings) Custom CBA settings initialized";
 
 nil;