Merge pull request #541 from TomGrobbe/development

vMenu v3.8.4

Author: cm8263

SharedClasses/ConfigManager.cs

@@ -30,7 +30,6 @@ public enum Setting
             vmenu_enable_animals_spawn_menu,
             vmenu_pvp_mode,
             keep_player_head_props,
-            vmenu_disable_server_info_convars,
             vmenu_player_names_distance,
             vmenu_disable_entity_outlines_tool,
             vmenu_disable_player_stats_setup,

vMenu/menus/VehicleOptions.cs

@@ -185,7 +185,7 @@ private void CreateMenu()
                 GetLabelText("CMOD_PLA_2"), // Plate Index 2 // BlueOnWhite3
                 GetLabelText("CMOD_PLA_3"), // Plate Index 3 // YellowOnBlue
                 GetLabelText("CMOD_PLA_4"), // Plate Index 4 // YellowOnBlack
-                "North Yankton", // Plate Index 5 // NorthYankton
+                GetLabelText("PROL"), // Plate Index 5 // NorthYankton
                 GetLabelText("CMOD_PLA_6"), // Plate Index 6 // ECola
                 GetLabelText("CMOD_PLA_7"), // Plate Index 7 // LasVenturas
                 GetLabelText("CMOD_PLA_8"), // Plate Index 8 // LibertyCity
@@ -1028,21 +1028,35 @@ private void CreateMenu()
             #endregion
 
             #region Vehicle Colors Submenu Stuff
+            // color customization menu
+            var customizeColorMenu = new Menu("Vehicle Colors", "Customize Colors");
+            MenuController.AddSubmenu(VehicleColorsMenu, customizeColorMenu);
+
+            var colorsCustomizationBtn = new MenuItem("Customize Colors") { Label = "→→→" };
+            VehicleColorsMenu.AddMenuItem(colorsCustomizationBtn);
+            MenuController.BindMenuItem(VehicleColorsMenu, customizeColorMenu, colorsCustomizationBtn);
+
             // primary menu
             var primaryColorsMenu = new Menu("Vehicle Colors", "Primary Colors");
-            MenuController.AddSubmenu(VehicleColorsMenu, primaryColorsMenu);
+            MenuController.AddSubmenu(customizeColorMenu, primaryColorsMenu);
 
             var primaryColorsBtn = new MenuItem("Primary Color") { Label = "→→→" };
-            VehicleColorsMenu.AddMenuItem(primaryColorsBtn);
-            MenuController.BindMenuItem(VehicleColorsMenu, primaryColorsMenu, primaryColorsBtn);
+            customizeColorMenu.AddMenuItem(primaryColorsBtn);
+            MenuController.BindMenuItem(customizeColorMenu, primaryColorsMenu, primaryColorsBtn);
 
             // secondary menu
             var secondaryColorsMenu = new Menu("Vehicle Colors", "Secondary Colors");
-            MenuController.AddSubmenu(VehicleColorsMenu, secondaryColorsMenu);
+            MenuController.AddSubmenu(customizeColorMenu, secondaryColorsMenu);
 
             var secondaryColorsBtn = new MenuItem("Secondary Color") { Label = "→→→" };
-            VehicleColorsMenu.AddMenuItem(secondaryColorsBtn);
-            MenuController.BindMenuItem(VehicleColorsMenu, secondaryColorsMenu, secondaryColorsBtn);
+            customizeColorMenu.AddMenuItem(secondaryColorsBtn);
+            MenuController.BindMenuItem(customizeColorMenu, secondaryColorsMenu, secondaryColorsBtn);
+
+            var presetColorsBtn = new MenuListItem("Preset Colors", [], 0);
+            customizeColorMenu.AddMenuItem(presetColorsBtn);
+
+            var chrome = new MenuItem("Chrome");
+            customizeColorMenu.AddMenuItem(chrome);
 
             // color lists
             var classic = new List<string>();
@@ -1108,25 +1122,8 @@ private void CreateMenu()
             var intColorList = new MenuListItem("Interior / Trim Color", classic, 0);
             var vehicleEnveffScale = new MenuSliderItem("Vehicle Enveff Scale", "This works on certain vehicles only, like the besra for example. It 'fades' certain paint layers.", 0, 20, 10, true);
 
-            var chrome = new MenuItem("Chrome");
-            VehicleColorsMenu.AddMenuItem(chrome);
             VehicleColorsMenu.AddMenuItem(vehicleEnveffScale);
 
