Update CHANGELOG.md

Update README.md
document new folder structure
2024-02-01 23:46:32 -06:00 · 2024-02-01 23:27:15 -06:00 · 2024-02-01 23:22:09 -06:00 · 2024-02-01 23:19:35 -06:00 · 2024-02-01 20:52:10 -08:00 · 2024-02-01 15:20:25 -08:00
29 changed files with 1062 additions and 499 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,8 +4,24 @@ 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).

-## [3.1.3] - 2024-01-10
+## [3.2] - 2024-02-01

+### Added
+
+- Custom logging function to allow for external scripts to parse framework messages
+- Transport request system for respawned players
+- CBA settings for transport request enable/disable and timeout durations
+- Added zeus mortar resupply boxes
+- Added battalion layout definition file for use in FBCB2 system
+
+### Changed
+
+- Update fixed wing asset class type
+- Update contents of zeus resupply boxes
+- Update player inventory check functions
+- Update FBCB2 callsign and radio frequency pages
+
+## [3.1.3] - 2024-01-10

 ### Changed
 - Merge triage-status-draw3d to fix draw overlay for medics
--- a/README.md
+++ b/README.md
@@ -10,6 +10,7 @@ Once copied, the final structure should appear similar to the following:
 ├── images/
 ├── scripts/
 ├── sounds/
+├── textures/
 ├── description.ext
 ├── mission.jpg
 ├── mission.sqm
@@ -52,3 +53,7 @@ This directory is for organizational purposes for any custom scripts you wish to

 This directory is for organizational purposes for any custom scripts you wish to use in your mission.
 > **Note:** Using custom sounds require adding the proper CfgSounds codeblock into mission_settings.hpp
+
+## textures/
+
+This directory is for organizational purposes for textures files used by mission scripts
--- a/description.ext
+++ b/description.ext
@@ -1,4 +1,4 @@
-//-------------------------------------------DESCRIPTION.EXT-----------------------------------------------------------------
+//-------------------------------------------DESCRIPTION.EXT-----------------------------------------------------------------
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////


@@ -17,6 +17,8 @@
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

 #include "mission_settings.hpp"
+#include "functions\definitions\DisallowedEquipment.hpp"
+#include "functions\definitions\BattalionInfo.hpp"

 //-------------------------------------------MISSION INFO--------------------------------------------------------------------
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
--- a/functions/CfgFunctions.hpp
+++ b/functions/CfgFunctions.hpp
@@ -15,15 +15,22 @@ class milsim
 	};

 	class fbcb2 {
-		class addFBCB2DiaryEntries { postInit = 1; };
 		class initFBCB2 { postInit = 1; };
-		class processFBCB2Callsigns {};
 		class processFBCB2FixedWingAssets {};
 		class processFBCB2RotaryAssets {};
 		class processFBCB2RadioFrequencies {};
 		class processFBCB2SmokeColors {};
 		class processFBCB2Environment {};
-		class messageFBCB2AssetStatus {};
+		class hintFBCB2AssetStatus {};
+	};
+	class fbcb2_util {
+		file = "functions\fbcb2\util";
+		class createOrUpdateDiaryRecord {};
+	};
+	class fbcb2_radioFrequencies {
+		file = "functions\fbcb2\radioFrequencies";
+		class formatRadioElementForDiary {};
+		class generateElementFrequencyRecordText {};
 	};

 	class client {
@@ -72,9 +79,12 @@ class milsim

 	class util
 	{
-		class getPlayerLogString {};
+		class logMissionInfo { postInit = 1; };
 		class addPlayerInfoToArray {};
 		class log {};
+		class padString {};
+		class recurseSubclasses {};
+		class getBattalionCfg {};
 	};
 };

--- a/functions/client/fn_bindEventHandlers.sqf
+++ b/functions/client/fn_bindEventHandlers.sqf
@@ -5,10 +5,11 @@ player addEventHandler["Respawn",
 		params ["_unit", "_corpse"];
 		private _killer = _corpse getVariable ["ace_medical_causeOfDeath", "#scripted"];
 		if (_killer == "respawn_button") then {
-			format[
-				"[MILSIM] (client) RESPAWNED WHILE UNCONSCIOUS %1",
-				[_unit] call milsim_fnc_getPlayerLogString
-			] remoteExec["diag_log", 0];
+			[
+				"client",
+				"RESPAWNED WHILE UNCONSCIOUS",
+				[_unit] call milsim_fnc_addPlayerInfoToArray
+			] remoteExec ["milsim_fnc_log", 2];
 		//	format["%1 was unconscious then clicked the respawn button", name _unit] remoteExec["systemChat", 0];
 		};
 	}
