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

Update vehicles and weapons for The Contract DLC (MPSECURITY, v2545) #268

Closed
wants to merge 2 commits into from
Closed

Update vehicles and weapons for The Contract DLC (MPSECURITY, v2545) #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e55712
Update vehicles and weapons for The Contract DLC (MPSECURITY, v2545)
MichaelCoding25 Dec 19, 2021
8b6a518
Fix wrong hazardcan name
MichaelCoding25 Dec 19, 2021
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
27 changes: 17 additions & 10 deletions SharedClasses/PermissionsManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,16 +290,23 @@ public enum Permission
WPUnarmed,
WPVintagePistol,
WPWrench,
WPPlasmaPistol, // xmas 2018 dlc (1604)
WPPlasmaCarbine, // xmas 2018 dlc (1604)
WPPlasmaMinigun, // xmas 2018 dlc (1604)
WPStoneHatchet, // xmas 2018 dlc (1604)
WPCeramicPistol, // xmas 2019 dlc (1868)
WPNavyRevolver, // xmas 2019 dlc (1868)
//WPHazardCan, // xmas 2019 dlc (1868) (Does not have label text)
WPPericoPistol, // xmas 2020 dlc (2189)
WPMilitaryRifle, // xmas 2020 dlc (2189)
WPCombatShotgun, // xmas 2020 dlc (2189)
WPPlasmaPistol,
WPPlasmaCarbine,
WPPlasmaMinigun,
WPStoneHatchet,
// MPHEIST3 DLC (v 1868)
WPCeramicPistol,
WPNavyRevolver,
WPHazardCan,
// MPHEIST4 DLC (v 2189)
WPPericoPistol,
WPMilitaryRifle,
WPCombatShotgun,
// MPSECURITY DLC (v 2545)
WPEMPLauncher,
WPHeavyRifle,
WPFertilizerCan,
WPStunGunMP,
#endregion

// Weapon Loadouts Menu
Expand Down
59 changes: 43 additions & 16 deletions vMenu/data/ValidWeapon.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,19 +206,23 @@ private static void CreateWeaponsList()
{ "weapon_unarmed", GetLabelText("WTD_UNARMED") },
{ "weapon_vintagepistol", GetLabelText("WTD_VPISTOL") },
{ "weapon_wrench", GetLabelText("WTD_WRENCH") },
// DLC CHRISTMAS2018 (v 1604)
{ "weapon_raypistol", GetLabelText("WTD_RAYPISTOL") },
{ "weapon_raycarbine", GetLabelText("WTD_RAYCARBINE") },
{ "weapon_rayminigun", GetLabelText("WTD_RAYMINIGUN") },
{ "weapon_stone_hatchet", GetLabelText("WTD_SHATCHET") },
// DLC CHRISTMAS2019 (v 1868)
// MPHEIST3 DLC (v 1868)
{ "weapon_ceramicpistol", GetLabelText("WTD_CERPST") },
{ "weapon_navyrevolver", GetLabelText("WTD_REV_NV") },
{ "weapon_hazardcan", "Hazard Can" }, //(Does not have label text)
// DLC CHRISTMAS2020 (v 2189)
{ "weapon_hazardcan", GetLabelText("WTD_HAZARDCAN") },
// MPHEIST4 DLC (v 2189)
{ "weapon_gadgetpistol", GetLabelText("WTD_GDGTPST") },
{ "weapon_militaryrifle", GetLabelText("WTD_MLTRYRFL") },
{ "weapon_combatshotgun", GetLabelText("WTD_CMBSHGN") }
{ "weapon_combatshotgun", GetLabelText("WTD_CMBSHGN") },
// MPSECURITY DLC (v 2545)
{ "weapon_emplauncher", GetLabelText("WTD_EMPL") },
{ "weapon_heavyrifle", GetLabelText("WTD_HEAVYRIFLE") },
{ "weapon_fertilizercan", GetLabelText("WTD_FERTILIZERCAN") },
{ "weapon_stungun_mp", GetLabelText("WTD_STNGUNMP") },
};

