Skip to content

Commit

Permalink
Merge pull request #363 from MichaelCoding25/Update-vMenu-To-The-Chop…
Browse files Browse the repository at this point in the history 
…-Shop-DLC

Add new content from The Chop Shop (mp2023_02)
  • Loading branch information
@XdGoldenTigerOfficial
XdGoldenTigerOfficial committed Dec 26, 2023
2 parents 06c8337 + 07d86c8 commit abbfeec
Show file tree
Hide file tree
Showing 4 changed files with 84 additions and 2 deletions.
5 changes: 5 additions & 0 deletions SharedClasses/PermissionsManager.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,12 @@ public enum Permission
WPCandyCane,
WPRailgunXM3,
WPAcidPackage,
// MP2023_01 DLC (V 2944)
WPTecPistol,
// MP2023_02 DLC (V 3095)
WPBattleRifle,
WPSnowLauncher,
WPHackingDevice,
#endregion

// Weapon Loadouts Menu
Expand Down
17 changes: 17 additions & 0 deletions vMenu/data/ValidWeapon.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,9 @@ private static void CreateWeaponsList()
{ "weapon_railgunxm3", GetLabelText("WTD_RAILGUNXM3") },
// MP2023_01 DLC (V 2944)
{ "weapon_tecpistol", GetLabelText("WTD_TECPISTOL") },
// MP2023_02 DLC (V 3095)
{ "weapon_battlerifle", GetLabelText("WTD_BATTLERIFLE") },
{ "weapon_snowlauncher", GetLabelText("WTD_SNOWLNCHR") },
};

public static readonly Dictionary<string, string> weaponNames = new()
Expand Down Expand Up @@ -376,6 +379,10 @@ private static void CreateWeaponsList()
{ "weapon_acidpackage", GetLabelText("WT_ACIDPACKAGE") },
// MP2023_01 DLC (V 2944)
{ "weapon_tecpistol", GetLabelText("WT_TECPISTOL") },
// MP2023_02 DLC (V 3095)
{ "weapon_battlerifle", GetLabelText("WT_BATTLERIFLE") },
{ "weapon_snowlauncher", GetLabelText("WT_SNOWLNCHR") },
{ "weapon_hackingdevice", GetLabelText("WT_HACKDEVICE") },
};
#endregion

Expand Down Expand Up @@ -495,6 +502,10 @@ private static void CreateWeaponsList()
["weapon_acidpackage"] = Permission.WPAcidPackage,
// MP2023_01 DLC (V 2944)
["weapon_tecpistol"] = Permission.WPTecPistol,
// MP2023_02 DLC (V 3095)
["weapon_battlerifle"] = Permission.WPBattleRifle,
["weapon_snowlauncher"] = Permission.WPSnowLauncher,
["weapon_hackingdevice"] = Permission.WPHackingDevice,
};
#endregion

Expand Down Expand Up @@ -912,6 +923,12 @@ private static void CreateWeaponsList()
["COMPONENT_MICROSMG_VARMOD_FRN"] = GetLabelText("WCT_MSMGFRN_VAR"),
["COMPONENT_CARBINERIFLE_VARMOD_MICH"] = GetLabelText("WCT_CRBNMIC_VAR"),
["COMPONENT_RPG_VARMOD_TVR"] = GetLabelText("WCT_RPGTVR_VAR"),
// MP2023_02 DLC (V 3095)
["COMPONENT_BATTLERIFLE_CLIP_01"] = GetLabelText("WCT_CLIP1"),
["COMPONENT_BATTLERIFLE_CLIP_02"] = GetLabelText("WCT_CLIP2"),
["COMPONENT_COMBATPISTOL_VARMOD_XMAS23"] = GetLabelText("WCT_COMPIST_XM"),
["COMPONENT_SPECIALCARBINE_VARMOD_XMAS23"] = GetLabelText("WCT_SPCR_XM"),
["COMPONENT_HEAVYSNIPER_VARMOD_XMAS23"] = GetLabelText("WCT_HVSP_XM"),
};
#endregion

