Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated the weapons specific arsenal to add launcher and handgun slots #1151

Merged
merged 7 commits into from
Apr 1, 2024
Merged

Updated the weapons specific arsenal to add launcher and handgun slots #1151

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bd69fe1
Add new launchers and handguns categories
pool011 Mar 29, 2024
bb17c76
Spelling mistake
pool011 Mar 29, 2024
84a491c
Remove launchers from "weapons" role
pool011 Mar 29, 2024
9ccf2c5
Add pistol magazines to all roles that have pistols as an option
pool011 Mar 29, 2024
ae5f8c6
Remove M9 from possible sidearms
pool011 Mar 29, 2024
390063f
Stowaway comma
pool011 Mar 30, 2024
a4e721e
Merge branch 'main' into javelin-control
AndreasBrostrom Apr 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 26 additions & 10 deletions cScripts/functions/init/fn_init_logistics.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1511,6 +1511,7 @@ private _dataArray = [
["ACE_HuntIR_monitor", 0],
["ItemAndroid", 0],
["rhsusf_weap_glock17g4", 0],
["rhsusf_mag_17Rnd_9x19_FMJ",0],
["USP_VEST_STRANDHOGG2_MC", 0],
["USP_VEST_STRANDHOGG2_CBR", 0],
["ACE_Vector", 0],
Expand All @@ -1531,6 +1532,7 @@ private _dataArray = [
["ACE_microDAGR", 0],
["ACE_MX2A", 0],
["rhsusf_weap_glock17g4", 0],
["rhsusf_mag_17Rnd_9x19_FMJ",0],
["USP_VEST_STRANDHOGG2_MC", 0],
["USP_VEST_STRANDHOGG2_CBR", 0],
["ACE_HuntIR_monitor", 0],
Expand All @@ -1547,15 +1549,6 @@ private _dataArray = [
["UK3CB_US_B_B_RIF_OCP_Radio", 0]
]],
["arsenal_role_weapons", [
// Launchers
["rhs_weap_maaws", 0],
["launch_MRAWS_green_F", 0],
["launch_MRAWS_sand_F", 0],
["launch_MRAWS_olive_F", 0],
["rhs_weap_fgm148",0],
["rhs_weap_fim92",0],


// MAAWS ammo
["MRAWS_HEAT_F", 0],
["MRAWS_HE_F", 0],
Expand Down Expand Up @@ -1900,8 +1893,31 @@ private _dataArray = [
["rhsusf_acc_wmx", 0],
["rhsusf_acc_wmx_bk", 0],
["acc_flashlight", 0]
]]
]],
["arsenal_weap_launchers", [
// Launchers
["launch_MRAWS_green_F", 0],
["launch_MRAWS_sand_F", 0],
["launch_MRAWS_olive_F", 0],
["rhs_weap_fgm148",0],
["rhs_weap_fim92",0],

// Launcher ammo
["MRAWS_HEAT_F", 0],
["MRAWS_HE_F", 0],
["MAA_MAAWS_ASM509", 0],
["MAA_MAAWS_HEDP502", 0],
["MAA_MAAWS_GMM_MT", 0],
["MAA_MAAWS_MT756", 0],
["rhs_fgm148_magazine_AT",0],
["rhs_fim92_mag",0]
]],
["arsenal_weap_sidearm",[
["rhsusf_weap_glock17g4",0],
["rhsusf_weap_m1911a1",0],
["rhsusf_mag_7x45acp_MHP",0],
["rhsusf_mag_17Rnd_9x19_FMJ",0]
]]
];