public static readonly Dictionary<string, string> weaponNames = new Dictionary<string, string>()
Expand Down Expand Up @@ -309,19 +313,23 @@ private static void CreateWeaponsList()
{ "weapon_unarmed", GetLabelText("WT_UNARMED") },
{ "weapon_vintagepistol", GetLabelText("WT_VPISTOL") },
{ "weapon_wrench", GetLabelText("WT_WRENCH") },
// DLC CHRISTMAS2018 (v 1604)
{ "weapon_raypistol", GetLabelText("WT_RAYPISTOL") },
{ "weapon_raycarbine", GetLabelText("WT_RAYCARBINE") },
{ "weapon_rayminigun", GetLabelText("WT_RAYMINIGUN") },
{ "weapon_stone_hatchet", GetLabelText("WT_SHATCHET") },
// DLC CHRISTMAS2019 (v 1868)
// MPHEIST3 DLC (v 1868)
{ "weapon_ceramicpistol", GetLabelText("WT_CERPST") },
{ "weapon_navyrevolver", GetLabelText("WT_REV_NV") },
//{ "weapon_hazardcan", GetLabelText("WT_") }, (Does not have label text)
// DLC CHRISTMAS2020 (v 2189)
{ "weapon_hazardcan", GetLabelText("WT_HAZARDCAN") },
// MPHEIST4 DLC (v 2189)
{ "weapon_gadgetpistol", GetLabelText("WT_GDGTPST") },
{ "weapon_militaryrifle", GetLabelText("WT_MLTRYRFL") },
{ "weapon_combatshotgun", GetLabelText("WT_CMBSHGN") }
{ "weapon_combatshotgun", GetLabelText("WT_CMBSHGN") },
// MPSECURITY DLC (v 2545)
{ "weapon_emplauncher", GetLabelText("WT_EMPL") },
{ "weapon_heavyrifle", GetLabelText("WT_HEAVYRIFLE") },
{ "weapon_fertilizercan", GetLabelText("WT_FERTILIZERCAN") },
{ "weapon_stungun_mp", GetLabelText("WT_STNGUNMP") },
};
#endregion

Expand Down Expand Up @@ -414,19 +422,23 @@ private static void CreateWeaponsList()
["weapon_unarmed"] = Permission.WPUnarmed,
["weapon_vintagepistol"] = Permission.WPVintagePistol,
["weapon_wrench"] = Permission.WPWrench,
// DLC CHRISTMAS2018 (v 1604)
["weapon_raypistol"] = Permission.WPPlasmaPistol,
["weapon_raycarbine"] = Permission.WPPlasmaCarbine,
["weapon_rayminigun"] = Permission.WPPlasmaMinigun,
["weapon_stone_hatchet"] = Permission.WPStoneHatchet,
// DLC CHRISTMAS2019 (v 1868)
// MPHEIST3 DLC (v 1868)
["weapon_ceramicpistol"] = Permission.WPCeramicPistol,
["weapon_navyrevolver"] = Permission.WPNavyRevolver,
//["weapon_hazardcan"] = Permission.WPHazardCan, (Does not have label text)
// DLC CHRISTMAS2020 (v 2189)
["weapon_hazardcan"] = Permission.WPHazardCan,
// MPHEIST4 DLC (v 2189)
["weapon_gadgetpistol"] = Permission.WPPericoPistol,
["weapon_militaryrifle"] = Permission.WPMilitaryRifle,
["weapon_combatshotgun"] = Permission.WPCombatShotgun,
// MPSECURITY DLC (v 2545)
["weapon_emplauncher"] = Permission.WPEMPLauncher,
["weapon_heavyrifle"] = Permission.WPHeavyRifle,
["weapon_fertilizercan"] = Permission.WPFertilizerCan,
["weapon_stungun_mp"] = Permission.WPStunGunMP,
};
#endregion

Expand Down Expand Up @@ -789,8 +801,23 @@ private static void CreateWeaponsList()
["COMPONENT_SWITCHBLADE_VARMOD_VAR2"] = GetLabelText("WCT_SB_VAR2"),
["COMPONENT_VINTAGEPISTOL_CLIP_01"] = GetLabelText("WCT_CLIP1"),
["COMPONENT_VINTAGEPISTOL_CLIP_02"] = GetLabelText("WCT_CLIP2"),
// CHRISTMAS 2018 DLC (v 1604)
["COMPONENT_RAYPISTOL_VARMOD_XMAS18"] = GetLabelText("WCT_VAR_RAY18")
["COMPONENT_RAYPISTOL_VARMOD_XMAS18"] = GetLabelText("WCT_VAR_RAY18"),
// MPHEIST3 DLC (v 1868)
["COMPONENT_CERAMICPISTOL_CLIP_01"] = GetLabelText("WCT_CLIP1"),
["COMPONENT_CERAMICPISTOL_CLIP_02"] = GetLabelText("WCT_CLIP2"),
["COMPONENT_CERAMICPISTOL_SUPP"] = GetLabelText("WCT_SUPP"),
// MPHEIST4 DLC (v 2189)
["COMPONENT_MILITARYRIFLE_CLIP_01"] = GetLabelText("WCT_CLIP1"),
["COMPONENT_MILITARYRIFLE_CLIP_02"] = GetLabelText("WCT_CLIP2"),
["COMPONENT_MILITARYRIFLE_SIGHT_01"] = GetLabelText("WCT_MRFL_SIGHT"),
// MPSECURITY DLC (v 2545)
["COMPONENT_APPISTOL_VARMOD_SECURITY"] = GetLabelText("WCT_VAR_STUD"),
["COMPONENT_MICROSMG_VARMOD_SECURITY"] = GetLabelText("WCT_VAR_WEED"),
["COMPONENT_PUMPSHOTGUN_VARMOD_SECURITY"] = GetLabelText("WCT_VAR_BONE"),
["COMPONENT_HEAVYRIFLE_CLIP_01"] = GetLabelText("WCT_CLIP1"),
["COMPONENT_HEAVYRIFLE_CLIP_02"] = GetLabelText("WCT_CLIP2"),
["COMPONENT_HEAVYRIFLE_SIGHT_01"] = GetLabelText("WCT_HVYRFLE_SIG"),
["COMPONENT_HEAVYRIFLE_CAMO1"] = GetLabelText("WCT_VAR_FAM"),
};
#endregion

