17th-Ranger-Battalion-ORG/MissionTemplate
6
0
Fork 0
Code Issues 1 Pull Requests Actions Projects 1 Releases 16 Wiki Activity

improve inventory check performance and logging #10

Merged
hizumi merged 5 commits from #7-inventory-compliance-message into inv_expan 2024-01-29 23:37:08 -06:00
Conversation 3 Commits 5 Files Changed 4 +307 -268
1 changed files with 307 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 93204f7d36 - Show all commits

137
functions/server/fn_logPlayerInventory.sqf
View File

@@ -5,35 +5,8 @@ params [
if (!isPlayer _player) exitWith { diag_log("exitWith logPlayerInventory")};
_items = [];
_ietms 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;
_unlisted = [];
_restricted = [];
_blacklist = [];
_tabbed = [];
_meme = [];
diag_log text format["[MILSIM] (logPlayerInventory): Checking %1 inventory.", name _player];
{
_blackListItems = [ // Items that NO member is allowed to use.
// 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
@@ -131,9 +104,9 @@ diag_log text format["[MILSIM] (logPlayerInventory): Checking %1 inventory.", na
"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.)
_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
@@ -172,9 +145,9 @@ diag_log text format["[MILSIM] (logPlayerInventory): Checking %1 inventory.", na
"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
_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
@@ -224,21 +197,79 @@ diag_log text format["[MILSIM] (logPlayerInventory): Checking %1 inventory.", na
"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
_memeItems = [ // Items that serve no purpose other than to MEME
"UK3CB_Cocaine_Brick",
"ACE_Banana"
];
// INSTANTIATE VARS
_unlisted = [];
_restricted = [];
_blacklist = [];
_tabbed = [];
_meme = [];
private _nonCompliantItemsCount = 0;
// PRIVATE FUNCTIONS
private _logItem = {
params ["_playerObj", "_categoryText", "_itemClassName"];
private _cfg = _itemClassName call CBA_fnc_getItemConfig;
diag_log text format[
"[MILSIM] (logPlayerInventory): Found %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 = [
_player, // Unit
true, // Include weapons, attachments, loaded magazines
true, // Include items in backpack
true, // Include items in vest
true, // Include items in uniform
true, // Include assigned items
true // Include not loaded magazines
] call CBA_fnc_uniqueUnitItems;
_items pushBack (headgear _player);
_items pushBack (uniform _player);
// CHECK INVENTORY
diag_log text format[
"[MILSIM] (logPlayerInventory): Checking inventory :: %1",
[_player] call _playerInfoString
];
{
_item = _x;
_modes = getArray(configfile >> "CfgWeapons" >> _item >> "visionMode");
@@ -274,32 +305,40 @@ diag_log text format["[MILSIM] (logPlayerInventory): Checking %1 inventory.", na
} forEach _items;
{
diag_log text format["[MILSIM] (logPlayerInventory): %1 has a blacklisted inventory item: %2", name _player, getText( configfile >> "CfgWeapons" >> _x >> "displayName" )];
_nonCompliantItemsCount = _nonCompliantItemsCount + 1;
[_player, "a blacklisted inventory item", _x] call _logItem;
} forEach _blacklist;
{
diag_log text format["[MILSIM] (logPlayerInventory): %1 has a restricted inventory item: %2", name _player, getText( configfile >> "CfgWeapons" >> _x >> "displayName" )];
_nonCompliantItemsCount = _nonCompliantItemsCount + 1;
[_player, "a restricted inventory item", _x] call _logItem;
} forEach _restricted;
{
diag_log text format["[MILSIM] (logPlayerInventory): %1 has a tabbed inventory item: %2", name _player, getText( configfile >> "CfgWeapons" >> _x >> "displayName" )];
_nonCompliantItemsCount = _nonCompliantItemsCount + 1;
[_player, "a tabbed inventory item", _x] call _logItem;
} forEach _tabbed;
{
diag_log text format["[MILSIM] (logPlayerInventory): %1 has a meme inventory item: %2", name _player, getText( configfile >> "CfgWeapons" >> _x >> "displayName" )];
_nonCompliantItemsCount = _nonCompliantItemsCount + 1;
[_player, "a meme inventory item", _x] call _logItem;
} forEach _meme;
{
diag_log text format["[MILSIM] (logPlayerInventory): %1 has an unlisted thermal item: %2", name _player, getText( configfile >> "CfgWeapons" >> _x >> "displayName" )];
if (
_x in _blackListItems ||
_x in _restrictedItems
) then {continue}; // Skip items that are already checked
_nonCompliantItemsCount = _nonCompliantItemsCount + 1;
[_player, "an unlisted thermal item", _x] call _logItem;
} forEach _unlisted;
if (
[_blacklist, _restricted, _tabbed, _meme, _unlisted] find {
count _x > 0
} isEqualTo -1
) then {
diag_log text format["[MILSIM] (logPlayerInventory): %1 inventory in fully base inventory compliant.", name _player];
if (_nonCompliantItemsCount isEqualTo 0) then {
diag_log text format["[MILSIM] (logPlayerInventory): %1's inventory is compliant :: playerName=""%1"" playerUID=""%2""", name _player, getPlayerUID _player];
};
nil