Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop

ReallifeGamemode.Database/Entities/Faction.cs

@@ -20,6 +20,7 @@ namespace ReallifeGamemode.Database.Entities
     [StringLength(32)]
     public string Name { get; set; }
     public bool StateOwned { get; set; }
+    public int WeaponDealTime { get; set; } = 60;
 
     public IBankAccount GetBankAccount(DatabaseContext databaseContext = null)
     {

ReallifeGamemode.Database/Entities/FactionWeapon.cs

@@ -20,5 +20,6 @@ namespace ReallifeGamemode.Database.Entities
     public string WeaponModel { get; set; }
     public int SlotID { get; set; }
     public int Rank { get; set; }
+    public int Ammount { get; set; }
   }
 }

ReallifeGamemode.Database/Entities/User.cs

@@ -88,7 +88,7 @@ namespace ReallifeGamemode.Database.Entities
 
     public int JailTime { get; set; }
 
-    public int PaydayTimer { get; set; }
+    public int PaydayTimer { get; set; } = 60;
 
     public bool DriverLicenseVehicle { get; set; }
 

ReallifeGamemode.Database/Migrations/20190922163450_WeaponDealTimer.cs

@@ -0,0 +1,35 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace ReallifeGamemode.Database.Migrations
+{
+    public partial class WeaponDealTimer : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "WeaponDealTime",
+                table: "Factions",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AlterColumn<int>(
+              name: "PaydayTimer",
+              table: "Users",
+              nullable: false,
+              defaultValue: 60);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "WeaponDealTime",
+                table: "Factions");
+
+            migrationBuilder.AlterColumn<int>(
+              name: "PaydayTimer",
+              table: "Users",
+              nullable: false,
+              defaultValue: 0);
+        }
+    }
+}

ReallifeGamemode.Database/Migrations/20190929202101_FactionWeaponAmount.cs

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

ReallifeGamemode.Database/Migrations/DatabaseContextModelSnapshot.cs

@@ -356,6 +356,8 @@ namespace ReallifeGamemode.Database.Migrations
 
                     b.Property<bool>("StateOwned");
 
+                    b.Property<int>("WeaponDealTime");
+
                     b.HasKey("Id");
 
                     b.ToTable("Factions");
@@ -408,6 +410,8 @@ namespace ReallifeGamemode.Database.Migrations
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
 
+                    b.Property<int>("Ammount");
+
                     b.Property<int?>("FactionId");
 
                     b.Property<int>("Rank");