Expand Down
17 changes: 17 additions & 0 deletions vMenu/data/VehicleData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,10 +293,12 @@ public static class Vehicles
"ASEA",
"ASEA2",
"ASTEROPE",
"CINQUEMILA", // THE CONTRACT (MPSECURITY) DLC - Requires b2545
"COG55",
"COG552",
"COGNOSCENTI",
"COGNOSCENTI2",
"DEITY", // THE CONTRACT (MPSECURITY) DLC - Requires b2545
"EMPEROR",
"EMPEROR2",
"EMPEROR3",
Expand Down Expand Up @@ -330,12 +332,14 @@ public static class Vehicles
#region SUVs
public static List<string> SUVs { get; } = new List<string>()
{
"ASTRON", // THE CONTRACT (MPSECURITY) DLC - Requires b2545
"BALLER",
"BALLER2",
"BALLER3",
"BALLER4",
"BALLER5",
"BALLER6",
"BALLER7", // THE CONTRACT (MPSECURITY) DLC - Requires b2545
"BJXL",
"CAVALCADE",
"CAVALCADE2",
Expand All @@ -344,9 +348,12 @@ public static class Vehicles
"DUBSTA2",
"FQ2",
"GRANGER",
"GRANGER2", // THE CONTRACT (MPSECURITY) DLC - Requires b2545
"GRESLEY",
"HABANERO",
"HUNTLEY",
"IWAGEN", // THE CONTRACT (MPSECURITY) DLC - Requires b2545
"JUBILEE", // THE CONTRACT (MPSECURITY) DLC - Requires b2545
"LANDSTALKER",
"LANDSTALKER2", // SUMMER SPECIAL (MPSUM) DLC - Requires b2060
"MESA",
Expand Down Expand Up @@ -392,6 +399,7 @@ public static class Vehicles
"BLADE",
"BUCCANEER",
"BUCCANEER2",
"BUFFALO4", // THE CONTRACT (MPSECURITY) DLC - Requires b2545
"CHINO",
"CHINO2",
"CLIQUE",
Expand Down Expand Up @@ -533,6 +541,7 @@ public static class Vehicles
"COMET4",
"COMET5",
"COMET6", // LS TUNERS (MPTUNER) DLC - Requires b2372
"COMET7", // THE CONTRACT (MPSECURITY) DLC - Requires b2545
"COQUETTE",
"COQUETTE4", // SUMMER SPECIAL (MPSUM) DLC - Requires b2060
"CYPHER", // LS TUNERS (MPTUNER) DLC - Requires b2372
Expand Down Expand Up @@ -618,6 +627,7 @@ public static class Vehicles
"AUTARCH",
"BANSHEE2",
"BULLET",
"CHAMPION", // THE CONTRACT (MPSECURITY) DLC - Requires b2545
"CHEETAH",
"CYCLONE",
"DEVESTE",
Expand All @@ -627,6 +637,7 @@ public static class Vehicles
"FMJ",
"FURIA", // CASINO HEIST (MPHEIST3) DLC - Requires b2060
"GP1",
"IGNUS", // THE CONTRACT (MPSECURITY) DLC - Requires b2545
"INFERNUS",
"ITALIGTB",
"ITALIGTB2",
Expand Down Expand Up @@ -660,6 +671,7 @@ public static class Vehicles
"VOLTIC",
"VOLTIC2",
"XA21",
"ZENO", // THE CONTRACT (MPSECURITY) DLC - Requires b2545
"ZENTORNO",
"ZORRUSSO", // CASINO AND RESORT (MPVINEWOOD) DLC - Requires b2060
};
Expand Down Expand Up @@ -706,11 +718,13 @@ public static class Vehicles
"OPPRESSOR2",
"PCJ",
"RATBIKE",
"REEVER", // THE CONTRACT (MPSECURITY) DLC - Requires b2545
"RROCKET", // CASINO AND RESORT (MPVINEWOOD) DLC - Requires b2060
"RUFFIAN",
"SANCHEZ",
"SANCHEZ2",
"SANCTUS",
"SHINOBI", // THE CONTRACT (MPSECURITY) DLC - Requires b2545
"SHOTARO",
"SOVEREIGN",
"STRYDER", // CASINO HEIST (MPHEIST3) DLC - Requires b2060
Expand Down Expand Up @@ -767,6 +781,7 @@ public static class Vehicles
"MONSTER5",
"NIGHTSHARK",
"OUTLAW", // CASINO HEIST (MPHEIST3) DLC - Requires b2060
"PATRIOT3", // THE CONTRACT (MPSECURITY) DLC - Requires b2545
"RANCHERXL",
"RANCHERXL2",
"RCBANDITO",
Expand Down Expand Up @@ -902,6 +917,7 @@ public static class Vehicles
"YOUGA",
"YOUGA2",
"YOUGA3", // SUMMER SPECIAL (MPSUM) DLC - Requires b2060
"YOUGA4", // THE CONTRACT (MPSECURITY) DLC - Requires b2545
};
#endregion
#region Cycles
Expand Down Expand Up @@ -1102,6 +1118,7 @@ public static class Vehicles
"MULE2",
"MULE3",
"MULE4",
"MULE5", // THE CONTRACT (MPSECURITY) DLC - Requires b2545
"PACKER",
"PHANTOM",
"PHANTOM2",
Expand Down
23 changes: 14 additions & 9 deletions vMenuServer/config/permissions.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,15 +459,20 @@ add_ace builtin.everyone "vMenu.WeaponOptions.All" allow
# add_ace builtin.everyone "vMenu.WeaponOptions.Unarmed" allow
# add_ace builtin.everyone "vMenu.WeaponOptions.VintagePistol" allow
# add_ace builtin.everyone "vMenu.WeaponOptions.Wrench" allow
# add_ace builtin.everyone "vMenu.WeaponOptions.PlasmaPistol" allow # xmas 2018 dlc (1604)
# add_ace builtin.everyone "vMenu.WeaponOptions.PlasmaCarbine" allow # xmas 2018 dlc (1604)
# add_ace builtin.everyone "vMenu.WeaponOptions.PlasmaMinigun" allow # xmas 2018 dlc (1604)
# add_ace builtin.everyone "vMenu.WeaponOptions.StoneHatchet" allow # xmas 2018 dlc (1604)
# add_ace builtin.everyone "vMenu.WeaponOptions.CeramicPistol" allow # xmas 2019 dlc (1868)
# add_ace builtin.everyone "vMenu.WeaponOptions.NavyRevolver" allow # xmas 2019 dlc (1868)
# add_ace builtin.everyone "vMenu.WeaponOptions.PericoPistol" allow # xmas 2020 dlc (2189)
# add_ace builtin.everyone "vMenu.WeaponOptions.MilitaryRifle" allow # xmas 2020 dlc (2189)
# add_ace builtin.everyone "vMenu.WeaponOptions.CombatShotgun" allow # xmas 2020 dlc (2189)
# add_ace builtin.everyone "vMenu.WeaponOptions.PlasmaPistol" allow
# add_ace builtin.everyone "vMenu.WeaponOptions.PlasmaCarbine" allow
# add_ace builtin.everyone "vMenu.WeaponOptions.PlasmaMinigun" allow
# add_ace builtin.everyone "vMenu.WeaponOptions.StoneHatchet" allow
# add_ace builtin.everyone "vMenu.WeaponOptions.CeramicPistol" allow # mpheist3 dlc (1868)
# add_ace builtin.everyone "vMenu.WeaponOptions.NavyRevolver" allow # mpheist3 dlc (1868)
# add_ace builtin.everyone "vMenu.WeaponOptions.HazardCan" allow # mpheist3 dlc (1868)
# add_ace builtin.everyone "vMenu.WeaponOptions.PericoPistol" allow # mpheist4 dlc (2189)
# add_ace builtin.everyone "vMenu.WeaponOptions.MilitaryRifle" allow # mpheist4 dlc (2189)
# add_ace builtin.everyone "vMenu.WeaponOptions.CombatShotgun" allow # mpheist4 dlc (2189)
# add_ace builtin.everyone "vMenu.WeaponOptions.EMPLauncher" allow # mpsecurity dlc (2545)
# add_ace builtin.everyone "vMenu.WeaponOptions.HeavyRifle" allow # mpsecurity dlc (2545)
# add_ace builtin.everyone "vMenu.WeaponOptions.FertilizerCan" allow # mpsecurity dlc (2545)
# add_ace builtin.everyone "vMenu.WeaponOptions.StunGunMP" allow # mpsecurity dlc (2545)

####################################
# WEAPON LOADOUTS MENU #
Expand Down