@@ -42,13 +43,11 @@ addMissionEventHandler ["HandleChatMessage",


 ["ace_arsenal_displayClosed", {
-	private _lines = [player] call milsim_fnc_logPlayerInventory;
-	["milsim_logText", [_lines]] call CBA_fnc_globalEvent;
+	[player] remoteExec ["milsim_fnc_logPlayerInventory", 2];
 }] call CBA_fnc_addEventHandler;

 [missionNamespace, "arsenalClosed", {
-	private _lines = [player] call milsim_fnc_logPlayerInventory;
-	["milsim_logText", [_lines]] call CBA_fnc_globalEvent;
+	[player] remoteExec ["milsim_fnc_logPlayerInventory", 2];
 }] call BIS_fnc_addScriptedEventHandler;

 diag_log text "[MILSIM] (client) event handlers bound";
--- a/functions/definitions/BattalionInfo.hpp
+++ b/functions/definitions/BattalionInfo.hpp
@@ -0,0 +1,253 @@
+// BattalionInfo.hpp
+// Defines the structure of the Battalion, allowing properties to be easily changed and updated
+// This file is included in description.ext
+
+
+// Define the callsigns for the Battalion
+#define COMMAND_CALLSIGN SPARTAN
+#define RRC_CALLSIGN TIGER
+#define MEDIC_CALLSIGN LIFELINE
+#define ALPHA_CALLSIGN BLACKJACK
+#define ECHO_CALLSIGN ZOOMER
+#define WPN_CALLSIGN BLACKFOOT
+
+// Define the frequencies for the Battalion
+#define FREQ_BATTALION 45
+#define FREQ_BATTALION_MEDICAL_INTERCOM 91.1
+#define FREQ_ALL_MEDICAL_SR 121.5
+
+#define FREQ_ALPHA_COMPANY 40
+
+#define FREQ_PLATOON1_SR 100
+#define FREQ_PLATOON1_LR 41
+#define FREQ_PLATOON1_RTO 101
+
+#define FREQ_PLATOON2_SR 200
+#define FREQ_PLATOON2_LR 42
+#define FREQ_PLATOON2_RTO 201
+
+#define FREQ_ECHO_FLIGHT_INTERCOM 30
+#define FREQ_ECHO_FLIGHT_CAS 35
+#define FREQ_ECHO_FLIGHT_LOGISTICS 35.1
+
+#define FREQ_ECHO_GROUND 80
+#define FREQ_ECHO_GROUND_LOGISTICS 81
+#define FREQ_ECHO_ARTY 82
+#define FREQ_ECHO_ARTY_INTERCOM 155
+
+#define FREQ_CONVOY 50
+
+// Define the text colors to appear in diary entries
+#define LVL1_TEXT_COLOR "#7c887e"
+#define LVL2_TEXT_COLOR "#bab79f"
+#define LVL3_TEXT_COLOR "#91967f"
+#define LVL4_TEXT_COLOR "#d3d2cd"
+
+
+// All elements and subclasses should have the following properties:
+// callsign: the callsign of the element
+// textColor: the color of the text for the element
+// frequencies: an array of frequencies for the element in the format:
+// 		{roleWithinElement, {primarySR, additionalSR}, {primaryLR, additionalLR}}
+
+// Battalion-level elements under Command should have the following additional properties:
+// shortDescription: a short description of the element's place in the Battalion
+
+
+// System macros
+#define CALLSIGN_ELEMENT(callsign,element) callsign##element
+
+
+
+class BattalionInfo {
+	class Command {
+		callsign = COMMAND_CALLSIGN;
+		shortDescription = "Battalion Command";
+		textColor = LVL1_TEXT_COLOR;
+		// frequencies are in format:
+		// {roleWithinElement, {primarySR, additionalSR}, {primaryLR, additionalLR}}
+		frequencies[] = {
+			{"Contact", {}, {FREQ_BATTALION}},
+			{"Actual", {}, {FREQ_BATTALION}},
+			{"Romeo", {}, {FREQ_BATTALION, FREQ_ECHO_FLIGHT_CAS}}
+		};
+
+
+		class RRC { // WIP
+			callsign = RRC_CALLSIGN;
+			shortDescription = "RRC";
+			textColor = LVL2_TEXT_COLOR;
+			frequencies[] = {
+				{"Contact", {}, {FREQ_BATTALION}},
+				{"Actual", {}, {FREQ_BATTALION, FREQ_ECHO_FLIGHT_CAS}}
+			};
+		};
+
+		class BattalionMedical { // WIP
+			callsign = MEDIC_CALLSIGN;
+			shortDescription = "Battalion Medical";
+			textColor = LVL2_TEXT_COLOR;
+			frequencies[] = {
+				{"Contact", {FREQ_ALL_MEDICAL_SR}, {FREQ_BATTALION}},
+				{"Actual", {FREQ_BATTALION_MEDICAL_INTERCOM, FREQ_ALL_MEDICAL_SR}, {FREQ_BATTALION, FREQ_ECHO_FLIGHT_LOGISTICS}},
+				{"General", {FREQ_BATTALION_MEDICAL_INTERCOM, FREQ_ALL_MEDICAL_SR}, {}}
+			};
+		};
+
+		class WeaponsSquad { // WIP
+			callsign = WPN_CALLSIGN;
+			shortDescription = "Special Weapons Squad";
+			textColor = LVL2_TEXT_COLOR;
+			frequencies[] = {
+				{"Contact", {}, {FREQ_BATTALION}}
+			};
+		};
+
+			
+		class AlphaCompany {
+			callsign = ALPHA_CALLSIGN;
+			shortDescription = "Alpha Company";
+			textColor = LVL2_TEXT_COLOR;
+			frequencies[] = {
+				{"Contact", {}, {FREQ_ALPHA_COMPANY, FREQ_BATTALION}}
+			};
+
+			class Platoon1 {
+				callsign = CALLSIGN_ELEMENT(ALPHA_CALLSIGN, 1-6);
+				textColor = LVL3_TEXT_COLOR;
+				frequencies[] = {
+					{"Actual", {FREQ_PLATOON1_SR, FREQ_PLATOON1_RTO}, {FREQ_PLATOON1_LR, FREQ_ALPHA_COMPANY}},
+					{"Romeo", {}, {FREQ_BATTALION, FREQ_ECHO_FLIGHT_CAS, FREQ_ECHO_FLIGHT_LOGISTICS}}
+				};
+				class Squad1 {
+					callsign = CALLSIGN_ELEMENT(ALPHA_CALLSIGN, 1-1);
+					textColor = LVL4_TEXT_COLOR;
+					frequencies[] = {
+						{"Actual", {110, FREQ_PLATOON1_SR}, {FREQ_PLATOON1_LR}},
+						{"Alpha Team", {111, 110}, {}},
+						{"Bravo Team", {112, 110}, {}},
+						{"Medic", {110, FREQ_ALL_MEDICAL_SR}, {}}
+					};
+				};
+				class Squad2 {
+					callsign = CALLSIGN_ELEMENT(ALPHA_CALLSIGN, 1-2);
+					textColor = LVL4_TEXT_COLOR;
+					frequencies[] = {
+						{"Actual", {120, FREQ_PLATOON1_SR}, {FREQ_PLATOON1_LR}},
+						{"Alpha Team", {121, 120}, {}},
+						{"Bravo Team", {122, 120}, {}},
+						{"Medic", {120, FREQ_ALL_MEDICAL_SR}, {}}
+					};
+				};
+				class Squad3 {
+					callsign = CALLSIGN_ELEMENT(ALPHA_CALLSIGN, 1-3);
+					textColor = LVL4_TEXT_COLOR;
+					frequencies[] = {
+						{"Actual", {130, FREQ_PLATOON1_SR}, {FREQ_PLATOON1_LR}},
+						{"Alpha Team", {131, 130}, {}},
+						{"Bravo Team", {132, 130}, {}},
+						{"Medic", {130, FREQ_ALL_MEDICAL_SR}, {}}
+					};
+				};
+			};
+
+			class Platoon2 {
+				callsign = CALLSIGN_ELEMENT(ALPHA_CALLSIGN, 2-6);
+				textColor = LVL3_TEXT_COLOR;
+				frequencies[] = {
+					{"Actual", {FREQ_PLATOON2_SR, FREQ_PLATOON2_RTO}, {FREQ_PLATOON2_LR, FREQ_ALPHA_COMPANY}}
+				};
+				class Squad1 {
+					callsign = CALLSIGN_ELEMENT(ALPHA_CALLSIGN, 2-1);
+					textColor = LVL4_TEXT_COLOR;
+					frequencies[] = {
+						{"Actual", {210, FREQ_PLATOON2_SR}, {FREQ_PLATOON2_LR}},
+						{"Alpha Team", {211, 210}, {}},
+						{"Bravo Team", {212, 210}, {}},
+						{"Medic", {210, FREQ_ALL_MEDICAL_SR}, {}}
+					};
+				};
+				class Squad2 {
+					callsign = CALLSIGN_ELEMENT(ALPHA_CALLSIGN, 2-2);
+					textColor = LVL4_TEXT_COLOR;
+					frequencies[] = {
+						{"Actual", {220, FREQ_PLATOON2_SR}, {FREQ_PLATOON2_LR}},
+						{"Alpha Team", {221, 220}, {}},
+						{"Bravo Team", {222, 220}, {}},
+						{"Medic", {220, FREQ_ALL_MEDICAL_SR}, {}}
+					};
+				};
+				class Squad3 {
+					callsign = CALLSIGN_ELEMENT(ALPHA_CALLSIGN, 2-3);
+					textColor = LVL4_TEXT_COLOR;
+					frequencies[] = {
+						{"Actual", {230, FREQ_PLATOON2_SR}, {FREQ_PLATOON2_LR}},
+						{"Alpha Team", {231, 230}, {}},
+						{"Bravo Team", {232, 230}, {}},
+						{"Medic", {230, FREQ_ALL_MEDICAL_SR}, {}}
+					};
+				};
+			};
+		};
+
+		class EchoCompany {
+			callsign = ECHO_CALLSIGN;
+			shortDescription = "Echo Company";
+			textColor = LVL2_TEXT_COLOR;
+			frequencies[] = {
+				{"Contact", {}, {FREQ_BATTALION}},
+				{"Actual", {}, {FREQ_BATTALION}}
+			};
+
+			class Flight {
+				callsign = CALLSIGN_ELEMENT(ECHO_CALLSIGN, FLIGHT);
+				textColor = LVL3_TEXT_COLOR;
+				frequencies[] = {
+					{"Contact", {}, {FREQ_BATTALION}},
+					{"Actual", {}, {FREQ_ECHO_FLIGHT_INTERCOM, FREQ_BATTALION}},
+					{"CAS Support", {}, {FREQ_ECHO_FLIGHT_INTERCOM, FREQ_ECHO_FLIGHT_CAS}},
+					{"Logistics", {}, {FREQ_ECHO_FLIGHT_INTERCOM, FREQ_ECHO_FLIGHT_LOGISTICS}}
+				};
+			};
+
+			class Ground {
+				callsign = CALLSIGN_ELEMENT(ECHO_CALLSIGN, GROUND);
+				textColor = LVL3_TEXT_COLOR;
+				frequencies[] = {
+					{"Contact", {}, {FREQ_BATTALION}},
+					{"Actual", {}, {FREQ_ECHO_GROUND, FREQ_BATTALION}}
+				};
+
+				class Logistics {
+					callsign = CALLSIGN_ELEMENT(ECHO_CALLSIGN, LOGISTICS);
+					textColor = LVL4_TEXT_COLOR;
+					frequencies[] = {
+						{"Contact", {}, {FREQ_ECHO_GROUND}},
+						{"Actual", {}, {FREQ_ECHO_GROUND_LOGISTICS, FREQ_ECHO_GROUND}},
+						{"General", {}, {FREQ_ECHO_GROUND_LOGISTICS}},
+						{"Convoy", {}, {FREQ_CONVOY}}
+					};
+				};
+
+				class Attack {
+					callsign = CALLSIGN_ELEMENT(ECHO_CALLSIGN, ATTACK);
+					textColor = LVL4_TEXT_COLOR;
+					frequencies[] = {
+						{"Contact", {}, {FREQ_ECHO_GROUND, FREQ_ECHO_FLIGHT_CAS}},
+						{"Actual", {}, {FREQ_ECHO_GROUND}},
+						{"General", {}, {FREQ_ECHO_GROUND}},
+						{"Convoy", {}, {FREQ_CONVOY}}
+					};
+				};
+
+				class Artillery {
+					callsign = CALLSIGN_ELEMENT(ECHO_CALLSIGN, ARTILLERY);
+					textColor = LVL4_TEXT_COLOR;
+					frequencies[] = {
+						{"General", {FREQ_ECHO_ARTY_INTERCOM}, {FREQ_ECHO_GROUND, FREQ_ECHO_ARTY}}
+					};
+				};
+			};
+		};
+	};
+};
--- a/functions/definitions/DisallowedEquipment.hpp
+++ b/functions/definitions/DisallowedEquipment.hpp
@@ -0,0 +1,223 @@
+// To access these from SQF:
+// to get an array of STRING with each subclass name:
+// (missionConfigFile >> "DisallowedEquipment") call BIS_fnc_getCfgSubClasses
+// To access a specific class' properties:
+// (missionConfigFile >> "DisallowedEquipment" >> "blacklisted" >> "label") call BIS_fnc_getCfgData;
+// (missionConfigFile >> "DisallowedEquipment" >> "blacklisted" >> "description") call BIS_fnc_getCfgData;
+// (missionConfigFile >> "DisallowedEquipment" >> "blacklisted" >> "items") call BIS_fnc_getCfgDataArray;
+
+class DisallowedEquipment {
+	class blacklisted {
+		label = "BLACKLISTED WEAPON OR ITEM";
+		description = "Items that NO member is allowed to use.";
+		items[] = {
+			"17BN_ANPVS14", // NVG AN/PVS-14
+			"ej_PVS15D", // NVG AN/PVS-15
+			"ej_VPS15", // NVG AN/PVS-15
+			"LMG_Mk200_black_F", //Mk200 Series
+			"LMG_Mk200_F", //Mk200 Series
+			"rhs_weap_g36c", // G36 Series
+			"rhs_weap_g36kv_ag36", // G36 Series
+			"rhs_weap_g36kv", // G36 Series
+			"rhs_weap_m14_d", // M14 Series
+			"rhs_weap_m14_fiberglass", // M14 Series
+			"rhs_weap_m14_rail_d", // M14 Series
+			"rhs_weap_m14_rail_fiberglass", // M14 Series
+			"rhs_weap_m14_rail_wd", // M14 Series
+			"rhs_weap_m14_rail", // M14 Series
+			"rhs_weap_m14_ris_d", // M14 Series
+			"rhs_weap_m14_ris_fiberglass", // M14 Series
+			"rhs_weap_m14_ris_wd", // M14 Series
+			"rhs_weap_m14_ris", // M14 Series
+			"rhs_weap_m14_socom_rail", // M14 Series
+			"rhs_weap_m14_socom", // M14 Series
+			"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
+			"rhsusf_ANPVS_15", // NVG AN/PVS-15
+			"SMA_ACRREM", //Remington ACR 556+6.5
+			"SMA_ACRREMAFG", //Remington ACR 556+6.5
+			"SMA_ACRREMAFGblk", //Remington ACR 556+6.5
+			"SMA_ACRREMAFGCQB",  //Remington ACR 556+6.5
+			"SMA_ACRREMAFGCQBblk", //Remington ACR 556+6.5
+			"SMA_ACRREMblk", //Remington ACR 556+6.5
+			"SMA_ACRREMCQBGL", //Remington ACR 556+6.5
+			"SMA_ACRREMGL_B", //Remington ACR 556+6.5
+			"SMA_ACRREMGL", //Remington ACR 556+6.5
+			"SMA_ACRREMMOE", //Remington ACR 556+6.5
+			"SMA_ACRREMMOEblk", //Remington ACR 556+6.5
+			"SMA_ACRREMMOECQB", //Remington ACR 556+6.5
+			"SMA_ACRREMMOECQBblk", //Remington ACR 556+6.5
+			"srifle_DMR_06_camo_F", // M14 Series
+			"srifle_DMR_06_hunter_F", // M14 Series
+			"srifle_DMR_06_olive_F", // M14 Series
+			"srifle_EBR_F", // Mk14 Series
+			"Tier1_SIG_CMX_115_Virtus_300BLK_Black", // MCX 300 Blackout
+			"Tier1_SIG_CMX_115_Virtus_300BLK_Desert", // MCX 300 Blackout
+			"Tier1_SIG_CMX_115_Virtus_300BLK_FDE", // MCX 300 Blackout
+			"Tier1_SIG_CMX_115_Virtus_300BLK", // MCX 300 Blackout
+			"UK3CB_AG36_MLIC", // G36 Series
+			"UK3CB_AG36_TAC_K", // G36 Series
+			"UK3CB_AG36A1", // G36 Series
+			"UK3CB_AG36E1", // G36 Series
+			"UK3CB_AG36V", // G36 Series
+			"UK3CB_FNFAL_FOREGRIP", // FN_FAL Series
+			"UK3CB_FNFAL_FULL_RAILS", // FN_FAL Series
+			"UK3CB_FNFAL_FULL", // FN_FAL Series
+			"UK3CB_FNFAL_OSW_GL", // FN_FAL Series
+			"UK3CB_FNFAL_OSW", // FN_FAL Series
+			"UK3CB_FNFAL_PARA_RAILS", // FN_FAL Series
+			"UK3CB_FNFAL_PARA", // FN_FAL Series
+			"UK3CB_FNFAL_STG58", // FN_FAL Series
+			"UK3CB_G36_KSK_K", // G36 Series
+			"UK3CB_G36_KSK", // G36 Series
+			"UK3CB_G36_LSW", // G36 Series
+			"UK3CB_G36_MLIC_C", // G36 Series
+			"UK3CB_G36_MLIC_K", // G36 Series
+			"UK3CB_G36_MLIC", // G36 Series
+			"UK3CB_G36_TAC_C", // G36 Series
+			"UK3CB_G36_TAC", // G36 Series
+			"UK3CB_G36A1_C", // G36 Series
+			"UK3CB_G36A1_K", // G36 Series
+			"UK3CB_G36A1", // G36 Series
+			"UK3CB_G36E1_C", // G36 Series
+			"UK3CB_G36E1_K", // G36 Series
+			"UK3CB_G36E1", // G36 Series
+			"UK3CB_G36V_C", // G36 Series
+			"UK3CB_G36V_K", // G36 Series
+			"UK3CB_G36V", // G36 Series
+			"UK3CB_M14_Railed", // M14 Series
+			"UK3CB_M14", // M14 Series
+			"UK3CB_M14DMR_BLK", // M14 Series
+			"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
+		};
+	};
+
+	class restrictedItems {
+		label = "RESTRICTED ITEM";
+		description = "Items that are allowed for specific USE Case (RRC / Marksman / etc.)";
+		items[] = {
+			"A3_GPNVG18_BLK_TI", // Thermal Quad
+			"A3_GPNVG18_REC_BLK_TI", // Thermal Quad
+			"A3_GPNVG18_REC_TI", // Thermal Quad
+			"A3_GPNVG18_TI", // Thermal Quad
+			"A3_GPNVG18b_BLK_TI", // Thermal Quad
+			"A3_GPNVG18b_REC_BLK_TI", // Thermal Quad
+			"A3_GPNVG18b_REC_TI", // Thermal Quad
+			"A3_GPNVG18b_TI", // Thermal Quad
+			"ACE_optic_LRPS_2D", //Nightforce Series Optic
+			"ACE_optic_LRPS_PIP", //Nightforce Series Optic
+			"NVGogglesB_blk_F", // ENVG
+			"NVGogglesB_grn_F", // ENVG
+			"NVGogglesB_gry_F", // ENVG
+			"optic_lrps_ghex_F", //Nightforce Series Optic
+			"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
+			"Tier1_ANPVS10_Tan", // Thermal Optic
+			"Tier1_ATACR18_ADM_Black_Vanilla", //Nightforce Series Optic
+			"Tier1_ATACR18_ADM_Black", //Nightforce Series Optic
+			"Tier1_ATACR18_ADM_Desert_Vanilla", //Nightforce Series Optic
+			"Tier1_ATACR18_ADM_Desert", //Nightforce Series Optic
+			"Tier1_ATACR18_ADM_T1_Black_Vanilla", //Nightforce Series Optic
+			"Tier1_ATACR18_ADM_T1_Black", //Nightforce Series Optic
+			"Tier1_ATACR18_ADM_T1_Desert_Vanilla", //Nightforce Series Optic
+			"Tier1_ATACR18_ADM_T1_Desert", //Nightforce Series Optic
+			"Tier1_ATACR18_Geissele_Black_Vanilla", //Nightforce Series Optic
+			"Tier1_ATACR18_Geissele_Black", //Nightforce Series Optic
+			"Tier1_ATACR18_Geissele_Desert_Vanilla", //Nightforce Series Optic
+			"Tier1_ATACR18_Geissele_Desert", //Nightforce Series Optic
+			"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
+		};
+	};
+
+	class tabbedItems { // Items that are allowed for individuals with Ranger Tab
+		label = "TABBED WEAPON";
+		description = "Items that are allowed for individuals with Ranger Tab.";
+		items[] = {
+			"arifle_MX_black_F", // MX Series
+			"arifle_MX_F", // MX Series
+			"arifle_MX_GL_black_F", // MX 3GL Series
+			"arifle_MX_GL_F", // MX 3GL Series
+			"arifle_MX_GL_khk_F", // MX 3GL Series
+			"arifle_MX_khk_F", // MX Series
+			"arifle_MX_SW_black_F", // MX LSW Series
+			"arifle_MX_SW_F", // MX LSW Series
+			"arifle_MX_SW_khk_F", // MX LSW Series
+			"arifle_MXC_black_F", // MXC Series
+			"arifle_MXC_F", // MXC Series
+			"arifle_MXC_khk_F", // MXC Series
+			"arifle_MXM_black_F", // MXM Series
+			"arifle_MXM_F", // MXM Series
+			"arifle_MXM_khk_F", // MXM Series
+			"arifle_SPAR_03_blk_F", // HK417 Series
+			"arifle_SPAR_03_khk_F", // HK417 Series
+			"arifle_SPAR_03_snd_F", // HK417 Series
+			"rhs_weap_SCARH_CQC", // Scar H Series
+			"rhs_weap_SCARH_FDE_CQC", // Scar H Series
+			"rhs_weap_SCARH_FDE_LB", // Scar H Series
+			"rhs_weap_SCARH_FDE_STD", // Scar H Series
+			"rhs_weap_SCARH_LB", // Scar H Series
+			"rhs_weap_SCARH_STD", // Scar H Series
+			"rhs_weap_SCARH_USA_CQC", // Scar H Series
+			"rhs_weap_SCARH_USA_LB", // Scar H Series
+			"rhs_weap_SCARH_USA_STD", // Scar H Series
+			"SMA_HK417_16in", // HK417 Series
+			"SMA_HK417", // HK417 Series
+			"SMA_HK417vfg", // HK417 Series
+			"SMA_Mk17_16_black", // Scar H Series
+			"SMA_Mk17_16_green", // Scar H Series
+			"SMA_Mk17_16", // Scar H Series
+			"SMA_Mk17_black", // Scar H Series
+			"SMA_Mk17_EGML_black", // Scar H Series
+			"SMA_Mk17_EGML_green", // Scar H Series
+			"SMA_Mk17_EGML", // Scar H Series
+			"SMA_Mk17_green", // Scar H Series
+			"SMA_Mk17", // Scar H Series
+			"Tier1_MK48_Mod0_Desert", // Mk48 Series
+			"Tier1_MK48_Mod0_Para_Desert", // Mk48 Series
+			"Tier1_MK48_Mod0_Para", // Mk48 Series
+			"Tier1_MK48_Mod0", // Mk48 Series
+			"Tier1_MK48_Mod1_Desert", // Mk48 Series
+			"Tier1_MK48_Mod1", // Mk48 Series
+			"Tier1_SR25_ec_tan", // SR-25 Series
+			"Tier1_SR25_ec", // SR-25 Series
+			"Tier1_SR25_tan", // SR-25 Series
+			"Tier1_SR25" // SR-25 Series
+		};
+	};
+
+	class memeItems {
+		label = "MEME ITEM";
+		description = "Items that serve no purpose other than to MEME.";
+		items[] = {
+			"ACE_Banana",
+			"UK3CB_Cocaine_Brick"
+		};
+	};
+};
--- a/functions/fbcb2/fn_addFBCB2DiaryEntries.sqf
+++ b/functions/fbcb2/fn_addFBCB2DiaryEntries.sqf
@@ -1,10 +0,0 @@
-if ( !hasInterface ) exitWith {};
-
-player createDiarySubject["Status","FBCB2 - Status"];
-player createDiarySubject["Intel","FBCB2 - Combat Msgs"];
-player createDiarySubject["Messages","FBCB2 - Messages"];
-
-
-diag_log text "[MILSIM] (fbcb2) diary entries added";
-
-nil;
--- a/functions/fbcb2/fn_messageFBCB2AssetStatus.sqf
+++ b/functions/fbcb2/fn_messageFBCB2AssetStatus.sqf
--- a/functions/fbcb2/fn_initFBCB2.sqf
+++ b/functions/fbcb2/fn_initFBCB2.sqf
@@ -1,8 +1,32 @@
+
 if ( !hasInterface ) exitWith {};

 waitUntil { !isNil "milsim_complete" };

-[] call milsim_fnc_processFBCB2Callsigns;
+milsim_fbcb2_recordTitleColor = "#ff6666";
+milsim_fbcb2_recordTitleFont = "PuristaMedium";
+milsim_fbcb2_recordTitleSize = 20;
+
+milsim_fbcb2_recordTextHeaderSize = 16;
+milsim_fbcb2_recordTextBodySize = 14;
+
+milsim_fbcb2_subjectStatusID = "FBCB2_Status";
+milsim_fbcb2_subjectIntelID = "FBCB2_Intel";
+milsim_fbcb2_subjectMessagesID = "FBCB2_Messages";
+milsim_fbcb2_subjectFrequenciesID = "FBCB2_Frequencies";
+
+player createDiarySubject[milsim_fbcb2_subjectStatusID, "FBCB2 - Status"];
+player createDiarySubject[milsim_fbcb2_subjectMessagesID, "FBCB2 - Messages"];
+player createDiarySubject[milsim_fbcb2_subjectIntelID, "FBCB2 - Intel"];
+player createDiarySubject[milsim_fbcb2_subjectFrequenciesID, "FBCB2 - Frequencies"];
+
+// store records in format:
+// [subject, [
+//		[title, diaryRecord]
+// ]]
+milsim_fbcb2_diaryRecords = createHashMap;
+
+// populate diary
 [] call milsim_fnc_processFBCB2FixedWingAssets;
 [] call milsim_fnc_processFBCB2RotaryAssets;
 [] call milsim_fnc_processFBCB2RadioFrequencies;
--- a/functions/fbcb2/fn_processFBCB2Callsigns.sqf
+++ b/functions/fbcb2/fn_processFBCB2Callsigns.sqf
@@ -1,22 +0,0 @@
-
-_text = "
-<font size='24' color='#ff0000'>=======------   Mission Data Set   ------=======</font>
-<br/><br/>
-<font color='#00FF00' size='16'>SPARTAN</font><br/>
-Command
-<br/><br/>
-<font color='#00FF00' size='16'>BLACKJACK</font><br/>
-Alpha Platoon
-<br/><br/>
-<font color='#00FF00' size='16'>ZOOMER</font><br/>
-Echo
-<br/><br/>
-<font color='#00FF00' size='16'>TIGER</font><br/>
-RRC
-<br/><br/>
-<font color='#00FF00' size='16'>BLACKFOOT</font><br/>
-Weapons Squad
-<br/><br/>
-";
-
-player createDiaryRecord ["Status", ["MDS - COMMAND - CALLSIGNS", _text]];
--- a/functions/fbcb2/fn_processFBCB2Environment.sqf
+++ b/functions/fbcb2/fn_processFBCB2Environment.sqf
@@ -1,16 +1,45 @@
-_sunTimes = date call BIS_fnc_sunriseSunsetTime; 
+private _recordTitle = "MDS - INTEL - ENVIRONMENT";

-_text = "
-<font size='24' color='#ff0000'>=======------   Mission Data Set   ------=======</font>
-<br/><br/>
-<font size='16' color='#4A86E8'>Local Sunrise</font>
-<br/>
-<font size='20' color='#FF0000'>" + ([_sunTimes select 0, "HH:MM"] call BIS_fnc_timeToString) + "</font>
-<br/><br/>
-<font size='16' color='#6AA84F'>Local Sunset</font>
-<br/>
-<font size='20' color='#FF0000'>" + ([_sunTimes select 1, "HH:MM"] call BIS_fnc_timeToString) + "</font>
-<br/><br/>
-";
+private _text = [
+	format[
+		"<font size='%1' color='%2' face='%3'>%4</font><br/><br/>",
+		milsim_fbcb2_recordTitleSize,
+		milsim_fbcb2_recordTitleColor,
+		milsim_fbcb2_recordTitleFont,
+		_recordTitle
+	]
+];

-player createDiaryRecord ["Status", ["MDS - INTEL - ENVIRONMENT", _text]];
+private _sunriseColor = "#4A86E8";
+private _sunsetColor = "#6AA84F";
+private _whiteColor = "#FFFFFF";
+
+private _sunTimes = date call BIS_fnc_sunriseSunsetTime;
+
+_text pushBack format[
+	"<font size='%1' color='%2'>Local Sunrise</font><br/>
+	<font size='%3' color='%4'>%5</font><br/><br/>",
+	milsim_fbcb2_recordTextHeaderSize,
+	_sunriseColor,
+	milsim_fbcb2_recordTextBodySize,
+	_whiteColor,
+	([_sunTimes select 0, "HH:MM"] call BIS_fnc_timeToString)
+];
+
+_text pushBack format[
+	"<font size='%1' color='%2'>Local Sunset</font><br/>
+	<font size='%3' color='%4'>%5</font><br/><br/>",
+	milsim_fbcb2_recordTextHeaderSize,
+	_sunsetColor,
+	milsim_fbcb2_recordTextBodySize,
+	_whiteColor,
+	([_sunTimes select 1, "HH:MM"] call BIS_fnc_timeToString)
+];
+
+_text = _text joinString "";
+
+[
+	milsim_fbcb2_subjectIntelID,
+	_recordTitle,
+	_text
+] call milsim_fnc_createOrUpdateDiaryRecord;
--- a/functions/fbcb2/fn_processFBCB2FixedWingAssets.sqf
+++ b/functions/fbcb2/fn_processFBCB2FixedWingAssets.sqf
@@ -1,4 +1,6 @@
- _assetList = missionNamespace getVariable "milsim_var_fixedAssets";
+private _recordTitle = "MDS - ASSETS - FIXED";
+
+private _assetList = missionNamespace getVariable "milsim_var_fixedAssets";

 _text = "<font size='24' color='#ff0000'>=======------   Mission Data Set   ------=======</font>";

@@ -14,6 +16,11 @@ _text = "<font size='24' color='#ff0000'>=======------   Mission Data Set   ----

 } foreach _assetList;

