Merge pull request #303 from MichaelCoding25/update-vMenu-to-SA-Merce…

…naries-DLC Add new content from San Andreas Mercenaries (mp2023_01)
TomGrobbe · Jul 16, 2023 · 336bdb0 · 336bdb0
2 parents d08bbfc + fa2deb8
commit 336bdb0
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 0 deletions.
diff --git a/SharedClasses/PermissionsManager.cs b/SharedClasses/PermissionsManager.cs
@@ -317,6 +317,7 @@ public enum Permission
             WPCandyCane,
             WPRailgunXM3,
             WPAcidPackage,
+            WPTecPistol,
             #endregion
 
             // Weapon Loadouts Menu

diff --git a/vMenu/data/PedModels.cs b/vMenu/data/PedModels.cs
@@ -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"),
@@ -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"),
@@ -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")
         };
     }

diff --git a/vMenu/data/ValidWeapon.cs b/vMenu/data/ValidWeapon.cs
@@ -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>()
@@ -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
 
@@ -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
 
@@ -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
 

diff --git a/vMenu/data/VehicleData.cs b/vMenu/data/VehicleData.cs
@@ -488,13 +488,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",
@@ -644,6 +647,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",
@@ -656,6 +660,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",
@@ -708,6 +713,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
@@ -883,6 +889,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",
@@ -895,11 +902,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",
@@ -1028,6 +1037,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
@@ -1044,6 +1054,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",
@@ -1094,6 +1106,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",
@@ -1121,6 +1134,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",
@@ -1145,10 +1160,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",

diff --git a/vMenu/menus/PlayerAppearance.cs b/vMenu/menus/PlayerAppearance.cs
@@ -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",
@@ -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
@@ -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",
@@ -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
@@ -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",
@@ -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",
@@ -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",
@@ -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",

diff --git a/vMenuServer/config/permissions.cfg b/vMenuServer/config/permissions.cfg
@@ -486,6 +486,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       #