diff --git a/SharedClasses/PermissionsManager.cs b/SharedClasses/PermissionsManager.cs index 8ada2284..dafba905 100644 --- a/SharedClasses/PermissionsManager.cs +++ b/SharedClasses/PermissionsManager.cs @@ -323,6 +323,8 @@ public enum Permission WPBattleRifle, WPSnowLauncher, WPHackingDevice, + // MP2024_01 DLC (V 3258) + WPStunRod, #endregion // Weapon Loadouts Menu diff --git a/vMenu/data/ValidWeapon.cs b/vMenu/data/ValidWeapon.cs index 78b1f219..4f3b57bb 100644 --- a/vMenu/data/ValidWeapon.cs +++ b/vMenu/data/ValidWeapon.cs @@ -262,6 +262,8 @@ private static void CreateWeaponsList() // MP2023_02 DLC (V 3095) { "weapon_battlerifle", GetLabelText("WTD_BATTLERIFLE") }, { "weapon_snowlauncher", GetLabelText("WTD_SNOWLNCHR") }, + // MP2024_01 DLC (V 3258) + { "weapon_stunrod", GetLabelText("WTD_STUNROD") }, }; public static readonly Dictionary weaponNames = new() @@ -383,6 +385,8 @@ private static void CreateWeaponsList() { "weapon_battlerifle", GetLabelText("WT_BATTLERIFLE") }, { "weapon_snowlauncher", GetLabelText("WT_SNOWLNCHR") }, { "weapon_hackingdevice", GetLabelText("WT_HACKDEVICE") }, + // MP2024_01 DLC (V 3258) + { "weapon_stunrod", GetLabelText("WT_STUNROD") }, }; #endregion @@ -506,6 +510,8 @@ private static void CreateWeaponsList() ["weapon_battlerifle"] = Permission.WPBattleRifle, ["weapon_snowlauncher"] = Permission.WPSnowLauncher, ["weapon_hackingdevice"] = Permission.WPHackingDevice, + // MP2024_01 DLC (V 3258) + ["weapon_stunrod"] = Permission.WPStunRod, }; #endregion @@ -929,6 +935,8 @@ private static void CreateWeaponsList() ["COMPONENT_COMBATPISTOL_VARMOD_XMAS23"] = GetLabelText("WCT_COMPIST_XM"), ["COMPONENT_SPECIALCARBINE_VARMOD_XMAS23"] = GetLabelText("WCT_SPCR_XM"), ["COMPONENT_HEAVYSNIPER_VARMOD_XMAS23"] = GetLabelText("WCT_HVSP_XM"), + // MP2024_01 DLC (V 3258) + ["COMPONENT_STUNGUN_VARMOD_BAIL"] = GetLabelText("WCT_STNGN_BAIL"), }; #endregion diff --git a/vMenu/data/VehicleData.cs b/vMenu/data/VehicleData.cs index dbc5e4c2..ac12c22a 100644 --- a/vMenu/data/VehicleData.cs +++ b/vMenu/data/VehicleData.cs @@ -383,6 +383,7 @@ public static class Vehicles "COGNOSCENTI", "COGNOSCENTI2", "DEITY", // THE CONTRACT (MPSECURITY) DLC - Requires b2545 + "DRIFTVORSCHLAG", // BOTTOM DOLLAR BOUNTIES (MP2024_01) DLC - Requires b3258 "EMPEROR", "EMPEROR2", "EMPEROR3", @@ -410,6 +411,7 @@ public static class Vehicles "SURGE", "TAILGATER", "TAILGATER2", // LS TUNERS (MPTUNER) DLC - Requires b2372 + "VORSCHLAGHAMMER", // BOTTOM DOLLAR BOUNTIES (MP2024_01) DLC - Requires b3258 "WARRENER", "WARRENER2", // LS TUNERS (MPTUNER) DLC - Requires b2372 "WASHINGTON", @@ -429,6 +431,7 @@ public static class Vehicles "BALLER7", // THE CONTRACT (MPSECURITY) DLC - Requires b2545 "BALLER8", // CHOP SHOP (MP2023_02) DLC - Requires b3095 "BJXL", + "CASTIGATOR", // BOTTOM DOLLAR BOUNTIES (MP2024_01) DLC - Requires b3258 "CAVALCADE", "CAVALCADE2", "CAVALCADE3", // CHOP SHOP (MP2023_02) DLC - Requires b3095 @@ -470,6 +473,7 @@ public static class Vehicles { "COGCABRIO", "DRIFTFR36", // CHOP SHOP (MP2023_02) DLC - Requires b3095 + "EUROSX32", // BOTTOM DOLLAR BOUNTIES (MP2024_01) DLC - Requires b3258 "EXEMPLAR", "F620", "FELON", @@ -506,6 +510,7 @@ public static class Vehicles "COQUETTE3", "DEVIANT", "DOMINATOR", + "DOMINATOR10", // BOTTOM DOLLAR BOUNTIES (MP2024_01) DLC - Requires b3258 "DOMINATOR2", "DOMINATOR3", "DOMINATOR4", @@ -594,7 +599,9 @@ public static class Vehicles "CHEBUREK", "CHEETAH2", "COQUETTE2", + "COQUETTE5", // BOTTOM DOLLAR BOUNTIES (MP2024_01) DLC - Requires b3258 "DELUXO", + "DRIFTNEBULA", // BOTTOM DOLLAR BOUNTIES (MP2024_01) DLC - Requires b3258 "DYNASTY", // CASINO AND RESORT (MPVINEWOOD) DLC - Requires b2060 "FAGALOA", "FELTZER3", // Stirling GT @@ -658,15 +665,18 @@ public static class Vehicles "CORSITA", // CRIMINAL ENTERPRISES (MPSUM2) DLC - Requires b2699 "COUREUR", // SA MERCENARIES (MP2023_01) DLC - Requires b2944 "CYPHER", // LS TUNERS (MPTUNER) DLC - Requires b2372 + "DRIFTCYPHER", // BOTTOM DOLLAR BOUNTIES (MP2024_01) DLC - Requires b3258 "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 + "DRIFTSENTINEL", // BOTTOM DOLLAR BOUNTIES (MP2024_01) DLC - Requires b3258 "DRIFTTAMPA", // CHOP SHOP (MP2023_02) DLC - Requires b3095 "DRIFTZR350", // CHOP SHOP (MP2023_02) DLC - Requires b3095 "ELEGY", "ELEGY2", + "ENVISAGE", // BOTTOM DOLLAR BOUNTIES (MP2024_01) DLC - Requires b3258 "EUROS", // LS TUNERS (MPTUNER) DLC - Requires b2372 "EVERON2", // DRUG WARS (MPCHRISTMAS3) DLC - Requires b2802 "FELTZER2", @@ -699,11 +709,13 @@ public static class Vehicles "NEON", "NINEF", "NINEF2", + "NIOBE", // BOTTOM DOLLAR BOUNTIES (MP2024_01) DLC - Requires b3258 "OMNIS", "OMNISEGT", // CRIMINAL ENTERPRISES (MPSUM2) DLC - Requires b2699 "PANTHERE", // DRUG WARS (MPCHRISTMAS3) DLC - Requires b2802 "PARAGON", // CASINO AND RESORT (MPVINEWOOD) DLC - Requires b2060 "PARAGON2", // CASINO AND RESORT (MPVINEWOOD) DLC - Requires b2060 + "PARAGON3", // BOTTOM DOLLAR BOUNTIES (MP2024_01) DLC - Requires b3258 "PARIAH", "PENUMBRA", "PENUMBRA2", // SUMMER SPECIAL (MPSUM) DLC - Requires b2060 @@ -779,6 +791,7 @@ public static class Vehicles "OSIRIS", "PENETRATOR", "PFISTER811", + "PIPISTRELLO", // BOTTOM DOLLAR BOUNTIES (MP2024_01) DLC - Requires b3258 "PROTOTIPO", "REAPER", "S80", // CASINO AND RESORT (MPVINEWOOD) DLC - Requires b2060 @@ -852,6 +865,7 @@ public static class Vehicles "OPPRESSOR", "OPPRESSOR2", "PCJ", + "PIZZABOY", // BOTTOM DOLLAR BOUNTIES (MP2024_01) DLC - Requires b3258 "POWERSURGE", // DRUG WARS (MPCHRISTMAS3) DLC - Requires b2802 "RATBIKE", "REEVER", // THE CONTRACT (MPSECURITY) DLC - Requires b2545 @@ -940,6 +954,7 @@ public static class Vehicles "VAGRANT", // CASINO HEIST (MPHEIST3) DLC - Requires b2060 "VERUS", // CAYO PERICO (MPHEIST4) DLC - Requires b2189 "WINKY", // CAYO PERICO (MPHEIST4) DLC - Requires b2189 + "YOSEMITE1500", // BOTTOM DOLLAR BOUNTIES (MP2024_01) DLC - Requires b3258 "YOSEMITE3", // SUMMER SPECIAL (MPSUM) DLC - Requires b2060 "ZHABA", // CASINO HEIST (MPHEIST3) DLC - Requires b2060 }; @@ -1227,7 +1242,10 @@ public static class Vehicles "FIRETRUK", "LGUARD", "PBUS", + "POLDOMINATOR10", // BOTTOM DOLLAR BOUNTIES (MP2024_01) DLC - Requires b3258 + "POLDORADO", // BOTTOM DOLLAR BOUNTIES (MP2024_01) DLC - Requires b3258 "POLGAUNTLET", // CHOP SHOP (MP2023_02) DLC - Requires b3095 + "POLGREENWOOD", // BOTTOM DOLLAR BOUNTIES (MP2024_01) DLC - Requires b3258 "POLICE", "POLICE2", "POLICE3", @@ -1237,6 +1255,9 @@ public static class Vehicles "POLICEOLD1", "POLICEOLD2", "POLICET", + "POLICET3", // BOTTOM DOLLAR BOUNTIES (MP2024_01) DLC - Requires b3258 + "POLIMPALER5", // BOTTOM DOLLAR BOUNTIES (MP2024_01) DLC - Requires b3258 + "POLIMPALER6", // BOTTOM DOLLAR BOUNTIES (MP2024_01) DLC - Requires b3258 "POLMAV", "PRANGER", "PREDATOR", diff --git a/vMenu/menus/MiscSettings.cs b/vMenu/menus/MiscSettings.cs index 8e0f496c..06d5d18f 100644 --- a/vMenu/menus/MiscSettings.cs +++ b/vMenu/menus/MiscSettings.cs @@ -214,7 +214,7 @@ private void CreateMenu() { if (item == quitGame) { - QuitGame(); + CommonFunctions.QuitGame(); } else if (item == quitSession) { diff --git a/vMenu/menus/PlayerAppearance.cs b/vMenu/menus/PlayerAppearance.cs index 6d4b3051..d1892df6 100644 --- a/vMenu/menus/PlayerAppearance.cs +++ b/vMenu/menus/PlayerAppearance.cs @@ -1520,6 +1520,7 @@ private void RefreshCustomizationMenu() ["csb_jackhowitzer"] = "JackHowitzerCutscene", ["csb_jamalamir"] = "JamalAmirCutscene", // mp2023_02 ["csb_janitor"] = "JanitorCutscene", + ["csb_jenettee"] = "JenetteECutscene", // mp2024_01 ["csb_jio"] = "JIOCutscene", // mpheist4 ["csb_jio_02"] = "JIO02Cutscene", // mpsecurity ["csb_johnny_guns"] = "JohnnyGunsCutscene", // mpsecurity @@ -1527,6 +1528,7 @@ private void RefreshCustomizationMenu() ["csb_labrat"] = "LabratCutscene", // mpchristmas3 ["csb_luchadora"] = "LuchadoraCutscene", // mpchristmas3 ["csb_maude"] = "MaudeCutscene", + ["csb_maude_02"] = "Maude02Cutscene", // mp2024_01 ["csb_miguelmadrazo"] = "MiguelMadrazoCutscene", // mpheist4 ["csb_mimi"] = "MimiCutscene", // mptuner ["csb_mjo"] = "MJOCutscene", // mpheist4 @@ -1607,6 +1609,9 @@ private void RefreshCustomizationMenu() ["g_m_m_mexboss_02"] = "MexBoss02GMM", ["g_m_m_prisoners_01"] = "Prisoners01GMM", // mptuner ["g_m_m_slasher_01"] = "Shalsher01GMM", // patchday27ng + ["g_m_m_zombie_01"] = "Zombie01GMM", // mp2024_01 + ["g_m_m_zombie_02"] = "Zombie02GMM", // mp2024_01 + ["g_m_m_zombie_03"] = "Zombie03GMM", // mp2024_01 ["g_m_y_armgoon_02"] = "ArmGoon02GMY", ["g_m_y_azteca_01"] = "Azteca01GMY", ["g_m_y_ballaeast_01"] = "BallaEast01GMY", @@ -1660,6 +1665,12 @@ private void RefreshCustomizationMenu() ["ig_bestmen"] = "Bestmen", ["ig_beverly"] = "Beverly", ["ig_billionaire"] = "Billionaire", // mpsecurity + ["ig_bountytarget_01"] = "BountyTarget01", // mp2024_01 + ["ig_bountytarget_02"] = "BountyTarget02", // mp2024_01 + ["ig_bountytarget_03"] = "BountyTarget03", // mp2024_01 + ["ig_bountytarget_04"] = "BountyTarget04", // mp2024_01 + ["ig_bountytarget_05"] = "BountyTarget05", // mp2024_01 + ["ig_bountytarget_06"] = "BountyTarget06", // mp2024_01 ["ig_brad"] = "Brad", ["ig_bride"] = "Bride", ["ig_brucie2"] = "Brucie2", // patchday22ng @@ -1739,6 +1750,7 @@ private void RefreshCustomizationMenu() ["ig_janet"] = "Janet", ["ig_jay_norris"] = "JayNorris", ["ig_jaywalker"] = "JayWalker", // mp2023_02 + ["ig_jenettee"] = "JenetteE", // mp2024_01 ["ig_jewelass"] = "Jewelass", ["ig_jimmyboston"] = "JimmyBoston", ["ig_jimmyboston_02"] = "JimmyBoston02", @@ -1776,8 +1788,10 @@ private void RefreshCustomizationMenu() ["ig_maryann"] = "MaryAnn", ["ig_mason_duggan"] = "MasonDuggan", // mpsum2 ["ig_maude"] = "Maude", + ["ig_maudebf"] = "MaudeBF", // mp2024_01 ["ig_mechanic_01"] = "Mechanic01", // mp2023_02 ["ig_mechanic_02"] = "Mechanic02", // mp2023_02 + ["ig_mechanic_03"] = "Mechanic03", // mp2024_01 ["ig_michelle"] = "Michelle", ["ig_miguelmadrazo"] = "MiguelMadrazo", // mpheist4 ["ig_milton"] = "Milton", @@ -1941,6 +1955,7 @@ private void RefreshCustomizationMenu() ["s_m_m_autoshop_01"] = "Autoshop01SMM", ["s_m_m_autoshop_02"] = "Autoshop02SMM", ["s_m_m_autoshop_03"] = "Autoshop03SMM", // mptuner + ["s_m_m_bailoffice_01"] = "BailOffice01SMM", // mp2024_01 ["s_m_m_bouncer_01"] = "Bouncer01SMM", ["s_m_m_bouncer_02"] = "Bouncer02SMM", // mpheist4 ["s_m_m_ccrew_01"] = "CCrew01SMM", diff --git a/vMenuServer/config/permissions.cfg b/vMenuServer/config/permissions.cfg index 012da777..fb0451da 100644 --- a/vMenuServer/config/permissions.cfg +++ b/vMenuServer/config/permissions.cfg @@ -496,6 +496,7 @@ add_ace builtin.everyone "vMenu.WeaponOptions.All" allow # add_ace builtin.everyone "vMenu.WeaponOptions.BattleRifle" allow # mp2023_02 dlc (3095) # add_ace builtin.everyone "vMenu.WeaponOptions.SnowLauncher" allow # mp2023_02 dlc (3095) # add_ace builtin.everyone "vMenu.WeaponOptions.HackingDevice" allow # mp2023_02 dlc (3095) +# add_ace builtin.everyone "vMenu.WeaponOptions.StunRod" allow # mp2024_01 dlc (3258) #################################### # WEAPON LOADOUTS MENU #