Merge pull request #249 from MichaelCoding25/master

Update vehicles and weapons for Cayo Perico v2189
TomGrobbe · May 25, 2021 · 4cb7a80 · 4cb7a80
2 parents e8f4e1c + ca62749
commit 4cb7a80
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 3 deletions.
diff --git a/SharedClasses/PermissionsManager.cs b/SharedClasses/PermissionsManager.cs
@@ -294,6 +294,12 @@ public enum Permission
             WPPlasmaCarbine, // xmas 2018 dlc (1604)
             WPPlasmaMinigun, // xmas 2018 dlc (1604)
             WPStoneHatchet, // xmas 2018 dlc (1604)
+            WPCeramicPistol, // xmas 2019 dlc (1868)
+            WPNavyRevolver, // xmas 2019 dlc (1868)
+            //WPHazardCan, // xmas 2019 dlc (1868) (Does not have label text)
+            WPPericoPistol, // xmas 2020 dlc (2189)
+            WPMilitaryRifle, // xmas 2020 dlc (2189)
+            WPCombatShotgun, // xmas 2020 dlc (2189)
             #endregion
 
             // Weapon Loadouts Menu

diff --git a/vMenu/data/ValidWeapon.cs b/vMenu/data/ValidWeapon.cs
@@ -305,7 +305,15 @@ private static void CreateWeaponsList()
             { "weapon_raypistol", GetLabelText("WT_RAYPISTOL") },
             { "weapon_raycarbine", GetLabelText("WT_RAYCARBINE") },
             { "weapon_rayminigun", GetLabelText("WT_RAYMINIGUN") },
-            { "weapon_stone_hatchet", GetLabelText("WT_SHATCHET") }
+            { "weapon_stone_hatchet", GetLabelText("WT_SHATCHET") },
+            // DLC CHRISTMAS2019 (v 1868)
+            { "weapon_ceramicpistol", GetLabelText("WT_CERPST") },
+            { "weapon_navyrevolver", GetLabelText("WT_REV_NV") },
+            //{ "weapon_hazardcan", GetLabelText("WT_") }, (Does not have label text)
+            // DLC CHRISTMAS2020 (v 2189)
+            { "weapon_gadgetpistol", GetLabelText("WT_GDGTPST") },
+            { "weapon_militaryrifle", GetLabelText("WT_MLTRYRFL") },
+            { "weapon_combatshotgun", GetLabelText("WT_CMBSHGN") }
         };
         #endregion
 
@@ -403,6 +411,14 @@ private static void CreateWeaponsList()
             ["weapon_raycarbine"] = Permission.WPPlasmaCarbine,
             ["weapon_rayminigun"] = Permission.WPPlasmaMinigun,
             ["weapon_stone_hatchet"] = Permission.WPStoneHatchet,
+            // DLC CHRISTMAS2019 (v 1868)
+            ["weapon_ceramicpistol"] = Permission.WPCeramicPistol,
+            ["weapon_navyrevolver"] = Permission.WPNavyRevolver,
+            //["weapon_hazardcan"] = Permission.WPHazardCan, (Does not have label text)
+            // DLC CHRISTMAS2020 (v 2189)
+            ["weapon_gadgetpistol"] = Permission.WPPericoPistol,
+            ["weapon_militaryrifle"] = Permission.WPMilitaryRifle,
+            ["weapon_combatshotgun"] = Permission.WPCombatShotgun,
         };
         #endregion
 

diff --git a/vMenu/data/VehicleData.cs b/vMenu/data/VehicleData.cs
@@ -271,6 +271,7 @@ public static class Vehicles
                 "ASBO", // CASINO (MPHEIST3) DLC
                 "BLISTA",
                 "BRIOSO",
+                "BRIOSO2", // MPCAYOPERICO DLC
                 "CLUB", // MPSUM2020
                 "DILETTANTE",
                 "DILETTANTE2",
@@ -283,6 +284,7 @@ public static class Vehicles
                 "PANTO",
                 "PRAIRIE",
                 "RHAPSODY",
+                "WEEVIL", // MPCAYOPERICO DLC
             };
             #endregion
             #region Sedans
@@ -356,6 +358,7 @@ public static class Vehicles
                 "SEMINOLE",
                 "SEMINOLE2", // MPSUM2020
                 "SERRANO",
+                "SQUADDIE", // MPCAYOPERICO DLC
                 "TOROS", // MPCHRISTMAS2018 DLC
                 "XLS",
                 "XLS2",
@@ -492,6 +495,7 @@ public static class Vehicles
                 "STINGERGT",
                 "STROMBERG",
                 "SWINGER", // dlc (mpbattle)
+                "TOREADOR", // MPCAYOPERICO DLC
                 "TORERO",
                 "TORNADO",
                 "TORNADO2",
@@ -537,6 +541,7 @@ public static class Vehicles
                 "IMORGON", // CASINO (MPHEIST3) DLC
                 "ISSI7", // MPVINEWOOD DLC
                 "ITALIGTO", // MPCHRISTMAS2018 DLC
+                "ITALIRSX", // MPCAYOPERICO DLC
                 "JESTER",
                 "JESTER2",
                 "JUGULAR", // MPVINEWOOD DLC
@@ -581,6 +586,8 @@ public static class Vehicles
                 "TAMPA2",
                 "TROPOS",
                 "VERLIERER2",
+                "VETO", // MPCAYOPERICO DLC
+                "VETO2", // MPCAYOPERICO DLC
                 "VSTR", // CASINO (MPHEIST3) DLC
                 "ZR380", // MPCHRISTMAS2018 DLC
                 "ZR3802", // MPCHRISTMAS2018 DLC
