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; }