-_text = _text + "<br/><br/><execute expression='[missionNamespace getVariable ""milsim_var_fixedAssets""] call milsim_fnc_messageFBCB2AssetStatus'>Run Report on local node?</execute>";
+_text = _text + "<br/><br/><execute expression='[missionNamespace getVariable ""milsim_var_fixedAssets""] call milsim_fnc_hintFBCB2AssetStatus'>Run Report on local node?</execute>";

-player createDiaryRecord ["Status", ["MDS - ASSETS - FIXED", _text]];
+
+[
+	milsim_fbcb2_subjectStatusID,
+	_recordTitle,
+	_text
+] call milsim_fnc_createOrUpdateDiaryRecord;
--- a/functions/fbcb2/fn_processFBCB2RadioFrequencies.sqf
+++ b/functions/fbcb2/fn_processFBCB2RadioFrequencies.sqf
@@ -1,35 +1,50 @@
+// updated 2024-02-01 by IndigoFox
+// now reads from the battalion config structure to generate the diary entries

-_text = "
-<font size='24' color='#ff0000'>=======------   Mission Data Set   ------=======</font>
-<br/><br/>
-<font size='16' color='#4A86E8'>EXODUS</font>
-<br/>
-<font color='#FF0000'>6 - 45</font>
-<br/>
-<font color='#FF0000'>RTO - 45 / 35</font>
-<br/><br/>
-<font size='16' color='#6AA84F'>RIPTIDE</font>
-<br/>
-<font color='#FF0000'>Actual - 45 / 100</font>
-<br/>
-<font color='#FF0000'>Romeo - 45 / 35</font>
-<br/>
-<font color='#FF0000'>1 - 110 / 100</font>
-<br/>
-<font color='#FF0000'>2 - 120 / 100</font>
-<br/>
-<font color='#FF0000'>3 - 130 / 110</font>
-<br/>
-<font color='#FF0000'>Blackfoot - 150 / 100</font>
-<br/><br/>
-<font size='16' color='#F1C232'>ECHO</font>
-<br/>
-<font color='#FF0000'>Impaler - 45 / 35</font>
-<br/>
-<font color='#FF0000'>JTAC - 35 / 82</font>
-<br/>
-<font color='#FF0000'>IDF - 82 / 100</font>
-<br/><br/>
-";
+////////////////////////////////////////
+// Get info from missionConfigFile
+////////////////////////////////////////
+private _battalionInfoCfg = call milsim_fnc_getBattalionCfg;
+private _battalionElementCfgs = [_battalionInfoCfg >> "Command"] call BIS_fnc_returnChildren;