@@ -675,6 +682,7 @@ public static class Vehicles
                 "INNOVATION",
                 "LECTRO",
                 "MANCHEZ",
+                "MANCHEZ2", // MPCAYOPERICO DLC
                 "NEMESIS",
                 "NIGHTBLADE",
                 "OPPRESSOR",
@@ -756,6 +764,8 @@ public static class Vehicles
                 "TROPHYTRUCK",
                 "TROPHYTRUCK2",
                 "VAGRANT", // CASINO (MPHEIST3) DLC
+                "VERUS", // MPCAYOPERICO DLC
+                "WINKY", // MPCAYOPERICO DLC
                 "YOSEMITE3", // MPSUM2020
                 "ZHABA", // CASINO (MPHEIST3) DLC
             };
@@ -792,6 +802,7 @@ public static class Vehicles
                 "SADLER",
                 "SADLER2",
                 "SCRAP",
+                "SLAMTRUCK", // MPCAYOPERICO DLC
                 "TOWTRUCK",
                 "TOWTRUCK2",
                 "TRACTOR", // Tractor (rusted/old)
@@ -891,12 +902,17 @@ public static class Vehicles
             #region Boats
             public static List<string> Boats { get; } = new List<string>()
             {
+                "AVISA", // MPCAYOPERICO DLC
                 "DINGHY",
                 "DINGHY2",
                 "DINGHY3",
                 "DINGHY4",
+                "DINGHY5", // MPCAYOPERICO DLC
                 "JETMAX",
+                "KOSATKA", // MPCAYOPERICO DLC
+                "LONGFIN", // MPCAYOPERICO DLC
                 "MARQUIS",
+                "PATROLBOAT", // MPCAYOPERICO DLC
                 "PREDATOR",
                 "SEASHARK",
                 "SEASHARK2",
@@ -919,6 +935,7 @@ public static class Vehicles
             {
                 "AKULA",
                 "ANNIHILATOR",
+                "ANNIHILATOR2", // MPCAYOPERICO DLC
                 "BUZZARD",
                 "BUZZARD2",
                 "CARGOBOB",
@@ -933,6 +950,8 @@ public static class Vehicles
                 "POLMAV",
                 "SAVAGE",
                 "SEASPARROW",
+                "SEASPARROW2", // MPCAYOPERICO DLC
+                "SEASPARROW3", // MPCAYOPERICO DLC
                 "SKYLIFT",
                 "SUPERVOLITO",
                 "SUPERVOLITO2",
@@ -946,6 +965,7 @@ public static class Vehicles
             #region Planes
             public static List<string> Planes { get; } = new List<string>()
             {
+                "ALKONOST", // MPCAYOPERICO DLC
                 "ALPHAZ1",
                 "AVENGER",
                 "AVENGER2",
@@ -1048,6 +1068,7 @@ public static class Vehicles
                 "SCARAB3", // MPCHRISTMAS2018 DLC
                 "THRUSTER", // Jetpack
                 "TRAILERSMALL2", // Anti Aircraft Trailer
+                "VETIR", // MPCAYOPERICO DLC
             };
             #endregion
             #region Commercial

diff --git a/vMenu/menus/PersonalVehicle.cs b/vMenu/menus/PersonalVehicle.cs
@@ -192,12 +192,12 @@ private void CreateMenu()
                         {
                             if (_checked)
                             {
-                                SetVehicleExclusiveDriver(CurrentPersonalVehicle.Handle, Game.PlayerPed.Handle);
+                                SetVehicleExclusiveDriver(CurrentPersonalVehicle.Handle, Game.PlayerPed.Handle, 1);
                                 SetVehicleExclusiveDriver_2(CurrentPersonalVehicle.Handle, Game.PlayerPed.Handle, 1);
                             }
                             else
                             {
-                                SetVehicleExclusiveDriver(CurrentPersonalVehicle.Handle, 0);
+                                SetVehicleExclusiveDriver(CurrentPersonalVehicle.Handle, 0, 1);
                                 SetVehicleExclusiveDriver_2(CurrentPersonalVehicle.Handle, 0, 1);
                             }
                         }

diff --git a/vMenuServer/config/permissions.cfg b/vMenuServer/config/permissions.cfg
@@ -452,6 +452,11 @@ add_ace builtin.everyone "vMenu.WeaponOptions.All" allow
 # add_ace builtin.everyone "vMenu.WeaponOptions.PlasmaCarbine" allow # xmas 2018 dlc (1604)
 # add_ace builtin.everyone "vMenu.WeaponOptions.PlasmaMinigun" allow # xmas 2018 dlc (1604)
 # add_ace builtin.everyone "vMenu.WeaponOptions.StoneHatchet" allow # xmas 2018 dlc (1604)
+# add_ace builtin.everyone "vMenu.WeaponOptions.CeramicPistol" allow # xmas 2019 dlc (1868)
+# add_ace builtin.everyone "vMenu.WeaponOptions.NavyRevolver" allow # xmas 2019 dlc (1868)
+# add_ace builtin.everyone "vMenu.WeaponOptions.PericoPistol" allow # xmas 2020 dlc (2189)
+# add_ace builtin.everyone "vMenu.WeaponOptions.MilitaryRifle" allow # xmas 2020 dlc (2189)
+# add_ace builtin.everyone "vMenu.WeaponOptions.CombatShotgun" allow # xmas 2020 dlc (2189)
 
 ####################################
 #       WEAPON LOADOUTS MENU       #