Skip to content

Commit

Permalink
Merge pull request TomGrobbe#303 from MichaelCoding25/update-vMenu-to…
Browse files Browse the repository at this point in the history
…-SA-Mercenaries-DLC

Add new content from San Andreas Mercenaries (mp2023_01)
  • Loading branch information
XdGoldenTigerOfficial authored and Drift91 committed Aug 3, 2023
1 parent ec2b0d8 commit b48f074
Show file tree
Hide file tree
Showing 6 changed files with 45 additions and 0 deletions.
1 change: 1 addition & 0 deletions SharedClasses/PermissionsManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,7 @@ public enum Permission
WPCandyCane,
WPRailgunXM3,
WPAcidPackage,
WPTecPistol,
#endregion

// Weapon Loadouts Menu
Expand Down
6 changes: 6 additions & 0 deletions vMenu/data/PedModels.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ public static class PedModels
public static List<uint> AnimalHashes = new List<uint>()
{
(uint)GetHashKey("a_c_boar"),
(uint)GetHashKey("a_c_boar_02"), // mp2023_01
(uint)GetHashKey("a_c_cat_01"),
(uint)GetHashKey("a_c_chickenhawk"),
(uint)GetHashKey("a_c_chimp"),
Expand All @@ -22,20 +23,24 @@ public static class PedModels
(uint)GetHashKey("a_c_cormorant"),
(uint)GetHashKey("a_c_cow"),
(uint)GetHashKey("a_c_coyote"),
(uint)GetHashKey("a_c_coyote_02"), // mp2023_01
(uint)GetHashKey("a_c_crow"),
(uint)GetHashKey("a_c_deer"),
(uint)GetHashKey("a_c_deer_02"), // mp2023_01
(uint)GetHashKey("a_c_dolphin"),
(uint)GetHashKey("a_c_fish"),
(uint)GetHashKey("a_c_hen"),
(uint)GetHashKey("a_c_humpback"),
(uint)GetHashKey("a_c_husky"),
(uint)GetHashKey("a_c_killerwhale"),
(uint)GetHashKey("a_c_mtlion"),
(uint)GetHashKey("a_c_mtlion_02"), // mp2023_01
(uint)GetHashKey("a_c_panther"), // mpheist4
(uint)GetHashKey("a_c_pig"),
(uint)GetHashKey("a_c_pigeon"),
(uint)GetHashKey("a_c_poodle"),
(uint)GetHashKey("a_c_pug"),
(uint)GetHashKey("a_c_pug_02"), // mp2023_01
(uint)GetHashKey("a_c_rabbit_01"),
(uint)GetHashKey("a_c_rabbit_02"), // mpchristmas3
(uint)GetHashKey("a_c_rat"),
Expand All @@ -46,6 +51,7 @@ public static class PedModels
(uint)GetHashKey("a_c_sharkhammer"),
(uint)GetHashKey("a_c_sharktiger"),
(uint)GetHashKey("a_c_shepherd"),
(uint)GetHashKey("a_c_stingray"),
(uint)GetHashKey("a_c_westy")
};
}
Expand Down
12 changes: 12 additions & 0 deletions vMenu/data/ValidWeapon.cs
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,8 @@ private static void CreateWeaponsList()
{ "weapon_pistolxm3", GetLabelText("WTD_PISTOLXM3") },
{ "weapon_candycane", GetLabelText("WTD_CANDYCANE") },
{ "weapon_railgunxm3", GetLabelText("WTD_RAILGUNXM3") },
// MP2023_01 DLC (V 2944)
{ "weapon_tecpistol", GetLabelText("WTD_TECPISTOL") },
};

public static readonly Dictionary<string, string> weaponNames = new Dictionary<string, string>()
Expand Down Expand Up @@ -345,6 +347,8 @@ private static void CreateWeaponsList()
{ "weapon_candycane", GetLabelText("WT_CANDYCANE") },
{ "weapon_railgunxm3", GetLabelText("WT_RAILGUNXM3") },
{ "weapon_acidpackage", GetLabelText("WT_ACIDPACKAGE") },
// MP2023_01 DLC (V 2944)
{ "weapon_tecpistol", GetLabelText("WT_TECPISTOL") },
};
#endregion