-player createDiaryRecord ["Status", ["MDS - INTEL - RADIO FREQS", _text]];
+////////////////////////////////////////
+// Define formatting constants
+////////////////////////////////////////
+private _ELEMENT_NAME_SIZE = 10;
+private _ELEMENT_NAME_FONT = "EtelkaMonospaceProBold";
+private _ELEMENT_FREQ_SIZE = 9;
+private _ELEMENT_FREQ_FONT = "EtelkaMonospacePro";
+private _FREQ_INDENT_CONSTANT = 6;
+private _FREQ_PAD_LENGTH = 17;
+private _FREQ_TEXT_COLOR = "#CCCCCC";
+// Note: Element colors are defined in the battalion config
+
+////////////////////////////////////////
+// ADD DIARY ENTRIES
+////////////////////////////////////////
+
+// First is all the battalion-level elements beneath command
+// To have the records listed in the order they appear in the battalion config, we need to reverse the array
+// Since each entry is added to the top of the list, this will result in the entries being added in the correct order
+reverse _battalionElementCfgs;
+
+{
+	// recursively generate diary text for all child elements of battalion-level elements
+	private _diaryTitleText = [_x, true] call milsim_fnc_generateElementFrequencyRecordText;
+	[
+		milsim_fbcb2_subjectFrequenciesID,
+		_diaryTitleText#0,
+		_diaryTitleText#1
+	] call milsim_fnc_createOrUpdateDiaryRecord;
+} forEach _battalionElementCfgs;
+
+// add the battalion command to the top of the list
+// don't process child elements
+private _diaryTitleText = [_battalionInfoCfg >> "Command", false] call milsim_fnc_generateElementFrequencyRecordText;
+[
+	milsim_fbcb2_subjectFrequenciesID,
+	_diaryTitleText#0,
+	_diaryTitleText#1
+] call milsim_fnc_createOrUpdateDiaryRecord;
+
+true;
--- a/functions/fbcb2/fn_processFBCB2RotaryAssets.sqf
+++ b/functions/fbcb2/fn_processFBCB2RotaryAssets.sqf
@@ -1,4 +1,6 @@
- _assetList = missionNamespace getVariable "milsim_var_rotaryAssets";
+private _recordTitle = "MDS - ASSETS - ROTARY";
+
+_assetList = missionNamespace getVariable "milsim_var_rotaryAssets";

 _text = "<font size='24' color='#ff0000'>=======------   Mission Data Set   ------=======</font>";

@@ -14,6 +16,11 @@ _text = "<font size='24' color='#ff0000'>=======------   Mission Data Set   ----

 } foreach _assetList;

-_text = _text + "<br/><br/><execute expression='[missionNamespace getVariable ""milsim_var_rotaryAssets""] call milsim_fnc_messageFBCB2AssetStatus'>Run Report on local node?</execute>";
+_text = _text + "<br/><br/><execute expression='[missionNamespace getVariable ""milsim_var_rotaryAssets""] call milsim_fnc_hintFBCB2AssetStatus'>Run Report on local node?</execute>";

