Added tank column to servervehicles

ReallifeGamemode.Client/Scripts/moveItems.ps1

@@ -5,9 +5,16 @@ $csPackagesPath = "$rootPath\cs_packages"
 $dlcPacksPath = "$rootPath\dlcpacks"
 
 $clientResourcesPath = "$rootPath\..\..\client_packages"
+$sourceDlcPacksPath = "$rootPath\..\..\source_dlcpacks"
 
 Remove-Item -Path "$clientResourcesPath\*" -Recurse -Force
 
-$exclude = @('*.ts', 'package.json', 'package-lock.json', 'tsconfig.json', '*.csproj', 'Scripts', 'node_modules', 'bin', 'obj')
+$exclude = @('*.ts', 'package.json', 'package-lock.json', 'tsconfig.json', '*.csproj', 'Scripts', 'node_modules', 'bin', 'obj', 'dlcpacks')
+
+if(!(Test-Path $sourceDlcPacksPath))
+{
+	New-Item -Type Directory $sourceDlcPacksPath
+}
 
 Copy-Item "$rootPath\*" $clientResourcesPath -Recurse -Exclude $exclude
+Copy-Item "$dlcPacksPath\*" $sourceDlcPacksPath -Recurse -Force

ReallifeGamemode.Server/Entities/ServerVehicle.cs

@@ -25,6 +25,7 @@ namespace ReallifeGamemode.Server.Entities
         public bool Locked { get; set; }
         public bool Active { get; set; }
         public float DistanceDriven { get; set; }
+        public float TankAmount { get; set; }
 
         [NotMapped]
         public Vector3 Position => new Vector3(PositionX, PositionY, PositionZ);

ReallifeGamemode.Server/Migrations/20190307163335_VehicleTank.cs

@@ -0,0 +1,23 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace ReallifeGamemode.Migrations
+{
+    public partial class VehicleTank : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<float>(
+                name: "TankAmount",
+                table: "ServerVehicles",
+                nullable: false,
+                defaultValue: 0f);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "TankAmount",
+                table: "ServerVehicles");
+        }
+    }
+}

ReallifeGamemode.Server/Migrations/DatabaseContextModelSnapshot.cs

@@ -17,7 +17,7 @@ namespace ReallifeGamemode.Migrations
                 .HasAnnotation("ProductVersion", "2.2.0-rtm-35687")
                 .HasAnnotation("Relational:MaxIdentifierLength", 64);
 
-            modelBuilder.Entity("reallife_gamemode.Server.Entities.Ban", b =>
+            modelBuilder.Entity("ReallifeGamemode.Server.Entities.Ban", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -39,7 +39,7 @@ namespace ReallifeGamemode.Migrations
                     b.ToTable("Bans");
                 });
 
-            modelBuilder.Entity("reallife_gamemode.Server.Entities.BusinessBankAccount", b =>
+            modelBuilder.Entity("ReallifeGamemode.Server.Entities.BusinessBankAccount", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -56,7 +56,7 @@ namespace ReallifeGamemode.Migrations
                     b.ToTable("BusinessBankAccounts");
                 });
 
-            modelBuilder.Entity("reallife_gamemode.Server.Entities.Character", b =>
+            modelBuilder.Entity("ReallifeGamemode.Server.Entities.Character", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -182,7 +182,7 @@ namespace ReallifeGamemode.Migrations
                     b.ToTable("Characters");
                 });
 
-            modelBuilder.Entity("reallife_gamemode.Server.Entities.CharacterCloth", b =>
+            modelBuilder.Entity("ReallifeGamemode.Server.Entities.CharacterCloth", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -204,7 +204,7 @@ namespace ReallifeGamemode.Migrations
                     b.ToTable("CharacterClothes");
                 });
 
-            modelBuilder.Entity("reallife_gamemode.Server.Entities.ClothCombination", b =>
+            modelBuilder.Entity("ReallifeGamemode.Server.Entities.ClothCombination", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -222,7 +222,7 @@ namespace ReallifeGamemode.Migrations
                     b.ToTable("ClothCombinations");
                 });
 
-            modelBuilder.Entity("reallife_gamemode.Server.Entities.Door", b =>
+            modelBuilder.Entity("ReallifeGamemode.Server.Entities.Door", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -252,7 +252,7 @@ namespace ReallifeGamemode.Migrations
                     b.ToTable("Doors");
                 });
 