-            VehicleColorsMenu.OnItemSelect += (sender, item, index) =>
-            {
-                var veh = GetVehicle();
-                if (veh != null && veh.Exists() && !veh.IsDead && veh.Driver == Game.PlayerPed)
-                {
-                    if (item == chrome)
-                    {
-                        SetVehicleColours(veh.Handle, 120, 120); // chrome is index 120
-                    }
-                }
-                else
-                {
-                    Notify.Error("You need to be the driver of a driveable vehicle to change this.");
-                }
-            };
             VehicleColorsMenu.OnSliderPositionChange += (m, sliderItem, oldPosition, newPosition, itemIndex) =>
             {
                 var veh = GetVehicle();
@@ -1309,7 +1306,7 @@ async void HandleItemSelect(Menu menu, MenuItem menuItem, int itemIndex)
 
             for (var i = 0; i < 2; i++)
             {
-                var customColour = new MenuItem("Custom RGB") { Label = ">>>" };
+                var customColour = new MenuItem("Custom RGB") { Label = "→→→" };
                 var pearlescentList = new MenuListItem("Pearlescent", classic, 0);
                 var classicList = new MenuListItem("Classic", classic, 0);
                 var metallicList = new MenuListItem("Metallic", classic, 0);
@@ -1353,6 +1350,66 @@ async void HandleItemSelect(Menu menu, MenuItem menuItem, int itemIndex)
                     secondaryColorsMenu.OnItemSelect += HandleItemSelect;
                 }
             }
+
+            customizeColorMenu.OnMenuOpen += (_) =>
+            {
+                int numVehColors = GetNumberOfVehicleColours(GetVehicle().Handle);
+
+                if (numVehColors == 0)
+                {
+                    presetColorsBtn.Enabled = false;
+                    presetColorsBtn.ListItems = ["No Preset Colors"];
+                    presetColorsBtn.ListIndex = 0;
+                    return;
+                }
+
+                List<string> colorOptions = [];
+
+                presetColorsBtn.Enabled = true;
+
+                for (int i = 0; i < numVehColors; i++)
+                {
+                    colorOptions.Add($"Preset Color #{i + 1}");
+                }
+
+                int currentColor = GetVehicleColourCombination(GetVehicle().Handle);
+
+                presetColorsBtn.ListItems = colorOptions;
+                presetColorsBtn.ListIndex = currentColor < 0 ? 0 : currentColor;
+            };
+
+            customizeColorMenu.OnItemSelect += (_, item, _) =>
+            {
+                var veh = GetVehicle();
+                if (veh != null && veh.Exists() && !veh.IsDead && veh.Driver == Game.PlayerPed)
+                {
+                    if (item == chrome)
+                    {
+                        SetVehicleColours(veh.Handle, 120, 120); // chrome is index 120
+                    }
+                }
+                else
+                {
+                    Notify.Error("You need to be the driver of a driveable vehicle to change this.");
+                }
+            };
+
+            customizeColorMenu.OnListItemSelect += (_, _, index, _) => ChangeVehiclePresetColor(index);
+
+            customizeColorMenu.OnListIndexChange += (_, _, _, index, _) => ChangeVehiclePresetColor(index);
+
+            void ChangeVehiclePresetColor(int index)
+            {
+                var veh = GetVehicle();
+                if (veh != null && veh.Exists() && !veh.IsDead && veh.Driver == Game.PlayerPed)
+                {
+                    SetVehicleColourCombination(veh.Handle, index);
+                }
+                else
+                {
+                    Notify.Error("You need to be the driver of a driveable vehicle to change this.");
+                }
+            }
             #endregion
 
             #region Vehicle Doors Submenu Stuff

vMenuServer/MainServer.cs

@@ -831,7 +831,7 @@ internal void FreezeServerTime([FromSource] Player source, bool freezeTime)
         [EventHandler("vMenu:KickPlayer")]
         internal void KickPlayer([FromSource] Player source, int target, string kickReason = "You have been kicked from the server.")
         {
-            if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.OPKick, source) && !PermissionsManager.IsAllowed(PermissionsManager.Permission.POAll, source))
+            if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.OPKick, source) && !PermissionsManager.IsAllowed(PermissionsManager.Permission.OPAll, source))
             {
                 BanManager.BanCheater(source);
                 return;

vMenuServer/config/permissions.cfg

@@ -80,9 +80,6 @@ setr vmenu_pvp_mode 0
 # false = vMenu will not touch this feature, by default this means that head props will fall off when the player is hit, which is the default behavior for GTA V Single Player peds.
 setr keep_player_head_props true
 
-# Set this to true if you don't want vMenu to use any server information convars.
-setr vmenu_disable_server_info_convars false
-
 # Distance for playerblips to showup. This is using "game units" as measurement. It's unknown
 # what this is in relation to meters or something similar, but 500.0 seems fine in most cases.
 setr vmenu_player_names_distance 500.0