private _return = createHashMapFromArray _dataArray;
Expand Down
29 changes: 24 additions & 5 deletions cScripts/functions/systems/fn_getArsenalWhitelist.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,24 +56,43 @@ private _roleSpecific = switch ([player] call EFUNC(gear,getLoadoutRole)) do {


private _primaryWeapon = if (!isNil{_loadout#0#0}) then {_loadout#0#0} else {""};
private _weaponSystemSpecific = switch (true) do {
private _primarySpecific = switch (true) do {
case (_primaryWeapon isKindof ['rhs_weap_mk18_m320', configFile >> 'CfgWeapons']
|| _primaryWeapon isKindof ['rhs_weap_m16a4_carryhandle_M203', configFile >> 'CfgWeapons']): {GET_CONTAINER_KEYS("arsenal_weap_ugl");};
|| _primaryWeapon isKindof ['rhs_weap_m16a4_carryhandle_M203', configFile >> 'CfgWeapons']
|| _primaryWeapon isKindof ['rhs_weap_m4a1_m320', configFile >> 'CfgWeapons']): {GET_CONTAINER_KEYS("arsenal_weap_ugl");};

case (_primaryWeapon isKindof ['rhs_weap_m4a1', configFile >> 'CfgWeapons']
|| _primaryWeapon isKindof ['rhs_weap_m16a4', configFile >> 'CfgWeapons']): {GET_CONTAINER_KEYS("arsenal_weap_m4");};

case (_primaryWeapon isKindof ['rhs_weap_sr25_ec', configFile >> 'CfgWeapons']): {GET_CONTAINER_KEYS("arsenal_weap_sr25");};

case (primaryWeapon player isKindof ['rhs_weap_m240_base', configFile >> 'CfgWeapons']): {GET_CONTAINER_KEYS("arsenal_weap_m240");};
case (_primaryWeapon isKindof ['rhs_weap_m240_base', configFile >> 'CfgWeapons']): {GET_CONTAINER_KEYS("arsenal_weap_m240");};

case (primaryWeapon player isKindof ['rhs_weap_m249_pip', configFile >> 'CfgWeapons']
case (_primaryWeapon isKindof ['rhs_weap_m249_pip', configFile >> 'CfgWeapons']
|| _primaryWeapon isKindof ['rhs_weap_m249_pip_L', configFile >> 'CfgWeapons']
|| _primaryWeapon isKindof ['rhs_weap_m249_pip_S', configFile >> 'CfgWeapons']): {GET_CONTAINER_KEYS("arsenal_weap_m249");};
default {[]};
};

private _handgunWeapon = if (!isNil{_loadout#2#0}) then {_loadout#2#0} else {""};
private _handgunSpecific = switch (true) do {
case (_handgunWeapon isKindOf ['rhs_weap_M320', configFile >> 'CfgWeapons']): {GET_CONTAINER_KEYS("arsenal_weap_ugl");};
case (_handgunWeapon isKindOf ['rhsusf_weap_glock17g4', configFile >> 'CfgWeapons']
|| _handgunWeapon isKindOf ['rhsusf_weap_m1911a1', configFile >> 'CfgWeapons']): {GET_CONTAINER_KEYS("arsenal_weap_sidearm");};
default {[]};
};

private _launcherWeapon = if (!isNil{_loadout#1#0}) then {_loadout#1#0} else {""};
private _launcherSpecific = switch (true) do {
case (_launcherWeapon isKindOf ['rhs_weap_fgm148', configFile >> 'CfgWeapons']
|| _launcherWeapon isKindof ['rhs_weap_fim92', configFile >> 'CfgWeapons']
|| _launcherWeapon isKindof ['rhs_weap_maaws', configFile >> 'CfgWeapons']
|| _launcherWeapon isKindof ['launch_MRAWS_green_F', configFile >> 'CfgWeapons']
|| _launcherWeapon isKindof ['launch_MRAWS_sand_F', configFile >> 'CfgWeapons']
|| _launcherWeapon isKindof ['launch_MRAWS_olive_F', configFile >> 'CfgWeapons']): {GET_CONTAINER_KEYS("arsenal_weap_launchers");};
default {[]};
};

private _whitelist = _commonGear + _unitItems + _companyItems + _roleSpecific + _medicGear + _weaponSystemSpecific;
private _whitelist = _commonGear + _unitItems + _companyItems + _roleSpecific + _medicGear + _primarySpecific + _handgunSpecific + _launcherSpecific;

_whitelist