-            modelBuilder.Entity("reallife_gamemode.Server.Entities.DutyCloth", b =>
+            modelBuilder.Entity("ReallifeGamemode.Server.Entities.DutyCloth", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -274,7 +274,7 @@ namespace ReallifeGamemode.Migrations
                     b.ToTable("DutyClothes");
                 });
 
-            modelBuilder.Entity("reallife_gamemode.Server.Entities.Faction", b =>
+            modelBuilder.Entity("ReallifeGamemode.Server.Entities.Faction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -289,7 +289,7 @@ namespace ReallifeGamemode.Migrations
                     b.ToTable("Factions");
                 });
 
-            modelBuilder.Entity("reallife_gamemode.Server.Entities.FactionBankAccount", b =>
+            modelBuilder.Entity("ReallifeGamemode.Server.Entities.FactionBankAccount", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -313,7 +313,7 @@ namespace ReallifeGamemode.Migrations
                     b.ToTable("FactionBankAccounts");
                 });
 
-            modelBuilder.Entity("reallife_gamemode.Server.Entities.FactionRank", b =>
+            modelBuilder.Entity("ReallifeGamemode.Server.Entities.FactionRank", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -331,7 +331,7 @@ namespace ReallifeGamemode.Migrations
                     b.ToTable("FactionRanks");
                 });
 
-            modelBuilder.Entity("reallife_gamemode.Server.Entities.GotoPoint", b =>
+            modelBuilder.Entity("ReallifeGamemode.Server.Entities.GotoPoint", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -352,7 +352,7 @@ namespace ReallifeGamemode.Migrations
                     b.ToTable("GotoPoints");
                 });
 
-            modelBuilder.Entity("reallife_gamemode.Server.Entities.Interior", b =>
+            modelBuilder.Entity("ReallifeGamemode.Server.Entities.Interior", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -370,7 +370,81 @@ namespace ReallifeGamemode.Migrations
                     b.ToTable("Interiors");
                 });
 
-            modelBuilder.Entity("reallife_gamemode.Server.Entities.News", b =>
+            modelBuilder.Entity("ReallifeGamemode.Server.Entities.Logs.BankAccountTransactionHistory", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("Fee");
+
+                    b.Property<int>("MoneySent");
+
+                    b.Property<int>("NewReceiverBalance");
+
+                    b.Property<int>("NewSenderBalance");
+
+                    b.Property<string>("Origin")
+                        .HasMaxLength(32);
+
+                    b.Property<string>("Receiver")
+                        .HasMaxLength(32);
+
+                    b.Property<int>("ReceiverBalance");
+
+                    b.Property<string>("Sender")
+                        .HasMaxLength(32);
+
+                    b.Property<int>("SenderBalance");
+
+                    b.Property<DateTime>("Timestamp")
+                        .ValueGeneratedOnAdd();
+
+                    b.HasKey("Id");
+
+                    b.ToTable("BankAccountTransactionLogs");
+                });
+
+            modelBuilder.Entity("ReallifeGamemode.Server.Entities.Logs.Death", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("CauseOfDeath")
+                        .HasMaxLength(64);
+
+                    b.Property<float>("KillerHeading");
+
+                    b.Property<int?>("KillerId");
+
+                    b.Property<float>("KillerPositionX");
+
+                    b.Property<float>("KillerPositionY");
+
+                    b.Property<float>("KillerPositionZ");
+
+                    b.Property<DateTime>("Timestamp")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<float>("VictimHeading");
+
+                    b.Property<int>("VictimId");
+
+                    b.Property<float>("VictimPositionX");
+
+                    b.Property<float>("VictimPositionY");
+
+                    b.Property<float>("VictimPositionZ");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("KillerId");
+
+                    b.HasIndex("VictimId");
+
+                    b.ToTable("DeathLogs");
+                });
+
+            modelBuilder.Entity("ReallifeGamemode.Server.Entities.News", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -392,7 +466,181 @@ namespace ReallifeGamemode.Migrations
                     b.ToTable("News");
                 });
 
