Merge remote-tracking branch 'origin/main' into update-asset-diary-entries

description.ext

@@ -19,6 +19,7 @@
 #include "mission_settings.hpp"
 #include "functions\definitions\DisallowedEquipment.hpp"
 #include "functions\definitions\BattalionInfo.hpp"
+#include "functions\definitions\ApprovedAssets.hpp"
 
 //-------------------------------------------MISSION INFO--------------------------------------------------------------------
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

functions/CfgFunctions.hpp

@@ -16,8 +16,6 @@ class milsim
 
 	class fbcb2 {
 		class initFBCB2 { postInit = 1; };
-		class processFBCB2FixedWingAssets {};
-		class processFBCB2RotaryAssets {};
 		class processFBCB2RadioFrequencies {};
 		class processFBCB2SmokeColors {};
 		class processFBCB2Environment {};
@@ -85,15 +83,35 @@ class milsim
 		class padString {};
 		class recurseSubclasses {};
 		class getBattalionCfg {};
+		class getNameOfBase {};
+		class getNearestBase {};
 	};
 };
 
-class milsim_reinsert {
+class milsim_fbcb2_assets {
 	class functions {
-		file = "functions\reinsert";
-		class getBaseName {};
-		class getNearestBase {};
+		file = "functions\fbcb2\assets";
+		class updateAssetDiary {};
+		class removeAssetDiaryRecords {};
+		class getMagsForWeapon {};
+		class getWeaponry {};
+		class getInventory {};
+		class getVehicleData {};
 	};
+	class assetsByBase {
+		file = "functions\fbcb2\assets\byBase";
+		class getAssetsByBase {};
+		class getStartingAssetsByBase {};
+		class updateAssetsByBase {};
+	};
+	class markers {
+		file = "functions\fbcb2\assets\markers";
+		class showMarkersOnMap {};
+		class removeMarkersOnMap {};
+	}
+};
+
+class milsim_reinsert {
 	class server {
 		file = "functions\reinsert\server";
 		class initServer { postInit = 1; };

functions/definitions/ApprovedAssets.hpp

@@ -0,0 +1,22 @@
+// Lists approved fixed-wing and rotary vehicle types that mission makers can use in their missions.
+
+class ApprovedAssets {
+	// Fixed-wing aircraft
+	class USAF_A10 {callsign = "Ares";assetType = "FixedWing";};
+	class RHSGREF_A29B_HIDF {callsign = "Odyssey";assetType = "FixedWing";};
+	class USAF_C130J {callsign = "Hercules";assetType = "FixedWing";};
+	// Rotary aircraft
+	class RHS_MELB_MH6M {callsign = "Apollo";assetType = "Rotary";};
+	class RHS_MELB_AH6M {callsign = "Artemis";assetType = "Rotary";};
+	class RHS_MELB_H6M {callsign = "Icarus";assetType = "Rotary";};
+	class RHS_CH_47F {callsign = "Achilles";assetType = "Rotary";};
+	class ej_MH60MDAP4 {callsign = "Hades";assetType = "Rotary";};
+	class RHS_UH60M {callsign = "Griffin";assetType = "Rotary";};
+	class RHS_UH60M_MEV2 {callsign = "Dustoff";assetType = "Rotary";};
+	class B_T_VTOL_01_INFANTRY_F {callsign = "Pegasus";assetType = "Rotary";};
+	class B_T_VTOL_01_ARMED_F {callsign = "Spartan";assetType = "Rotary";};
+	class RHS_AH64D {callsign = "Orion";assetType = "Rotary";};
+	class RHS_AH1Z {callsign = "Athena";assetType = "Rotary";};
+	class RHS_UH1Y {callsign = "Homer";assetType = "Rotary";};
+	class rhsusf_CH53E_USMC {callsign = "Atlas";assetType = "Rotary";};
+};

functions/fbcb2/assets/byBase/fn_getAssetsByBase.sqf

@@ -0,0 +1,4 @@
+// return each base with its assets
+milsim_baseObjects apply {
+	[_x, _x getVariable ["milsim_fbcb2_assets_assetsAtThisBase", []]]
+};

functions/fbcb2/assets/byBase/fn_getStartingAssetsByBase.sqf

@@ -0,0 +1,4 @@
+// return each base with its assets
+milsim_baseObjects apply {
+	[_x, _x getVariable ["milsim_fbcb2_assets_assetsStartedAtThisBase", []]]
+};

functions/fbcb2/assets/byBase/fn_updateAssetsByBase.sqf

@@ -0,0 +1,179 @@
+params [
+	["_isInit", false, [false]],
+	["_logCurrentAssets", false, [false]]
+];
+
+if (!isServer) exitWith {};
+
+// Get all approved assets on map, find the closest base
+// Then determine if it's within range
+// If it is, add it to the base's assets list
+// This is to ensure bases with overlapping detection range don't have duplicate assets
+private _allVehicles = vehicles;
+private _allSaved = [];
+
+private _assetsAtThisBaseVar = "milsim_fbcb2_assets_assetsAtThisBase";
+private _assetsStartedAtThisBaseVar = "milsim_fbcb2_assets_assetsStartedAtThisBase";
+
+{
+	private _className = configName _x;
+	private _callsign = getText(_x >> "callsign");
+	private _found = _allVehicles select { typeOf _x == _className };
+	{
+		private _asset = _x;
+		// avoid duplicates
+		if (_asset in _allSaved) then {continue};
+		private _closestBase = [_asset] call milsim_fnc_getNearestBase;
+		if (isNull _closestBase) then {
+			// no base found
+			continue;
+		};
+		if (
+			_asset distance _closestBase > 
+			milsim_fbcb2_assets_setting_detectionRangeFromBase
+		) then {
+			// not within range
+			continue;
+		};
+
+		_asset setVariable ["milsim_fbcb2_assets_callsign", _callsign, true];
+
+		// add to base's assets list
+		private _baseAssets = _closestBase getVariable [_assetsAtThisBaseVar, []];
+		_baseAssets pushBackUnique _asset;
+		// broadcast later so we're not spamming network
+		_closestBase setVariable [
+			_assetsAtThisBaseVar,
+			_baseAssets
+		];
+
+		// if this is the init, set the base's assets started at this base
+		if (_isInit) then {
+			// broadcast later so we're not spamming network
+			_closestBase setVariable [
+				_assetsStartedAtThisBaseVar,
+				_baseAssets
+			];
+		};
+
+		_allSaved pushBack _asset;
+	} forEach _found;
+} forEach ((missionConfigFile >> "ApprovedAssets") call BIS_fnc_returnChildren);
+
+// Add all ground vehicles (LandVehicle)
+{
+	private _asset = _x;
+	// avoid duplicates
+	if (_asset in _allSaved) then {continue};
+
+	private _closestBase = [_asset] call milsim_fnc_getNearestBase;
+	if (isNull _closestBase) then {
+		// no base found
+		continue;
+	};
+
+	if (
+		_asset distance _closestBase > 
+		milsim_fbcb2_assets_setting_detectionRangeFromBase
+	) then {
+		// not within range
+		continue;
+	};
+
+	// add to base's assets list
+	private _baseAssets = _closestBase getVariable [_assetsAtThisBaseVar, []];
+	_baseAssets pushBackUnique _asset;
+	// broadcast later so we're not spamming network
+	_closestBase setVariable [
+		_assetsAtThisBaseVar,
+		_baseAssets
+	];
+
+	// if this is the init, set the base's assets started at this base
+	if (_isInit) then {
+		// broadcast later so we're not spamming network
+		_closestBase setVariable [
+			_assetsStartedAtThisBaseVar,
+			_baseAssets
+		];
+	};
+} forEach (_allVehicles select { _x isKindOf "LandVehicle" });
+
+////////////////////////////////////////////////////////////////////////
+// publish updated base variables
+////////////////////////////////////////////////////////////////////////
+{
+	private _base = _x;
+
+	// save current assets
+	private _baseAssets = _base getVariable [_assetsAtThisBaseVar, []];
+	_base setVariable [_assetsAtThisBaseVar, _baseAssets, true];
+
+	// if init, save starting assets
+	if (_isInit) then {
+		_base setVariable [_assetsStartedAtThisBaseVar, _baseAssets, true];
+	};
+} forEach milsim_baseObjects;
+
+////////////////////////////////////////////////////////////////////////
+// log starting assets if init
+// log current assets if requested (for end of mission counts)
+////////////////////////////////////////////////////////////////////////
+if !(_isInit || _logCurrentAssets) exitWith {};
+
+{
+	private _base = _x;
+
+	// get current assets
+	private _baseAssets = _base getVariable [_assetsAtThisBaseVar, []];
+
+	// prepare key value for logging
+	private _baseAssetsHashesPrep = _baseAssets apply {
+		private _asset = _x;
+		[
+			["callsign", _asset getVariable [
+				"milsim_fbcb2_assets_callsign",
+				"N/A"
+			]],
+			["className", typeOf _asset],
+			["displayName", (configOf _asset) call BIS_fnc_displayName]
+		];
+	};
+
+	_baseAssetsHashesPrep = _baseAssetsHashesPrep call BIS_fnc_consolidateArray;
+
+	private _baseAssetsHashes = [];
+	{
+		private _out = createHashMapFromArray (_x#0);
+		_out set ["count", _x#1];
+		_baseAssetsHashes pushBack _out;
+	} forEach _baseAssetsHashesPrep;
+
+	// if logging current assets
+	if (_logCurrentAssets) then {
+		{
+			[
+				"fbcb2_assets",
+				"CURRENT ASSETS",
+				[
+					["baseName", [[_base] call milsim_fnc_getNameOfBase]],
+					["asset", _x]
+				]
+			] call milsim_fnc_log;
+		} forEach _baseAssetsHashes;
+	};
+
+	// if init, log starting assets
+	if (_isInit) then {		
+		{
+			[
+				"fbcb2_assets",
+				"STARTING ASSETS",
+				[
+					["baseName", [[_base] call milsim_fnc_getNameOfBase]],
+					["asset", _x]
+				]
+			] call milsim_fnc_log;
+		} forEach _baseAssetsHashes;
+	};
+} forEach milsim_baseObjects;

functions/fbcb2/assets/fn_getInventory.sqf

@@ -0,0 +1,123 @@
+params ["_vic"];
+
+
+_vicDispName = configOf _vic call BIS_fnc_displayName;
+private _thisArr = [];
+
+// _thisArr pushBack getItemCargo _vic;
+// _thisArr pushBack getBackpackCargo _vic;
+// _thisArr pushBack getMagazineCargo _vic;
+// _thisArr pushBack getWeaponCargo _vic;
+
+private _ItemCargo = [];
+private _MagazineCargo = [];
+private _WeaponCargo = [];
+private _BackpackCargo = [];
+
+{
+	private _config = _x call CBA_fnc_getItemConfig;
+	_ItemCargo pushBack [
+		getText (_config >> "displayName"),
+		getText (_config >> "picture")
+	];
+} forEach ItemCargo _vic;
+{
+	private _config = _x call CBA_fnc_getItemConfig;
+	_MagazineCargo pushBack [
+		getText (_config >> "displayName"),
+		getText (_config >> "picture")
+	];
+} forEach MagazineCargo _vic;
+{
+	// private _config = _x call CBA_fnc_getObjectConfig;
+	_WeaponCargo pushBack [
+		getText (configFile >> "CfgWeapons" >> _x >> "displayName"),
+		getText (configFile >> "CfgWeapons" >> _x >> "picture")
+	];
+} forEach WeaponCargo _vic;
+{
+	private _config = _x call CBA_fnc_getObjectConfig;
+	_BackpackCargo pushBack [
+		getText (_config >> "displayName"),
+		getText (_config >> "picture")
+	];
+} forEach BackpackCargo _vic;
+
+private _sortedItemCargo = ([_ItemCargo call BIS_fnc_consolidateArray, [], {_x # 0 # 0}] call BIS_fnc_sortBy) select {!(_x # 0 # 0 isEqualTo "")};
+private _sortedMagazineCargo = ([_MagazineCargo call BIS_fnc_consolidateArray, [], {_x # 0 # 0}] call BIS_fnc_sortBy) select {!(_x # 0 # 0 isEqualTo "")};
+private _sortedWeaponCargo = ([_WeaponCargo call BIS_fnc_consolidateArray, [], {_x # 0 # 0}] call BIS_fnc_sortBy) select {!(_x # 0 # 0 isEqualTo "")};
+private _sortedBackpackCargo = ([_BackpackCargo call BIS_fnc_consolidateArray, [], {_x # 0 # 0}] call BIS_fnc_sortBy) select {!(_x # 0 # 0 isEqualTo "")};
+
+// "debug_console" callExtension(str _sortedItemCargo + "~0100");
+// "debug_console" callExtension(str _sortedMagazineCargo + "~0100");
+// "debug_console" callExtension(str _sortedWeaponCargo + "~0100");
+// "debug_console" callExtension(str _sortedBackpackCargo + "~0100");
+
+if (count _sortedItemCargo > 0) then {
+	_thisArr pushBack format["<font color='#ffffff' size='12' face='PuristaMedium'>Items:</font>"];
+	private _itemCargoOut = [];
+	{
+		private _name = _x # 0 # 0;
+		private _pic = _x # 0 # 1;
+		private _count = _x # 1;
+		if (_pic == "") then {
+			_itemCargoOut pushBack format["<font color='#ffffff' size='12' face='EtelkaMonospacePro'><execute expression='systemChat ""%3"";'>%3 x%2</execute></font>", _pic, _count, _name];
+		} else {
+			_itemCargoOut pushBack format["<img height='30' image='%1'/><font color='#ffffff' size='10' face='EtelkaMonospacePro'><execute expression='systemChat ""%3"";'>x%2</execute></font>", _pic, _count, _name];
+		};
+		if ((_forEachIndex + 1) mod 6 == 0) then {_itemCargoOut pushBack "<br/>"};
+	} forEach _sortedItemCargo;
+	_thisArr pushBack (_itemCargoOut joinString "");
+};
+if (count _sortedMagazineCargo > 0) then {
+	_thisArr pushBack format["<font color='#ffffff' size='12' face='PuristaMedium'>Magazines:</font>"];
+	private _magCargoOut = [];
+	{
+		private _name = _x # 0 # 0;
+		private _pic = _x # 0 # 1;
+		private _count = _x # 1;
+		if (_pic == "") then {
+			_magCargoOut pushBack format["<font color='#ffffff' size='12' face='EtelkaMonospacePro'><execute expression='systemChat ""%3"";'>%3 x%2</execute></font>", _pic, _count, _name];
+		} else {
+			_magCargoOut pushBack format["<img height='30' image='%1'/><font color='#ffffff' size='10' face='EtelkaMonospacePro'><execute expression='systemChat ""%3"";'>x%2</execute></font>", _pic, _count, _name];
+		};
+		if ((_forEachIndex + 1) mod 6 == 0) then {_magCargoOut pushBack "<br/>"};
+	} forEach _sortedMagazineCargo;
+	_thisArr pushBack (_magCargoOut joinString "");
+};
+if (count _sortedWeaponCargo > 0) then {
+	_thisArr pushBack format["<font color='#ffffff' size='12' face='PuristaMedium'>Weapons:</font>"];
+	private _weaponCargoOut = [];
+	{
+		private _name = _x # 0 # 0;
+		private _pic = _x # 0 # 1;
+		private _count = _x # 1;
+		if (_pic == "") then {
+			_weaponCargoOut pushBack format["<font color='#ffffff' size='12' face='EtelkaMonospacePro'><execute expression='systemChat ""%3"";'>%3 x%2</execute></font>", _pic, _count, _name];
+		} else {
+			_weaponCargoOut pushBack format["<img height='50' image='%1'/><font color='#ffffff' size='10' face='EtelkaMonospacePro'><execute expression='systemChat ""%3"";'>x%2</execute></font>", _pic, _count, _name];
+		};
+		if ((_forEachIndex + 1) mod 3 == 0) then {_weaponCargoOut pushBack "<br/>"};
+	} forEach _sortedWeaponCargo;
+	_thisArr pushBack (_weaponCargoOut joinString "");
+};
+if (count _sortedBackpackCargo > 0) then {
+	_thisArr pushBack format["<font color='#ffffff' size='12' face='PuristaMedium'>Backpacks:</font>"];
+	private _backpackCargoOut = [];
+	{
+		private _name = _x # 0 # 0;
+		private _pic = _x # 0 # 1;
+		private _count = _x # 1;
+		if (_pic == "") then {
+			_backpackCargoOut pushBack format["<font color='#ffffff' size='12' face='EtelkaMonospacePro'><execute expression='systemChat ""%3"";'>%3 x%2</execute></font>", _pic, _count, _name];
+		} else {
+			_backpackCargoOut pushBack format["<img height='50' image='%1'/><font color='#ffffff' size='10' face='EtelkaMonospacePro'><execute expression='systemChat ""%3"";'>x%2</execute></font>", _pic, _count, _name];
+		};
+		if ((_forEachIndex + 1) mod 4 == 0) then {_backpackCargoOut pushBack "<br/>"};
+	} forEach _sortedBackpackCargo;
+	_thisArr pushBack (_backpackCargoOut joinString "");
+	// "debug_console" callExtension(str _backpackCargoOut + "~0100");
+};
+
+// "debug_console" callExtension(str _thisArr + "~1100");
+_thisArr;

functions/fbcb2/assets/fn_getMagsForWeapon.sqf

@@ -0,0 +1,80 @@
+params ["_vic", "_path", "_wep", "_magsHere", "_pylons"];
+
+if (_path isEqualTo []) then {_path = [-1]};
+// "debug_console" callExtension (_wep + "#0100");
+if (_wep in [
+	"rhs_weap_MASTERSAFE",
+	"rhs_weap_fcs_ammo",
+	"rhs_weap_laserDesignator_AI",
+	"rhs_weap_fcs_ah64",
+	"rhs_weap_DummyLauncher",
+	"rhs_weap_fcs_nolrf_ammo",
+	"rhsusf_weap_duke",
+	"TruckHorn",
+	"TruckHorn2",
+	"TruckHorn3"
+]) exitWith {[[]]};
+
+private _thisArr = [];
+_wepConfig = (configFile >> "CfgWeapons" >> _wep);
+_wepDisp = [(_wepConfig >> "displayName"), "STRING", "Weapon"] call CBA_fnc_getConfigEntry;
+if (_wep == "rhs_weap_smokegen") then {_wepDisp = "Smoke Generator"};
+if (_wepDisp isEqualTo "") exitWith {[[]]};
+
+// "debug_console" callExtension (_wepDisp + "#0100");
+_magsToCheck = (_vic magazinesTurret _path);
+
+
+// See if the first default magazine in the config of this weapon is meant to be used on a pylon. If so, process differently
+// _mag1pylonWeapon = "";
+// _magsConfigArr = [(_wepConfig >> "magazines"), "ARRAY", []] call CBA_fnc_getConfigEntry;
+// if (_magsConfigArr isEqualTo []) then {
+// 	_mag1pylonWeapon = "";
+// } else {
+// 	_mag1Name = _magsConfigArr # 0;
+// 	_mag1pylonWeapon = [(configFile >> "CfgMagazines" >> _mag1Name >> "pylonWeapon"), "STRING", ""] call CBA_fnc_getConfigEntry;
+// };
+
+_pylonMagNames = _pylons apply {_x # 3};
+
+_compatMagsRef = [_wepConfig, true] call CBA_fnc_compatibleMagazines;
+_magsFound = _compatMagsRef select {_magsToCheck find _x  != -1};
+
+private _magsArr = [];
+
+if (!((_magsFound # 0) in _pylonMagNames)) then {
+	// Not a pylon weapon, so check mags in turret storage
+	_thisArr pushBack format["        <font color='#87ffbb' face='PuristaSemiBold'>%1</font>", _wepDisp];
+	{
+	_thisMag = _x;
+		_magAmmo = _vic magazineTurretAmmo [_x, _path];
+		_magCount = (_magsHere select {_x # 0 == _thisMag} apply {_x # 1}) # 0;
+
+		private _magConfig = (configFile >> "CfgMagazines" >> _thisMag);
+		private _magName = [(_magConfig >> "displayName"), "STRING", "Magazine"] call CBA_fnc_getConfigEntry;
+		if (_magName isEqualTo "") then {_magName = "Magazine"};
+
+
+
+		_magsArr pushBack format[
+			"            + <font color='#4de4ff' size='12' face='PuristaMedium'><font color='#ffffff'>%1</font> <font color='#c2c2c2'>|</font> %2 <font color='#c2c2c2'>rounds</font> <font color='#c2c2c2'>|</font> %3 <font color='#c2c2c2'>mags</font></font>",
+			_magName,
+			_magAmmo,
+			_magCount
+		];
+	} forEach _magsFound;
+} else {
+	// This is a pylon weapon, so make a unique entry and directly check ammo on pylon
+	_thisArr pushBack format["        <font color='#87ffbb' face='PuristaSemiBold'>%1</font> <font face='PuristaMedium'>[Pylon]</font>", _wepDisp];
+};
+
+_thisArr pushBack _magsArr;
+// "debug_console" callExtension (str _magsArr + "#0100");
+_thisArr;
+// _thisArr;
+// "debug_console" callExtension (format[
+// 	"    %1 | %2 rounds | %3 mags#0110",
+// 	getText(configFile >> "CfgMagazines" >> _thisMag >> "displayName"),
+// 	_magAmmo,
+// 	_magCount
+// ]);

functions/fbcb2/assets/fn_getVehicleData.sqf

@@ -0,0 +1,166 @@
+params ["_vic"];
+
+private _title = [];
+private _image = [];
+private _info = [];
+private _capacity = [];
+
+// Excluded 2024-02-01
+// private _weapons = [];
+// private _pylonWeapons = [];
+// private _inventory = [];
+
+
+private _vicConfig = configOf _vic;
+private _class = configName _vicConfig;
+private _objType = (_vic call BIS_fnc_objectType) select 1;
+private _dispName = getText(_vicConfig >> 'displayName');
+
+// "debug_console" callExtension (format["VehicleName = %1", _dispName] + "#0110");
+
+private _cat = getText(_vicConfig >> 'category');
+private _fac = getText(_vicConfig >> 'faction');
+private _side = [getNumber(_vicConfig >> 'side')] call BIS_fnc_sideName;
+private _canFloat = (_vicConfig >> "canFloat") call BIS_fnc_getCfgDataBool;
+
+private _totalSeats = [_class, true] call BIS_fnc_crewCount; // Number of total seats: crew + non-FFV cargo/passengers + FFV cargo/passengers
+private _crewSeats = [_class, false] call BIS_fnc_crewCount; // Number of crew seats only
+private _driverSeats = fullcrew [_vic, "driver", true];
+private _gunnerSeats = fullCrew [_vic, "gunner", true];
+private _commanderSeats = fullCrew [_vic, "commander", true];
+// _cargoSeats = fullCrew [_vic, "cargo", true];
+private _cargoSeats = _totalSeats - _crewSeats; // Number of total cargo/passenger seats: non-FFV + FFV
+private _turretSeatsRaw = fullCrew [_vic, "turret", true];
+private _turretSeats = _turretSeatsRaw select {(_x # 4) isEqualTo false};
+private _ffvSeats = _turretSeatsRaw select {(_x # 4) isEqualTo true};
+
+private _pylons = getAllPylonsInfo _vic;
+
+///////////////////////////////////////////////
+// WRITE TITLE
+///////////////////////////////////////////////
+_title pushBack format["<font size='24' shadow='1' color='#e1701a' face='PuristaBold'>%1</font>", _dispName];
+
+///////////////////////////////////////////////
+// WRITE IMAGE
+///////////////////////////////////////////////
+// Editor preview image
+_image pushBack format["<img width='200' image='%1'/>", getText(_vicConfig >> 'editorPreview')];
+_image pushBack linebreak;
+// Thumbnail image
+// _image pushBack format["<img width='128' height='64' image='%1'/>", getText(_vicConfig >> 'picture')];
+// _image pushBack linebreak;
+
+///////////////////////////////////////////////
+// WRITE INFO
+///////////////////////////////////////////////
+_info pushBack format["<font size='14' color='#e1701a' face='PuristaBold'>INFO</font>"];
+_info pushBack format["<font face='PuristaMedium'>  Classname: %1", _class];
+_info pushBack format["  Side: %1", _side];
+_info pushBack format["  Category: %1", _objType];
+_info pushBack format["  Faction: %1", _fac];
+_info pushBack format["  Can Float: %1", _canFloat];
+
+///////////////////////////////////////////////
+// WRITE CAPACITY
+///////////////////////////////////////////////
+_capacity pushBack format["<font size='14' color='#e1701a' face='PuristaBold'>CAPACITY: %1</font>", _totalSeats];
+_capacity pushBack format["<font face='PuristaMedium'>  Driver Seats: %1", count _driverSeats];
+_capacity pushBack format["  Gunner Seats: %1", count _gunnerSeats];
+_capacity pushBack format["  Commander Seats: %1", count _commanderSeats];
+_capacity pushBack format["  Turret Seats: %1", count _turretSeats];
+_capacity pushBack format["  Cargo Seats: %1", _cargoSeats];
+_capacity pushBack format["  FFV Seats: %1</font>", count _ffvSeats];
+
+///////////////////////////////////////////////
+// GATHER WEAPONS AVAILABLE TO SEATS AND TURRETS
+// EXCLUDED 2024-02-01
+///////////////////////////////////////////////
+// _weapons pushBack format["<font size='14' color='#e1701a' face='PuristaBold'>WEAPONS</font>"];
+// // DRIVER
+// [_driverSeats apply {_x # 3}, "DRIVER/PILOT", _weapons] call milsim_fbcb2_assets_fnc_getWeaponry;
+
+// //GUNNER
+// [_gunnerSeats apply {_x # 3}, "GUNNER/COPILOT", _weapons] call milsim_fbcb2_assets_fnc_getWeaponry;
+
+// // COMMANDER
+// // "debug_console" callExtension ("COMMANDER" + "#1100");
+// [_commanderSeats apply {_x # 3}, "COMMANDER", _weapons] call milsim_fbcb2_assets_fnc_getWeaponry;
+
+// // TURRETS
+// [_turretSeats apply {_x # 3}, "TURRET", _weapons] call milsim_fbcb2_assets_fnc_getWeaponry;
+
+///////////////////////////////////////////////
+// GATHER PYLON WEAPONS WITH AMMO
+// EXCLUDED 2024-02-01
+///////////////////////////////////////////////
+
+// _pilotWeps = [];
+// _otherWeps = [];
+
+// _parsePylonWeapons = {
+// 	params ["_input"];
+// 	_input params ["_index", "_name", "_turretPath", "_magazine","_ammoCount","_id"];
+// 	// "debug_console" callExtension (str _turretPath + "~0000");
+
+// 	_magName = getText(configFile >> "CfgMagazines" >> _magazine >> "displayName");
+// 	if (_magName isEqualTo "") exitWith {};
+
+// 	if (_turretPath isEqualTo [-1]) then {
+// 		_pilotWeps pushBack format[
+// 			"        <font color='#87ffbb' face='PuristaSemiBold'>%1</font> <font face='PuristaMedium'><font color='#c2c2c2'>|</font> <font color='#4de4ff'>%2</font> <font color='#c2c2c2'>rounds</font></font>",
+// 			_magName,
+// 			_ammoCount
+// 		];
+// 	} else {
+// 		_otherWeps pushBack format[
+// 			"        <font color='#87ffbb' face='PuristaSemiBold'>%1</font> <font face='PuristaMedium'><font color='#c2c2c2'>|</font> <font color='#4de4ff'>%2</font> <font color='#c2c2c2'>rounds</font></font>",
+// 			_magName,
+// 			_ammoCount
+// 		];
+// 	};
+// };
+
+///////////////////////////////////////////////
+// WRITE PYLON WEAPONS
+///////////////////////////////////////////////
+
+// if (count _pylons > 0) then {
+// 	_pylonWeapons pushBack format["<font size='14' color='#e1701a' face='PuristaBold'>PYLON WEAPONS</font>"];
+// 	{
+// 		[_x] call _parsePylonWeapons;
+// 	} forEach _pylons;
+// 	_pylonWeapons pushBack format["    <font color='#f6dcbf' face='PuristaSemiBold'>PILOT</font>"];
+// 	{
+// 		_pylonWeapons pushBack _x;
+// 	} forEach _pilotWeps;
+// 	_pylonWeapons pushBack format["    <font color='#f6dcbf' face='PuristaSemiBold'>GUNNER</font>"];
+// 	{
+// 		_pylonWeapons pushBack _x;
+// 	} forEach _otherWeps;
+// };
+
+///////////////////////////////////////////////
+// GATHER INVENTORY
+// EXCLUDED 2024-02-01
+///////////////////////////////////////////////
+// _invLines = [_vic] call milsim_fbcb2_assets_fnc_getInventory;
+// if (count _invLines > 0) then {
+// 	_inventory pushBack format["<font size='14' color='#e1701a' face='PuristaBold'>INVENTORY</font>"];
+// 	_inventory append _invLines;
+// };
+
+
+///////////////////////////////////////////////
+// CLOSE AND RETURN
+///////////////////////////////////////////////
+
+[_vicConfig, _dispName, [
+	_title joinString "<br/>",
+	_image joinString "<br/>",
+	_info joinString "<br/>",
+	_capacity joinString "<br/>"
+	// _weapons joinString "<br/>",
+	// _pylonWeapons joinString "<br/>",
+	// _inventory joinString "<br/>"
+]];

functions/fbcb2/assets/fn_getWeaponry.sqf

@@ -0,0 +1,55 @@
+params ["_turretPaths", "_seatCategory", "_outArr"];
+{
+	_path = _x;
+	if (_path isEqualTo []) then {_path = [-1]};
+	_weps = _vic weaponsTurret _path;
+	private _thisArr = [];
+	if (count _weps isNotEqualTo 0) then {
+		_magsHere = _vic magazinesTurret _path call BIS_fnc_consolidateArray;
+
+		private _wepMags = [];
+		{
+			private _wepDet = [_vic, _path, _x, _magsHere, _pylons] call milsim_fbcb2_assets_fnc_getMagsForWeapon;
+			if (!(_wepDet isEqualTo [[]])) then {
+				_wepMags pushBack _wepDet;
+			};
+		} forEach _weps;
+
+		if (count _wepMags > 0) then {
+		// "debug_console" callExtension (format["_wepMags Driver = %1", [_wepMags] call CBA_fnc_encodeJSON] + "#1100");
+		{
+			_thisArr pushBack _x # 0;
+			if (count _x > 1) then {
+			{
+				_thisArr pushBack _x;
+			} forEach (_x # 1);
+			}
+		} forEach _wepMags;
+		};
+	};// else {
+		// "debug_console" callExtension (format["Running Mags Only."] + "#1100");
+		// "debug_console" callExtension (format["Vic: %1",_vic] + "#1100");
+		// "debug_console" callExtension (format["Path: %1", _path] + "#1100");
+	// 	_mags = ([_vic, _path] call _getMags);
+
+	// 	if (count _mags > 0) then {
+	// 		{
+	// 			_thisArr pushBack _x;
+	// 		} forEach _mags;
+	// 	};
+	// };
+
+	if (count _thisArr > 0) then {
+		private _turretConfig = [_vic, _x] call BIS_fnc_turretConfig;
+		private _turretDisplayName = [_turretConfig] call BIS_fnc_displayName;
+		if (_turretDisplayName != "") then {
+			_outArr pushBack format["    <font color='#f6dcbf' face='PuristaSemiBold'>%1 (""%2"")</font>", _seatCategory, _turretDisplayName];
+		} else {
+			_outArr pushBack format["    <font color='#f6dcbf' face='PuristaSemiBold'>%1</font>", _seatCategory];
+		};
+
+		{
+			_outArr pushBack _x;
+		} forEach _thisArr;
+	}
+} forEach _turretPaths;

functions/fbcb2/assets/fn_removeAssetDiaryRecords.sqf

@@ -0,0 +1,16 @@
+if (!hasInterface) exitWith {};
+
+{
+	private _diarySubject = _x;
+	private _records = player allDiaryRecords _diarySubject;
+	if (count _records isEqualTo 0) then {continue};
+
+	{
+		private _diaryRecord = _x select -1;
+		player removeDiaryRecord [_diarySubject, _diaryRecord];
+	} forEach _records;
+} forEach [
+	milsim_fbcb2_subjectAssetsFixedWingID,
+	milsim_fbcb2_subjectAssetsRotaryID,
+	milsim_fbcb2_subjectAssetsGroundID
+];

functions/fbcb2/assets/fn_updateAssetDiary.sqf

@@ -0,0 +1,185 @@
+if (!hasInterface) exitWith {};
+
+// create diary records
+
+
+// remove any existing asset map markers
+call milsim_fbcb2_assets_fnc_removeMarkersOnMap;
+
+// remove existing asset records
+call milsim_fbcb2_assets_fnc_removeAssetDiaryRecords;
+
+// get all vehicles by base
+private _vehiclesByBase = call milsim_fbcb2_assets_fnc_getAssetsByBase;
+if (count _vehiclesByBase isEqualTo 0) exitWith {false};
+
+// put vehicles from each base into a single array
+private _vehicles = [];
+{
+	_vehicles append (_x#1);
+} forEach _vehiclesByBase;
+
+if (count _vehicles isEqualTo 0) exitWith {false};
+private _distinctVehiclesClassNames = [];
+{
+	_distinctVehiclesClassNames pushBackUnique (typeOf _x);
+} forEach _vehicles;
+
+
+// ForEach unique vehicle class name, we'll find the first and gather its info
+{
+	private _className = _x;
+	private _vehiclesOfThisKind = _vehicles select {typeOf _x isEqualTo _className};
+	// This should never happen, but...
+	if (count _vehiclesOfThisKind isEqualTo 0) then {continue};
+
+	// Take the first vehicle as a representative
+	private _representativeVehicle = _vehiclesOfThisKind#0;
+	private _vehicleCfg = configOf _representativeVehicle;
+	private _vehicleCallsign = toUpper (
+		_representativeVehicle getVariable [
+			"milsim_fbcb2_assets_callsign",
+			"NONE ASSIGNED"
+		]
+	);
+
+	// Process the vehicle for extended info
+	// Exclusion list for display names
+	if (
+		((configOf _representativeVehicle) call BIS_fnc_displayName)
+		in ["Helicopter"]
+	) then {continue};
+	
+	// Get the vehicle data
+	private _processed = [_representativeVehicle] call milsim_fbcb2_assets_fnc_getVehicleData;
+	
+	if (isNil "_processed") then {continue};
+	_processed params ["_vehicleCfg", "_displayName", "_diaryTextSections"];
+	_diaryTextSections params [
+		"_title",
+		"_image",
+		"_info",
+		"_capacity"
+		// "_weapons",
+		// "_pylonWeapons",
+		// "_inventory"
+	];
+
+	// Create the diary record
+	private _recordText = [];
+	// Add the title and image
+	_recordText pushBack _title;
+	_recordText pushBack _image;
+	_recordText pushBack "<br/>";
+	_recordText pushBack format[
+		"CALLSIGN: %1",
+		_vehicleCallsign
+	];
+	_recordText pushBack format[
+		"COUNT ACTIVE: %1",
+		count _vehiclesOfThisKind
+	];
+
+	// Here, we'll create a link to show markers on the map for all vehicles of this kind
+	private _randomColor = selectRandom [
+		["ColorRed", "#FF0000", "Red"],
+		["ColorGreen", "#00FF00", "Green"],
+		["ColorBlue", "#0000FF", "Blue"],
+		["ColorYellow", "#FFFF00", "Yellow"],
+		["ColorWhite", "#FFFFFF", "White"]
+	];
+	private _vehicleCfg = configFile >> "CfgVehicles" >> _className;
+	// get 'picture' for record
+	private _icon = getText(_vehicleCfg >> "picture");
+	// determine marker type
+	private _markerType = "mil_dot";
+	switch (true) do {
+		case (_representativeVehicle isKindOf "Helicopter"): {
+			_markerType = "loc_heli";
+		};
+		case (_representativeVehicle isKindOf "Air"): {
+			_markerType = "loc_plane";
+		};
+		case (_representativeVehicle isKindOf "Ship"): {
+			_markerType = "loc_boat";
+		};
+		case (_representativeVehicle isKindOf "Car"): {
+			_markerType = "loc_car";
+		};
+		default {
+			_markerType = "loc_truck";
+		};
+	};
+
+	// Link to show markers
+	private _showMarkersText = format[
+		"<execute expression='[""%1"",""%2"",""%3"",%4] call milsim_fbcb2_assets_fnc_showMarkersOnMap'>SHOW MARKERS at vehicle positions</execute> (in %5)",
+		_className,
+		_markerType,
+		_randomColor#0,
+		(_vehiclesOfThisKind apply {
+			format["%1", _x call BIS_fnc_netId]
+		}),
+		format["<font color='%1'>%2</font>", _randomColor#1, _randomColor#2]
+	];
+	_recordText pushBack _showMarkersText;
+
+	// Link to hide markers
+	_recordText pushBack "<execute expression=""call milsim_fbcb2_assets_fnc_removeMarkersOnMap"">REMOVE ALL MARKERS showing asset positions</execute>";
+
+	// Link to update asset diary entries
+	_recordText pushBack "<execute expression=""call milsim_fbcb2_assets_fnc_updateAssetDiary"">UPDATE ENTRIES for all assets</execute>";
+
+	_recordText pushBack format[
+		"<font size='10' color='#777777'>%1</font>",
+		"Notes:<br/>
+			- Markers are only displayed on your local machine.<br/>
+			- The REMOVE ALL option will remove all assets' markers from the map.<br/>
+			- UPDATE ENTRIES will update the asset diary with the latest information (~5 minutes at most)."
+	];
+
+
+
+	// Add info and capacity sections
+	_recordText pushBack _info;
+	_recordText pushBack _capacity;
+
+
+	private _subjectID = "";
+	switch (true) do {
+		case (_representativeVehicle isKindOf "Helicopter"): {
+			_subjectID = milsim_fbcb2_subjectAssetsRotaryID;
+		};
+		case (_representativeVehicle isKindOf "Air"): {
+			_subjectID = milsim_fbcb2_subjectAssetsFixedWingID;
+		};
+		default {
+			_subjectID = milsim_fbcb2_subjectAssetsGroundID;
+		};
+	};
+
+	[
+		_subjectID,
+		format[
+			"%1x %2",
+			count _vehiclesOfThisKind,
+			(configOf _representativeVehicle) call BIS_fnc_displayName
+		],
+		_recordText joinString "<br/>",
+		_icon
+	] call milsim_fnc_createOrUpdateDiaryRecord;
+
+// "\A3\ui_f\data\igui\cfg\simpleTasks\types\car_ca.paa"
+} forEach _distinctVehiclesClassNames;
+
+// log to RPT
+[
+	"fbcb2_assets",
+	"UPDATED ASSET DIARY",
+	[
+		["assetCount", count _vehicles],
+		["distinctAssetCount", count _distinctVehiclesClassNames]
+	]
+] call milsim_fnc_log;
+
+true;

functions/fbcb2/assets/markers/fn_removeMarkersOnMap.sqf

@@ -0,0 +1,25 @@
+private _baseMarkerStoreVar = "milsim_fbcb2_assets_baseMarkerStore";
+private _assetMarkerStoreVar = "milsim_fbcb2_assets_assetMarkerStore";
+
+private _baseMarkerStore = localNamespace getVariable [
+	_baseMarkerStoreVar,
+	[]
+];
+private _assetMarkerStore = localNamespace getVariable [
+	_assetMarkerStoreVar,
+	[]
+];
+
+// delete markers
+{
+	deleteMarkerLocal (_x#1);
+} forEach (_baseMarkerStore + _assetMarkerStore);
+
+localNamespace setVariable [
+	_baseMarkerStoreVar,
+	[]
+];
+localNamespace setVariable [
+	_assetMarkerStoreVar,
+	[]
+];

functions/fbcb2/assets/markers/fn_showMarkersOnMap.sqf

@@ -0,0 +1,106 @@
+params [
+	["_className", "", [""]],
+	["_markerType", "hd_dot", [""]],
+	["_markerColor", "", [""]],
+	["_assetObjects", [], []]
+];
+
+if (count _className isEqualTo 0) exitWith {
+	["No class name provided!"] call BIS_fnc_error;
+};
+if (count _markerColor isEqualTo 0) exitWith {
+	["No marker color provided!"] call BIS_fnc_error;
+};
+if (count _assetObjects isEqualTo 0) exitWith {
+	["No vehicles provided!"] call BIS_fnc_error;
+};
+
+private _baseMarkerStoreVar = "milsim_fbcb2_assets_baseMarkerStore";
+private _assetMarkerStoreVar = "milsim_fbcb2_assets_assetMarkerStore";
+
+private _baseMarkerStore = localNamespace getVariable [
+	_baseMarkerStoreVar,
+	[]
+];
+private _assetMarkerStore = localNamespace getVariable [
+	_assetMarkerStoreVar,
+	[]
+];
+
+///////////////////////////////////////////////////////////////////////////////
+// Create base markers if not already present
+if (not (count _baseMarkerStore > 0)) then {
+	{ // milsim_baseObjects is accessed directly, so are valid objects
+		private _base = _x;
+
+		// create a circle marker with range as the detection range of assets
+		_newMarker = createMarkerLocal [
+			format["milsim_fbcb2_assets_base_marker_%1", _forEachIndex + 1],
+			getPosASL _base
+		];
+		_newMarker setMarkerTypeLocal "mil_dot";
+		_newMarker setMarkerColorLocal "ColorGreen";
+		_newMarker setMarkerShapeLocal "ELLIPSE";
+		_newMarker setMarkerSizeLocal [
+			milsim_fbcb2_assets_setting_detectionRangeFromBase,
+			milsim_fbcb2_assets_setting_detectionRangeFromBase
+		];
+		_newMarker setMarkerAlphaLocal 0.5;
+		_newMarker setMarkerTextLocal str(_forEachIndex + 1);
+
+		_baseMarkerStore pushBack [
+			_base,
+			_newMarker
+		];
+
+		// create a flag marker at base position
+		_newMarker = createMarkerLocal [
+			format["milsim_fbcb2_assets_base_flag_marker_%1", _forEachIndex + 1],
+			getPosASL _base
+		];
+		_newMarker setMarkerTypeLocal "mil_flag";
+		_newMarker setMarkerColorLocal "ColorGreen";
+		_newMarker setMarkerSizeLocal [0.7, 0.7];
+		_newMarker setMarkerTextLocal ([_base] call milsim_fnc_getNameOfBase);
+
+		_baseMarkerStore pushBack [
+			_base,
+			_newMarker
+		];
+	} forEach milsim_baseObjects;
+
+	localNamespace setVariable [_baseMarkerStoreVar, _baseMarkerStore];
+};
+
+
+private _start = (count _assetMarkerStore) + 1;
+{ // _assetObjects is a serialized parameter, so we pass the netIds (strings)
+	private _assetNetIdStr = _x;
+	private _asset = _assetNetIdStr call BIS_fnc_objectFromNetId;
+	// if asset was removed since last update
+	if (isNull _asset) then {continue};
+	// check if a marker is already placed for this asset
+	if (
+		(_assetMarkerStore findIf { _x select 0 isEqualTo _asset })
+		> -1
+	) then {continue};
+
+	// create a marker for the asset
+	private _newMarker = createMarkerLocal [
+		format["milsim_fbcb2_assets_marker_%1", _start],
+		getPosASL _asset
+	];
+	_newMarker setMarkerAlphaLocal 1;
+	_newMarker setMarkerTypeLocal _markerType;
+	_newMarker setMarkerColorLocal _markerColor;
+	// _newMarker setMarkerTextLocal ([configOf _asset] call BIS_fnc_displayName);
+
+	_assetMarkerStore pushBack [
+		_asset,
+		_newMarker
+	];
+	_start = _start + 1;
+} forEach _assetObjects;
+
+// update store var
+localNamespace setVariable [_assetMarkerStoreVar, _assetMarkerStore];

functions/fbcb2/fn_initFBCB2.sqf

@@ -14,11 +14,17 @@ milsim_fbcb2_subjectStatusID = "FBCB2_Status";
 milsim_fbcb2_subjectIntelID = "FBCB2_Intel";
 milsim_fbcb2_subjectMessagesID = "FBCB2_Messages";
 milsim_fbcb2_subjectFrequenciesID = "FBCB2_Frequencies";
+milsim_fbcb2_subjectAssetsFixedWingID = "FBCB2_Assets_FixedWing";
+milsim_fbcb2_subjectAssetsRotaryID = "FBCB2_Assets_Rotary";
+milsim_fbcb2_subjectAssetsGroundID = "FBCB2_Assets_Ground";
 
 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"];
+player createDiarySubject[milsim_fbcb2_subjectAssetsFixedWingID, "FBCB2 - Assets Plane"];
+player createDiarySubject[milsim_fbcb2_subjectAssetsRotaryID, "FBCB2 - Assets Rotary"];
+player createDiarySubject[milsim_fbcb2_subjectAssetsGroundID, "FBCB2 - Assets Ground"];
 
 // store records in format:
 // [subject, [
@@ -27,8 +33,7 @@ player createDiarySubject[milsim_fbcb2_subjectFrequenciesID, "FBCB2 - Frequencie
 milsim_fbcb2_diaryRecords = createHashMap;
 
 // populate diary
-[] call milsim_fnc_processFBCB2FixedWingAssets;
-[] call milsim_fnc_processFBCB2RotaryAssets;
 [] call milsim_fnc_processFBCB2RadioFrequencies;
 [] call milsim_fnc_processFBCB2SmokeColors;
 [] call milsim_fnc_processFBCB2Environment;
+[] call milsim_fbcb2_assets_fnc_updateAssetDiary;

functions/fbcb2/fn_processFBCB2FixedWingAssets.sqf

@@ -1,26 +0,0 @@
-private _recordTitle = "MDS - ASSETS - FIXED";
-
-private _assetList = missionNamespace getVariable "milsim_var_fixedAssets";
-
-_text = "<font size='24' color='#ff0000'>=======------   Mission Data Set   ------=======</font>";
-
- {
-	_callSign = _x select 0;
-	_asset = _x select 1;
-	_assigned = _x select 2;
-	_name = getText(configFile >> "CfgVehicles" >> _asset >> "displayName");
-
-	_data = "<t size='2'>Callsign:  " + _callsign + "</t><br/><t size='1'>Asset:       " + _name + "</t><br/><t size='1'>Assigned: " + str _assigned + "</t>";
-
-	_text = _text + "<br/><br/>" + _data;
-
-} foreach _assetList;
-
-_text = _text + "<br/><br/><execute expression='[missionNamespace getVariable ""milsim_var_fixedAssets""] call milsim_fnc_hintFBCB2AssetStatus'>Run Report on local node?</execute>";
-
-
-[
-	milsim_fbcb2_subjectStatusID,
-	_recordTitle,
-	_text
-] call milsim_fnc_createOrUpdateDiaryRecord;

functions/fbcb2/fn_processFBCB2RotaryAssets.sqf

@@ -1,26 +0,0 @@
-private _recordTitle = "MDS - ASSETS - ROTARY";
-
-_assetList = missionNamespace getVariable "milsim_var_rotaryAssets";
-
-_text = "<font size='24' color='#ff0000'>=======------   Mission Data Set   ------=======</font>";
-
- {
-	_callSign = _x select 0;
-	_asset = _x select 1;
-	_assigned = _x select 2;
-	_name = getText(configFile >> "CfgVehicles" >> _asset >> "displayName");
-
-	_data = "<t size='2'>Callsign:  " + _callsign + "</t><br/><t size='1'>Asset:       " + _name + "</t><br/><t size='1'>Assigned: " + str _assigned + "</t>";
-
-	_text = _text + "<br/><br/>" + _data;
-
-} foreach _assetList;
-
-_text = _text + "<br/><br/><execute expression='[missionNamespace getVariable ""milsim_var_rotaryAssets""] call milsim_fnc_hintFBCB2AssetStatus'>Run Report on local node?</execute>";
-
-
-[
-	milsim_fbcb2_subjectStatusID,
-	_recordTitle,
-	_text
-] call milsim_fnc_createOrUpdateDiaryRecord;

functions/fbcb2/util/fn_createOrUpdateDiaryRecord.sqf

@@ -1,7 +1,10 @@
+if (!hasInterface) exitWith {};
+
 params [
 	["_subjectID", milsim_fbcb2_subjectStatusID, [""]],
 	["_recordTitle", "", [""]],
-	["_recordText", "", [""]]
+	["_recordText", "", [""]],
+	["_recordIcon", "", [""]]
 ];
 
 // Check if already created
@@ -9,10 +12,17 @@ private _subjectRecords = milsim_fbcb2_diaryRecords getOrDefault [_subjectID, cr
 private _existingRecord = _subjectRecords getOrDefault [_recordTitle, diaryRecordNull, true];
 
 if (!isNull _existingRecord) then {
-	player setDiaryRecordText [[_subjectID, _existingRecord], [_recordTitle, _recordText]];
+	player setDiaryRecordText [[_subjectID, _existingRecord], [_recordTitle, _recordText, _recordIcon]];
 	systemChat format ["Updated diary record: %1", _recordTitle];
 } else {
-	private _new = player createDiaryRecord [_subjectID, [_recordTitle, _recordText]];
+	private _new = player createDiaryRecord [
+		_subjectID, 
+		[
+			_recordTitle, 
+			_recordText,
+			_recordIcon
+		]
+	];
 	_subjectRecords set [_recordTitle, _new];
 	milsim_fbcb2_diaryRecords set [_subjectID, _subjectRecords];
 };

functions/init/fn_initServer.sqf

@@ -2,58 +2,25 @@ if (!isServer) exitWith {};
 
 // define milsim_resupply_crateDefinitions
 call milsim_fnc_crateDefinitions;
-
-_fixedAssets = [ 
-	["Ares",  "B_Plane_CAS_01_Cluster_F",   0], 
-	["Odyssey",  "RHSGREF_A29B_HIDF",   0], 
-	["Hercules", "USAF_C130J",   0]
  
-]; 
- 
-_rotaryAssets = [ 
-	["Apollo",  "RHS_MELB_MH6M",   0], 
-	["Artemis",  "RHS_MELB_AH6M",  0], 
-	["Icarus",  "RHS_MELB_H6M",  0], 
-	["Achilles", "RHS_CH_47F",   0], 
-	["Hades",  "ej_MH60MDAP4",   0], 
-	["Griffin",  "RHS_UH60M",   0], 
-	["Dustoff",  "RHS_UH60M_MEV2",   0], 
-	["Pegasus",  "B_T_VTOL_01_INFANTRY_F",   0], 
-	["Spartan",  "B_T_VTOL_01_ARMED_F",   0], 
-	["Orion", "RHS_AH64D",   0],
-	["Athena",  "RHS_AH1Z",   0], 
-	["Homer",  "RHS_UH1Y",   0], 
-	["Atlas",  "rhsusf_CH53E_USMC",   0]
-]; 
- 
-_homes = allMissionObjects "ModuleRespawnPosition_F";
-
-{
-	_home = _x;
-	{
-		_a = _home nearEntities [ _x select 1, 750]; 
-		_x set [2, (_x select 2) + count _a];
-	 
-	} forEach _fixedAssets; 
-} forEach _homes;
-
-missionNamespace setVariable ["milsim_var_fixedAssets", _fixedAssets]; 
-
-{
-	_home = _x;
-	{
-		_a = _home nearEntities [ _x select 1, 750]; 
-		_x set [2, (_x select 2) + count _a];
-	 
-	} forEach _rotaryAssets; 
-} forEach _homes;
- 
-missionNamespace setVariable ["milsim_var_rotaryAssets", _rotaryAssets]; 
-
-publicVariable "milsim_var_fixedAssets";
-publicVariable "milsim_var_rotaryAssets";
+milsim_baseObjects = allMissionObjects "ModuleRespawnPosition_F";
+publicVariable "milsim_baseObjects";
 
+// init asset stores at bases
+[true] call milsim_fbcb2_assets_fnc_updateAssetsByBase;
+// starting 5 minutes after postInit, update asset stores every 5 minutes
+[{
+	[
+		{[false] call milsim_fbcb2_assets_fnc_updateAssetsByBase;},
+		60*5
+	] call CBA_fnc_addPerFrameHandler;
+}, 60*5] call CBA_fnc_waitAndExecute;
 
+// add end mission EH
+addMissionEventHandler ["MPEnded", {
+	// log the "current" asset counts to RPT
+	[false, true] call milsim_fbcb2_assets_fnc_updateAssetsByBase;
+}];
 
 // Initializes the Dynamic Groups framework and groups
 ["Initialize", [true]] call BIS_fnc_dynamicGroups;

functions/reinsert/client/fn_addAceSelfActions.sqf

@@ -13,8 +13,8 @@ private _fileForReinsertAction = [
 	{ // statement
 		params ["_target", "_player", "_params"];
 		// find nearest base or location
-		private _base = [_player] call milsim_reinsert_fnc_getNearestBase;
-		private _baseName = [_base] call milsim_reinsert_fnc_getBaseName;
+		private _base = [_player] call milsim_fnc_getNearestBase;
+		private _baseName = [_base] call milsim_fnc_getNameOfBase;
 		// send event to server
 		["milsim_reinsert_fileReinsertRequest", [_player, _base]] call CBA_fnc_serverEvent;
 		// notify player their request was filed
@@ -23,7 +23,7 @@ private _fileForReinsertAction = [
 	{ // condition
 		params ["_target", "_player", "_params"];
 		// find nearest base or location
-		private _base = [_player] call milsim_reinsert_fnc_getNearestBase;
+		private _base = [_player] call milsim_fnc_getNearestBase;
 		private _baseDistance = _player distance _base;
 
 		private _maxRangeToReady = missionNamespace getVariable ["milsim_reinsert_setting_reinsertion_maxRangeToReady", 400];

functions/reinsert/fn_getBaseName.sqf

@@ -1,8 +0,0 @@
-params [["_base", objNull, [objNull]]];
-if (_base == objNull) exitWith {""};
-
-// get base name
-private _baseName = _base getVariable ["name", ""];
-if (_baseName == "") then {_baseName = format["near %1", text (nearestLocation [_base, ["NameCity", "NameLocal"]])]};
-
-_baseName;

functions/reinsert/fn_getNearestBase.sqf

@@ -1,10 +0,0 @@
-params [["_player", objNull, [objNull]]];
-if (isNull _player) exitWith {objNull};
-
-private _bases = missionNamespace getVariable ["milsim_reinsert_bases", []];
-if (count _bases == 0) exitWith {objNull};
-
-// get nearest base (Module_Respawn_F)
-private _closestBase = [_bases, _player] call BIS_fnc_nearestPosition;
-if (isNull _closestBase) exitWith {objNull};
-_closestBase;

functions/reinsert/server/fn_addToQueue.sqf

@@ -41,9 +41,9 @@ publicVariable "milsim_reinsert_reinsertionQueue";
 
 // log to rpt
 private _logParams = [
-	["filedAtBase", [_base] call milsim_reinsert_fnc_getBaseName],
+	["filedAtBase", [_base] call milsim_fnc_getNameOfBase],
 	["filedAtBaseDistance", _player distance _base],
-	["closestBase", [_nearestBase] call milsim_reinsert_fnc_getBaseName],
+	["closestBase", [_nearestBase] call milsim_fnc_getNameOfBase],
 	["closestBaseDistance", _player distance _nearestBase],
 	["maxDistanceSetting", _maxRangeToReady],
 	["inQueueDuration", diag_tickTime - _timeFiled]

functions/reinsert/server/fn_globalShowQueue.sqf

@@ -21,7 +21,7 @@ if (count _timeoutPlayers > 0) then {
 		private _thisBase = _x;
 
 		// Add line for base name
-		_playerLines pushBack ([[_thisBase] call milsim_reinsert_fnc_getBaseName, 1, [0,1,0,1]]);
+		_playerLines pushBack ([[_thisBase] call milsim_fnc_getNameOfBase, 1, [0,1,0,1]]);
 
 		// Get players under this base
 		private _thisBasePlayers = _timeoutPlayers select {_x#1 isEqualTo _thisBase};
@@ -35,7 +35,7 @@ if (count _timeoutPlayers > 0) then {
 		{ // for each player under this base, add a line
 			_x params ["_player", "_base", "_timeFiled"];
 			// get the closest base to the player
-			private _nearestBase = [_player] call milsim_reinsert_fnc_getNearestBase;
+			private _nearestBase = [_player] call milsim_fnc_getNearestBase;
 
 			// add player to array of players under bases
 			_playerLines pushBack ([format [
@@ -47,9 +47,9 @@ if (count _timeoutPlayers > 0) then {
 
 			// log to rpt
 			private _logParams = [
-				["filedAtBase", [_base] call milsim_reinsert_fnc_getBaseName],
+				["filedAtBase", [_base] call milsim_fnc_getNameOfBase],
 				["filedAtBaseDistance", _player distance _base],
-				["closestBase", [_nearestBase] call milsim_reinsert_fnc_getBaseName],
+				["closestBase", [_nearestBase] call milsim_fnc_getNameOfBase],
 				["closestBaseDistance", _player distance _nearestBase],
 				["maxDistanceSetting", _maxRangeToReady],
 				["inQueueDuration", diag_tickTime - _timeFiled]

functions/reinsert/server/fn_initServer.sqf

@@ -6,8 +6,8 @@
 if (!isServer) exitWith {};
 
 // array of all respawn modules in the mission, used as 'base' locations for reinsertion
-milsim_reinsert_bases = allMissionObjects "ModuleRespawnPosition_F";
-publicVariable "milsim_reinsert_bases";
+milsim_baseObjects = allMissionObjects "ModuleRespawnPosition_F";
+publicVariable "milsim_baseObjects";
 
 // register queue
 milsim_reinsert_reinsertionQueue = [];

functions/reinsert/server/fn_removeFromQueue.sqf

@@ -39,12 +39,12 @@ publicVariable "milsim_reinsert_reinsertionQueue";
 // get first entry (longest wait)
 (_unitArrs#0) params ["_player", "_base", "_timeFiled"]; // _unitArr = [unit, base, timeInQueue]
 // get the closest base to the player
-private _nearestBase = [_player] call milsim_reinsert_fnc_getNearestBase;
+private _nearestBase = [_player] call milsim_fnc_getNearestBase;
 // log to rpt
 private _logParams = [
-	["filedAtBase", [_base] call milsim_reinsert_fnc_getBaseName],
+	["filedAtBase", [_base] call milsim_fnc_getNameOfBase],
 	["filedAtBaseDistance", _player distance _base],
-	["closestBase", [_nearestBase] call milsim_reinsert_fnc_getBaseName],
+	["closestBase", [_nearestBase] call milsim_fnc_getNameOfBase],
 	["closestBaseDistance", _player distance _nearestBase],
 	["maxDistanceSetting", _maxRangeToReady],
 	["inQueueDuration", diag_tickTime - _timeFiled]

functions/reinsert/server/fn_returnReinsertQueueNotification.sqf

@@ -48,7 +48,7 @@ if (count _basesWithPeople isEqualTo 0) then {
 // forEach _basesWithPeople
 {
 	private _thisBase = _x;
-	private _baseName = [_thisBase] call milsim_reinsert_fnc_getBaseName;
+	private _baseName = [_thisBase] call milsim_fnc_getNameOfBase;
 	
 	// generate player lines for this base
 	private _playerLines = _queue select {

functions/reinsert/server/fn_validateQueue.sqf

@@ -7,16 +7,16 @@ private _maxRangeToReady = missionNamespace getVariable ["milsim_reinsert_settin
 
 	private _distanceToOriginalBase = _player distance _base;
 	// get the closest base to the player
-	private _nearestBase = [_player] call milsim_reinsert_fnc_getNearestBase;
+	private _nearestBase = [_player] call milsim_fnc_getNearestBase;
 	private _isCloseEnoughToAnyBase = (_player distance _nearestBase) < _maxRangeToReady;
 
 	if (not _isCloseEnoughToAnyBase || not (alive _player)) then {
 		// don't include player in updated queue
 		// log to rpt
 		private _logParams = [
-			["filedAtBase", [_base] call milsim_reinsert_fnc_getBaseName],
+			["filedAtBase", [_base] call milsim_fnc_getNameOfBase],
 			["filedAtBaseDistance", _player distance _base],
-			["closestBase", [_nearestBase] call milsim_reinsert_fnc_getBaseName],
+			["closestBase", [_nearestBase] call milsim_fnc_getNameOfBase],
 			["closestBaseDistance", _player distance _nearestBase],
 			["maxDistanceSetting", _maxRangeToReady],
 			["inQueueDuration", diag_tickTime - _timeFiled]
@@ -36,9 +36,9 @@ private _maxRangeToReady = missionNamespace getVariable ["milsim_reinsert_settin
 	// if player's base has changed, log to rpt
 	if (_base != _nearestBase) then {
 		private _logParams = [
-			["filedAtBase", [_base] call milsim_reinsert_fnc_getBaseName],
+			["filedAtBase", [_base] call milsim_fnc_getNameOfBase],
 			["filedAtBaseDistance", _player distance _base],
-			["closestBase", [_nearestBase] call milsim_reinsert_fnc_getBaseName],
+			["closestBase", [_nearestBase] call milsim_fnc_getNameOfBase],
 			["closestBaseDistance", _player distance _nearestBase],
 			["maxDistanceSetting", _maxRangeToReady],
 			["inQueueDuration", diag_tickTime - _timeFiled]

functions/settings/fn_addCBASettings.sqf

@@ -242,6 +242,32 @@
 	}
 ] call CBA_fnc_addSetting;
 
+//---------------------
+// Asset Diary and Markers Settings
+
+[
+	"milsim_fbcb2_assets_setting_detectionRangeFromBase", // variable
+	"SLIDER", // type
+	["Detection Range From Base", "The range from a base that assets will be detected"], // title
+	["17th Battalion", "Asset Diary and Markers"], // category
+	[0, 1000, 750, 0, false], // [_min, _max, _default, _trailingDecimals, _isPercentage]
+	true, // global setting
+	{
+		params ["_value"];
+		[
+			"fbcb2_assets",
+			"SETTING CHANGED",
+			[
+				[
+					"setting",
+					"milsim_fbcb2_assets_setting_detectionRangeFromBase"
+				],
+				["newValue", _value]
+			]
+		] call milsim_fnc_log;
+	}
+] call CBA_fnc_addSetting;
+
 diag_log text "[MILSIM] (settings) Custom CBA settings initialized";
 
 nil;

functions/util/fn_getNameOfBase.sqf

@@ -0,0 +1,17 @@
+params [["_base", objNull, [objNull]]];
+if (_base == objNull) exitWith {""};
+
+// get base name
+private _baseName = _base getVariable ["name", ""];
+// if (_baseName == "") then {
+// 	_baseName = format[
+// 		"near %1",
+// 		text (nearestLocation [_base, ["NameCity", "NameLocal"]])
+// 	]
+// };
+
+if (_baseName == "") then {
+	_baseName = _base call BIS_fnc_locationDescription;
+};
+
+_baseName;

functions/util/fn_getNearestBase.sqf

@@ -0,0 +1,10 @@
+params [["_object", objNull, [objNull]]];
+if (isNull _object) exitWith {objNull};
+
+private _bases = missionNamespace getVariable ["milsim_baseObjects", []];
+if (count _bases == 0) exitWith {objNull};
+
+// get nearest base (Module_Respawn_F)
+private _closestBase = [_bases, _object] call BIS_fnc_nearestPosition;
+if (isNull _closestBase) exitWith {objNull};
+_closestBase;