New features and fixes

SharedClasses/ConfigManager.cs

@@ -34,8 +34,10 @@ public enum Setting
             vmenu_disable_entity_outlines_tool,
             vmenu_disable_player_stats_setup,
 
-            // Vehicle Chameleon Colours
+            // Vehicle Settings
             vmenu_using_chameleon_colours,
+            vmenu_vehicle_spawn_delay,
+            vmenu_delete_vehicle_distance,
 
             // Prevent Extras Abuse
             vmenu_prevent_extras_when_damaged,
@@ -61,6 +63,7 @@ public enum Setting
             vmenu_vehicle_blackout_enabled,
             vmenu_weather_change_duration,
             vmenu_enable_snow,
+            vmenu_smooth_time_transitions,
 
             // Time settings
             vmenu_enable_time_sync,
@@ -92,12 +95,12 @@ public static bool GetSettingsBool(Setting setting)
         /// </summary>
         /// <param name="setting"></param>
         /// <returns></returns>
-        public static int GetSettingsInt(Setting setting)
+        public static int GetSettingsInt(Setting setting, int defaultValue = -1)
         {
-            var convarInt = GetConvarInt(setting.ToString(), -1);
-            if (convarInt == -1)
+            var convarInt = GetConvarInt(setting.ToString(), defaultValue);
+            if (convarInt == defaultValue)
             {
-                if (int.TryParse(GetConvar(setting.ToString(), "-1"), out var convarIntAlt))
+                if (int.TryParse(GetConvar(setting.ToString(), defaultValue.ToString()), out var convarIntAlt))
                 {
                     return convarIntAlt;
                 }
@@ -110,13 +113,13 @@ public static int GetSettingsInt(Setting setting)
         /// </summary>
         /// <param name="setting"></param>
         /// <returns></returns>
-        public static float GetSettingsFloat(Setting setting)
+        public static float GetSettingsFloat(Setting setting, float defaultValue = -1f)
         {
-            if (float.TryParse(GetConvar(setting.ToString(), "-1.0"), out var result))
+            if (float.TryParse(GetConvar(setting.ToString(), defaultValue.ToString()), out var result))
             {
                 return result;
             }
-            return -1f;
+            return defaultValue;
         }
 
         /// <summary>

SharedClasses/PermissionsManager.cs

@@ -113,6 +113,7 @@ public enum Permission
             #region vehicle spawner
             VSMenu,
             VSAll,
+            VSBypassRateLimit,
             VSDisableReplacePrevious,
             VSSpawnByName,
             VSAddon,
@@ -481,8 +482,7 @@ private static bool IsAllowedServer(Permission permission, string playerHandle)
             {
                 return false;
             }
-
-            return IsPlayerAceAllowed(playerHandle, GetAceName(permission));
+            return GetPermissionAndParentPermissions(permission).Any(p => IsPlayerAceAllowed(playerHandle, GetAceName(p)));
         }
 #endif
 

SharedClasses/SupplementaryPermissionManager.cs

@@ -124,7 +124,7 @@ private static bool IsAllowedServer(string permission, string playerHandle)
                 return false;
             }
 
-            return IsPlayerAceAllowed(playerHandle, GetAceName(permission));
+            return GetPermissionAndParentPermissions(permission).Any(p => IsPlayerAceAllowed(playerHandle, GetAceName(p)));
         }
 #endif
 

vMenu/CommonFunctions.cs

@@ -15,6 +15,7 @@
 
 using static CitizenFX.Core.UI.Screen;
 using static vMenuShared.PermissionsManager;