Expand Down
33 changes: 33 additions & 0 deletions vMenu/data/VehicleData.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,7 @@ public static class Vehicles
"ASEA",
"ASEA2",
"ASTEROPE",
"ASTEROPE2", // CHOP SHOP (MP2023_02) DLC - Requires b3095
"CINQUEMILA", // THE CONTRACT (MPSECURITY) DLC - Requires b2545
"COG55",
"COG552",
Expand All @@ -388,6 +389,7 @@ public static class Vehicles
"FUGITIVE",
"GLENDALE",
"GLENDALE2", // SUMMER SPECIAL (MPSUM) DLC - Requires b2060
"IMPALER5", // CHOP SHOP (MP2023_02) DLC - Requires b3095
"INGOT",
"INTRUDER",
"LIMO2",
Expand Down Expand Up @@ -416,6 +418,7 @@ public static class Vehicles
#region SUVs
public static List<string> SUVs { get; } = new List<string>()
{
"ALEUTIAN", // CHOP SHOP (MP2023_02) DLC - Requires b3095
"ASTRON", // THE CONTRACT (MPSECURITY) DLC - Requires b2545
"BALLER",
"BALLER2",
Expand All @@ -424,10 +427,13 @@ public static class Vehicles
"BALLER5",
"BALLER6",
"BALLER7", // THE CONTRACT (MPSECURITY) DLC - Requires b2545
"BALLER8", // CHOP SHOP (MP2023_02) DLC - Requires b3095
"BJXL",
"CAVALCADE",
"CAVALCADE2",
"CAVALCADE3", // CHOP SHOP (MP2023_02) DLC - Requires b3095
"CONTENDER",
"DORADO", // CHOP SHOP (MP2023_02) DLC - Requires b3095
"DUBSTA",
"DUBSTA2",
"FQ2",
Expand All @@ -454,6 +460,7 @@ public static class Vehicles
"SERRANO",
"SQUADDIE", // CAYO PERICO (MPHEIST4) DLC - Requires b2189
"TOROS",
"VIVANITE", // CHOP SHOP (MP2023_02) DLC - Requires b3095
"XLS",
"XLS2",
};
Expand All @@ -462,10 +469,12 @@ public static class Vehicles
public static List<string> Coupes { get; } = new List<string>()
{
"COGCABRIO",
"DRIFTFR36", // CHOP SHOP (MP2023_02) DLC - Requires b3095
"EXEMPLAR",
"F620",
"FELON",
"FELON2",
"FR36", // CHOP SHOP (MP2023_02) DLC - Requires b3095
"JACKAL",
"KANJOSJ", // CRIMINAL ENTERPRISES (MPSUM2) DLC - Requires b2699
"ORACLE",
Expand Down Expand Up @@ -504,6 +513,8 @@ public static class Vehicles
"DOMINATOR6",
"DOMINATOR7", // LS TUNERS (MPTUNER) DLC - Requires b2372
"DOMINATOR8", // LS TUNERS (MPTUNER) DLC - Requires b2372
"DOMINATOR9", // CHOP SHOP (MP2023_02) DLC - Requires b3095
"DRIFTYOSEMITE", // CHOP SHOP (MP2023_02) DLC - Requires b3095
"DUKES",
"DUKES2",
"DUKES3", // SUMMER SPECIAL (MPSUM) DLC - Requires b2060
Expand All @@ -525,6 +536,7 @@ public static class Vehicles
"IMPALER2",
"IMPALER3",
"IMPALER4",
"IMPALER6", // CHOP SHOP (MP2023_02) DLC - Requires b3095
"IMPERATOR",
"IMPERATOR2",
"IMPERATOR3",
Expand Down Expand Up @@ -560,6 +572,7 @@ public static class Vehicles
"VAMOS",
"VIGERO",
"VIGERO2", // CRIMINAL ENTERPRISES (MPSUM2) DLC - Requires b2699
"VIGERO3", // CHOP SHOP (MP2023_02) DLC - Requires b3095
"VIRGO",
"VIRGO2",
"VIRGO3",
Expand Down Expand Up @@ -646,6 +659,12 @@ public static class Vehicles
"COUREUR", // SA MERCENARIES (MP2023_01) DLC - Requires b2944
"CYPHER", // LS TUNERS (MPTUNER) DLC - Requires b2372
"DRAFTER", // CASINO AND RESORT (MPVINEWOOD) DLC - Requires b2060
"DRIFTEUROS", // CHOP SHOP (MP2023_02) DLC - Requires b3095
"DRIFTFUTO", // CHOP SHOP (MP2023_02) DLC - Requires b3095
"DRIFTJESTER", // CHOP SHOP (MP2023_02) DLC - Requires b3095
"DRIFTREMUS", // CHOP SHOP (MP2023_02) DLC - Requires b3095
"DRIFTTAMPA", // CHOP SHOP (MP2023_02) DLC - Requires b3095
"DRIFTZR350", // CHOP SHOP (MP2023_02) DLC - Requires b3095
"ELEGY",
"ELEGY2",
"EUROS", // LS TUNERS (MPTUNER) DLC - Requires b2372
Expand Down Expand Up @@ -775,6 +794,7 @@ public static class Vehicles
"TIGON", // SUMMER SPECIAL (MPSUM) DLC - Requires b2060
"TORERO2", // CRIMINAL ENTERPRISES (MPSUM2) DLC - Requires b2699
"TURISMOR",
"TURISMO3", // CHOP SHOP (MP2023_02) DLC - Requires b3095
"TYRANT",
"TYRUS",
"VACCA",
Expand Down Expand Up @@ -914,6 +934,7 @@ public static class Vehicles
"TECHNICAL",
"TECHNICAL2",
"TECHNICAL3",
"TERMINUS", // CHOP SHOP (MP2023_02) DLC - Requires b3095
"TROPHYTRUCK",
"TROPHYTRUCK2",
"VAGRANT", // CASINO HEIST (MPHEIST3) DLC - Requires b2060
Expand Down Expand Up @@ -956,6 +977,8 @@ public static class Vehicles
"SLAMTRUCK", // CAYO PERICO (MPHEIST4) DLC - Requires b2189
"TOWTRUCK",
"TOWTRUCK2",
"TOWTRUCK3", // CHOP SHOP (MP2023_02) DLC - Requires b3095
"TOWTRUCK4", // CHOP SHOP (MP2023_02) DLC - Requires b3095
"TRACTOR", // Tractor (rusted/old)
"TRACTOR2", // Fieldmaster
"TRACTOR3", // Fieldmaster
Expand All @@ -982,7 +1005,9 @@ public static class Vehicles
"TRAILERS4", // White Container Trailer
"TRAILERS2", // Box Trailer
"TRAILERS3", // Ramp Box Trailer
"TRAILERS5", // CHOP SHOP (MP2023_02) DLC - Requires b3095
"TVTRAILER", // Fame or Shame Trailer
"TVTRAILER2", // CHOP SHOP (MP2023_02) DLC - Requires b3095
"TRAILERLOGS", // Logs Trailer
"TANKER", // Ron Oil Tanker Trailer
"TANKER2", // Ron Oil Tanker Trailer (Heist Version)
Expand All @@ -996,6 +1021,8 @@ public static class Vehicles

/// Small Trailers
"BOATTRAILER", // Small Boat Trailer
"BOATTRAILER2", // CHOP SHOP (MP2023_02) DLC - Requires b3095
"BOATTRAILER3", // CHOP SHOP (MP2023_02) DLC - Requires b3095
"RAKETRAILER", // Tractor Tow Plow/Rake
"TRAILERSMALL", // Small Utility Trailer
};
Expand All @@ -1012,6 +1039,7 @@ public static class Vehicles
"BOXVILLE3",
"BOXVILLE4",
"BOXVILLE5",
"BOXVILLE6", // CHOP SHOP (MP2023_02) DLC - Requires b3095
"BURRITO",
"BURRITO2",
"BURRITO3",
Expand Down Expand Up @@ -1199,10 +1227,12 @@ public static class Vehicles
"FIRETRUK",
"LGUARD",
"PBUS",
"POLGAUNTLET", // CHOP SHOP (MP2023_02) DLC - Requires b3095
"POLICE",
"POLICE2",
"POLICE3",
"POLICE4",
"POLICE5", // CHOP SHOP (MP2023_02) DLC - Requires b3095
"POLICEB",
"POLICEOLD1",
"POLICEOLD2",
Expand Down Expand Up @@ -1242,6 +1272,7 @@ public static class Vehicles
public static List<string> Commercial { get; } = new List<string>()
{
"BENSON",
"BENSON2", // CHOP SHOP (MP2023_02) DLC - Requires b3095
"BIFF",
"CERBERUS",
"CERBERUS2",
Expand All @@ -1257,6 +1288,7 @@ public static class Vehicles
"PHANTOM",
"PHANTOM2",
"PHANTOM3",
"PHANTOM4", // CHOP SHOP (MP2023_02) DLC - Requires b3095
"POUNDER",
"POUNDER2",
"STOCKADE",
Expand All @@ -1269,6 +1301,7 @@ public static class Vehicles
{
"CABLECAR",
"FREIGHT",
"FREIGHT2", // CHOP SHOP (MP2023_02) DLC - Requires b3095
"FREIGHTCAR",
"FREIGHTCONT1",
"FREIGHTCONT2",
Expand Down
Loading

0 comments on commit abbfeec

Please sign in to comment.