Updated after merged

7Cav · Apr 1, 2024 · 88c65a8 · 88c65a8
1 parent a3dfda6
commit 88c65a8
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 11 deletions.
diff --git a/cScripts/Loadouts/CfgLoadouts_Alpha_Rotary.hpp b/cScripts/Loadouts/CfgLoadouts_Alpha_Rotary.hpp
@@ -26,7 +26,7 @@ class Cav_B_A_Helicopter_Tra_DoorGunner_F: Cav_B_A_Helicopter_Tra_CrewChief_F {
     displayName = "$STR_Cav_Alpha_Characters_A_Helicopter_Tra_DoorGunner";
     scope = 2;
     abilityMedic = 1;
-    role = "rotarycls";
+    equipmentTags[] = {"role_rotarycrew", "tag_cls"};
     loadout = [["rhs_weap_m4a1_blockII_grip_bk","ACE_muzzle_mzls_L","acc_pointer_IR","rhsusf_acc_ACOG_RMR",["ACE_30Rnd_556x45_Stanag_M995_AP_mag",30],[],"rhsusf_acc_rvg_blk"],[],["rhsusf_weap_glock17g4","","acc_flashlight_pistol","",["rhsusf_mag_17Rnd_9x19_JHP",17],[],""],["USP_G3C_RS2_MC",[["ACE_Banana",1],["ACE_EarPlugs",1],["ACE_MapTools",1],["ACE_microDAGR",1],["ACE_tourniquet",4],["ACE_splint",4],["ACE_packingBandage",20],["kat_Painkiller",2,10]]],["UK3CB_V_Pilot_Vest",[["ACE_IR_Strobe_Item",2],["kat_chestSeal",2],["kat_guedel",1],["kat_ncdKit",1],["kat_Pulseoximeter",1],["ACE_elasticBandage",20],["ACE_quikclot",20],["ACE_splint",2],["ACE_tourniquet",2],["SmokeShellRed",2,1],["SmokeShell",4,1],["ACE_30Rnd_556x45_Stanag_M995_AP_mag",6,30],["rhsusf_mag_17Rnd_9x19_JHP",1,17],["SmokeShellPurple",2,1],["ACE_HandFlare_Green",2,1],["SmokeShellBlue",2,1],[["hgun_Pistol_Signal_F","","","",[],[],""],1]]],["USP_TACTICAL_PACK_CCT2",[["H_Cap_tan",1],["ACE_CableTie",2],["ACE_EntrenchingTool",1],["ToolKit",1],["rhsusf_m112_mag",1,1]]],"rhsusf_hgu56p_visor_mask","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemcTab","","ItemCompass","ACE_Altimeter","NVGogglesB_blk_F"]];
 };
 

