Skip to content

Commit

Permalink
Move weapon arsenal whitelists to init_logistics (#1051)
Browse files Browse the repository at this point in the history 
* Move weapon arsenal whitelists to init_logistics

* Fixed formating of arsenal items

* More concise naming of UGL category
  • Loading branch information
@pool011
pool011 authored Oct 17, 2023
1 parent 531984e commit 8263095
Show file tree
Hide file tree
Showing 2 changed files with 215 additions and 209 deletions.
211 changes: 210 additions & 1 deletion cScripts/functions/init/fn_init_logistics.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1342,7 +1342,7 @@ private _dataArray = [
["ACE_1Rnd_82mm_Mo_HE_LaserGuided", 0],
["ACE_1Rnd_82mm_Mo_Smoke", 0]
]],

// Roles
["arsenal_role_officer", [
["ACE_microDAGR", 0],
["ACE_HuntIR_monitor", 0],
Expand Down Expand Up @@ -1527,7 +1527,216 @@ private _dataArray = [
["USP_TACTICAL_PACK_MCB_CCT7", 0],
["USP_TACTICAL_PACK_MCB_CCT8", 0],
["UK3CB_US_B_B_RIF_OCP_Radio", 0]
]],
// Weapons
["arsenal_weap_ugl", [
["rhs_weap_m4a1_m320", 0],
["rhs_weap_mk18_m320", 0],
["rhs_weap_M320", 0],
["rhs_weap_m4a1_carryhandle", 0],
["rhs_weap_m4a1_carryhandle_mstock", 0],
["rhs_weap_m4a1", 0],
["rhs_weap_m4a1_mstock", 0],
["rhs_weap_m4a1_d", 0],
["rhs_weap_m4a1_d_mstock", 0],
["rhs_weap_m4a1_wd", 0],
["rhs_weap_m4a1_wd_mstock", 0],

["rhs_weap_m4a1_blockII", 0],
["rhs_weap_m4a1_blockII_KAC", 0],
["rhs_weap_m4a1_blockII_bk", 0],
["rhs_weap_m4a1_blockII_KAC_bk", 0],
["rhs_weap_m4a1_blockII_d", 0],
["rhs_weap_m4a1_blockII_KAC_d", 0],
["rhs_weap_m4a1_blockII_wd", 0],
["rhs_weap_m4a1_blockII_KAC_wd", 0],

["rhs_weap_mk18", 0],
["rhs_weap_mk18_bk", 0],
["rhs_weap_mk18_KAC_bk", 0],
["rhs_weap_mk18_d", 0],
["rhs_weap_mk18_KAC_d", 0],
["rhs_weap_mk18_KAC", 0],
["rhs_weap_mk18_wd", 0],
["rhs_weap_mk18_KAC_wd", 0],

//Attachments
["rhsusf_acc_sf3p556", 0],
["rhsusf_acc_eotech", 0],
["rhsusf_acc_g33_t1", 0],
["rhsusf_acc_g33_xps3", 0],
["rhsusf_acc_g33_xps3_tan", 0],
["rhsusf_acc_elcan", 0],
["rhsusf_acc_acog", 0],
["rhsusf_acc_acog2", 0],
["rhsusf_acc_acog3", 0],
["rhsusf_acc_eotech_552", 0],
["rhsusf_acc_eotech_552_d", 0],
["rhsusf_acc_eotech_552_wd", 0],
["rhsusf_acc_compm4", 0],
["rhsusf_acc_su230", 0],
["rhsusf_acc_su230_c", 0],
["rhsusf_acc_su230_mrds", 0],
["rhsusf_acc_su230_mrds_c", 0],
["rhsusf_acc_t1_high", 0],
["rhsusf_acc_acog_rmr", 0],
["rhsusf_acc_acog_d", 0],
["rhsusf_acc_acog_wd", 0],
["rhsusf_acc_grip2", 0],
["rhsusf_acc_grip2_tan", 0],
["rhsusf_acc_grip2_wd", 0],
["rhsusf_acc_grip1", 0],
["rhsusf_acc_kac_grip", 0],
["rhsusf_acc_rvg_blk", 0],
["rhsusf_acc_rvg_de", 0],
["rhsusf_acc_tdstubby_blk", 0],
["rhsusf_acc_tdstubby_tan", 0],
["rhsusf_acc_grip3", 0],
["rhsusf_acc_grip3_tan", 0],
["rhsusf_acc_eotech_xps3", 0]
]],
["arsenal_weap_m4", [
["rhs_weap_m4a1_carryhandle", 0],
["rhs_weap_m4a1_carryhandle_mstock", 0],
["rhs_weap_m4a1", 0],
["rhs_weap_m4a1_mstock", 0],
["rhs_weap_m4a1_d", 0],
["rhs_weap_m4a1_d_mstock", 0],
["rhs_weap_m4a1_wd", 0],
["rhs_weap_m4a1_wd_mstock", 0],

["rhs_weap_m4a1_blockII", 0],
["rhs_weap_m4a1_blockII_KAC", 0],
["rhs_weap_m4a1_blockII_bk", 0],
["rhs_weap_m4a1_blockII_KAC_bk", 0],
["rhs_weap_m4a1_blockII_d", 0],
["rhs_weap_m4a1_blockII_KAC_d", 0],
["rhs_weap_m4a1_blockII_wd", 0],
["rhs_weap_m4a1_blockII_KAC_wd", 0],

["rhs_weap_mk18", 0],
["rhs_weap_mk18_bk", 0],
["rhs_weap_mk18_KAC_bk", 0],
["rhs_weap_mk18_d", 0],
["rhs_weap_mk18_KAC_d", 0],
["rhs_weap_mk18_KAC", 0],
["rhs_weap_mk18_wd", 0],
["rhs_weap_mk18_KAC_wd", 0],

//Attachments
["rhsusf_acc_sf3p556", 0],
["rhsusf_acc_eotech", 0],
["rhsusf_acc_g33_t1", 0],
["rhsusf_acc_g33_xps3", 0],
["rhsusf_acc_g33_xps3_tan", 0],
["rhsusf_acc_elcan", 0],
["rhsusf_acc_acog", 0],
["rhsusf_acc_acog2", 0],
["rhsusf_acc_acog3", 0],
["rhsusf_acc_eotech_552", 0],
["rhsusf_acc_eotech_552_d", 0],
["rhsusf_acc_eotech_552_wd", 0],
["rhsusf_acc_compm4", 0],
["rhsusf_acc_su230", 0],
["rhsusf_acc_su230_c", 0],
["rhsusf_acc_su230_mrds", 0],
["rhsusf_acc_su230_mrds_c", 0],
["rhsusf_acc_t1_high", 0],
["rhsusf_acc_acog_rmr", 0],
["rhsusf_acc_acog_d", 0],
["rhsusf_acc_acog_wd", 0],
["rhsusf_acc_grip2", 0],
["rhsusf_acc_grip2_tan", 0],
["rhsusf_acc_grip2_wd", 0],
["rhsusf_acc_grip1", 0],
["rhsusf_acc_kac_grip", 0],
["rhsusf_acc_rvg_blk", 0],
["rhsusf_acc_rvg_de", 0],
["rhsusf_acc_tdstubby_blk", 0],
["rhsusf_acc_tdstubby_tan", 0],
["rhsusf_acc_grip3", 0],
["rhsusf_acc_grip3_tan", 0],
["rhsusf_acc_eotech_xps3", 0]
]],
["arsenal_weap_sr25", [
["rhs_weap_sr25_ec", 0],
["rhs_weap_sr25_ec_d", 0],
["rhs_weap_sr25_ec_wd", 0],

//Magazines
["rhsusf_20Rnd_762x51_SR25_m118_special_Mag", 0],

//Attachments
["rhsusf_acc_harris_bipod", 0],
["rhsusf_acc_m8541_d", 0],
["rhsusf_acc_m8541_mrds", 0],
["rhsusf_acc_elcan_ard", 0],
["rhsusf_acc_su230a", 0],
["rhsusf_acc_su230a_c", 0],
["rhsusf_acc_su230a_mrds", 0],
["rhsusf_acc_su230a_mrds_c", 0],
["rhsusf_acc_m8541_wd", 0],
["rhsusf_acc_acog_mdo", 0]
]],
["arsenal_weap_m240", [
["rhs_weap_m240B", 0],
["rhs_weap_m240G", 0],

// Attachments
["rhsusf_acc_eotech", 0],
["rhsusf_acc_g33_t1", 0],
["rhsusf_acc_g33_xps3", 0],
["rhsusf_acc_g33_xps3_tan", 0],
["rhsusf_acc_eotech_552", 0],
["rhsusf_acc_eotech_552_d", 0],
["rhsusf_acc_eotech_552_wd", 0],
["rhsusf_acc_compm4", 0],
["rhsusf_acc_t1_high", 0],
["rhsusf_acc_elcan_ard", 0],
["rhsusf_acc_anpeq16a", 0],
["rhsusf_acc_su230a", 0],
["rhsusf_acc_su230a_c", 0],
["rhsusf_acc_su230a_mrds", 0],
["rhsusf_acc_su230a_mrds_c", 0],
["rhsusf_acc_acog_mdo", 0]
]],
["arsenal_weap_m249", [
["rhs_weap_m249_pip", 0],
["rhs_weap_m249_light_L", 0],
["rhs_weap_m249_pip_L_para", 0],
["rhs_weap_m249_pip_L", 0],
["rhs_weap_m249_pip_ris", 0],
["rhs_weap_m249_light_S", 0],
["rhs_weap_m249_pip_S_para", 0],
["rhs_weap_m249_pip_S", 0],

// Attachements
["rhsusf_acc_eotech", 0],
["rhsusf_acc_g33_t1", 0],
["rhsusf_acc_g33_xps3", 0],
["rhsusf_acc_g33_xps3_tan", 0],
["rhsusf_acc_elcan", 0],
["rhsusf_acc_acog", 0],
["rhsusf_acc_acog2", 0],
["rhsusf_acc_acog3", 0],
["rhsusf_acc_eotech_552", 0],
["rhsusf_acc_eotech_552_d", 0],
["rhsusf_acc_eotech_552_wd", 0],
["rhsusf_acc_compm4", 0],
["rhsusf_acc_su230", 0],
["rhsusf_acc_su230_c", 0],
["rhsusf_acc_su230_mrds", 0],
["rhsusf_acc_su230_mrds_c", 0],
["rhsusf_acc_t1_high", 0],
["rhsusf_acc_acog_rmr", 0],
["rhsusf_acc_acog_d", 0],
["rhsusf_acc_acog_wd", 0],
["rhsusf_acc_kac_grip_saw_bipod", 0],
["rhsusf_acc_grip4", 0],
["rhsusf_acc_grip4_bipod", 0],
["rhsusf_acc_saw_lw_bipod", 0]
]]

];

private _return = createHashMapFromArray _dataArray;
Expand Down
Loading

0 comments on commit 8263095

Please sign in to comment.