From bee3497fc377c7cfdc58f50fde970a6172b0966f Mon Sep 17 00:00:00 2001 From: hydrant Date: Wed, 6 Mar 2019 21:12:34 +0100 Subject: [PATCH] Added mileage, changed all namespaces from reallife_gamemode to ReallifeGamemode --- ReallifeGamemode.Client/Speedometer/index.js | 11 + .../Business/BusinessBase.cs | 10 +- .../Business/CarDealerBusinessBase.cs | 2 +- .../Business/ShopBusiness.cs | 2 +- .../Business/TelefonBusiness.cs | 2 +- .../Business/VapidCarDealerBusiness.cs | 2 +- ReallifeGamemode.Server/Classes/TempBlip.cs | 2 +- ReallifeGamemode.Server/Commands/Admin.cs | 22 +- ReallifeGamemode.Server/Commands/Faction.cs | 12 +- ReallifeGamemode.Server/Commands/User.cs | 10 +- ReallifeGamemode.Server/Entities/Ban.cs | 4 +- .../Entities/BusinessBankAccount.cs | 8 +- ReallifeGamemode.Server/Entities/Character.cs | 2 +- .../Entities/CharacterCloth.cs | 2 +- .../Entities/ClothCombination.cs | 2 +- ReallifeGamemode.Server/Entities/Door.cs | 2 +- ReallifeGamemode.Server/Entities/DutyCloth.cs | 2 +- ReallifeGamemode.Server/Entities/Faction.cs | 6 +- .../Entities/FactionBankAccount.cs | 4 +- .../Entities/FactionRank.cs | 4 +- .../Entities/FactionVehicles.cs | 4 +- .../Entities/GotoPoints.cs | 4 +- ReallifeGamemode.Server/Entities/Interior.cs | 2 +- ReallifeGamemode.Server/Entities/News.cs | 2 +- .../Entities/ServerVehicle.cs | 11 +- .../Entities/ShopVehicles.cs | 6 +- ReallifeGamemode.Server/Entities/User.cs | 6 +- .../Entities/UserBankAccount.cs | 8 +- ReallifeGamemode.Server/Entities/UserItem.cs | 4 +- .../Entities/UserVehicle.cs | 4 +- .../Entities/VehicleMod.cs | 2 +- ReallifeGamemode.Server/Entities/Whitelist.cs | 2 +- ReallifeGamemode.Server/Events/Chat.cs | 2 +- ReallifeGamemode.Server/Events/Connect.cs | 8 +- ReallifeGamemode.Server/Events/Death.cs | 12 +- ReallifeGamemode.Server/Events/Disconnect.cs | 6 +- .../Events/EnterVehicleAttempt.cs | 6 +- ReallifeGamemode.Server/Events/Faction.cs | 8 +- ReallifeGamemode.Server/Events/Key.cs | 18 +- ReallifeGamemode.Server/Events/Login.cs | 8 +- ReallifeGamemode.Server/Events/Register.cs | 4 +- .../Events/ResourceStop.cs | 6 +- ReallifeGamemode.Server/Events/Siren.cs | 2 +- ReallifeGamemode.Server/Events/Update.cs | 57 + .../Events/UpdateCharacterCloth.cs | 8 +- ReallifeGamemode.Server/Events/VehicleMenu.cs | 8 +- .../Extensions/AdminLevelExtension.cs | 6 +- .../Extensions/ClientExtension.cs | 6 +- .../Extensions/IntegerExtension.cs | 2 +- .../Extensions/VehicleExtension.cs | 6 +- .../Factions/Medic/Medic.cs | 4 +- .../Factions/Medic/MedicTask.cs | 2 +- .../Inventory/GroundItem.cs | 12 +- .../Inventory/Interfaces/IDroppableItem.cs | 4 +- .../Inventory/Interfaces/IItem.cs | 2 +- .../Inventory/Interfaces/IUsableItem.cs | 4 +- .../Inventory/Items/Cheeseburger.cs | 4 +- .../Inventory/Items/Chickenburger.cs | 4 +- .../Inventory/Items/DropItem.cs | 10 +- .../Inventory/Items/FoodItem.cs | 10 +- .../Inventory/Items/Hamburger.cs | 4 +- .../Inventory/Items/Holz.cs | 4 +- .../Inventory/Items/Kraftstoff.cs | 4 +- .../Logs/BankAccountTransactionHistory.cs | 2 +- ReallifeGamemode.Server/Logs/Death.cs | 4 +- ReallifeGamemode.Server/Main.cs | 8 +- .../Managers/BankManager.cs | 12 +- .../Managers/BusinessManager.cs | 12 +- .../Managers/CharacterCreator.cs | 6 +- .../Managers/DoorManager.cs | 10 +- .../Managers/InteractionManager.cs | 6 +- .../Managers/InteriorManager.cs | 6 +- .../Managers/InventoryManager.cs | 14 +- .../Managers/LoadManager.cs | 8 +- .../Managers/PositionManager.cs | 4 +- .../Managers/SaveManager.cs | 12 +- .../Managers/TimeManager.cs | 2 +- .../Managers/TuningManager.cs | 8 +- .../Managers/VehicleManager.cs | 25 +- .../20190226185806_Initial.Designer.cs | 2 +- ...06194826_VehicleDistanceDriven.Designer.cs | 1002 +++++++++++++++++ .../20190306194826_VehicleDistanceDriven.cs | 23 + .../DatabaseContextModelSnapshot.cs | 4 +- .../Models/DatabaseContext.cs | 72 +- .../ReallifeGamemode.Server.csproj | 2 +- ReallifeGamemode.Server/Saves/SavedBlip.cs | 2 +- ReallifeGamemode.Server/Saves/SavedMarker.cs | 2 +- ReallifeGamemode.Server/Saves/SavedPed.cs | 2 +- ReallifeGamemode.Server/Saves/SavedPickup.cs | 2 +- .../Saves/SavedTextLabel.cs | 2 +- ReallifeGamemode.Server/Saves/SavedVehicle.cs | 4 +- .../Services/ChatService.cs | 8 +- .../Services/ClientService.cs | 2 +- ReallifeGamemode.Server/Util/AdminLevel.cs | 2 +- ReallifeGamemode.Server/Util/Converter.cs | 2 +- .../Util/DatabaseHelper.cs | 4 +- ReallifeGamemode.Server/Util/FactionHelper.cs | 6 +- .../Util/FactionRankHelper.cs | 2 +- ReallifeGamemode.Server/Util/IBankAccount.cs | 2 +- .../Util/IBankAccountOwner.cs | 4 +- ReallifeGamemode.Server/Util/ListPlayer.cs | 2 +- .../Util/SmoothThrottle.cs | 2 +- .../Util/TransactionResult.cs | 2 +- ReallifeGamemode.Server/Util/VehicleSync.cs | 2 +- 104 files changed, 1408 insertions(+), 297 deletions(-) create mode 100644 ReallifeGamemode.Server/Events/Update.cs create mode 100644 ReallifeGamemode.Server/Migrations/20190306194826_VehicleDistanceDriven.Designer.cs create mode 100644 ReallifeGamemode.Server/Migrations/20190306194826_VehicleDistanceDriven.cs diff --git a/ReallifeGamemode.Client/Speedometer/index.js b/ReallifeGamemode.Client/Speedometer/index.js index 4ab5ca95..07840e61 100644 --- a/ReallifeGamemode.Client/Speedometer/index.js +++ b/ReallifeGamemode.Client/Speedometer/index.js @@ -60,6 +60,17 @@ mp.events.add('render', () => outline: true, centre: false }); + + var drivenDistance = player.vehicle.getVariable("drivenDistance"); + var drivenDistanceStr = "0"; + if (drivenDistance) drivenDistanceStr = parseFloat(drivenDistance).toFixed(3).toString(); + mp.game.graphics.drawText(drivenDistanceStr + " KM", [0.48, 0.973], { + font: 0, + color: [255, 255, 255, 255], + scale: [0.35, 0.35], + outline: true, + centre: false + }); } else { if (dictLoaded) { diff --git a/ReallifeGamemode.Server/Business/BusinessBase.cs b/ReallifeGamemode.Server/Business/BusinessBase.cs index 83e0005c..e7e67c19 100644 --- a/ReallifeGamemode.Server/Business/BusinessBase.cs +++ b/ReallifeGamemode.Server/Business/BusinessBase.cs @@ -1,11 +1,11 @@ using GTANetworkAPI; -using reallife_gamemode.Server.Entities; -using reallife_gamemode.Server.Extensions; -using reallife_gamemode.Server.Models; -using reallife_gamemode.Server.Util; +using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Server.Extensions; +using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Server.Util; using System.Linq; -namespace reallife_gamemode.Server.Business +namespace ReallifeGamemode.Server.Business { public abstract class BusinessBase : IBankAccountOwner { diff --git a/ReallifeGamemode.Server/Business/CarDealerBusinessBase.cs b/ReallifeGamemode.Server/Business/CarDealerBusinessBase.cs index 82d0a461..e9a6399b 100644 --- a/ReallifeGamemode.Server/Business/CarDealerBusinessBase.cs +++ b/ReallifeGamemode.Server/Business/CarDealerBusinessBase.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using System.Text; -namespace reallife_gamemode.Server.Business +namespace ReallifeGamemode.Server.Business { public abstract class CarDealerBusinessBase : BusinessBase { diff --git a/ReallifeGamemode.Server/Business/ShopBusiness.cs b/ReallifeGamemode.Server/Business/ShopBusiness.cs index ed9d2ea6..204e9077 100644 --- a/ReallifeGamemode.Server/Business/ShopBusiness.cs +++ b/ReallifeGamemode.Server/Business/ShopBusiness.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text; using GTANetworkAPI; -namespace reallife_gamemode.Server.Business +namespace ReallifeGamemode.Server.Business { public class ShopBusiness : BusinessBase { diff --git a/ReallifeGamemode.Server/Business/TelefonBusiness.cs b/ReallifeGamemode.Server/Business/TelefonBusiness.cs index 02d11e2b..ecdb5c66 100644 --- a/ReallifeGamemode.Server/Business/TelefonBusiness.cs +++ b/ReallifeGamemode.Server/Business/TelefonBusiness.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text; using GTANetworkAPI; -namespace reallife_gamemode.Server.Business +namespace ReallifeGamemode.Server.Business { public class TelefonBusiness : BusinessBase { diff --git a/ReallifeGamemode.Server/Business/VapidCarDealerBusiness.cs b/ReallifeGamemode.Server/Business/VapidCarDealerBusiness.cs index 26666017..07afd1c6 100644 --- a/ReallifeGamemode.Server/Business/VapidCarDealerBusiness.cs +++ b/ReallifeGamemode.Server/Business/VapidCarDealerBusiness.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text; using GTANetworkAPI; -namespace reallife_gamemode.Server.Business +namespace ReallifeGamemode.Server.Business { public class VapidCarDealerBusiness : CarDealerBusinessBase { diff --git a/ReallifeGamemode.Server/Classes/TempBlip.cs b/ReallifeGamemode.Server/Classes/TempBlip.cs index 374c76e5..41f1c175 100644 --- a/ReallifeGamemode.Server/Classes/TempBlip.cs +++ b/ReallifeGamemode.Server/Classes/TempBlip.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace reallife_gamemode.Server.Classes +namespace ReallifeGamemode.Server.Classes { public class TempBlip { diff --git a/ReallifeGamemode.Server/Commands/Admin.cs b/ReallifeGamemode.Server/Commands/Admin.cs index edc9739b..94c7ae6e 100644 --- a/ReallifeGamemode.Server/Commands/Admin.cs +++ b/ReallifeGamemode.Server/Commands/Admin.cs @@ -3,17 +3,17 @@ using System.Collections.Generic; using System.Linq; using GTANetworkAPI; using Newtonsoft.Json; -using reallife_gamemode.Server.Entities; -using reallife_gamemode.Server.Extensions; -using reallife_gamemode.Server.Services; -using reallife_gamemode.Server.Util; -using reallife_gamemode.Server.Managers; -using reallife_gamemode.Server.Inventory.Interfaces; -using reallife_gamemode.Server.Business; +using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Server.Extensions; +using ReallifeGamemode.Server.Services; +using ReallifeGamemode.Server.Util; +using ReallifeGamemode.Server.Managers; +using ReallifeGamemode.Server.Inventory.Interfaces; +using ReallifeGamemode.Server.Business; using System.Text.RegularExpressions; -using reallife_gamemode.Server.Classes; -using reallife_gamemode.Server.Factions.Medic; -using reallife_gamemode.Server.Models; +using ReallifeGamemode.Server.Classes; +using ReallifeGamemode.Server.Factions.Medic; +using ReallifeGamemode.Server.Models; /** * @overview Life of German Reallife - Admin Commands (Admin.cs) @@ -21,7 +21,7 @@ using reallife_gamemode.Server.Models; * @copyright (c) 2008 - 2018 Life of German */ -namespace reallife_gamemode.Server.Commands +namespace ReallifeGamemode.Server.Commands { public class Admin : Script { diff --git a/ReallifeGamemode.Server/Commands/Faction.cs b/ReallifeGamemode.Server/Commands/Faction.cs index 9b1434f2..ceba64ce 100644 --- a/ReallifeGamemode.Server/Commands/Faction.cs +++ b/ReallifeGamemode.Server/Commands/Faction.cs @@ -1,9 +1,9 @@ using GTANetworkAPI; -using reallife_gamemode.Server.Entities; -using reallife_gamemode.Server.Extensions; -using reallife_gamemode.Server.Factions.Medic; -using reallife_gamemode.Server.Models; -using reallife_gamemode.Server.Services; +using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Server.Extensions; +using ReallifeGamemode.Server.Factions.Medic; +using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Server.Services; using System.Linq; using System.Text.RegularExpressions; @@ -13,7 +13,7 @@ using System.Text.RegularExpressions; * @copyright (c) 2008 - 2018 Life of German */ -namespace reallife_gamemode.Server.Commands +namespace ReallifeGamemode.Server.Commands { class Faction : Script { diff --git a/ReallifeGamemode.Server/Commands/User.cs b/ReallifeGamemode.Server/Commands/User.cs index db777ca3..ed486cf9 100644 --- a/ReallifeGamemode.Server/Commands/User.cs +++ b/ReallifeGamemode.Server/Commands/User.cs @@ -1,11 +1,11 @@ using GTANetworkAPI; -using reallife_gamemode.Server.Entities; -using reallife_gamemode.Server.Extensions; -using reallife_gamemode.Server.Models; -using reallife_gamemode.Server.Util; +using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Server.Extensions; +using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Server.Util; using System.Linq; -namespace reallife_gamemode.Server.Commands +namespace ReallifeGamemode.Server.Commands { class User : Script { diff --git a/ReallifeGamemode.Server/Entities/Ban.cs b/ReallifeGamemode.Server/Entities/Ban.cs index 9a9438c9..c6c36b9e 100644 --- a/ReallifeGamemode.Server/Entities/Ban.cs +++ b/ReallifeGamemode.Server/Entities/Ban.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -using reallife_gamemode.Server.Entities; +using ReallifeGamemode.Server.Entities; /** * @overview Life of German Reallife - Entities Ban (Ban.cs) @@ -11,7 +11,7 @@ using reallife_gamemode.Server.Entities; * @copyright (c) 2008 - 2018 Life of German */ -namespace reallife_gamemode.Server.Entities +namespace ReallifeGamemode.Server.Entities { public class Ban { diff --git a/ReallifeGamemode.Server/Entities/BusinessBankAccount.cs b/ReallifeGamemode.Server/Entities/BusinessBankAccount.cs index fd056e8d..e84471db 100644 --- a/ReallifeGamemode.Server/Entities/BusinessBankAccount.cs +++ b/ReallifeGamemode.Server/Entities/BusinessBankAccount.cs @@ -1,13 +1,13 @@ -using reallife_gamemode.Server.Business; -using reallife_gamemode.Server.Managers; -using reallife_gamemode.Server.Util; +using ReallifeGamemode.Server.Business; +using ReallifeGamemode.Server.Managers; +using ReallifeGamemode.Server.Util; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Text; -namespace reallife_gamemode.Server.Entities +namespace ReallifeGamemode.Server.Entities { public class BusinessBankAccount : IBankAccount { diff --git a/ReallifeGamemode.Server/Entities/Character.cs b/ReallifeGamemode.Server/Entities/Character.cs index 7e3e5d58..e3166f5b 100644 --- a/ReallifeGamemode.Server/Entities/Character.cs +++ b/ReallifeGamemode.Server/Entities/Character.cs @@ -7,7 +7,7 @@ using System.ComponentModel.DataAnnotations.Schema; * @copyright (c) 2008 - 2018 Life of German */ -namespace reallife_gamemode.Server.Entities +namespace ReallifeGamemode.Server.Entities { public class Character { diff --git a/ReallifeGamemode.Server/Entities/CharacterCloth.cs b/ReallifeGamemode.Server/Entities/CharacterCloth.cs index 50364c6d..58cb9926 100644 --- a/ReallifeGamemode.Server/Entities/CharacterCloth.cs +++ b/ReallifeGamemode.Server/Entities/CharacterCloth.cs @@ -7,7 +7,7 @@ using System.ComponentModel.DataAnnotations.Schema; * @copyright (c) 2008 - 2018 Life of German */ -namespace reallife_gamemode.Server.Entities +namespace ReallifeGamemode.Server.Entities { public class CharacterCloth { diff --git a/ReallifeGamemode.Server/Entities/ClothCombination.cs b/ReallifeGamemode.Server/Entities/ClothCombination.cs index bbf9223f..b1842416 100644 --- a/ReallifeGamemode.Server/Entities/ClothCombination.cs +++ b/ReallifeGamemode.Server/Entities/ClothCombination.cs @@ -11,7 +11,7 @@ using System.Text; * @copyright (c) 2008 - 2018 Life of German */ -namespace reallife_gamemode.Server.Entities +namespace ReallifeGamemode.Server.Entities { public class ClothCombination { diff --git a/ReallifeGamemode.Server/Entities/Door.cs b/ReallifeGamemode.Server/Entities/Door.cs index 3e87810a..ff50a249 100644 --- a/ReallifeGamemode.Server/Entities/Door.cs +++ b/ReallifeGamemode.Server/Entities/Door.cs @@ -11,7 +11,7 @@ using System.Text; * @copyright (c) 2008 - 2018 Life of German */ -namespace reallife_gamemode.Server.Entities +namespace ReallifeGamemode.Server.Entities { public class Door { diff --git a/ReallifeGamemode.Server/Entities/DutyCloth.cs b/ReallifeGamemode.Server/Entities/DutyCloth.cs index dd3a875d..647b3729 100644 --- a/ReallifeGamemode.Server/Entities/DutyCloth.cs +++ b/ReallifeGamemode.Server/Entities/DutyCloth.cs @@ -10,7 +10,7 @@ using System.Text; * @copyright (c) 2008 - 2018 Life of German */ -namespace reallife_gamemode.Server.Entities +namespace ReallifeGamemode.Server.Entities { public class DutyCloth { diff --git a/ReallifeGamemode.Server/Entities/Faction.cs b/ReallifeGamemode.Server/Entities/Faction.cs index 8715a4bd..6a6e9621 100644 --- a/ReallifeGamemode.Server/Entities/Faction.cs +++ b/ReallifeGamemode.Server/Entities/Faction.cs @@ -1,5 +1,5 @@ -using reallife_gamemode.Server.Models; -using reallife_gamemode.Server.Util; +using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Server.Util; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Linq; @@ -10,7 +10,7 @@ using System.Linq; * @copyright (c) 2008 - 2018 Life of German */ -namespace reallife_gamemode.Server.Entities +namespace ReallifeGamemode.Server.Entities { public class Faction : IBankAccountOwner { diff --git a/ReallifeGamemode.Server/Entities/FactionBankAccount.cs b/ReallifeGamemode.Server/Entities/FactionBankAccount.cs index a4be3a30..1502f972 100644 --- a/ReallifeGamemode.Server/Entities/FactionBankAccount.cs +++ b/ReallifeGamemode.Server/Entities/FactionBankAccount.cs @@ -1,5 +1,5 @@ using GTANetworkAPI; -using reallife_gamemode.Server.Util; +using ReallifeGamemode.Server.Util; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; @@ -11,7 +11,7 @@ using System.Text; * @author VegaZ * @copyright (c) 2008 - 2018 Life of German */ -namespace reallife_gamemode.Server.Entities +namespace ReallifeGamemode.Server.Entities { public class FactionBankAccount : IBankAccount { diff --git a/ReallifeGamemode.Server/Entities/FactionRank.cs b/ReallifeGamemode.Server/Entities/FactionRank.cs index 3096eb38..9130f483 100644 --- a/ReallifeGamemode.Server/Entities/FactionRank.cs +++ b/ReallifeGamemode.Server/Entities/FactionRank.cs @@ -1,8 +1,8 @@ -using reallife_gamemode.Server.Models; +using ReallifeGamemode.Server.Models; using System.ComponentModel.DataAnnotations; using System.Linq; -namespace reallife_gamemode.Server.Entities +namespace ReallifeGamemode.Server.Entities { public class FactionRank { diff --git a/ReallifeGamemode.Server/Entities/FactionVehicles.cs b/ReallifeGamemode.Server/Entities/FactionVehicles.cs index 134a76b1..553958b7 100644 --- a/ReallifeGamemode.Server/Entities/FactionVehicles.cs +++ b/ReallifeGamemode.Server/Entities/FactionVehicles.cs @@ -1,4 +1,4 @@ -using reallife_gamemode.Server.Models; +using ReallifeGamemode.Server.Models; using System.ComponentModel.DataAnnotations.Schema; using System.Linq; @@ -8,7 +8,7 @@ using System.Linq; * @copyright (c) 2008 - 2018 Life of German */ -namespace reallife_gamemode.Server.Entities +namespace ReallifeGamemode.Server.Entities { [Table("FactionVehicles")] public class FactionVehicle : ServerVehicle diff --git a/ReallifeGamemode.Server/Entities/GotoPoints.cs b/ReallifeGamemode.Server/Entities/GotoPoints.cs index 68d2ecb5..36c1cc7b 100644 --- a/ReallifeGamemode.Server/Entities/GotoPoints.cs +++ b/ReallifeGamemode.Server/Entities/GotoPoints.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -using reallife_gamemode.Server.Entities; +using ReallifeGamemode.Server.Entities; /** * @overview Life of German Reallife - Entities GotoPoints (GotoPoints.cs) @@ -11,7 +11,7 @@ using reallife_gamemode.Server.Entities; * @copyright (c) 2008 - 2018 Life of German */ -namespace reallife_gamemode.Server.Entities +namespace ReallifeGamemode.Server.Entities { public class GotoPoint { diff --git a/ReallifeGamemode.Server/Entities/Interior.cs b/ReallifeGamemode.Server/Entities/Interior.cs index e4502de1..aa96a080 100644 --- a/ReallifeGamemode.Server/Entities/Interior.cs +++ b/ReallifeGamemode.Server/Entities/Interior.cs @@ -6,7 +6,7 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Text; -namespace reallife_gamemode.Server.Entities +namespace ReallifeGamemode.Server.Entities { public class Interior { diff --git a/ReallifeGamemode.Server/Entities/News.cs b/ReallifeGamemode.Server/Entities/News.cs index b88141b9..0dae2e5e 100644 --- a/ReallifeGamemode.Server/Entities/News.cs +++ b/ReallifeGamemode.Server/Entities/News.cs @@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Text; -namespace reallife_gamemode.Server.Entities +namespace ReallifeGamemode.Server.Entities { public class News { diff --git a/ReallifeGamemode.Server/Entities/ServerVehicle.cs b/ReallifeGamemode.Server/Entities/ServerVehicle.cs index 2a16787f..67343176 100644 --- a/ReallifeGamemode.Server/Entities/ServerVehicle.cs +++ b/ReallifeGamemode.Server/Entities/ServerVehicle.cs @@ -1,11 +1,11 @@ using GTANetworkAPI; -using reallife_gamemode.Server.Extensions; -using reallife_gamemode.Server.Managers; -using reallife_gamemode.Server.Util; +using ReallifeGamemode.Server.Extensions; +using ReallifeGamemode.Server.Managers; +using ReallifeGamemode.Server.Util; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -namespace reallife_gamemode.Server.Entities +namespace ReallifeGamemode.Server.Entities { public abstract class ServerVehicle { @@ -24,6 +24,7 @@ namespace reallife_gamemode.Server.Entities public int SecondaryColor { get; set; } public bool Locked { get; set; } public bool Active { get; set; } + public float DistanceDriven { get; set; } [NotMapped] public Vector3 Position => new Vector3(PositionX, PositionY, PositionZ); @@ -42,6 +43,8 @@ namespace reallife_gamemode.Server.Entities VehicleStreaming.SetLockStatus(veh, this.Locked); VehicleManager.AddVehicle(this, veh); + veh.SetSharedData("drivenDistance", this.DistanceDriven); + string numberplate = $"{this.Id}"; if(this is FactionVehicle fV) diff --git a/ReallifeGamemode.Server/Entities/ShopVehicles.cs b/ReallifeGamemode.Server/Entities/ShopVehicles.cs index 6e4157b0..c8a1e039 100644 --- a/ReallifeGamemode.Server/Entities/ShopVehicles.cs +++ b/ReallifeGamemode.Server/Entities/ShopVehicles.cs @@ -1,6 +1,6 @@ using GTANetworkAPI; -using reallife_gamemode.Server.Business; -using reallife_gamemode.Server.Util; +using ReallifeGamemode.Server.Business; +using ReallifeGamemode.Server.Util; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; @@ -13,7 +13,7 @@ using System.Text; * @copyright (c) 2008 - 2018 Life of German */ -namespace reallife_gamemode.Server.Entities +namespace ReallifeGamemode.Server.Entities { [Table("ShopVehicles")] public class ShopVehicle : ServerVehicle diff --git a/ReallifeGamemode.Server/Entities/User.cs b/ReallifeGamemode.Server/Entities/User.cs index 7dcd877d..2d8081e4 100644 --- a/ReallifeGamemode.Server/Entities/User.cs +++ b/ReallifeGamemode.Server/Entities/User.cs @@ -1,6 +1,6 @@ using GTANetworkAPI; -using reallife_gamemode.Server.Models; -using reallife_gamemode.Server.Util; +using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Server.Util; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; @@ -13,7 +13,7 @@ using System.Linq; * @copyright (c) 2008 - 2018 Life of German */ -namespace reallife_gamemode.Server.Entities +namespace ReallifeGamemode.Server.Entities { public class User : IBankAccountOwner { diff --git a/ReallifeGamemode.Server/Entities/UserBankAccount.cs b/ReallifeGamemode.Server/Entities/UserBankAccount.cs index 88949211..d07c028a 100644 --- a/ReallifeGamemode.Server/Entities/UserBankAccount.cs +++ b/ReallifeGamemode.Server/Entities/UserBankAccount.cs @@ -1,6 +1,6 @@ -using reallife_gamemode.Server.Models; -using reallife_gamemode.Server.Services; -using reallife_gamemode.Server.Util; +using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Server.Services; +using ReallifeGamemode.Server.Util; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Linq; @@ -11,7 +11,7 @@ using System.Linq; * @copyright (c) 2008 - 2018 Life of German */ -namespace reallife_gamemode.Server.Entities +namespace ReallifeGamemode.Server.Entities { public class UserBankAccount : IBankAccount { diff --git a/ReallifeGamemode.Server/Entities/UserItem.cs b/ReallifeGamemode.Server/Entities/UserItem.cs index fe1c8f0c..d463511d 100644 --- a/ReallifeGamemode.Server/Entities/UserItem.cs +++ b/ReallifeGamemode.Server/Entities/UserItem.cs @@ -1,4 +1,4 @@ -using reallife_gamemode.Server.Models; +using ReallifeGamemode.Server.Models; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Linq; @@ -9,7 +9,7 @@ using System.Linq; * @copyright (c) 2008 - 2018 Life of German */ -namespace reallife_gamemode.Server.Entities +namespace ReallifeGamemode.Server.Entities { public class UserItem { diff --git a/ReallifeGamemode.Server/Entities/UserVehicle.cs b/ReallifeGamemode.Server/Entities/UserVehicle.cs index 441448f6..a262af13 100644 --- a/ReallifeGamemode.Server/Entities/UserVehicle.cs +++ b/ReallifeGamemode.Server/Entities/UserVehicle.cs @@ -1,4 +1,4 @@ -using reallife_gamemode.Server.Models; +using ReallifeGamemode.Server.Models; using System.ComponentModel.DataAnnotations.Schema; using System.Linq; @@ -8,7 +8,7 @@ using System.Linq; * @copyright (c) 2008 - 2018 Life of German */ -namespace reallife_gamemode.Server.Entities +namespace ReallifeGamemode.Server.Entities { [Table("UserVehicles")] public class UserVehicle : ServerVehicle diff --git a/ReallifeGamemode.Server/Entities/VehicleMod.cs b/ReallifeGamemode.Server/Entities/VehicleMod.cs index 45a49b59..84d485da 100644 --- a/ReallifeGamemode.Server/Entities/VehicleMod.cs +++ b/ReallifeGamemode.Server/Entities/VehicleMod.cs @@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Text; -namespace reallife_gamemode.Server.Entities +namespace ReallifeGamemode.Server.Entities { public class VehicleMod { diff --git a/ReallifeGamemode.Server/Entities/Whitelist.cs b/ReallifeGamemode.Server/Entities/Whitelist.cs index e195de72..65962ff4 100644 --- a/ReallifeGamemode.Server/Entities/Whitelist.cs +++ b/ReallifeGamemode.Server/Entities/Whitelist.cs @@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Text; -namespace reallife_gamemode.Server.Entities +namespace ReallifeGamemode.Server.Entities { public class Whitelist { diff --git a/ReallifeGamemode.Server/Events/Chat.cs b/ReallifeGamemode.Server/Events/Chat.cs index a2cc9b77..e8529b10 100644 --- a/ReallifeGamemode.Server/Events/Chat.cs +++ b/ReallifeGamemode.Server/Events/Chat.cs @@ -1,7 +1,7 @@ using GTANetworkAPI; using System.Text.RegularExpressions; -namespace reallife_gamemode.Server.Events +namespace ReallifeGamemode.Server.Events { public class Chat : Script { diff --git a/ReallifeGamemode.Server/Events/Connect.cs b/ReallifeGamemode.Server/Events/Connect.cs index 6afaad64..1f052465 100644 --- a/ReallifeGamemode.Server/Events/Connect.cs +++ b/ReallifeGamemode.Server/Events/Connect.cs @@ -1,9 +1,9 @@ using System; using System.Linq; using GTANetworkAPI; -using reallife_gamemode.Server.Models; -using reallife_gamemode.Server.Services; -using reallife_gamemode.Server.Util; +using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Server.Services; +using ReallifeGamemode.Server.Util; /** * @overview Life of German Reallife - Event Login (Login.cs) @@ -11,7 +11,7 @@ using reallife_gamemode.Server.Util; * @copyright (c) 2008 - 2018 Life of German */ -namespace reallife_gamemode.Server.Events +namespace ReallifeGamemode.Server.Events { class Connect : Script { diff --git a/ReallifeGamemode.Server/Events/Death.cs b/ReallifeGamemode.Server/Events/Death.cs index 1b1c5787..8b359d13 100644 --- a/ReallifeGamemode.Server/Events/Death.cs +++ b/ReallifeGamemode.Server/Events/Death.cs @@ -1,10 +1,10 @@ using System; using GTANetworkAPI; -using reallife_gamemode.Server.Extensions; -using reallife_gamemode.Server.Factions.Medic; -using reallife_gamemode.Server.Models; -using reallife_gamemode.Server.Services; -using reallife_gamemode.Server.Util; +using ReallifeGamemode.Server.Extensions; +using ReallifeGamemode.Server.Factions.Medic; +using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Server.Services; +using ReallifeGamemode.Server.Util; /** * @overview Life of German Reallife - Events Death (Death.cs) @@ -12,7 +12,7 @@ using reallife_gamemode.Server.Util; * @copyright (c) 2008 - 2018 Life of German */ -namespace reallife_gamemode.Server.Events +namespace ReallifeGamemode.Server.Events { public class Death : Script { diff --git a/ReallifeGamemode.Server/Events/Disconnect.cs b/ReallifeGamemode.Server/Events/Disconnect.cs index ebe0cce2..22ecc1ca 100644 --- a/ReallifeGamemode.Server/Events/Disconnect.cs +++ b/ReallifeGamemode.Server/Events/Disconnect.cs @@ -3,8 +3,8 @@ using System.Collections.Generic; using System.Linq; using System.Text; using GTANetworkAPI; -using reallife_gamemode.Server.Extensions; -using reallife_gamemode.Server.Models; +using ReallifeGamemode.Server.Extensions; +using ReallifeGamemode.Server.Models; /** * @overview Life of German Reallife - Event Login (Login.cs) @@ -12,7 +12,7 @@ using reallife_gamemode.Server.Models; * @copyright (c) 2008 - 2018 Life of German */ -namespace reallife_gamemode.Server.Events +namespace ReallifeGamemode.Server.Events { public class Disconnect : Script { diff --git a/ReallifeGamemode.Server/Events/EnterVehicleAttempt.cs b/ReallifeGamemode.Server/Events/EnterVehicleAttempt.cs index 86a43108..51dcec5f 100644 --- a/ReallifeGamemode.Server/Events/EnterVehicleAttempt.cs +++ b/ReallifeGamemode.Server/Events/EnterVehicleAttempt.cs @@ -2,10 +2,10 @@ using System.Collections.Generic; using System.Text; using GTANetworkAPI; -using reallife_gamemode.Server.Entities; -using reallife_gamemode.Server.Extensions; +using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Server.Extensions; -namespace reallife_gamemode.Server.Events +namespace ReallifeGamemode.Server.Events { public class EnterVehicleAttempt : Script diff --git a/ReallifeGamemode.Server/Events/Faction.cs b/ReallifeGamemode.Server/Events/Faction.cs index 63767b11..e272f0e4 100644 --- a/ReallifeGamemode.Server/Events/Faction.cs +++ b/ReallifeGamemode.Server/Events/Faction.cs @@ -1,12 +1,12 @@ using GTANetworkAPI; using Newtonsoft.Json; -using reallife_gamemode.Server.Entities; -using reallife_gamemode.Server.Models; -using reallife_gamemode.Server.Util; +using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Server.Util; using System.Collections.Generic; using System.Linq; -namespace reallife_gamemode.Server.Events +namespace ReallifeGamemode.Server.Events { class Faction : Script { diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs index ea7d5fb3..c6c22644 100644 --- a/ReallifeGamemode.Server/Events/Key.cs +++ b/ReallifeGamemode.Server/Events/Key.cs @@ -2,21 +2,21 @@ using System.Linq; using GTANetworkAPI; using Newtonsoft.Json; -using reallife_gamemode.Server.Classes; -using reallife_gamemode.Server.Entities; -using reallife_gamemode.Server.Extensions; -using reallife_gamemode.Server.Factions.Medic; -using reallife_gamemode.Server.Inventory; -using reallife_gamemode.Server.Managers; -using reallife_gamemode.Server.Models; -using reallife_gamemode.Server.Util; +using ReallifeGamemode.Server.Classes; +using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Server.Extensions; +using ReallifeGamemode.Server.Factions.Medic; +using ReallifeGamemode.Server.Inventory; +using ReallifeGamemode.Server.Managers; +using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Server.Util; /** * @overview Life of German Reallife - Event Key (Key.cs) * @author VegaZ * @copyright (c) 2008 - 2018 Life of German */ -namespace reallife_gamemode.Server.Events +namespace ReallifeGamemode.Server.Events { public class Key : Script { diff --git a/ReallifeGamemode.Server/Events/Login.cs b/ReallifeGamemode.Server/Events/Login.cs index 628b34af..cb80d7e4 100644 --- a/ReallifeGamemode.Server/Events/Login.cs +++ b/ReallifeGamemode.Server/Events/Login.cs @@ -1,8 +1,8 @@ using System.Linq; using GTANetworkAPI; -using reallife_gamemode.Server.Managers; -using reallife_gamemode.Server.Models; -using reallife_gamemode.Server.Util; +using ReallifeGamemode.Server.Managers; +using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Server.Util; /** * @overview Life of German Reallife - Event Login (Login.cs) @@ -10,7 +10,7 @@ using reallife_gamemode.Server.Util; * @copyright (c) 2008 - 2018 Life of German */ -namespace reallife_gamemode.Server.Events +namespace ReallifeGamemode.Server.Events { public class Login : Script { diff --git a/ReallifeGamemode.Server/Events/Register.cs b/ReallifeGamemode.Server/Events/Register.cs index 1441bea9..94a4a725 100644 --- a/ReallifeGamemode.Server/Events/Register.cs +++ b/ReallifeGamemode.Server/Events/Register.cs @@ -1,6 +1,6 @@ using System.Linq; using GTANetworkAPI; -using reallife_gamemode.Server.Models; +using ReallifeGamemode.Server.Models; /** * @overview Life of German Reallife - Event Register (Register.cs) @@ -8,7 +8,7 @@ using reallife_gamemode.Server.Models; * @copyright (c) 2008 - 2018 Life of German */ -namespace reallife_gamemode.Server.Events +namespace ReallifeGamemode.Server.Events { class Register : Script { diff --git a/ReallifeGamemode.Server/Events/ResourceStop.cs b/ReallifeGamemode.Server/Events/ResourceStop.cs index ff1be60e..456907f8 100644 --- a/ReallifeGamemode.Server/Events/ResourceStop.cs +++ b/ReallifeGamemode.Server/Events/ResourceStop.cs @@ -1,7 +1,7 @@ using GTANetworkAPI; using GTANetworkMethods; -using reallife_gamemode.Server.Entities; -using reallife_gamemode.Server.Models; +using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Server.Models; using System; using System.Collections.Generic; using System.Linq; @@ -13,7 +13,7 @@ using System.Text; * @copyright (c) 2008 - 2018 Life of German */ -namespace reallife_gamemode.Server.Events +namespace ReallifeGamemode.Server.Events { public class ResourceStop : Script { diff --git a/ReallifeGamemode.Server/Events/Siren.cs b/ReallifeGamemode.Server/Events/Siren.cs index 7c542eb4..5675ef73 100644 --- a/ReallifeGamemode.Server/Events/Siren.cs +++ b/ReallifeGamemode.Server/Events/Siren.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using System.Text; -namespace reallife_gamemode.Server.Events +namespace ReallifeGamemode.Server.Events { class Siren : Script { diff --git a/ReallifeGamemode.Server/Events/Update.cs b/ReallifeGamemode.Server/Events/Update.cs new file mode 100644 index 00000000..6df27459 --- /dev/null +++ b/ReallifeGamemode.Server/Events/Update.cs @@ -0,0 +1,57 @@ +using GTANetworkAPI; +using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Server.Managers; +using ReallifeGamemode.Server.Models; +using System; +using System.Collections.Generic; +using System.Text; + +namespace ReallifeGamemode.Server.Events +{ + class Update : Script + { + private Dictionary lastPositions = new Dictionary(); + private DateTime lastSave = DateTime.UtcNow; + + [ServerEvent(Event.Update)] + void UpdateEvent() + { + NAPI.Pools.GetAllVehicles().ForEach(v => + { + Vector3 lastPosition = v.Position; + if (lastPositions.ContainsKey(v.Handle)) lastPosition = lastPositions[v.Handle]; + + double distanceDriven = v.HasSharedData("drivenDistance") ? v.GetSharedData("drivenDistance") : 0; + + distanceDriven += (lastPosition.DistanceTo(v.Position) / 1000.0); + + v.SetSharedData("drivenDistance", (float)distanceDriven); + + lastPositions[v.Handle] = v.Position; + }); + + if (DateTime.UtcNow.Subtract(lastSave).Seconds >= 30) + { + lastSave = DateTime.UtcNow; + NAPI.Chat.SendChatMessageToAll("save distances"); + // save to db + using (var dbContext = new DatabaseContext()) + { + foreach(var key in lastPositions.Keys) + { + Vehicle v = key.Entity(); + if (!v.HasSharedData("drivenDistance")) continue; + + ServerVehicle sVeh = VehicleManager.GetServerVehicleFromVehicle(v, dbContext); + + if (sVeh == null) continue; + + sVeh.DistanceDriven = (float)v.GetSharedData("drivenDistance"); + + } + dbContext.SaveChanges(); + } + } + } + } +} diff --git a/ReallifeGamemode.Server/Events/UpdateCharacterCloth.cs b/ReallifeGamemode.Server/Events/UpdateCharacterCloth.cs index 2421d39c..a7a2a81d 100644 --- a/ReallifeGamemode.Server/Events/UpdateCharacterCloth.cs +++ b/ReallifeGamemode.Server/Events/UpdateCharacterCloth.cs @@ -2,11 +2,11 @@ using System.Linq; using GTANetworkAPI; using Newtonsoft.Json; -using reallife_gamemode.Server.Entities; -using reallife_gamemode.Server.Extensions; -using reallife_gamemode.Server.Models; +using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Server.Extensions; +using ReallifeGamemode.Server.Models; -namespace reallife_gamemode.Server.Events +namespace ReallifeGamemode.Server.Events { public class UpdateCharacterCloth : Script { diff --git a/ReallifeGamemode.Server/Events/VehicleMenu.cs b/ReallifeGamemode.Server/Events/VehicleMenu.cs index af50426e..bb6f1b3d 100644 --- a/ReallifeGamemode.Server/Events/VehicleMenu.cs +++ b/ReallifeGamemode.Server/Events/VehicleMenu.cs @@ -1,12 +1,12 @@ using GTANetworkAPI; -using reallife_gamemode.Server.Entities; -using reallife_gamemode.Server.Extensions; -using reallife_gamemode.Server.Util; +using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Server.Extensions; +using ReallifeGamemode.Server.Util; using System; using System.Collections.Generic; using System.Text; -namespace reallife_gamemode.Server.Events +namespace ReallifeGamemode.Server.Events { public class VehicleMenu : Script { diff --git a/ReallifeGamemode.Server/Extensions/AdminLevelExtension.cs b/ReallifeGamemode.Server/Extensions/AdminLevelExtension.cs index fcca308a..5f29d488 100644 --- a/ReallifeGamemode.Server/Extensions/AdminLevelExtension.cs +++ b/ReallifeGamemode.Server/Extensions/AdminLevelExtension.cs @@ -1,10 +1,10 @@ -using reallife_gamemode.Server.Util; -using static reallife_gamemode.Server.Util.AdminLevel; +using ReallifeGamemode.Server.Util; +using static ReallifeGamemode.Server.Util.AdminLevel; using System; using System.Collections.Generic; using System.Text; -namespace reallife_gamemode.Server.Extensions +namespace ReallifeGamemode.Server.Extensions { public static class AdminLevelExtension { diff --git a/ReallifeGamemode.Server/Extensions/ClientExtension.cs b/ReallifeGamemode.Server/Extensions/ClientExtension.cs index 47cecf88..4d9e9409 100644 --- a/ReallifeGamemode.Server/Extensions/ClientExtension.cs +++ b/ReallifeGamemode.Server/Extensions/ClientExtension.cs @@ -1,6 +1,6 @@ using GTANetworkAPI; -using reallife_gamemode.Server.Entities; -using reallife_gamemode.Server.Models; +using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Server.Models; using System; using System.Linq; @@ -10,7 +10,7 @@ using System.Linq; * @copyright (c) 2008 - 2018 Life of German */ -namespace reallife_gamemode.Server.Extensions +namespace ReallifeGamemode.Server.Extensions { public static class ClientExtension { diff --git a/ReallifeGamemode.Server/Extensions/IntegerExtension.cs b/ReallifeGamemode.Server/Extensions/IntegerExtension.cs index d5172998..3232526b 100644 --- a/ReallifeGamemode.Server/Extensions/IntegerExtension.cs +++ b/ReallifeGamemode.Server/Extensions/IntegerExtension.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace reallife_gamemode.Server.Extensions +namespace ReallifeGamemode.Server.Extensions { public static class IntegerExtension { diff --git a/ReallifeGamemode.Server/Extensions/VehicleExtension.cs b/ReallifeGamemode.Server/Extensions/VehicleExtension.cs index be9c98b0..d548937d 100644 --- a/ReallifeGamemode.Server/Extensions/VehicleExtension.cs +++ b/ReallifeGamemode.Server/Extensions/VehicleExtension.cs @@ -1,11 +1,11 @@ using GTANetworkAPI; -using reallife_gamemode.Server.Entities; -using reallife_gamemode.Server.Managers; +using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Server.Managers; using System; using System.Collections.Generic; using System.Text; -namespace reallife_gamemode.Server.Extensions +namespace ReallifeGamemode.Server.Extensions { public static class VehicleExtension { diff --git a/ReallifeGamemode.Server/Factions/Medic/Medic.cs b/ReallifeGamemode.Server/Factions/Medic/Medic.cs index 0b8f73b0..5146954a 100644 --- a/ReallifeGamemode.Server/Factions/Medic/Medic.cs +++ b/ReallifeGamemode.Server/Factions/Medic/Medic.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text; using GTANetworkAPI; using Newtonsoft.Json; -using reallife_gamemode.Server.Services; +using ReallifeGamemode.Server.Services; /** * @overview Life of German Reallife - Server Factions Medic Medic.cs @@ -12,7 +12,7 @@ using reallife_gamemode.Server.Services; */ -namespace reallife_gamemode.Server.Factions.Medic +namespace ReallifeGamemode.Server.Factions.Medic { public class Medic : Script { diff --git a/ReallifeGamemode.Server/Factions/Medic/MedicTask.cs b/ReallifeGamemode.Server/Factions/Medic/MedicTask.cs index cc432e47..0d06c2d6 100644 --- a/ReallifeGamemode.Server/Factions/Medic/MedicTask.cs +++ b/ReallifeGamemode.Server/Factions/Medic/MedicTask.cs @@ -10,7 +10,7 @@ using GTANetworkAPI; */ -namespace reallife_gamemode.Server.Factions.Medic +namespace ReallifeGamemode.Server.Factions.Medic { public class MedicTask { diff --git a/ReallifeGamemode.Server/Inventory/GroundItem.cs b/ReallifeGamemode.Server/Inventory/GroundItem.cs index 0a6847b4..0ac67d35 100644 --- a/ReallifeGamemode.Server/Inventory/GroundItem.cs +++ b/ReallifeGamemode.Server/Inventory/GroundItem.cs @@ -1,13 +1,13 @@ using System.Collections.Generic; using GTANetworkAPI; -using reallife_gamemode.Server.Inventory.Interfaces; -using reallife_gamemode.Server.Managers; +using ReallifeGamemode.Server.Inventory.Interfaces; +using ReallifeGamemode.Server.Managers; using System.Linq; -using reallife_gamemode.Server.Entities; -using reallife_gamemode.Server.Extensions; -using reallife_gamemode.Server.Models; +using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Server.Extensions; +using ReallifeGamemode.Server.Models; -namespace reallife_gamemode.Server.Inventory +namespace ReallifeGamemode.Server.Inventory { public class GroundItem : Script { diff --git a/ReallifeGamemode.Server/Inventory/Interfaces/IDroppableItem.cs b/ReallifeGamemode.Server/Inventory/Interfaces/IDroppableItem.cs index 1dc07406..a9e3e042 100644 --- a/ReallifeGamemode.Server/Inventory/Interfaces/IDroppableItem.cs +++ b/ReallifeGamemode.Server/Inventory/Interfaces/IDroppableItem.cs @@ -1,5 +1,5 @@ using GTANetworkAPI; -using reallife_gamemode.Server.Entities; +using ReallifeGamemode.Server.Entities; using System; using System.Collections.Generic; using System.Text; @@ -10,7 +10,7 @@ using System.Text; * @copyright (c) 2008 - 2018 Life of German */ -namespace reallife_gamemode.Server.Inventory.Interfaces +namespace ReallifeGamemode.Server.Inventory.Interfaces { public interface IDroppableItem : IItem { diff --git a/ReallifeGamemode.Server/Inventory/Interfaces/IItem.cs b/ReallifeGamemode.Server/Inventory/Interfaces/IItem.cs index 10222cc2..07bd4124 100644 --- a/ReallifeGamemode.Server/Inventory/Interfaces/IItem.cs +++ b/ReallifeGamemode.Server/Inventory/Interfaces/IItem.cs @@ -8,7 +8,7 @@ using System.Text; * @copyright (c) 2008 - 2018 Life of German */ -namespace reallife_gamemode.Server.Inventory.Interfaces +namespace ReallifeGamemode.Server.Inventory.Interfaces { public interface IItem { diff --git a/ReallifeGamemode.Server/Inventory/Interfaces/IUsableItem.cs b/ReallifeGamemode.Server/Inventory/Interfaces/IUsableItem.cs index 2a5adc5c..ca56a496 100644 --- a/ReallifeGamemode.Server/Inventory/Interfaces/IUsableItem.cs +++ b/ReallifeGamemode.Server/Inventory/Interfaces/IUsableItem.cs @@ -1,5 +1,5 @@ using GTANetworkAPI; -using reallife_gamemode.Server.Entities; +using ReallifeGamemode.Server.Entities; using System; using System.Collections.Generic; using System.Text; @@ -10,7 +10,7 @@ using System.Text; * @copyright (c) 2008 - 2018 Life of German */ -namespace reallife_gamemode.Server.Inventory.Interfaces +namespace ReallifeGamemode.Server.Inventory.Interfaces { public interface IUsableItem : IItem, IDroppableItem { diff --git a/ReallifeGamemode.Server/Inventory/Items/Cheeseburger.cs b/ReallifeGamemode.Server/Inventory/Items/Cheeseburger.cs index 520c7c6c..e77f3b49 100644 --- a/ReallifeGamemode.Server/Inventory/Items/Cheeseburger.cs +++ b/ReallifeGamemode.Server/Inventory/Items/Cheeseburger.cs @@ -1,4 +1,4 @@ -using reallife_gamemode.Server.Inventory.Interfaces; +using ReallifeGamemode.Server.Inventory.Interfaces; using System; using System.Collections.Generic; using System.Text; @@ -9,7 +9,7 @@ using System.Text; * @copyright (c) 2008 - 2018 Life of German */ -namespace reallife_gamemode.Server.Inventory.Items +namespace ReallifeGamemode.Server.Inventory.Items { public class Cheeseburger : FoodItem { diff --git a/ReallifeGamemode.Server/Inventory/Items/Chickenburger.cs b/ReallifeGamemode.Server/Inventory/Items/Chickenburger.cs index 17eb2cc0..1f8cc8b0 100644 --- a/ReallifeGamemode.Server/Inventory/Items/Chickenburger.cs +++ b/ReallifeGamemode.Server/Inventory/Items/Chickenburger.cs @@ -1,4 +1,4 @@ -using reallife_gamemode.Server.Inventory.Interfaces; +using ReallifeGamemode.Server.Inventory.Interfaces; using System; using System.Collections.Generic; using System.Text; @@ -9,7 +9,7 @@ using System.Text; * @copyright (c) 2008 - 2018 Life of German */ -namespace reallife_gamemode.Server.Inventory.Items +namespace ReallifeGamemode.Server.Inventory.Items { public class Chickenburger : FoodItem { diff --git a/ReallifeGamemode.Server/Inventory/Items/DropItem.cs b/ReallifeGamemode.Server/Inventory/Items/DropItem.cs index 5e883004..8bc62255 100644 --- a/ReallifeGamemode.Server/Inventory/Items/DropItem.cs +++ b/ReallifeGamemode.Server/Inventory/Items/DropItem.cs @@ -1,13 +1,13 @@ using GTANetworkAPI; -using reallife_gamemode.Server.Entities; -using reallife_gamemode.Server.Extensions; -using reallife_gamemode.Server.Inventory.Interfaces; -using reallife_gamemode.Server.Managers; +using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Server.Extensions; +using ReallifeGamemode.Server.Inventory.Interfaces; +using ReallifeGamemode.Server.Managers; using System; using System.Collections.Generic; using System.Text; -namespace reallife_gamemode.Server.Inventory.Items +namespace ReallifeGamemode.Server.Inventory.Items { public abstract class DropItem : IDroppableItem { diff --git a/ReallifeGamemode.Server/Inventory/Items/FoodItem.cs b/ReallifeGamemode.Server/Inventory/Items/FoodItem.cs index 4b17ba9c..8c0b84e8 100644 --- a/ReallifeGamemode.Server/Inventory/Items/FoodItem.cs +++ b/ReallifeGamemode.Server/Inventory/Items/FoodItem.cs @@ -1,13 +1,13 @@ using GTANetworkAPI; -using reallife_gamemode.Server.Entities; -using reallife_gamemode.Server.Extensions; -using reallife_gamemode.Server.Inventory.Interfaces; -using reallife_gamemode.Server.Managers; +using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Server.Extensions; +using ReallifeGamemode.Server.Inventory.Interfaces; +using ReallifeGamemode.Server.Managers; using System; using System.Collections.Generic; using System.Text; -namespace reallife_gamemode.Server.Inventory.Items +namespace ReallifeGamemode.Server.Inventory.Items { public abstract class FoodItem : IUsableItem { diff --git a/ReallifeGamemode.Server/Inventory/Items/Hamburger.cs b/ReallifeGamemode.Server/Inventory/Items/Hamburger.cs index 84dacefe..a1985372 100644 --- a/ReallifeGamemode.Server/Inventory/Items/Hamburger.cs +++ b/ReallifeGamemode.Server/Inventory/Items/Hamburger.cs @@ -1,4 +1,4 @@ -using reallife_gamemode.Server.Inventory.Interfaces; +using ReallifeGamemode.Server.Inventory.Interfaces; using System; using System.Collections.Generic; using System.Text; @@ -9,7 +9,7 @@ using System.Text; * @copyright (c) 2008 - 2018 Life of German */ -namespace reallife_gamemode.Server.Inventory.Items +namespace ReallifeGamemode.Server.Inventory.Items { public class Hamburger : FoodItem { diff --git a/ReallifeGamemode.Server/Inventory/Items/Holz.cs b/ReallifeGamemode.Server/Inventory/Items/Holz.cs index fd25dd63..6ffdaddf 100644 --- a/ReallifeGamemode.Server/Inventory/Items/Holz.cs +++ b/ReallifeGamemode.Server/Inventory/Items/Holz.cs @@ -1,4 +1,4 @@ -using reallife_gamemode.Server.Inventory.Interfaces; +using ReallifeGamemode.Server.Inventory.Interfaces; using System; using System.Collections.Generic; using System.Text; @@ -9,7 +9,7 @@ using System.Text; * @copyright (c) 2008 - 2018 Life of German */ -namespace reallife_gamemode.Server.Inventory.Items +namespace ReallifeGamemode.Server.Inventory.Items { public class Holz : IDroppableItem { diff --git a/ReallifeGamemode.Server/Inventory/Items/Kraftstoff.cs b/ReallifeGamemode.Server/Inventory/Items/Kraftstoff.cs index 499a4aaa..9d613592 100644 --- a/ReallifeGamemode.Server/Inventory/Items/Kraftstoff.cs +++ b/ReallifeGamemode.Server/Inventory/Items/Kraftstoff.cs @@ -1,4 +1,4 @@ -using reallife_gamemode.Server.Inventory.Interfaces; +using ReallifeGamemode.Server.Inventory.Interfaces; using System; using System.Collections.Generic; using System.Text; @@ -9,7 +9,7 @@ using System.Text; * @copyright (c) 2008 - 2018 Life of German */ -namespace reallife_gamemode.Server.Inventory.Items +namespace ReallifeGamemode.Server.Inventory.Items { public class Kraftstoff : DropItem { diff --git a/ReallifeGamemode.Server/Logs/BankAccountTransactionHistory.cs b/ReallifeGamemode.Server/Logs/BankAccountTransactionHistory.cs index 88146e6f..69f1c49f 100644 --- a/ReallifeGamemode.Server/Logs/BankAccountTransactionHistory.cs +++ b/ReallifeGamemode.Server/Logs/BankAccountTransactionHistory.cs @@ -10,7 +10,7 @@ using System.Text; * @copyright (c) 2008 - 2018 Life of German */ -namespace reallife_gamemode.Server.Logs +namespace ReallifeGamemode.Server.Logs { public class BankAccountTransactionHistory { diff --git a/ReallifeGamemode.Server/Logs/Death.cs b/ReallifeGamemode.Server/Logs/Death.cs index 95d2bb21..a3b7aa7a 100644 --- a/ReallifeGamemode.Server/Logs/Death.cs +++ b/ReallifeGamemode.Server/Logs/Death.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -using reallife_gamemode.Server.Entities; +using ReallifeGamemode.Server.Entities; /** * @overview Life of German Reallife - Logs Death (Death.cs) @@ -11,7 +11,7 @@ using reallife_gamemode.Server.Entities; * @copyright (c) 2008 - 2018 Life of German */ -namespace reallife_gamemode.Server.Logs +namespace ReallifeGamemode.Server.Logs { public class Death { diff --git a/ReallifeGamemode.Server/Main.cs b/ReallifeGamemode.Server/Main.cs index 643cfb43..582bfa91 100644 --- a/ReallifeGamemode.Server/Main.cs +++ b/ReallifeGamemode.Server/Main.cs @@ -1,8 +1,8 @@ using System.Globalization; using GTANetworkAPI; -using reallife_gamemode.Server.Classes; -using reallife_gamemode.Server.Managers; -using reallife_gamemode.Server.Util; +using ReallifeGamemode.Server.Classes; +using ReallifeGamemode.Server.Managers; +using ReallifeGamemode.Server.Util; /** * @overview Life of German Reallife - Main Class (Main.cs) @@ -10,7 +10,7 @@ using reallife_gamemode.Server.Util; * @copyright (c) 2008 - 2018 Life of German */ -namespace reallife_gamemode +namespace ReallifeGamemode.Server { public class Main : Script { diff --git a/ReallifeGamemode.Server/Managers/BankManager.cs b/ReallifeGamemode.Server/Managers/BankManager.cs index a4823ae2..62d81cc6 100644 --- a/ReallifeGamemode.Server/Managers/BankManager.cs +++ b/ReallifeGamemode.Server/Managers/BankManager.cs @@ -3,11 +3,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; using GTANetworkAPI; -using reallife_gamemode.Server.Business; -using reallife_gamemode.Server.Entities; -using reallife_gamemode.Server.Extensions; -using reallife_gamemode.Server.Models; -using reallife_gamemode.Server.Util; +using ReallifeGamemode.Server.Business; +using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Server.Extensions; +using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Server.Util; /** * @overview Life of German Reallife - Managers BankManager (BankManager.cs) @@ -15,7 +15,7 @@ using reallife_gamemode.Server.Util; * @copyright (c) 2008 - 2018 Life of German */ -namespace reallife_gamemode.Server.Managers +namespace ReallifeGamemode.Server.Managers { public class BankManager { diff --git a/ReallifeGamemode.Server/Managers/BusinessManager.cs b/ReallifeGamemode.Server/Managers/BusinessManager.cs index 107add49..af67011a 100644 --- a/ReallifeGamemode.Server/Managers/BusinessManager.cs +++ b/ReallifeGamemode.Server/Managers/BusinessManager.cs @@ -1,15 +1,15 @@ using GTANetworkAPI; -using reallife_gamemode.Server.Business; -using reallife_gamemode.Server.Entities; -using reallife_gamemode.Server.Extensions; -using reallife_gamemode.Server.Models; -using reallife_gamemode.Server.Util; +using ReallifeGamemode.Server.Business; +using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Server.Extensions; +using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Server.Util; using System; using System.Collections.Generic; using System.Linq; using System.Reflection; -namespace reallife_gamemode.Server.Managers +namespace ReallifeGamemode.Server.Managers { class BusinessManager : Script { diff --git a/ReallifeGamemode.Server/Managers/CharacterCreator.cs b/ReallifeGamemode.Server/Managers/CharacterCreator.cs index 57feeee2..58ed39f1 100644 --- a/ReallifeGamemode.Server/Managers/CharacterCreator.cs +++ b/ReallifeGamemode.Server/Managers/CharacterCreator.cs @@ -1,10 +1,10 @@ using System.Linq; using GTANetworkAPI; using Newtonsoft.Json.Linq; -using reallife_gamemode.Server.Extensions; -using reallife_gamemode.Server.Models; +using ReallifeGamemode.Server.Extensions; +using ReallifeGamemode.Server.Models; -namespace reallife_gamemode.Server.Managers +namespace ReallifeGamemode.Server.Managers { public class CharacterCreator : Script { diff --git a/ReallifeGamemode.Server/Managers/DoorManager.cs b/ReallifeGamemode.Server/Managers/DoorManager.cs index 0b16c1dd..0b72ff44 100644 --- a/ReallifeGamemode.Server/Managers/DoorManager.cs +++ b/ReallifeGamemode.Server/Managers/DoorManager.cs @@ -1,17 +1,17 @@ using System.Collections.Generic; using System.Linq; using GTANetworkAPI; -using reallife_gamemode.Server.Entities; -using reallife_gamemode.Server.Extensions; -using reallife_gamemode.Server.Models; -using reallife_gamemode.Server.Util; +using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Server.Extensions; +using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Server.Util; /** * @overview Life of German Reallife - Managers BankManager (BankManager.cs) * @author VegaZ * @copyright (c) 2008 - 2018 Life of German */ -namespace reallife_gamemode.Server.Managers +namespace ReallifeGamemode.Server.Managers { public class DoorManager : Script { diff --git a/ReallifeGamemode.Server/Managers/InteractionManager.cs b/ReallifeGamemode.Server/Managers/InteractionManager.cs index da190715..0c707632 100644 --- a/ReallifeGamemode.Server/Managers/InteractionManager.cs +++ b/ReallifeGamemode.Server/Managers/InteractionManager.cs @@ -1,7 +1,7 @@ using GTANetworkAPI; using Newtonsoft.Json; -using reallife_gamemode.Server.Extensions; -using reallife_gamemode.Server.Services; +using ReallifeGamemode.Server.Extensions; +using ReallifeGamemode.Server.Services; using System; using System.Collections.Generic; using System.Text; @@ -12,7 +12,7 @@ using System.Text; * @copyright (c) 2008 - 2018 Life of German */ -namespace reallife_gamemode.Server.Managers +namespace ReallifeGamemode.Server.Managers { public class InteractionManager : Script { diff --git a/ReallifeGamemode.Server/Managers/InteriorManager.cs b/ReallifeGamemode.Server/Managers/InteriorManager.cs index 69c05b13..71004fa7 100644 --- a/ReallifeGamemode.Server/Managers/InteriorManager.cs +++ b/ReallifeGamemode.Server/Managers/InteriorManager.cs @@ -1,10 +1,10 @@ using GTANetworkAPI; -using reallife_gamemode.Server.Entities; -using reallife_gamemode.Server.Models; +using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Server.Models; using System.Collections.Generic; using System.Linq; -namespace reallife_gamemode.Server.Managers +namespace ReallifeGamemode.Server.Managers { public class InteriorManager : Script { diff --git a/ReallifeGamemode.Server/Managers/InventoryManager.cs b/ReallifeGamemode.Server/Managers/InventoryManager.cs index fc0fb29a..2204c34b 100644 --- a/ReallifeGamemode.Server/Managers/InventoryManager.cs +++ b/ReallifeGamemode.Server/Managers/InventoryManager.cs @@ -1,11 +1,11 @@ using GTANetworkAPI; using Newtonsoft.Json; -using reallife_gamemode.Server.Entities; -using reallife_gamemode.Server.Extensions; -using reallife_gamemode.Server.Inventory; -using reallife_gamemode.Server.Inventory.Interfaces; -using reallife_gamemode.Server.Models; -using reallife_gamemode.Server.Services; +using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Server.Extensions; +using ReallifeGamemode.Server.Inventory; +using ReallifeGamemode.Server.Inventory.Interfaces; +using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Server.Services; using System; using System.Collections.Generic; using System.Linq; @@ -17,7 +17,7 @@ using System.Reflection; * @copyright (c) 2008 - 2018 Life of German */ -namespace reallife_gamemode.Server.Managers +namespace ReallifeGamemode.Server.Managers { public class InventoryManager : Script { diff --git a/ReallifeGamemode.Server/Managers/LoadManager.cs b/ReallifeGamemode.Server/Managers/LoadManager.cs index fc18e7b3..2ace793f 100644 --- a/ReallifeGamemode.Server/Managers/LoadManager.cs +++ b/ReallifeGamemode.Server/Managers/LoadManager.cs @@ -1,7 +1,7 @@ using GTANetworkAPI; -using reallife_gamemode.Server.Entities; -using reallife_gamemode.Server.Models; -using reallife_gamemode.Server.Saves; +using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Server.Saves; /** * @overview Life of German Reallife - Managers LoadManager (LoadManager.cs) @@ -9,7 +9,7 @@ using reallife_gamemode.Server.Saves; * @copyright (c) 2008 - 2018 Life of German */ -namespace reallife_gamemode.Server.Managers +namespace ReallifeGamemode.Server.Managers { public class LoadManager : Script { diff --git a/ReallifeGamemode.Server/Managers/PositionManager.cs b/ReallifeGamemode.Server/Managers/PositionManager.cs index b319eee0..903468ec 100644 --- a/ReallifeGamemode.Server/Managers/PositionManager.cs +++ b/ReallifeGamemode.Server/Managers/PositionManager.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.Text; using GTANetworkAPI; -using reallife_gamemode.Server.Entities; +using ReallifeGamemode.Server.Entities; -namespace reallife_gamemode.Server.Managers +namespace ReallifeGamemode.Server.Managers { public class PositionManager : Script { diff --git a/ReallifeGamemode.Server/Managers/SaveManager.cs b/ReallifeGamemode.Server/Managers/SaveManager.cs index c113b8dd..ef46ef89 100644 --- a/ReallifeGamemode.Server/Managers/SaveManager.cs +++ b/ReallifeGamemode.Server/Managers/SaveManager.cs @@ -1,12 +1,12 @@ using GTANetworkAPI; -using reallife_gamemode.Server.Business; -using reallife_gamemode.Server.Entities; -using reallife_gamemode.Server.Extensions; -using reallife_gamemode.Server.Models; -using reallife_gamemode.Server.Saves; +using ReallifeGamemode.Server.Business; +using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Server.Extensions; +using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Server.Saves; using System; -namespace reallife_gamemode.Server.Managers +namespace ReallifeGamemode.Server.Managers { public class SaveManager : Script { diff --git a/ReallifeGamemode.Server/Managers/TimeManager.cs b/ReallifeGamemode.Server/Managers/TimeManager.cs index 9020c2f5..2571705f 100644 --- a/ReallifeGamemode.Server/Managers/TimeManager.cs +++ b/ReallifeGamemode.Server/Managers/TimeManager.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Text; using System.Timers; -namespace reallife_gamemode.Server.Managers +namespace ReallifeGamemode.Server.Managers { public class TimeManager { diff --git a/ReallifeGamemode.Server/Managers/TuningManager.cs b/ReallifeGamemode.Server/Managers/TuningManager.cs index 0f08f3bb..c7198425 100644 --- a/ReallifeGamemode.Server/Managers/TuningManager.cs +++ b/ReallifeGamemode.Server/Managers/TuningManager.cs @@ -1,11 +1,11 @@ using GTANetworkAPI; -using reallife_gamemode.Server.Entities; -using reallife_gamemode.Server.Extensions; -using reallife_gamemode.Server.Models; +using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Server.Extensions; +using ReallifeGamemode.Server.Models; using System.Collections.Generic; using System.Linq; -namespace reallife_gamemode.Server.Managers +namespace ReallifeGamemode.Server.Managers { class TuningManager : Script { diff --git a/ReallifeGamemode.Server/Managers/VehicleManager.cs b/ReallifeGamemode.Server/Managers/VehicleManager.cs index 88c54e59..562d063d 100644 --- a/ReallifeGamemode.Server/Managers/VehicleManager.cs +++ b/ReallifeGamemode.Server/Managers/VehicleManager.cs @@ -1,10 +1,10 @@ using GTANetworkAPI; -using reallife_gamemode.Server.Entities; -using reallife_gamemode.Server.Models; +using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Server.Models; using System; using System.Collections.Generic; -namespace reallife_gamemode.Server.Managers +namespace ReallifeGamemode.Server.Managers { public class VehicleManager { @@ -110,11 +110,24 @@ namespace reallife_gamemode.Server.Managers return GetVehicleFromHandle(_serverVehicles[serverVehicle.Id]); } - public static ServerVehicle GetServerVehicleFromVehicle(Vehicle veh) + public static ServerVehicle GetServerVehicleFromVehicle(Vehicle veh, DatabaseContext dbContext = null) { - using (var dbContext = new DatabaseContext()) + if(dbContext == null) { - foreach(KeyValuePair pair in _serverVehicles) + using (dbContext = new DatabaseContext()) + { + foreach (KeyValuePair pair in _serverVehicles) + { + if (pair.Value == veh.Handle) + { + return dbContext.ServerVehicles.Find(pair.Key); + } + } + } + } + else + { + foreach (KeyValuePair pair in _serverVehicles) { if (pair.Value == veh.Handle) { diff --git a/ReallifeGamemode.Server/Migrations/20190226185806_Initial.Designer.cs b/ReallifeGamemode.Server/Migrations/20190226185806_Initial.Designer.cs index 43a6f29c..2714aaec 100644 --- a/ReallifeGamemode.Server/Migrations/20190226185806_Initial.Designer.cs +++ b/ReallifeGamemode.Server/Migrations/20190226185806_Initial.Designer.cs @@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using reallife_gamemode.Server.Models; +using ReallifeGamemode.Server.Models; namespace ReallifeGamemode.Migrations { diff --git a/ReallifeGamemode.Server/Migrations/20190306194826_VehicleDistanceDriven.Designer.cs b/ReallifeGamemode.Server/Migrations/20190306194826_VehicleDistanceDriven.Designer.cs new file mode 100644 index 00000000..49d9d1b1 --- /dev/null +++ b/ReallifeGamemode.Server/Migrations/20190306194826_VehicleDistanceDriven.Designer.cs @@ -0,0 +1,1002 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using ReallifeGamemode.Server.Models; + +namespace ReallifeGamemode.Migrations +{ + [DbContext(typeof(DatabaseContext))] + [Migration("20190306194826_VehicleDistanceDriven")] + partial class VehicleDistanceDriven + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "2.2.0-rtm-35687") + .HasAnnotation("Relational:MaxIdentifierLength", 64); + + modelBuilder.Entity("reallife_gamemode.Server.Entities.Ban", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Applied"); + + b.Property("BannedBy"); + + b.Property("Reason"); + + b.Property("UntilDateTime"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("Bans"); + }); + + modelBuilder.Entity("reallife_gamemode.Server.Entities.BusinessBankAccount", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Balance"); + + b.Property("BusinessId"); + + b.HasKey("Id"); + + b.HasIndex("BusinessId") + .IsUnique(); + + b.ToTable("BusinessBankAccounts"); + }); + + modelBuilder.Entity("reallife_gamemode.Server.Entities.Character", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Ageing"); + + b.Property("AgeingOpacity"); + + b.Property("BeardColor"); + + b.Property("Blemishes"); + + b.Property("BlemishesOpacity"); + + b.Property("Blush"); + + b.Property("BlushColor"); + + b.Property("BlushOpacity"); + + b.Property("BrowDepth"); + + b.Property("BrowHeight"); + + b.Property("CheekDepth"); + + b.Property("CheekboneHeight"); + + b.Property("CheekboneWidth"); + + b.Property("ChestHair"); + + b.Property("ChestHairColor"); + + b.Property("ChestHairOpacity"); + + b.Property("ChinDepth"); + + b.Property("ChinHeight"); + + b.Property("ChinIndent"); + + b.Property("ChinWidth"); + + b.Property("Complexion"); + + b.Property("ComplexionOpacity"); + + b.Property("EyeColor"); + + b.Property("EyeSize"); + + b.Property("EyebrowColor"); + + b.Property("Eyebrows"); + + b.Property("EyebrowsOpacity"); + + b.Property("FacialHair"); + + b.Property("FacialHairOpacity"); + + b.Property("Father"); + + b.Property("Freckles"); + + b.Property("FrecklesOpacity"); + + b.Property("Gender"); + + b.Property("Hair"); + + b.Property("HairColor"); + + b.Property("HairHighlightColor"); + + b.Property("JawShape"); + + b.Property("JawWidth"); + + b.Property("LipThickness"); + + b.Property("Lipstick"); + + b.Property("LipstickColor"); + + b.Property("LipstickOpacity"); + + b.Property("Makeup"); + + b.Property("MakeupOpacity"); + + b.Property("Mother"); + + b.Property("NeckWidth"); + + b.Property("NoseBottomHeight"); + + b.Property("NoseBridgeDepth"); + + b.Property("NoseBroken"); + + b.Property("NoseTipHeight"); + + b.Property("NoseTipLength"); + + b.Property("NoseWidth"); + + b.Property("Similarity"); + + b.Property("SkinSimilarity"); + + b.Property("SunDamage"); + + b.Property("SunDamageOpacity"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("Characters"); + }); + + modelBuilder.Entity("reallife_gamemode.Server.Entities.CharacterCloth", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ClothId"); + + b.Property("Duty"); + + b.Property("SlotId"); + + b.Property("SlotType"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("CharacterClothes"); + }); + + modelBuilder.Entity("reallife_gamemode.Server.Entities.ClothCombination", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Gender"); + + b.Property("Top"); + + b.Property("Torso"); + + b.Property("Undershirt"); + + b.HasKey("Id"); + + b.ToTable("ClothCombinations"); + }); + + modelBuilder.Entity("reallife_gamemode.Server.Entities.Door", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Category"); + + b.Property("FactionId"); + + b.Property("Locked"); + + b.Property("Model"); + + b.Property("Name"); + + b.Property("Radius"); + + b.Property("X"); + + b.Property("Y"); + + b.Property("Z"); + + b.HasKey("Id"); + + b.HasIndex("FactionId"); + + b.ToTable("Doors"); + }); + + modelBuilder.Entity("reallife_gamemode.Server.Entities.DutyCloth", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ClothId"); + + b.Property("FactionId"); + + b.Property("Gender"); + + b.Property("SlotId"); + + b.Property("SlotType"); + + b.HasKey("Id"); + + b.HasIndex("FactionId"); + + b.ToTable("DutyClothes"); + }); + + modelBuilder.Entity("reallife_gamemode.Server.Entities.Faction", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Name") + .HasMaxLength(32); + + b.Property("StateOwned"); + + b.HasKey("Id"); + + b.ToTable("Factions"); + }); + + modelBuilder.Entity("reallife_gamemode.Server.Entities.FactionBankAccount", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Active"); + + b.Property("Balance"); + + b.Property("Bic") + .HasMaxLength(12); + + b.Property("FactionId"); + + b.Property("Iban") + .HasMaxLength(32); + + b.HasKey("Id"); + + b.HasIndex("FactionId"); + + b.ToTable("FactionBankAccounts"); + }); + + modelBuilder.Entity("reallife_gamemode.Server.Entities.FactionRank", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("FactionId"); + + b.Property("Order"); + + b.Property("RankName"); + + b.HasKey("Id"); + + b.HasIndex("FactionId"); + + b.ToTable("FactionRanks"); + }); + + modelBuilder.Entity("reallife_gamemode.Server.Entities.GotoPoint", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Active"); + + b.Property("Description") + .HasMaxLength(32); + + b.Property("X"); + + b.Property("Y"); + + b.Property("Z"); + + b.HasKey("Id"); + + b.ToTable("GotoPoints"); + }); + + modelBuilder.Entity("reallife_gamemode.Server.Entities.Interior", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("EnterPositionStr") + .HasColumnName("EnterPosition"); + + b.Property("ExitPositionStr") + .HasColumnName("ExitPosition"); + + b.Property("Name"); + + b.HasKey("Id"); + + b.ToTable("Interiors"); + }); + + modelBuilder.Entity("reallife_gamemode.Server.Entities.News", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Active"); + + b.Property("Caption"); + + b.Property("Content"); + + b.Property("Timestamp"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("News"); + }); + + modelBuilder.Entity("reallife_gamemode.Server.Entities.ServerVehicle", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Active") + .ValueGeneratedOnAdd() + .HasDefaultValue(true); + + b.Property("Discriminator") + .IsRequired(); + + b.Property("DistanceDriven"); + + b.Property("Heading"); + + b.Property("Locked"); + + b.Property("Model"); + + b.Property("NumberPlate") + .HasMaxLength(8); + + b.Property("PositionX"); + + b.Property("PositionY"); + + b.Property("PositionZ"); + + b.Property("PrimaryColor"); + + b.Property("SecondaryColor"); + + b.HasKey("Id"); + + b.ToTable("ServerVehicles"); + + b.HasDiscriminator("Discriminator").HasValue("ServerVehicle"); + }); + + modelBuilder.Entity("reallife_gamemode.Server.Entities.User", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AdminLevel"); + + b.Property("BanId"); + + b.Property("BusinessId"); + + b.Property("CharacterId"); + + b.Property("Dead"); + + b.Property("Email") + .HasMaxLength(64); + + b.Property("FactionId"); + + b.Property("FactionLeader"); + + b.Property("FactionRankId"); + + b.Property("LogUserId"); + + b.Property("Name") + .HasMaxLength(32); + + b.Property("Password") + .HasMaxLength(64); + + b.Property("PositionX"); + + b.Property("PositionY"); + + b.Property("PositionZ"); + + b.Property("RegistrationDate") + .ValueGeneratedOnAdd(); + + b.Property("SocialClubName") + .HasMaxLength(32); + + b.HasKey("Id"); + + b.HasIndex("BanId"); + + b.HasIndex("BusinessId") + .IsUnique(); + + b.HasIndex("CharacterId"); + + b.HasIndex("FactionId"); + + b.HasIndex("FactionRankId"); + + b.ToTable("Users"); + }); + + modelBuilder.Entity("reallife_gamemode.Server.Entities.UserBankAccount", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Active"); + + b.Property("Balance"); + + b.Property("Bic") + .HasMaxLength(12); + + b.Property("Iban") + .HasMaxLength(32); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("UserBankAccounts"); + }); + + modelBuilder.Entity("reallife_gamemode.Server.Entities.UserItem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Amount"); + + b.Property("ItemId"); + + b.Property("Slot"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("UserItems"); + }); + + modelBuilder.Entity("reallife_gamemode.Server.Entities.VehicleMod", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ModId"); + + b.Property("ServerVehicleId"); + + b.Property("Slot"); + + b.HasKey("Id"); + + b.HasIndex("ServerVehicleId", "Slot") + .IsUnique(); + + b.ToTable("VehicleMods"); + }); + + modelBuilder.Entity("reallife_gamemode.Server.Entities.Whitelist", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("SocialClubName"); + + b.HasKey("Id"); + + b.ToTable("WhitelistEntries"); + }); + + modelBuilder.Entity("reallife_gamemode.Server.Logs.BankAccountTransactionHistory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Fee"); + + b.Property("MoneySent"); + + b.Property("NewReceiverBalance"); + + b.Property("NewSenderBalance"); + + b.Property("Origin") + .HasMaxLength(32); + + b.Property("Receiver") + .HasMaxLength(32); + + b.Property("ReceiverBalance"); + + b.Property("Sender") + .HasMaxLength(32); + + b.Property("SenderBalance"); + + b.Property("Timestamp") + .ValueGeneratedOnAdd(); + + b.HasKey("Id"); + + b.ToTable("BankAccountTransactionLogs"); + }); + + modelBuilder.Entity("reallife_gamemode.Server.Logs.Death", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("CauseOfDeath") + .HasMaxLength(64); + + b.Property("KillerHeading"); + + b.Property("KillerId"); + + b.Property("KillerPositionX"); + + b.Property("KillerPositionY"); + + b.Property("KillerPositionZ"); + + b.Property("Timestamp") + .ValueGeneratedOnAdd(); + + b.Property("VictimHeading"); + + b.Property("VictimId"); + + b.Property("VictimPositionX"); + + b.Property("VictimPositionY"); + + b.Property("VictimPositionZ"); + + b.HasKey("Id"); + + b.HasIndex("KillerId"); + + b.HasIndex("VictimId"); + + b.ToTable("DeathLogs"); + }); + + modelBuilder.Entity("reallife_gamemode.Server.Saves.SavedBlip", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Active"); + + b.Property("Alpha"); + + b.Property("Color"); + + b.Property("Dimension"); + + b.Property("DrawDistance"); + + b.Property("Name"); + + b.Property("PositionX"); + + b.Property("PositionY"); + + b.Property("PositionZ"); + + b.Property("Rotation"); + + b.Property("Scale"); + + b.Property("ShortRange"); + + b.Property("Sprite"); + + b.HasKey("Id"); + + b.ToTable("Blips"); + }); + + modelBuilder.Entity("reallife_gamemode.Server.Saves.SavedMarker", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Active"); + + b.Property("ColorA"); + + b.Property("ColorB"); + + b.Property("ColorG"); + + b.Property("ColorR"); + + b.Property("Dimension"); + + b.Property("DirectionX"); + + b.Property("DirectionY"); + + b.Property("DirectionZ"); + + b.Property("PositionX"); + + b.Property("PositionY"); + + b.Property("PositionZ"); + + b.Property("RotationX"); + + b.Property("RotationY"); + + b.Property("RotationZ"); + + b.Property("Scale"); + + b.Property("Type"); + + b.Property("Visible"); + + b.HasKey("Id"); + + b.ToTable("Markers"); + }); + + modelBuilder.Entity("reallife_gamemode.Server.Saves.SavedPed", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Active"); + + b.Property("Dimension"); + + b.Property("HashModel"); + + b.Property("Heading"); + + b.Property("PositionX"); + + b.Property("PositionY"); + + b.Property("PositionZ"); + + b.HasKey("Id"); + + b.ToTable("Peds"); + }); + + modelBuilder.Entity("reallife_gamemode.Server.Saves.SavedPickup", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Active"); + + b.Property("Dimension"); + + b.Property("PositionX") + .HasMaxLength(128); + + b.Property("PositionY"); + + b.Property("PositionZ"); + + b.Property("RespawnTime"); + + b.Property("RotationX"); + + b.Property("RotationY"); + + b.Property("RotationZ"); + + b.Property("Vehicle"); + + b.HasKey("Id"); + + b.ToTable("Pickups"); + }); + + modelBuilder.Entity("reallife_gamemode.Server.Saves.SavedTextLabel", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Active"); + + b.Property("ColorA"); + + b.Property("ColorB"); + + b.Property("ColorG"); + + b.Property("ColorR"); + + b.Property("Dimension"); + + b.Property("DrawDistance"); + + b.Property("Font"); + + b.Property("LOS"); + + b.Property("PositionX"); + + b.Property("PositionY"); + + b.Property("PositionZ"); + + b.Property("Text") + .IsRequired(); + + b.HasKey("Id"); + + b.ToTable("TextLabels"); + }); + + modelBuilder.Entity("reallife_gamemode.Server.Entities.FactionVehicle", b => + { + b.HasBaseType("reallife_gamemode.Server.Entities.ServerVehicle"); + + b.Property("FactionId"); + + b.HasIndex("FactionId"); + + b.ToTable("FactionVehicles"); + + b.HasDiscriminator().HasValue("FactionVehicle"); + }); + + modelBuilder.Entity("reallife_gamemode.Server.Entities.ShopVehicle", b => + { + b.HasBaseType("reallife_gamemode.Server.Entities.ServerVehicle"); + + b.Property("BusinessId"); + + b.Property("Price"); + + b.Property("ShopId"); + + b.ToTable("ShopVehicles"); + + b.HasDiscriminator().HasValue("ShopVehicle"); + }); + + modelBuilder.Entity("reallife_gamemode.Server.Entities.UserVehicle", b => + { + b.HasBaseType("reallife_gamemode.Server.Entities.ServerVehicle"); + + b.Property("UserId"); + + b.HasIndex("UserId"); + + b.ToTable("UserVehicles"); + + b.HasDiscriminator().HasValue("UserVehicle"); + }); + + modelBuilder.Entity("reallife_gamemode.Server.Saves.SavedVehicle", b => + { + b.HasBaseType("reallife_gamemode.Server.Entities.ServerVehicle"); + + b.HasDiscriminator().HasValue("SavedVehicle"); + }); + + modelBuilder.Entity("reallife_gamemode.Server.Entities.Ban", b => + { + b.HasOne("reallife_gamemode.Server.Entities.User", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("reallife_gamemode.Server.Entities.Character", b => + { + b.HasOne("reallife_gamemode.Server.Entities.User", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("reallife_gamemode.Server.Entities.CharacterCloth", b => + { + b.HasOne("reallife_gamemode.Server.Entities.User", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("reallife_gamemode.Server.Entities.Door", b => + { + b.HasOne("reallife_gamemode.Server.Entities.Faction", "Faction") + .WithMany() + .HasForeignKey("FactionId"); + }); + + modelBuilder.Entity("reallife_gamemode.Server.Entities.DutyCloth", b => + { + b.HasOne("reallife_gamemode.Server.Entities.Faction", "Faction") + .WithMany() + .HasForeignKey("FactionId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("reallife_gamemode.Server.Entities.FactionBankAccount", b => + { + b.HasOne("reallife_gamemode.Server.Entities.Faction", "Faction") + .WithMany() + .HasForeignKey("FactionId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("reallife_gamemode.Server.Entities.FactionRank", b => + { + b.HasOne("reallife_gamemode.Server.Entities.Faction", "Faction") + .WithMany() + .HasForeignKey("FactionId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("reallife_gamemode.Server.Entities.News", b => + { + b.HasOne("reallife_gamemode.Server.Entities.User", "User") + .WithMany() + .HasForeignKey("UserId"); + }); + + modelBuilder.Entity("reallife_gamemode.Server.Entities.User", b => + { + b.HasOne("reallife_gamemode.Server.Entities.Ban", "Ban") + .WithMany() + .HasForeignKey("BanId"); + + b.HasOne("reallife_gamemode.Server.Entities.Character", "Character") + .WithMany() + .HasForeignKey("CharacterId"); + + b.HasOne("reallife_gamemode.Server.Entities.Faction", "Faction") + .WithMany() + .HasForeignKey("FactionId"); + + b.HasOne("reallife_gamemode.Server.Entities.FactionRank", "FactionRank") + .WithMany() + .HasForeignKey("FactionRankId"); + }); + + modelBuilder.Entity("reallife_gamemode.Server.Entities.UserBankAccount", b => + { + b.HasOne("reallife_gamemode.Server.Entities.User", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("reallife_gamemode.Server.Entities.UserItem", b => + { + b.HasOne("reallife_gamemode.Server.Entities.User", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("reallife_gamemode.Server.Entities.VehicleMod", b => + { + b.HasOne("reallife_gamemode.Server.Entities.ServerVehicle", "Vehicle") + .WithMany() + .HasForeignKey("ServerVehicleId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("reallife_gamemode.Server.Logs.Death", b => + { + b.HasOne("reallife_gamemode.Server.Entities.User", "Killer") + .WithMany() + .HasForeignKey("KillerId"); + + b.HasOne("reallife_gamemode.Server.Entities.User", "Victim") + .WithMany() + .HasForeignKey("VictimId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("reallife_gamemode.Server.Entities.FactionVehicle", b => + { + b.HasOne("reallife_gamemode.Server.Entities.Faction", "Faction") + .WithMany() + .HasForeignKey("FactionId"); + }); + + modelBuilder.Entity("reallife_gamemode.Server.Entities.UserVehicle", b => + { + b.HasOne("reallife_gamemode.Server.Entities.User", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/ReallifeGamemode.Server/Migrations/20190306194826_VehicleDistanceDriven.cs b/ReallifeGamemode.Server/Migrations/20190306194826_VehicleDistanceDriven.cs new file mode 100644 index 00000000..5610b2d0 --- /dev/null +++ b/ReallifeGamemode.Server/Migrations/20190306194826_VehicleDistanceDriven.cs @@ -0,0 +1,23 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +namespace ReallifeGamemode.Migrations +{ + public partial class VehicleDistanceDriven : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "DistanceDriven", + table: "ServerVehicles", + nullable: false, + defaultValue: 0f); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "DistanceDriven", + table: "ServerVehicles"); + } + } +} diff --git a/ReallifeGamemode.Server/Migrations/DatabaseContextModelSnapshot.cs b/ReallifeGamemode.Server/Migrations/DatabaseContextModelSnapshot.cs index ca4d8b3e..ed6dfe57 100644 --- a/ReallifeGamemode.Server/Migrations/DatabaseContextModelSnapshot.cs +++ b/ReallifeGamemode.Server/Migrations/DatabaseContextModelSnapshot.cs @@ -3,7 +3,7 @@ using System; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using reallife_gamemode.Server.Models; +using ReallifeGamemode.Server.Models; namespace ReallifeGamemode.Migrations { @@ -404,6 +404,8 @@ namespace ReallifeGamemode.Migrations b.Property("Discriminator") .IsRequired(); + b.Property("DistanceDriven"); + b.Property("Heading"); b.Property("Locked"); diff --git a/ReallifeGamemode.Server/Models/DatabaseContext.cs b/ReallifeGamemode.Server/Models/DatabaseContext.cs index 1eb3c024..4d03b4ec 100644 --- a/ReallifeGamemode.Server/Models/DatabaseContext.cs +++ b/ReallifeGamemode.Server/Models/DatabaseContext.cs @@ -6,7 +6,7 @@ * @copyright (c) 2008 - 2018 Life of German */ -namespace reallife_gamemode.Server.Models +namespace ReallifeGamemode.Server.Models { public partial class DatabaseContext : DbContext { @@ -30,74 +30,74 @@ namespace reallife_gamemode.Server.Models { base.OnModelCreating(modelBuilder); - modelBuilder.Entity() + modelBuilder.Entity() .HasIndex(b => b.BusinessId) .IsUnique(true); - modelBuilder.Entity() + modelBuilder.Entity() .HasIndex(u => u.BusinessId) .IsUnique(true); - modelBuilder.Entity() + modelBuilder.Entity() .Property(sv => sv.Active) .HasDefaultValue(true); - modelBuilder.Entity() + modelBuilder.Entity() .HasIndex(vM => new { vM.ServerVehicleId, vM.Slot }).IsUnique(); } //User - public DbSet Bans { get; set; } - public DbSet Characters { get; set; } - public DbSet CharacterClothes { get; set; } - public DbSet DutyClothes { get; set; } - public DbSet ClothCombinations { get; set; } - public DbSet Users { get; set; } - public DbSet UserVehicles { get; set; } - public DbSet UserBankAccounts { get; set; } + public DbSet Bans { get; set; } + public DbSet Characters { get; set; } + public DbSet CharacterClothes { get; set; } + public DbSet DutyClothes { get; set; } + public DbSet ClothCombinations { get; set; } + public DbSet Users { get; set; } + public DbSet UserVehicles { get; set; } + public DbSet UserBankAccounts { get; set; } //Inventar - public DbSet UserItems { get; set; } + public DbSet UserItems { get; set; } //Faction - public DbSet Factions { get; set; } - public DbSet FactionBankAccounts { get; set; } - public DbSet FactionRanks { get; set; } - public DbSet FactionVehicles { get; set; } + public DbSet Factions { get; set; } + public DbSet FactionBankAccounts { get; set; } + public DbSet FactionRanks { get; set; } + public DbSet FactionVehicles { get; set; } //Shops //Logs - //public DbSet BanLogs { get; set; } - public DbSet BankAccountTransactionLogs { get; set; } - public DbSet DeathLogs { get; set; } + //public DbSet BanLogs { get; set; } + public DbSet BankAccountTransactionLogs { get; set; } + public DbSet DeathLogs { get; set; } //Saves - public DbSet Blips { get; set; } - public DbSet Doors { get; set; } - public DbSet GotoPoints { get; set; } - public DbSet Markers { get; set; } - public DbSet Peds { get; set; } - public DbSet Pickups { get; set; } - public DbSet TextLabels { get; set; } - public DbSet Vehicles { get; set; } - public DbSet ShopVehicles { get; set; } + public DbSet Blips { get; set; } + public DbSet Doors { get; set; } + public DbSet GotoPoints { get; set; } + public DbSet Markers { get; set; } + public DbSet Peds { get; set; } + public DbSet Pickups { get; set; } + public DbSet TextLabels { get; set; } + public DbSet Vehicles { get; set; } + public DbSet ShopVehicles { get; set; } // Business - public DbSet BusinessBankAccounts { get; set; } + public DbSet BusinessBankAccounts { get; set; } // Control Panel - public DbSet News { get; set; } + public DbSet News { get; set; } // Server Vehicles - public DbSet ServerVehicles { get; set; } - public DbSet VehicleMods { get; set; } + public DbSet ServerVehicles { get; set; } + public DbSet VehicleMods { get; set; } // Whitelist - public DbSet WhitelistEntries { get; set; } + public DbSet WhitelistEntries { get; set; } // Interiors - public DbSet Interiors { get; set; } + public DbSet Interiors { get; set; } } } diff --git a/ReallifeGamemode.Server/ReallifeGamemode.Server.csproj b/ReallifeGamemode.Server/ReallifeGamemode.Server.csproj index e17b2f4c..0ab19ec7 100644 --- a/ReallifeGamemode.Server/ReallifeGamemode.Server.csproj +++ b/ReallifeGamemode.Server/ReallifeGamemode.Server.csproj @@ -1,7 +1,7 @@  netcoreapp2.0 - ReallifeGamemode + ReallifeGamemode.Server true true true diff --git a/ReallifeGamemode.Server/Saves/SavedBlip.cs b/ReallifeGamemode.Server/Saves/SavedBlip.cs index 3c9d09c9..d76abe3d 100644 --- a/ReallifeGamemode.Server/Saves/SavedBlip.cs +++ b/ReallifeGamemode.Server/Saves/SavedBlip.cs @@ -10,7 +10,7 @@ using System.ComponentModel.DataAnnotations.Schema; * @copyright (c) 2008 - 2018 Life of German */ -namespace reallife_gamemode.Server.Saves +namespace ReallifeGamemode.Server.Saves { public class SavedBlip { diff --git a/ReallifeGamemode.Server/Saves/SavedMarker.cs b/ReallifeGamemode.Server/Saves/SavedMarker.cs index 5670d0f7..f0d95577 100644 --- a/ReallifeGamemode.Server/Saves/SavedMarker.cs +++ b/ReallifeGamemode.Server/Saves/SavedMarker.cs @@ -10,7 +10,7 @@ using System.ComponentModel.DataAnnotations.Schema; * @copyright (c) 2008 - 2018 Life of German */ -namespace reallife_gamemode.Server.Saves +namespace ReallifeGamemode.Server.Saves { public class SavedMarker { diff --git a/ReallifeGamemode.Server/Saves/SavedPed.cs b/ReallifeGamemode.Server/Saves/SavedPed.cs index 627ec516..54c520c7 100644 --- a/ReallifeGamemode.Server/Saves/SavedPed.cs +++ b/ReallifeGamemode.Server/Saves/SavedPed.cs @@ -10,7 +10,7 @@ using System.ComponentModel.DataAnnotations.Schema; * @copyright (c) 2008 - 2018 Life of German */ -namespace reallife_gamemode.Server.Saves +namespace ReallifeGamemode.Server.Saves { public class SavedPed { diff --git a/ReallifeGamemode.Server/Saves/SavedPickup.cs b/ReallifeGamemode.Server/Saves/SavedPickup.cs index 5c518de5..abb3b6cc 100644 --- a/ReallifeGamemode.Server/Saves/SavedPickup.cs +++ b/ReallifeGamemode.Server/Saves/SavedPickup.cs @@ -10,7 +10,7 @@ using System.ComponentModel.DataAnnotations.Schema; * @copyright (c) 2008 - 2018 Life of German */ -namespace reallife_gamemode.Server.Saves +namespace ReallifeGamemode.Server.Saves { public class SavedPickup { diff --git a/ReallifeGamemode.Server/Saves/SavedTextLabel.cs b/ReallifeGamemode.Server/Saves/SavedTextLabel.cs index d367bfbf..62b45c87 100644 --- a/ReallifeGamemode.Server/Saves/SavedTextLabel.cs +++ b/ReallifeGamemode.Server/Saves/SavedTextLabel.cs @@ -10,7 +10,7 @@ using System.ComponentModel.DataAnnotations.Schema; * @copyright (c) 2008 - 2018 Life of German */ -namespace reallife_gamemode.Server.Saves +namespace ReallifeGamemode.Server.Saves { public class SavedTextLabel { diff --git a/ReallifeGamemode.Server/Saves/SavedVehicle.cs b/ReallifeGamemode.Server/Saves/SavedVehicle.cs index 74c8a0c1..5a598757 100644 --- a/ReallifeGamemode.Server/Saves/SavedVehicle.cs +++ b/ReallifeGamemode.Server/Saves/SavedVehicle.cs @@ -4,7 +4,7 @@ using System.Text; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using GTANetworkAPI; -using reallife_gamemode.Server.Entities; +using ReallifeGamemode.Server.Entities; /** * @overview Life of German Reallife - Saves SavedVehicle.cs @@ -12,7 +12,7 @@ using reallife_gamemode.Server.Entities; * @copyright (c) 2008 - 2018 Life of German */ -namespace reallife_gamemode.Server.Saves +namespace ReallifeGamemode.Server.Saves { public class SavedVehicle : ServerVehicle { diff --git a/ReallifeGamemode.Server/Services/ChatService.cs b/ReallifeGamemode.Server/Services/ChatService.cs index a6e90bdc..0eae8c39 100644 --- a/ReallifeGamemode.Server/Services/ChatService.cs +++ b/ReallifeGamemode.Server/Services/ChatService.cs @@ -1,7 +1,7 @@ using GTANetworkAPI; -using reallife_gamemode.Server.Entities; -using reallife_gamemode.Server.Extensions; -using reallife_gamemode.Server.Util; +using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Server.Extensions; +using ReallifeGamemode.Server.Util; using System.Collections.Generic; /** @@ -10,7 +10,7 @@ using System.Collections.Generic; * @copyright (c) 2008 - 2018 Life of German */ -namespace reallife_gamemode.Server.Services +namespace ReallifeGamemode.Server.Services { class ChatService { diff --git a/ReallifeGamemode.Server/Services/ClientService.cs b/ReallifeGamemode.Server/Services/ClientService.cs index 7b668770..5112794d 100644 --- a/ReallifeGamemode.Server/Services/ClientService.cs +++ b/ReallifeGamemode.Server/Services/ClientService.cs @@ -9,7 +9,7 @@ using System.Text; * @copyright (c) 2008 - 2018 Life of German */ -namespace reallife_gamemode.Server.Services +namespace ReallifeGamemode.Server.Services { class ClientService { diff --git a/ReallifeGamemode.Server/Util/AdminLevel.cs b/ReallifeGamemode.Server/Util/AdminLevel.cs index 3ef29297..63fd38c5 100644 --- a/ReallifeGamemode.Server/Util/AdminLevel.cs +++ b/ReallifeGamemode.Server/Util/AdminLevel.cs @@ -8,7 +8,7 @@ using System.Text; * @copyright (c) 2008 - 2018 Life of German */ -namespace reallife_gamemode.Server.Util +namespace ReallifeGamemode.Server.Util { public enum AdminLevel : int { diff --git a/ReallifeGamemode.Server/Util/Converter.cs b/ReallifeGamemode.Server/Util/Converter.cs index 6bc4d355..3e7e2017 100644 --- a/ReallifeGamemode.Server/Util/Converter.cs +++ b/ReallifeGamemode.Server/Util/Converter.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Globalization; using System.Text; -namespace reallife_gamemode.Server.Util +namespace ReallifeGamemode.Server.Util { public class Converter { diff --git a/ReallifeGamemode.Server/Util/DatabaseHelper.cs b/ReallifeGamemode.Server/Util/DatabaseHelper.cs index 31d9898d..7dec58f8 100644 --- a/ReallifeGamemode.Server/Util/DatabaseHelper.cs +++ b/ReallifeGamemode.Server/Util/DatabaseHelper.cs @@ -1,8 +1,8 @@ using GTANetworkAPI; -using reallife_gamemode.Server.Models; +using ReallifeGamemode.Server.Models; using System.Linq; -namespace reallife_gamemode.Server.Util +namespace ReallifeGamemode.Server.Util { class DatabaseHelper { diff --git a/ReallifeGamemode.Server/Util/FactionHelper.cs b/ReallifeGamemode.Server/Util/FactionHelper.cs index 6733d1af..5c5f8706 100644 --- a/ReallifeGamemode.Server/Util/FactionHelper.cs +++ b/ReallifeGamemode.Server/Util/FactionHelper.cs @@ -1,8 +1,8 @@ using GTANetworkAPI; -using reallife_gamemode.Server.Entities; -using reallife_gamemode.Server.Models; +using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Server.Models; -namespace reallife_gamemode.Server.Util +namespace ReallifeGamemode.Server.Util { class FactionHelper { diff --git a/ReallifeGamemode.Server/Util/FactionRankHelper.cs b/ReallifeGamemode.Server/Util/FactionRankHelper.cs index 5d457bf7..d81c6abd 100644 --- a/ReallifeGamemode.Server/Util/FactionRankHelper.cs +++ b/ReallifeGamemode.Server/Util/FactionRankHelper.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace reallife_gamemode.Server.Util +namespace ReallifeGamemode.Server.Util { class FactionRankHelper { diff --git a/ReallifeGamemode.Server/Util/IBankAccount.cs b/ReallifeGamemode.Server/Util/IBankAccount.cs index 4a8b4a2c..12446266 100644 --- a/ReallifeGamemode.Server/Util/IBankAccount.cs +++ b/ReallifeGamemode.Server/Util/IBankAccount.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace reallife_gamemode.Server.Util +namespace ReallifeGamemode.Server.Util { public interface IBankAccount { diff --git a/ReallifeGamemode.Server/Util/IBankAccountOwner.cs b/ReallifeGamemode.Server/Util/IBankAccountOwner.cs index 9f5a8874..be6f7cc2 100644 --- a/ReallifeGamemode.Server/Util/IBankAccountOwner.cs +++ b/ReallifeGamemode.Server/Util/IBankAccountOwner.cs @@ -1,6 +1,6 @@ -using reallife_gamemode.Server.Models; +using ReallifeGamemode.Server.Models; -namespace reallife_gamemode.Server.Util +namespace ReallifeGamemode.Server.Util { public interface IBankAccountOwner { diff --git a/ReallifeGamemode.Server/Util/ListPlayer.cs b/ReallifeGamemode.Server/Util/ListPlayer.cs index 40ea85c4..5fbef9e1 100644 --- a/ReallifeGamemode.Server/Util/ListPlayer.cs +++ b/ReallifeGamemode.Server/Util/ListPlayer.cs @@ -9,7 +9,7 @@ using GTANetworkAPI; * @copyright (c) 2008 - 2018 Life of German */ -namespace reallife_gamemode.Server.Util +namespace ReallifeGamemode.Server.Util { public class ListPlayer { diff --git a/ReallifeGamemode.Server/Util/SmoothThrottle.cs b/ReallifeGamemode.Server/Util/SmoothThrottle.cs index d55775a7..da62bb6f 100644 --- a/ReallifeGamemode.Server/Util/SmoothThrottle.cs +++ b/ReallifeGamemode.Server/Util/SmoothThrottle.cs @@ -1,6 +1,6 @@ using GTANetworkAPI; -namespace reallife_gamemode.Server.Util +namespace ReallifeGamemode.Server.Util { public class SmoothThrottleAntiReverse : Script { diff --git a/ReallifeGamemode.Server/Util/TransactionResult.cs b/ReallifeGamemode.Server/Util/TransactionResult.cs index 7ce9b001..9a8d17cf 100644 --- a/ReallifeGamemode.Server/Util/TransactionResult.cs +++ b/ReallifeGamemode.Server/Util/TransactionResult.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace reallife_gamemode.Server.Util +namespace ReallifeGamemode.Server.Util { public enum TransactionResult { diff --git a/ReallifeGamemode.Server/Util/VehicleSync.cs b/ReallifeGamemode.Server/Util/VehicleSync.cs index 317caa02..8dcc49f0 100644 --- a/ReallifeGamemode.Server/Util/VehicleSync.cs +++ b/ReallifeGamemode.Server/Util/VehicleSync.cs @@ -23,7 +23,7 @@ public static void SetLockStatus(Vehicle veh, bool status) public static bool GetLockState(Vehicle veh) */ -namespace reallife_gamemode.Server.Util +namespace ReallifeGamemode.Server.Util { //Enums for ease of use public enum WindowID