-player createDiaryRecord ["Status", ["MDS - ASSETS - ROTARY", _text]];
+
+[
+	milsim_fbcb2_subjectStatusID,
+	_recordTitle,
+	_text
+] call milsim_fnc_createOrUpdateDiaryRecord;
--- a/functions/fbcb2/fn_processFBCB2SmokeColors.sqf
+++ b/functions/fbcb2/fn_processFBCB2SmokeColors.sqf
@@ -1,30 +1,41 @@
+private _recordTitle = "MDS - INTEL - SMOKES";

-_text = "
-<font size='24' color='#ff0000'>=======------   Mission Data Set   ------=======</font>
-<br/><br/>
-Smoke is a Guideline Not a Rule
-<br/><br/>
-<font color='#FFFFFF' size='16'>WHITE</font><br/>
-Concealment
-<br/><br/>
-<font color='#008800' size='16'>GREEN</font><br/>
-Friendly Forces
-<br/><br/>
-<font color='#0000FF' size='16'>BLUE</font><br/>
-LZ Markers
-<br/><br/>
-<font color='#FF0000' size='16'>RED</font><br/>
-Enemy Location
-<br/><br/>
-<font color='#FFA500' size='16'>ORANGE</font><br/>
-Resupply Marker
-<br/><br/>
-<font color='#FFFF00' size='16'>YELLOW</font><br/>
-Medical Emergency
-<br/><br/>
-<font color='#800080' size='16'>PURPLE</font><br/>
-Broken Arrow - 100m radius
-<br/><br/>
-";
+private _text = [
+	// Title
+	format[
+		"<font size='%1' color='%2' face='%3'>%4</font>",
+		milsim_fbcb2_recordTitleSize,
+		milsim_fbcb2_recordTitleColor,
+		milsim_fbcb2_recordTitleFont,
+		_recordTitle
+	]
+];

