From e0a34d8f0093532a093f5d9bf32d525ac36e62d0 Mon Sep 17 00:00:00 2001 From: VegaZ Date: Sun, 11 Apr 2021 19:28:12 +0200 Subject: [PATCH] Log UserWeapon --- .../Entities/UserWeapon.cs | 25 +++++++++++++++ ReallifeGamemode.Database/Entities/Weapon.cs | 20 ++++++++++++ .../Models/DatabaseContext.cs | 12 +++---- .../Managers/PositionManager.cs | 9 ++++++ .../Managers/ShopManager.cs | 1 + .../Shop/Ammunation/Ammunation.cs | 31 +++++++++++++++++++ 6 files changed, 92 insertions(+), 6 deletions(-) create mode 100644 ReallifeGamemode.Database/Entities/UserWeapon.cs create mode 100644 ReallifeGamemode.Database/Entities/Weapon.cs create mode 100644 ReallifeGamemode.Server/Shop/Ammunation/Ammunation.cs diff --git a/ReallifeGamemode.Database/Entities/UserWeapon.cs b/ReallifeGamemode.Database/Entities/UserWeapon.cs new file mode 100644 index 00000000..d981f8b6 --- /dev/null +++ b/ReallifeGamemode.Database/Entities/UserWeapon.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Text; + +namespace ReallifeGamemode.Database.Entities +{ + public partial class UserWeapon + { + [Key] + [DatabaseGenerated(DatabaseGeneratedOption.Identity)] + public int Id { get; set; } + + [ForeignKey("User")] + public int UserId { get; set; } + public User User { get; set; } + + [ForeignKey("Weapon")] + public int WeaponId { get; set; } + public Weapon Weapon { get; set; } + + public int Ammo { get; set; } + } +} diff --git a/ReallifeGamemode.Database/Entities/Weapon.cs b/ReallifeGamemode.Database/Entities/Weapon.cs new file mode 100644 index 00000000..d01e2686 --- /dev/null +++ b/ReallifeGamemode.Database/Entities/Weapon.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Text; + +namespace ReallifeGamemode.Database.Entities +{ + public partial class Weapon + { + [Key] + [DatabaseGenerated(DatabaseGeneratedOption.Identity)] + public int Id { get; set; } + public string WeaponModel { get; set; } + public string Category { get; set; } + public int SlotID { get; set; } + public int Ammo { get; set; } + public float Price { get; set; } + } +} diff --git a/ReallifeGamemode.Database/Models/DatabaseContext.cs b/ReallifeGamemode.Database/Models/DatabaseContext.cs index 63a65d63..0846054b 100644 --- a/ReallifeGamemode.Database/Models/DatabaseContext.cs +++ b/ReallifeGamemode.Database/Models/DatabaseContext.cs @@ -74,6 +74,8 @@ namespace ReallifeGamemode.Database.Models public DbSet UserVehicles { get; set; } public DbSet UserBankAccounts { get; set; } + public DbSet UserWeapons { get; set; } + //Inventar public DbSet UserItems { get; set; } @@ -85,8 +87,12 @@ namespace ReallifeGamemode.Database.Models public DbSet FactionVehicles { get; set; } //Shops + public DbSet ShopClothes { get; set; } + public DbSet ShopItems { get; set; } + public DbSet Weapons { get; set; } //Logs + //public DbSet BanLogs { get; set; } public DbSet BankAccountTransactionLogs { get; set; } public DbSet DeathLogs { get; set; } @@ -155,12 +161,6 @@ namespace ReallifeGamemode.Database.Models //Gangwar public DbSet Turfs { get; set; } - //ClothesShop - public DbSet ShopClothes { get; set; } - - //ItemShop - public DbSet ShopItems { get; set; } - //Server Variablen public DbSet ServerVariables { get; set; } } diff --git a/ReallifeGamemode.Server/Managers/PositionManager.cs b/ReallifeGamemode.Server/Managers/PositionManager.cs index ec0ea301..5b1eab84 100644 --- a/ReallifeGamemode.Server/Managers/PositionManager.cs +++ b/ReallifeGamemode.Server/Managers/PositionManager.cs @@ -6,6 +6,7 @@ using ReallifeGamemode.Server.Shop.SevenEleven; using ReallifeGamemode.Server.Shop.Friseur; using ReallifeGamemode.Server.Util; using ReallifeGamemode.Server.Extensions; +using ReallifeGamemode.Server.Shop.Ammunation; namespace ReallifeGamemode.Server.Managers { @@ -29,6 +30,8 @@ namespace ReallifeGamemode.Server.Managers public static List cuffPoints = new List(); + public static List AmmunationPoints = new List(); + public static void LoadPositionManager() { #region DutyPoints @@ -407,3 +410,9 @@ public class ElevatorPoint public int FactionId { get; set; } public string Stage { get; set; } } + +public class AmmunationPoint +{ + public Vector3 Position { get; set; } + public Ammunation Ammunation { get; set; } +} diff --git a/ReallifeGamemode.Server/Managers/ShopManager.cs b/ReallifeGamemode.Server/Managers/ShopManager.cs index 6a94a4af..f21470fb 100644 --- a/ReallifeGamemode.Server/Managers/ShopManager.cs +++ b/ReallifeGamemode.Server/Managers/ShopManager.cs @@ -14,6 +14,7 @@ namespace ReallifeGamemode.Server.Managers public static List clotheStores = new List(); public static List itemShops = new List(); public static List FriseurStores = new List(); + public static List Ammunations = new List(); public static void LoadClotheShops() { diff --git a/ReallifeGamemode.Server/Shop/Ammunation/Ammunation.cs b/ReallifeGamemode.Server/Shop/Ammunation/Ammunation.cs new file mode 100644 index 00000000..db46ed4e --- /dev/null +++ b/ReallifeGamemode.Server/Shop/Ammunation/Ammunation.cs @@ -0,0 +1,31 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using GTANetworkAPI; +using ReallifeGamemode.Database.Entities; +using ReallifeGamemode.Database.Models; + +namespace ReallifeGamemode.Server.Shop.Ammunation +{ + public class Ammunation + { + public Vector3 vector { get; set; } + public List weaponList = new List(); + + public Ammunation(Vector3 position) + { + this.vector = vector; + LoadWeapons(); + } + + public void LoadWeapons() + { + using (var dbContext = new DatabaseContext()) + { + weaponList = dbContext.Weapons.ToList(); + } + } + + } +}