-            modelBuilder.Entity("reallife_gamemode.Server.Entities.ServerVehicle", b =>
+            modelBuilder.Entity("ReallifeGamemode.Server.Entities.Saves.SavedBlip", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<bool>("Active");
+
+                    b.Property<byte>("Alpha");
+
+                    b.Property<byte>("Color");
+
+                    b.Property<byte>("Dimension");
+
+                    b.Property<float>("DrawDistance");
+
+                    b.Property<string>("Name");
+
+                    b.Property<float>("PositionX");
+
+                    b.Property<float>("PositionY");
+
+                    b.Property<float>("PositionZ");
+
+                    b.Property<float>("Rotation");
+
+                    b.Property<float>("Scale");
+
+                    b.Property<bool>("ShortRange");
+
+                    b.Property<short>("Sprite");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Blips");
+                });
+
+            modelBuilder.Entity("ReallifeGamemode.Server.Entities.Saves.SavedMarker", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<bool>("Active");
+
+                    b.Property<byte>("ColorA");
+
+                    b.Property<byte>("ColorB");
+
+                    b.Property<byte>("ColorG");
+
+                    b.Property<byte>("ColorR");
+
+                    b.Property<byte>("Dimension");
+
+                    b.Property<float>("DirectionX");
+
+                    b.Property<float>("DirectionY");
+
+                    b.Property<float>("DirectionZ");
+
+                    b.Property<float>("PositionX");
+
+                    b.Property<float>("PositionY");
+
+                    b.Property<float>("PositionZ");
+
+                    b.Property<float>("RotationX");
+
+                    b.Property<float>("RotationY");
+
+                    b.Property<float>("RotationZ");
+
+                    b.Property<float>("Scale");
+
+                    b.Property<byte>("Type");
+
+                    b.Property<bool>("Visible");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Markers");
+                });
+
+            modelBuilder.Entity("ReallifeGamemode.Server.Entities.Saves.SavedPed", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<bool>("Active");
+
+                    b.Property<byte>("Dimension");
+
+                    b.Property<string>("HashModel");
+
+                    b.Property<float>("Heading");
+
+                    b.Property<float>("PositionX");
+
+                    b.Property<float>("PositionY");
+
+                    b.Property<float>("PositionZ");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Peds");
+                });
+
+            modelBuilder.Entity("ReallifeGamemode.Server.Entities.Saves.SavedPickup", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<bool>("Active");
+
+                    b.Property<byte>("Dimension");
+
+                    b.Property<float>("PositionX")
+                        .HasMaxLength(128);
+
+                    b.Property<float>("PositionY");
+
+                    b.Property<float>("PositionZ");
+
+                    b.Property<int>("RespawnTime");
+
+                    b.Property<float>("RotationX");
+
+                    b.Property<float>("RotationY");
+
+                    b.Property<float>("RotationZ");
+
+                    b.Property<bool>("Vehicle");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Pickups");
+                });
+
+            modelBuilder.Entity("ReallifeGamemode.Server.Entities.Saves.SavedTextLabel", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<bool>("Active");
+
+                    b.Property<byte>("ColorA");
+
+                    b.Property<byte>("ColorB");
+
+                    b.Property<byte>("ColorG");
+
+                    b.Property<byte>("ColorR");
+
+                    b.Property<byte>("Dimension");
+
+                    b.Property<float>("DrawDistance");
+
+                    b.Property<byte>("Font");
+
+                    b.Property<bool>("LOS");
+
+                    b.Property<float>("PositionX");
+
+                    b.Property<float>("PositionY");
+
+                    b.Property<float>("PositionZ");
+
+                    b.Property<string>("Text")
+                        .IsRequired();
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TextLabels");
+                });
+
+            modelBuilder.Entity("ReallifeGamemode.Server.Entities.ServerVehicle", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -425,6 +673,8 @@ namespace ReallifeGamemode.Migrations
 
                     b.Property<int>("SecondaryColor");
 
+                    b.Property<float>("TankAmount");
+
                     b.HasKey("Id");
 
                     b.ToTable("ServerVehicles");
@@ -432,7 +682,7 @@ namespace ReallifeGamemode.Migrations
                     b.HasDiscriminator<string>("Discriminator").HasValue("ServerVehicle");
                 });
 
