haus-konto geld abheben (30% steuern)
alten hausmanager entfernt
interiormanager in core verschoben
This commit is contained in:
hydrant
2020-03-30 22:25:09 +02:00
parent 4159043348
commit 73bd04b84f
21 changed files with 1930 additions and 753 deletions

View File

@@ -6,7 +6,7 @@ using ReallifeGamemode.Server.Core.API;
namespace ReallifeGamemode.Database.Entities
{
public partial class House
public partial class House : BankAccountHolder<HouseBankAccount>
{
[Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
@@ -34,5 +34,7 @@ namespace ReallifeGamemode.Database.Entities
public User Owner { get; set; }
public ICollection<HouseRental> Rentals { get; set; }
public override string BankAccountName => "Haus-Konto";
}
}

View File

@@ -0,0 +1,17 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Text;
namespace ReallifeGamemode.Database.Entities
{
public class HouseBankAccount : IBankAccount
{
[Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
public int Id { get; set; }
public int Balance { get; set; }
}
}

View File

@@ -2,15 +2,16 @@
using System.ComponentModel.DataAnnotations.Schema;
using GTANetworkAPI;
using Newtonsoft.Json;
using ReallifeGamemode.Server.Core.API;
namespace ReallifeGamemode.Database.Entities
{
public partial class Interior
{
[NotMapped]
private Vector3 _enterPosition;
private Position _enterPosition;
[NotMapped]
private Vector3 _exitPosition;
private Position _exitPosition;
[Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
@@ -26,7 +27,7 @@ namespace ReallifeGamemode.Database.Entities
}
set
{
this._enterPosition = JsonConvert.DeserializeObject<Vector3>(value);
this._enterPosition = JsonConvert.DeserializeObject<Position>(value);
}
}
@@ -39,12 +40,12 @@ namespace ReallifeGamemode.Database.Entities
}
set
{
this._exitPosition = JsonConvert.DeserializeObject<Vector3>(value);
this._exitPosition = JsonConvert.DeserializeObject<Position>(value);
}
}
[NotMapped]
public Vector3 EnterPosition
public Position EnterPosition
{
get
{
@@ -57,7 +58,7 @@ namespace ReallifeGamemode.Database.Entities
}
[NotMapped]
public Vector3 ExitPosition
public Position ExitPosition
{
get
{