Expand Down Expand Up @@ -462,6 +466,8 @@ private static void CreateWeaponsList()
["weapon_candycane"] = Permission.WPCandyCane,
["weapon_railgunxm3"] = Permission.WPRailgunXM3,
["weapon_acidpackage"] = Permission.WPAcidPackage,
// MP2023_01 DLC (V 2944)
["weapon_tecpistol"] = Permission.WPTecPistol,
};
#endregion

Expand Down Expand Up @@ -873,6 +879,12 @@ private static void CreateWeaponsList()
["COMPONENT_KNIFE_VARMOD_XM3_07"] = GetLabelText("WCT_KNIFE_XM307"),
["COMPONENT_KNIFE_VARMOD_XM3_08"] = GetLabelText("WCT_KNIFE_XM308"),
["COMPONENT_KNIFE_VARMOD_XM3_09"] = GetLabelText("WCT_KNIFE_XM309"),
// MP2023_01 DLC (V 2944)
["COMPONENT_TECPISTOL_CLIP_01"] = GetLabelText("WCT_CLIP1"),
["COMPONENT_TECPISTOL_CLIP_02"] = GetLabelText("WCT_CLIP2"),
["COMPONENT_MICROSMG_VARMOD_FRN"] = GetLabelText("WCT_MSMGFRN_VAR"),
["COMPONENT_CARBINERIFLE_VARMOD_MICH"] = GetLabelText("WCT_CRBNMIC_VAR"),
["COMPONENT_RPG_VARMOD_TVR"] = GetLabelText("WCT_RPGTVR_VAR"),
};
#endregion