-            modelBuilder.Entity("reallife_gamemode.Server.Entities.User", b =>
+            modelBuilder.Entity("ReallifeGamemode.Server.Entities.User", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -492,7 +742,7 @@ namespace ReallifeGamemode.Migrations
                     b.ToTable("Users");
                 });
 
-            modelBuilder.Entity("reallife_gamemode.Server.Entities.UserBankAccount", b =>
+            modelBuilder.Entity("ReallifeGamemode.Server.Entities.UserBankAccount", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -516,7 +766,7 @@ namespace ReallifeGamemode.Migrations
                     b.ToTable("UserBankAccounts");
                 });
 
-            modelBuilder.Entity("reallife_gamemode.Server.Entities.UserItem", b =>
+            modelBuilder.Entity("ReallifeGamemode.Server.Entities.UserItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -536,7 +786,7 @@ namespace ReallifeGamemode.Migrations
                     b.ToTable("UserItems");
                 });
 
-            modelBuilder.Entity("reallife_gamemode.Server.Entities.VehicleMod", b =>
+            modelBuilder.Entity("ReallifeGamemode.Server.Entities.VehicleMod", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -555,7 +805,7 @@ namespace ReallifeGamemode.Migrations
                     b.ToTable("VehicleMods");
                 });
 
-            modelBuilder.Entity("reallife_gamemode.Server.Entities.Whitelist", b =>
+            modelBuilder.Entity("ReallifeGamemode.Server.Entities.Whitelist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -567,257 +817,9 @@ namespace ReallifeGamemode.Migrations
                     b.ToTable("WhitelistEntries");
                 });
 