+using vMenuShared;
 
 namespace vMenuClient
 {
@@ -1225,6 +1226,8 @@ public static async Task<int> SpawnVehicle(string vehicleName = "custom", bool s
         #endregion
 
         #region Main Spawn Vehicle Function
+        public static int lastSpawnTime = 0;
+        public static int spawnTime = ConfigManager.GetSettingsInt(ConfigManager.Setting.vmenu_vehicle_spawn_delay, 5) * 1000;
         /// <summary>
         /// Spawns a vehicle.
         /// </summary>
@@ -1260,8 +1263,19 @@ public static async Task<int> SpawnVehicle(uint vehicleHash, bool spawnInside, b
                     return 0;
                 }
             }
-
-
+
+            int gameTime = GetGameTimer();
+            if (!IsAllowed(Permission.VSBypassRateLimit))
+            {
+                if (lastSpawnTime + spawnTime > gameTime)
+                {
+                    Notify.Error($"You are spawning vehicles too quickly. Please wait {Math.Ceiling((double)(lastSpawnTime + spawnTime - gameTime)/1000)} second(s) before trying again.");
+                    return 0;
+                }
+            }
+
+            lastSpawnTime = gameTime;
+
             if (!skipLoad)
             {
                 var successFull = await LoadModel(vehicleHash);
@@ -1375,6 +1389,13 @@ public static async Task<int> SpawnVehicle(uint vehicleHash, bool spawnInside, b
                 {
                     vehicle.PlaceOnGround();
                 }
+
+                if (!vehicle.Model.IsTrain) // to be extra fucking safe
+                {
+                    // workaround of retarded feature above:
+                    SetVehicleForwardSpeed(vehicle.Handle, speed);
+                }
+                vehicle.CurrentRPM = rpm;
             }
 
             // If mod info about the vehicle was specified, check if it's not null.
@@ -1385,13 +1406,6 @@ public static async Task<int> SpawnVehicle(uint vehicleHash, bool spawnInside, b
 
             // Set the previous vehicle to the new vehicle.
             _previousVehicle = vehicle;
-            //vehicle.Speed = speed; // retarded feature that randomly breaks for no fucking reason
-            if (!vehicle.Model.IsTrain) // to be extra fucking safe
-            {
-                // workaround of retarded feature above:
-                SetVehicleForwardSpeed(vehicle.Handle, speed);
-            }
-            vehicle.CurrentRPM = rpm;
 
             int vehicleDefaultRadio = UserDefaults.VehicleDefaultRadio;
 
@@ -2141,7 +2155,7 @@ public static void UpdateServerTime(int hours, int minutes)
             {
                 realMinutes = 0;
             }
-            TriggerServerEvent("vMenu:UpdateServerTime", realHours, realMinutes);
+            TriggerServerEvent("vMenu:UpdateServerTime", realHours, realMinutes, EventManager.IsServerTimeFrozen);
         }
 
         /// <summary>
@@ -3615,5 +3629,81 @@ .. Enum.GetValues(typeof(VehicleData.ModType))
             ];
         }
         #endregion
