From cc5b8bbf45a122171230a817d830c5517918ca6e Mon Sep 17 00:00:00 2001 From: EagleTrooper Date: Sun, 14 Apr 2024 00:03:01 -0500 Subject: [PATCH] Update defines/DisallowedEquipment.hpp Updated Defines / Allowed Items for Tabbed Weapons to align with new announcement https://www.guilded.gg/Iceberg-gaming/groups/v3j2vAP3/channels/06d0c762-6a54-4657-9ed0-9d73763fcd1e/announcements/16nPOKxR --- defines/DisallowedEquipment.hpp | 102 +++++++++++++++++++++++++++----- 1 file changed, 87 insertions(+), 15 deletions(-) diff --git a/defines/DisallowedEquipment.hpp b/defines/DisallowedEquipment.hpp index d10c79b..92a9325 100644 --- a/defines/DisallowedEquipment.hpp +++ b/defines/DisallowedEquipment.hpp @@ -13,7 +13,7 @@ class DisallowedEquipment { items[] = { "17BN_ANPVS14", // NVG AN/PVS-14 "ej_PVS15D", // NVG AN/PVS-15 - "ej_VPS15", // NVG AN/PVS-15 + "ej_PVS15", // NVG AN/PVS-15 "LMG_Mk200_black_F", //Mk200 Series "LMG_Mk200_F", //Mk200 Series "rhs_weap_g36c", // G36 Series @@ -34,11 +34,6 @@ class DisallowedEquipment { "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 @@ -100,12 +95,6 @@ class DisallowedEquipment { "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 }; @@ -132,10 +121,9 @@ class DisallowedEquipment { "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 + "optic_tws_mg", // Thermal Optic "Tier1_ANPVS10_Tan", // Thermal Optic "Tier1_ATACR18_ADM_Black_Vanilla", //Nightforce Series Optic "Tier1_ATACR18_ADM_Black", //Nightforce Series Optic @@ -160,6 +148,7 @@ class DisallowedEquipment { label = "TABBED WEAPON"; description = "Items that are allowed for individuals with Ranger Tab."; items[] = { + "optic_tws", // Thermal Optic "arifle_MX_black_F", // MX Series "arifle_MX_F", // MX Series "arifle_MX_GL_black_F", // MX 3GL Series @@ -208,7 +197,90 @@ class DisallowedEquipment { "Tier1_SR25_ec_tan", // SR-25 Series "Tier1_SR25_ec", // SR-25 Series "Tier1_SR25_tan", // SR-25 Series - "Tier1_SR25" // SR-25 Series + "Tier1_SR25", // SR-25 Series + "rhsusf_weap_MP7A2", //MP7 Series + "rhsusf_weap_MP7A2_aor1", //MP7 Series + "rhsusf_weap_MP7A2_desert", //MP7 Series + "rhsusf_weap_MP7A2_folded", //MP7 Series + "rhsusf_weap_MP7A2_folded_aor1", //MP7 Series + "rhsusf_weap_MP7A2_folded_winter", //MP7 Series + "rhsusf_weap_MP7A2_folded_desert", //MP7 Series + "rhsusf_weap_MP7A2_winter", //MP7 Series + "UK3CB_MP510", //MP5 Series + "UK3CB_MP5A2", //MP5 Series + "UK3CB_MP5A3", //MP5 Series + "UK3CB_MP5A4", //MP5 Series + "UK3CB_MP5K", //MP5 Series + "UK3CB_MP5K_PDW", //MP5 Series + "UK3CB_MP5N", //MP5 Series + "UK3CB_MP5N_UGL", //MP5 Series + "UK3CB_MP5SD5", //MP5 Series + "UK3CB_MP5SD6", //MP5 Series + "SMG_03C_black", //P90 Series + "SMG_03C_camo", //P90 Series + "SMG_03C_hex", //P90 Series + "SMG_03C_khaki", //P90 Series + "SMG_03C_TR_black", //P90 Series + "SMG_03C_TR_camo", //P90 Series + "SMG_03C_TR_hex", //P90 Series + "SMG_03C_TR_khaki", //P90 Series + "UK3CB_P90C_black", //P90 Series + "UK3CB_P90C_camo", //P90 Series + "UK3CB_P90C_hex", //P90 Series + "UK3CB_P90C_khaki", //P90 Series + "UK3CB_P90C_TR_black", //P90 Series + "UK3CB_P90C_TR_camo", //P90 Series + "UK3CB_P90C_TR_hex", //P90 Series + "UK3CB_P90C_TR_khaki", //P90 Series + "UK3CB_P90_black", //P90 Series + "UK3CB_P90_camo", //P90 Series + "UK3CB_P90_hex", //P90 Series + "UK3CB_P90_khaki", //P90 Series + "UK3CB_P90_TR_black", //P90 Series + "UK3CB_P90_TR_camo", //P90 Series + "UK3CB_P90_TR_hex", //P90 Series + "UK3CB_P90_TR_khaki", //P90 Series + "UK3CB_M16_Carbine", //M16 Series + "UK3CB_M16_Carbine_eotech_552", //M16 Series + "UK3CB_M16_Carbine_sup", //M16 Series + "UK3CB_M16A1", //M16 Series + "UK3CB_M16A1_LSW", //M16 Series + "UK3CB_M16A2", //M16 Series + "UK3CB_M16A2_sup", //M16 Series + "UK3CB_M16A2_UGL", //M16 Series + "UK3CB_M16A2_UGL_eotech_552", //M16 Series + "UK3CB_M16A2_UGL_sup", //M16 Series + "UK3CB_M16A3", //M16 Series + "UK3CB_M16A3_eotech_552", //M16 Series + "UK3CB_M16A3_eotech_552_sup", //M16 Series + "UK3CB_M16A3_sup", //M16 Series + "UK3CB_M16A3_UGL", //M16 Series + "rhs_weap_m16a4", //M16 Series + "rhs_weap_m16a4_grip", //M16 Series + "rhs_weap_m16a4_grip_acog", //M16 Series + "rhs_weap_m16a4_grip2", //M16 Series + "rhs_weap_m16a4_grip3", //M16 Series + "rhs_weap_m16a4_bipod", //M16 Series + "rhs_weap_m16a4_acog_usmc", //M16 Series + "rhs_weap_m16a4_carryhandle", //M16 Series + "rhs_weap_m16a4_carryhandle_bipod", //M16 Series + "rhs_weap_m16a4_carryhandle_grip", //M16 Series + "rhs_weap_m16a4_carryhandle_M203", //M16 Series + "rhs_weap_m16a4_carryhandle_M203_grip", //M16 Series + "rhs_weap_m16a4_m203_acog_usmc", //M16 Series + "uk3cb_weap_m16a4_m203s_eotech_552_anpeq15_sup", //M16 Series + "rhs_weap_m16a4_imod", //M16 Series + "rhs_weap_m16a4_imod_grip", //M16 Series + "rhs_weap_m16a4_imod_grip2", //M16 Series + "rhs_weap_m16a4_imod_grip3", //M16 Series + "rhs_weap_m16a4_imod_M203", //M16 Series + "rhs_weap_m16a4_imod_M203_grip", //M16 Series + "rhs_weap_m16a4_carryhandle_grip2", //M16 Series + "rhs_weap_m16a4_carryhandle_grip3", //M16 Series + "rhs_weap_m16a4_grip_acog_usmc", //M16 Series + "rhs_weap_m16a4_grip_acog2_usmc", //M16 Series + "rhs_weap_m32", //M32/MGL Series + "rhs_weap_m32_usmc" //M32/MGL Series }; };