Expand Down
17 changes: 17 additions & 0 deletions vMenu/data/VehicleData.cs
Original file line number Diff line number Diff line change
Expand Up @@ -402,13 +402,16 @@ public static class Vehicles
public static List<string> Muscle { get; } = new List<string>()
{
"BLADE",
"BRIGHAM", // SA MERCENARIES (MP2023_01) DLC - Requires b2944
"BROADWAY", // DRUG WARS (MPCHRISTMAS3) DLC - Requires b2802
"BUCCANEER",
"BUCCANEER2",
"BUFFALO4", // THE CONTRACT (MPSECURITY) DLC - Requires b2545
"BUFFALO5", // SA MERCENARIES (MP2023_01) DLC - Requires b2944
"CHINO",
"CHINO2",
"CLIQUE",
"CLIQUE2", // SA MERCENARIES (MP2023_01) DLC - Requires b2944
"COQUETTE3",
"DEVIANT",
"DOMINATOR",
Expand Down Expand Up @@ -558,6 +561,7 @@ public static class Vehicles
"COQUETTE",
"COQUETTE4", // SUMMER SPECIAL (MPSUM) DLC - Requires b2060
"CORSITA", // CRIMINAL ENTERPRISES (MPSUM2) DLC - Requires b2699
"COUREUR", // SA MERCENARIES (MP2023_01) DLC - Requires b2944
"CYPHER", // LS TUNERS (MPTUNER) DLC - Requires b2372
"DRAFTER", // CASINO AND RESORT (MPVINEWOOD) DLC - Requires b2060
"ELEGY",
Expand All @@ -570,6 +574,7 @@ public static class Vehicles
"FUSILADE",
"FUTO",
"FUTO2", // LS TUNERS (MPTUNER) DLC - Requires b2372
"GAUNTLET6", // SA MERCENARIES (MP2023_01) DLC - Requires b2944
"GB200",
"GROWLER", // LS TUNERS (MPTUNER) DLC - Requires b2372
"HOTRING",
Expand Down Expand Up @@ -622,6 +627,7 @@ public static class Vehicles
"SM722", // CRIMINAL ENTERPRISES (MPSUM2) DLC - Requires b2699
"SPECTER",
"SPECTER2",
"STINGERTT", // SA MERCENARIES (MP2023_01) DLC - Requires b2944
"SUGOI", // CASINO HEIST (MPHEIST3) DLC - Requires b2060
"SULTAN",
"SULTAN2", // CASINO HEIST (MPHEIST3) DLC - Requires b2060
Expand Down Expand Up @@ -797,6 +803,7 @@ public static class Vehicles
"EVERON", // CASINO HEIST (MPHEIST3) DLC - Requires b2060
"FREECRAWLER",
"HELLION", // CASINO AND RESORT (MPVINEWOOD) DLC - Requires b2060
"L35", // SA MERCENARIES (MP2023_01) DLC - Requires b2944
"INSURGENT",
"INSURGENT2",
"INSURGENT3",
Expand All @@ -809,11 +816,13 @@ public static class Vehicles
"MONSTER3",
"MONSTER4",
"MONSTER5",
"MONSTROCITI", // SA MERCENARIES (MP2023_01) DLC - Requires b2944
"NIGHTSHARK",
"OUTLAW", // CASINO HEIST (MPHEIST3) DLC - Requires b2060
"PATRIOT3", // THE CONTRACT (MPSECURITY) DLC - Requires b2545
"RANCHERXL",
"RANCHERXL2",
"RATEL", // SA MERCENARIES (MP2023_01) DLC - Requires b2944
"RCBANDITO",
"REBEL",
"REBEL2",
Expand Down Expand Up @@ -942,6 +951,7 @@ public static class Vehicles
"SPEEDO",
"SPEEDO2",
"SPEEDO4",
"SPEEDO5", // SA MERCENARIES (MP2023_01) DLC - Requires b2944
"SURFER",
"SURFER2",
"SURFER3", // DRUG WARS (MPCHRISTMAS3) DLC - Requires b2802
Expand All @@ -958,6 +968,8 @@ public static class Vehicles
"BMX",
"CRUISER",
"FIXTER",
"INDUCTOR", // SA MERCENARIES (MP2023_01) DLC - Requires b2944
"INDUCTOR2", // SA MERCENARIES (MP2023_01) DLC - Requires b2944
"SCORCHER",
"TRIBIKE",
"TRIBIKE2",
Expand Down Expand Up @@ -1008,6 +1020,7 @@ public static class Vehicles
"CARGOBOB3",
"CARGOBOB4",
"CONADA", // CRIMINAL ENTERPRISES (MPSUM2) DLC - Requires b2699
"CONADA2", // SA MERCENARIES (MP2023_01) DLC - Requires b2944
"FROGGER",
"FROGGER2",
"HAVOK",
Expand Down Expand Up @@ -1035,6 +1048,8 @@ public static class Vehicles
"ALPHAZ1",
"AVENGER",
"AVENGER2",
"AVENGER3", // SA MERCENARIES (MP2023_01) DLC - Requires b2944
"AVENGER4", // SA MERCENARIES (MP2023_01) DLC - Requires b2944
"BESRA",
"BLIMP",
"BLIMP2",
Expand All @@ -1059,10 +1074,12 @@ public static class Vehicles
"NIMBUS",
"NOKOTA",
"PYRO",
"RAIJU", // SA MERCENARIES (MP2023_01) DLC - Requires b2944
"ROGUE",
"SEABREEZE",
"SHAMAL",
"STARLING",
"STEAMER216", // SA MERCENARIES (MP2023_01) DLC - Requires b2944
"STRIKEFORCE",
"STUNT",
"TITAN",
Expand Down
8 changes: 8 additions & 0 deletions vMenu/menus/PlayerAppearance.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1460,6 +1460,7 @@ private void RefreshCustomizationMenu()
["csb_ary_02"] = "ARY02Cutscene", // mpsecurity
["csb_avery"] = "AveryCutscene", // mpvinewood
["csb_avischwartzman_02"] = "AviSchwartzman02Cutscene", // mptuner
["csb_avischwartzman_03"] = "AviSchwartzman03Cutscene", // mp2023_01
["csb_avon"] = "AvonCutscene",
["csb_ballas_leader"] = "BallasLeaderCutscene", // mpsecurity
["csb_ballasog"] = "BallasogCutscene",
Expand All @@ -1472,6 +1473,7 @@ private void RefreshCustomizationMenu()
["csb_car3guy1"] = "Car3Guy1Cutscene",
["csb_car3guy2"] = "Car3Guy2Cutscene",
["csb_celeb_01"] = "Celeb01Cutscene", // mpheist3
["csb_charlie_reed"] = "CharlieReedCutscene", // mp2023_01
["csb_chef"] = "ChefCutscene",
["csb_chef2"] = "Chef2Cutscene",
["csb_chef_03"] = "Chef3Cutscene", // mpchristmas3
Expand Down Expand Up @@ -1632,6 +1634,7 @@ private void RefreshCustomizationMenu()
["ig_ashley"] = "Ashley",
["ig_avery"] = "Avery", // mpvinewood
["ig_avischwartzman_02"] = "AviSchwartzman02", // mptuner
["ig_avischwartzman_03"] = "AviSchwartzman03", // mp2023_01
["ig_avon"] = "Avon",
["ig_ballas_leader"] = "BallasLeader", // mpsecurity
["ig_ballasog"] = "Ballasog",
Expand All @@ -1649,6 +1652,7 @@ private void RefreshCustomizationMenu()
["ig_car3guy2"] = "Car3Guy2",
["ig_casey"] = "Casey",
["ig_celeb_01"] = "Celeb01", // mpheist3
["ig_charlie_reed"] = "CharlieReed", // mp2023_01
["ig_chef"] = "Chef",
["ig_chef2"] = "Chef2",
["ig_chef_03"] = "Chef3", // mpchristmas3
Expand Down Expand Up @@ -1779,6 +1783,7 @@ private void RefreshCustomizationMenu()
["ig_orleans"] = "Orleans",
["ig_ortega"] = "Ortega",
["ig_paige"] = "Paige",
["ig_parnell_moss"] = "ParnellMoss", // mp2023_01
["ig_paper"] = "Paper",
["ig_party_promo"] = "PartyPromo", // mpsecurity
["ig_patricia"] = "Patricia",
Expand All @@ -1794,6 +1799,7 @@ private void RefreshCustomizationMenu()
["ig_rashcosvki"] = "Rashcosvki",
["ig_req_officer"] = "ReqOfficer", // mpsecurity
["ig_roccopelosi"] = "RoccoPelosi",
["ig_roostermccraw"] = "RoosterMcCraw", // mp2023_01
["ig_russiandrunk"] = "RussianDrunk",
["ig_sacha"] = "Sacha",
["ig_screen_writer"] = "ScreenWriter",
Expand Down Expand Up @@ -1913,6 +1919,7 @@ private void RefreshCustomizationMenu()
["s_m_m_bouncer_01"] = "Bouncer01SMM",
["s_m_m_bouncer_02"] = "Bouncer02SMM", // mpheist4
["s_m_m_ccrew_01"] = "CCrew01SMM",
["s_m_m_ccrew_02"] = "CCrew02SMM", // mp2023_01
["s_m_m_chemsec_01"] = "ChemSec01SMM",
["s_m_m_ciasec_01"] = "CiaSec01SMM",
["s_m_m_cntrybar_01"] = "Cntrybar01SMM",
Expand Down Expand Up @@ -2061,6 +2068,7 @@ private void RefreshCustomizationMenu()
["u_m_m_jesus_01"] = "Jesus01",
["u_m_m_jewelsec_01"] = "JewelSec01",
["u_m_m_jewelthief"] = "JewelThief",
["u_m_m_juggernaut_03"] = "Juggernaut03", // mp2023_01
["u_m_m_markfost"] = "Markfost",
["u_m_m_partytarget"] = "PartyTarget",
["u_m_m_prolsec_01"] = "PrologueSec01",
Expand Down
1 change: 1 addition & 0 deletions vMenuServer/config/permissions.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -481,6 +481,7 @@ add_ace builtin.everyone "vMenu.WeaponOptions.All" allow
# add_ace builtin.everyone "vMenu.WeaponOptions.CandyCane" allow # mpchristmas3 dlc (2802)
# add_ace builtin.everyone "vMenu.WeaponOptions.RailgunXM3" allow # mpchristmas3 dlc (2802)
# add_ace builtin.everyone "vMenu.WeaponOptions.AcidPackage" allow # mpchristmas3 dlc (2802)
# add_ace builtin.everyone "vMenu.WeaponOptions.TecPistol" allow # mp2023_01 dlc (2944)

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

0 comments on commit b48f074

Please sign in to comment.