-player createDiaryRecord ["Status", ["MDS - INTEL - SMOKES", _text]];
+private _smokeColors = [
+	["#FFFFFF", "WHITE", "Concealment"],
+	["#008800", "GREEN", "Friendly Forces"],
+	["#0000FF", "BLUE", "LZ Markers"],
+	["#FF0000", "RED", "Enemy Location"],
+	["#FFA500", "ORANGE", "Resupply Marker"],
+	["#FFFF00", "YELLOW", "Medical Emergency"],
+	["#800080", "PURPLE", "Broken Arrow - 100m radius"]
+];
+
+{
+	_x params ["_color", "_name", "_description"];
+	_text pushBack format[
+		"<font size='%1'><font color='%2'>%3</font> - %4</font>",
+		milsim_fbcb2_recordTextHeaderSize,
+		_color,
+		_name,
+		_description
+	];
+} forEach _smokeColors;
+
+_text = _text joinString "<br/><br/>";
+
+[
+	milsim_fbcb2_subjectIntelID,
+	_recordTitle,
+	_text
+] call milsim_fnc_createOrUpdateDiaryRecord;
--- a/functions/fbcb2/radioFrequencies/fn_formatRadioElementForDiary.sqf
+++ b/functions/fbcb2/radioFrequencies/fn_formatRadioElementForDiary.sqf
@@ -0,0 +1,73 @@
+// called from milsim_fnc_processFBCB2RadioFrequencies
+params ["_cfg", ["_indentCount", 1, [5]]];
+
+//////////////////////////////////////////////////////
+// Define leading space/hyphenation for element name
+//////////////////////////////////////////////////////
+private _leadingSpace = [
+	format["<font size='%1' face='%2'>| ", _ELEMENT_NAME_SIZE, _ELEMENT_NAME_FONT]
+];
+for "_i" from 1 to _indentCount do {
+	_leadingSpace pushBack "-";
+};
+_leadingSpace pushBack " | </font>";
+
+/////////////////////////////////////////////////////////
+// Create the header line for the provided config entry
+/////////////////////////////////////////////////////////
+private _lines = [
+	format[
+		"<font color='%1'>%2%3</font>",
+		getText(_cfg >> "textColor"),
+		_leadingSpace joinString "",
+		getText (_cfg >> "callsign")
+	]
+];
+
+////////////////////////////////////////////////////////////
+// Create the frequency lines for the provided config entry
+////////////////////////////////////////////////////////////
+
+// Generate leading space
+private _freqLeadingSpace = [
+	format["<font size='%1' face='%2'>| ", _ELEMENT_NAME_SIZE, _ELEMENT_NAME_FONT]
+];
+for "_i" from 1 to _FREQ_INDENT_CONSTANT do {
+	_freqLeadingSpace pushBack " ";
+};
+_freqLeadingSpace pushBack "</font>";
+_freqLeadingSpace = _freqLeadingSpace joinString "";
+
+// Process config values for frequencies
+{
+	_x params ["_role", "_sr", "_lr"];
+
+
+	private ["_srStr", "_lrStr"];
+	if (count _sr > 0) then {
+		_srStr = format["%1", _sr joinString " / "];
+	} else {
+		_srStr = "----";
+	};
+	if (count _lr > 0) then {
+		_lrStr = format["%1", _lr joinString " / "];
+	} else {
+		_lrStr = "----";
+	};
+
+	// Add formatted line to the array
+	_lines pushBack format[
+		"%1<font size='%2' face='%3' color='%4'>- %5%6%7</font>",
+		_freqLeadingSpace,
+		_ELEMENT_FREQ_SIZE,
+		_ELEMENT_FREQ_FONT,
+		_FREQ_TEXT_COLOR,
+		[_role, "right", " ", _FREQ_PAD_LENGTH] call milsim_fnc_padString,
+		[_srStr, "right", " ", _FREQ_PAD_LENGTH] call milsim_fnc_padString,
+		_lrStr
+	];
+} forEach (getArray (_cfg >> "frequencies"));
+// diag_log text (_lines joinString endl);
+
+// Return the formatted lines in ARRAY format
+_lines;
--- a/functions/fbcb2/radioFrequencies/fn_generateElementFrequencyRecordText.sqf
+++ b/functions/fbcb2/radioFrequencies/fn_generateElementFrequencyRecordText.sqf
@@ -0,0 +1,87 @@
+// called from milsim_fnc_processFBCB2RadioFrequencies ONLY
+// this function is called recursively to process all child elements of a battalion element in missionConfigFile
+params [
+	["_elementCfg", configNull, [configNull]],
+	["_shouldProcessChildCfgs", true]
+];
+
+if (isNull _elementCfg) exitWith {
+	["_elementCfg parameter is NULL"] call BIS_fnc_error;
+};
+
+// change reference variable for clarity
+private _battalionElement = _elementCfg;
+
+// Generate title from callsign and shortDescription
+private _recordTitle = format[
+	"%1 (%2)",
+	getText(_battalionElement >> "callsign"),
+	getText(_battalionElement >> "shortDescription")
+];
+// systemChat _recordTitle;
+
+
+//////////////////////////////////////////////////////////
+// Generate frequency table header line's leading space
+//////////////////////////////////////////////////////////
+private _freqLeadingSpace = [
+	format["<font size='%1' face='%2'>| ", _ELEMENT_NAME_SIZE, _ELEMENT_NAME_FONT]
+];
+for "_i" from 1 to _FREQ_INDENT_CONSTANT do {
+	_freqLeadingSpace pushBack " ";
+};
+_freqLeadingSpace pushBack "</font>";
+_freqLeadingSpace = _freqLeadingSpace joinString "";
+
+//////////////////////////////////////////////////////////
+// Generate header line and frequency table header line
+//////////////////////////////////////////////////////////
+
+private _headers = [
+	format[
+		"<font size='%1' color='%2' face='%3'>%4</font>",
+		milsim_fbcb2_recordTitleSize,
+		milsim_fbcb2_recordTitleColor,
+		milsim_fbcb2_recordTitleFont,
+		_recordTitle
+	],
+	format[
+		"%1<font size='%2' face='%3' color='%4'>- %5%6%7</font>",
+		_freqLeadingSpace,
+		_ELEMENT_FREQ_SIZE,
+		_ELEMENT_FREQ_FONT,
+		_FREQ_TEXT_COLOR,
+		["ROLE", "right", " ", _FREQ_PAD_LENGTH] call milsim_fnc_padString,
+		["SR", "right", " ", _FREQ_PAD_LENGTH] call milsim_fnc_padString,
+		"LR"
+	]
+];
+
+
+//////////////////////////////////////////////////////////
+// Generate the list of element headers and frequencies
+//////////////////////////////////////////////////////////
+private _allText = [];
+
+// get all child elements recursively and format them
+if (_shouldProcessChildCfgs) then {
+	[_battalionElement, {
+		params ["_cfg", "_recurseCounter"];
+		// add config
+		private _lines = [_cfg, _recurseCounter+1] call milsim_fnc_formatRadioElementForDiary;
+		// private _lines = [_cfg, _indentCount] call t;
+		_allText pushBack (_lines joinString "<br/>");
+	}] call milsim_fnc_recurseSubclasses;
+} else {
+	// or if the param was false, just add the battalion element
+	private _lines = [_battalionElement, 1] call milsim_fnc_formatRadioElementForDiary;
+	// private _lines = [_cfg, _indentCount] call t;
+	_allText pushBack (_lines joinString "<br/>");
+};
+
+// add headers, add all other lines and format them as monospace
+_allText = format[
+	"%1<br/><br/><font face='EtelkaMonospaceProBold'>%2</font>", _headers joinString "<br/>", _allText joinString "<br/><br/>"];
+
+// return the title and all text
+[_recordTitle, _allText];
--- a/functions/fbcb2/util/fn_createOrUpdateDiaryRecord.sqf
+++ b/functions/fbcb2/util/fn_createOrUpdateDiaryRecord.sqf
@@ -0,0 +1,18 @@
+params [
+	["_subjectID", milsim_fbcb2_subjectStatusID, [""]],
+	["_recordTitle", "", [""]],
+	["_recordText", "", [""]]
+];
+
+// Check if already created
+private _subjectRecords = milsim_fbcb2_diaryRecords getOrDefault [_subjectID, createHashMap, true];
+private _existingRecord = _subjectRecords getOrDefault [_recordTitle, diaryRecordNull, true];
+
+if (!isNull _existingRecord) then {
+	player setDiaryRecordText [[_subjectID, _existingRecord], [_recordTitle, _recordText]];
+	systemChat format ["Updated diary record: %1", _recordTitle];
+} else {
+	private _new = player createDiaryRecord [_subjectID, [_recordTitle, _recordText]];
+	_subjectRecords set [_recordTitle, _new];
+	milsim_fbcb2_diaryRecords set [_subjectID, _subjectRecords];
+};
--- a/functions/init/fn_initServer.sqf
+++ b/functions/init/fn_initServer.sqf
@@ -4,7 +4,7 @@ if (!isServer) exitWith {};
 call milsim_fnc_crateDefinitions;

 _fixedAssets = [ 
-	["Ares",  "USAF_A10",   0], 
+	["Ares",  "B_Plane_CAS_01_Cluster_F",   0], 
 	["Odyssey",  "RHSGREF_A29B_HIDF",   0], 
 	["Hercules", "USAF_C130J",   0]
 
--- a/functions/server/fn_logPlayerInventory.sqf
+++ b/functions/server/fn_logPlayerInventory.sqf
@@ -18,257 +18,27 @@ params [
 ];

 if (!isPlayer _player) exitWith {
-	["[MILSIM] (logPlayerInventory): ERROR :: _player is not a player"]
+	[
+		"logPlayerInventory",
+		"PARAM PLAYER IS NOT A PLAYER",
+		[["player", _player]]
+	] call milsim_fnc_log;
 };

-// DEFINITIONS
-_blackListItems = [ // Items that NO member is allowed to use.
-	"17BN_ANPVS14", // NVG AN/PVS-14
-	"USP_PVS_14", // NVG AN/PVS-14
-	"USP_PVS_15", // NVG AN/PVS-15
-	"rhsusf_ANPVS_14", // NVG AN/PVS-14
-	"ej_VPS15", // NVG AN/PVS-15
-	"rhsusf_ANPVS_15", // NVG AN/PVS-15
-	"ej_PVS15D", // NVG AN/PVS-15
-	"UK3CB_M16_Carbine", // M16 Series
-	"UK3CB_M16A1", // M16 Series
-	"UK3CB_M16A1_LSW", // M16 Series
-	"UK3CB_M16A2", // M16 Series
-	"UK3CB_M16A2_UGL", // M16 Series
-	"UK3CB_M16A3", // M16 Series
-	"rhs_weap_m16a4", // M16 Series
-	"rhs_weap_m16a4_carryhandle", // M16 Series
-	"rhs_weap_m16a4_carryhandle_M203", // M16 Series
-	"rhs_weap_m16a4_imod", // M16 Series
-	"rhs_weap_m16a4_imod_M203", // M16 Series
-	"rhs_weap_m27iar", // M27 Series
-	"rhs_weap_m27iar_grip", // M27 Series
-	"UK3CB_G36_MLIC", // G36 Series
-	"UK3CB_G36_MLIC_K", // G36 Series
-	"UK3CB_G36_MLIC_C", // G36 Series
-	"UK3CB_G36_KSK_K", // G36 Series
-	"UK3CB_G36_KSK", // G36 Series
-	"UK3CB_G36A1", // G36 Series
-	"UK3CB_AG36A1", // G36 Series
-	"UK3CB_G36A1_K", // G36 Series
-	"UK3CB_G36A1_C", // G36 Series
-	"UK3CB_G36E1", // G36 Series
-	"UK3CB_AG36E1", // G36 Series
-	"UK3CB_G36E1_K", // G36 Series
-	"UK3CB_G36E1_C", // G36 Series
-	"UK3CB_AG36_MLIC", // G36 Series
-	"UK3CB_G36V", // G36 Series
-	"UK3CB_AG36V", // G36 Series
-	"UK3CB_G36_TAC", // G36 Series
-	"UK3CB_G36V_K", // G36 Series
-	"UK3CB_AG36_TAC_K", // G36 Series
-	"UK3CB_G36V_C", // G36 Series
-	"UK3CB_G36_TAC_C", // G36 Series
-	"UK3CB_G36_LSW", // G36 Series
-	"rhs_weap_g36kv", // G36 Series
-	"rhs_weap_g36kv_ag36", // G36 Series
-	"rhs_weap_g36c", // G36 Series
-	"Tier1_SIG_CMX_115_Virtus_300BLK", // MCX 300 Blackout
-	"Tier1_SIG_CMX_115_Virtus_300BLK_Black", // MCX 300 Blackout
-	"Tier1_SIG_CMX_115_Virtus_300BLK_Desert", // MCX 300 Blackout
-	"Tier1_SIG_CMX_115_Virtus_300BLK_FDE", // MCX 300 Blackout
-	"UK3CB_M14", // M14 Series
-	"UK3CB_M14_Railed", // M14 Series
-	"UK3CB_M14DMR", // M14 Series
-	"UK3CB_M14DMR_BLK", // M14 Series
-	"UK3CB_M14DMR_Railed", // M14 Series
-	"UK3CB_M14DMR_Railed_BLK", // M14 Series
-	"srifle_DMR_06_hunter_F", // M14 Series
-	"srifle_DMR_06_camo_F", // M14 Series
-	"srifle_DMR_06_olive_F", // M14 Series
-	"rhs_weap_m14", // M14 Series
-	"rhs_weap_m14_d", // M14 Series
-	"rhs_weap_m14_fiberglass", // M14 Series
-	"rhs_weap_m14_rail", // M14 Series
-	"rhs_weap_m14_rail_d", // M14 Series
-	"rhs_weap_m14_rail_fiberglass", // M14 Series
-	"rhs_weap_m14_rail_wd", // M14 Series
-	"rhs_weap_m14_ris", // M14 Series
-	"rhs_weap_m14_ris_d", // M14 Series
-	"rhs_weap_m14_ris_fiberglass", // M14 Series
-	"rhs_weap_m14_ris_wd", // M14 Series
-	"rhs_weap_m14_wd", // M14 Series
-	"rhs_weap_m14_weap_m14ebrri", // M14 Series
-	"rhs_weap_m14_socom", // M14 Series
-	"rhs_weap_m14_socom_rail", // M14 Series
-	"srifle_EBR_F", // Mk14 Series
-	"UK3CB_FNFAL_OSW", // FN_FAL Series
-	"UK3CB_FNFAL_OSW_GL", // FN_FAL Series
-	"UK3CB_FNFAL_FULL", // FN_FAL Series
-	"UK3CB_FNFAL_FULL_RAILS", // FN_FAL Series
-	"UK3CB_FNFAL_FOREGRIP", // FN_FAL Series
-	"UK3CB_FNFAL_PARA", // FN_FAL Series
-	"UK3CB_FNFAL_PARA_RAILS", // FN_FAL Series
-	"UK3CB_FNFAL_STG58", // FN_FAL Series
-	"SMA_ACRREM", //Remington ACR 556+6.5
-	"SMA_ACRREMAFGCQB",  //Remington ACR 556+6.5
-	"SMA_ACRREMAFG", //Remington ACR 556+6.5
-	"SMA_ACRREMMOECQB", //Remington ACR 556+6.5
-	"SMA_ACRREMMOE", //Remington ACR 556+6.5
-	"SMA_ACRREMblk", //Remington ACR 556+6.5
-	"SMA_ACRREMAFGCQBblk", //Remington ACR 556+6.5
-	"SMA_ACRREMAFGblk", //Remington ACR 556+6.5
-	"SMA_ACRREMMOECQBblk", //Remington ACR 556+6.5
-	"SMA_ACRREMMOEblk", //Remington ACR 556+6.5
-	"SMA_ACRREMGL_B", //Remington ACR 556+6.5
-	"SMA_ACRREMCQBGL", //Remington ACR 556+6.5
-	"SMA_ACRREMGL", //Remington ACR 556+6.5
-	"LMG_Mk200_F", //Mk200 Series
-	"LMG_Mk200_black_F" //Mk200 Series
-];
-
-_restrictedItems = [ // Items that are allowed for Specific USE Case (RRC / Marksman / etc.)
-	"A3_GPNVG18b_REC_TI", // Thermal Quad
-	"A3_GPNVG18_REC_TI", // Thermal Quad
-	"A3_GPNVG18b_TI", // Thermal Quad
-	"A3_GPNVG18_TI", // Thermal Quad
-	"A3_GPNVG18b_REC_BLK_TI", // Thermal Quad
-	"A3_GPNVG18_REC_BLK_TI", // Thermal Quad
-	"A3_GPNVG18b_BLK_TI", // Thermal Quad
-	"A3_GPNVG18_BLK_TI", // Thermal Quad
-	"NVGogglesB_gry_F", // ENVG
-	"NVGogglesB_grn_F", // ENVG
-	"NVGogglesB_blk_F", // ENVG
-	"optic_Nightstalker", // Thermal Optic
-	"rhsusf_acc_anpas13gv1", // Thermal Optic
-	"Tier1_ANPVS10_Tan", // Thermal Optic
-	"rhsusf_acc_anpvs27", // Thermal Optic
-	"optic_tws_mg", // Thermal Optic
-	"optic_tws", // Thermal Optic
-	"Tier1_ATACR18_ADM_Black", //Nightforce Series Optic
-	"Tier1_ATACR18_ADM_Desert", //Nightforce Series Optic
-	"Tier1_ATACR18_ADM_Desert_Vanilla", //Nightforce Series Optic
-	"Tier1_ATACR18_ADM_Black_Vanilla", //Nightforce Series Optic
-	"Tier1_ATACR18_ADM_T1_Black", //Nightforce Series Optic
-	"Tier1_ATACR18_ADM_T1_Desert", //Nightforce Series Optic
-	"Tier1_ATACR18_ADM_T1_Black_Vanilla", //Nightforce Series Optic
-	"Tier1_ATACR18_ADM_T1_Desert_Vanilla", //Nightforce Series Optic
-	"Tier1_ATACR18_Geissele_Black", //Nightforce Series Optic
-	"Tier1_ATACR18_Geissele_Desert", //Nightforce Series Optic
-	"Tier1_ATACR18_Geissele_Black_Vanilla", //Nightforce Series Optic
-	"Tier1_ATACR18_Geissele_Desert_Vanilla", //Nightforce Series Optic
-	"Tier1_ATACR18_Geissele_Docter_Black", //Nightforce Series Optic
-	"Tier1_ATACR18_Geissele_Docter_Desert", //Nightforce Series Optic
-	"Tier1_ATACR18_Geissele_Docter_Black_Vanilla", //Nightforce Series Optic
-	"Tier1_ATACR18_Geissele_Docter_Desert_Vanilla", //Nightforce Series Optic
-	"optic_lrps", //Nightforce Series Optic
-	"optic_lrps_ghex_F", //Nightforce Series Optic
-	"optic_lrps_tna_F", //Nightforce Series Optic
-	"ACE_optic_LRPS_2D", //Nightforce Series Optic
-	"ACE_optic_LRPS_PIP" //Nightforce Series Optic
-];
-
-_tabbedItems = [ // Items that are allowed for individuals with Ranger Tab
-	"arifle_SPAR_03_snd_F", // HK417 Series
-	"arifle_SPAR_03_blk_F", // HK417 Series
-	"arifle_SPAR_03_khk_F", // HK417 Series
-	"SMA_HK417", // HK417 Series
-	"SMA_HK417vfg", // HK417 Series
-	"SMA_HK417_16in", // HK417 Series
-	"rhs_weap_SCARH_CQC", // Scar H Series
-	"rhs_weap_SCARH_FDE_CQC", // Scar H Series
-	"rhs_weap_SCARH_FDE_LB", // Scar H Series
-	"rhs_weap_SCARH_LB", // Scar H Series
-	"rhs_weap_SCARH_FDE_STD", // Scar H Series
-	"rhs_weap_SCARH_STD", // Scar H Series
-	"rhs_weap_SCARH_USA_CQC", // Scar H Series
-	"rhs_weap_SCARH_USA_LB", // Scar H Series
-	"rhs_weap_SCARH_USA_STD", // Scar H Series
-	"SMA_Mk17", // Scar H Series
-	"SMA_Mk17_black", // Scar H Series
-	"SMA_Mk17_green", // Scar H Series
-	"SMA_Mk17_EGML", // Scar H Series
-	"SMA_Mk17_EGML_black", // Scar H Series
-	"SMA_Mk17_EGML_green", // Scar H Series
-	"SMA_Mk17_16", // Scar H Series
-	"SMA_Mk17_16_black", // Scar H Series
-	"SMA_Mk17_16_green", // Scar H Series
-	"Tier1_SR25", // SR-25 Series
-	"Tier1_SR25_tan", // SR-25 Series
-	"Tier1_SR25_ec", // SR-25 Series
-	"Tier1_SR25_ec_tan", // SR-25 Series
-	"arifle_MXC_F", // MXC Series
-	"arifle_MXC_black_F", // MXC Series
-	"arifle_MXC_khk_F", // MXC Series
-	"arifle_MXM_F", // MXM Series
-	"arifle_MXM_black_F", // MXM Series
-	"arifle_MXM_khk_F", // MXM Series
-	"arifle_MX_F", // MX Series
-	"arifle_MX_black_F", // MX Series
-	"arifle_MX_khk_F", // MX Series
-	"arifle_MX_GL_F", // MX 3GL Series
-	"arifle_MX_GL_black_F", // MX 3GL Series
-	"arifle_MX_GL_khk_F", // MX 3GL Series
-	"arifle_MX_SW_F", // MX LSW Series
-	"arifle_MX_SW_black_F", // MX LSW Series
-	"arifle_MX_SW_khk_F", // MX LSW Series
-	"Tier1_MK48_Mod0", // Mk48 Series
-	"Tier1_MK48_Mod0_Desert", // Mk48 Series
-	"Tier1_MK48_Mod0_Para", // Mk48 Series
-	"Tier1_MK48_Mod0_Para_Desert", // Mk48 Series
-	"Tier1_MK48_Mod1", // Mk48 Series
-	"Tier1_MK48_Mod1_Desert" // Mk48 Series
-];
-
-_memeItems = [ // Items that serve no purpose other than to MEME
-	"UK3CB_Cocaine_Brick",
-	"ACE_Banana"
-];
-
+// testing
+// test_old = compile preprocessFileLineNumbers "testold.sqf"; 
+// test_new = compile preprocessFileLineNumbers "testnew.sqf";
+// player addItem "A3_GPNVG18_BLK_TI";
+// player addWeapon "SMA_HK417_16in";
+// player addItem "ej_VPS15";
+// player addItem "ACE_Banana";

 // INSTANTIATE VARS
-private _returnLines = [];
+private _foundItemsKeyValue = [];
+private _allFoundItemsSoFar = [];

-_unlisted = [];
-
-_restricted = [];
-_blacklist = [];
-_tabbed = [];
-_meme = [];
-
-private _nonCompliantItemsCount = 0;
-
-// PRIVATE FUNCTIONS
-private _logItem = {
-	params ["_playerObj", "_categoryText", "_itemClassName"];
-	private _cfg = _itemClassName call CBA_fnc_getItemConfig;
-	_returnLines pushBack (format[
-		"[MILSIM] (logPlayerInventory): %1 :: className=""%2"" displayName=""%3"" %4",
-		_categoryText,
-		_itemClassName,
-		[_cfg] call BIS_fnc_displayName,
-		[_playerObj] call _playerInfoString
-	]);
-};
-
-private _playerInfoString = {
-	params ["_playerObj"];
-	format["playerName=""%1"" playerUID=""%2"" playerGroup=""%3""", name _playerObj, getPlayerUID _playerObj, groupId (group _playerObj)];
-};
-
-
-// GATHER INVENTORY
-// _items = [];
-// _items pushback headgear _player;
-// _items pushback uniform _player;
-// _items append uniformItems _player;
-// _items pushback vest _player;
-// _items append vestItems _player;
-// _items pushback backpack _player;
-// _items append backpackItems _player;
-// _items pushback hmd _player;
-// _items pushback binocular _player;
-// _items pushback primaryWeapon _player;
-// _items append primaryWeaponItems _player;
-// _items pushback secondaryWeapon _player;
-// _items append secondaryWeaponItems _player;
-
-_items = [
+// GET PLAYER ITEMS
+private _playerItems = [
 	_player, // Unit
 	true, // Include weapons, attachments, loaded magazines
 	true, // Include items in backpack
@@ -278,89 +48,97 @@ _items = [
 	true // Include not loaded magazines
 ] call CBA_fnc_uniqueUnitItems;

-_items pushBack (headgear _player);
-_items pushBack (uniform _player);
+_playerItems pushBack (headgear _player);
+_playerItems pushBack (uniform _player);

-// CHECK INVENTORY
-_returnLines pushBack (format[
-	"[MILSIM] (logPlayerInventory): CHECKING :: %1",
-	[_player] call _playerInfoString
-]);

-{
-	_item = _x;
-	_modes = getArray(configfile >> "CfgWeapons" >> _item >> "visionMode");
+[
+	"logPlayerInventory",
+	"CHECKING PLAYER INVENTORY",
+	[_player] call milsim_fnc_addPlayerInfoToArray
+] call milsim_fnc_log;

-	_subModes = [configfile >> "CfgWeapons" >> _item >> "ItemInfo" >> "OpticsModes", 1] call BIS_fnc_returnChildren;
+////////////////////////////////////////
+// HARDCODED DISALLOWED ITEMS - see functions/definitions/DisallowedEquipment.hpp

+// Get parent class
+private _disallowedEquipmentCfg = (missionConfigFile >> "DisallowedEquipment");
+
+// Get all subclasses
+private _definitionCfgs = (_disallowedEquipmentCfg call BIS_fnc_getCfgSubClasses) apply {
+	(_disallowedEquipmentCfg >> _x)
+};
+
+// diag_log text format["DEFINITION CFGS: %1", _definitionCfgs];
+// Check all items
+{ // forEach _subclassesCfgs
+	private _definitionCfg = _x;
+	private _definitionLabel = (_definitionCfg >> "label") call BIS_fnc_getCfgData;
+	private _definitionItems = (_definitionCfg >> "items") call BIS_fnc_getCfgDataArray;
+	// diag_log text format["DEF ITEMS: %1", _definitionItems];
+	{ // forEach _playerItems
+		private _playerItem = _x;
+		// diag_log text format["PLAYER ITEM: %1", _playerItem];
+		if (_playerItem in _definitionItems && not (_playerItem in _allFoundItemsSoFar)) then {
+			// add under def label
+			[_foundItemsKeyValue, _definitionLabel, _playerItem] call BIS_fnc_addToPairs;
+			// add to all found items
+			_allFoundItemsSoFar pushBackUnique _playerItem;
+		};
+	} forEach _playerItems;
+} forEach _definitionCfgs;
+
+////////////////////////////////////////
+// UNLISTED THERMAL - Any item with thermal capabilities that is not already in the list
+
+// Identify thermal items in the player list
+private _thermalItems = _playerItems select {
+	private _playerItem = _x;
+	private _modes = getArray(configfile >> "CfgWeapons" >> _playerItem >> "visionMode");
+	private _subModes = [configfile >> "CfgWeapons" >> _playerItem >> "ItemInfo" >> "OpticsModes", 1] call BIS_fnc_returnChildren;
 	{
 		_modes append getArray( _x >> "visionMode" );
 	} forEach _subModes;
-
-
-	if ( _item in _blackListItems ) then {
-		_blacklist pushBackUnique _item;
-	};
-
-	if ( _item in _restrictedItems ) then {
-		_restricted pushBackUnique _item;
-	};
-
-	if ( _item in _tabbedItems ) then {
-		_tabbed pushBackUnique _item;
-	};
-
-	if ( _item in _memeItems ) then {
-		_meme pushBackUnique _item;
-	};
-
 	if ((count _modes) isNotEqualTo 0) then {
-		_modes = _modes apply { toLower _x };
-		if ( "ti" in _modes ) then {
-			_unlisted pushBackUnique _item;
-		};
+		// if the item has thermal capabilities and is not in the list anywhere else, include it
+		"ti" in (_modes apply { toLower _x }) && not (_playerItem in _allFoundItemsSoFar);
+	} else {
+		false;
 	};
-
-} forEach _items;
-
-
-
-
-{
-	_nonCompliantItemsCount = _nonCompliantItemsCount + 1;
-	[_player, "BLACKLISTED", _x] call _logItem;
-} forEach _blacklist;
-
-{
-	_nonCompliantItemsCount = _nonCompliantItemsCount + 1;
-	[_player, "RESTRICTED", _x] call _logItem;
-} forEach _restricted;
-
-{
-	_nonCompliantItemsCount = _nonCompliantItemsCount + 1;
-	[_player, "TABBED", _x] call _logItem;
-} forEach _tabbed;
-
-{
-	_nonCompliantItemsCount = _nonCompliantItemsCount + 1;
-	[_player, "MEME", _x] call _logItem;
-} forEach _meme;
-
-{
-	if (
-		_x in _blackListItems ||
-		_x in _restrictedItems
-	) then {continue}; // Skip items that are already checked
-	_nonCompliantItemsCount = _nonCompliantItemsCount + 1;
-	[_player, "UNLISTED THERMAL", _x] call _logItem;
-} forEach _unlisted;
-
-if (_nonCompliantItemsCount isEqualTo 0) then {
-	_returnLines pushBack (format[
-		"[MILSIM] (logPlayerInventory): COMPLIANT :: %1",
-		[_player] call _playerInfoString
-	]);
 };

-// returns array of strings
-_returnLines;
+{
+	[_foundItemsKeyValue, "UNLISTED THERMAL", _x] call BIS_fnc_addToPairs;
+} forEach _thermalItems;
+
+
+// Only log compliance message if no non-compliant items were found
+if (count _allFoundItemsSoFar isEqualTo 0) exitWith {
+	[
+		"logPlayerInventory",
+		"PLAYER INVENTORY IS COMPLIANT",
+		[_player] call milsim_fnc_addPlayerInfoToArray
+	] call milsim_fnc_log;
+};
+
+// Log all non-compliant items
+{
+	_x params ["_categoryLabel", "_items"];
+	if (typeName _items isEqualTo "STRING") then {
+		_items = [_items];
+	};
+	{
+		private _itemClassName = _x;
+		private _itemConfig = _itemClassName call CBA_fnc_getItemConfig;
+		// Log to RPT
+		[
+			"logPlayerInventory",
+			"NON-COMPLIANT ITEM",
+			[_player, [
+				["category", _categoryLabel],
+				["className", _itemClassName],
+				["displayName", [_itemConfig] call BIS_fnc_displayName]
+			]] call milsim_fnc_addPlayerInfoToArray
+		] call milsim_fnc_log;
+	} forEach _items;
+} forEach _foundItemsKeyValue;
--- a/functions/settings/fn_addRespawnChatHandler.sqf
+++ b/functions/settings/fn_addRespawnChatHandler.sqf
@@ -3,11 +3,15 @@
 	{
 		_clientID = _thisArgs select 0;
 		player setDamage 1;
-		format[
-			"[MILSIM] (init) CHAT COMMAND RESPAWN playerNetID=%1 %2",
-			player call BIS_fnc_netId,
-			[player] call milsim_fnc_getPlayerLogString
-		] remoteExec["diag_log", 2];
+
+		// log to server RPT
+		[
+			"init",
+			"CHAT COMMAND RESPAWN",
+			[player] call milsim_fnc_addPlayerInfoToArray
+		] remoteExec ["milsim_fnc_log", 2];
+
+		// systemChat to all remote machines
 		format["%1 claims they were glitched and respawned (%2)", name player, netID player] remoteExec["systemChat", -_clientID];
 	},
 	"all",
--- a/functions/util/fn_addPlayerInfoToArray.sqf
+++ b/functions/util/fn_addPlayerInfoToArray.sqf
@@ -1,11 +1,14 @@
 params [["_playerObj", objNull], ["_arrayToModify", [], [[]]]];

+if (isNull _playerObj) exitWith {_arrayToModify};
+
 {
 	_arrayToModify = [_arrayToModify, _x#0, _x#1] call BIS_fnc_setToPairs;
 } forEach [
 	["playerName", name _playerObj],
 	["playerUID", getPlayerUID _playerObj],
-	["playerGroup", groupId (group _playerObj)]
+	["playerGroup", groupId (group _playerObj)],
+	["playerNetID", [_playerObj] call BIS_fnc_netId]
 ];

 _arrayToModify;
--- a/functions/util/fn_getBattalionCfg.sqf
+++ b/functions/util/fn_getBattalionCfg.sqf
@@ -0,0 +1 @@
+(missionConfigFile >> "BattalionInfo")
--- a/functions/util/fn_getPlayerLogString.sqf
+++ b/functions/util/fn_getPlayerLogString.sqf
@@ -1,42 +0,0 @@
-/*
-	Function: milsim_fnc_getPlayerLogString
-
-	Author: IndigoFox
-
-	Description:
-		Returns a string containing the player's name, UID and group name in 'key="value"' format.
-
-	Parameters:
-		0: _playerObj <OBJECT> - The player object to get the string for.
-		1: _returnArray <BOOL> - If true, returns a key/value array of the player's name, UID and group name.
-*/
-
-params [["_playerObj", objNull], ["_returnArray", false, [false, true]]];
-
-switch (_returnArray) do {
-	case false: {
-		if (isNull _playerObj) exitWith {
-			"playerName=""ERROR"" playerUID=""ERROR"" playerGroup=""ERROR"""
-		};
-		if (true) exitWith {
-			format["playerName=""%1"" playerUID=""%2"" playerGroup=""%3""", name _playerObj, getPlayerUID _playerObj, groupId (group _playerObj)];
-		};
-	};
-	case true: {
-		if (isNull _playerObj) exitWith {
-			[
-				["playerName", "ERROR"],
-				["playerUID", "ERROR"],
-				["playerGroup", "ERROR"]
-			]
-		};
-		if (true) exitWith {
-			[
-				["playerName", name _playerObj],
-				["playerUID", getPlayerUID _playerObj],
-				["playerGroup", groupId (group _playerObj)]
-			]
-		};
-	};
-};
-
--- a/functions/util/fn_log.sqf
+++ b/functions/util/fn_log.sqf
@@ -18,7 +18,11 @@ params [

 private _hash = createHashMapFromArray _data;

+// Replace square brackets with round brackets to avoid parsing issues.
+_message regexReplace ["\[", "("];
+_message regexReplace ["\]", ")"];
+
 private _json = [_hash] call CBA_fnc_encodeJSON;
-_log = format ["[milsim] (%1) (%2) (%3) :: %4", _component, _fnc_scriptNameParent, _message, _json];
+_log = format ["[milsim] [%1] [%2] [%3] :: %4", _component, _fnc_scriptNameParent, _message, _json];

 diag_log text _log;
--- a/functions/util/fn_logMissionInfo.sqf
+++ b/functions/util/fn_logMissionInfo.sqf
@@ -0,0 +1,23 @@
+[
+	"init",
+	"MISSION INFO",
+	[
+		["serverName", serverName],
+		["worldName", worldName],
+		["missionSeries", getMissionConfigValue ["missionSeries", ""]],
+		["missionName", missionName],
+		["briefingName", briefingName],
+		["overviewText", getMissionConfigValue ["overviewText", ""]],
+		["onLoadName", getMissionConfigValue ["onLoadName", ""]],
+		["onLoadMission", getMissionConfigValue ["onLoadMission", ""]],
+		["missionAuthor", getMissionConfigValue ["author", ""]],
+		["unitSlots", createHashMapFromArray [
+			["EAST", playableSlotsNumber EAST], // 0 is EAST side
+			["WEST", playableSlotsNumber WEST], // 1 is WEST side
+			["RESISTANCE", playableSlotsNumber RESISTANCE], // 2 is RESISTANCE side
+			["CIVILIAN", playableSlotsNumber CIVILIAN], // 3 is CIVILIAN side
+			["SIDEUNKNOWN", 0], // 4 is SIDEUNKNOWN side
+			["LOGIC", playableSlotsNumber sideLogic] // 5 is LOGIC side
+		]]
+	]
+] call milsim_fnc_log;
--- a/functions/util/fn_padString.sqf
+++ b/functions/util/fn_padString.sqf
@@ -0,0 +1,20 @@
+params [
+	["_text", "", [""]],
+	["_padSide", "left", ["left", "right"]],
+	["_padChar", " ", [" "]],
+	["_padLength", 4, [4]]
+];
+
+// pad a string with a character to a certain length
+if (_padSide == "left") then {
+	for "_i" from 1 to _padLength - count _text do {
+		_text = _padChar + _text;
+	};
+};
+if (_padSide == "right") then {
+	for "_i" from 1 to _padLength - count _text do {
+		_text = _text + _padChar;
+	};
+};
+
+_text
--- a/functions/util/fn_recurseSubclasses.sqf
+++ b/functions/util/fn_recurseSubclasses.sqf
@@ -0,0 +1,25 @@
+params [
+	["_cfg", configNull, [configNull]],
+	["_code", {}, [{}]]
+];
+
+if (isNull _cfg) exitWith {["Provided config is null!"] call BIS_fnc_error};
+
+
+private _recurseFnc = {
+	params ["_cfg", "_code", ["_recurseCounter", 0]];
+	[_cfg, _recurseCounter] call _code;
+	// get children and recurse
+	private _childCfgs = _cfg call BIS_fnc_returnChildren;
+	if (count _childCfgs isEqualTo 0) exitWith {false};
+
+	{
+		[_x, _code, _recurseCounter + 1] call _recurseFnc;
+	} forEach _childCfgs;
+	false;
+};
+
+private _continue = true;
+while {_continue} do {
+	_continue = [_cfg, _code] call _recurseFnc;
+};
Author	SHA1	Message	Date
hizumi	30e09b3bb7	Update CHANGELOG.md	2024-02-01 23:46:32 -06:00
hizumi	ca5ee22f04	Update README.md document new folder structure	2024-02-01 23:27:15 -06:00
hizumi	75c13ce69b	Update fn_initServer.sqf update old no longer existing asset for fixed wing aircraft to currently used asset	2024-02-01 23:22:09 -06:00
hizumi	29a04a1851	Merge pull request 'move-battalion-struct-to-missioncfg' (#15 ) from move-battalion-struct-to-missioncfg into main Reviewed-on: https://17th-gs.iceberg-gaming.com:5443/hizumi/MissionTemplate/pulls/15	2024-02-01 23:19:35 -06:00
IndigoFox	1e4a5a79a8	updates FBCB2, updates log fnc, adds comments	2024-02-01 20:52:10 -08:00
IndigoFox	c7d9298987	Merge branch 'main' into move-battalion-struct-to-missioncfg	2024-02-01 15:20:25 -08:00
IndigoFox	a7550d374e	major updates to fbcb2 diary stuff	2024-02-01 15:19:30 -08:00
hizumi	94b0d5becf	Merge pull request 'inv_expan' (#13 ) from inv_expan into main Reviewed-on: https://17th-gs.iceberg-gaming.com:5443/hizumi/MissionTemplate/pulls/13	2024-02-01 14:12:58 -06:00
hizumi	bb388ecfb1	Merge branch 'main' into inv_expan	2024-02-01 14:12:10 -06:00
IndigoFox	2d6fbcfcef	defines battalion info, integrates FBCB2 freqs and callsigns	2024-02-01 01:23:21 -08:00
IndigoFox	4677d54689	tested. moves defs to cfg where they should be, plus refactor of gather	2024-01-31 19:43:30 -08:00
IndigoFox	dc33829751	changes logging, and eval inv on server only	2024-01-30 18:25:46 -08:00
IndigoFox	8c40b107a5	update logging, add netId to player info, logmissioninfo	2024-01-30 18:24:55 -08:00