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

inv_expan #13

Merged
hizumi merged 12 commits from inv_expan into main 2024-02-01 14:12:59 -06:00
Conversation 0 Commits 12 Files Changed 6 +369 -43
6 changed files with 369 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
description.ext
View File

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

4
functions/client/fn_bindEventHandlers.sqf
View File

@@ -43,11 +43,11 @@ addMissionEventHandler ["HandleChatMessage",
["ace_arsenal_displayClosed", { ["ace_arsenal_displayClosed", {
player remoteExec["milsim_fnc_logPlayerInventory", 0]; [player] remoteExec ["milsim_fnc_logPlayerInventory", 2];
}] call CBA_fnc_addEventHandler; }] call CBA_fnc_addEventHandler;
[missionNamespace, "arsenalClosed", { [missionNamespace, "arsenalClosed", {
player remoteExec["milsim_fnc_logPlayerInventory", 0]; [player] remoteExec ["milsim_fnc_logPlayerInventory", 2];
}] call BIS_fnc_addScriptedEventHandler; }] call BIS_fnc_addScriptedEventHandler;
diag_log text "[MILSIM] (client) event handlers bound"; diag_log text "[MILSIM] (client) event handlers bound";

223
functions/definitions/DisallowedEquipment.hpp Normal file
View File

@@ -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"
};
};
};

9
functions/init/fn_initPlayerLocal.sqf
View File

@@ -1,5 +1,14 @@
if ( !hasInterface ) exitWith {}; if ( !hasInterface ) exitWith {};
if (!isServer) then {
["milsim_logText", {
params [["_strArray", [""], [[]]]];
{
diag_log text _x;
} forEach _strArray;
}] call CBA_fnc_addEventHandler;
};
// define milsim_resupply_crateDefinitions // define milsim_resupply_crateDefinitions
call milsim_fnc_crateDefinitions; call milsim_fnc_crateDefinitions;

7
functions/init/fn_initServer.sqf
View File

@@ -58,7 +58,12 @@ publicVariable "milsim_var_rotaryAssets";
// Initializes the Dynamic Groups framework and groups // Initializes the Dynamic Groups framework and groups
["Initialize", [true]] call BIS_fnc_dynamicGroups; ["Initialize", [true]] call BIS_fnc_dynamicGroups;
["milsim_logText", {
params [["_strArray", [""], [[]]]];
{
diag_log text _x;
} forEach _strArray;
}] call CBA_fnc_addEventHandler;
missionNamespace setVariable ["milsim_complete", true]; missionNamespace setVariable ["milsim_complete", true];
diag_log text "[MILSIM] (initServer) milsim_complete: version 2.3"; diag_log text "[MILSIM] (initServer) milsim_complete: version 2.3";

168
functions/server/fn_logPlayerInventory.sqf
View File

@@ -1,56 +1,144 @@
/*
Function: milsim_fnc_logPlayerInventory
Description:
Checks a player's inventory for non-compliant items and logs results to all machines.
Author: Hizumi, EagleTrooper, IndigoFox
Parameters:
0: _player - <OBJECT> - Player to check inventory of.
Returns:
<ARRAY> - Array of strings to be logged.
*/
params [ params [
["_player", objNull, [objNull]] ["_player", objNull, [objNull]]
]; ];
if (!isPlayer _player) exitWith { diag_log("exitWith logPlayerInventory")}; if (!isPlayer _player) exitWith {
[
"logPlayerInventory",
"PARAM PLAYER IS NOT A PLAYER",
[["player", _player]]
] call milsim_fnc_log;
};
_items = []; // testing
_items append uniformItems _player; // test_old = compile preprocessFileLineNumbers "testold.sqf";
_items append vestItems _player; // test_new = compile preprocessFileLineNumbers "testnew.sqf";
_items append backpackItems _player; // player addItem "A3_GPNVG18_BLK_TI";
_items pushback hmd _player; // player addWeapon "SMA_HK417_16in";
_items pushback binocular _player; // player addItem "ej_VPS15";
_items append primaryWeaponItems _player; // player addItem "ACE_Banana";
_noncompliant = []; // INSTANTIATE VARS
_unlisted = []; private _foundItemsKeyValue = [];
private _allFoundItemsSoFar = [];
{ // GET PLAYER ITEMS
_item = _x; private _playerItems = [
_modes = getArray(configfile >> "CfgWeapons" >> _item >> "visionMode"); _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;
_subModes = [configfile >> "CfgWeapons" >> _item >> "ItemInfo" >> "OpticsModes", 1] call BIS_fnc_returnChildren; _playerItems pushBack (headgear _player);
_playerItems pushBack (uniform _player);
[
"logPlayerInventory",
"CHECKING PLAYER INVENTORY",
[_player] call milsim_fnc_addPlayerInfoToArray
] call milsim_fnc_log;
////////////////////////////////////////
// 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" ); _modes append getArray( _x >> "visionMode" );
} forEach _subModes; } forEach _subModes;
_restrictedItemList = ["A3_GPNVG18b_REC_TI","A3_GPNVG18_REC_TI","A3_GPNVG18b_TI","A3_GPNVG18_TI","A3_GPNVG18b_REC_BLK_TI","A3_GPNVG18_REC_BLK_TI","A3_GPNVG18b_BLK_TI","A3_GPNVG18_BLK_TI","NVGogglesB_gry_F","NVGogglesB_grn_F","NVGogglesB_blk_F","optic_Nightstalker","rhsusf_acc_anpas13gv1","Tier1_ANPVS10_Tan","rhsusf_acc_anpvs27","optic_tws_mg","optic_tws"];
if ( _x in _restrictedItemList ) then {
_noncompliant pushBackUnique _item;
};
if ((count _modes) isNotEqualTo 0) then { if ((count _modes) isNotEqualTo 0) then {
_modes = _modes apply { toLower _x }; // if the item has thermal capabilities and is not in the list anywhere else, include it
if ( "ti" in _modes ) then { "ti" in (_modes apply { toLower _x }) && not (_playerItem in _allFoundItemsSoFar);
_unlisted pushBackUnique _item; } else {
}; false;
}; };
} forEach _items;
{
diag_log text format["[MILSIM] (logPlayerInventory): %1 has a restricted inventory item: %2", name _player, getText( configfile >> "CfgWeapons" >> _x >> "displayName" )];
} forEach _noncompliant;
{
diag_log text format["[MILSIM] (logPlayerInventory): %1 has an unlisted thermal item: %2", name _player, getText( configfile >> "CfgWeapons" >> _x >> "displayName" )];
} forEach _unlisted;
if (((count _noncompliant) isEqualTo 0) && ((count _unlisted) isEqualTo 0)) then {
diag_log text format["[MILSIM] (logPlayerInventory): %1 inventory in compliance", name _player];
}; };
nil {
[_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;