-            modelBuilder.Entity("reallife_gamemode.Server.Logs.BankAccountTransactionHistory", b =>
+            modelBuilder.Entity("ReallifeGamemode.Server.Entities.FactionVehicle", b =>
                 {
-                    b.Property<int>("Id")
+                    b.HasBaseType("ReallifeGamemode.Server.Entities.ServerVehicle");
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("Fee");
-
-                    b.Property<int>("MoneySent");
-
-                    b.Property<int>("NewReceiverBalance");
-
-                    b.Property<int>("NewSenderBalance");
-
-                    b.Property<string>("Origin")
-                        .HasMaxLength(32);
-
-                    b.Property<string>("Receiver")
-                        .HasMaxLength(32);
-
-                    b.Property<int>("ReceiverBalance");
-
-                    b.Property<string>("Sender")
-                        .HasMaxLength(32);
-
-                    b.Property<int>("SenderBalance");
-
-                    b.Property<DateTime>("Timestamp")
-                        .ValueGeneratedOnAdd();
-
-                    b.HasKey("Id");
-
-                    b.ToTable("BankAccountTransactionLogs");
-                });
-
-            modelBuilder.Entity("reallife_gamemode.Server.Logs.Death", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("CauseOfDeath")
-                        .HasMaxLength(64);
-
-                    b.Property<float>("KillerHeading");
-
-                    b.Property<int?>("KillerId");
-
-                    b.Property<float>("KillerPositionX");
-
-                    b.Property<float>("KillerPositionY");
-
-                    b.Property<float>("KillerPositionZ");
-
-                    b.Property<DateTime>("Timestamp")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<float>("VictimHeading");
-
-                    b.Property<int>("VictimId");
-
-                    b.Property<float>("VictimPositionX");
-
-                    b.Property<float>("VictimPositionY");
-
-                    b.Property<float>("VictimPositionZ");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("KillerId");
-
-                    b.HasIndex("VictimId");
-
-                    b.ToTable("DeathLogs");
-                });
-
-            modelBuilder.Entity("reallife_gamemode.Server.Saves.SavedBlip", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Active");
-
-                    b.Property<byte>("Alpha");
-
-                    b.Property<byte>("Color");
-
-                    b.Property<byte>("Dimension");
-
-                    b.Property<float>("DrawDistance");
-
-                    b.Property<string>("Name");
-
-                    b.Property<float>("PositionX");
-
-                    b.Property<float>("PositionY");
-
-                    b.Property<float>("PositionZ");
-
-                    b.Property<float>("Rotation");
-
-                    b.Property<float>("Scale");
-
-                    b.Property<bool>("ShortRange");
-
-                    b.Property<short>("Sprite");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Blips");
-                });
-
-            modelBuilder.Entity("reallife_gamemode.Server.Saves.SavedMarker", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Active");
-
-                    b.Property<byte>("ColorA");
-
-                    b.Property<byte>("ColorB");
-
-                    b.Property<byte>("ColorG");
-
-                    b.Property<byte>("ColorR");
-
-                    b.Property<byte>("Dimension");
-
-                    b.Property<float>("DirectionX");
-
-                    b.Property<float>("DirectionY");
-
-                    b.Property<float>("DirectionZ");
-
-                    b.Property<float>("PositionX");
-
-                    b.Property<float>("PositionY");
-
-                    b.Property<float>("PositionZ");
-
-                    b.Property<float>("RotationX");
-
-                    b.Property<float>("RotationY");
-
-                    b.Property<float>("RotationZ");
-
-                    b.Property<float>("Scale");
-
-                    b.Property<byte>("Type");
-
-                    b.Property<bool>("Visible");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Markers");
-                });
-
-            modelBuilder.Entity("reallife_gamemode.Server.Saves.SavedPed", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Active");
-
-                    b.Property<byte>("Dimension");
-
-                    b.Property<string>("HashModel");
-
-                    b.Property<float>("Heading");
-
-                    b.Property<float>("PositionX");
-
-                    b.Property<float>("PositionY");
-
-                    b.Property<float>("PositionZ");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Peds");
-                });
-
-            modelBuilder.Entity("reallife_gamemode.Server.Saves.SavedPickup", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Active");
-
-                    b.Property<byte>("Dimension");
-
-                    b.Property<float>("PositionX")
-                        .HasMaxLength(128);
-
-                    b.Property<float>("PositionY");
-
-                    b.Property<float>("PositionZ");
-
-                    b.Property<int>("RespawnTime");
-
-                    b.Property<float>("RotationX");
-
-                    b.Property<float>("RotationY");
-
-                    b.Property<float>("RotationZ");
-
-                    b.Property<bool>("Vehicle");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Pickups");
-                });
-
-            modelBuilder.Entity("reallife_gamemode.Server.Saves.SavedTextLabel", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Active");
-
-                    b.Property<byte>("ColorA");
-
-                    b.Property<byte>("ColorB");
-
-                    b.Property<byte>("ColorG");
-
-                    b.Property<byte>("ColorR");
-
-                    b.Property<byte>("Dimension");
-
-                    b.Property<float>("DrawDistance");
-
-                    b.Property<byte>("Font");
-
-                    b.Property<bool>("LOS");
-
-                    b.Property<float>("PositionX");
-
-                    b.Property<float>("PositionY");
-
-                    b.Property<float>("PositionZ");
-
-                    b.Property<string>("Text")
-                        .IsRequired();
-
-                    b.HasKey("Id");
-
-                    b.ToTable("TextLabels");
-                });
-
-            modelBuilder.Entity("reallife_gamemode.Server.Entities.FactionVehicle", b =>
-                {
-                    b.HasBaseType("reallife_gamemode.Server.Entities.ServerVehicle");
 
                     b.Property<int?>("FactionId");
 
@@ -828,9 +830,16 @@ namespace ReallifeGamemode.Migrations
                     b.HasDiscriminator().HasValue("FactionVehicle");
                 });
 
