Test NoobVehicles

ReallifeGamemode.Database/Entities/NoobVehicle.cs

@@ -0,0 +1,7 @@
+namespace ReallifeGamemode.Database.Entities
+{
+  public partial class NoobVehicle : ServerVehicle
+  {
+    //public int SchoolId { get; set; }
+  }
+}

ReallifeGamemode.Database/Models/DatabaseContext.cs

@@ -136,6 +136,9 @@ namespace ReallifeGamemode.Database.Models
     //Driving/Bike/Flight School
     public DbSet<Entities.SchoolVehicle> SchoolVehicles { get; set; }
 
+    //Noob Vehicles
+    public DbSet<Entities.NoobVehicle> NoobVehicles { get; set; }
+
     //Gangwar
     public DbSet<Entities.Turfs> Turfs { get; set; }
 

ReallifeGamemode.Server/Commands/AdminCommands.cs

@@ -1985,7 +1985,7 @@ namespace ReallifeGamemode.Server.Commands
       }
     }
 
-    [Command("save", "~m~Benutzung: ~s~/save [Typ = ~g~Blip~s~, ~g~Goto (X)~s~, ~r~Marker~s~, ~r~Ped~s~, ~r~Pickup~s~, ~r~TextLabel~s~, ~g~Vehicle~s~, ~g~FVehicle~s~, ~g~SVehicle (X)~s~, ~g~JVehicle (X)~s~, ~g~Location~s~] (Weitere Angaben) = (X)", GreedyArg = true)]
+    [Command("save", "~m~Benutzung: ~s~/save [Typ = ~g~Blip~s~, ~g~Goto (X)~s~, ~r~Marker~s~, ~r~Ped~s~, ~r~Pickup~s~, ~r~TextLabel~s~, ~g~Vehicle~s~, ~g~FVehicle~s~, ~g~SVehicle (X)~s~, ~g~JVehicle (X)~s~, ~g~ShoolVehicle (X)~s~, ~g~NoobVehicle~s~, ~g~Location~s~] (Weitere Angaben) = (X)", GreedyArg = true)]
     public void CmdAdminSave(Player player, string typ, string option1 = null, string option2 = null)
     {
       if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true)
@@ -2164,6 +2164,16 @@ namespace ReallifeGamemode.Server.Commands
             player.SetIntoVehicle(vehicle, 0);
           }
           break;
+        case "noobvehicle":
+          if (player.IsInVehicle)
+          {
+            Vehicle vehicle = player.Vehicle;
+            vehicle = SaveManager.SaveNoobVehicleData(vehicle, (VehicleHash)vehicle.Model, vehicle.Position, vehicle.Heading, vehicle.NumberPlate,
+                vehicle.PrimaryColor, vehicle.SecondaryColor, vehicle.Locked, vehicle.EngineStatus);
+            player.SendNotification("Noobfahrzeug ~g~" + vehicle.DisplayName + "~s~ gespeichert.", true);
+            player.SetIntoVehicle(vehicle, 0);
+          }
+          break;
 
         case "location":
           if (option1 == null || option1.Length < 0)

ReallifeGamemode.Server/Events/EnterVehicleAttempt.cs

@@ -39,13 +39,6 @@ namespace ReallifeGamemode.Server.Events
           player.SendNotification("~r~Du darfst dieses Fahrzeug nicht benutzen!", true);
           return;
         }
-        else if (player.GetUser().FactionId == 0)
-        {
-          if(player.GetUser().PlayedMinutes > 1800)
-          {
-            player.SendNotification("~r~Du hast mehr als 30 Spielstunde, kaufe dir ein eigenes Fahrzeug!", true);
-          }
-        }
 
       }
       if (vehicle.GetServerVehicle() is SchoolVehicle sVeh)
@@ -63,6 +56,15 @@ namespace ReallifeGamemode.Server.Events
           return;
         }
       }
+      if (vehicle.GetServerVehicle() is NoobVehicle nVeh)
+      {
+        if (player.GetUser().PlayedMinutes > 1800)
+        {
+          player.StopAnimation();
+          player.SendNotification("~r~Du hast schon über 30 Spielstunden!", true);
+          return;
+        }
+      }
     }
   }
 }

ReallifeGamemode.Server/Extensions/ServerVehicleExtensions.cs

@@ -66,6 +66,14 @@ namespace ReallifeGamemode.Server.Extensions
       {
         numberplate = $"J{jV.JobId} " + numberplate;
       }
+      if (veh is SchoolVehicle)
+      {
+        numberplate = "FS" + numberplate;
+      }
+      if (veh is NoobVehicle)
+      {
+        numberplate = "NV" + numberplate;
+      }
       NAPI.Vehicle.SetVehicleNumberPlate(newVeh, numberplate);
       veh.NumberPlate = numberplate;
 

ReallifeGamemode.Server/Managers/SaveManager.cs

@@ -131,6 +131,31 @@ namespace ReallifeGamemode.Server.Managers
       }
     }
 
+    public static Vehicle SaveNoobVehicleData(Vehicle veh, VehicleHash vehicleModel, Vector3 vehiclePosition, float vehicleHeading,
+        string vehicleNumberPlate, int vehiclePrimaryColor, int vehicleSecondaryColor, bool vehicleLocked, bool vehicleEngine)
+    {
+      using (var saveData = new DatabaseContext())
+      {
+        var dataSet = new NoobVehicle
+        {
+          Model = vehicleModel,
+          PositionX = vehiclePosition.X,
+          PositionY = vehiclePosition.Y,
+          PositionZ = vehiclePosition.Z,
+          Heading = vehicleHeading,
+          NumberPlate = vehicleNumberPlate,
+          PrimaryColor = vehiclePrimaryColor,
+          SecondaryColor = vehicleSecondaryColor,
+          Locked = vehicleLocked,
+          Active = true
+        };
+        saveData.NoobVehicles.Add(dataSet);
+        saveData.SaveChanges();
+
+        return dataSet.Spawn(veh);
+      }
+    }
+
 
 
     public static Vehicle SaveFactionVehicleData(Vehicle veh, VehicleHash vehicleModel, Vector3 vehiclePosition, float vehicleHeading,