+
+        #region  Delete vehicle function
+
+        public async static void DeleteVehicle()
+        { 
+            var player = Game.PlayerPed;
+
+            if (!player.IsAlive)
+                return;
+
+            if (player.IsInVehicle())
+            {
+                var veh = GetVehicle();
+
+                if (veh != null && veh.Exists() && veh.Driver == player)
+                {
+                    SetVehicleHasBeenOwnedByPlayer(veh.Handle, false);
+                    SetEntityAsMissionEntity(veh.Handle, false, false);
+                    veh.Delete();
+                }
+                else
+                {
+                    Notify.Error("This vehicle does not exist (somehow) or you need to be the driver of this vehicle to delete it!");
+                }
+
+                return;
+            }
+
+            float distance = ConfigManager.GetSettingsFloat(ConfigManager.Setting.vmenu_delete_vehicle_distance, 5.0f);
+            int maxDeleteTries = 5;
+            int maxHitTries = 5;
+
+            var forward = GetOffsetFromEntityInWorldCoords(player.Handle, 0f, distance, 0f);
+            var ray = StartShapeTestCapsule(player.Position.X, player.Position.Y, player.Position.Z, forward.X, forward.Y, forward.Z, 5f, 10, player.Handle, 7);
+
+            bool hit = false;
+            Vector3 endCoords = Vector3.Zero;
+            Vector3 surfaceNormal = Vector3.Zero;
+            int entity = 0;
+
+            for (int i = 0; i < maxHitTries; i++)
+            {
+                GetShapeTestResult(ray, ref hit, ref endCoords, ref surfaceNormal, ref entity);
+                if (hit) break;
+                await Task.FromResult(0);
+            }
+
+            if (!hit || !DoesEntityExist(entity) || !IsEntityAVehicle(entity))
+            {
+                Notify.Error("No vehicle found in front of you to delete!");
+                return;
+            }
+
+            var hitVeh = new Vehicle(entity);
+
+            for (int i = 0; i <= maxDeleteTries && DoesEntityExist(entity); i++)
+            {
+                NetworkRequestControlOfEntity(entity);
+                SetVehicleHasBeenOwnedByPlayer(entity, false);
+                SetEntityAsMissionEntity(entity, false, false);
+                hitVeh.Delete();
+                await Task.FromResult(0);
+            }
+
+            if (DoesEntityExist(entity))
+            {
+                Notify.Error("Failed to delete the vehicle in front of you. Try again or ask an admin for help.");
+            }
+            else
+            {
+                Notify.Success("Vehicle deleted successfully.");
+            }
+        }
+
+
+        #endregion
     }
 }

vMenu/FunctionsController.cs

@@ -621,7 +621,6 @@ private async Task VehicleOptions()
 
                 var subMenus = new List<Menu>()
                     {
-                        MainMenu.VehicleOptionsMenu.DeleteConfirmMenu,
                         MainMenu.VehicleOptionsMenu.VehicleColorsMenu,
                         MainMenu.VehicleOptionsMenu.VehicleComponentsMenu,
                         MainMenu.VehicleOptionsMenu.VehicleDoorsMenu,

vMenu/MainMenu.cs

@@ -147,6 +147,14 @@ public MainMenu()
                     }
                 }
             }), false);
+
+            RegisterCommand("vMenu:DV", new Action<dynamic, List<dynamic>, string>((source, args, rawCommand) =>
+            {
+                if (IsAllowed(Permission.VODelete))
+                {
+                    DeleteVehicle();
+                }
+            }), false);
 
             if (!(GetSettingsString(Setting.vmenu_noclip_toggle_key) == null))
             {

vMenu/menus/VehicleOptions.cs

@@ -461,27 +461,8 @@ private void CreateMenu()
                 }
                 else
                 {
-                    var veh = GetVehicle();
-                    if (veh != null && veh.Exists() && GetVehicle().Driver == Game.PlayerPed)
-                    {
-                        SetVehicleHasBeenOwnedByPlayer(veh.Handle, false);
-                        SetEntityAsMissionEntity(veh.Handle, false, false);
-                        veh.Delete();
-                    }
-                    else
-                    {
-                        if (!Game.PlayerPed.IsInVehicle())
-                        {
-                            Notify.Alert(CommonErrors.NoVehicle);
-                        }
-                        else
-                        {
-                            Notify.Alert("You need to be in the driver's seat if you want to delete a vehicle.");
-                        }
-
-                    }
+                    DeleteVehicle();
                     DeleteConfirmMenu.GoBack();
-                    menu.GoBack();
                 }
             };
             #endregion

vMenu/vMenuClient.csproj

@@ -50,7 +50,7 @@
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command="if exist &quot;$(SolutionDir)\postbuild.cmd&quot; &quot;$(SolutionDir)postbuild.cmd&quot;" />
+    <Exec Condition="'$(OS)' == 'Windows_NT'" Command="if exist &quot;$(SolutionDir)postbuild.cmd&quot; &quot;$(SolutionDir)postbuild.cmd&quot;" />
   </Target>
 
   <ItemGroup>