-            modelBuilder.Entity("reallife_gamemode.Server.Entities.ShopVehicle", b =>
+            modelBuilder.Entity("ReallifeGamemode.Server.Entities.Saves.SavedVehicle", b =>
                 {
-                    b.HasBaseType("reallife_gamemode.Server.Entities.ServerVehicle");
+                    b.HasBaseType("ReallifeGamemode.Server.Entities.ServerVehicle");
+
+                    b.HasDiscriminator().HasValue("SavedVehicle");
+                });
+
+            modelBuilder.Entity("ReallifeGamemode.Server.Entities.ShopVehicle", b =>
+                {
+                    b.HasBaseType("ReallifeGamemode.Server.Entities.ServerVehicle");
 
                     b.Property<int>("BusinessId");
 
@@ -843,9 +852,9 @@ namespace ReallifeGamemode.Migrations
                     b.HasDiscriminator().HasValue("ShopVehicle");
                 });
 
-            modelBuilder.Entity("reallife_gamemode.Server.Entities.UserVehicle", b =>
+            modelBuilder.Entity("ReallifeGamemode.Server.Entities.UserVehicle", b =>
                 {
-                    b.HasBaseType("reallife_gamemode.Server.Entities.ServerVehicle");
+                    b.HasBaseType("ReallifeGamemode.Server.Entities.ServerVehicle");
 
                     b.Property<int>("UserId");
 
@@ -856,140 +865,133 @@ namespace ReallifeGamemode.Migrations
                     b.HasDiscriminator().HasValue("UserVehicle");
                 });
 
-            modelBuilder.Entity("reallife_gamemode.Server.Saves.SavedVehicle", b =>
+            modelBuilder.Entity("ReallifeGamemode.Server.Entities.Ban", b =>
                 {
-                    b.HasBaseType("reallife_gamemode.Server.Entities.ServerVehicle");
+                    b.HasOne("ReallifeGamemode.Server.Entities.User", "User")
-
-                    b.HasDiscriminator().HasValue("SavedVehicle");
-                });
-
-            modelBuilder.Entity("reallife_gamemode.Server.Entities.Ban", b =>
-                {
-                    b.HasOne("reallife_gamemode.Server.Entities.User", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("reallife_gamemode.Server.Entities.Character", b =>
+            modelBuilder.Entity("ReallifeGamemode.Server.Entities.Character", b =>
                 {
-                    b.HasOne("reallife_gamemode.Server.Entities.User", "User")
+                    b.HasOne("ReallifeGamemode.Server.Entities.User", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("reallife_gamemode.Server.Entities.CharacterCloth", b =>
+            modelBuilder.Entity("ReallifeGamemode.Server.Entities.CharacterCloth", b =>
                 {
-                    b.HasOne("reallife_gamemode.Server.Entities.User", "User")
+                    b.HasOne("ReallifeGamemode.Server.Entities.User", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("reallife_gamemode.Server.Entities.Door", b =>
+            modelBuilder.Entity("ReallifeGamemode.Server.Entities.Door", b =>
                 {
-                    b.HasOne("reallife_gamemode.Server.Entities.Faction", "Faction")
+                    b.HasOne("ReallifeGamemode.Server.Entities.Faction", "Faction")
                         .WithMany()
                         .HasForeignKey("FactionId");
                 });
 
-            modelBuilder.Entity("reallife_gamemode.Server.Entities.DutyCloth", b =>
+            modelBuilder.Entity("ReallifeGamemode.Server.Entities.DutyCloth", b =>
                 {
-                    b.HasOne("reallife_gamemode.Server.Entities.Faction", "Faction")
+                    b.HasOne("ReallifeGamemode.Server.Entities.Faction", "Faction")
                         .WithMany()
                         .HasForeignKey("FactionId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("reallife_gamemode.Server.Entities.FactionBankAccount", b =>
+            modelBuilder.Entity("ReallifeGamemode.Server.Entities.FactionBankAccount", b =>
                 {
-                    b.HasOne("reallife_gamemode.Server.Entities.Faction", "Faction")
+                    b.HasOne("ReallifeGamemode.Server.Entities.Faction", "Faction")
                         .WithMany()
                         .HasForeignKey("FactionId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("reallife_gamemode.Server.Entities.FactionRank", b =>
+            modelBuilder.Entity("ReallifeGamemode.Server.Entities.FactionRank", b =>
                 {
-                    b.HasOne("reallife_gamemode.Server.Entities.Faction", "Faction")
+                    b.HasOne("ReallifeGamemode.Server.Entities.Faction", "Faction")
                         .WithMany()
                         .HasForeignKey("FactionId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("reallife_gamemode.Server.Entities.News", b =>
+            modelBuilder.Entity("ReallifeGamemode.Server.Entities.Logs.Death", b =>
                 {
-                    b.HasOne("reallife_gamemode.Server.Entities.User", "User")
+                    b.HasOne("ReallifeGamemode.Server.Entities.User", "Killer")
-                        .WithMany()
-                        .HasForeignKey("UserId");
-                });
-
-            modelBuilder.Entity("reallife_gamemode.Server.Entities.User", b =>
-                {
-                    b.HasOne("reallife_gamemode.Server.Entities.Ban", "Ban")
-                        .WithMany()
-                        .HasForeignKey("BanId");
-
-                    b.HasOne("reallife_gamemode.Server.Entities.Character", "Character")
-                        .WithMany()
-                        .HasForeignKey("CharacterId");
-
-                    b.HasOne("reallife_gamemode.Server.Entities.Faction", "Faction")
-                        .WithMany()
-                        .HasForeignKey("FactionId");
-
-                    b.HasOne("reallife_gamemode.Server.Entities.FactionRank", "FactionRank")
-                        .WithMany()
-                        .HasForeignKey("FactionRankId");
-                });
-
-            modelBuilder.Entity("reallife_gamemode.Server.Entities.UserBankAccount", b =>
-                {
-                    b.HasOne("reallife_gamemode.Server.Entities.User", "User")
-                        .WithMany()
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("reallife_gamemode.Server.Entities.UserItem", b =>
-                {
-                    b.HasOne("reallife_gamemode.Server.Entities.User", "User")
-                        .WithMany()
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("reallife_gamemode.Server.Entities.VehicleMod", b =>
-                {
-                    b.HasOne("reallife_gamemode.Server.Entities.ServerVehicle", "Vehicle")
-                        .WithMany()
-                        .HasForeignKey("ServerVehicleId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("reallife_gamemode.Server.Logs.Death", b =>
-                {
-                    b.HasOne("reallife_gamemode.Server.Entities.User", "Killer")
                         .WithMany()
                         .HasForeignKey("KillerId");
 
-                    b.HasOne("reallife_gamemode.Server.Entities.User", "Victim")
+                    b.HasOne("ReallifeGamemode.Server.Entities.User", "Victim")
                         .WithMany()
                         .HasForeignKey("VictimId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("reallife_gamemode.Server.Entities.FactionVehicle", b =>
+            modelBuilder.Entity("ReallifeGamemode.Server.Entities.News", b =>
                 {
-                    b.HasOne("reallife_gamemode.Server.Entities.Faction", "Faction")
+                    b.HasOne("ReallifeGamemode.Server.Entities.User", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId");
+                });
+
+            modelBuilder.Entity("ReallifeGamemode.Server.Entities.User", b =>
+                {
+                    b.HasOne("ReallifeGamemode.Server.Entities.Ban", "Ban")
+                        .WithMany()
+                        .HasForeignKey("BanId");
+
+                    b.HasOne("ReallifeGamemode.Server.Entities.Character", "Character")
+                        .WithMany()
+                        .HasForeignKey("CharacterId");
+
+                    b.HasOne("ReallifeGamemode.Server.Entities.Faction", "Faction")
+                        .WithMany()
+                        .HasForeignKey("FactionId");
+
+                    b.HasOne("ReallifeGamemode.Server.Entities.FactionRank", "FactionRank")
+                        .WithMany()
+                        .HasForeignKey("FactionRankId");
+                });
+
+            modelBuilder.Entity("ReallifeGamemode.Server.Entities.UserBankAccount", b =>
+                {
+                    b.HasOne("ReallifeGamemode.Server.Entities.User", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("ReallifeGamemode.Server.Entities.UserItem", b =>
+                {
+                    b.HasOne("ReallifeGamemode.Server.Entities.User", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("ReallifeGamemode.Server.Entities.VehicleMod", b =>
+                {
+                    b.HasOne("ReallifeGamemode.Server.Entities.ServerVehicle", "Vehicle")
+                        .WithMany()
+                        .HasForeignKey("ServerVehicleId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("ReallifeGamemode.Server.Entities.FactionVehicle", b =>
+                {
+                    b.HasOne("ReallifeGamemode.Server.Entities.Faction", "Faction")
                         .WithMany()
                         .HasForeignKey("FactionId");
                 });
 
-            modelBuilder.Entity("reallife_gamemode.Server.Entities.UserVehicle", b =>
+            modelBuilder.Entity("ReallifeGamemode.Server.Entities.UserVehicle", b =>
                 {
-                    b.HasOne("reallife_gamemode.Server.Entities.User", "User")
+                    b.HasOne("ReallifeGamemode.Server.Entities.User", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);