diff --git a/cScripts/Loadouts/CfgLoadouts_Bravo_Viking.hpp b/cScripts/Loadouts/CfgLoadouts_Bravo_Viking.hpp
@@ -110,7 +110,7 @@ class Cav_B_B_Scout_CombatLifeSaver_F: Cav_B_B_Scout_Base_F {
     loadout = [["rhs_weap_m4a1_blockII_KAC","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15","rhsusf_acc_ACOG_RMR",["rhs_mag_30Rnd_556x45_M855A1_PMAG",30],[],"rhsusf_acc_grip2"],[],[],["USP_G3C_RS_KP_OR_MC",[["ACE_packingBandage",10],["ACE_quikclot",10],["ACE_tourniquet",4],["ACE_microDAGR",1],["ACE_Flashlight_XL50",1],["ACE_MapTools",1],["ACE_splint",4]]],["USP_CRYE_JPC_ASLTB",[["kat_CarbonateItem",1],["ACE_epinephrine",3],["kat_phenylephrineAuto",3],["HandGrenade",4,1],["SmokeShell",4,1],["ACE_Chemlight_IR",2,1],["rhs_mag_mk3a2",4,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG",8,30]]],["USP_DELTA_BAG_MC",[["ACE_EntrenchingTool",1],["ACE_packingBandage",40],["ACE_quikclot",40],["ACE_tourniquet",12],["ACE_splint",8],["ACE_EarPlugs",2],["kat_chestSeal",10],["kat_guedel",10],["kat_ncdKit",5],["kat_pocketBVM",1],["kat_accuvac",1],["kat_Painkiller",3,10]]],"USP_OPS_FASTXP_TAN_MC_03","USP_MFRAME_BLK2",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ItemWatch","USP_PVS15"]];
     insignia = "cav_insignia_specialized_cls";
     abilityMedic = 1;
-    role = "medic";
+    equipmentTags[] = {"tag_medic"};
     icon = "iconManMedic";
 };
 

diff --git a/cScripts/Loadouts/CfgLoadouts_Charlie_Squad.hpp b/cScripts/Loadouts/CfgLoadouts_Charlie_Squad.hpp
@@ -77,7 +77,7 @@ class Cav_B_C_CombatLifeSaver_F: Cav_B_Charlie_base_F {
     category[] += {"cScripts_Loadout_Cat_Charlie_Squad"};
     loadout = [["rhs_weap_m4a1_blockII_KAC","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15","rhsusf_acc_ACOG_RMR",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan",30],[],""],[],[],["USP_G3C_CU_KP_OR_MC",[["ACE_tourniquet",4],["ACE_Flashlight_XL50",1],["ACE_MapTools",1],["ACE_microDAGR",1],["ACE_packingBandage",14],["ACE_splint",2],["ACE_EarPlugs",1],["ACE_Chemlight_IR",2,1]]],["USP_CRYE_JPC_DMB",[["SmokeShell",4,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan",9,30],["HandGrenade",2,1],["SmokeShellBlue",1,1],["SmokeShellPurple",1,1]]],["USP_DELTA_BAG_MC",[["USP_PVS15",1],["ACE_packingBandage",40],["ACE_quikclot",40],["ACE_EntrenchingTool",1],["ACE_splint",8],["ACE_tourniquet",12],["kat_chestSeal",10],["ACE_epinephrine",3],["kat_guedel",10],["kat_ncdKit",5],["kat_pocketBVM",1],["kat_accuvac",1],["kat_phenylephrineAuto",3],["kat_CarbonateItem",1],["kat_Painkiller",7,10]]],"USP_OPSCORE_FASTMTC_GSW","USP_MFRAME_TAN",[],["ItemMap","","","ItemCompass","ACE_Altimeter",""]];    insignia = "cav_insignia_specialized_cls";
     abilityMedic = 1;
-    role = "cls";
+    equipmentTags[] = {"tag_cls"};
     icon = "iconManMedic";
 };
 class Cav_B_C_Marksman_F_Local: Cav_B_Charlie_base_F {

diff --git a/cScripts/functions/systems/fn_getArsenalWhitelist.sqf b/cScripts/functions/systems/fn_getArsenalWhitelist.sqf
@@ -47,16 +47,12 @@ private _tagGear = [];
         case "role_pilot";
         case "role_rotarypilot": {GET_CONTAINER_KEYS("arsenal_role_rotarypilot");};
         case "role_rotarycrew": {GET_CONTAINER_KEYS("arsenal_role_pilotcrew");};
-        case "role_rotarycls": {
-            private _rotaryRole = GET_CONTAINER_KEYS("arsenal_role_pilotcrew");
-            private _clsRole = GET_CONTAINER_KEYS("arsenal_role_cls");
-            _rotaryRole + _clsRole;
-        };
         case "role_pilotfighter": {GET_CONTAINER_KEYS("arsenal_role_pilotfighter");};
         case "role_pilottransport": {GET_CONTAINER_KEYS("arsenal_role_pilottransport");};
-        case "role_cls": {GET_CONTAINER_KEYS("arsenal_role_cls");};
-        case "role_medic": {GET_CONTAINER_KEYS("arsenal_role_medic");};
-        case "role_doctor": {GET_CONTAINER_KEYS("arsenal_role_doctor");};
+
+        case "tag_cls": {GET_CONTAINER_KEYS("arsenal_role_cls");};
+        case "tag_medic": {GET_CONTAINER_KEYS("arsenal_role_medic");};
+        case "tag_doctor": {GET_CONTAINER_KEYS("arsenal_role_doctor");};
         default {[]};
     };
     _tagGear append _x;