Merge develop into feature/inventory-system

This commit is contained in:
VegaZ
2018-11-26 17:53:25 +01:00
66 changed files with 4533 additions and 1302 deletions

View File

@@ -1,10 +1,4 @@
using System;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Configuration;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata;
using Microsoft.Extensions.Configuration;
using Microsoft.EntityFrameworkCore;
/**
* @overview Life of German Reallife - DatabaseContext.cs
@@ -37,11 +31,15 @@ namespace reallife_gamemode.Model
}
//User
public DbSet<Server.Entities.Ban> Bans { get; set; }
public DbSet<Server.Entities.Character> Characters { get; set; }
public DbSet<Server.Entities.CharacterCloth> CharacterClothes { get; set; }
public DbSet<Server.Entities.DutyCloth> DutyClothes { get; set; }
public DbSet<Server.Entities.ClothCombination> ClothCombinations { get; set; }
public DbSet<Server.Entities.User> Users { get; set; }
public DbSet<Server.Entities.UserVehicle> UserVehicles { get; set; }
public DbSet<Server.Entities.UserBankAccount> UserBankAccounts { get; set; }
public DbSet<Server.Entities.Ban> Bans { get; set; }
public DbSet<Server.Entities.Character> Characters { get; set; }
//Inventar
public DbSet<Server.Entities.UserItem> UserItems { get; set; }
@@ -62,6 +60,7 @@ namespace reallife_gamemode.Model
//Saves
public DbSet<Server.Saves.SavedBlip> Blips { get; set; }
public DbSet<Server.Entities.Door> Doors { get; set; }
public DbSet<Server.Entities.GotoPoint> GotoPoints { get; set; }
public DbSet<Server.Saves.SavedMarker> Markers { get; set; }
public DbSet<Server.Saves.SavedPed> Peds { get; set; }
@@ -69,5 +68,8 @@ namespace reallife_gamemode.Model
public DbSet<Server.Saves.SavedTextLabel> TextLabels { get; set; }
public DbSet<Server.Saves.SavedVehicle> Vehicles { get; set; }
public DbSet<Server.Entities.ShopVehicle> ShopVehicles { get; set; }
// Control Panel
public DbSet<Server.Entities.News> News { get; set; }
}
}