diff --git a/SharedClasses/PermissionsManager.cs b/SharedClasses/PermissionsManager.cs index bcda5dc7..205808a0 100644 --- a/SharedClasses/PermissionsManager.cs +++ b/SharedClasses/PermissionsManager.cs @@ -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 diff --git a/vMenu/data/ValidWeapon.cs b/vMenu/data/ValidWeapon.cs index 3bff03f9..78b1f219 100644 --- a/vMenu/data/ValidWeapon.cs +++ b/vMenu/data/ValidWeapon.cs @@ -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 weaponNames = new() @@ -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 @@ -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 @@ -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 diff --git a/vMenu/data/VehicleData.cs b/vMenu/data/VehicleData.cs index 7daf0fcb..dbc5e4c2 100644 --- a/vMenu/data/VehicleData.cs +++ b/vMenu/data/VehicleData.cs @@ -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", @@ -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", @@ -416,6 +418,7 @@ public static class Vehicles #region SUVs public static List SUVs { get; } = new List() { + "ALEUTIAN", // CHOP SHOP (MP2023_02) DLC - Requires b3095 "ASTRON", // THE CONTRACT (MPSECURITY) DLC - Requires b2545 "BALLER", "BALLER2", @@ -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", @@ -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", }; @@ -462,10 +469,12 @@ public static class Vehicles public static List Coupes { get; } = new List() { "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", @@ -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 @@ -525,6 +536,7 @@ public static class Vehicles "IMPALER2", "IMPALER3", "IMPALER4", + "IMPALER6", // CHOP SHOP (MP2023_02) DLC - Requires b3095 "IMPERATOR", "IMPERATOR2", "IMPERATOR3", @@ -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", @@ -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 @@ -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", @@ -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 @@ -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 @@ -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) @@ -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 }; @@ -1012,6 +1039,7 @@ public static class Vehicles "BOXVILLE3", "BOXVILLE4", "BOXVILLE5", + "BOXVILLE6", // CHOP SHOP (MP2023_02) DLC - Requires b3095 "BURRITO", "BURRITO2", "BURRITO3", @@ -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", @@ -1242,6 +1272,7 @@ public static class Vehicles public static List Commercial { get; } = new List() { "BENSON", + "BENSON2", // CHOP SHOP (MP2023_02) DLC - Requires b3095 "BIFF", "CERBERUS", "CERBERUS2", @@ -1257,6 +1288,7 @@ public static class Vehicles "PHANTOM", "PHANTOM2", "PHANTOM3", + "PHANTOM4", // CHOP SHOP (MP2023_02) DLC - Requires b3095 "POUNDER", "POUNDER2", "STOCKADE", @@ -1269,6 +1301,7 @@ public static class Vehicles { "CABLECAR", "FREIGHT", + "FREIGHT2", // CHOP SHOP (MP2023_02) DLC - Requires b3095 "FREIGHTCAR", "FREIGHTCONT1", "FREIGHTCONT2", diff --git a/vMenu/menus/PlayerAppearance.cs b/vMenu/menus/PlayerAppearance.cs index a7111a03..6d4b3051 100644 --- a/vMenu/menus/PlayerAppearance.cs +++ b/vMenu/menus/PlayerAppearance.cs @@ -1187,6 +1187,7 @@ private void RefreshCustomizationMenu() private readonly Dictionary animalModels = new() { ["a_c_boar"] = "Boar", + ["a_c_boar_02"] = "Boar 2", // mp2023_01 ["a_c_cat_01"] = "Cat", ["a_c_chickenhawk"] = "ChickenHawk", ["a_c_chimp"] = "Chimp", @@ -1196,8 +1197,10 @@ private void RefreshCustomizationMenu() ["a_c_cormorant"] = "Cormorant", ["a_c_cow"] = "Cow", ["a_c_coyote"] = "Coyote", + ["a_c_coyote_02"] = "Coyote 2", // mp2023_01 ["a_c_crow"] = "Crow", ["a_c_deer"] = "Deer", + ["a_c_deer_02"] = "Deer 2", // mp2023_01 ["a_c_dolphin"] = "Dolphin", ["a_c_fish"] = "Fish", ["a_c_hen"] = "Hen", @@ -1205,11 +1208,13 @@ private void RefreshCustomizationMenu() ["a_c_husky"] = "Husky", ["a_c_killerwhale"] = "KillerWhale", ["a_c_mtlion"] = "MountainLion", + ["a_c_mtlion_02"] = "MountainLion 2", // mp2023_01 ["a_c_panther"] = "Panther", // mpheist4 ["a_c_pig"] = "Pig", ["a_c_pigeon"] = "Pigeon", ["a_c_poodle"] = "Poodle", ["a_c_pug"] = "Pug", + ["a_c_pug_02"] = "Pug 2", // mp2023_01 ["a_c_rabbit_01"] = "Rabbit", ["a_c_rabbit_02"] = "Rabbit 2", // mpchristmas3 ["a_c_rat"] = "Rat", @@ -1472,6 +1477,8 @@ private void RefreshCustomizationMenu() ["csb_brucie2"] = "Brucie2Cutscene", // patchday22ng ["csb_bryony"] = "BryonyCutscene", ["csb_burgerdrug"] = "BurgerDrugCutscene", + ["csb_callgirl_01"] = "CallGirl01Cutscene", // mp2023_02 + ["csb_callgirl_02"] = "CallGirl02Cutscene", // mp2023_02 ["csb_car3guy1"] = "Car3Guy1Cutscene", ["csb_car3guy2"] = "Car3Guy2Cutscene", ["csb_celeb_01"] = "Celeb01Cutscene", // mpheist3 @@ -1511,6 +1518,7 @@ private void RefreshCustomizationMenu() ["csb_isldj_03"] = "IslDJ03Cutscene", // mpheist4 ["csb_isldj_04"] = "IslDJ04Cutscene", // mpheist4 ["csb_jackhowitzer"] = "JackHowitzerCutscene", + ["csb_jamalamir"] = "JamalAmirCutscene", // mp2023_02 ["csb_janitor"] = "JanitorCutscene", ["csb_jio"] = "JIOCutscene", // mpheist4 ["csb_jio_02"] = "JIO02Cutscene", // mpsecurity @@ -1567,6 +1575,8 @@ private void RefreshCustomizationMenu() ["csb_vernon"] = "VernonCutscene", // mpsecurity ["csb_vincent"] = "VincentCutscene", // mpvinewood ["csb_vincent_2"] = "Vincent2Cutscene", // mpheist3 + ["csb_vincent_4"] = "Vincent4Cutscene", // mp2023_02 + ["csb_yusufamir"] = "YusufAmirCuscene", // mp2023_02 ["csb_wendy"] = "WendyCutscene", // mpheist3 ["g_f_importexport_01"] = "ImportExport01GF", ["g_f_m_fooliganz_01"] = "Fooliganz01GFM", // mpchristmas3 @@ -1578,8 +1588,9 @@ private void RefreshCustomizationMenu() ["g_m_m_armboss_01"] = "ArmBoss01GMM", ["g_m_m_armgoon_01"] = "ArmGoon01GMM", ["g_m_m_armlieut_01"] = "ArmLieut01GMM", - ["g_m_m_cartelguards_01"] = "CarterGuards01GMM", // mpheist4 - ["g_m_m_cartelguards_02"] = "CarterGuards02GMM", // mpheist4 + ["g_m_m_cartelgoons_01"] = "CartelGoons01GMM", // mp2023_02 + ["g_m_m_cartelguards_01"] = "CartelGuards01GMM", // mpheist4 + ["g_m_m_cartelguards_02"] = "CartelGuards02GMM", // mpheist4 ["g_m_m_casrn_01"] = "CasRN01MM", // mpvinewood ["g_m_m_chemwork_01"] = "ChemWork01GMM", ["g_m_m_chiboss_01"] = "ChiBoss01GMM", @@ -1591,6 +1602,7 @@ private void RefreshCustomizationMenu() ["g_m_m_genthug_01"] = "GenThug01GMM", // mpsum2 ["g_m_m_goons_01"] = "Goons01GMM", // mpsecurity ["g_m_m_korboss_01"] = "KorBoss01GMM", + ["g_m_m_maragrande_01"] = "MaraGrande01GMM", // mp2023_02 ["g_m_m_mexboss_01"] = "MexBoss01GMM", ["g_m_m_mexboss_02"] = "MexBoss02GMM", ["g_m_m_prisoners_01"] = "Prisoners01GMM", // mptuner @@ -1629,6 +1641,7 @@ private void RefreshCustomizationMenu() ["ig_agatha"] = "Agatha", // mpvinewood ["ig_agent"] = "Agent", ["ig_agent_02"] = "Agent02", //mpsum2 + ["ig_ahronward"] = "AhronWard", // mp2023_02 ["ig_amandatownley"] = "AmandaTownley", ["ig_andreas"] = "Andreas", ["ig_ary"] = "ARY", // mpheist4 @@ -1650,6 +1663,8 @@ private void RefreshCustomizationMenu() ["ig_brad"] = "Brad", ["ig_bride"] = "Bride", ["ig_brucie2"] = "Brucie2", // patchday22ng + ["ig_callgirl_01"] = "CallGirl01", // mp2023_02 + ["ig_callgirl_02"] = "CallGirl02", // mp2023_02 ["ig_car3guy1"] = "Car3Guy1", ["ig_car3guy2"] = "Car3Guy2", ["ig_casey"] = "Casey", @@ -1720,8 +1735,10 @@ private void RefreshCustomizationMenu() ["ig_isldj_04_d_02"] = "ISLDJ04D02", // mpheist4 ["ig_isldj_04_e_01"] = "ISLDJ04E01", // mpheist4 ["ig_jackie"] = "Jackie", // mpheist4 + ["ig_jamalamir"] = "JamalAmir", // mp2023_02 ["ig_janet"] = "Janet", ["ig_jay_norris"] = "JayNorris", + ["ig_jaywalker"] = "JayWalker", // mp2023_02 ["ig_jewelass"] = "Jewelass", ["ig_jimmyboston"] = "JimmyBoston", ["ig_jimmyboston_02"] = "JimmyBoston02", @@ -1759,6 +1776,8 @@ private void RefreshCustomizationMenu() ["ig_maryann"] = "MaryAnn", ["ig_mason_duggan"] = "MasonDuggan", // mpsum2 ["ig_maude"] = "Maude", + ["ig_mechanic_01"] = "Mechanic01", // mp2023_02 + ["ig_mechanic_02"] = "Mechanic02", // mp2023_02 ["ig_michelle"] = "Michelle", ["ig_miguelmadrazo"] = "MiguelMadrazo", // mpheist4 ["ig_milton"] = "Milton", @@ -1791,6 +1810,7 @@ private void RefreshCustomizationMenu() ["ig_patricia"] = "Patricia", ["ig_patricia_02"] = "Patricia02", // mpheist4 ["ig_pilot"] = "Pilot", // mpheist4 + ["ig_pilot_02"] = "Pilot02", // mp2023_02 ["ig_popov"] = "Popov", ["ig_priest"] = "Priest", ["ig_prolsec_02"] = "PrologueSec02", @@ -1814,6 +1834,7 @@ private void RefreshCustomizationMenu() ["ig_sss"] = "SSS", // mpheist4 ["ig_stevehains"] = "SteveHains", ["ig_stretch"] = "Stretch", + ["ig_subcrewhead"] = "SubCrewHead", // mp2023_02 ["ig_talcc"] = "TalCC", ["ig_talina"] = "Talina", ["ig_talmm"] = "TalMM", @@ -1839,9 +1860,11 @@ private void RefreshCustomizationMenu() ["ig_vincent"] = "Vincent", // mpvinewood ["ig_vincent_2"] = "Vincent2", // mpheist3 ["ig_vincent_3"] = "Vincent3", // mpsecurity + ["ig_vincent_4"] = "Vincent4", // mp2023_02 ["ig_wade"] = "Wade", ["ig_warehouseboss"] = "WarehouseBoss", // mpsum2 ["ig_wendy"] = "Wendy", // mpheist3 + ["ig_yusufamir"] = "YusufAmir", // mp2023_02 ["ig_zimbor"] = "Zimbor", ["mp_f_bennymech_01"] = "BennyMechanic01", ["mp_f_boatstaff_01"] = "MBoatStaff01", @@ -1922,9 +1945,11 @@ private void RefreshCustomizationMenu() ["s_m_m_bouncer_02"] = "Bouncer02SMM", // mpheist4 ["s_m_m_ccrew_01"] = "CCrew01SMM", ["s_m_m_ccrew_02"] = "CCrew02SMM", // mp2023_01 + ["s_m_m_ccrew_03"] = "CCrew03SMM", // mp2023_02 ["s_m_m_chemsec_01"] = "ChemSec01SMM", ["s_m_m_ciasec_01"] = "CiaSec01SMM", ["s_m_m_cntrybar_01"] = "Cntrybar01SMM", + ["s_m_m_cop_01"] = "Cop01SMM", // mp2023_02 ["s_m_m_dockwork_01"] = "Dockwork01SMM", ["s_m_m_doctor_01"] = "Doctor01SMM", ["s_m_m_drugprocess_01"] = "DrugProcess01SMM", // mpheist4 @@ -1970,6 +1995,7 @@ private void RefreshCustomizationMenu() ["s_m_m_studioassist_02"] = "StudioAssist02SMM", // mpsecurity ["s_m_m_studioprod_01"] = "StudioProd01SMM", // mpsecurity ["s_m_m_studiosoueng_02"] = "StudioSouEng02SMM", // mpsecurity + ["s_m_m_subcrew_01"] = "SubCrew01SMM", // mp2023_02 ["s_m_m_tattoo_01"] = "Tattoo01SMM", // mptuner ["s_m_m_trucker_01"] = "Trucker01SMM", ["s_m_m_ups_01"] = "Ups01SMM", @@ -2080,6 +2106,7 @@ private void RefreshCustomizationMenu() ["u_m_m_streetart_01"] = "StreetArt01", ["u_m_m_vince"] = "Vince", // mpvinewood ["u_m_m_willyfist"] = "WillyFist", + ["u_m_m_yeti"] = "Yeti", // mp2023_02 ["u_m_m_yulemonster"] = "YuleMonster", // mpchristmas3 ["u_m_o_dean"] = "Dean", // mpvinewood ["u_m_o_finguru_01"] = "Finguru01",