From cec8048a1ef1c79d2d8ed0360882ae3245c68c83 Mon Sep 17 00:00:00 2001 From: Luke Date: Sun, 9 May 2021 23:54:58 +0200 Subject: [PATCH 01/82] fix login message @airmake --- ReallifeGamemode.Server/Util/GlobalHelper.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReallifeGamemode.Server/Util/GlobalHelper.cs b/ReallifeGamemode.Server/Util/GlobalHelper.cs index 88e0a5e3..94849ec3 100644 --- a/ReallifeGamemode.Server/Util/GlobalHelper.cs +++ b/ReallifeGamemode.Server/Util/GlobalHelper.cs @@ -14,7 +14,7 @@ namespace ReallifeGamemode.Server.Util { ".MichaPlays.", "Der echte Ballas Leader ist online (MichaPlays)" }, { "iCroniX", "Life of Malle - Eimer für Alle - Alle für Malle - Böllern! (CroniX)" }, { "balboistderbeste", "Hurra! Hurra! Der Balbo ist jetzt da! (balbo)" }, - { "AirMake", "The fresh breeze of the stone ist back. (AirMake)" }, + { "AirMake", "The fresh breeze of the stone is back. (AirMake)" }, { "raviatex", "I'll remember you all in therapy. (aviate)" }, { "datgame__", "KOPF ENTWICKLUNG!! (hydrant)" }, { "Roachkook", "2head Entwickler ist wieder online (kookroach)" } From 490a71c3e3c80684e7c4fbca2185da6b9827e0d4 Mon Sep 17 00:00:00 2001 From: "michael.reiswich" Date: Mon, 10 May 2021 18:30:34 +0200 Subject: [PATCH 02/82] test carwash --- ReallifeGamemode.Client/index.ts | 3 + ReallifeGamemode.Client/util/carwash.ts | 16 +++++ .../Commands/AdminCommands.cs | 6 ++ .../Managers/PositionManager.cs | 59 ++++++++++++++++++- 4 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 ReallifeGamemode.Client/util/carwash.ts diff --git a/ReallifeGamemode.Client/index.ts b/ReallifeGamemode.Client/index.ts index b79488aa..e1b91d2d 100644 --- a/ReallifeGamemode.Client/index.ts +++ b/ReallifeGamemode.Client/index.ts @@ -286,6 +286,9 @@ notification(); import rentCar from './util/rentcar'; rentCar(globalData); +import Carwash from './util/carwash'; +Carwash(globalData); + require('./Gui/policedepartment'); require('./Gui/helptext'); require('./admin/spectate'); diff --git a/ReallifeGamemode.Client/util/carwash.ts b/ReallifeGamemode.Client/util/carwash.ts new file mode 100644 index 00000000..600ca0ad --- /dev/null +++ b/ReallifeGamemode.Client/util/carwash.ts @@ -0,0 +1,16 @@ +export default function Carwash(globalData: IGlobalData) { + + mp.events.add('washcar', () => { + let vehicle = mp.players.local.vehicle; + + vehicle.setDirtLevel(0); + }); + + mp.events.add('entityStreamIn', (entity) => { + if (entity.type !== 'vehicle' || !entity.hasVariable('dirtLevel')) { + return; + } + const dirtLevel = entity.getVariable('dirtLevel') || 0; + entity.setDirtLevel(parseFloat(dirtLevel)); + }); +} \ No newline at end of file diff --git a/ReallifeGamemode.Server/Commands/AdminCommands.cs b/ReallifeGamemode.Server/Commands/AdminCommands.cs index 916f4293..d2a3d842 100644 --- a/ReallifeGamemode.Server/Commands/AdminCommands.cs +++ b/ReallifeGamemode.Server/Commands/AdminCommands.cs @@ -4025,6 +4025,12 @@ namespace ReallifeGamemode.Server.Commands } } + [Command("washcar", "~m~Benutzung: ~s~/washcar")] + public void washcar(Player player) + { + player.TriggerEvent("washcar"); + } + [Command("makeadmin", "~m~Benutzung: ~s~/makeadmin [Name] [Adminlevel]")] public void CmdAdminMakeadmin(Player player, string name, int rank) { diff --git a/ReallifeGamemode.Server/Managers/PositionManager.cs b/ReallifeGamemode.Server/Managers/PositionManager.cs index 51ee78d2..daf97ffe 100644 --- a/ReallifeGamemode.Server/Managers/PositionManager.cs +++ b/ReallifeGamemode.Server/Managers/PositionManager.cs @@ -7,6 +7,9 @@ using ReallifeGamemode.Server.Shop.Friseur; using ReallifeGamemode.Server.Util; using ReallifeGamemode.Server.Extensions; using ReallifeGamemode.Server.Shop.Ammunation; +using ReallifeGamemode.Database.Entities; +using ReallifeGamemode.Database.Models; + namespace ReallifeGamemode.Server.Managers { @@ -34,6 +37,9 @@ namespace ReallifeGamemode.Server.Managers public static List rentcarPoints = new List(); + public static List carwashPoints = new List(); + + public static Vector3 eventportPosition; public static bool eventportActive = false; @@ -347,9 +353,55 @@ namespace ReallifeGamemode.Server.Managers NAPI.Blip.CreateBlip(88, new Vector3(point.Position.X, point.Position.Y, point.Position.Z), (float)0.7, 59, "Fahrzeugverleih", 255, 200, true, 0, 0); } + + #endregion RentCar + + #region Carwash + + CarwashPoint Carwash = new CarwashPoint() + { + Position = new Vector3(26.37, -1391.99, 29.36) + }; + + CarwashPoint Carwash2 = new CarwashPoint() + { + Position = new Vector3(111, 111, 29.32) + }; + + carwashPoints.Add(Carwash); + carwashPoints.Add(Carwash2); + + foreach (CarwashPoint point in carwashPoints) + { + + NAPI.Marker.CreateMarker(1, new Vector3(point.Position.X, point.Position.Y, point.Position.Z - 2), new Vector3(point.Position.X, point.Position.Y, point.Position.Z + 1), + new Vector3(0, 0, 0), 5.5f, new Color(255, 255, 255, 50), false, 0); + NAPI.TextLabel.CreateTextLabel("~y~Autowaschanlage", point.Position, 7, 1, 0, new Color(255, 255, 255), false, 0); + NAPI.Blip.CreateBlip(100, new Vector3(point.Position.X, point.Position.Y, point.Position.Z), (float)0.7, 0, "´Carwash", 255, 200, true, 0, 0); + + Vector3 pos = point.Position; + ColShape colShape = NAPI.ColShape.CreateSphereColShape(pos, 5, 0); + + colShape.OnEntityEnterColShape += (cs, c) => + { + if (!c.IsInVehicle) return; + + c.TriggerEvent("washcar"); + using (var dbcontext = new DatabaseContext()) + { + User u = c.GetUser(dbcontext); + u.BankAccount.Balance -= 100; + dbcontext.SaveChanges(); + } + c.SendNotification("Die Autowäsche hat dich ~g~$~w~100 gekostet."); + }; + } + + #endregion Carwash + } - #endregion RentCar + [RemoteEvent("sendClientToStage")] public void ElevatorSendToStage(Player player, string level) { @@ -486,3 +538,8 @@ public class RentcarPoint public Vector3 Position { get; set; } } +public class CarwashPoint +{ + public Vector3 Position { get; set; } +} + From c476694c3202d95da4829242413e4c61ed632855 Mon Sep 17 00:00:00 2001 From: "michael.reiswich" Date: Mon, 10 May 2021 18:31:19 +0200 Subject: [PATCH 03/82] forget to take this shit out --- ReallifeGamemode.Server/Managers/PositionManager.cs | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ReallifeGamemode.Server/Managers/PositionManager.cs b/ReallifeGamemode.Server/Managers/PositionManager.cs index daf97ffe..bd7f824a 100644 --- a/ReallifeGamemode.Server/Managers/PositionManager.cs +++ b/ReallifeGamemode.Server/Managers/PositionManager.cs @@ -363,13 +363,7 @@ namespace ReallifeGamemode.Server.Managers Position = new Vector3(26.37, -1391.99, 29.36) }; - CarwashPoint Carwash2 = new CarwashPoint() - { - Position = new Vector3(111, 111, 29.32) - }; - carwashPoints.Add(Carwash); - carwashPoints.Add(Carwash2); foreach (CarwashPoint point in carwashPoints) { From 47180f6e3367b8861060412f9a88787a09a7a8df Mon Sep 17 00:00:00 2001 From: Luke Date: Tue, 11 May 2021 01:14:23 +0200 Subject: [PATCH 04/82] zeit zum abtauchen auf 2,4 sekunden runtergeschraubt --- ReallifeGamemode.Client/Gui/blips.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReallifeGamemode.Client/Gui/blips.ts b/ReallifeGamemode.Client/Gui/blips.ts index a648181b..9350fe60 100644 --- a/ReallifeGamemode.Client/Gui/blips.ts +++ b/ReallifeGamemode.Client/Gui/blips.ts @@ -72,7 +72,7 @@ export default function playerBlips() { } mp.events.callRemote("CLIENT:EscapeWanted"); - }, 300000); //120000 -> 2 min , 300000 -> 5min + }, 2.4 * 60 * 1000); // 2.4 Minuten } }, 50); From 1bc8051d0d7cc84326ef62c548a36b351852afd5 Mon Sep 17 00:00:00 2001 From: "michael.reiswich" Date: Tue, 11 May 2021 11:13:39 +0200 Subject: [PATCH 05/82] testings --- ReallifeGamemode.Client/util/carwash.ts | 14 +++++++++++--- .../Commands/AdminCommands.cs | 7 ++++++- .../Managers/PositionManager.cs | 18 +++++++++++++----- 3 files changed, 30 insertions(+), 9 deletions(-) diff --git a/ReallifeGamemode.Client/util/carwash.ts b/ReallifeGamemode.Client/util/carwash.ts index 600ca0ad..914a2696 100644 --- a/ReallifeGamemode.Client/util/carwash.ts +++ b/ReallifeGamemode.Client/util/carwash.ts @@ -7,10 +7,18 @@ }); mp.events.add('entityStreamIn', (entity) => { - if (entity.type !== 'vehicle' || !entity.hasVariable('dirtLevel')) { + if (entity.type !== 'vehicle') { return; } - const dirtLevel = entity.getVariable('dirtLevel') || 0; - entity.setDirtLevel(parseFloat(dirtLevel)); + const dirtLevel = entity.vehicle.getDirtLevel(); + entity.setDirtLevel(dirtLevel); + }); + + mp.events.add('getdirtlevel', () => { + let vehicle = mp.players.local.vehicle; + + let num = vehicle.getDirtLevel(); + + mp.gui.chat.push("Dirtlevel = " + num); }); } \ No newline at end of file diff --git a/ReallifeGamemode.Server/Commands/AdminCommands.cs b/ReallifeGamemode.Server/Commands/AdminCommands.cs index d2a3d842..fffaa442 100644 --- a/ReallifeGamemode.Server/Commands/AdminCommands.cs +++ b/ReallifeGamemode.Server/Commands/AdminCommands.cs @@ -4024,13 +4024,18 @@ namespace ReallifeGamemode.Server.Commands ChatService.BroadcastAdmin("~b~[ADMIN]~s~ " + player.Name + " hat " + target.Name + " den Blackscreen entfernt. ", AdminLevel.ADMIN); } } - [Command("washcar", "~m~Benutzung: ~s~/washcar")] public void washcar(Player player) { player.TriggerEvent("washcar"); } + [Command("getdirtlevel", "~m~Benutzung: ~s~/getdirtlevel")] + public void dirtlevel(Player player) + { + player.TriggerEvent("getdirtlevel"); + } + [Command("makeadmin", "~m~Benutzung: ~s~/makeadmin [Name] [Adminlevel]")] public void CmdAdminMakeadmin(Player player, string name, int rank) { diff --git a/ReallifeGamemode.Server/Managers/PositionManager.cs b/ReallifeGamemode.Server/Managers/PositionManager.cs index bd7f824a..3725a372 100644 --- a/ReallifeGamemode.Server/Managers/PositionManager.cs +++ b/ReallifeGamemode.Server/Managers/PositionManager.cs @@ -378,16 +378,24 @@ namespace ReallifeGamemode.Server.Managers colShape.OnEntityEnterColShape += (cs, c) => { - if (!c.IsInVehicle) return; + if (!(c.IsInVehicle && c.VehicleSeat == 0)) return; - c.TriggerEvent("washcar"); + using (var dbcontext = new DatabaseContext()) { User u = c.GetUser(dbcontext); - u.BankAccount.Balance -= 100; - dbcontext.SaveChanges(); + if(u.Handmoney <= 0) + { + c.SendNotification("Du hast nicht genug Geld auf der Hand!"); + return; + } + else { + c.TriggerEvent("washcar"); + c.SendNotification("Die Autowäsche hat dich ~g~$~w~100 gekostet."); + u.Handmoney -= 100; + dbcontext.SaveChanges(); + } } - c.SendNotification("Die Autowäsche hat dich ~g~$~w~100 gekostet."); }; } From a489b0abe9978dde0c8050fa5f36b0d6f5dd3d6f Mon Sep 17 00:00:00 2001 From: "michael.reiswich" Date: Tue, 11 May 2021 11:18:38 +0200 Subject: [PATCH 06/82] testings2 --- ReallifeGamemode.Client/util/carwash.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ReallifeGamemode.Client/util/carwash.ts b/ReallifeGamemode.Client/util/carwash.ts index 914a2696..9ff1f3d1 100644 --- a/ReallifeGamemode.Client/util/carwash.ts +++ b/ReallifeGamemode.Client/util/carwash.ts @@ -10,7 +10,9 @@ if (entity.type !== 'vehicle') { return; } - const dirtLevel = entity.vehicle.getDirtLevel(); + let vehicle = mp.players.local.vehicle; + + const dirtLevel = vehicle.getDirtLevel(); entity.setDirtLevel(dirtLevel); }); From efc4a7e991548138ec4342aa629be1cc8ff70c69 Mon Sep 17 00:00:00 2001 From: "michael.reiswich" Date: Tue, 11 May 2021 11:34:23 +0200 Subject: [PATCH 07/82] testings3 --- ReallifeGamemode.Client/util/carwash.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ReallifeGamemode.Client/util/carwash.ts b/ReallifeGamemode.Client/util/carwash.ts index 9ff1f3d1..ac5043da 100644 --- a/ReallifeGamemode.Client/util/carwash.ts +++ b/ReallifeGamemode.Client/util/carwash.ts @@ -10,10 +10,11 @@ if (entity.type !== 'vehicle') { return; } - let vehicle = mp.players.local.vehicle; + var vehicle: VehicleMp = entity as VehicleMp; + vehicle.getDirtLevel(); - const dirtLevel = vehicle.getDirtLevel(); - entity.setDirtLevel(dirtLevel); + let dirtLevel = vehicle.getDirtLevel(); + entity.setDirtLevel(dirtLevel); }); mp.events.add('getdirtlevel', () => { From 0aa1e4d49b7a4a5c9822a72b40dcf69df7c094f7 Mon Sep 17 00:00:00 2001 From: "michael.reiswich" Date: Thu, 13 May 2021 00:33:10 +0200 Subject: [PATCH 08/82] save car at position --- .../Commands/AdminCommands.cs | 4 ++-- ReallifeGamemode.Server/Events/ExitVehicle.cs | 23 ++++++++++++++++++- .../Managers/PositionManager.cs | 2 +- 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/ReallifeGamemode.Server/Commands/AdminCommands.cs b/ReallifeGamemode.Server/Commands/AdminCommands.cs index fffaa442..0c61a0bb 100644 --- a/ReallifeGamemode.Server/Commands/AdminCommands.cs +++ b/ReallifeGamemode.Server/Commands/AdminCommands.cs @@ -4024,7 +4024,7 @@ namespace ReallifeGamemode.Server.Commands ChatService.BroadcastAdmin("~b~[ADMIN]~s~ " + player.Name + " hat " + target.Name + " den Blackscreen entfernt. ", AdminLevel.ADMIN); } } - [Command("washcar", "~m~Benutzung: ~s~/washcar")] + /*[Command("washcar", "~m~Benutzung: ~s~/washcar")] public void washcar(Player player) { player.TriggerEvent("washcar"); @@ -4035,7 +4035,7 @@ namespace ReallifeGamemode.Server.Commands { player.TriggerEvent("getdirtlevel"); } - + */ [Command("makeadmin", "~m~Benutzung: ~s~/makeadmin [Name] [Adminlevel]")] public void CmdAdminMakeadmin(Player player, string name, int rank) { diff --git a/ReallifeGamemode.Server/Events/ExitVehicle.cs b/ReallifeGamemode.Server/Events/ExitVehicle.cs index 255b4a5c..de493cbe 100644 --- a/ReallifeGamemode.Server/Events/ExitVehicle.cs +++ b/ReallifeGamemode.Server/Events/ExitVehicle.cs @@ -9,6 +9,7 @@ using ReallifeGamemode.Server.Managers; using ReallifeGamemode.Server.Services; using ReallifeGamemode.Server.Util; using ReallifeGamemode.Server.WeaponDeal; +using ReallifeGamemode.Database.Models; namespace ReallifeGamemode.Server.Events { @@ -65,7 +66,27 @@ namespace ReallifeGamemode.Server.Events //LastVehicle = vehicle; //timerNoobRollerRespawn.Elapsed += async (sender, e) => {await } - } + + using (var dbContext = new DatabaseContext()) + { + ServerVehicle sV = vehicle.GetServerVehicle(dbContext); + + if (sV is UserVehicle) + { + Vector3 pos = vehicle.Position; + + sV.PositionX = pos.X; + sV.PositionY = pos.Y; + sV.PositionZ = pos.Z; + sV.Heading = vehicle.Heading; + + dbContext.SaveChanges(); + } + } + + + + } private static void Timer600000_Elapsed(object sender, ElapsedEventArgs e) { //ExitVehicle c = new ExitVehicle(); diff --git a/ReallifeGamemode.Server/Managers/PositionManager.cs b/ReallifeGamemode.Server/Managers/PositionManager.cs index 3725a372..d07d9e46 100644 --- a/ReallifeGamemode.Server/Managers/PositionManager.cs +++ b/ReallifeGamemode.Server/Managers/PositionManager.cs @@ -384,7 +384,7 @@ namespace ReallifeGamemode.Server.Managers using (var dbcontext = new DatabaseContext()) { User u = c.GetUser(dbcontext); - if(u.Handmoney <= 0) + if(u.Handmoney < 0) { c.SendNotification("Du hast nicht genug Geld auf der Hand!"); return; From 845523aa7ccc2da53d2b824807b14cac137d5876 Mon Sep 17 00:00:00 2001 From: "michael.reiswich" Date: Thu, 13 May 2021 01:41:09 +0200 Subject: [PATCH 09/82] add auch beim ausslogen position speichern --- ReallifeGamemode.Server/Events/Disconnect.cs | 23 ++++++++++++++++++-- ReallifeGamemode.Server/Events/Vehicle.cs | 1 + 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/ReallifeGamemode.Server/Events/Disconnect.cs b/ReallifeGamemode.Server/Events/Disconnect.cs index e4708593..ca1ba2ab 100644 --- a/ReallifeGamemode.Server/Events/Disconnect.cs +++ b/ReallifeGamemode.Server/Events/Disconnect.cs @@ -195,11 +195,30 @@ namespace ReallifeGamemode.Server.Events user.PositionX = pos.X; user.PositionY = pos.Y; - user.PositionZ = pos.Z; + user.PositionZ = pos.Z; saveUser.SaveChanges(); user.Dead = player.HasData("isDead") ? (bool)player.GetData("isDead") : false; - if (user.Wanteds > 0) + if (player.IsInVehicle) + { + GTANetworkAPI.Vehicle vehicle = player.Vehicle; + + ServerVehicle sV = vehicle.GetServerVehicle(saveUser); + + if (sV is UserVehicle) + { + Vector3 pos1 = vehicle.Position; + + sV.PositionX = pos1.X; + sV.PositionY = pos1.Y; + sV.PositionZ = pos1.Z; + sV.Heading = vehicle.Heading; + + saveUser.SaveChanges(); + } + + } + if (user.Wanteds > 0) { ChatService.HQMessage("Der Straftäter " + user.Name + " ist vom Radar verschwunden"); } diff --git a/ReallifeGamemode.Server/Events/Vehicle.cs b/ReallifeGamemode.Server/Events/Vehicle.cs index 2bb8c2ae..b35b9dd3 100644 --- a/ReallifeGamemode.Server/Events/Vehicle.cs +++ b/ReallifeGamemode.Server/Events/Vehicle.cs @@ -281,6 +281,7 @@ namespace ReallifeGamemode.Server.Events sV.PositionZ = pos.Z; sV.Heading = v.Heading; + player.SendNotification("~g~Das Fahrzeug wurde geparkt."); dbContext.SaveChanges(); From df5a97cc43f834915974e9e873f6b85dd4c50048 Mon Sep 17 00:00:00 2001 From: Luke Date: Thu, 13 May 2021 05:52:27 +0200 Subject: [PATCH 10/82] wie parke ich jetzt mein fahrzeug?? --- ReallifeGamemode.Client/Gui/vehiclemenu/main.ts | 5 +---- .../assets/html/interaction/index.html | 6 ------ .../assets/img/interaction/parking.png | Bin 524 -> 0 bytes 3 files changed, 1 insertion(+), 10 deletions(-) delete mode 100644 ReallifeGamemode.Client/assets/img/interaction/parking.png diff --git a/ReallifeGamemode.Client/Gui/vehiclemenu/main.ts b/ReallifeGamemode.Client/Gui/vehiclemenu/main.ts index 686d604f..a599b7f2 100644 --- a/ReallifeGamemode.Client/Gui/vehiclemenu/main.ts +++ b/ReallifeGamemode.Client/Gui/vehiclemenu/main.ts @@ -80,10 +80,7 @@ export default function vehicleMenu(globalData: IGlobalData) { break; case 4: // Fahrzeug tanken break; - case 5: // Fahrzeug parken - mp.events.callRemote("CLIENT:VehicleMenu_ParkCar"); - break; - case 6: // Türen öffnen/schließen + case 5: // Türen öffnen/schließen showDoorsMenu(); break; } diff --git a/ReallifeGamemode.Client/assets/html/interaction/index.html b/ReallifeGamemode.Client/assets/html/interaction/index.html index 49d1a41e..69687a19 100644 --- a/ReallifeGamemode.Client/assets/html/interaction/index.html +++ b/ReallifeGamemode.Client/assets/html/interaction/index.html @@ -39,12 +39,6 @@ -->
  • -
    - - Fahrzeug
    parken     -
    -
    • -
  • Türen
    öffnen/schließen     diff --git a/ReallifeGamemode.Client/assets/img/interaction/parking.png b/ReallifeGamemode.Client/assets/img/interaction/parking.png deleted file mode 100644 index bdc5645a11767b3c3135fcb57fc4bcd15c06ccc6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 524 zcmV+n0`vWeP)UwT0S(XrOL7eI=5#4U7UqG)@i!`ha)f4Y&r*fgLkD_oeG9=m$mT z|G};#=LuI-KePc!I+m2Xg`3s)c8q3-tO0kx2QUFF@Vl=pn%Slg{mcYqRv;rjBIz+T z?WC-Juv5s)?tqQdpPGDz2AeDZiN1L%?r3z;HZK^TIDb= z;JVC>182ZM6%`fW8JID%>#Shz3YggyFa_+=*iNBIfPEarM Date: Thu, 13 May 2021 22:41:47 +0200 Subject: [PATCH 11/82] fix managefactionranks --- ReallifeGamemode.Client/FactionManagement/main.ts | 3 ++- .../assets/html/factionmanagement/ranks/index.html | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ReallifeGamemode.Client/FactionManagement/main.ts b/ReallifeGamemode.Client/FactionManagement/main.ts index b9ae499a..fc53aee7 100644 --- a/ReallifeGamemode.Client/FactionManagement/main.ts +++ b/ReallifeGamemode.Client/FactionManagement/main.ts @@ -12,7 +12,6 @@ export default function factionManagement() { mp.events.add('manageFactionRanks', (ranks) => { if (manageFactionRanksBrowser !== null) return; manageFactionRanksBrowser = mp.browsers.new('package://assets/html/factionmanagement/ranks/index.html'); - mp.gui.chat.activate(false); rankData = JSON.parse(ranks); }); @@ -22,6 +21,7 @@ export default function factionManagement() { manageFactionRanksBrowser.execute(`setFactionName('${rankData.FactionName}')`); manageFactionRanksBrowser.execute(`loadData(` + JSON.stringify(rankData.Ranks) + `)`); mp.gui.cursor.show(true, true); + this.data.InMenu = true; } }); @@ -30,6 +30,7 @@ export default function factionManagement() { manageFactionRanksBrowser.destroy(); mp.gui.cursor.show(false, false); mp.gui.chat.activate(true); + this.data.InMenu = false; var obj: FactionRanks = { factionId: rankData.FactionId, diff --git a/ReallifeGamemode.Client/assets/html/factionmanagement/ranks/index.html b/ReallifeGamemode.Client/assets/html/factionmanagement/ranks/index.html index 7561a03f..f8cfa5ec 100644 --- a/ReallifeGamemode.Client/assets/html/factionmanagement/ranks/index.html +++ b/ReallifeGamemode.Client/assets/html/factionmanagement/ranks/index.html @@ -6,14 +6,16 @@ + - + +
    -

    : Ränge bearbeiten

    +

    {{ name }}: Ränge bearbeiten

    @@ -27,4 +29,5 @@ + \ No newline at end of file From e243ffcb73e55a57689c1984a58e461f2efce2a4 Mon Sep 17 00:00:00 2001 From: Luke Date: Fri, 14 May 2021 00:25:44 +0200 Subject: [PATCH 12/82] wt nachrichten angepasst --- ReallifeGamemode.Server/Events/Key.cs | 2 +- .../WeaponDeal/WeaponDealManager.cs | 27 ++++--------------- 2 files changed, 6 insertions(+), 23 deletions(-) diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs index 45a00fcf..e7312df1 100644 --- a/ReallifeGamemode.Server/Events/Key.cs +++ b/ReallifeGamemode.Server/Events/Key.cs @@ -393,7 +393,7 @@ namespace ReallifeGamemode.Server.Events } weapon.Ammount += item.Amount; - ChatService.SendMessage(player, item.Amount + " " + iItem.Name + " wurden im Waffenlager hinzugefügt."); + ChatService.SendMessage(player, $"~y~[WT] ~s~Du hast eine ~y~Kiste abgeladen ~s~(Inhalt: {item.Amount}x {iItem.Name})."); unloadedWeaponPackage = true; context.Remove(item); } diff --git a/ReallifeGamemode.Server/WeaponDeal/WeaponDealManager.cs b/ReallifeGamemode.Server/WeaponDeal/WeaponDealManager.cs index fe7af038..2d430b6a 100644 --- a/ReallifeGamemode.Server/WeaponDeal/WeaponDealManager.cs +++ b/ReallifeGamemode.Server/WeaponDeal/WeaponDealManager.cs @@ -122,35 +122,18 @@ namespace ReallifeGamemode.Server.WeaponDeal msg = "Die Waffenlieferung steht zur Abholung bereit"; } - ChatService.BroadcastFaction($"~y~[WAFFENDEAL]~s~ {msg}.", user.Faction); + ChatService.BroadcastFaction($"~y~[WT]~s~ {msg}.", user.Faction); - ChatService.SendMessage(client, "~y~[WAFFENDEAL]~s~ Steige in den ~y~Transporter ~s~ein und fahre zum Übergabepunkt."); + ChatService.SendMessage(client, "~y~[WT]~s~ Steig in den ~y~Transporter ~s~ein und fahre zum Übergabepunkt."); fVeh.SetData("weaponDeal", true); InventoryManager.RemoveAllItemsfromVehicleInventory(fVeh); Faction fac = context.Factions.Where(f => f.Id == user.FactionId).FirstOrDefault(); - if (fac.Id == 1 | fac.Id == 3) - { - fac.WeaponDealTime = 180; + fac.WeaponDealTime = (fac.Id == 1 | fac.Id == 3) ? 180 : 60; context.SaveChanges(); - } - else - { - fac.WeaponDealTime = 60; - context.SaveChanges(); - } } } - /* - public static void WeaponDealTimer() - { - System.Timers.Timer timer = new System.Timers.Timer(60000); - timer.Start(); - timer.Elapsed += Timer_Elapsed; - } - */ - public static void Timer_Elapsed() { using (var context = new DatabaseContext()) @@ -254,8 +237,8 @@ namespace ReallifeGamemode.Server.WeaponDeal InventoryManager.AddItemToVehicleInventory(fVeh, item7.ItemId, item7.Amount); } - ChatService.BroadcastFaction("~y~[WAFFENDEAL] ~w~Der Transporter wurde erfolgreich beladen.", new List() { client.GetUser().Faction.Id }); - client.SendChatMessage("~y~[WAFFENDEAL] ~w~Fahre nun zu deiner Base zurück."); + ChatService.BroadcastFaction("~y~[WT] ~w~Der Transporter wurde erfolgreich beladen.", new List() { client.GetUser().Faction.Id }); + client.SendChatMessage("~y~[WT] ~w~Fahre nun zu deiner Base zurück."); BasePoints basePoints = new BasePoints(); basePoints.getbase(user.FactionId, client); } From 458880579b66ede41808b0713470dfd3ab3caba5 Mon Sep 17 00:00:00 2001 From: Luke Date: Fri, 14 May 2021 00:25:58 +0200 Subject: [PATCH 13/82] Revert "wie parke ich jetzt mein fahrzeug??" This reverts commit df5a97cc43f834915974e9e873f6b85dd4c50048. --- ReallifeGamemode.Client/Gui/vehiclemenu/main.ts | 5 ++++- .../assets/html/interaction/index.html | 6 ++++++ .../assets/img/interaction/parking.png | Bin 0 -> 524 bytes 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 ReallifeGamemode.Client/assets/img/interaction/parking.png diff --git a/ReallifeGamemode.Client/Gui/vehiclemenu/main.ts b/ReallifeGamemode.Client/Gui/vehiclemenu/main.ts index a599b7f2..686d604f 100644 --- a/ReallifeGamemode.Client/Gui/vehiclemenu/main.ts +++ b/ReallifeGamemode.Client/Gui/vehiclemenu/main.ts @@ -80,7 +80,10 @@ export default function vehicleMenu(globalData: IGlobalData) { break; case 4: // Fahrzeug tanken break; - case 5: // Türen öffnen/schließen + case 5: // Fahrzeug parken + mp.events.callRemote("CLIENT:VehicleMenu_ParkCar"); + break; + case 6: // Türen öffnen/schließen showDoorsMenu(); break; } diff --git a/ReallifeGamemode.Client/assets/html/interaction/index.html b/ReallifeGamemode.Client/assets/html/interaction/index.html index 69687a19..49d1a41e 100644 --- a/ReallifeGamemode.Client/assets/html/interaction/index.html +++ b/ReallifeGamemode.Client/assets/html/interaction/index.html @@ -39,6 +39,12 @@
    • -->
  • +
    + + Fahrzeug
    parken     +
    +
    • +
  • Türen
    öffnen/schließen     diff --git a/ReallifeGamemode.Client/assets/img/interaction/parking.png b/ReallifeGamemode.Client/assets/img/interaction/parking.png new file mode 100644 index 0000000000000000000000000000000000000000..bdc5645a11767b3c3135fcb57fc4bcd15c06ccc6 GIT binary patch literal 524 zcmV+n0`vWeP)UwT0S(XrOL7eI=5#4U7UqG)@i!`ha)f4Y&r*fgLkD_oeG9=m$mT z|G};#=LuI-KePc!I+m2Xg`3s)c8q3-tO0kx2QUFF@Vl=pn%Slg{mcYqRv;rjBIz+T z?WC-Juv5s)?tqQdpPGDz2AeDZiN1L%?r3z;HZK^TIDb= z;JVC>182ZM6%`fW8JID%>#Shz3YggyFa_+=*iNBIfPEarM Date: Fri, 14 May 2021 00:33:20 +0200 Subject: [PATCH 14/82] duty notification angepasst --- ReallifeGamemode.Server/Events/Key.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs index e7312df1..6be91059 100644 --- a/ReallifeGamemode.Server/Events/Key.cs +++ b/ReallifeGamemode.Server/Events/Key.cs @@ -306,7 +306,7 @@ namespace ReallifeGamemode.Server.Events if (user.GetData("duty") == false) { user.SetData("duty", true); - player.SendNotification("Du bist nun ~g~im Dienst."); + player.SendNotification("Du bist nun ~g~im Dienst"); player.TriggerEvent("toggleDutyMode", true); player.TriggerEvent("abortSpawnschutz"); if (user.FactionId == 2) //Fire Department @@ -347,7 +347,7 @@ namespace ReallifeGamemode.Server.Events else { user.SetData("duty", false); - player.SendNotification("Du bist nun ~r~außer Dienst."); + player.SendNotification("Du bist nun ~r~nicht mehr im Dienst"); player.TriggerEvent("toggleDutyMode", false); Medic.UpdateDutyMedics(); UpdateCharacterCloth.LoadCharacterDefaults(player); From 70a6b35d42f1a645565986bf3eb19334d441c7c8 Mon Sep 17 00:00:00 2001 From: Luke Date: Fri, 14 May 2021 00:53:46 +0200 Subject: [PATCH 15/82] mfr wurde jetzt wirklich gefixt --- .../assets/html/factionmanagement/ranks/index.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ReallifeGamemode.Client/assets/html/factionmanagement/ranks/index.html b/ReallifeGamemode.Client/assets/html/factionmanagement/ranks/index.html index f8cfa5ec..5d04d846 100644 --- a/ReallifeGamemode.Client/assets/html/factionmanagement/ranks/index.html +++ b/ReallifeGamemode.Client/assets/html/factionmanagement/ranks/index.html @@ -24,10 +24,10 @@
    - - - - + + + + \ No newline at end of file From 706bacde1cd1f1f3d6a8b9412fbd1cfaa18af60a Mon Sep 17 00:00:00 2001 From: Luke Date: Fri, 14 May 2021 01:01:56 +0200 Subject: [PATCH 16/82] mfr: this.data.InMenu gibt error, deswegen wieder raus sorry @airmake --- ReallifeGamemode.Client/inputhelper/index.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ReallifeGamemode.Client/inputhelper/index.ts b/ReallifeGamemode.Client/inputhelper/index.ts index 62e509ae..6297caab 100644 --- a/ReallifeGamemode.Client/inputhelper/index.ts +++ b/ReallifeGamemode.Client/inputhelper/index.ts @@ -29,8 +29,7 @@ export default class InputHelper { } show() { - if (this.created) return; - this.data.InMenu = true; + if (this.created) return; this.created = true; this.browser = mp.browsers.new('package://assets/html/inputhelper/index.html'); mp.gui.cursor.show(true, true); @@ -44,11 +43,9 @@ export default class InputHelper { mp.events.remove('cef_request_title'); mp.events.remove('closeinputhelper'); this.browser.destroy(); - this.data.InMenu = false; this.created = false; this.browser = null; mp.gui.cursor.show(false, false); - } } From 3c2d56f2ad21ac99185f2f2c95ce30b8f1666bec Mon Sep 17 00:00:00 2001 From: hydrant Date: Sat, 15 May 2021 00:58:14 +0200 Subject: [PATCH 17/82] =?UTF-8?q?M-Men=C3=BC=20fix=20wenn=20zivilist?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ReallifeGamemode.Server/Events/Key.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs index 6be91059..15af42c2 100644 --- a/ReallifeGamemode.Server/Events/Key.cs +++ b/ReallifeGamemode.Server/Events/Key.cs @@ -171,7 +171,7 @@ namespace ReallifeGamemode.Server.Events isActive = JobBase.GetPlayerInJob().Contains(player), }; - var memberList = dbContext.Users.Where(f => f.FactionId == u.FactionId && u.FactionId != 0).OrderByDescending(f => f.FactionRank.Order).ThenBy(f => f.Name).Select(m => new + var memberList = dbContext.Users.Where(f => f.FactionId == u.FactionId && u.FactionId != null && u.FactionId != 0).OrderByDescending(f => f.FactionRank.Order).ThenBy(f => f.Name).Select(m => new { username = m.Name, factionRank = m.FactionRank.Order, From a2db770316a6f76a660ba20825773675f3109f81 Mon Sep 17 00:00:00 2001 From: hydrant Date: Sat, 15 May 2021 03:14:37 +0200 Subject: [PATCH 18/82] GELD LOGS --- .../Managers/HouseManager.cs | 3 + .../Menus/PoliceDepartment.cs | 9 +- ReallifeGamemode.Server/Bank/bank.cs | 70 ++-- .../Commands/AdminCommands.cs | 4 + .../Commands/FactionCommands.cs | 14 +- .../Commands/UserCommands.cs | 12 +- .../DrivingSchool/DrivingSchool.cs | 81 ++-- .../DrivingSchool/PlaneSchool.cs | 13 +- .../Events/UpdateCharacterCloth.cs | 12 +- ReallifeGamemode.Server/Events/Weapon.cs | 2 +- .../Extensions/ClientExtension.cs | 6 + .../Factions/Medic/Medic.cs | 34 +- ReallifeGamemode.Server/Finance/Economy.cs | 9 +- ReallifeGamemode.Server/Gangwar/Turf.cs | 10 +- ReallifeGamemode.Server/Main.cs | 390 +++++++++--------- .../Managers/ATMManager.cs | 12 +- .../Managers/CharacterCreator.cs | 5 + .../Managers/CityHallManager.cs | 10 +- .../Managers/InteractionManager.cs | 24 +- .../Managers/InventoryManager.cs | 19 +- .../Managers/TuningManager.cs | 7 +- ReallifeGamemode.Server/Util/Rentcar.cs | 8 +- 22 files changed, 448 insertions(+), 306 deletions(-) diff --git a/ReallifeGamemode.Server.Core/Managers/HouseManager.cs b/ReallifeGamemode.Server.Core/Managers/HouseManager.cs index aaf43688..0ccca564 100644 --- a/ReallifeGamemode.Server.Core/Managers/HouseManager.cs +++ b/ReallifeGamemode.Server.Core/Managers/HouseManager.cs @@ -10,6 +10,7 @@ using ReallifeGamemode.Server.Core.Extensions; using System.Linq; using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Common; +using Microsoft.Extensions.Logging; namespace ReallifeGamemode.Server.Core.Managers { @@ -451,6 +452,8 @@ namespace ReallifeGamemode.Server.Core.Managers return; } + Log.LogInformation("Player {0} did a withdraw of {1} dollars from house {2}", player.Name, amount, house.Id); + user.BankAccount.Balance += amount; house.BankAccount.Balance -= amount; diff --git a/ReallifeGamemode.Server.Core/Menus/PoliceDepartment.cs b/ReallifeGamemode.Server.Core/Menus/PoliceDepartment.cs index f4e9c3ef..67021b46 100644 --- a/ReallifeGamemode.Server.Core/Menus/PoliceDepartment.cs +++ b/ReallifeGamemode.Server.Core/Menus/PoliceDepartment.cs @@ -6,12 +6,13 @@ using ReallifeGamemode.Server.Types; using ReallifeGamemode.Server.Core.Extensions; using Microsoft.EntityFrameworkCore; using System.Linq; +using Microsoft.Extensions.Logging; namespace ReallifeGamemode.Server.Core.Menus { internal class PoliceDepartment : Script { - + private const int WEAPONLICENSE_PRICE = 5000; public PoliceDepartment() { @@ -40,13 +41,15 @@ namespace ReallifeGamemode.Server.Core.Menus var account = user.BankAccount; - if (account.Balance < 5000) + if (account.Balance < WEAPONLICENSE_PRICE) { player.SendMessage("Du hast nicht genug Geld auf der Bank (5.000$)!", ChatPrefix.Error); return; } - account.Balance -= 5000; + Log.LogInformation("Player {0} bought a weapon license for {1} dollars", player.Name); + + account.Balance -= WEAPONLICENSE_PRICE; player.SendMessage("Du hast den Waffenschein erfolgreich erworben.", ChatPrefix.Info); diff --git a/ReallifeGamemode.Server/Bank/bank.cs b/ReallifeGamemode.Server/Bank/bank.cs index a17e81c6..b074d0a9 100644 --- a/ReallifeGamemode.Server/Bank/bank.cs +++ b/ReallifeGamemode.Server/Bank/bank.cs @@ -4,18 +4,20 @@ * @copyright (c) 2008 - 2021 Life of German */ using GTANetworkAPI; +using Microsoft.Extensions.Logging; using Newtonsoft.Json; using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Extensions; using ReallifeGamemode.Server.Finance; +using ReallifeGamemode.Server.Log; using ReallifeGamemode.Services; using System; namespace ReallifeGamemode.Server.Bank { - class bank : Script + class Bank : Script { private static TextLabel informationLabel; private static TextLabel factionInformationLabel; @@ -25,6 +27,7 @@ namespace ReallifeGamemode.Server.Bank private static ColShape _factioncolShape; public static Vector3 Position { get; } + private static readonly ILogger logger = LogManager.GetLogger(); public static void Setup() { @@ -58,7 +61,7 @@ namespace ReallifeGamemode.Server.Bank } private static void EntityEnterFactionBankColShape(ColShape colShape, Player client) - { + { if (client.IsInVehicle || !client.IsLoggedIn() || client.GetUser().FactionId is null) return; User user = client.GetUser(); @@ -92,6 +95,7 @@ namespace ReallifeGamemode.Server.Bank } else { + logger.LogInformation("Player {0} did a deposit of {1} dollars at the bank", player.Name, amount); player.SendNotification($"~w~Du hast $~g~{amount} ~w~eingezahlt."); player.GetUser(dbContext).Handmoney -= amount; player.GetUser(dbContext).BankAccount.Balance += amount; @@ -115,6 +119,7 @@ namespace ReallifeGamemode.Server.Bank } else { + logger.LogInformation("Player {0} did a withdraw of {1} dollars at the bank", player.Name, amount); player.SendNotification($"~w~Du hast $~g~{amount} ~w~abgehoben."); player.GetUser(dbContext).Handmoney += amount; player.GetUser(dbContext).BankAccount.Balance -= amount; @@ -130,34 +135,40 @@ namespace ReallifeGamemode.Server.Bank int amount = Int32.Parse(stringAmount); Player target = PlayerService.GetPlayerByNameOrId(nameOrId); + if (!target.IsLoggedIn()) + { + player.SendNotification($"~r~Dieser Spieler ist nicht Online."); + return; + } + using (var dbContext = new DatabaseContext()) { - if (player.GetUser().PlayedMinutes < 180) + User user = player.GetUser(dbContext); + if (user.PlayedMinutes < 180) { player.SendNotification("~r~Du kannst Geld erst ab 3 Spielstunden vergeben"); return; } - if (player.GetUser(dbContext) == target.GetUser(dbContext)) + + User targetUser = target.GetUser(dbContext); + + if (user == targetUser) { player.SendNotification($"~r~Du kannst dir selber kein Geld überweisen."); return; } - else if (!target.IsLoggedIn()) - { - player.SendNotification($"~r~Dieser Spieler ist nicht Online."); - - } - else if (amount <= 0 || (int)(amount * 1.05) > player.GetUser(dbContext).BankAccount.Balance) + else if (amount <= 0 || (int)(amount * 1.05) > user.BankAccount.Balance) { player.SendNotification($"~r~Dieser Betrag kann nicht überwiesen werden."); return; } else { + logger.LogInformation("Player {0} did a transfer of {1} dollars to {2}", user.Name, amount, targetUser.Name); player.SendNotification($"~w~Du hast {target.Name} $~g~{amount} ~w~Überwiesen."); target.SendNotification($"~w~{player.Name} hat dir $~g~{amount} ~w~Überwiesen."); - player.GetUser(dbContext).BankAccount.Balance -= (int)(amount * 1.05); - target.GetUser(dbContext).otheramount += amount; + user.BankAccount.Balance -= (int)(amount * 1.05); + targetUser.otheramount += amount; dbContext.SaveChanges(); } } @@ -170,17 +181,23 @@ namespace ReallifeGamemode.Server.Bank using (var dbContext = new DatabaseContext()) { + User user = player.GetUser(dbContext); + if (user.FactionId == null) + { + return; + } - if (amount <= 0 || amount > player.GetUser(dbContext).BankAccount.Balance) + if (amount <= 0 || amount > user.BankAccount.Balance) { player.SendNotification($"~r~Dieser Betrag ist ungültig."); return; } else { + logger.LogInformation("Player {0} did a faction payin of {1} dollars to faction {2}", user.Name, amount, user.Faction.Id); player.SendNotification($"~w~Du hast $~g~{amount}~w~ in die Fraktionskasse eingezahlt."); - player.GetUser(dbContext).BankAccount.Balance -= amount; - player.GetUser(dbContext).Faction.BankAccount.Balance += amount; + user.BankAccount.Balance -= amount; + user.Faction.BankAccount.Balance += amount; dbContext.SaveChanges(); } } @@ -193,23 +210,28 @@ namespace ReallifeGamemode.Server.Bank int amount = Int32.Parse(stringAmount); Player target = PlayerService.GetPlayerByNameOrId(nameOrId); + if (!target.IsLoggedIn()) + { + player.SendNotification($"~r~Dieser Spieler ist nicht Online."); + return; + } + using (var dbContext = new DatabaseContext()) { - if (!target.IsLoggedIn()) - { - player.SendNotification($"~r~Dieser Spieler ist nicht Online."); - - } - else if (amount <= 0 || (int)(amount * 1.05) > player.GetUser(dbContext).Faction.BankAccount.Balance) + User user = player.GetUser(dbContext); + User targetUser = target.GetUser(dbContext); + if (amount <= 0 || (int)(amount * 1.05) > user.Faction.BankAccount.Balance) { player.SendNotification($"~r~Dieser Betrag kann nicht überwiesen werden."); return; } else { - player.SendNotification($"~w~Du hast {target.Name} $~g~{amount} ~w~Überwiesen."); - player.GetUser(dbContext).Faction.BankAccount.Balance -= (int)(amount * 1.05); - target.GetUser(dbContext).otheramount += amount; + logger.LogInformation("Player {0} did a faction transfer of {1} dollars from faction {2} to {3}", user.Name, amount, user.Faction.Id, target); + player.SendNotification($"Du hast ~g~{amount.ToMoneyString()}~s~ an ~y~{targetUser.Name}~s~ überwiesen"); + target.SendNotification($"Dir wurden ~g~{amount.ToMoneyString()}~s~ von ~y~{user.Name}~s~ überwiesen"); + user.Faction.BankAccount.Balance -= (int)(amount * 1.05); + targetUser.otheramount += amount; dbContext.SaveChanges(); } } diff --git a/ReallifeGamemode.Server/Commands/AdminCommands.cs b/ReallifeGamemode.Server/Commands/AdminCommands.cs index 0c61a0bb..dbf19e4d 100644 --- a/ReallifeGamemode.Server/Commands/AdminCommands.cs +++ b/ReallifeGamemode.Server/Commands/AdminCommands.cs @@ -2287,6 +2287,7 @@ namespace ReallifeGamemode.Server.Commands { var user = target.GetUser(context); user.Handmoney = amount; + logger.LogInformation("Admin {0} set the handmoney of player {1} to {2} dollars", admin.Name, target.Name, amount); context.SaveChanges(); //target.TriggerEvent("SERVER:SET_HANDMONEY", amount); } @@ -2313,6 +2314,7 @@ namespace ReallifeGamemode.Server.Commands { var user = target.GetUser(context); user.Handmoney += amount; + logger.LogInformation("Admin {0} added {2} dollarsto the handmoney of player {1}", admin.Name, target.Name, amount); context.SaveChanges(); //target.TriggerEvent("SERVER:SET_HANDMONEY", user.Handmoney); } @@ -3356,6 +3358,7 @@ namespace ReallifeGamemode.Server.Commands using (var dbContext = new DatabaseContext()) { + logger.LogInformation("Admin {0} set the bank account of {1} to {2} dollars", player.Name, target.Name, amount); target.GetUser(dbContext).BankAccount.Balance = amount; dbContext.SaveChanges(); } @@ -3381,6 +3384,7 @@ namespace ReallifeGamemode.Server.Commands using (var dbContext = new DatabaseContext()) { + logger.LogInformation("Admin {0} added {2} dollars to the bank account of {1}", player.Name, target.Name, amount); target.GetUser(dbContext).BankAccount.Balance += amount; dbContext.SaveChanges(); } diff --git a/ReallifeGamemode.Server/Commands/FactionCommands.cs b/ReallifeGamemode.Server/Commands/FactionCommands.cs index 9d90d3a2..7dd4e5b7 100644 --- a/ReallifeGamemode.Server/Commands/FactionCommands.cs +++ b/ReallifeGamemode.Server/Commands/FactionCommands.cs @@ -1,9 +1,10 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text.RegularExpressions; using GTANetworkAPI; using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Logging; using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Database.Entities.Logs.Chat; using ReallifeGamemode.Database.Models; @@ -15,6 +16,7 @@ using ReallifeGamemode.Server.Services; using ReallifeGamemode.Server.Types; using ReallifeGamemode.Server.Util; using ReallifeGamemode.Services; +using ReallifeGamemode.Server.Log; /** * @overview Life of German Reallife - Faction Commands (Faction.cs) @@ -26,6 +28,8 @@ namespace ReallifeGamemode.Server.Commands { internal class FactionCommands : Script { + private static readonly ILogger logger = LogManager.GetLogger(); + #region Chat Commands [Command("f", "~m~Benutzung: ~s~/f [Nachricht]", GreedyArg = true)] @@ -413,17 +417,19 @@ namespace ReallifeGamemode.Server.Commands return; } - if (deadPlayerUser.Handmoney >= 100) + if (deadPlayerUser.Handmoney >= Medic.ReviveIncome) { - deadPlayerUser.Handmoney -= 100; + deadPlayerUser.Handmoney -= Medic.ReviveIncome; } else { - int bankMoney = 100 - deadPlayerUser.Handmoney; + int bankMoney = Medic.ReviveIncome - deadPlayerUser.Handmoney; deadPlayerUser.Handmoney = 0; deadPlayerUser.BankAccount.Balance -= bankMoney; } + logger.LogInformation("Player {0} has been revived by {1} for {2} dollars", deadPlayer.Name, player.Name, Medic.ReviveIncome); + player.PlayAnimation("amb@medic@standing@kneel@enter", "enter", 0); deadPlayer.TriggerEvent("onPlayerRevived"); diff --git a/ReallifeGamemode.Server/Commands/UserCommands.cs b/ReallifeGamemode.Server/Commands/UserCommands.cs index 2ed40def..ec9dfcd2 100644 --- a/ReallifeGamemode.Server/Commands/UserCommands.cs +++ b/ReallifeGamemode.Server/Commands/UserCommands.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text.RegularExpressions; using GTANetworkAPI; +using Microsoft.Extensions.Logging; using Newtonsoft.Json; using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Database.Models; @@ -13,11 +14,16 @@ using ReallifeGamemode.Server.Services; using ReallifeGamemode.Server.Types; using ReallifeGamemode.Server.Util; using ReallifeGamemode.Services; +using ReallifeGamemode.Server.Log; namespace ReallifeGamemode.Server.Commands { internal class UserCommands : Script { + private static readonly ILogger logger = LogManager.GetLogger(); + + private const int SMS_PRICE = 5; + [Command("rent", "~m~rent stop")] public void CmdUserStopRent(Player player, String option = "") { @@ -113,13 +119,15 @@ namespace ReallifeGamemode.Server.Commands using (var dbContext = new DatabaseContext()) { User user = player.GetUser(dbContext); - if (user.BankAccount.Balance < 5) + if (user.BankAccount.Balance < SMS_PRICE) { ChatService.ErrorMessage(player, "Dafür hast du nicht genug Geld auf deinem Bankkonto"); return; } - user.BankAccount.Balance -= 5; + logger.LogInformation("Player {0} sent a sms to {1} for {2} dollars", player.Name, target.Name, SMS_PRICE); + + user.BankAccount.Balance -= SMS_PRICE; dbContext.SaveChanges(); } diff --git a/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs b/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs index 590bbf7e..3f333409 100644 --- a/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs +++ b/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs @@ -6,17 +6,24 @@ using ReallifeGamemode.Server.Extensions; using ReallifeGamemode.Server.Managers; using ReallifeGamemode.Server.Util; using System; +using Microsoft.Extensions.Logging; +using ReallifeGamemode.Server.Log; namespace ReallifeGamemode.Server.DrivingSchool { internal class DrivingSchool : Script { + private static readonly ILogger logger = LogManager.GetLogger(); + private static TextLabel informationLabel; private static Marker marker; private static ColShape _colShape; public static Vector3 Position { get; } private const int FAILPOINTS = 2; + private const int CAR_LICENSE_PRICE = 2500; + private const int BIKE_LICENSE_PRICE = 3500; + private readonly IReadOnlyCollection BikeRoute = new List { new Vector3(-741.98, -1283.46, 6.17), @@ -122,14 +129,14 @@ namespace ReallifeGamemode.Server.DrivingSchool public void StartDrivingSchool(Player client) { User user = client.GetUser(); - + if (user.DriverLicenseVehicle || client.HasData("ActiveSchool")) { client.SendChatMessage("~b~[INFO]~s~ Du besitzt schon einen Führerschein."); return; } - - if (user.Handmoney < 2500) + + if (user.Handmoney < CAR_LICENSE_PRICE) { client.SendNotification("~r~[FEHLER]~s~ Du hast nicht genug Geld auf der Hand($2.500)!", true); return; @@ -138,7 +145,8 @@ namespace ReallifeGamemode.Server.DrivingSchool using (var dbContext = new DatabaseContext()) { User payer = client.GetUser(dbContext); - payer.Handmoney -= 2500; + payer.Handmoney -= CAR_LICENSE_PRICE; + logger.LogInformation("Player {0} bought the driving school (car) for {1} dollars", client.Name, CAR_LICENSE_PRICE); // client.TriggerEvent("SERVER:SET_HANDMONEY", payer.Handmoney); dbContext.SaveChanges(); } @@ -174,8 +182,8 @@ namespace ReallifeGamemode.Server.DrivingSchool [RemoteEvent("drivingSchoolEventEnd")] public void DrivingSchoolEventEnd(Player user, int checkpoint) { - using (var dbContext = new DatabaseContext()) - { + using (var dbContext = new DatabaseContext()) + { User drivingUser = user.GetUser(dbContext); if (drivingUser.failpoints > FAILPOINTS) @@ -186,13 +194,13 @@ namespace ReallifeGamemode.Server.DrivingSchool else { user.TriggerEvent("renderTextOnScreen", "Du hast den Führerschein bestanden. Glückwunsch!"); - user.ResetData("ActiveSchool"); + user.ResetData("ActiveSchool"); drivingUser.DriverLicenseVehicle = true; drivingUser.failpoints = 0; dbContext.SaveChanges(); } - - } + + } Vehicle veh = user.Vehicle; user.WarpOutOfVehicle(); ServerVehicle sVeh = VehicleManager.GetServerVehicleFromVehicle(veh); @@ -208,31 +216,31 @@ namespace ReallifeGamemode.Server.DrivingSchool [RemoteEvent("drivingSchoolEvent")] public void DrivingSchoolEvent(Player user, int checkpoint) { - /* for (int i = 0; i >= 33; i++) - { - if (checkpoint <= 24) - { - user.TriggerEvent("kmh100"); - } - else if (checkpoint >= 25 && checkpoint <= 26) - { - user.TriggerEvent("kmh150"); - } - else if (checkpoint >= 26 && checkpoint <= 28) - { - user.TriggerEvent("kmh100"); - } - else if (checkpoint >= 29 && checkpoint <= 31) - { - user.TriggerEvent("kmh150"); - } - else if (checkpoint >= 32 && checkpoint <= 33) - { - user.TriggerEvent("kmh100"); - } - } - */ - switch(checkpoint) + /* for (int i = 0; i >= 33; i++) + { + if (checkpoint <= 24) + { + user.TriggerEvent("kmh100"); + } + else if (checkpoint >= 25 && checkpoint <= 26) + { + user.TriggerEvent("kmh150"); + } + else if (checkpoint >= 26 && checkpoint <= 28) + { + user.TriggerEvent("kmh100"); + } + else if (checkpoint >= 29 && checkpoint <= 31) + { + user.TriggerEvent("kmh150"); + } + else if (checkpoint >= 32 && checkpoint <= 33) + { + user.TriggerEvent("kmh100"); + } + } + */ + switch (checkpoint) { case 25: case 26: @@ -275,7 +283,7 @@ namespace ReallifeGamemode.Server.DrivingSchool client.SendChatMessage("~b~[INFO]~s~ Du besitzt schon einen Motorradschein."); return; } - if (user.Handmoney < 3500) + if (user.Handmoney < BIKE_LICENSE_PRICE) { client.SendNotification("~r~[FEHLER]~s~Du hast nicht genug Geld auf der Hand($3.500)!", true); return; @@ -284,7 +292,8 @@ namespace ReallifeGamemode.Server.DrivingSchool using (var dbContext = new DatabaseContext()) { User payer = client.GetUser(dbContext); - payer.Handmoney -= 3500; + payer.Handmoney -= BIKE_LICENSE_PRICE; + logger.LogInformation("Player {0} bought the driving school (bike) for {1} dollars", client.Name, BIKE_LICENSE_PRICE); // client.TriggerEvent("SERVER:SET_HANDMONEY", payer.Handmoney); dbContext.SaveChanges(); } diff --git a/ReallifeGamemode.Server/DrivingSchool/PlaneSchool.cs b/ReallifeGamemode.Server/DrivingSchool/PlaneSchool.cs index 310860ec..94873705 100644 --- a/ReallifeGamemode.Server/DrivingSchool/PlaneSchool.cs +++ b/ReallifeGamemode.Server/DrivingSchool/PlaneSchool.cs @@ -1,8 +1,10 @@ using System.Collections.Generic; using GTANetworkAPI; +using Microsoft.Extensions.Logging; using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Extensions; +using ReallifeGamemode.Server.Log; using ReallifeGamemode.Server.Managers; using ReallifeGamemode.Server.Util; @@ -15,8 +17,12 @@ namespace ReallifeGamemode.Server.DrivingSchool private static ColShape _colShape1; public static Vector3 Position { get; } + private static readonly ILogger logger = LogManager.GetLogger(); + private const int CHECKPOINT_MARKER_ID = 6; + private const int PLANE_LICENSE_PRICE = 5000; + private readonly IReadOnlyCollection planeRoute = new List { new Vector3(-1114.39, -2333.09, 14.87), @@ -74,7 +80,7 @@ namespace ReallifeGamemode.Server.DrivingSchool client.SendChatMessage("~b~[INFO]~s~ Du besitzt schon einen Flugschein."); return; } - if (user.Handmoney < 5000) + if (user.Handmoney < PLANE_LICENSE_PRICE) { client.SendNotification("~r~Du brauchst ~g~$5.000~r~ auf der Hand, um die Prüfung starten zu können.", true); return; @@ -82,7 +88,8 @@ namespace ReallifeGamemode.Server.DrivingSchool using (var dbContext = new DatabaseContext()) { User payer = client.GetUser(dbContext); - payer.Handmoney -= 5000; + payer.Handmoney -= PLANE_LICENSE_PRICE; + logger.LogInformation("Player {0} bought the plane school for {1} dollars", client.Name, PLANE_LICENSE_PRICE); //client.TriggerEvent("SERVER:SET_HANDMONEY", payer.Handmoney); dbContext.SaveChanges(); } @@ -171,7 +178,7 @@ namespace ReallifeGamemode.Server.DrivingSchool case 14: user.TriggerEvent("renderTextOnScreen", "Setzen Sie zum Landeanflug an. Drücken Sie 'G', um das Fahrwerk auszufahren."); - CheckPointHandle.StartCheckPointRoute(user, planeRouteEnd, 5000, CHECKPOINT_MARKER_ID, 12, 5, true, "planeSchoolEventEnd"); + CheckPointHandle.StartCheckPointRoute(user, planeRouteEnd, PLANE_LICENSE_PRICE, CHECKPOINT_MARKER_ID, 12, 5, true, "planeSchoolEventEnd"); break; } } diff --git a/ReallifeGamemode.Server/Events/UpdateCharacterCloth.cs b/ReallifeGamemode.Server/Events/UpdateCharacterCloth.cs index ea2d67d6..086ec118 100644 --- a/ReallifeGamemode.Server/Events/UpdateCharacterCloth.cs +++ b/ReallifeGamemode.Server/Events/UpdateCharacterCloth.cs @@ -6,11 +6,15 @@ using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Extensions; using System; +using Microsoft.Extensions.Logging; +using ReallifeGamemode.Server.Log; namespace ReallifeGamemode.Server.Events { public class UpdateCharacterCloth : Script { + private static readonly ILogger logger = LogManager.GetLogger(); + [RemoteEvent("updateDutyProp")] public void UpdateDutyProp(Player player, int componentId, int componentVariation) { @@ -280,7 +284,8 @@ namespace ReallifeGamemode.Server.Events } } - if(data[0] == 2){ + if (data[0] == 2) + { User payer = client.GetUser(dbContext); payer.GetCharacter(dbContext); payer.Character.Hair = Convert.ToByte(data[2]); @@ -288,13 +293,14 @@ namespace ReallifeGamemode.Server.Events } client.GetUser(dbContext).Handmoney -= data[6]; + logger.LogInformation("Player {0} bought clothing for {1} dollars: slot = {2}, cloth = {3}, texture = {4}", client.Name, data[6], data[0], data[2], data[1]); dbContext.SaveChanges(); //client.TriggerEvent("SERVER:SET_HANDMONEY", user.Handmoney); } client.TriggerEvent("clothesMenu:updateLast", data[2], data[1], data[4], data[5], data[3]); } } - + [RemoteEvent("SERVER:BuyHairColor")] public void BuyHairColor(Player client, byte HairColor) @@ -332,7 +338,7 @@ namespace ReallifeGamemode.Server.Events User payer = client.GetUser(dbContext); payer.GetCharacter(dbContext); payer.Handmoney -= 50; - payer.Character.HairHighlightColor = HairlightColor; + payer.Character.HairHighlightColor = HairlightColor; // client.TriggerEvent("SERVER:SET_HANDMONEY", payer.Handmoney); dbContext.SaveChanges(); } diff --git a/ReallifeGamemode.Server/Events/Weapon.cs b/ReallifeGamemode.Server/Events/Weapon.cs index c32f22c0..34d7661d 100644 --- a/ReallifeGamemode.Server/Events/Weapon.cs +++ b/ReallifeGamemode.Server/Events/Weapon.cs @@ -130,7 +130,7 @@ namespace ReallifeGamemode.Server.Events player.SendNotification("Du hast nicht genügend Geld bei dir"); return; } - logger.LogInformation("Player {0} bought a {1} in ammunation", user.Name, weaponmodel); + logger.LogInformation("Player {0} bought a weapon {1} in ammunation for {2} dollars", user.Name, weaponmodel, price); user.Handmoney -= price; dbContext.SaveChanges(); player.GiveWeapon(NAPI.Util.WeaponNameToModel(weaponmodel), ammo); diff --git a/ReallifeGamemode.Server/Extensions/ClientExtension.cs b/ReallifeGamemode.Server/Extensions/ClientExtension.cs index dcd4d284..2b57264b 100644 --- a/ReallifeGamemode.Server/Extensions/ClientExtension.cs +++ b/ReallifeGamemode.Server/Extensions/ClientExtension.cs @@ -3,10 +3,12 @@ using System.Collections.Generic; using System.Linq; using GTANetworkAPI; using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Logging; using Newtonsoft.Json; using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Admin; +using ReallifeGamemode.Server.Log; using ReallifeGamemode.Server.Managers; using ReallifeGamemode.Server.Services; using ReallifeGamemode.Server.Types; @@ -22,6 +24,8 @@ namespace ReallifeGamemode.Server.Extensions { public static class PlayerExtension { + private static ILogger Logger => LogManager.GetLogger(typeof(PlayerExtension)); + /// /// Gibt das User-Objekt eines Player's zurück. /// Gibt nichts zurück, wenn der Player nicht eingeloggt ist @@ -108,6 +112,8 @@ namespace ReallifeGamemode.Server.Extensions faction.BankAccount.Balance += factionMoney; } + Logger.LogInformation("Player {0} was sent to jail for {1} seconds, executive factions got {2} dollars each", user.Name, time, factionMoney); + user.Wanteds = 0; user.JailTime = time; } diff --git a/ReallifeGamemode.Server/Factions/Medic/Medic.cs b/ReallifeGamemode.Server/Factions/Medic/Medic.cs index 1bc98dcd..58847dcf 100644 --- a/ReallifeGamemode.Server/Factions/Medic/Medic.cs +++ b/ReallifeGamemode.Server/Factions/Medic/Medic.cs @@ -9,6 +9,8 @@ using ReallifeGamemode.Database.Models; using Microsoft.EntityFrameworkCore; using System; using ReallifeGamemode.Server.Extensions; +using Microsoft.Extensions.Logging; +using ReallifeGamemode.Server.Log; /** * @overview Life of German Reallife - Server Factions Medic Medic.cs @@ -20,6 +22,8 @@ namespace ReallifeGamemode.Server.Factions.Medic { public class Medic : Script { + private static readonly ILogger logger = LogManager.GetLogger(); + public static List ReviveTasks = new List(); public static List HealTasks = new List(); public static List FireTasks = new List(); @@ -34,7 +38,7 @@ namespace ReallifeGamemode.Server.Factions.Medic public Player dTarget; public int dPrice; } - + public static void AddTaskToList(MedicTask task) { if (task == null) @@ -84,7 +88,7 @@ namespace ReallifeGamemode.Server.Factions.Medic public static void UpdateReviveSperre() { var allRevivedPlayers = NAPI.Pools.GetAllPlayers().Where(c => c.HasData("reviveSperre")); - foreach(var player in allRevivedPlayers) + foreach (var player in allRevivedPlayers) { var timeLeft = player.GetData("reviveSperre"); @@ -101,7 +105,7 @@ namespace ReallifeGamemode.Server.Factions.Medic public static void CheckHealDecisionDistance() { - foreach(var healAuftrag in HealDecisions.ToList()) + foreach (var healAuftrag in HealDecisions.ToList()) { if (healAuftrag.dMedic.Position.DistanceTo(healAuftrag.dTarget.Position) > 5) { @@ -117,9 +121,9 @@ namespace ReallifeGamemode.Server.Factions.Medic public static void MakeHealDecision(Player target, bool decision) { var activeDecision = HealDecisions.FirstOrDefault(d => d.dTarget == target); - if(decision == false) + if (decision == false) { - activeDecision.dMedic.SendNotification(activeDecision.dTarget.Name + " hat den Heal ~r~abgelehnt",false); + activeDecision.dMedic.SendNotification(activeDecision.dTarget.Name + " hat den Heal ~r~abgelehnt", false); activeDecision.dTarget.SendNotification("Du hast den Heal ~r~abgelehnt", false); } else @@ -141,6 +145,8 @@ namespace ReallifeGamemode.Server.Factions.Medic targetUser.BankAccount.Balance -= bankMoney; } + logger.LogInformation("Player {0} accepted a heal for {1} dollars from medic {2}", target.Name, activeDecision.dPrice, activeDecision.dMedic.Name); + dbContext.Factions.Include(f => f.BankAccount).Where(f => f.Id == 2).First().BankAccount.Balance += activeDecision.dPrice / 2; activeDecision.dMedic.GetUser(dbContext).Wage += activeDecision.dPrice / 2; @@ -149,7 +155,7 @@ namespace ReallifeGamemode.Server.Factions.Medic activeDecision.dTarget.SafeSetHealth(100); activeDecision.dTarget.SendNotification($"Du wurdest von ~g~{activeDecision.dMedic.Name} ~s~ für ~g~{activeDecision.dPrice.ToMoneyString()} geheilt", false); activeDecision.dMedic.SendNotification($"Du hast ~g~{activeDecision.dTarget.Name} ~s~ für {activeDecision.dPrice.ToMoneyString()} geheilt", false); - delHealTask(activeDecision.dTarget); + delHealTask(activeDecision.dTarget); } HealDecisions.Remove(activeDecision); } @@ -166,7 +172,7 @@ namespace ReallifeGamemode.Server.Factions.Medic var taskTimeLeft = Math.Abs((int)(((DateTimeOffset)actualTime).ToUnixTimeSeconds() - ((DateTimeOffset)task.Time).ToUnixTimeSeconds() - reviveTaskTime)); task.TimeLeft = taskTimeLeft; var medic = PlayerService.GetPlayerByNameOrId(task.MedicName); - if(medic != null) medic.TriggerEvent("setTaskTimeLeft", taskTimeLeft); + if (medic != null) medic.TriggerEvent("setTaskTimeLeft", taskTimeLeft); } } } @@ -176,14 +182,14 @@ namespace ReallifeGamemode.Server.Factions.Medic { if (HealTasks.Count != 0) { - foreach(var task in HealTasks) + foreach (var task in HealTasks) { - if(task.MedicName != "none") + if (task.MedicName != "none") { var medic = PlayerService.GetPlayerByNameOrId(task.MedicName); var victim = PlayerService.GetPlayerByNameOrId(task.Victim); - if(medic == null || victim == null) + if (medic == null || victim == null) { continue; } @@ -241,11 +247,11 @@ namespace ReallifeGamemode.Server.Factions.Medic { reviveTask.MedicName = "none"; } - else + else { reviveTask.MedicName = player.Name; } - + ChatService.BroadcastFaction("~y~[MEDIC] ~w~" + player.Name + " hat den Reviveauftrag von " + victim + " angenommen.", new List() { 2 }); target.SendNotification("~w~Sanitäter~g~ " + player.Name + "~w~ eilt zur Rettung."); break; @@ -261,7 +267,7 @@ namespace ReallifeGamemode.Server.Factions.Medic healTask.MedicName = player.Name; ChatService.BroadcastFaction("~y~[MEDIC] ~w~" + player.Name + " hat den Healauftrag von " + victim + " angenommen.", new List() { 2 }); target.SendNotification("~w~Sanitäter~g~ " + player.Name + "~w~ hat deinen Auftrag angenommen."); - } + } break; case 2: @@ -275,7 +281,7 @@ namespace ReallifeGamemode.Server.Factions.Medic { MedicTask task = HealTasks.FirstOrDefault(t => t.Victim == player.Name); if (task != null) - { + { player.SetData("healauftrag", false); var medicPlayer = PlayerService.GetPlayerByNameOrId(task.MedicName); if (medicPlayer != null) diff --git a/ReallifeGamemode.Server/Finance/Economy.cs b/ReallifeGamemode.Server/Finance/Economy.cs index f602fb3a..65fa002f 100644 --- a/ReallifeGamemode.Server/Finance/Economy.cs +++ b/ReallifeGamemode.Server/Finance/Economy.cs @@ -9,9 +9,11 @@ using System.Collections.Generic; using System.Linq; using GTANetworkAPI; using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Logging; using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Extensions; +using ReallifeGamemode.Server.Log; using ReallifeGamemode.Server.Services; using ReallifeGamemode.Server.Wanted; @@ -19,6 +21,8 @@ namespace ReallifeGamemode.Server.Finance { public class Economy { + private static readonly ILogger logger = LogManager.GetLogger(); + public static Dictionary Paychecks { get; set; } = new Dictionary(); public static (int, float, float) GetEconomyClass(Player client, int wage) @@ -162,6 +166,8 @@ namespace ReallifeGamemode.Server.Finance } } + logger.LogInformation("Player {0} has a payday of {1} dollars. old balance: {2}, new balance: {3}", client.Name, paycheck.Amount, u.BankAccount.Balance, u.BankAccount.Balance + paycheck.Amount); + u.BankAccount.Balance += paycheck.Amount; u.Wage = 0; u.otheramount = 0; @@ -173,7 +179,7 @@ namespace ReallifeGamemode.Server.Finance .Where(hR => hR.UserId == u.Id); dbContext.Factions.Include(f => f.BankAccount).Where(f => f.Id == 2).First().BankAccount.Balance += (int)(paycheck.HealthInsurance * 0.1); - + logger.LogInformation("Medic faction got a health insurance payment of {0} dollars from player {1}", paycheck.HealthInsurance * 0.1, client.Name); if (rentals.Any()) { foreach (var rental in rentals) @@ -181,6 +187,7 @@ namespace ReallifeGamemode.Server.Finance if (rental?.House?.BankAccount != null) { rental.House.BankAccount.Balance += (int)(rental.House.RentalFee * 0.7); + logger.LogInformation("House {0} got a rentalfee of {1} from paycheck from user {2}", rental.House.Id, rental.House.RentalFee * 0.7, u.Name); } } } diff --git a/ReallifeGamemode.Server/Gangwar/Turf.cs b/ReallifeGamemode.Server/Gangwar/Turf.cs index 3cd1d52b..88573919 100644 --- a/ReallifeGamemode.Server/Gangwar/Turf.cs +++ b/ReallifeGamemode.Server/Gangwar/Turf.cs @@ -5,16 +5,20 @@ using System.Threading.Tasks; using System.Timers; using GTANetworkAPI; using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Logging; using Newtonsoft.Json; using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Extensions; +using ReallifeGamemode.Server.Log; using ReallifeGamemode.Server.Services; namespace ReallifeGamemode.Server.Gangwar { public class Turf { + private static readonly ILogger logger = LogManager.GetLogger(); + public int TurfID { get; set; } public string TurfName { get; set; } public int Color { get; set; } @@ -203,7 +207,7 @@ namespace ReallifeGamemode.Server.Gangwar public void enter(Player client) { User user = client.GetUser(); - if(user == null || user.FactionId == null) + if (user == null || user.FactionId == null) { return; } @@ -276,6 +280,7 @@ namespace ReallifeGamemode.Server.Gangwar a.TriggerEvent("CLIENT:loose"); } ownerFaction.BankAccount.Balance += 15000; + logger.LogInformation("Gang {0} successfully defended the turf {1} against gang {2} and gained {3} dollars", getOwner(), getAttacker(), 15000); } else if (getOwner() != FactionName) { @@ -292,6 +297,7 @@ namespace ReallifeGamemode.Server.Gangwar if (a != null) a.TriggerEvent("CLIENT:win"); } + logger.LogInformation("Gang {0} successfully took over the turf {1} from gang {2} and gained {3} dollars", getAttacker(), getOwner(), 10000); this.Owner = FactionName; attackerFaction.BankAccount.Balance += 10000; Turfs turf = dbContext.Turfs.Where(t => t.Id == getId()).FirstOrDefault(); @@ -379,7 +385,7 @@ namespace ReallifeGamemode.Server.Gangwar { if (getOwner() == FactionName) { - NAPI.Util.ConsoleOutput($"GangwarKill - Adding Point for Faction {getAttacker()}"); + NAPI.Util.ConsoleOutput($"GangwarKill - Adding Point for Faction {getAttacker()}"); Att_Score += 1; } else if (getAttacker() == FactionName) diff --git a/ReallifeGamemode.Server/Main.cs b/ReallifeGamemode.Server/Main.cs index 28e226d3..c50c6ce4 100644 --- a/ReallifeGamemode.Server/Main.cs +++ b/ReallifeGamemode.Server/Main.cs @@ -29,212 +29,212 @@ using System.IO; namespace ReallifeGamemode.Server { - public class Main : Script - { - public static readonly Vector3 DEFAULT_SPAWN_POSITION = new Vector3(-1033.93603515625, -2731.572998046875, 13.756634712219238); - public static readonly float DEFAULT_SPAWN_HEADING = -32.23991012573242f; - - public static readonly CultureInfo SERVER_CULTURE = new CultureInfo("de-DE"); - - private Core.Events.EventHandler eventHandler; - - private readonly Mutex logMutex = new Mutex(false, "RAGE_MAIN_LOG_MUTEX"); - - public Main() + public class Main : Script { - AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException; - } + public static readonly Vector3 DEFAULT_SPAWN_POSITION = new Vector3(-1033.93603515625, -2731.572998046875, 13.756634712219238); + public static readonly float DEFAULT_SPAWN_HEADING = -32.23991012573242f; - [ServerEvent(Event.ResourceStart)] - public void OnResourceStart() - { - try - { - if (System.Environment.GetEnvironmentVariable("RAGEMP_UPDATE_DATABASE_ON_STARTUP", System.EnvironmentVariableTarget.User) == "true") + public static readonly CultureInfo SERVER_CULTURE = new CultureInfo("de-DE"); + + private Core.Events.EventHandler eventHandler; + + private readonly Mutex logMutex = new Mutex(false, "RAGE_MAIN_LOG_MUTEX"); + + public Main() { - using var dbContext = new DatabaseContext(true); - - var pendingMigrations = dbContext.Database.GetPendingMigrations(); - - if (!pendingMigrations.Any()) - { - System.Console.WriteLine("No migrations to apply"); - } - else - { - System.Console.WriteLine("Applying {0} migrations", pendingMigrations.Count()); - foreach (var migration in pendingMigrations) - { - System.Console.WriteLine("\t{0}", migration); - } - - try - { - dbContext.Database.Migrate(); - } - catch (System.Exception e) - { - System.Console.WriteLine("Error while updating database: {0}", e.ToString()); - System.Console.ReadLine(); - System.Environment.Exit(1); - } - - System.Console.WriteLine("Migrations successfull"); - } + AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException; } - var methods = Assembly.GetExecutingAssembly() - .GetTypes() - .SelectMany(t => t.GetMethods()) - .Where(m => m.GetCustomAttributes(typeof(CommandAttribute), false).Length > 0) - .ToArray(); - - var cmdAttributes = methods.Select(c => c.GetCustomAttribute()).ToList(); - - var registeredCommands = cmdAttributes.Select(c => c.CommandString).ToList(); - cmdAttributes.Where(c => c.Alias?.Any() ?? false).ToList().ForEach(a => + [ServerEvent(Event.ResourceStart)] + public void OnResourceStart() { - registeredCommands.AddRange(a.Alias.Split(',')); - }); - - IAPI apiInstance = new RageAPI(); - eventHandler = new Core.Events.EventHandler(apiInstance); - - new Core.Main(apiInstance, eventHandler, registeredCommands.ToArray()); - - NAPI.Server.SetGlobalServerChat(false); - - NAPI.Server.SetCommandErrorMessage(""); - NAPI.Server.SetDefaultSpawnLocation(DEFAULT_SPAWN_POSITION, DEFAULT_SPAWN_HEADING); - NAPI.Server.SetAutoSpawnOnConnect(false); - NAPI.Server.SetAutoRespawnAfterDeath(false); - NAPI.Data.SetWorldData("playerCreatorDimension", 0); - - JsonConvert.DefaultSettings = () => - { - return new JsonSerializerSettings() - { - NullValueHandling = NullValueHandling.Ignore - }; - }; - - InventoryManager.LoadItems(); - ShopManager.LoadClotheShops(); - ShopManager.LoadItemShops(); - ShopManager.LoadFriseur(); - ShopManager.LoadAmmunations(); - TuningManager.LoadTuningGarages(); - - TimeManager.StartTimeManager(); - VehicleManager.CheckEnabledMods(); - - DatabaseHelper.InitDatabaseFirstTime(); - - FactionHelper.CheckFactionBankAccounts(); - BusinessManager.LoadBusinesses(); - //InteriorManager.LoadInteriors(); - DoorManager.LoadDoors(); - ATMManager.InitATMs(); - CityHallManager.LoadCityHall(); - JobManager.LoadJobs(); - //TaxiDriverJob.StartTaxiTimer(); Obselete - //HouseManager.LoadHouses(); - DrivingSchool.DrivingSchool.Setup(); - PlaneSchool.Setup(); - Gangwar.Gangwar.loadTurfs(); - Bank.bank.Setup(); - Introduction.Setup(); - PositionManager.LoadPositionManager(); - LoadManager.LoadLoadManager(); - Rentcar.Setup(); - - World.WeatherSync.Load(); - - TempBlip tempBlip = new TempBlip() - { - Color = 1, - Name = "", - Transparency = 0, - ShortRange = true, - Sprite = 1, - Scale = 1, - }; - - NAPI.Data.SetWorldData("blipTemplate", tempBlip); - - //WantedEscapeTimer.WantedTimer(); Obselete - //Jail.JailTimer(); Obselete - //Economy.PaydayTimer(); Obselete - // WeaponDealManager.WeaponDealTimer(); Obselete - - ThreadTimers.StartAllTimers(); - - Managers.SVarManager.LoadSVars(); - - UserBankAccount.BalanceChanged += (account) => - { - using (var dbContext = new DatabaseContext()) - { - var user = dbContext.Users.Where(u => u.BankAccountId == account.Id).Select(u => u.Name).FirstOrDefault(); - if (user == null) + try { - return; + if (System.Environment.GetEnvironmentVariable("RAGEMP_UPDATE_DATABASE_ON_STARTUP", System.EnvironmentVariableTarget.User) == "true") + { + using var dbContext = new DatabaseContext(true); + + var pendingMigrations = dbContext.Database.GetPendingMigrations(); + + if (!pendingMigrations.Any()) + { + System.Console.WriteLine("No migrations to apply"); + } + else + { + System.Console.WriteLine("Applying {0} migrations", pendingMigrations.Count()); + foreach (var migration in pendingMigrations) + { + System.Console.WriteLine("\t{0}", migration); + } + + try + { + dbContext.Database.Migrate(); + } + catch (System.Exception e) + { + System.Console.WriteLine("Error while updating database: {0}", e.ToString()); + System.Console.ReadLine(); + System.Environment.Exit(1); + } + + System.Console.WriteLine("Migrations successfull"); + } + } + + var methods = Assembly.GetExecutingAssembly() + .GetTypes() + .SelectMany(t => t.GetMethods()) + .Where(m => m.GetCustomAttributes(typeof(CommandAttribute), false).Length > 0) + .ToArray(); + + var cmdAttributes = methods.Select(c => c.GetCustomAttribute()).ToList(); + + var registeredCommands = cmdAttributes.Select(c => c.CommandString).ToList(); + cmdAttributes.Where(c => c.Alias?.Any() ?? false).ToList().ForEach(a => + { + registeredCommands.AddRange(a.Alias.Split(',')); + }); + + IAPI apiInstance = new RageAPI(); + eventHandler = new Core.Events.EventHandler(apiInstance); + + new Core.Main(apiInstance, eventHandler, registeredCommands.ToArray()); + + NAPI.Server.SetGlobalServerChat(false); + + NAPI.Server.SetCommandErrorMessage(""); + NAPI.Server.SetDefaultSpawnLocation(DEFAULT_SPAWN_POSITION, DEFAULT_SPAWN_HEADING); + NAPI.Server.SetAutoSpawnOnConnect(false); + NAPI.Server.SetAutoRespawnAfterDeath(false); + NAPI.Data.SetWorldData("playerCreatorDimension", 0); + + JsonConvert.DefaultSettings = () => + { + return new JsonSerializerSettings() + { + NullValueHandling = NullValueHandling.Ignore + }; + }; + + InventoryManager.LoadItems(); + ShopManager.LoadClotheShops(); + ShopManager.LoadItemShops(); + ShopManager.LoadFriseur(); + ShopManager.LoadAmmunations(); + TuningManager.LoadTuningGarages(); + + TimeManager.StartTimeManager(); + VehicleManager.CheckEnabledMods(); + + DatabaseHelper.InitDatabaseFirstTime(); + + FactionHelper.CheckFactionBankAccounts(); + BusinessManager.LoadBusinesses(); + //InteriorManager.LoadInteriors(); + DoorManager.LoadDoors(); + ATMManager.InitATMs(); + CityHallManager.LoadCityHall(); + JobManager.LoadJobs(); + //TaxiDriverJob.StartTaxiTimer(); Obselete + //HouseManager.LoadHouses(); + DrivingSchool.DrivingSchool.Setup(); + PlaneSchool.Setup(); + Gangwar.Gangwar.loadTurfs(); + Bank.Bank.Setup(); + Introduction.Setup(); + PositionManager.LoadPositionManager(); + LoadManager.LoadLoadManager(); + Rentcar.Setup(); + + World.WeatherSync.Load(); + + TempBlip tempBlip = new TempBlip() + { + Color = 1, + Name = "", + Transparency = 0, + ShortRange = true, + Sprite = 1, + Scale = 1, + }; + + NAPI.Data.SetWorldData("blipTemplate", tempBlip); + + //WantedEscapeTimer.WantedTimer(); Obselete + //Jail.JailTimer(); Obselete + //Economy.PaydayTimer(); Obselete + // WeaponDealManager.WeaponDealTimer(); Obselete + + ThreadTimers.StartAllTimers(); + + Managers.SVarManager.LoadSVars(); + + UserBankAccount.BalanceChanged += (account) => + { + using (var dbContext = new DatabaseContext()) + { + var user = dbContext.Users.Where(u => u.BankAccountId == account.Id).Select(u => u.Name).FirstOrDefault(); + if (user == null) + { + return; + } + + Player player = PlayerService.GetPlayerByNameOrId(user); + if (player == null) + { + return; + } + + player.TriggerEvent("updateMoney", account.Balance); + } + }; + + User.HandMoneyChanged += (user) => + { + user.Player.TriggerEvent("SERVER:SET_HANDMONEY", user.Handmoney); + }; + + //IPLS + NAPI.World.RequestIpl("vw_casino_garage"); + + } + catch (Exception e) + { + Log(e.ToString()); + } + } + + private void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e) + { + Log(e.ExceptionObject.ToString()); + } + + private void Log(string message) + { + string basePath = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location); + string log = Path.Combine(basePath, "log.txt"); + + logMutex.WaitOne(); + + if (!File.Exists(log)) + { + File.Create(log); } - Player player = PlayerService.GetPlayerByNameOrId(user); - if(player == null) - { - return; - } + string msg = $"[{DateTime.Now:s}] - Error: {message}{Environment.NewLine}"; - player.TriggerEvent("updateMoney", account.Balance); - } - }; + File.AppendAllText(log, msg); - User.HandMoneyChanged += (user) => + logMutex.ReleaseMutex(); + } + + [RemoteEvent("CLIENT:Event")] + public void OnClientEvent(Player player, string dataStr) { - user.Player.TriggerEvent("SERVER:SET_HANDMONEY", user.Handmoney); - }; - - //IPLS - NAPI.World.RequestIpl("vw_casino_garage"); - - } - catch (Exception e) - { - Log(e.ToString()); - } + var data = dataStr.DeserializeJson>(); + eventHandler.HandleEvent(new RagePlayer(player), data); + } } - - private void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e) - { - Log(e.ExceptionObject.ToString()); - } - - private void Log(string message) - { - string basePath = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location); - string log = Path.Combine(basePath, "log.txt"); - - logMutex.WaitOne(); - - if (!File.Exists(log)) - { - File.Create(log); - } - - string msg = $"[{DateTime.Now:s}] - Error: {message}{Environment.NewLine}"; - - File.AppendAllText(log, msg); - - logMutex.ReleaseMutex(); - } - - [RemoteEvent("CLIENT:Event")] - public void OnClientEvent(Player player, string dataStr) - { - var data = dataStr.DeserializeJson>(); - eventHandler.HandleEvent(new RagePlayer(player), data); - } - } } diff --git a/ReallifeGamemode.Server/Managers/ATMManager.cs b/ReallifeGamemode.Server/Managers/ATMManager.cs index 2fab284c..ec10ddae 100644 --- a/ReallifeGamemode.Server/Managers/ATMManager.cs +++ b/ReallifeGamemode.Server/Managers/ATMManager.cs @@ -2,9 +2,11 @@ using System.Linq; using System.Numerics; using GTANetworkAPI; +using Microsoft.Extensions.Logging; using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Extensions; +using ReallifeGamemode.Server.Log; /** * @overview Life of German Reallife - Managers ATMManager (ATMManager.cs) @@ -18,6 +20,8 @@ namespace ReallifeGamemode.Server.Managers { public static List ATMColShapes = new List(); + private static readonly ILogger logger = LogManager.GetLogger(); + public static void InitATMs() { var addedATMs = 0; @@ -112,15 +116,16 @@ namespace ReallifeGamemode.Server.Managers //client.TriggerEvent("SERVER:WORLD_INTERACTION:ATM_ERROR", 0, checkATM.Balance); client.SendNotification("~r~Nicht genügend Geld auf der Hand!"); } - else if(inputField1 < 0) + else if (inputField1 < 0) { client.SendNotification("~r~Ungültiger Betrag!"); - } - else + } + else { var updateBankMoneyIn = user.BankAccount; var updateATMBalanceIn = dbContext.ATMs.FirstOrDefault(a => a.Id == nearATM); user.Handmoney -= inputField1; + logger.LogInformation("Player {0} did a deposit of {1} dollars at atm {2}", client.Name, inputField1, nearATM); updateBankMoneyIn.Balance += inputField1; updateATMBalanceIn.Balance += inputField1; //client.TriggerEvent("SERVER:SET_HANDMONEY", user.Handmoney); @@ -149,6 +154,7 @@ namespace ReallifeGamemode.Server.Managers var updateATMBalanceOut = dbContext.ATMs.FirstOrDefault(a => a.Id == nearATM); updateHandMoneyOut.Handmoney += inputField1; user.BankAccount.Balance -= inputField1; + logger.LogInformation("Player {0} did a withdraw of {1} dollars at atm {2}", client.Name, inputField1, nearATM); updateATMBalanceOut.Balance -= inputField1; //client.TriggerEvent("SERVER:SET_HANDMONEY", updateHandMoneyOut.Handmoney); } diff --git a/ReallifeGamemode.Server/Managers/CharacterCreator.cs b/ReallifeGamemode.Server/Managers/CharacterCreator.cs index f0c2ee73..4815ec7c 100644 --- a/ReallifeGamemode.Server/Managers/CharacterCreator.cs +++ b/ReallifeGamemode.Server/Managers/CharacterCreator.cs @@ -1,11 +1,13 @@ using System.Linq; using GTANetworkAPI; +using Microsoft.Extensions.Logging; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Events; using ReallifeGamemode.Server.Extensions; +using ReallifeGamemode.Server.Log; namespace ReallifeGamemode.Server.Managers { @@ -14,6 +16,8 @@ namespace ReallifeGamemode.Server.Managers public static Vector3 surgeryPoint = new Vector3(342.30032, -1397.7542, 32.50923); public const int SURGERY_PRICE = 15000; + private static readonly ILogger logger = LogManager.GetLogger(); + public CharacterCreator() { //LoadSurgery(); @@ -273,6 +277,7 @@ namespace ReallifeGamemode.Server.Managers } else { + logger.LogInformation("Player {0} bought a surgery for {1} dollars", player.Name, SURGERY_PRICE); user.BankAccount.Balance -= SURGERY_PRICE; } saveCharacter.Remove(oldChar); diff --git a/ReallifeGamemode.Server/Managers/CityHallManager.cs b/ReallifeGamemode.Server/Managers/CityHallManager.cs index 428c90de..53259373 100644 --- a/ReallifeGamemode.Server/Managers/CityHallManager.cs +++ b/ReallifeGamemode.Server/Managers/CityHallManager.cs @@ -1,9 +1,11 @@ using System.Linq; using GTANetworkAPI; +using Microsoft.Extensions.Logging; using Newtonsoft.Json; using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Extensions; +using ReallifeGamemode.Server.Log; using ReallifeGamemode.Server.Services; using ReallifeGamemode.Server.Types; @@ -11,8 +13,11 @@ namespace ReallifeGamemode.Server.Managers { internal class CityHallManager : Script { + private const int GROUP_PRICE = 50000; private static readonly Vector3 _cityHallPosition = new Vector3(273.22, -278.14, 53.9); + private static readonly ILogger logger = LogManager.GetLogger(); + public static void LoadCityHall() { NAPI.Marker.CreateMarker(GTANetworkAPI.MarkerType.VerticalCylinder, _cityHallPosition.Subtract(new Vector3(0, 0, 1.7)), new Vector3(), new Vector3(), 1.0f, new Color(255, 255, 255)); @@ -57,13 +62,14 @@ namespace ReallifeGamemode.Server.Managers u.Group = group; u.GroupRank = GroupRank.OWNER; - if (player.GetUser(dbContext).BankAccount.Balance < 50000) + if (u.BankAccount.Balance < GROUP_PRICE) { ChatService.ErrorMessage(player, "Du hast nicht genug Geld"); return; } - player.GetUser(dbContext).BankAccount.Balance -= 50000; + logger.LogInformation("Player {0} created a group for {1} dollars", player.Name, GROUP_PRICE); + u.BankAccount.Balance -= GROUP_PRICE; dbContext.SaveChanges(); ChatService.BroadcastGroup($"Die Gruppe \"{name}\" wurde erfolgreich erstellt.", group); diff --git a/ReallifeGamemode.Server/Managers/InteractionManager.cs b/ReallifeGamemode.Server/Managers/InteractionManager.cs index 536a9fe9..4d799e80 100644 --- a/ReallifeGamemode.Server/Managers/InteractionManager.cs +++ b/ReallifeGamemode.Server/Managers/InteractionManager.cs @@ -16,6 +16,8 @@ using ReallifeGamemode.Server.Events; using System; using ReallifeGamemode.Server.Core.API; using ReallifeGamemode.Server.Factions.Medic; +using Microsoft.Extensions.Logging; +using ReallifeGamemode.Server.Log; /** * @overview Life of German Reallife - Managers Interaction (InteractionManager.cs) @@ -27,6 +29,8 @@ namespace ReallifeGamemode.Server.Managers { public class InteractionManager : Script { + private static readonly ILogger logger = LogManager.GetLogger(); + #region Eigeninteraktionen Taste-M [RemoteEvent("CLIENT:InteractionMenu_AcceptInvite")] @@ -484,8 +488,8 @@ namespace ReallifeGamemode.Server.Managers using var dbContext = new DatabaseContext(); var user = player.GetUser(dbContext); ServerVehicle serverVehicle = dbContext.ServerVehicles.FirstOrDefault(v => v.Id == id); - - if(serverVehicle is UserVehicle) + + if (serverVehicle is UserVehicle) { UserVehicle userVehicle = dbContext.UserVehicles.Where(v => v.Id == id && v.UserId == user.Id).FirstOrDefault(); var vehPrice = userVehicle.Price; @@ -493,25 +497,29 @@ namespace ReallifeGamemode.Server.Managers GTANetworkAPI.Vehicle veh = VehicleManager.GetVehicleFromServerVehicle(userVehicle); user.BankAccount.Balance += backPrice; - ChatService.SendMessage(player, $"~b~[INFO]~s~ Du hast durch den Autoverkauf ~g~{backPrice.ToMoneyString()} ~s~erhalten."); + logger.LogInformation("Player {0} sold his uservehicle {1} for {2} dollars", player.Name, userVehicle.Model.ToString(), backPrice); + + ChatService.SendMessage(player, $"~b~[INFO]~s~ Du hast durch den Autoverkauf ~g~{backPrice.ToMoneyString()}~s~ erhalten."); VehicleManager.DeleteVehicle(veh); dbContext.UserVehicles.Remove(userVehicle); player.SendNotification("~g~Du hast dein Fahrzeug verkauft"); } - else if(serverVehicle is FactionVehicle) + else if (serverVehicle is FactionVehicle) { FactionVehicle factionVehicle = dbContext.FactionVehicles.FirstOrDefault(v => v.Id == id); var backPrice = (int)(factionVehicle.BuyPrice * 1.5 * 0.4); user.Faction.BankAccount.Balance += backPrice; + logger.LogInformation("Player {0} sold thr factionvehicle {1} of faction {2} for {3} dollars", player.Name, factionVehicle.Model.ToString(), user.Faction.Id, backPrice); + ChatService.SendMessage(player, $"~b~[INFO]~s~ Die Fraktionskasse hat ~g~{backPrice.ToMoneyString()}~s~ erhalten."); VehicleManager.DeleteVehicle(VehicleManager.GetVehicleFromServerVehicle(factionVehicle)); dbContext.FactionVehicles.Remove(factionVehicle); player.SendNotification("~g~Du hast dein Fraktionsfahrzeug verkauft"); - } + } dbContext.SaveChanges(); } @@ -564,13 +572,13 @@ namespace ReallifeGamemode.Server.Managers ChatService.ErrorMessage(player, "Das Fahrzeug konnte nicht verkauft werden. Bitte melde dich bei der Leaderverwaltung"); return; } - + var backPrice = (int)(price.Price * 1.5 * 0.4); player.SetData("SellVehicleDecision", true); player.SetData("VehicleToSell", id); - ChatService.SendMessage(player, "~s~Möchtest du das Fahrzeug ~y~" + veh.DisplayName + " ~s~wirklich für ~g~" + backPrice.ToMoneyString() + " ~s~verkaufen? Drücke ~g~J~s~ zum Bestätigen oder ~r~N ~s~zum Abbrechen."); + ChatService.SendMessage(player, "~s~Möchtest du das Fahrzeug ~y~" + veh.DisplayName + " ~s~wirklich für ~g~" + backPrice.ToMoneyString() + " ~s~verkaufen? Drücke ~g~J~s~ zum Bestätigen oder ~r~N ~s~zum Abbrechen."); } } @@ -733,6 +741,7 @@ namespace ReallifeGamemode.Server.Managers fibBankAccount.Balance += (int)(ticket_amount / 100 * 60); lspdBankAccount.Balance += (int)(ticket_amount / 100 * 40); } + logger.LogInformation("Player {0} accepted a ticket of {1} dollars", player.Name, ticket_amount); dbContext.SaveChanges(); } target.ResetData("ticket_boolean"); @@ -798,6 +807,7 @@ namespace ReallifeGamemode.Server.Managers if (amount > 0 && amount <= 5000) { + logger.LogInformation("Player {0} did a local payment of {1} dollars to player {2}", player.Name, amount, target.Name); player.SendNotification($"~w~Du hast ~y~{targetname} ~w~{amount.ToMoneyString()} gegeben."); target.SendNotification($"~w~ Du hast von ~y~{playername} ~w~{amount.ToMoneyString()} erhalten.", true); diff --git a/ReallifeGamemode.Server/Managers/InventoryManager.cs b/ReallifeGamemode.Server/Managers/InventoryManager.cs index ffeb557b..e0dc309d 100644 --- a/ReallifeGamemode.Server/Managers/InventoryManager.cs +++ b/ReallifeGamemode.Server/Managers/InventoryManager.cs @@ -14,6 +14,8 @@ using ReallifeGamemode.Server.Services; using ReallifeGamemode.Server.Util; using ReallifeGamemode.Services; using ReallifeGamemode.Server.Types; +using Microsoft.Extensions.Logging; +using ReallifeGamemode.Server.Log; /** * @overview Life of German Reallife - Managers InventoryManager (InventoryManager.cs) @@ -25,6 +27,9 @@ namespace ReallifeGamemode.Server.Managers { public class InventoryManager : Script { + private const int MAX_USER_INVENTORY = 40000; + private static readonly ILogger logger = LogManager.GetLogger(); + public static List itemList; private static Dictionary TradeItems { get; set; } = new Dictionary(); @@ -224,7 +229,7 @@ namespace ReallifeGamemode.Server.Managers using (var context = new DatabaseContext()) { - List userItems = context.UserItems.ToList().FindAll(i => i.UserId == user.Id); + List userItems = context.UserItems.Where(i => i.UserId == user.Id).ToList(); foreach (var item in userItems) { IItem iItem = GetItemById(item.ItemId); @@ -381,7 +386,7 @@ namespace ReallifeGamemode.Server.Managers int setAmount = 0; for (int i = 1; i <= amount; i++) { - if (GetUserInventoryWeight(player) + (i * GetItemById(itemId).Gewicht) > 40000) + if (GetUserInventoryWeight(player) + (i * GetItemById(itemId).Gewicht) > MAX_USER_INVENTORY) { break; } @@ -589,7 +594,7 @@ namespace ReallifeGamemode.Server.Managers break; } context.SaveChanges(); - + } } @@ -608,6 +613,14 @@ namespace ReallifeGamemode.Server.Managers return; } + logger.LogInformation("Player {0} bought the item {1} for {2} dollars", client.Name, shopItem.Name, shopItem.Price); + + if (GetUserInventoryWeight(client) + shopItem.Gewicht > MAX_USER_INVENTORY) + { + + return; + } + UserItem item = dbContext.UserItems.Where(i => i.ItemId == shopItem.Id && i.UserId == user.Id).FirstOrDefault(); if (item == null) { diff --git a/ReallifeGamemode.Server/Managers/TuningManager.cs b/ReallifeGamemode.Server/Managers/TuningManager.cs index af39a796..c3834da0 100644 --- a/ReallifeGamemode.Server/Managers/TuningManager.cs +++ b/ReallifeGamemode.Server/Managers/TuningManager.cs @@ -2,14 +2,17 @@ using System.Collections.Generic; using System.Linq; using GTANetworkAPI; +using Microsoft.Extensions.Logging; using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Extensions; +using ReallifeGamemode.Server.Log; namespace ReallifeGamemode.Server.Managers { internal class TuningManager : Script { + private static readonly ILogger logger = LogManager.GetLogger(); private static List tuningGarages = new List(); public static void LoadTuningGarages() @@ -220,6 +223,7 @@ namespace ReallifeGamemode.Server.Managers ServerVehicle sV = player.Vehicle.GetServerVehicle(dbContext); if (sV == null) return; + logger.LogInformation("Player {0} bought a tuning part for server vehicle {1}, slot: {2}, mod: {3} for {4} dollars", player.Name, sV.Id, slot, index, price); VehicleMod vMod = dbContext.VehicleMods.FirstOrDefault(m => m.ServerVehicleId == sV.Id && m.Slot == slot); if (vMod == null && index != -1) @@ -265,7 +269,7 @@ namespace ReallifeGamemode.Server.Managers veh.SecondaryColor = color; } - using var dbContext = new DatabaseContext(true); + using var dbContext = new DatabaseContext(); ServerVehicle serverVeh = VehicleManager.GetServerVehicleFromVehicle(veh, dbContext); if (serverVeh == null) @@ -311,6 +315,7 @@ namespace ReallifeGamemode.Server.Managers if (serverVehicle != null) { + logger.LogInformation("Player {0} bought wheels for server vehicle {1}, type: {2}, wheels: {3} for {4} dollars", player.Name, serverVehicle.Id, wheelType, wheelIndex, price); VehicleMod typeMod = dbContext.VehicleMods.Where(m => m.ServerVehicleId == serverVehicle.Id && m.Slot == -2).FirstOrDefault(); if (typeMod == null) { diff --git a/ReallifeGamemode.Server/Util/Rentcar.cs b/ReallifeGamemode.Server/Util/Rentcar.cs index ff17b584..b5828f64 100644 --- a/ReallifeGamemode.Server/Util/Rentcar.cs +++ b/ReallifeGamemode.Server/Util/Rentcar.cs @@ -2,9 +2,11 @@ using System.Collections.Generic; using System.Text; using GTANetworkAPI; +using Microsoft.Extensions.Logging; using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Extensions; +using ReallifeGamemode.Server.Log; using ReallifeGamemode.Server.Managers; using ReallifeGamemode.Server.Services; @@ -12,6 +14,7 @@ namespace ReallifeGamemode.Server.Util { class Rentcar : Script { + private static readonly ILogger logger = LogManager.GetLogger(); //In Sekunden public static int PAY_TIMER = 180; @@ -69,6 +72,7 @@ namespace ReallifeGamemode.Server.Util { User user = player.GetUser(dbContext); user.BankAccount.Balance -= mapPlayerRentcarBill[player.Name].Item2; + logger.LogInformation("Player {0} cancelled a rent and payed {1} dollars", player.Name, mapPlayerRentcarBill[player.Name].Item2); dbContext.SaveChanges(); } @@ -105,9 +109,9 @@ namespace ReallifeGamemode.Server.Util { return; } - + player.TriggerEvent("BN_Show", "Fahrzeug seit ~b~" + (int)(time / 60) + "~w~ Minuten gemietet (Gesamtkosten: ~g~$~s~" + bill + ")."); - mapPlayerRentcarBill[player.Name] = (mapPlayerRentcarBill[player.Name].Item1, bill); + mapPlayerRentcarBill[player.Name] = (mapPlayerRentcarBill[player.Name].Item1, bill); } [RemoteEvent("SERVER:rentcarBooked")] From 7ad941cd91b0933b1e7eeb5246883c0af4133459 Mon Sep 17 00:00:00 2001 From: hydrant Date: Sat, 15 May 2021 10:18:38 +0200 Subject: [PATCH 19/82] remove db logs --- ReallifeGamemode.Server/Main.cs | 370 +++++++++--------- .../Managers/InteractionManager.cs | 2 +- .../WeaponDeal/WeaponDealManager.cs | 4 +- 3 files changed, 188 insertions(+), 188 deletions(-) diff --git a/ReallifeGamemode.Server/Main.cs b/ReallifeGamemode.Server/Main.cs index c50c6ce4..439d20df 100644 --- a/ReallifeGamemode.Server/Main.cs +++ b/ReallifeGamemode.Server/Main.cs @@ -29,212 +29,212 @@ using System.IO; namespace ReallifeGamemode.Server { - public class Main : Script + public class Main : Script + { + public static readonly Vector3 DEFAULT_SPAWN_POSITION = new Vector3(-1033.93603515625, -2731.572998046875, 13.756634712219238); + public static readonly float DEFAULT_SPAWN_HEADING = -32.23991012573242f; + + public static readonly CultureInfo SERVER_CULTURE = new CultureInfo("de-DE"); + + private Core.Events.EventHandler eventHandler; + + private readonly Mutex logMutex = new Mutex(false, "RAGE_MAIN_LOG_MUTEX"); + + public Main() { - public static readonly Vector3 DEFAULT_SPAWN_POSITION = new Vector3(-1033.93603515625, -2731.572998046875, 13.756634712219238); - public static readonly float DEFAULT_SPAWN_HEADING = -32.23991012573242f; + AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException; + } - public static readonly CultureInfo SERVER_CULTURE = new CultureInfo("de-DE"); - - private Core.Events.EventHandler eventHandler; - - private readonly Mutex logMutex = new Mutex(false, "RAGE_MAIN_LOG_MUTEX"); - - public Main() + [ServerEvent(Event.ResourceStart)] + public void OnResourceStart() + { + try + { + if (System.Environment.GetEnvironmentVariable("RAGEMP_UPDATE_DATABASE_ON_STARTUP", System.EnvironmentVariableTarget.User) == "true") { - AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException; - } + using var dbContext = new DatabaseContext(true); + + var pendingMigrations = dbContext.Database.GetPendingMigrations(); + + if (!pendingMigrations.Any()) + { + System.Console.WriteLine("No migrations to apply"); + } + else + { + System.Console.WriteLine("Applying {0} migrations", pendingMigrations.Count()); + foreach (var migration in pendingMigrations) + { + System.Console.WriteLine("\t{0}", migration); + } - [ServerEvent(Event.ResourceStart)] - public void OnResourceStart() - { try { - if (System.Environment.GetEnvironmentVariable("RAGEMP_UPDATE_DATABASE_ON_STARTUP", System.EnvironmentVariableTarget.User) == "true") - { - using var dbContext = new DatabaseContext(true); - - var pendingMigrations = dbContext.Database.GetPendingMigrations(); - - if (!pendingMigrations.Any()) - { - System.Console.WriteLine("No migrations to apply"); - } - else - { - System.Console.WriteLine("Applying {0} migrations", pendingMigrations.Count()); - foreach (var migration in pendingMigrations) - { - System.Console.WriteLine("\t{0}", migration); - } - - try - { - dbContext.Database.Migrate(); - } - catch (System.Exception e) - { - System.Console.WriteLine("Error while updating database: {0}", e.ToString()); - System.Console.ReadLine(); - System.Environment.Exit(1); - } - - System.Console.WriteLine("Migrations successfull"); - } - } - - var methods = Assembly.GetExecutingAssembly() - .GetTypes() - .SelectMany(t => t.GetMethods()) - .Where(m => m.GetCustomAttributes(typeof(CommandAttribute), false).Length > 0) - .ToArray(); - - var cmdAttributes = methods.Select(c => c.GetCustomAttribute()).ToList(); - - var registeredCommands = cmdAttributes.Select(c => c.CommandString).ToList(); - cmdAttributes.Where(c => c.Alias?.Any() ?? false).ToList().ForEach(a => - { - registeredCommands.AddRange(a.Alias.Split(',')); - }); - - IAPI apiInstance = new RageAPI(); - eventHandler = new Core.Events.EventHandler(apiInstance); - - new Core.Main(apiInstance, eventHandler, registeredCommands.ToArray()); - - NAPI.Server.SetGlobalServerChat(false); - - NAPI.Server.SetCommandErrorMessage(""); - NAPI.Server.SetDefaultSpawnLocation(DEFAULT_SPAWN_POSITION, DEFAULT_SPAWN_HEADING); - NAPI.Server.SetAutoSpawnOnConnect(false); - NAPI.Server.SetAutoRespawnAfterDeath(false); - NAPI.Data.SetWorldData("playerCreatorDimension", 0); - - JsonConvert.DefaultSettings = () => - { - return new JsonSerializerSettings() - { - NullValueHandling = NullValueHandling.Ignore - }; - }; - - InventoryManager.LoadItems(); - ShopManager.LoadClotheShops(); - ShopManager.LoadItemShops(); - ShopManager.LoadFriseur(); - ShopManager.LoadAmmunations(); - TuningManager.LoadTuningGarages(); - - TimeManager.StartTimeManager(); - VehicleManager.CheckEnabledMods(); - - DatabaseHelper.InitDatabaseFirstTime(); - - FactionHelper.CheckFactionBankAccounts(); - BusinessManager.LoadBusinesses(); - //InteriorManager.LoadInteriors(); - DoorManager.LoadDoors(); - ATMManager.InitATMs(); - CityHallManager.LoadCityHall(); - JobManager.LoadJobs(); - //TaxiDriverJob.StartTaxiTimer(); Obselete - //HouseManager.LoadHouses(); - DrivingSchool.DrivingSchool.Setup(); - PlaneSchool.Setup(); - Gangwar.Gangwar.loadTurfs(); - Bank.Bank.Setup(); - Introduction.Setup(); - PositionManager.LoadPositionManager(); - LoadManager.LoadLoadManager(); - Rentcar.Setup(); - - World.WeatherSync.Load(); - - TempBlip tempBlip = new TempBlip() - { - Color = 1, - Name = "", - Transparency = 0, - ShortRange = true, - Sprite = 1, - Scale = 1, - }; - - NAPI.Data.SetWorldData("blipTemplate", tempBlip); - - //WantedEscapeTimer.WantedTimer(); Obselete - //Jail.JailTimer(); Obselete - //Economy.PaydayTimer(); Obselete - // WeaponDealManager.WeaponDealTimer(); Obselete - - ThreadTimers.StartAllTimers(); - - Managers.SVarManager.LoadSVars(); - - UserBankAccount.BalanceChanged += (account) => - { - using (var dbContext = new DatabaseContext()) - { - var user = dbContext.Users.Where(u => u.BankAccountId == account.Id).Select(u => u.Name).FirstOrDefault(); - if (user == null) - { - return; - } - - Player player = PlayerService.GetPlayerByNameOrId(user); - if (player == null) - { - return; - } - - player.TriggerEvent("updateMoney", account.Balance); - } - }; - - User.HandMoneyChanged += (user) => - { - user.Player.TriggerEvent("SERVER:SET_HANDMONEY", user.Handmoney); - }; - - //IPLS - NAPI.World.RequestIpl("vw_casino_garage"); - + dbContext.Database.Migrate(); } - catch (Exception e) + catch (System.Exception e) { - Log(e.ToString()); + System.Console.WriteLine("Error while updating database: {0}", e.ToString()); + System.Console.ReadLine(); + System.Environment.Exit(1); } + + System.Console.WriteLine("Migrations successfull"); + } } - private void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e) + var methods = Assembly.GetExecutingAssembly() + .GetTypes() + .SelectMany(t => t.GetMethods()) + .Where(m => m.GetCustomAttributes(typeof(CommandAttribute), false).Length > 0) + .ToArray(); + + var cmdAttributes = methods.Select(c => c.GetCustomAttribute()).ToList(); + + var registeredCommands = cmdAttributes.Select(c => c.CommandString).ToList(); + cmdAttributes.Where(c => c.Alias?.Any() ?? false).ToList().ForEach(a => { - Log(e.ExceptionObject.ToString()); - } + registeredCommands.AddRange(a.Alias.Split(',')); + }); - private void Log(string message) + IAPI apiInstance = new RageAPI(); + eventHandler = new Core.Events.EventHandler(apiInstance); + + new Core.Main(apiInstance, eventHandler, registeredCommands.ToArray()); + + NAPI.Server.SetGlobalServerChat(false); + + NAPI.Server.SetCommandErrorMessage(""); + NAPI.Server.SetDefaultSpawnLocation(DEFAULT_SPAWN_POSITION, DEFAULT_SPAWN_HEADING); + NAPI.Server.SetAutoSpawnOnConnect(false); + NAPI.Server.SetAutoRespawnAfterDeath(false); + NAPI.Data.SetWorldData("playerCreatorDimension", 0); + + JsonConvert.DefaultSettings = () => { - string basePath = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location); - string log = Path.Combine(basePath, "log.txt"); + return new JsonSerializerSettings() + { + NullValueHandling = NullValueHandling.Ignore + }; + }; - logMutex.WaitOne(); + InventoryManager.LoadItems(); + ShopManager.LoadClotheShops(); + ShopManager.LoadItemShops(); + ShopManager.LoadFriseur(); + ShopManager.LoadAmmunations(); + TuningManager.LoadTuningGarages(); - if (!File.Exists(log)) + TimeManager.StartTimeManager(); + VehicleManager.CheckEnabledMods(); + + DatabaseHelper.InitDatabaseFirstTime(); + + FactionHelper.CheckFactionBankAccounts(); + BusinessManager.LoadBusinesses(); + //InteriorManager.LoadInteriors(); + DoorManager.LoadDoors(); + ATMManager.InitATMs(); + CityHallManager.LoadCityHall(); + JobManager.LoadJobs(); + //TaxiDriverJob.StartTaxiTimer(); Obselete + //HouseManager.LoadHouses(); + DrivingSchool.DrivingSchool.Setup(); + PlaneSchool.Setup(); + Gangwar.Gangwar.loadTurfs(); + Bank.Bank.Setup(); + Introduction.Setup(); + PositionManager.LoadPositionManager(); + LoadManager.LoadLoadManager(); + Rentcar.Setup(); + + World.WeatherSync.Load(); + + TempBlip tempBlip = new TempBlip() + { + Color = 1, + Name = "", + Transparency = 0, + ShortRange = true, + Sprite = 1, + Scale = 1, + }; + + NAPI.Data.SetWorldData("blipTemplate", tempBlip); + + //WantedEscapeTimer.WantedTimer(); Obselete + //Jail.JailTimer(); Obselete + //Economy.PaydayTimer(); Obselete + // WeaponDealManager.WeaponDealTimer(); Obselete + + ThreadTimers.StartAllTimers(); + + Managers.SVarManager.LoadSVars(); + + UserBankAccount.BalanceChanged += (account) => + { + using (var dbContext = new DatabaseContext()) + { + var user = dbContext.Users.Where(u => u.BankAccountId == account.Id).Select(u => u.Name).FirstOrDefault(); + if (user == null) { - File.Create(log); + return; } - string msg = $"[{DateTime.Now:s}] - Error: {message}{Environment.NewLine}"; + Player player = PlayerService.GetPlayerByNameOrId(user); + if (player == null) + { + return; + } - File.AppendAllText(log, msg); + player.TriggerEvent("updateMoney", account.Balance); + } + }; - logMutex.ReleaseMutex(); - } - - [RemoteEvent("CLIENT:Event")] - public void OnClientEvent(Player player, string dataStr) + User.HandMoneyChanged += (user) => { - var data = dataStr.DeserializeJson>(); - eventHandler.HandleEvent(new RagePlayer(player), data); - } + user.Player.TriggerEvent("SERVER:SET_HANDMONEY", user.Handmoney); + }; + + //IPLS + NAPI.World.RequestIpl("vw_casino_garage"); + + } + catch (Exception e) + { + Log(e.ToString()); + } } + + private void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e) + { + Log(e.ExceptionObject.ToString()); + } + + private void Log(string message) + { + string basePath = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location); + string log = Path.Combine(basePath, "log.txt"); + + logMutex.WaitOne(); + + if (!File.Exists(log)) + { + File.Create(log); + } + + string msg = $"[{DateTime.Now:s}] - Error: {message}{Environment.NewLine}"; + + File.AppendAllText(log, msg); + + logMutex.ReleaseMutex(); + } + + [RemoteEvent("CLIENT:Event")] + public void OnClientEvent(Player player, string dataStr) + { + var data = dataStr.DeserializeJson>(); + eventHandler.HandleEvent(new RagePlayer(player), data); + } + } } diff --git a/ReallifeGamemode.Server/Managers/InteractionManager.cs b/ReallifeGamemode.Server/Managers/InteractionManager.cs index 4d799e80..d6d6e0ed 100644 --- a/ReallifeGamemode.Server/Managers/InteractionManager.cs +++ b/ReallifeGamemode.Server/Managers/InteractionManager.cs @@ -55,7 +55,7 @@ namespace ReallifeGamemode.Server.Managers return; } - using (var dbContext = new DatabaseContext(true)) + using (var dbContext = new DatabaseContext()) { User u = leader.GetUser(dbContext); User own = player.GetUser(dbContext); diff --git a/ReallifeGamemode.Server/WeaponDeal/WeaponDealManager.cs b/ReallifeGamemode.Server/WeaponDeal/WeaponDealManager.cs index 2d430b6a..0f26f7cf 100644 --- a/ReallifeGamemode.Server/WeaponDeal/WeaponDealManager.cs +++ b/ReallifeGamemode.Server/WeaponDeal/WeaponDealManager.cs @@ -43,7 +43,7 @@ namespace ReallifeGamemode.Server.WeaponDeal return; } - using (var context = new DatabaseContext(true)) + using (var context = new DatabaseContext()) { FactionVehicle factionVehicle = context.FactionVehicles.Where(f => f.Model == WEAPON_DEAL_GANG_VEHICLE_HASH || f.Model == WEAPON_DEAL_STAATSFRAK_VEHICLE_HASH) .ToList() @@ -130,7 +130,7 @@ namespace ReallifeGamemode.Server.WeaponDeal Faction fac = context.Factions.Where(f => f.Id == user.FactionId).FirstOrDefault(); fac.WeaponDealTime = (fac.Id == 1 | fac.Id == 3) ? 180 : 60; - context.SaveChanges(); + context.SaveChanges(); } } From 2c09e6961f439b1be95edf8daa7b0b3ee18f5b88 Mon Sep 17 00:00:00 2001 From: hydrant Date: Sat, 15 May 2021 10:22:15 +0200 Subject: [PATCH 20/82] =?UTF-8?q?fix=20error=20bei=20auto=20auf/abschlie?= =?UTF-8?q?=C3=9Fen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ReallifeGamemode.Server/Events/Key.cs | 2 +- ReallifeGamemode.Server/Events/Vehicle.cs | 18 ++++-------------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs index 15af42c2..22b9e783 100644 --- a/ReallifeGamemode.Server/Events/Key.cs +++ b/ReallifeGamemode.Server/Events/Key.cs @@ -963,7 +963,7 @@ namespace ReallifeGamemode.Server.Events } [RemoteEvent("keyPress:Z")] - public void KeyPressX(Player player) + public void KeyPressZ(Player player) { if (!player.IsLoggedIn() || player.GetData("isDead")) return; diff --git a/ReallifeGamemode.Server/Events/Vehicle.cs b/ReallifeGamemode.Server/Events/Vehicle.cs index b35b9dd3..ff21e6d8 100644 --- a/ReallifeGamemode.Server/Events/Vehicle.cs +++ b/ReallifeGamemode.Server/Events/Vehicle.cs @@ -140,14 +140,9 @@ namespace ReallifeGamemode.Server.Events { ServerVehicle carlocked = v.GetServerVehicle(dbContext); - if (state == true) + if (carlocked != null) { - carlocked.Locked = true; - dbContext.SaveChanges(); - } - else - { - carlocked.Locked = false; + carlocked.Locked = state; dbContext.SaveChanges(); } } @@ -208,14 +203,9 @@ namespace ReallifeGamemode.Server.Events { ServerVehicle carlocked = vehicle.GetServerVehicle(dbContext); - if (state == true) + if (carlocked != null) { - carlocked.Locked = true; - dbContext.SaveChanges(); - } - else - { - carlocked.Locked = false; + carlocked.Locked = state; dbContext.SaveChanges(); } } From e4e3bd0fbf0fa109c180f6bafaacee7c26970703 Mon Sep 17 00:00:00 2001 From: hydrant Date: Sat, 15 May 2021 10:22:27 +0200 Subject: [PATCH 21/82] fix error bei waffenschein kaufen --- ReallifeGamemode.Server.Core/Menus/PoliceDepartment.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReallifeGamemode.Server.Core/Menus/PoliceDepartment.cs b/ReallifeGamemode.Server.Core/Menus/PoliceDepartment.cs index 67021b46..9bff07a7 100644 --- a/ReallifeGamemode.Server.Core/Menus/PoliceDepartment.cs +++ b/ReallifeGamemode.Server.Core/Menus/PoliceDepartment.cs @@ -47,7 +47,7 @@ namespace ReallifeGamemode.Server.Core.Menus return; } - Log.LogInformation("Player {0} bought a weapon license for {1} dollars", player.Name); + Log.LogInformation("Player {0} bought a weapon license for {1} dollars", player.Name, WEAPONLICENSE_PRICE); account.Balance -= WEAPONLICENSE_PRICE; From 104615774746f95d7dca5cf8c19ec6c908fa6fb5 Mon Sep 17 00:00:00 2001 From: Fabian Date: Sat, 8 May 2021 02:16:16 +0200 Subject: [PATCH 22/82] Lol --- .../Jobs/FarmerFieldSelect.ts | 134 +++++++++++++ ReallifeGamemode.Client/Player/polygons.ts | 1 - ReallifeGamemode.Client/index.ts | 3 + ReallifeGamemode.Server/Events/Key.cs | 37 ++++ ReallifeGamemode.Server/Job/FarmerJob.cs | 176 ++++++++++++++++++ .../Managers/PositionManager.cs | 13 ++ 6 files changed, 363 insertions(+), 1 deletion(-) create mode 100644 ReallifeGamemode.Client/Jobs/FarmerFieldSelect.ts create mode 100644 ReallifeGamemode.Server/Job/FarmerJob.cs diff --git a/ReallifeGamemode.Client/Jobs/FarmerFieldSelect.ts b/ReallifeGamemode.Client/Jobs/FarmerFieldSelect.ts new file mode 100644 index 00000000..d89c7f32 --- /dev/null +++ b/ReallifeGamemode.Client/Jobs/FarmerFieldSelect.ts @@ -0,0 +1,134 @@ +import * as NativeUI from '../libs/NativeUI'; + +var fieldSelectColShape = mp.colshapes.newCircle(2415.229, 4993.037, 46.230038); +const Menu = NativeUI.Menu; +var fieldMenu: NativeUI.Menu; +const Point = NativeUI.Point; +const UIMenuListItem = NativeUI.UIMenuListItem; +const ItemsCollection = NativeUI.ItemsCollection; +const UIMenuItem = NativeUI.UIMenuItem; +const Color = NativeUI.Color; + +let sendItem = new UIMenuItem("Starten", "Route starten"); +sendItem.BackColor = new Color(13, 71, 161); +sendItem.HighlightedBackColor = new Color(25, 118, 210); + +let cancelItem = new UIMenuItem("Abbrechen", ""); +cancelItem.BackColor = new Color(213, 0, 0); +cancelItem.HighlightedBackColor = new Color(229, 57, 53); + +let screenRes = mp.game.graphics.getScreenResolution(0, 0); +var checkpoint = new mp.Vector3(2416.3723, 4993.94, 45); + +export default function farmerFieldList(globalData: IGlobalData) { + var skillSelect; + var skill = 60; + var fieldSelected = false; + var fieldSelect; + + mp.events.add(RageEnums.EventKey.PLAYER_EXIT_COLSHAPE, (colshape) => { + if (colshape == fieldSelectColShape) { + if (fieldMenu && fieldMenu.Visible) { + fieldMenu.Close(); + } + } + }); + + mp.events.add('SERVER:selectField', () => { + + skill = 100; + + if (!globalData.InMenu) { + globalData.InMenu = true; + + skillSelect = ["Knecht (1)", "Hilfsarbeiter (2)", "Ackersmann (3)", "Landwirt (4)", "Ökonom (5)"]; + + fieldMenu = new Menu("Bus Job", "", new Point(0, screenRes.y / 3), null, null); + fieldMenu.AddItem(new UIMenuListItem("Stufe wählen", "", new ItemsCollection(skillSelect))); + fieldSelect = "Anfänger"; + fieldMenu.AddItem(sendItem); + fieldMenu.AddItem(cancelItem); + fieldMenu.Visible = true; + + fieldMenu.ListChange.on((item, index) => { + switch (item.Text) { + case "Stufe wählen": + fieldSelect = String(item.SelectedItem.DisplayText); + break; + } + }); + + fieldMenu.ItemSelect.on((item) => { + if (item.Text === "Starten") { + + if (fieldSelect == skillSelect[1] && skill < 5) { + mp.game.audio.playSoundFrontend(1, "Hack_Failed", "DLC_HEIST_BIOLAB_PREP_HACKING_SOUNDS", true); + } + else if (fieldSelect == skillSelect[2] && skill < 10) { + mp.game.audio.playSoundFrontend(1, "Hack_Failed", "DLC_HEIST_BIOLAB_PREP_HACKING_SOUNDS", true); + } + else if (fieldSelect == skillSelect[3] && skill < 25) { + mp.game.audio.playSoundFrontend(1, "Hack_Failed", "DLC_HEIST_BIOLAB_PREP_HACKING_SOUNDS", true); + } + else if (fieldSelect == skillSelect[4] && skill < 50) { + mp.game.audio.playSoundFrontend(1, "Hack_Failed", "DLC_HEIST_BIOLAB_PREP_HACKING_SOUNDS", true); + } + else { + mp.events.callRemote("CLIENT:StartFieldSelected", fieldSelect); + fieldSelected = true; + fieldMenu.Close(); + globalData.InMenu = false; + } + + + } else if (item.Text === "Abbrechen") { + fieldMenu.Close(); + } + }); + + fieldMenu.MenuClose.on(() => { + if (!fieldSelected) { + //mp.events.callRemote("CLIENT:Job_StopJob"); + } + fieldSelected = false; + globalData.InMenu = false; + }); + } + }); + + var activeCheckpoint; + var activeBlip = null; + var myVar; + var activeCheckpointId; + + mp.events.add('farmerSetCheckpoint', (position, markerId, markerSize, cpId) => { + activeCheckpointId = cpId; + + activeCheckpoint = mp.markers.new(markerId, position, markerSize, { + color: [255, 0, 0, 150], + visible: true, + dimension: 0 + }); + + activeBlip = mp.blips.new(1, position, + { + color: 33, + alpha: 255, + shortRange: false, + }); + activeBlip.setRoute(true); + activeBlip.setRouteColour(33); + + clearInterval(myVar); + myVar = setInterval(checkpointTimer, 50); + }); + + function checkpointTimer() { + let dist = mp.game.gameplay.getDistanceBetweenCoords(mp.players.local.position.x, mp.players.local.position.y, 0, checkpoint.x, checkpoint.y, 0, false); + + if (dist <= 2) { + clearInterval(myVar); + activeCheckpoint.destroy(); + } + } +} \ No newline at end of file diff --git a/ReallifeGamemode.Client/Player/polygons.ts b/ReallifeGamemode.Client/Player/polygons.ts index 6c755cbf..75cd2f87 100644 --- a/ReallifeGamemode.Client/Player/polygons.ts +++ b/ReallifeGamemode.Client/Player/polygons.ts @@ -57,7 +57,6 @@ const muellbaseVector2 = new mp.Vector3(454.88348, -2158.1938, 5.9788494); const muellbaseVector3 = new mp.Vector3(529.06635, -2088.4097, 8.303088); const krankenhausVector1 = new mp.Vector3(-508.50705, -351.24368, 34); -//const krankenhausVector2 = new mp.Vector3(-437.00146, -357.10526, 32.735916 const krankenhausVector2 = new mp.Vector3(-442.62323, -356.99185, 33); const krankenhausVector3 = new mp.Vector3(-448.9346, -297.23972, 33.68); const krankenhausVector4 = new mp.Vector3(-504.952, -315.21698, 35.04881); diff --git a/ReallifeGamemode.Client/index.ts b/ReallifeGamemode.Client/index.ts index e1b91d2d..e3ed1f78 100644 --- a/ReallifeGamemode.Client/index.ts +++ b/ReallifeGamemode.Client/index.ts @@ -268,6 +268,9 @@ antiAfk(globalData); import ammunation from './Interaction/ammunation/ammunation'; ammunation(globalData); +import farmerFieldList from './Jobs/FarmerFieldSelect'; +farmerFieldList(globalData); + import handsup from './Player/handsup'; handsup(); diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs index 22b9e783..07a412e6 100644 --- a/ReallifeGamemode.Server/Events/Key.cs +++ b/ReallifeGamemode.Server/Events/Key.cs @@ -585,6 +585,43 @@ namespace ReallifeGamemode.Server.Events } } + if (player.Position.DistanceTo(FarmerJob.POSITION_SCHEUNE) <= 1.5) + { + if (JobManager.GetJob().GetUsersInJob().Contains(player)) + { + player.TriggerEvent("SERVER:selectField"); + return; + } + } + + if (player.Position.DistanceTo(FarmerJob.POSITION_FAHRZEUGHALLE) <= 1.5) + { + if (FarmerJob.playersWaitingForVehicle.Contains(player) || true) + { + FarmerJob.spawnVehicle(player); + return; + } + } + + if (CharacterCreator.surgeryPoint.DistanceTo(player.Position) <= 1.5) + { + if (user.GetData("duty")) + { + player.SendNotification("~r~Im Dienst kannst du nicht operiert werden", false); + return; + } + if (JobBase.GetPlayerInJob().Contains(player)) + { + player.SendNotification("~r~Im aktiven Job kannst du nicht operiert werden", false); + return; + } + if (user.Wanteds > 0) + { + player.SendNotification("~r~Wenn du gesucht wirst kannst du nicht operiert werden", false); + return; + } + } + //if (CharacterCreator.surgeryPoint.DistanceTo(player.Position) <= 1.5) //{ // if (user.GetData("duty")) diff --git a/ReallifeGamemode.Server/Job/FarmerJob.cs b/ReallifeGamemode.Server/Job/FarmerJob.cs new file mode 100644 index 00000000..f6504b76 --- /dev/null +++ b/ReallifeGamemode.Server/Job/FarmerJob.cs @@ -0,0 +1,176 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using GTANetworkAPI; +using ReallifeGamemode.Database.Entities; +using ReallifeGamemode.Database.Models; +using ReallifeGamemode.Server.Extensions; + +namespace ReallifeGamemode.Server.Job +{ + public class FarmerJob : JobBase + { + public override int Id => 5; + + public override string Name => "Farmer"; + + public override bool NeedVehicleToStart => false; + + public override bool Deactivated => false; + + private static FarmerJob _Instance; + + public static Vector3 POSITION_JOB_START = new Vector3(2434.2983, 4976.952, 46.571423); + public static Vector3 POSITION_SCHEUNE = new Vector3(2416.3723, 4993.94, 45); + public static Vector3 POSITION_SCHEUNE_LABEL = new Vector3(2416.3723, 4993.94, 46); + public static Vector3 POSITION_FAHRZEUGHALLE = new Vector3(2494.346, 4964.773, 43.5833); + public static Vector3 POSITION_FAHRZEUGHALLE_LABEL = new Vector3(2494.346, 4964.773, 44.5833); + + private static TextLabel labelScheune = null; + private static TextLabel labelFahrzeughalle = null; + + public static List playersWaitingForVehicle = new List(); + public static Dictionary playerHasField = new Dictionary(); + + private static readonly Dictionary VEHICLE_SPAWNS = new Dictionary + { + { new Vector3(2500.026, 4982.7485, 44.50283), (float)-148.8139 }, + { new Vector3(2511.2246, 4981.6924, 44.722702), (float)139.25208 }, + { new Vector3(2518.3486, 4977.3125, 44.716434), (float)131.3338 }, + { new Vector3(2522.8215, 4966.823, 44.53701), (float)118.17867 } + }; + + private static int spawnIndex = 0; + + public static readonly List CHECKPOINTS_FIELD1 = new List() + { + new Vector3(2335.83984375, 5114.8525390625, 47.83000183105469), + new Vector3(2295.81201171875, 5153.26123046875, 54.64070129394531), + new Vector3(2277.558837890625, 5139.4453125, 53.3763542175293), + new Vector3(2318.217041015625, 5099.271484375, 46.98373031616211), + new Vector3(2283.467041015625, 5066.1025390625, 45.97780227661133), + new Vector3(), + new Vector3(), + new Vector3(), + new Vector3(), + new Vector3(), + new Vector3(), + new Vector3(), + new Vector3(), + new Vector3(), + new Vector3(), + new Vector3(), + new Vector3(), + new Vector3(), + new Vector3(), + new Vector3() + }; + + public FarmerJob() + { + JobStart += FarmerDriverJobJobStart; + JobStop += FarmerDriverJobJobStop; + } + + public static FarmerJob GetInstance() + { + if (_Instance == null) + _Instance = new FarmerJob(); + return _Instance; + } + private void FarmerDriverJobJobStart(Player player) + { + labelScheune = NAPI.TextLabel.CreateTextLabel("Scheune - Drücke ~y~E ~w~um ein Feld auszuwählen", POSITION_SCHEUNE_LABEL, 15, 1, 0, new Color(255, 255, 255), false, 0); + + player.SendChatMessage("~y~[JOB]~w~ Begebe dich zur Scheune um Felder zu pachten"); + player.TriggerEvent("farmerSetCheckpoint", POSITION_SCHEUNE, 1, 1, "scheune"); + } + private void FarmerDriverJobJobStop(Player player) + { + player.SendChatMessage("Job stop"); + } + + [RemoteEvent("CLIENT:StartFieldSelected")] + public void startFieldSelected(Player player, String field) + { + labelScheune.Delete(); + labelFahrzeughalle = NAPI.TextLabel.CreateTextLabel("Fahrzeughalle - Drücke ~y~E ~w~um dir ein Fahrzeug zu holen", POSITION_FAHRZEUGHALLE_LABEL, 15, 1, 0, new Color(255, 255, 255), false, 0); + player.SendChatMessage("~y~[JOB]~w~ Begebe dich zur nun zur Fahrzeughalle um dein Fahrzeug abzuholen"); + player.TriggerEvent("farmerSetCheckpoint", POSITION_FAHRZEUGHALLE, 1, 1, "fahrzeughalle"); + playersWaitingForVehicle.Add(player); + playerHasField.Add(player, field); + } + + public static void spawnVehicle(Player player) + { + if (!playerHasField.ContainsKey(player)) + playerHasField.Add(player, "Landwirt (4)"); + + player.SendChatMessage("player " + player.Name + " with field " + playerHasField[player]); + + //NEXT: verschiedene spawnpositionen für fahrzeuge in VEHICLE_SPAWNS + + //Vector3 spawnPoint = VEHICLE_SPAWNS[spawnIndex++ % VEHICLE_SPAWNS.Count]; + Random rnd = new Random(); + spawnIndex = rnd.Next(VEHICLE_SPAWNS.Count); + + Vector3 spawnPoint = VEHICLE_SPAWNS.ElementAt(spawnIndex).Key; + float vehicleHeading = VEHICLE_SPAWNS[spawnPoint]; + Vehicle vehicle = null; + + if (playerHasField[player] == "Knecht (1)") + { + vehicle = NAPI.Vehicle.CreateVehicle(0x61D6BA8C, spawnPoint, vehicleHeading, 111, 111, "JOB"); + } else if (playerHasField[player] == "Hilfsarbeiter (2)") + { + vehicle = NAPI.Vehicle.CreateVehicle(0x61D6BA8C, spawnPoint, vehicleHeading, 111, 111, "JOB"); + } + else if (playerHasField[player] == "Ackersmann (3)") + { + vehicle = NAPI.Vehicle.CreateVehicle(0x843B73DE, spawnPoint, vehicleHeading, 111, 111, "JOB"); + } + else if (playerHasField[player] == "Landwirt (4)") + { + vehicle = NAPI.Vehicle.CreateVehicle(0x843B73DE, spawnPoint, vehicleHeading, 111, 111, "JOB"); + } + else if (playerHasField[player] == "Ökonom(5)") + { + vehicle = NAPI.Vehicle.CreateVehicle(0x843B73DE, spawnPoint, vehicleHeading, 111, 111, "JOB"); + } + + vehicle.NumberPlate = "JOB-" + vehicle.Id; + + _CHANGING_VEHICLE.Add(player); + if (playerVehiclePair.ContainsKey(player)) + { + Vehicle previousVehicle = null; + if (playerVehiclePair[player] != null) + previousVehicle = playerVehiclePair[player]; + playerVehiclePair.Remove(player); + + previousVehicle?.Delete(); + } + playerVehiclePair.Add(player, vehicle); + + player.SetIntoVehicle(vehicle.Handle, 0); + + } + + public override void LastCheckpoint(Player player) + { + //nothing + } + + public override void StartJobEndTimer(Player player) + { + //nothing + } + + public override bool CheckVehicle(Player player, Vehicle vehicle) + { + //nothig, kack jobsystem + return false; + } + } +} diff --git a/ReallifeGamemode.Server/Managers/PositionManager.cs b/ReallifeGamemode.Server/Managers/PositionManager.cs index d07d9e46..76e9ad3f 100644 --- a/ReallifeGamemode.Server/Managers/PositionManager.cs +++ b/ReallifeGamemode.Server/Managers/PositionManager.cs @@ -9,6 +9,7 @@ using ReallifeGamemode.Server.Extensions; using ReallifeGamemode.Server.Shop.Ammunation; using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Database.Models; +using ReallifeGamemode.Server.Job; namespace ReallifeGamemode.Server.Managers @@ -207,11 +208,18 @@ namespace ReallifeGamemode.Server.Managers jobId = 4, Skill = 0 }; + JobPoint jobPointFarmer = new JobPoint() + { + Position = FarmerJob.POSITION_JOB_START, + jobId = 5, + Skill = 0 + }; JobPoints.Add(jobPointRefuseCollector); JobPoints.Add(jobPointPilot); JobPoints.Add(jobPointPilot2); JobPoints.Add(jobPointBusDriver); + JobPoints.Add(jobPointFarmer); foreach (JobPoint p in JobPoints) { @@ -240,6 +248,11 @@ namespace ReallifeGamemode.Server.Managers NAPI.TextLabel.CreateTextLabel("Busfahrer - Dr\u00fccke ~y~E~s~ um Job zu starten/beenden", p.Position, 15, 1, 0, new Color(255, 255, 255), false, 0); NAPI.Blip.CreateBlip(513, p.Position, 1f, 16, "Busfahrer", 255, 0, true); } + if (p.jobId == 5) + { + NAPI.TextLabel.CreateTextLabel("Farmer - Dr\u00fccke ~y~E~s~ um Job zu starten/beenden", p.Position, 15, 1, 0, new Color(255, 255, 255), false, 0); + NAPI.Blip.CreateBlip(369, p.Position, 1f, 16, "Farmer", 255, 0, true); + } } #endregion JobPoints From 5a6ccf4991c5c5fa6fa2324ef664e268254139ba Mon Sep 17 00:00:00 2001 From: Fabian Date: Sat, 15 May 2021 14:25:42 +0200 Subject: [PATCH 23/82] 50 wanteds bugg --- ReallifeGamemode.Server/Extensions/ClientExtension.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ReallifeGamemode.Server/Extensions/ClientExtension.cs b/ReallifeGamemode.Server/Extensions/ClientExtension.cs index 2b57264b..c7af71aa 100644 --- a/ReallifeGamemode.Server/Extensions/ClientExtension.cs +++ b/ReallifeGamemode.Server/Extensions/ClientExtension.cs @@ -222,12 +222,13 @@ namespace ReallifeGamemode.Server.Extensions internal static void GiveWanteds(this User user, Player cop, int amount, string reason) { - if (user.Wanteds + amount > 50) + int newWanteds = user.Wanteds + amount; + if (newWanteds > 50) { ChatService.ErrorMessage(cop, "Die Wanteds dürfen ein Limit von 50 nicht überschreiten"); - return; + newWanteds = 50; } - int newWanteds = user.Wanteds + amount; + using (var dbContext = new DatabaseContext()) { User dbUser = dbContext.Users.Where(u => u.Id == user.Id).FirstOrDefault(); From 28dfca0034bc14fad25e9af8286f23fb3abd9a3e Mon Sep 17 00:00:00 2001 From: hydrant Date: Sun, 16 May 2021 14:47:33 +0200 Subject: [PATCH 24/82] fix gangwar server crash --- ReallifeGamemode.Server/Gangwar/Turf.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ReallifeGamemode.Server/Gangwar/Turf.cs b/ReallifeGamemode.Server/Gangwar/Turf.cs index 88573919..58f29fb1 100644 --- a/ReallifeGamemode.Server/Gangwar/Turf.cs +++ b/ReallifeGamemode.Server/Gangwar/Turf.cs @@ -280,7 +280,7 @@ namespace ReallifeGamemode.Server.Gangwar a.TriggerEvent("CLIENT:loose"); } ownerFaction.BankAccount.Balance += 15000; - logger.LogInformation("Gang {0} successfully defended the turf {1} against gang {2} and gained {3} dollars", getOwner(), getAttacker(), 15000); + logger.LogInformation("Gang {0} successfully defended the turf {1} against gang {2} and gained {3} dollars", getOwner(), getName(), getAttacker(), 15000); } else if (getOwner() != FactionName) { @@ -297,7 +297,7 @@ namespace ReallifeGamemode.Server.Gangwar if (a != null) a.TriggerEvent("CLIENT:win"); } - logger.LogInformation("Gang {0} successfully took over the turf {1} from gang {2} and gained {3} dollars", getAttacker(), getOwner(), 10000); + logger.LogInformation("Gang {0} successfully took over the turf {1} from gang {2} and gained {3} dollars", getAttacker(), getName(), getOwner(), 10000); this.Owner = FactionName; attackerFaction.BankAccount.Balance += 10000; Turfs turf = dbContext.Turfs.Where(t => t.Id == getId()).FirstOrDefault(); From 223fc1da4f87d902a8f6306384b13fdf71a06d8b Mon Sep 17 00:00:00 2001 From: Fabian Date: Sun, 16 May 2021 19:27:33 +0200 Subject: [PATCH 25/82] FARMER DEAKTIVIERT DA NICHT FERTIG @HYDRANT XDD --- ReallifeGamemode.Server/Job/FarmerJob.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReallifeGamemode.Server/Job/FarmerJob.cs b/ReallifeGamemode.Server/Job/FarmerJob.cs index f6504b76..731c0fe8 100644 --- a/ReallifeGamemode.Server/Job/FarmerJob.cs +++ b/ReallifeGamemode.Server/Job/FarmerJob.cs @@ -17,7 +17,7 @@ namespace ReallifeGamemode.Server.Job public override bool NeedVehicleToStart => false; - public override bool Deactivated => false; + public override bool Deactivated => true; private static FarmerJob _Instance; From 70d40df7ca2d119a22c3cd8b79aaccee8a2d567f Mon Sep 17 00:00:00 2001 From: Luke Date: Sun, 16 May 2021 20:46:14 +0200 Subject: [PATCH 26/82] /aunshow und NoClip auf Admin 1 --- ReallifeGamemode.Server/Commands/AdminCommands.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ReallifeGamemode.Server/Commands/AdminCommands.cs b/ReallifeGamemode.Server/Commands/AdminCommands.cs index dbf19e4d..c7343e19 100644 --- a/ReallifeGamemode.Server/Commands/AdminCommands.cs +++ b/ReallifeGamemode.Server/Commands/AdminCommands.cs @@ -1766,7 +1766,7 @@ namespace ReallifeGamemode.Server.Commands public void CmdAdminUnshow(Player player) { User user = player.GetUser(); - if (!user.IsAdmin(AdminLevel.HEADADMIN)) + if (!user.IsAdmin(AdminLevel.ADMIN)) { ChatService.NotAuthorized(player); return; @@ -4077,7 +4077,7 @@ namespace ReallifeGamemode.Server.Commands [RemoteEvent("Noclip")] public void Noclip(Player player) { - if (!player.GetUser().IsAdmin(AdminLevel.HEADADMIN)) + if (!player.GetUser().IsAdmin(AdminLevel.ADMIN)) { return; } From c475a08d67709aca4efabadd800ff2e33ae5b47e Mon Sep 17 00:00:00 2001 From: Fabian Date: Mon, 17 May 2021 23:07:09 +0200 Subject: [PATCH 27/82] rent stop not case sensitive --- ReallifeGamemode.Server/Commands/UserCommands.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReallifeGamemode.Server/Commands/UserCommands.cs b/ReallifeGamemode.Server/Commands/UserCommands.cs index ec9dfcd2..828ab72c 100644 --- a/ReallifeGamemode.Server/Commands/UserCommands.cs +++ b/ReallifeGamemode.Server/Commands/UserCommands.cs @@ -29,7 +29,7 @@ namespace ReallifeGamemode.Server.Commands { if (!player.IsLoggedIn()) return; - if (option != "stop") + if (option.ToLower() != "stop") { player.SendChatMessage("Mit \"/rent stop\" kannst du die Miete kündigen"); return; From a03a9749953241b3066a9671915cc9417abe59da Mon Sep 17 00:00:00 2001 From: hydrant Date: Mon, 17 May 2021 19:23:21 +0200 Subject: [PATCH 28/82] improve /giverank command --- .../Commands/FactionCommands.cs | 49 +++++++++++++------ 1 file changed, 33 insertions(+), 16 deletions(-) diff --git a/ReallifeGamemode.Server/Commands/FactionCommands.cs b/ReallifeGamemode.Server/Commands/FactionCommands.cs index 7dd4e5b7..5c3d8aff 100644 --- a/ReallifeGamemode.Server/Commands/FactionCommands.cs +++ b/ReallifeGamemode.Server/Commands/FactionCommands.cs @@ -237,7 +237,20 @@ namespace ReallifeGamemode.Server.Commands [Command("giverank", "~m~Benutzung: ~s~/giverank [Name] [Rang]", GreedyArg = true)] public void CmdFactionGiverank(Player player, string name, string rank) { - if (player.GetUser()?.FactionId == null || player.GetUser().FactionLeader == false) + if (!player.IsLoggedIn()) + { + return; + } + + using var dbContext = new DatabaseContext(); + User user = player.GetUser(dbContext); + + if (user == null) + { + return; + } + + if (user.FactionId == null || !user.FactionLeader) { ChatService.NotAuthorized(player); return; @@ -250,28 +263,32 @@ namespace ReallifeGamemode.Server.Commands return; } - if (target.GetUser()?.FactionId != player.GetUser()?.FactionId) + User targetUser = target.GetUser(dbContext); + if (targetUser == null) + { + ChatService.PlayerNotFound(player); + return; + } + + if (targetUser.FactionId != user.FactionId) { ChatService.ErrorMessage(player, "Dieser Spieler ist nicht in deiner Fraktion"); return; } - using (var dbContext = new DatabaseContext()) + FactionRank fr = dbContext.FactionRanks.FirstOrDefault(r => r.Order == int.Parse(rank) && r.FactionId == user.FactionId); + if (fr == null) { - FactionRank fr = dbContext.FactionRanks.FirstOrDefault(r => r.Order == int.Parse(rank) && r.FactionId == player.GetUser(dbContext).FactionId); - if (fr == null) - { - ChatService.ErrorMessage(player, "Dieser Rang existiert nicht"); - return; - } - - target.GetUser(dbContext).FactionRankId = fr.Id; - - ChatService.SendMessage(player, "!{02FCFF}Du hast " + target.Name + " den Rang '" + fr.RankName + "' (" + fr.Order + ") gegeben."); - ChatService.SendMessage(target, "!{02FCFF}Du hast von " + player.Name + " den Rang '" + fr.RankName + "' (" + fr.Order + ")' erhalten."); - - dbContext.SaveChanges(); + ChatService.ErrorMessage(player, "Dieser Rang existiert nicht"); + return; } + + targetUser.FactionRankId = fr.Id; + + ChatService.SendMessage(player, "!{02FCFF}Du hast " + target.Name + " den Rang '" + fr.RankName + "' (" + fr.Order + ") gegeben."); + ChatService.SendMessage(target, "!{02FCFF}Du hast von " + player.Name + " den Rang '" + fr.RankName + "' (" + fr.Order + ")' erhalten."); + + dbContext.SaveChanges(); } [Command("lc", "~m~Benutzung: ~s~/lc [Nachricht]", GreedyArg = true)] From 5169aedcd6d1239f21c2061e6c8dc38b02382990 Mon Sep 17 00:00:00 2001 From: hydrant Date: Mon, 17 May 2021 19:23:38 +0200 Subject: [PATCH 29/82] maybe fix aspeed second parameter --- ReallifeGamemode.Client/admin/aspeed.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ReallifeGamemode.Client/admin/aspeed.ts b/ReallifeGamemode.Client/admin/aspeed.ts index 4d0c919f..4871915c 100644 --- a/ReallifeGamemode.Client/admin/aspeed.ts +++ b/ReallifeGamemode.Client/admin/aspeed.ts @@ -10,9 +10,7 @@ export default function () { }); mp.events.addDataHandler("vehicleAdminSpeed2", (entity, newValue2) => { if (!entity.isAVehicle()) return; - //entity.setEngineTorqueMultiplier(newValue2); - TorqueEntity = entity; - TorqueValue = newValue2; + entity.setEngineTorqueMultiplier(newValue2); }); /*mp.events.add('render', () => { let vehicle = mp.players.local.vehicle; From baf977158cd1c486a389beba9e0349593b33af52 Mon Sep 17 00:00:00 2001 From: hydrant Date: Mon, 17 May 2021 23:14:51 +0200 Subject: [PATCH 30/82] adjust admincommands (method names, removed useless) --- .../Commands/AdminCommands.cs | 175 +++--------------- 1 file changed, 27 insertions(+), 148 deletions(-) diff --git a/ReallifeGamemode.Server/Commands/AdminCommands.cs b/ReallifeGamemode.Server/Commands/AdminCommands.cs index bdb0aa73..6ba6f34b 100644 --- a/ReallifeGamemode.Server/Commands/AdminCommands.cs +++ b/ReallifeGamemode.Server/Commands/AdminCommands.cs @@ -532,25 +532,6 @@ namespace ReallifeGamemode.Server.Commands } } - [Command("bitcoin", "~m~/bitcoin [ID]")] - public void CmdAdminBitcoin(Player player, string name) - { - if (!player.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? true) - { - ChatService.NotAuthorized(player); - return; - } - - Player target = PlayerService.GetPlayerByNameOrId(name); - if (target == null || !target.IsLoggedIn()) - { - ChatService.PlayerNotFound(player); - return; - } - - target.TriggerEvent("CLIENT:PlaySound", "fun/bitcoinnect", "mp3", 50); - } - #endregion Support #region Admin @@ -567,7 +548,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("remspawnschutz", "~m~Benutzung: ~s~/rmss [Target]", Alias = "rmss")] - public void CmdAdminRmss(Player player, String targetname) + public void CmdAdminRemSpawnSchutz(Player player, String targetname) { if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { @@ -620,7 +601,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("ac", "~m~Benutzung: ~s~/ac [Nachricht]", GreedyArg = true)] - public void CmdAdminA(Player player, string message) + public void CmdAdminChat(Player player, string message) { if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { @@ -1062,110 +1043,8 @@ namespace ReallifeGamemode.Server.Commands } } - [Command("destroyped", "~m~Benutzung: ~s~/destroyped [PedNr]")] - public void CmdAdminAddPPed(Player player, int PedNr) - { - if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) - { - ChatService.NotAuthorized(player); - return; - } - player.TriggerEvent("CLIENT:DestroyPed", PedNr); - //NAPI.Ped.CreatePed(PedHash.Bankman, new Vector3(player.Position.X, player.Position.Y, player.Position.Z), player.Heading, dimension); - } - - [Command("addpped", "~m~Benutzung: ~s~/addpped [PedNr] [model] [dimension] [Dynamic] [Freezed] [Collision(0-3)] [Weapon] [AttackProof] [Fire/Explosion-Proof] [DrownProof]")] - public void CmdAdminAddPPed(Player player, Array PedNr, string model, uint dimension = 0, bool dynamic = false, bool freeze = false, int collision = 0, string weapon = "none", bool attackproof = false, bool fireexplosionproof = false, bool drownproof = false) - { - if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) - { - ChatService.NotAuthorized(player); - return; - } - player.TriggerEvent("CLIENT:AddPed", PedNr, model, player.Position.X, player.Position.Y, player.Position.Z, player.Heading, dimension, dynamic, freeze, collision, weapon, attackproof, fireexplosionproof, drownproof); - //NAPI.Ped.CreatePed(PedHash.Bankman, new Vector3(player.Position.X, player.Position.Y, player.Position.Z), player.Heading, dimension); - } - - [Command("addmped", "~m~Benutzung: ~s~/addmped [model] [dimension]")] - public void CmdAdminAddMPed(Player player, int model, uint dimension = 0) - { - if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) - { - ChatService.NotAuthorized(player); - return; - } - player.TriggerEvent("CLIENT:AddPedModel", model, player.Position.X, player.Position.Y, player.Position.Z, player.Heading, dimension); - //NAPI.Ped.CreatePed(PedHash.Bankman, new Vector3(player.Position.X, player.Position.Y, player.Position.Z), player.Heading, dimension); - } - - [Command("addgped", "~m~Benutzung: ~s~/addgped")] - public void CmdAdminAddGPed(Player player, int model, uint dimension = 0) - { - if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) - { - ChatService.NotAuthorized(player); - return; - } - //player.TriggerEvent("CLIENT:AddPed", model, player.Position.X, player.Position.Y, player.Position.Z, player.Heading, dimension); - Ped Peter = NAPI.Ped.CreatePed(PedHash.Bankman, new Vector3(player.Position.X, player.Position.Y, player.Position.Z), player.Heading, dimension); - - //Peter.freezePosition(true); - } - - [Command("addgpedmore", "~m~Benutzung: ~s~/addgpedMore")] - public void CmdAdminAddGPedMore(Player player, int model, uint dimension = 0) - { - if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) - { - ChatService.NotAuthorized(player); - return; - } - //player.TriggerEvent("CLIENT:AddPed", model, player.Position.X, player.Position.Y, player.Position.Z, player.Heading, dimension); - Ped Peter = NAPI.Ped.CreatePed(PedHash.ChickenHawk, new Vector3(player.Position.X + 1, player.Position.Y, player.Position.Z + 2), player.Heading, dimension); - Ped Peter2 = NAPI.Ped.CreatePed(PedHash.MovAlien01, new Vector3(player.Position.X + 2, player.Position.Y, player.Position.Z), player.Heading, dimension); - Ped Peter3 = NAPI.Ped.CreatePed(PedHash.Chimp, new Vector3(player.Position.X + 3, player.Position.Y, player.Position.Z), player.Heading, dimension); - Ped Peter4 = NAPI.Ped.CreatePed(PedHash.Boar, new Vector3(player.Position.X + 4, player.Position.Y, player.Position.Z), player.Heading, dimension); - Ped Peter5 = NAPI.Ped.CreatePed(PedHash.BradCadaverCutscene, new Vector3(player.Position.X + 5, player.Position.Y, player.Position.Z + 2), player.Heading, dimension); - Ped Peter6 = NAPI.Ped.CreatePed(PedHash.Cat, new Vector3(player.Position.X - 1, player.Position.Y, player.Position.Z), player.Heading, dimension); - Ped Peter7 = NAPI.Ped.CreatePed(PedHash.Chop, new Vector3(player.Position.X - 2, player.Position.Y, player.Position.Z), player.Heading, dimension); - Ped Peter8 = NAPI.Ped.CreatePed(PedHash.Cormorant, new Vector3(player.Position.X - 3, player.Position.Y, player.Position.Z), player.Heading, dimension); - Ped Peter9 = NAPI.Ped.CreatePed(PedHash.Cow, new Vector3(player.Position.X - 4, player.Position.Y, player.Position.Z), player.Heading, dimension); - Ped Peter10 = NAPI.Ped.CreatePed(PedHash.Deer, new Vector3(player.Position.X - 5, player.Position.Y, player.Position.Z), player.Heading, dimension); - Ped Peter11 = NAPI.Ped.CreatePed(PedHash.Coyote, new Vector3(player.Position.X, player.Position.Y + 1, player.Position.Z), player.Heading, dimension); - Ped Peter12 = NAPI.Ped.CreatePed(PedHash.Crow, new Vector3(player.Position.X, player.Position.Y + 2, player.Position.Z + 2), player.Heading, dimension); - Ped Peter13 = NAPI.Ped.CreatePed(PedHash.Humpback, new Vector3(player.Position.X, player.Position.Y + 3, player.Position.Z), player.Heading, dimension); - Ped Peter14 = NAPI.Ped.CreatePed(PedHash.Husky, new Vector3(player.Position.X, player.Position.Y + 4, player.Position.Z), player.Heading, dimension); - Ped Peter15 = NAPI.Ped.CreatePed(PedHash.JohnnyKlebitz, new Vector3(player.Position.X, player.Position.Y + 5, player.Position.Z - 1), player.Heading, dimension); - Ped Peter16 = NAPI.Ped.CreatePed(PedHash.Pig, new Vector3(player.Position.X, player.Position.Y - 1, player.Position.Z), player.Heading, dimension); - Ped Peter17 = NAPI.Ped.CreatePed(PedHash.Pigeon, new Vector3(player.Position.X, player.Position.Y - 2, player.Position.Z), player.Heading, dimension); - Ped Peter18 = NAPI.Ped.CreatePed(PedHash.Poodle, new Vector3(player.Position.X, player.Position.Y - 3, player.Position.Z), player.Heading, dimension); - Ped Peter19 = NAPI.Ped.CreatePed(PedHash.Pug, new Vector3(player.Position.X, player.Position.Y - 4, player.Position.Z), player.Heading, dimension); - Ped Peter20 = NAPI.Ped.CreatePed(PedHash.Rabbit, new Vector3(player.Position.X, player.Position.Y - 5, player.Position.Z), player.Heading, dimension); - Ped Peter21 = NAPI.Ped.CreatePed(PedHash.Rat, new Vector3(player.Position.X + 1, player.Position.Y + 1, player.Position.Z), player.Heading, dimension); - Ped Peter22 = NAPI.Ped.CreatePed(PedHash.Retriever, new Vector3(player.Position.X + 2, player.Position.Y + 2, player.Position.Z), player.Heading, dimension); - Ped Peter23 = NAPI.Ped.CreatePed(PedHash.Rhesus, new Vector3(player.Position.X + 3, player.Position.Y + 3, player.Position.Z), player.Heading, dimension); - Ped Peter24 = NAPI.Ped.CreatePed(PedHash.Rottweiler, new Vector3(player.Position.X + 4, player.Position.Y + 4, player.Position.Z), player.Heading, dimension); - Ped Peter25 = NAPI.Ped.CreatePed(PedHash.Seagull, new Vector3(player.Position.X + 5, player.Position.Y + 5, player.Position.Z + 2), player.Heading, dimension); - Ped Peter26 = NAPI.Ped.CreatePed(PedHash.Shepherd, new Vector3(player.Position.X - 1, player.Position.Y - 1, player.Position.Z), player.Heading, dimension); - Ped Peter27 = NAPI.Ped.CreatePed(PedHash.Stingray, new Vector3(player.Position.X - 2, player.Position.Y - 2, player.Position.Z), player.Heading, dimension); - Ped Peter28 = NAPI.Ped.CreatePed(PedHash.Westy, new Vector3(player.Position.X - 3, player.Position.Y - 3, player.Position.Z), player.Heading, dimension); - Ped Peter29 = NAPI.Ped.CreatePed(PedHash.MountainLion, new Vector3(player.Position.X - 4, player.Position.Y - 4, player.Position.Z), player.Heading, dimension); - Ped Peter30 = NAPI.Ped.CreatePed(PedHash.FatCult01AFM, new Vector3(player.Position.X - 5, player.Position.Y - 5, player.Position.Z), player.Heading, dimension); - Ped Peter31 = NAPI.Ped.CreatePed(PedHash.FatCult01AFM, new Vector3(player.Position.X + 1, player.Position.Y - 3, player.Position.Z), player.Heading, dimension); - Ped Peter32 = NAPI.Ped.CreatePed(PedHash.FatCult01AFM, new Vector3(player.Position.X + 3, player.Position.Y - 1, player.Position.Z), player.Heading, dimension); - Ped Peter33 = NAPI.Ped.CreatePed(PedHash.FatCult01AFM, new Vector3(player.Position.X - 1, player.Position.Y + 3, player.Position.Z), player.Heading, dimension); - Ped Peter34 = NAPI.Ped.CreatePed(PedHash.Acult01AMM, new Vector3(player.Position.X - 3, player.Position.Y + 1, player.Position.Z), player.Heading, dimension); - Ped Peter35 = NAPI.Ped.CreatePed(PedHash.Acult01AMM, new Vector3(player.Position.X + 5, player.Position.Y + 1, player.Position.Z), player.Heading, dimension); - Ped Peter36 = NAPI.Ped.CreatePed(PedHash.Acult01AMO, new Vector3(player.Position.X + 1, player.Position.Y - 5, player.Position.Z), player.Heading, dimension); - Ped Peter37 = NAPI.Ped.CreatePed(PedHash.Acult01AMO, new Vector3(player.Position.X + 4, player.Position.Y - 2, player.Position.Z), player.Heading, dimension); - Ped Peter38 = NAPI.Ped.CreatePed(PedHash.Acult01AMY, new Vector3(player.Position.X - 5, player.Position.Y + 2, player.Position.Z), player.Heading, dimension); - Ped Peter39 = NAPI.Ped.CreatePed(PedHash.Acult01AMY, new Vector3(player.Position.X - 4, player.Position.Y - 1, player.Position.Z), player.Heading, dimension); - - //Peter.freezePosition(true); - } - [Command("gotox", "~m~Benutzung: ~s~/gotox [X] [Y] [Z]")] - public void CmdAdminGotoxyz(Player player, float x, float y, float z) + public void CmdAdminGotox(Player player, float x, float y, float z) { if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { @@ -1515,7 +1394,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("aclear", "~m~Benutzung: ~s~/aclear [Spieler] [Grund]", GreedyArg = true)] - public void CmdFactionClear(Player player, string nameOrId, string reason) + public void CmdAdminClear(Player player, string nameOrId, string reason) { User user = player.GetUser(); if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) @@ -1650,7 +1529,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("vcolor", "~m~Benutzung: ~s~/vcolor [Farb-ID1] [Farb-ID2]")] - public void CmdAdminColor(Player player, int color1, int color2) + public void CmdAdminVColor(Player player, int color1, int color2) { if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { @@ -1834,7 +1713,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("setsvar", "~m~Benutzung:~s~ /setsvar [ID] [WERT]")] - public void CmdAdmSetSvar(Player player, int varId, int varValue) + public void CmdAdminSetSvar(Player player, int varId, int varValue) { if (!player.GetUser()?.IsAdmin(AdminLevel.PROJEKTLEITUNG) ?? true) { @@ -1845,7 +1724,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("createturf", "~m~Benutzung:~s~ /createturf [radius]")] - public void CmdAdmCreateTurf(Player player, float option) + public void CmdAdminCreateTurf(Player player, float option) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -1867,7 +1746,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("cancleturf", "~m~Benutzung:~s~ /cancleturf")] - public void CmdAdmCancleTurf(Player player) + public void CmdAdminCancleTurf(Player player) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -1878,7 +1757,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("reloadturfs", "~m~Benutzung:~s~ /ReloadTurfs")] - public void CmdAdmReloadTurf(Player player) + public void CmdAdminReloadTurf(Player player) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -1890,7 +1769,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("deleteturf", "~m~Benutzung:~s~ /DeleteTurfs")] - public void CmdAdmDeleteTurf(Player player) + public void CmdAdminDeleteTurf(Player player) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -1901,7 +1780,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("setturfpoint", "~m~Benutzung:~s~ /setturfpoint")] - public void CmdAdmSetTurfPoint(Player player) + public void CmdAdminSetTurfPoint(Player player) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -1943,7 +1822,7 @@ namespace ReallifeGamemode.Server.Commands } ChatService.SendMessage(target, "~r~WARNINFO: ~w~Dir wurde von " + adminPlayername + " ein Warn entfernt: " + reason); - ChatService.Broadcast("~y~INFO: ~w~" + targetPlayername + " wurde von " + player.GetUser().AdminLevel.GetName() + " " + adminPlayername + " ein Warn entfernt: " + reason); + ChatService.BroadcastAdmin("~y~INFO: ~w~" + targetPlayername + " wurde von " + player.GetUser().AdminLevel.GetName() + " " + adminPlayername + " ein Warn entfernt: " + reason, AdminLevel.ADMIN); } [Command("setskill", "~m~Benutzung: ~s~/setskill [Playerid] [Bus/Pilot] [Menge]")] @@ -2124,7 +2003,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("setweather", "~m~Benutzung: ~s~/setweather [Wetter]")] - public void CmdAdminSetweather(Player player, string weather) + public void CmdAdminSetWeather(Player player, string weather) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -2174,7 +2053,7 @@ namespace ReallifeGamemode.Server.Commands [Command("showtuningmenu", "~m~Benutzung: ~s~/showtuningmenu", Alias = "stm")] - public void CmdAdminShowtuningmenu(Player player) + public void CmdAdminShowTuningMenu(Player player) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -2244,14 +2123,14 @@ namespace ReallifeGamemode.Server.Commands [Command("wepmod", "~m~Benutzung: ~s~/wepmod [Variable]")] public void CmdWeaponModifier(Player player, float modifier) { - player.SendChatMessage("Modifier steht auf" + modifier); + player.SendChatMessage("Modifier steht auf " + modifier); player.TriggerEvent("SERVER:WeaponModifier2", player, modifier, 1); } [Command("wepmmod", "~m~Benutzung: ~s~/wepmmod [Variable]")] public void CmdWeaponMeeleModifier(Player player, float modifier) { - player.SendChatMessage("MeeleModifier steht auf" + modifier); + player.SendChatMessage("MeeleModifier steht auf " + modifier); player.TriggerEvent("SERVER:WeaponModifier2", player, 1, modifier); } @@ -2269,7 +2148,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("sethandmoney", "~m~Benutzung: ~s~/sethandmoney [Name/ID] [Menge]")] - public void CmdAdminSetUserHandMoney(Player admin, string targetname, int amount) + public void CmdAdminSetHandMoney(Player admin, string targetname, int amount) { if (!admin.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -2296,7 +2175,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("givehandmoney", "~m~Benutzung: ~s~/givehandmoney [Name/ID] [Menge]")] - public void CmdAdminGiveUserHandMoney(Player admin, string targetname, int amount) + public void CmdAdminGiveHandMoney(Player admin, string targetname, int amount) { if (!admin.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -2323,7 +2202,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("quicksavemode", "~m~Benutzung: ~s~/quicksavemode [Modus]: ~g~blip, ~g~atm")] - public void CmdAdminSetQuickSaveMode(Player player, string mode) + public void CmdAdminQuickSaveMode(Player player, string mode) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -2373,7 +2252,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("setshopitem", "~m~Benutzung: ~s~/setshopitem [Item ID]")] - public void CmdAdminSetItemInShop(Player player, int itemId) + public void CmdAdminSetShopItem(Player player, int itemId) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -2419,7 +2298,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("rmshopitem", "~m~Benutzung: ~s~/rmshopitem [Item ID]")] - public void CmdAdminRemoveItemInShop(Player player, int itemId) + public void CmdAdminRmShopItem(Player player, int itemId) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -3228,7 +3107,7 @@ namespace ReallifeGamemode.Server.Commands // [Command("managefactionranks", "~m~Benutzung: ~s~/managefactionranks [Fraktions-ID]", Alias = "mfr")] - public void CmdFactionManageFactionRanks(Player player, int factionID) + public void CmdAdminManageFactionRanks(Player player, int factionID) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -3342,7 +3221,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("setmoney", "~m~Benutzung: ~s~/setmoney [Name] [Menge]")] - public void SetPlayerMoney(Player player, string receiver, int amount) + public void CmdAdminSetMoney(Player player, string receiver, int amount) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -3367,7 +3246,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("givemoney", "~m~Benutzung: ~s~/givemoney [Name] [Menge]")] - public void GivePlayerMoney(Player player, string receiver, int amount) + public void GiveAdminGiveMoney(Player player, string receiver, int amount) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -3393,7 +3272,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("setbusinessowner", "~m~Benutzung: ~s~/setbusinessowner [Name] [Business ID]")] - public void CmdAdminSetbusinessowner(Player player, string name, int businessid) + public void CmdAdminSetBusinessOwner(Player player, string name, int businessid) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -3474,7 +3353,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("setbusinessbankbalance", "~m~Benutzung: ~s~/setbusinessbankbalance [Business ID] [Menge]")] - public void CmdAdminGivebusinessbankbalance(Player player, int businessid, int amount) + public void CmdAdminSetBusinessBankBalance(Player player, int businessid, int amount) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -4006,7 +3885,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("blind", "~m~Benutzung: ~s~/blind [Spieler] [Mode]")] - public void CmdBlind(Player player, string name, int mode) + public void CmdAdminBlind(Player player, string name, int mode) { if (!player.IsLoggedIn()) return; From bbab2f71fcd5584999a33c06cbfb630cfb43186b Mon Sep 17 00:00:00 2001 From: Fabian Date: Mon, 17 May 2021 23:19:01 +0200 Subject: [PATCH 31/82] neues rentcar drinne --- ReallifeGamemode.Server/Util/Rentcar.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ReallifeGamemode.Server/Util/Rentcar.cs b/ReallifeGamemode.Server/Util/Rentcar.cs index b5828f64..a286f44b 100644 --- a/ReallifeGamemode.Server/Util/Rentcar.cs +++ b/ReallifeGamemode.Server/Util/Rentcar.cs @@ -52,18 +52,23 @@ namespace ReallifeGamemode.Server.Util { noobspawnVehicleProperties.Add(new RentcarProperty("bmx", 10)); noobspawnVehicleProperties.Add(new RentcarProperty("faggio3", 50)); + noobspawnVehicleProperties.Add(new RentcarProperty("panto", 200)); stadthalleVehicleProperties.Add(new RentcarProperty("bmx", 10)); stadthalleVehicleProperties.Add(new RentcarProperty("faggio3", 50)); + noobspawnVehicleProperties.Add(new RentcarProperty("panto", 200)); knastVehicleProperties.Add(new RentcarProperty("bmx", 10)); knastVehicleProperties.Add(new RentcarProperty("faggio3", 50)); + noobspawnVehicleProperties.Add(new RentcarProperty("panto", 200)); paletoVehicleProperties.Add(new RentcarProperty("bmx", 10)); paletoVehicleProperties.Add(new RentcarProperty("faggio3", 50)); + noobspawnVehicleProperties.Add(new RentcarProperty("panto", 200)); lamesaVehicleProperties.Add(new RentcarProperty("bmx", 10)); lamesaVehicleProperties.Add(new RentcarProperty("faggio3", 50)); + noobspawnVehicleProperties.Add(new RentcarProperty("panto", 200)); } public static void cancelRent(Player player) From 6a63653889dba21fed84d75dad94c17694ccee4d Mon Sep 17 00:00:00 2001 From: Fabian Date: Mon, 17 May 2021 23:20:45 +0200 Subject: [PATCH 32/82] shame on me --- ReallifeGamemode.Server/Util/Rentcar.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ReallifeGamemode.Server/Util/Rentcar.cs b/ReallifeGamemode.Server/Util/Rentcar.cs index a286f44b..d98c201d 100644 --- a/ReallifeGamemode.Server/Util/Rentcar.cs +++ b/ReallifeGamemode.Server/Util/Rentcar.cs @@ -56,19 +56,19 @@ namespace ReallifeGamemode.Server.Util stadthalleVehicleProperties.Add(new RentcarProperty("bmx", 10)); stadthalleVehicleProperties.Add(new RentcarProperty("faggio3", 50)); - noobspawnVehicleProperties.Add(new RentcarProperty("panto", 200)); + stadthalleVehicleProperties.Add(new RentcarProperty("panto", 200)); knastVehicleProperties.Add(new RentcarProperty("bmx", 10)); knastVehicleProperties.Add(new RentcarProperty("faggio3", 50)); - noobspawnVehicleProperties.Add(new RentcarProperty("panto", 200)); + knastVehicleProperties.Add(new RentcarProperty("panto", 200)); paletoVehicleProperties.Add(new RentcarProperty("bmx", 10)); paletoVehicleProperties.Add(new RentcarProperty("faggio3", 50)); - noobspawnVehicleProperties.Add(new RentcarProperty("panto", 200)); + paletoVehicleProperties.Add(new RentcarProperty("panto", 200)); lamesaVehicleProperties.Add(new RentcarProperty("bmx", 10)); lamesaVehicleProperties.Add(new RentcarProperty("faggio3", 50)); - noobspawnVehicleProperties.Add(new RentcarProperty("panto", 200)); + lamesaVehicleProperties.Add(new RentcarProperty("panto", 200)); } public static void cancelRent(Player player) From a0b83e05782f7fc405ea001cb8ecda890129bcb4 Mon Sep 17 00:00:00 2001 From: "michael.reiswich" Date: Mon, 17 May 2021 23:56:10 +0200 Subject: [PATCH 33/82] vehicle test --- ReallifeGamemode.Client/index.ts | 3 + .../vehiclesync/vehicleinwater.ts | 11 + ReallifeGamemode.Server/Events/ExitVehicle.cs | 9 +- .../Managers/VehicleManager.cs | 230 ++++++++++++++++++ 4 files changed, 248 insertions(+), 5 deletions(-) create mode 100644 ReallifeGamemode.Client/vehiclesync/vehicleinwater.ts diff --git a/ReallifeGamemode.Client/index.ts b/ReallifeGamemode.Client/index.ts index e1b91d2d..f37eaec0 100644 --- a/ReallifeGamemode.Client/index.ts +++ b/ReallifeGamemode.Client/index.ts @@ -177,6 +177,9 @@ vehicleIndicators(); import vehicleDoor from './vehiclesync/door'; vehicleDoor(); +import vehicleInWater from './vehiclesync/vehicleinwater'; +vehicleInWater() + import freeze from './util/freeze'; freeze(); diff --git a/ReallifeGamemode.Client/vehiclesync/vehicleinwater.ts b/ReallifeGamemode.Client/vehiclesync/vehicleinwater.ts new file mode 100644 index 00000000..62659896 --- /dev/null +++ b/ReallifeGamemode.Client/vehiclesync/vehicleinwater.ts @@ -0,0 +1,11 @@ +export default function vehicleInWater() { + + mp.events.add('CheckWaterCrash', (vehicle) => { + + if (!vehicle.isInWater() && vehicle.getIsEngineRunning()) { + return; + } + mp.gui.chat.push("Das Auto ist im Wasser"); + mp.events.callRemote("CheckWater", vehicle.id); + }); +} \ No newline at end of file diff --git a/ReallifeGamemode.Server/Events/ExitVehicle.cs b/ReallifeGamemode.Server/Events/ExitVehicle.cs index de493cbe..431ac5c0 100644 --- a/ReallifeGamemode.Server/Events/ExitVehicle.cs +++ b/ReallifeGamemode.Server/Events/ExitVehicle.cs @@ -43,6 +43,7 @@ namespace ReallifeGamemode.Server.Events { client.TriggerEvent("SERVER:setMarkerBehindVehicle", vehicle); } + client.TriggerEvent("CheckWaterCrash", vehicle); } if (vehicle.GetServerVehicle() is SchoolVehicle vehS) { @@ -80,13 +81,11 @@ namespace ReallifeGamemode.Server.Events sV.PositionZ = pos.Z; sV.Heading = vehicle.Heading; - dbContext.SaveChanges(); + dbContext.SaveChanges(); + client.TriggerEvent("CheckWaterCrash", vehicle); } } - - - - } + } private static void Timer600000_Elapsed(object sender, ElapsedEventArgs e) { //ExitVehicle c = new ExitVehicle(); diff --git a/ReallifeGamemode.Server/Managers/VehicleManager.cs b/ReallifeGamemode.Server/Managers/VehicleManager.cs index 341437a4..bbcd38fc 100644 --- a/ReallifeGamemode.Server/Managers/VehicleManager.cs +++ b/ReallifeGamemode.Server/Managers/VehicleManager.cs @@ -3,6 +3,7 @@ using Microsoft.Extensions.Logging; using Newtonsoft.Json; using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Database.Models; +using ReallifeGamemode.Server.Core.API; using ReallifeGamemode.Server.Extensions; using ReallifeGamemode.Server.Log; using ReallifeGamemode.Server.Services; @@ -1091,6 +1092,7 @@ namespace ReallifeGamemode.Server.Managers InventoryManager.RemoveAllItemsfromVehicleInventory(vehicle); serverVehicle.Spawn(vehicle); + vehicle.Repair(); } [RemoteEvent("CLIENT:setMarkerBehindVehicle")] @@ -1100,5 +1102,233 @@ namespace ReallifeGamemode.Server.Managers Vector3 vector3 = new Vector3(Convert.ToSingle((double)JsonConvert.DeserializeObject(jsonX)), Convert.ToSingle((double)JsonConvert.DeserializeObject(jsonY)), Convert.ToSingle((double)JsonConvert.DeserializeObject(jsonZ))); vehicle.AddMarkerBehind(vector3); } + #region spawnpositions-vehicleInWater + + public static List VehicleRespawnPoints = new List (); + + VehicleRespawnPoint pos1 = new VehicleRespawnPoint() + { + Position = new Vector3(-307.84, -909.04, 31.07), + heading = 167.46f + }; + VehicleRespawnPoint pos2 = new VehicleRespawnPoint() + { + Position = new Vector3(-311.52, -908.40, 31.07), + heading = 170.40f + }; + VehicleRespawnPoint pos3 = new VehicleRespawnPoint() + { + Position = new Vector3(-315.18, -907.68, 31.07), + heading = 167.17f + }; + VehicleRespawnPoint pos4 = new VehicleRespawnPoint() + { + Position = new Vector3(-319.09, -906.68, 31.07), + heading = 168.41f + }; + VehicleRespawnPoint pos5 = new VehicleRespawnPoint() + { + Position = new Vector3(-322.48, -905.95, 31.07), + heading = 169.00f + }; + VehicleRespawnPoint pos6 = new VehicleRespawnPoint() + { + Position = new Vector3(-322.48, -905.95, 31.07), + heading = 169.00f + }; + VehicleRespawnPoint pos7 = new VehicleRespawnPoint() + { + Position = new Vector3(-325.95, -905.17, 31.07), + heading = 168.26f + }; + VehicleRespawnPoint pos8 = new VehicleRespawnPoint() + { + Position = new Vector3(-329.77, -904.33, 31.07), + heading = 168.17f + }; + VehicleRespawnPoint pos9 = new VehicleRespawnPoint() + { + Position = new Vector3(-333.31, -903.61, 31.07), + heading = 169.17f + }; + VehicleRespawnPoint pos10 = new VehicleRespawnPoint() + { + Position = new Vector3(-336.86, -902.80, 31.07), + heading = 167.65f + }; + VehicleRespawnPoint pos11 = new VehicleRespawnPoint() + { + Position = new Vector3(-340.41, -902.12, 31.07), + heading = 162.65f + }; + VehicleRespawnPoint pos12 = new VehicleRespawnPoint() + { + Position = new Vector3(-360.96, -893.13, 31.07), + heading = -88.49f + }; + VehicleRespawnPoint pos13 = new VehicleRespawnPoint() + { + Position = new Vector3(-360.80, -896.62, 31.07), + heading = -88.13f + }; + VehicleRespawnPoint pos14 = new VehicleRespawnPoint() + { + Position = new Vector3(-359.50, -944.78, 31.08), + heading = -89.30f + }; + VehicleRespawnPoint pos15 = new VehicleRespawnPoint() + { + Position = new Vector3(-361.17, -948.58, 31.08), + heading = -85.58f + }; + VehicleRespawnPoint pos16 = new VehicleRespawnPoint() + { + Position = new Vector3(-361.00, -952.27, 31.08), + heading = -89.86f + }; + VehicleRespawnPoint pos17 = new VehicleRespawnPoint() + { + Position = new Vector3(-360.99, -955.92, 31.08), + heading = -87.21f + }; + VehicleRespawnPoint pos18 = new VehicleRespawnPoint() + { + Position = new Vector3(-350.26, -972.01, 31.08), + heading = -18.13f + }; + VehicleRespawnPoint pos19 = new VehicleRespawnPoint() + { + Position = new Vector3(-346.58, -973.31, 31.08), + }; + VehicleRespawnPoint pos20 = new VehicleRespawnPoint() + { + Position = new Vector3(-343.31, -974.59, 31.08), + heading = -20.22f + }; +/* + private readonly IReadOnlyCollection vector3s = new List + { + + new Vector3(-343.31, -974.59, 31.08), //Heading -20.22 + new Vector3(-339.67, -975.69, 31.08), //Heading -16.76 + new Vector3(-336.38, -976.95, 31.08), //Heading -19.30 + new Vector3(-332.50, -978.28, 31.08), //Heading -18.82 + new Vector3(-329.48, -979.39, 31.08), //Heading -26.22 + new Vector3(-325.96, -980.70, 31.08), //Heading -19.74 + new Vector3(-360.85, -900.53, 31.07), //Heading -88.64 + new Vector3(-360.71, -904.02, 31.07), //Heading -88.04 + new Vector3(-360.56, -907.78, 31.07), //Heading -88.41 + new Vector3(-360.41, -911.79, 31.08), //Heading -86.13 + new Vector3(-360.30, -915.26, 31.08), //Heading -134.60 + new Vector3(-360.12, -919.21, 31.08), //Heading -82.35 + new Vector3(-360.03, -922.63, 31.08), //Heading -89.27 + new Vector3(-359.78, -926.58, 31.08), //Heading -84.04 + new Vector3(-359.73, -929.89, 31.08), //Heading -88.67 + new Vector3(-359.66, -933.50, 31.08), //Heading -88.67 + new Vector3(-359.54, -937.61, 31.08), //Heading -86.68 + new Vector3(-359.48, -941.17, 31.08), //Heading -90.07 + new Vector3(-336.84, -952.54, 31.08), //Heading 68.74 + new Vector3(-355.55, -949.08, 31.08), //Heading 71.85 + new Vector3(-334.47, -945.95, 31.08), //Heading 70.89 + new Vector3(-333.11, -942.11, 31.08), //Heading 70.18 + new Vector3(-331.90, -938.98, 31.08), //Heading 68.07 + new Vector3(-330.65, -935.58, 31.08), //Heading 70.98 + new Vector3(-329.24, -931.58, 31.08), //Heading 73.91 + new Vector3(-328.12, -928.44, 31.08), //Heading 69.17 + new Vector3(-326.67, -924.60, 31.08), //Heading 46.89 + new Vector3(-322.36, -982.02, 31.08), //Heading -21.25059 + new Vector3(-318.92, -983.19, 31.08), //Heading -20.580233 + new Vector3(-315.42, -984.40, 31.08), //Heading -21.508415 + new Vector3(-311.97, 985.60, 31.080), //Heading -20.866705 + new Vector3(-308.43, -986.83, 31.08), //Heading -21.050055 + new Vector3(-305.03, -988.07, 31.08), //Heading -21.021408 + new Vector3(-301.48, -989.31, 31.08), //Heading -22.333475 + new Vector3(-298.04, -990.48, 31.08), //Heading -26.02332 + new Vector3(-342.30, -921.35, 31.0), //Heading-109.20534 + new Vector3(-343.37, -925.01, 31.08), //Heading -111.86385 + new Vector3(-344.68, -928.18, 31.08), //Heading -109.97883 + new Vector3(-345.78, -931.86, 31.08), //Heading -110.89556 + }.AsReadOnly(); + */ + #endregion spawnpositions-vehicleInWater + + [RemoteEvent("CheckWater")] + public void CheckWater(Player player, int id) + { + #region add_VehicleRespawnPoints + VehicleRespawnPoints.Add(pos1); + VehicleRespawnPoints.Add(pos2); + VehicleRespawnPoints.Add(pos3); + VehicleRespawnPoints.Add(pos4); + VehicleRespawnPoints.Add(pos5); + VehicleRespawnPoints.Add(pos6); + VehicleRespawnPoints.Add(pos7); + VehicleRespawnPoints.Add(pos8); + VehicleRespawnPoints.Add(pos9); + VehicleRespawnPoints.Add(pos10); + VehicleRespawnPoints.Add(pos11); + VehicleRespawnPoints.Add(pos12); + VehicleRespawnPoints.Add(pos13); + VehicleRespawnPoints.Add(pos14); + VehicleRespawnPoints.Add(pos15); + VehicleRespawnPoints.Add(pos16); + VehicleRespawnPoints.Add(pos17); + VehicleRespawnPoints.Add(pos18); + VehicleRespawnPoints.Add(pos19); + VehicleRespawnPoints.Add(pos20); + #endregion add_VehicleRespawnPoints + + using (var dbContext = new DatabaseContext()) + { + + Vehicle vehicle = NAPI.Pools.GetAllVehicles().Find(v => v.Id == id); + ServerVehicle sV = vehicle.GetServerVehicle(dbContext); + + if (sV is UserVehicle) + { + + foreach (VehicleRespawnPoint point in VehicleRespawnPoints) + { + if (NAPI.Pools.GetAllVehicles().Any(v => v.Position.DistanceTo(point.Position) < 1)) + { + ChatService.Broadcast("Fahrzeug zu nah"); + } + else + { + sV.PositionX = point.Position.X; + sV.PositionY = point.Position.Y; + sV.PositionZ = point.Position.Z; + sV.Heading = point.heading; + dbContext.SaveChanges(); + } + } + /* Vector3 pos = new Vector3(-344.02, -928.72, 31.08); + + sV.PositionX = pos.X; + sV.PositionY = pos.Y; + sV.PositionZ = pos.Z; + sV.Heading = -109; + + dbContext.SaveChanges(); */ + vehicle.Delete(); + Vehicle newVeh = sV.Spawn(vehicle); + newVeh.Repair(); + newVeh.Rotation = new Vector3(0, 0, sV.Heading); + } + + if (sV is FactionVehicle || sV is GroupVehicle) + { + vehicle.Delete(); + Vehicle newVeh = sV.Spawn(vehicle); + newVeh.Repair(); + newVeh.Rotation = new Vector3(0, 0, sV.Heading); + } + } + } } } +public class VehicleRespawnPoint +{ + public Vector3 Position { get; set; } + public float heading { get; set; } +} From 1e623f8fa9dfa0d5c6522a95ff187eed834947dc Mon Sep 17 00:00:00 2001 From: "michael.reiswich" Date: Tue, 18 May 2021 00:13:14 +0200 Subject: [PATCH 34/82] changes vehiclesInWater --- .../vehiclesync/vehicleinwater.ts | 6 +- .../Managers/VehicleManager.cs | 104 +++++++++--------- 2 files changed, 52 insertions(+), 58 deletions(-) diff --git a/ReallifeGamemode.Client/vehiclesync/vehicleinwater.ts b/ReallifeGamemode.Client/vehiclesync/vehicleinwater.ts index 62659896..317196ef 100644 --- a/ReallifeGamemode.Client/vehiclesync/vehicleinwater.ts +++ b/ReallifeGamemode.Client/vehiclesync/vehicleinwater.ts @@ -2,10 +2,8 @@ mp.events.add('CheckWaterCrash', (vehicle) => { - if (!vehicle.isInWater() && vehicle.getIsEngineRunning()) { - return; + if (vehicle.isInWater() && !vehicle.getIsEngineRunning()) { + mp.events.callRemote("CheckWater", vehicle.id); } - mp.gui.chat.push("Das Auto ist im Wasser"); - mp.events.callRemote("CheckWater", vehicle.id); }); } \ No newline at end of file diff --git a/ReallifeGamemode.Server/Managers/VehicleManager.cs b/ReallifeGamemode.Server/Managers/VehicleManager.cs index bbcd38fc..4f14e873 100644 --- a/ReallifeGamemode.Server/Managers/VehicleManager.cs +++ b/ReallifeGamemode.Server/Managers/VehicleManager.cs @@ -3,7 +3,6 @@ using Microsoft.Extensions.Logging; using Newtonsoft.Json; using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Database.Models; -using ReallifeGamemode.Server.Core.API; using ReallifeGamemode.Server.Extensions; using ReallifeGamemode.Server.Log; using ReallifeGamemode.Server.Services; @@ -888,6 +887,32 @@ namespace ReallifeGamemode.Server.Managers "pounder2" }; + public VehicleManager () + { + #region add_VehicleRespawnPoints + VehicleRespawnPoints.Add(pos1); + VehicleRespawnPoints.Add(pos2); + VehicleRespawnPoints.Add(pos3); + VehicleRespawnPoints.Add(pos4); + VehicleRespawnPoints.Add(pos5); + VehicleRespawnPoints.Add(pos6); + VehicleRespawnPoints.Add(pos7); + VehicleRespawnPoints.Add(pos8); + VehicleRespawnPoints.Add(pos9); + VehicleRespawnPoints.Add(pos10); + VehicleRespawnPoints.Add(pos11); + VehicleRespawnPoints.Add(pos12); + VehicleRespawnPoints.Add(pos13); + VehicleRespawnPoints.Add(pos14); + VehicleRespawnPoints.Add(pos15); + VehicleRespawnPoints.Add(pos16); + VehicleRespawnPoints.Add(pos17); + VehicleRespawnPoints.Add(pos18); + VehicleRespawnPoints.Add(pos19); + VehicleRespawnPoints.Add(pos20); + #endregion add_VehicleRespawnPoints + } + private static readonly Dictionary _serverVehicles = new Dictionary(); private static readonly Dictionary lastPositions = new Dictionary(); @@ -1109,101 +1134,102 @@ namespace ReallifeGamemode.Server.Managers VehicleRespawnPoint pos1 = new VehicleRespawnPoint() { Position = new Vector3(-307.84, -909.04, 31.07), - heading = 167.46f + Heading = 167.46f }; VehicleRespawnPoint pos2 = new VehicleRespawnPoint() { Position = new Vector3(-311.52, -908.40, 31.07), - heading = 170.40f + Heading = 170.40f }; VehicleRespawnPoint pos3 = new VehicleRespawnPoint() { Position = new Vector3(-315.18, -907.68, 31.07), - heading = 167.17f + Heading = 167.17f }; VehicleRespawnPoint pos4 = new VehicleRespawnPoint() { Position = new Vector3(-319.09, -906.68, 31.07), - heading = 168.41f + Heading = 168.41f }; VehicleRespawnPoint pos5 = new VehicleRespawnPoint() { Position = new Vector3(-322.48, -905.95, 31.07), - heading = 169.00f + Heading = 169.00f }; VehicleRespawnPoint pos6 = new VehicleRespawnPoint() { Position = new Vector3(-322.48, -905.95, 31.07), - heading = 169.00f + Heading = 169.00f }; VehicleRespawnPoint pos7 = new VehicleRespawnPoint() { Position = new Vector3(-325.95, -905.17, 31.07), - heading = 168.26f + Heading = 168.26f }; VehicleRespawnPoint pos8 = new VehicleRespawnPoint() { Position = new Vector3(-329.77, -904.33, 31.07), - heading = 168.17f + Heading = 168.17f }; VehicleRespawnPoint pos9 = new VehicleRespawnPoint() { Position = new Vector3(-333.31, -903.61, 31.07), - heading = 169.17f + Heading = 169.17f }; VehicleRespawnPoint pos10 = new VehicleRespawnPoint() { Position = new Vector3(-336.86, -902.80, 31.07), - heading = 167.65f + Heading = 167.65f }; VehicleRespawnPoint pos11 = new VehicleRespawnPoint() { Position = new Vector3(-340.41, -902.12, 31.07), - heading = 162.65f + Heading = 162.65f }; VehicleRespawnPoint pos12 = new VehicleRespawnPoint() { Position = new Vector3(-360.96, -893.13, 31.07), - heading = -88.49f + Heading = -88.49f }; VehicleRespawnPoint pos13 = new VehicleRespawnPoint() { Position = new Vector3(-360.80, -896.62, 31.07), - heading = -88.13f + Heading = -88.13f }; VehicleRespawnPoint pos14 = new VehicleRespawnPoint() { Position = new Vector3(-359.50, -944.78, 31.08), - heading = -89.30f + Heading = -89.30f }; VehicleRespawnPoint pos15 = new VehicleRespawnPoint() { Position = new Vector3(-361.17, -948.58, 31.08), - heading = -85.58f + Heading = -85.58f }; VehicleRespawnPoint pos16 = new VehicleRespawnPoint() { Position = new Vector3(-361.00, -952.27, 31.08), - heading = -89.86f + Heading = -89.86f }; VehicleRespawnPoint pos17 = new VehicleRespawnPoint() { Position = new Vector3(-360.99, -955.92, 31.08), - heading = -87.21f + Heading = -87.21f }; VehicleRespawnPoint pos18 = new VehicleRespawnPoint() { Position = new Vector3(-350.26, -972.01, 31.08), - heading = -18.13f + Heading = -18.13f }; VehicleRespawnPoint pos19 = new VehicleRespawnPoint() { Position = new Vector3(-346.58, -973.31, 31.08), + Heading = -19.79f }; VehicleRespawnPoint pos20 = new VehicleRespawnPoint() { Position = new Vector3(-343.31, -974.59, 31.08), - heading = -20.22f + Heading = -20.22f }; /* private readonly IReadOnlyCollection vector3s = new List @@ -1255,28 +1281,7 @@ namespace ReallifeGamemode.Server.Managers [RemoteEvent("CheckWater")] public void CheckWater(Player player, int id) { - #region add_VehicleRespawnPoints - VehicleRespawnPoints.Add(pos1); - VehicleRespawnPoints.Add(pos2); - VehicleRespawnPoints.Add(pos3); - VehicleRespawnPoints.Add(pos4); - VehicleRespawnPoints.Add(pos5); - VehicleRespawnPoints.Add(pos6); - VehicleRespawnPoints.Add(pos7); - VehicleRespawnPoints.Add(pos8); - VehicleRespawnPoints.Add(pos9); - VehicleRespawnPoints.Add(pos10); - VehicleRespawnPoints.Add(pos11); - VehicleRespawnPoints.Add(pos12); - VehicleRespawnPoints.Add(pos13); - VehicleRespawnPoints.Add(pos14); - VehicleRespawnPoints.Add(pos15); - VehicleRespawnPoints.Add(pos16); - VehicleRespawnPoints.Add(pos17); - VehicleRespawnPoints.Add(pos18); - VehicleRespawnPoints.Add(pos19); - VehicleRespawnPoints.Add(pos20); - #endregion add_VehicleRespawnPoints + using (var dbContext = new DatabaseContext()) { @@ -1298,22 +1303,14 @@ namespace ReallifeGamemode.Server.Managers sV.PositionX = point.Position.X; sV.PositionY = point.Position.Y; sV.PositionZ = point.Position.Z; - sV.Heading = point.heading; + sV.Heading = point.Heading; dbContext.SaveChanges(); + break; } } - /* Vector3 pos = new Vector3(-344.02, -928.72, 31.08); - - sV.PositionX = pos.X; - sV.PositionY = pos.Y; - sV.PositionZ = pos.Z; - sV.Heading = -109; - - dbContext.SaveChanges(); */ vehicle.Delete(); Vehicle newVeh = sV.Spawn(vehicle); newVeh.Repair(); - newVeh.Rotation = new Vector3(0, 0, sV.Heading); } if (sV is FactionVehicle || sV is GroupVehicle) @@ -1321,7 +1318,6 @@ namespace ReallifeGamemode.Server.Managers vehicle.Delete(); Vehicle newVeh = sV.Spawn(vehicle); newVeh.Repair(); - newVeh.Rotation = new Vector3(0, 0, sV.Heading); } } } @@ -1330,5 +1326,5 @@ namespace ReallifeGamemode.Server.Managers public class VehicleRespawnPoint { public Vector3 Position { get; set; } - public float heading { get; set; } + public float Heading { get; set; } } From 4cf6127d08927037132203b7c664ef1baa7a0927 Mon Sep 17 00:00:00 2001 From: hydrant Date: Tue, 18 May 2021 00:11:30 +0200 Subject: [PATCH 35/82] prevent nullreference in exitvehicle --- .../Events/EnterVehicleAttempt.cs | 1 - ReallifeGamemode.Server/Events/ExitVehicle.cs | 79 +++++++------------ 2 files changed, 30 insertions(+), 50 deletions(-) diff --git a/ReallifeGamemode.Server/Events/EnterVehicleAttempt.cs b/ReallifeGamemode.Server/Events/EnterVehicleAttempt.cs index 0370afa7..f4814c45 100644 --- a/ReallifeGamemode.Server/Events/EnterVehicleAttempt.cs +++ b/ReallifeGamemode.Server/Events/EnterVehicleAttempt.cs @@ -228,7 +228,6 @@ namespace ReallifeGamemode.Server.Events } else { - ExitVehicle.timerNoobRollerRespawn.Stop(); vehicle.SetData("NoobSpawnVehicleTimer", false); } } diff --git a/ReallifeGamemode.Server/Events/ExitVehicle.cs b/ReallifeGamemode.Server/Events/ExitVehicle.cs index 431ac5c0..bb8d8af2 100644 --- a/ReallifeGamemode.Server/Events/ExitVehicle.cs +++ b/ReallifeGamemode.Server/Events/ExitVehicle.cs @@ -15,21 +15,41 @@ namespace ReallifeGamemode.Server.Events { public class ExitVehicle : Script { - object LastVehicle; - public static Timer timerNoobRollerRespawn = new Timer(600000); //10 Minuten Timer NoobRollerRespawn [ServerEvent(Event.PlayerExitVehicleAttempt)] public void OnPlayerExitVehicle(Player client, GTANetworkAPI.Vehicle vehicle) { - LastVehicle = vehicle; - if (client.VehicleSeat != 0) + if (client == null) + { return; + } - if (vehicle.GetServerVehicle() is FactionVehicle veh) + if (client.VehicleSeat != 0) + { + return; + } + + if (vehicle == null) + { + return; + } + + ServerVehicle serverVehicle = vehicle.GetServerVehicle(); + if (serverVehicle == null) + { + return; + } + + if (serverVehicle is FactionVehicle factionVehicle) { User u = client.GetUser(); + if (u == null) + { + return; + } + if ((u.FactionId != null) - && (veh.GetOwners().Contains(u.FactionId ?? 0)) - && (veh.Model == WeaponDealManager.WEAPON_DEAL_GANG_VEHICLE_HASH || veh.Model == WeaponDealManager.WEAPON_DEAL_STAATSFRAK_VEHICLE_HASH) + && (factionVehicle.GetOwners().Contains(u.FactionId ?? 0)) + && (factionVehicle.Model == WeaponDealManager.WEAPON_DEAL_GANG_VEHICLE_HASH || factionVehicle.Model == WeaponDealManager.WEAPON_DEAL_STAATSFRAK_VEHICLE_HASH) && vehicle.HasData("weaponDeal") && vehicle.GetData("weaponDeal") == true) { @@ -37,7 +57,7 @@ namespace ReallifeGamemode.Server.Events client.TriggerEvent("destroyCP"); } else if ((u.FactionId != null) - && (veh.Model == WeaponDealManager.WEAPON_DEAL_GANG_VEHICLE_HASH || veh.Model == WeaponDealManager.WEAPON_DEAL_STAATSFRAK_VEHICLE_HASH) + && (factionVehicle.Model == WeaponDealManager.WEAPON_DEAL_GANG_VEHICLE_HASH || factionVehicle.Model == WeaponDealManager.WEAPON_DEAL_STAATSFRAK_VEHICLE_HASH) && vehicle.HasData("WeaponDealLoad") && vehicle.GetData("WeaponDealLoad") == true) { @@ -45,7 +65,7 @@ namespace ReallifeGamemode.Server.Events } client.TriggerEvent("CheckWaterCrash", vehicle); } - if (vehicle.GetServerVehicle() is SchoolVehicle vehS) + if (serverVehicle is SchoolVehicle schoolVehicle) { if (client.HasData("ActiveSchool")) { @@ -58,22 +78,13 @@ namespace ReallifeGamemode.Server.Events CheckPointHandle.DeleteCheckpoints(client); } } - if (vehicle.GetData("NoobSpawnVehicle") == true) - { - timerNoobRollerRespawn.Start(); - vehicle.SetData("NoobSpawnVehicleTimer", true); - timerNoobRollerRespawn.AutoReset = false; - timerNoobRollerRespawn.Elapsed += Timer600000_Elapsed; - //LastVehicle = vehicle; - //timerNoobRollerRespawn.Elapsed += async (sender, e) => {await - } using (var dbContext = new DatabaseContext()) { ServerVehicle sV = vehicle.GetServerVehicle(dbContext); if (sV is UserVehicle) - { + { Vector3 pos = vehicle.Position; sV.PositionX = pos.X; @@ -86,35 +97,5 @@ namespace ReallifeGamemode.Server.Events } } } - private static void Timer600000_Elapsed(object sender, ElapsedEventArgs e) - { - //ExitVehicle c = new ExitVehicle(); - //Vehicle veh = c.LastVehicle; - NAPI.Task.Run(() => - { - NAPI.Pools.GetAllVehicles().ForEach(v => - { - if (v.GetData("NoobSpawnVehicle") == true) - { - if (v.GetData("NoobSpawnVehicleTimer") == true) - { - v.ResetData("NoobSpawnVehicleTimer"); - v.ResetData("NoobSpawnVehicle"); - VehicleManager.DeleteVehicle(v); - } - } - }); - NAPI.Pools.GetAllPlayers().ForEach(p => - { - //if (!p.IsInVehicle) - //{ - if (p.GetData("HatNoobSpawnVehicle") == true) - { - p.ResetData("HatNoobSpawnVehicle"); - } - //} - }); - }); - } } } From 75adc464a5963025980d6769e97bd53f8a86f102 Mon Sep 17 00:00:00 2001 From: hydrant Date: Thu, 20 May 2021 10:06:26 +0200 Subject: [PATCH 36/82] Feedback bei /respawnvehicle --- ReallifeGamemode.Server/Commands/AdminCommands.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ReallifeGamemode.Server/Commands/AdminCommands.cs b/ReallifeGamemode.Server/Commands/AdminCommands.cs index 6ba6f34b..58b0cc6e 100644 --- a/ReallifeGamemode.Server/Commands/AdminCommands.cs +++ b/ReallifeGamemode.Server/Commands/AdminCommands.cs @@ -1240,6 +1240,8 @@ namespace ReallifeGamemode.Server.Commands return; } + ChatService.SendMessage(player, $"~b~[AMDIN]~s~ Das Fahrzeug ~y~{serverVehicle.Id}~s~ wurde respawnt"); + Vehicle newVeh = serverVehicle.Spawn(veh); newVeh.Repair(); newVeh.Rotation = new Vector3(0, 0, serverVehicle.Heading); From aa6ec6e7ab7d5d7c55a7d63dfd29cbe73d89d82b Mon Sep 17 00:00:00 2001 From: "michael.reiswich" Date: Thu, 20 May 2021 18:11:47 +0200 Subject: [PATCH 37/82] vehicle respawn if vehicleIsDead --- .../Managers/VehicleManager.cs | 181 +++++++++--------- 1 file changed, 94 insertions(+), 87 deletions(-) diff --git a/ReallifeGamemode.Server/Managers/VehicleManager.cs b/ReallifeGamemode.Server/Managers/VehicleManager.cs index 4f14e873..02012e69 100644 --- a/ReallifeGamemode.Server/Managers/VehicleManager.cs +++ b/ReallifeGamemode.Server/Managers/VehicleManager.cs @@ -1116,10 +1116,52 @@ namespace ReallifeGamemode.Server.Managers } InventoryManager.RemoveAllItemsfromVehicleInventory(vehicle); - serverVehicle.Spawn(vehicle); - vehicle.Repair(); + CheckVehicleDeath(vehicle.Id); } + public static void CheckVehicleDeath(int id) + { + + using (var dbContext = new DatabaseContext()) + { + + Vehicle vehicle = NAPI.Pools.GetAllVehicles().Find(v => v.Id == id); + ServerVehicle sV = vehicle.GetServerVehicle(dbContext); + + if (sV is UserVehicle) + { + + foreach (VehicleRespawnPoint point in VehicleRespawnPoints) + { + if (NAPI.Pools.GetAllVehicles().Any(v => v.Position.DistanceTo(point.Position) < 1)) + { + ChatService.Broadcast("Fahrzeug zu nah"); + } + else + { + sV.PositionX = point.Position.X; + sV.PositionY = point.Position.Y; + sV.PositionZ = point.Position.Z; + sV.Heading = point.Heading; + dbContext.SaveChanges(); + break; + } + } + vehicle.Delete(); + Vehicle newVeh = sV.Spawn(vehicle); + newVeh.Repair(); + } + + if (sV is FactionVehicle || sV is GroupVehicle) + { + vehicle.Delete(); + Vehicle newVeh = sV.Spawn(vehicle); + newVeh.Repair(); + } + } + } + + [RemoteEvent("CLIENT:setMarkerBehindVehicle")] public void setVectorBehindVehicle(Player player, int id, string jsonX, string jsonY, string jsonZ) { @@ -1231,95 +1273,57 @@ namespace ReallifeGamemode.Server.Managers Position = new Vector3(-343.31, -974.59, 31.08), Heading = -20.22f }; -/* - private readonly IReadOnlyCollection vector3s = new List - { - - new Vector3(-343.31, -974.59, 31.08), //Heading -20.22 - new Vector3(-339.67, -975.69, 31.08), //Heading -16.76 - new Vector3(-336.38, -976.95, 31.08), //Heading -19.30 - new Vector3(-332.50, -978.28, 31.08), //Heading -18.82 - new Vector3(-329.48, -979.39, 31.08), //Heading -26.22 - new Vector3(-325.96, -980.70, 31.08), //Heading -19.74 - new Vector3(-360.85, -900.53, 31.07), //Heading -88.64 - new Vector3(-360.71, -904.02, 31.07), //Heading -88.04 - new Vector3(-360.56, -907.78, 31.07), //Heading -88.41 - new Vector3(-360.41, -911.79, 31.08), //Heading -86.13 - new Vector3(-360.30, -915.26, 31.08), //Heading -134.60 - new Vector3(-360.12, -919.21, 31.08), //Heading -82.35 - new Vector3(-360.03, -922.63, 31.08), //Heading -89.27 - new Vector3(-359.78, -926.58, 31.08), //Heading -84.04 - new Vector3(-359.73, -929.89, 31.08), //Heading -88.67 - new Vector3(-359.66, -933.50, 31.08), //Heading -88.67 - new Vector3(-359.54, -937.61, 31.08), //Heading -86.68 - new Vector3(-359.48, -941.17, 31.08), //Heading -90.07 - new Vector3(-336.84, -952.54, 31.08), //Heading 68.74 - new Vector3(-355.55, -949.08, 31.08), //Heading 71.85 - new Vector3(-334.47, -945.95, 31.08), //Heading 70.89 - new Vector3(-333.11, -942.11, 31.08), //Heading 70.18 - new Vector3(-331.90, -938.98, 31.08), //Heading 68.07 - new Vector3(-330.65, -935.58, 31.08), //Heading 70.98 - new Vector3(-329.24, -931.58, 31.08), //Heading 73.91 - new Vector3(-328.12, -928.44, 31.08), //Heading 69.17 - new Vector3(-326.67, -924.60, 31.08), //Heading 46.89 - new Vector3(-322.36, -982.02, 31.08), //Heading -21.25059 - new Vector3(-318.92, -983.19, 31.08), //Heading -20.580233 - new Vector3(-315.42, -984.40, 31.08), //Heading -21.508415 - new Vector3(-311.97, 985.60, 31.080), //Heading -20.866705 - new Vector3(-308.43, -986.83, 31.08), //Heading -21.050055 - new Vector3(-305.03, -988.07, 31.08), //Heading -21.021408 - new Vector3(-301.48, -989.31, 31.08), //Heading -22.333475 - new Vector3(-298.04, -990.48, 31.08), //Heading -26.02332 - new Vector3(-342.30, -921.35, 31.0), //Heading-109.20534 - new Vector3(-343.37, -925.01, 31.08), //Heading -111.86385 - new Vector3(-344.68, -928.18, 31.08), //Heading -109.97883 - new Vector3(-345.78, -931.86, 31.08), //Heading -110.89556 - }.AsReadOnly(); - */ + /* + private readonly IReadOnlyCollection vector3s = new List + { + + new Vector3(-343.31, -974.59, 31.08), //Heading -20.22 + new Vector3(-339.67, -975.69, 31.08), //Heading -16.76 + new Vector3(-336.38, -976.95, 31.08), //Heading -19.30 + new Vector3(-332.50, -978.28, 31.08), //Heading -18.82 + new Vector3(-329.48, -979.39, 31.08), //Heading -26.22 + new Vector3(-325.96, -980.70, 31.08), //Heading -19.74 + new Vector3(-360.85, -900.53, 31.07), //Heading -88.64 + new Vector3(-360.71, -904.02, 31.07), //Heading -88.04 + new Vector3(-360.56, -907.78, 31.07), //Heading -88.41 + new Vector3(-360.41, -911.79, 31.08), //Heading -86.13 + new Vector3(-360.30, -915.26, 31.08), //Heading -134.60 + new Vector3(-360.12, -919.21, 31.08), //Heading -82.35 + new Vector3(-360.03, -922.63, 31.08), //Heading -89.27 + new Vector3(-359.78, -926.58, 31.08), //Heading -84.04 + new Vector3(-359.73, -929.89, 31.08), //Heading -88.67 + new Vector3(-359.66, -933.50, 31.08), //Heading -88.67 + new Vector3(-359.54, -937.61, 31.08), //Heading -86.68 + new Vector3(-359.48, -941.17, 31.08), //Heading -90.07 + new Vector3(-336.84, -952.54, 31.08), //Heading 68.74 + new Vector3(-355.55, -949.08, 31.08), //Heading 71.85 + new Vector3(-334.47, -945.95, 31.08), //Heading 70.89 + new Vector3(-333.11, -942.11, 31.08), //Heading 70.18 + new Vector3(-331.90, -938.98, 31.08), //Heading 68.07 + new Vector3(-330.65, -935.58, 31.08), //Heading 70.98 + new Vector3(-329.24, -931.58, 31.08), //Heading 73.91 + new Vector3(-328.12, -928.44, 31.08), //Heading 69.17 + new Vector3(-326.67, -924.60, 31.08), //Heading 46.89 + new Vector3(-322.36, -982.02, 31.08), //Heading -21.25059 + new Vector3(-318.92, -983.19, 31.08), //Heading -20.580233 + new Vector3(-315.42, -984.40, 31.08), //Heading -21.508415 + new Vector3(-311.97, 985.60, 31.080), //Heading -20.866705 + new Vector3(-308.43, -986.83, 31.08), //Heading -21.050055 + new Vector3(-305.03, -988.07, 31.08), //Heading -21.021408 + new Vector3(-301.48, -989.31, 31.08), //Heading -22.333475 + new Vector3(-298.04, -990.48, 31.08), //Heading -26.02332 + new Vector3(-342.30, -921.35, 31.0), //Heading-109.20534 + new Vector3(-343.37, -925.01, 31.08), //Heading -111.86385 + new Vector3(-344.68, -928.18, 31.08), //Heading -109.97883 + new Vector3(-345.78, -931.86, 31.08), //Heading -110.89556 + }.AsReadOnly(); + */ #endregion spawnpositions-vehicleInWater [RemoteEvent("CheckWater")] - public void CheckWater(Player player, int id) + public static void CheckWater(Player player, int id) { - - - using (var dbContext = new DatabaseContext()) - { - - Vehicle vehicle = NAPI.Pools.GetAllVehicles().Find(v => v.Id == id); - ServerVehicle sV = vehicle.GetServerVehicle(dbContext); - - if (sV is UserVehicle) - { - - foreach (VehicleRespawnPoint point in VehicleRespawnPoints) - { - if (NAPI.Pools.GetAllVehicles().Any(v => v.Position.DistanceTo(point.Position) < 1)) - { - ChatService.Broadcast("Fahrzeug zu nah"); - } - else - { - sV.PositionX = point.Position.X; - sV.PositionY = point.Position.Y; - sV.PositionZ = point.Position.Z; - sV.Heading = point.Heading; - dbContext.SaveChanges(); - break; - } - } - vehicle.Delete(); - Vehicle newVeh = sV.Spawn(vehicle); - newVeh.Repair(); - } - - if (sV is FactionVehicle || sV is GroupVehicle) - { - vehicle.Delete(); - Vehicle newVeh = sV.Spawn(vehicle); - newVeh.Repair(); - } - } + CheckVehicleDeath(id); } } } @@ -1328,3 +1332,6 @@ public class VehicleRespawnPoint public Vector3 Position { get; set; } public float Heading { get; set; } } + + + From 3f926fb9efae92e78ca1faf0deee07e7eb13f6bf Mon Sep 17 00:00:00 2001 From: "michael.reiswich" Date: Thu, 20 May 2021 22:24:46 +0200 Subject: [PATCH 38/82] fix item Rubbellos & add item Notfallkit --- .../html/inventory/img/inventory/200.svg | 1 + .../html/inventory/img/inventory/201.svg | 1 + .../Inventory/Items/Notfallkit.cs | 58 +++++++++++++++++++ .../Inventory/Items/Rubellos.cs | 47 ++++++++++++++- .../Inventory/Items/UseItem.cs | 29 +--------- 5 files changed, 107 insertions(+), 29 deletions(-) create mode 100644 ReallifeGamemode.Client/assets/html/inventory/img/inventory/200.svg create mode 100644 ReallifeGamemode.Client/assets/html/inventory/img/inventory/201.svg create mode 100644 ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/200.svg b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/200.svg new file mode 100644 index 00000000..4aa8a3e4 --- /dev/null +++ b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/200.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/201.svg b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/201.svg new file mode 100644 index 00000000..d3b99f2c --- /dev/null +++ b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/201.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs b/ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs new file mode 100644 index 00000000..3a953a8e --- /dev/null +++ b/ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs @@ -0,0 +1,58 @@ +using GTANetworkAPI; +using ReallifeGamemode.Database.Entities; +using System.Linq; +using ReallifeGamemode.Server.Extensions; +using ReallifeGamemode.Server.Managers; +using ReallifeGamemode.Server.Services; + + +namespace ReallifeGamemode.Server.Inventory.Items +{ + class Notfallkit : UseItem + { + public override int Id => 201; + public override string Name => "Notfallkit"; + public override string Description => "Fahrzeug reparieren"; + public override int Gewicht => 1000; + public override string Einheit => "g"; + public override uint Object => 875075437; + public override int Price => 500; + + public override bool Use(UserItem uItem) + { + Player player = uItem.GetUser().Player; + + if (uItem.ItemId != 201) + { + return false; + } + + Vehicle veh = null; + + var nearestVeh = NAPI.Pools.GetAllVehicles().Where(v => v.Position.DistanceTo(player.Position) <= 5).FirstOrDefault(); + veh = nearestVeh; + + if (veh == null) + { + player.SendNotification("Es befindet sich kein Fahrzeug in deiner Nähe"); + return false; + } + + if(player.IsInVehicle) + { + player.SendNotification("Du musst aus deinem Fahrzeug aussteigen!"); + return false; + } + + ChatService.SendMessage(player, $"~b~[AMDIN]~s~ Das Fahrzeug repariert"); + player.SendNotification("Du hast ~g~" + InventoryManager.GetItemById(uItem.ItemId).Name + " ~s~verwendet.", false); + InventoryManager.RemoveUserItem(player.GetUser(), uItem, 1); + ServerVehicle serverVehicle = VehicleManager.GetServerVehicleFromVehicle(veh); + Vehicle newVeh = serverVehicle.Spawn(veh); + newVeh.Repair(); + newVeh.Rotation = new Vector3(0, 0, serverVehicle.Heading); + return true; + + } + } +} diff --git a/ReallifeGamemode.Server/Inventory/Items/Rubellos.cs b/ReallifeGamemode.Server/Inventory/Items/Rubellos.cs index e9ad4ee7..22c2f1e4 100644 --- a/ReallifeGamemode.Server/Inventory/Items/Rubellos.cs +++ b/ReallifeGamemode.Server/Inventory/Items/Rubellos.cs @@ -1,4 +1,14 @@ -namespace ReallifeGamemode.Server.Inventory.Items +using System; +using System.Security.Cryptography; +using GTANetworkAPI; +using Microsoft.CodeAnalysis.CSharp.Syntax; +using ReallifeGamemode.Database.Entities; +using ReallifeGamemode.Database.Models; +using ReallifeGamemode.Server.Extensions; +using ReallifeGamemode.Server.Inventory.Interfaces; +using ReallifeGamemode.Server.Managers; + +namespace ReallifeGamemode.Server.Inventory.Items { public class Rubellos : UseItem { @@ -9,5 +19,40 @@ public override string Einheit => "g"; public override uint Object => 875075437; public override int Price => 500; + + public override bool Use(UserItem uItem) + { + Player player = uItem.GetUser().Player; + + if (uItem.ItemId != 200) + { + return false; + } + Random random = new Random(); + int randomNumber = random.Next(1, 5); + if (randomNumber == 1) + { + using (var dbContext = new DatabaseContext()) + { + User winner = player.GetUser(dbContext); + winner.Handmoney += 1000; + player.TriggerEvent("SERVER:SET_HANDMONEY", winner.Handmoney); + dbContext.SaveChanges(); + } + Services.ChatService.SendMessage(player, "Glückwunsch, du hast $1000 gewonnen!"); + } + else + { + Services.ChatService.SendMessage(player, "Leider kein Gewinn, viel Glück beim nächsten mal"); + } + player.SendNotification("Du hast ~g~" + InventoryManager.GetItemById(uItem.ItemId).Name + " ~s~verwendet.", false); + InventoryManager.RemoveUserItem(player.GetUser(), uItem, 1); + return true; } + + +} + + + } diff --git a/ReallifeGamemode.Server/Inventory/Items/UseItem.cs b/ReallifeGamemode.Server/Inventory/Items/UseItem.cs index 17368808..7da16564 100644 --- a/ReallifeGamemode.Server/Inventory/Items/UseItem.cs +++ b/ReallifeGamemode.Server/Inventory/Items/UseItem.cs @@ -20,34 +20,7 @@ namespace ReallifeGamemode.Server.Inventory.Items public abstract uint Object { get; } public abstract int Price { get; } - public bool Use(UserItem uItem) - { - Player player = uItem.GetUser().Player; + public abstract bool Use(UserItem uItem); - if (uItem.ItemId != 200) - { - return false; - } - Random random = new Random(); - int randomNumber = random.Next(1, 5); - if (randomNumber == 1) - { - using (var dbContext = new DatabaseContext()) - { - User winner = player.GetUser(dbContext); - winner.Handmoney += 1000; - player.TriggerEvent("SERVER:SET_HANDMONEY", winner.Handmoney); - dbContext.SaveChanges(); - } - Services.ChatService.SendMessage(player, "Glückwunsch, du hast $1000 gewonnen!"); - } - else - { - Services.ChatService.SendMessage(player, "Leider kein Gewinn, viel Glück beim nächsten mal"); - } - player.SendNotification("Du hast ~g~" + InventoryManager.GetItemById(uItem.ItemId).Name + " ~s~verwendet.", false); - InventoryManager.RemoveUserItem(player.GetUser(), uItem, 1); - return true; - } } } From a5b6f3215eeac0abab79d70baa1cc494389434ca Mon Sep 17 00:00:00 2001 From: "michael.reiswich" Date: Thu, 20 May 2021 23:10:15 +0200 Subject: [PATCH 39/82] Change Notfallkit --- .../Inventory/Items/Notfallkit.cs | 27 +++++++++++++------ .../Managers/VehicleManager.cs | 2 +- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs b/ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs index 3a953a8e..5ea73a88 100644 --- a/ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs +++ b/ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs @@ -4,6 +4,7 @@ using System.Linq; using ReallifeGamemode.Server.Extensions; using ReallifeGamemode.Server.Managers; using ReallifeGamemode.Server.Services; +using ReallifeGamemode.Database.Models; namespace ReallifeGamemode.Server.Inventory.Items @@ -44,15 +45,25 @@ namespace ReallifeGamemode.Server.Inventory.Items return false; } - ChatService.SendMessage(player, $"~b~[AMDIN]~s~ Das Fahrzeug repariert"); - player.SendNotification("Du hast ~g~" + InventoryManager.GetItemById(uItem.ItemId).Name + " ~s~verwendet.", false); - InventoryManager.RemoveUserItem(player.GetUser(), uItem, 1); - ServerVehicle serverVehicle = VehicleManager.GetServerVehicleFromVehicle(veh); - Vehicle newVeh = serverVehicle.Spawn(veh); - newVeh.Repair(); - newVeh.Rotation = new Vector3(0, 0, serverVehicle.Heading); - return true; + if(veh.Controller == null) + { + player.SendNotification("Es sitzt jemand im Auto du kannst es nicht Reparieren!"); + return false; + } + using (var dbContext = new DatabaseContext()) + { + Vector3 position = veh.Position; + ChatService.SendMessage(player, $"~b~[AMDIN]~s~ Das Fahrzeug repariert"); + player.SendNotification("Du hast ~g~" + InventoryManager.GetItemById(uItem.ItemId).Name + " ~s~verwendet.", false); + InventoryManager.RemoveUserItem(player.GetUser(), uItem, 1); + ServerVehicle serverVehicle = veh.GetServerVehicle(dbContext); + serverVehicle.Spawn(veh).Position = position; + Vehicle newVeh = serverVehicle.Spawn(veh); + newVeh.Repair(); + newVeh.Rotation = new Vector3(0, 0, serverVehicle.Heading); + return true; + } } } } diff --git a/ReallifeGamemode.Server/Managers/VehicleManager.cs b/ReallifeGamemode.Server/Managers/VehicleManager.cs index 02012e69..db220f30 100644 --- a/ReallifeGamemode.Server/Managers/VehicleManager.cs +++ b/ReallifeGamemode.Server/Managers/VehicleManager.cs @@ -1151,7 +1151,7 @@ namespace ReallifeGamemode.Server.Managers Vehicle newVeh = sV.Spawn(vehicle); newVeh.Repair(); } - + if (sV is FactionVehicle || sV is GroupVehicle) { vehicle.Delete(); From a1234a7fcfc3315461400606b8eb5dcd5586b12d Mon Sep 17 00:00:00 2001 From: "michael.reiswich" Date: Fri, 21 May 2021 20:57:55 +0200 Subject: [PATCH 40/82] some changes --- ReallifeGamemode.Server/Events/EnterVehicleAttempt.cs | 2 +- ReallifeGamemode.Server/Events/Key.cs | 5 +++++ ReallifeGamemode.Server/Factions/Medic/Medic.cs | 2 +- ReallifeGamemode.Server/Finance/Economy.cs | 9 +++++++-- ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs | 5 +++++ ReallifeGamemode.Server/Inventory/Items/Rubellos.cs | 8 ++++---- ReallifeGamemode.Server/Util/AttachmentSync.cs | 8 ++++---- 7 files changed, 27 insertions(+), 12 deletions(-) diff --git a/ReallifeGamemode.Server/Events/EnterVehicleAttempt.cs b/ReallifeGamemode.Server/Events/EnterVehicleAttempt.cs index f4814c45..fa9700dc 100644 --- a/ReallifeGamemode.Server/Events/EnterVehicleAttempt.cs +++ b/ReallifeGamemode.Server/Events/EnterVehicleAttempt.cs @@ -31,7 +31,7 @@ namespace ReallifeGamemode.Server.Events { if (!veh.GetOwners().Contains(player.GetUser().FactionId ?? 0) && !(u.IsAdmin(AdminLevel.HEADADMIN) && player.IsAdminDuty()) && !JobBase.GetPlayerInJob().Contains(player)) { - if ((VehicleHash)vehicle.Model == WeaponDealManager.WEAPON_DEAL_GANG_VEHICLE_HASH) + if ((VehicleHash)vehicle.Model == WeaponDealManager.WEAPON_DEAL_GANG_VEHICLE_HASH || (VehicleHash)vehicle.Model == WeaponDealManager.WEAPON_DEAL_STAATSFRAK_VEHICLE_HASH) { if (WeaponDealManager.checkWeaponDbyVehicle(vehicle)) return; diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs index 56bced38..dde1e8cf 100644 --- a/ReallifeGamemode.Server/Events/Key.cs +++ b/ReallifeGamemode.Server/Events/Key.cs @@ -946,6 +946,11 @@ namespace ReallifeGamemode.Server.Events return; } + if(player.Dead == true) + { + return; + } + bool state = VehicleStreaming.GetEngineState(v); ServerVehicle sV = v.GetServerVehicle(); if (sV != null) diff --git a/ReallifeGamemode.Server/Factions/Medic/Medic.cs b/ReallifeGamemode.Server/Factions/Medic/Medic.cs index 58847dcf..96a17975 100644 --- a/ReallifeGamemode.Server/Factions/Medic/Medic.cs +++ b/ReallifeGamemode.Server/Factions/Medic/Medic.cs @@ -28,7 +28,7 @@ namespace ReallifeGamemode.Server.Factions.Medic public static List HealTasks = new List(); public static List FireTasks = new List(); public static List HealDecisions = new List(); - public static int ReviveIncome = 100; + public static int ReviveIncome = 50; public static int dutyMedics = 0; public static int reviveTaskTime = 120; diff --git a/ReallifeGamemode.Server/Finance/Economy.cs b/ReallifeGamemode.Server/Finance/Economy.cs index 860f3c05..ca79a7d2 100644 --- a/ReallifeGamemode.Server/Finance/Economy.cs +++ b/ReallifeGamemode.Server/Finance/Economy.cs @@ -105,6 +105,11 @@ namespace ReallifeGamemode.Server.Finance healthInsurance = 0; } + if (healthInsurance > 150) + { + healthInsurance = 150; + } + int? factionMoney = null; if (user.Faction != null && user.FactionRank != null) @@ -185,8 +190,8 @@ namespace ReallifeGamemode.Server.Finance .ThenInclude(h => h.BankAccount) .Where(hR => hR.UserId == u.Id); - dbContext.Factions.Include(f => f.BankAccount).Where(f => f.Id == 2).First().BankAccount.Balance += (int)(paycheck.HealthInsurance * 0.1); - logger.LogInformation("Medic faction got a health insurance payment of {0} dollars from player {1}", paycheck.HealthInsurance * 0.1, client.Name); + dbContext.Factions.Include(f => f.BankAccount).Where(f => f.Id == 2).First().BankAccount.Balance += (int)(paycheck.HealthInsurance); + logger.LogInformation("Medic faction got a health insurance payment of {0} dollars from player {1}", paycheck.HealthInsurance, client.Name); if (rentals.Any()) { foreach (var rental in rentals) diff --git a/ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs b/ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs index 5ea73a88..5dff4e68 100644 --- a/ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs +++ b/ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs @@ -19,6 +19,9 @@ namespace ReallifeGamemode.Server.Inventory.Items public override uint Object => 875075437; public override int Price => 500; + + public static readonly VehicleHash WEAPON_DEAL_GANG_VEHICLE_HASH = VehicleHash.Gburrito2; + public static readonly VehicleHash WEAPON_DEAL_STAATSFRAK_VEHICLE_HASH = VehicleHash.Policet; public override bool Use(UserItem uItem) { Player player = uItem.GetUser().Player; @@ -28,6 +31,8 @@ namespace ReallifeGamemode.Server.Inventory.Items return false; } + + Vehicle veh = null; var nearestVeh = NAPI.Pools.GetAllVehicles().Where(v => v.Position.DistanceTo(player.Position) <= 5).FirstOrDefault(); diff --git a/ReallifeGamemode.Server/Inventory/Items/Rubellos.cs b/ReallifeGamemode.Server/Inventory/Items/Rubellos.cs index 22c2f1e4..7372b6f1 100644 --- a/ReallifeGamemode.Server/Inventory/Items/Rubellos.cs +++ b/ReallifeGamemode.Server/Inventory/Items/Rubellos.cs @@ -29,21 +29,21 @@ namespace ReallifeGamemode.Server.Inventory.Items return false; } Random random = new Random(); - int randomNumber = random.Next(1, 5); + int randomNumber = random.Next(1, 2); if (randomNumber == 1) { using (var dbContext = new DatabaseContext()) { User winner = player.GetUser(dbContext); winner.Handmoney += 1000; - player.TriggerEvent("SERVER:SET_HANDMONEY", winner.Handmoney); + //player.TriggerEvent("SERVER:SET_HANDMONEY", winner.Handmoney); dbContext.SaveChanges(); } - Services.ChatService.SendMessage(player, "Glückwunsch, du hast $1000 gewonnen!"); + player.SendNotification("Glückwunsch du hast ~g~$~w~1000 gewonnen!"); } else { - Services.ChatService.SendMessage(player, "Leider kein Gewinn, viel Glück beim nächsten mal"); + player.SendNotification("Leider kein Gewinn, viel Glück beim nächsten mal."); } player.SendNotification("Du hast ~g~" + InventoryManager.GetItemById(uItem.ItemId).Name + " ~s~verwendet.", false); InventoryManager.RemoveUserItem(player.GetUser(), uItem, 1); diff --git a/ReallifeGamemode.Server/Util/AttachmentSync.cs b/ReallifeGamemode.Server/Util/AttachmentSync.cs index 5828917a..505e1c62 100644 --- a/ReallifeGamemode.Server/Util/AttachmentSync.cs +++ b/ReallifeGamemode.Server/Util/AttachmentSync.cs @@ -135,15 +135,15 @@ public class AttachmentSyncExample : Script player.AddAttachment(Base36Extensions.FromBase36(hash), true); } - //[Command("xdd")] + [Command("xdd")] public void attachment(Player player) { Vehicle veh = player.Vehicle; - if (!player.HasAttachment("ammobox")) + if (!veh.HasAttachment("weapondeal")) { - player.AddAttachment("ammobox", false); + //player.AddAttachment("weapondeal", false); //player.SyncAnimation("carryBox"); - //veh.AddAttachment("weapondeal1", false); + veh.AddAttachment("weapondeal", false); //veh.AddAttachment("weapondeal2", false); } else From a49348ed5b57c5eb1573ea2dd2f183f8e0ecf0ea Mon Sep 17 00:00:00 2001 From: "michael.reiswich" Date: Fri, 21 May 2021 21:00:01 +0200 Subject: [PATCH 41/82] jha --- ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs | 5 ----- 1 file changed, 5 deletions(-) diff --git a/ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs b/ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs index 5dff4e68..5ea73a88 100644 --- a/ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs +++ b/ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs @@ -19,9 +19,6 @@ namespace ReallifeGamemode.Server.Inventory.Items public override uint Object => 875075437; public override int Price => 500; - - public static readonly VehicleHash WEAPON_DEAL_GANG_VEHICLE_HASH = VehicleHash.Gburrito2; - public static readonly VehicleHash WEAPON_DEAL_STAATSFRAK_VEHICLE_HASH = VehicleHash.Policet; public override bool Use(UserItem uItem) { Player player = uItem.GetUser().Player; @@ -31,8 +28,6 @@ namespace ReallifeGamemode.Server.Inventory.Items return false; } - - Vehicle veh = null; var nearestVeh = NAPI.Pools.GetAllVehicles().Where(v => v.Position.DistanceTo(player.Position) <= 5).FirstOrDefault(); From 89f06a4ea6e7629287935ae062564df7b0457f47 Mon Sep 17 00:00:00 2001 From: "michael.reiswich" Date: Fri, 21 May 2021 21:01:17 +0200 Subject: [PATCH 42/82] xdd command raus --- ReallifeGamemode.Server/Util/AttachmentSync.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ReallifeGamemode.Server/Util/AttachmentSync.cs b/ReallifeGamemode.Server/Util/AttachmentSync.cs index 505e1c62..2dc7fc75 100644 --- a/ReallifeGamemode.Server/Util/AttachmentSync.cs +++ b/ReallifeGamemode.Server/Util/AttachmentSync.cs @@ -135,7 +135,7 @@ public class AttachmentSyncExample : Script player.AddAttachment(Base36Extensions.FromBase36(hash), true); } - [Command("xdd")] + //[Command("xdd")] public void attachment(Player player) { Vehicle veh = player.Vehicle; @@ -143,7 +143,7 @@ public class AttachmentSyncExample : Script { //player.AddAttachment("weapondeal", false); //player.SyncAnimation("carryBox"); - veh.AddAttachment("weapondeal", false); + //veh.AddAttachment("weapondeal", false); //veh.AddAttachment("weapondeal2", false); } else From 82c7a0cb8eb0c9ea857bbc4027db780d69139bfd Mon Sep 17 00:00:00 2001 From: "michael.reiswich" Date: Fri, 21 May 2021 21:33:53 +0200 Subject: [PATCH 43/82] add GEZ --- .../Interaction/interactionmenu.ts | 4 ++++ ReallifeGamemode.Client/global.d.ts | 1 + ReallifeGamemode.Server/Finance/Economy.cs | 22 +++++++++++++++++-- ReallifeGamemode.Server/Finance/Paycheck.cs | 6 ++++- 4 files changed, 30 insertions(+), 3 deletions(-) diff --git a/ReallifeGamemode.Client/Interaction/interactionmenu.ts b/ReallifeGamemode.Client/Interaction/interactionmenu.ts index 6bff316d..c3a90cd9 100644 --- a/ReallifeGamemode.Client/Interaction/interactionmenu.ts +++ b/ReallifeGamemode.Client/Interaction/interactionmenu.ts @@ -127,6 +127,10 @@ export default function (globalData: IGlobalData) { item.SetRightLabel("~r~- $" + moneyFormat(Number(p.healthInsurance.toFixed(2)))); paycheckMenu.AddItem(item); + item = new UIMenuItem("Rundfunkbeitrag"); + item.SetRightLabel("~r~- $" + moneyFormat(Number(p.gez.toFixed(2)))); + paycheckMenu.AddItem(item); + item = new UIMenuItem("Einkommensteuer"); item.SetRightLabel(moneyFormat(Number((p.financialInterest * 100).toFixed(3))) + "%"); diff --git a/ReallifeGamemode.Client/global.d.ts b/ReallifeGamemode.Client/global.d.ts index 28e23ada..a3a3e4b2 100644 --- a/ReallifeGamemode.Client/global.d.ts +++ b/ReallifeGamemode.Client/global.d.ts @@ -48,6 +48,7 @@ declare type Paycheck = { amount: number; rentalFees: number; healthInsurance: number; + gez: number; factionMoney: number; otheramount: number; } diff --git a/ReallifeGamemode.Server/Finance/Economy.cs b/ReallifeGamemode.Server/Finance/Economy.cs index ca79a7d2..496f5321 100644 --- a/ReallifeGamemode.Server/Finance/Economy.cs +++ b/ReallifeGamemode.Server/Finance/Economy.cs @@ -110,6 +110,19 @@ namespace ReallifeGamemode.Server.Finance healthInsurance = 150; } + + int gez = (int)((bankAccount + user.Handmoney) * 0.001); + if (gez < 0) + { + gez = 0; + } + + if (gez > 150) + { + gez = 150; + } + + int? factionMoney = null; if (user.Faction != null && user.FactionRank != null) @@ -127,9 +140,9 @@ namespace ReallifeGamemode.Server.Finance factionMoney = factionWage; } int otheramount = user.otheramount; - int amount = wage - (int)(wage * financialInterest) - vehicleTaxation - (int)propertyTax + (int)financialHelp - rentalFees - healthInsurance + (factionMoney ?? 0) + otheramount; + int amount = wage - (int)(wage * financialInterest) - vehicleTaxation - (int)propertyTax + (int)financialHelp - rentalFees - healthInsurance + gez + (factionMoney ?? 0) + otheramount; - Paycheck paycheck = new Paycheck(financialHelp, financialInterest, vehicleTaxation, propertyTax, wage, amount, rentalFees, healthInsurance, factionMoney, otheramount); + Paycheck paycheck = new Paycheck(financialHelp, financialInterest, vehicleTaxation, propertyTax, wage, amount, rentalFees, healthInsurance, gez, factionMoney, otheramount); Paychecks[user.Id] = paycheck; ReleasePayDay(client, paycheck, minusJail); } @@ -178,6 +191,7 @@ namespace ReallifeGamemode.Server.Finance u.BankAccount.Balance + paycheck.Amount, paycheck.Wage, paycheck.FinancialInterest, + paycheck.gez, paycheck.otheramount); u.BankAccount.Balance += paycheck.Amount; @@ -192,6 +206,10 @@ namespace ReallifeGamemode.Server.Finance dbContext.Factions.Include(f => f.BankAccount).Where(f => f.Id == 2).First().BankAccount.Balance += (int)(paycheck.HealthInsurance); logger.LogInformation("Medic faction got a health insurance payment of {0} dollars from player {1}", paycheck.HealthInsurance, client.Name); + + dbContext.Factions.Include(f => f.BankAccount).Where(f => f.Id == 9).First().BankAccount.Balance += (int)(paycheck.gez); + logger.LogInformation("Medic faction got a gez payment of {0} dollars from player {1}", paycheck.gez, client.Name); + if (rentals.Any()) { foreach (var rental in rentals) diff --git a/ReallifeGamemode.Server/Finance/Paycheck.cs b/ReallifeGamemode.Server/Finance/Paycheck.cs index 9c4c0805..b9f8dcfc 100644 --- a/ReallifeGamemode.Server/Finance/Paycheck.cs +++ b/ReallifeGamemode.Server/Finance/Paycheck.cs @@ -28,13 +28,16 @@ namespace ReallifeGamemode.Server.Finance [JsonProperty("healthInsurance")] public int HealthInsurance { get; set; } = 0; + [JsonProperty("gez")] + public int gez { get; set; } = 0; + [JsonProperty("factionMoney")] public int? FactionMoney { get; set; } = 0; [JsonProperty("otheramount")] public int? otheramount { get; set; } = 0; - public Paycheck(float FinancialHelp, float FinancialInterest, int VehicleTaxation, float PropertyTaxation, int Wage, int Amount, int RentalFees, int HealthInsurance, int? FactionMoney, int? otheramount) + public Paycheck(float FinancialHelp, float FinancialInterest, int VehicleTaxation, float PropertyTaxation, int Wage, int Amount, int RentalFees, int HealthInsurance, int gez, int? FactionMoney, int? otheramount) { this.FinancialHelp = FinancialHelp; this.FinancialInterest = FinancialInterest; @@ -44,6 +47,7 @@ namespace ReallifeGamemode.Server.Finance this.Amount = Amount; this.RentalFees = RentalFees; this.HealthInsurance = HealthInsurance; + this.gez = gez; this.FactionMoney = FactionMoney; this.otheramount = otheramount; } From 502b43f9338aad1372be19d65328a43a4c9663c8 Mon Sep 17 00:00:00 2001 From: "michael.reiswich" Date: Fri, 21 May 2021 22:42:40 +0200 Subject: [PATCH 44/82] =?UTF-8?q?fix=20job=20annehmen=20/Du=20ben=C3=B6tig?= =?UTF-8?q?st=20einen=20F=C3=BChrerschein=20f=C3=BCr=20Pilot?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ReallifeGamemode.Server/Managers/JobManager.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReallifeGamemode.Server/Managers/JobManager.cs b/ReallifeGamemode.Server/Managers/JobManager.cs index 30a623df..58c0ffa2 100644 --- a/ReallifeGamemode.Server/Managers/JobManager.cs +++ b/ReallifeGamemode.Server/Managers/JobManager.cs @@ -100,7 +100,7 @@ namespace ReallifeGamemode.Server.Managers return; } - if (u.DriverLicenseVehicle == false) + if (jobId != 3 && u.DriverLicenseVehicle == false) { ChatService.ErrorMessage(player, "Um diesen Job annehmen zu können, musst du einen Führerschein besitzen"); return; From 591d592a3a905647bb6236bbb44d109080db69bc Mon Sep 17 00:00:00 2001 From: "michael.reiswich" Date: Sat, 22 May 2021 00:16:57 +0200 Subject: [PATCH 45/82] =?UTF-8?q?kofferraum=20=C3=B6ffnen=20range=20erh?= =?UTF-8?q?=C3=B6ht?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ReallifeGamemode.Server/Managers/InventoryManager.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReallifeGamemode.Server/Managers/InventoryManager.cs b/ReallifeGamemode.Server/Managers/InventoryManager.cs index e0dc309d..38d5d00d 100644 --- a/ReallifeGamemode.Server/Managers/InventoryManager.cs +++ b/ReallifeGamemode.Server/Managers/InventoryManager.cs @@ -82,7 +82,7 @@ namespace ReallifeGamemode.Server.Managers { player.TriggerEvent("Error", "Du kannst deinen Kofferraum gerade nicht öffnen."); } - Vehicle veh = NAPI.Pools.GetAllVehicles().ToList().Where(v => v.Position.DistanceTo(player.Position) <= 2).FirstOrDefault(); + Vehicle veh = NAPI.Pools.GetAllVehicles().ToList().Where(v => v.Position.DistanceTo(player.Position) <= 4).FirstOrDefault(); if (veh == null) { player.TriggerEvent("Error", "Kein Fahrzeug in der Nähe!"); From 0d19373064486df620440b0dd64a81c500d01956 Mon Sep 17 00:00:00 2001 From: "michael.reiswich" Date: Sat, 22 May 2021 00:45:42 +0200 Subject: [PATCH 46/82] =?UTF-8?q?add=20notification=20*Du=20besitzt=20kein?= =?UTF-8?q?en=20Flug/F=C3=BChrerschein*?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Events/EnterVehicle.cs | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/ReallifeGamemode.Server/Events/EnterVehicle.cs b/ReallifeGamemode.Server/Events/EnterVehicle.cs index 5725b4a3..6702336d 100644 --- a/ReallifeGamemode.Server/Events/EnterVehicle.cs +++ b/ReallifeGamemode.Server/Events/EnterVehicle.cs @@ -6,6 +6,7 @@ using ReallifeGamemode.Server.Extensions; using ReallifeGamemode.Server.Managers; using ReallifeGamemode.Server.Util; using ReallifeGamemode.Server.WeaponDeal; +using ReallifeGamemode.Database.Models; namespace ReallifeGamemode.Server.Events { @@ -32,6 +33,24 @@ namespace ReallifeGamemode.Server.Events VehicleManager.lastDriversInVehicle[vehicle][client.Name] = DateTime.Now; } + using (var dbcontext = new DatabaseContext()) + { + User u = client.GetUser(dbcontext); + if ((vehicle.Class != 16 && vehicle.Class != 15) && u.DriverLicenseVehicle == false) + { + client.SendNotification("Du besitzt keinen Führerschein!"); + return; + } + + if ((vehicle.Class == 16 && u.FlyingLicensePlane == false) || (vehicle.Class == 15 && u.FlyingLicensePlane == false)) //planes = 16 helicopter = 15 + { + client.SendNotification("Du besitzt keinen Flugschein!"); + return; + } + + } + + if (vehicle.GetServerVehicle() is FactionVehicle veh) { User u = client.GetUser(); @@ -52,10 +71,8 @@ namespace ReallifeGamemode.Server.Events && vehicle.GetData("WeaponDealLoad") == true) { BasePoints basePoints = new BasePoints(); - basePoints.getbase(u.FactionId, client); + basePoints.getbase(u.FactionId, client); } - - } } } From ad168aed7fcc5e43d6c335000ccc8b63b80fd8c6 Mon Sep 17 00:00:00 2001 From: "michael.reiswich" Date: Sun, 23 May 2021 14:48:25 +0200 Subject: [PATCH 47/82] more money for fib & pd --- ReallifeGamemode.Server/Extensions/ClientExtension.cs | 2 +- ReallifeGamemode.Server/Finance/Economy.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ReallifeGamemode.Server/Extensions/ClientExtension.cs b/ReallifeGamemode.Server/Extensions/ClientExtension.cs index c7af71aa..817d2ee4 100644 --- a/ReallifeGamemode.Server/Extensions/ClientExtension.cs +++ b/ReallifeGamemode.Server/Extensions/ClientExtension.cs @@ -105,7 +105,7 @@ namespace ReallifeGamemode.Server.Extensions time *= 2; } - int factionMoney = user.Wanteds * 6; + int factionMoney = user.Wanteds * 25; var executiveFactions = dbContext.Factions.Include(f => f.BankAccount).Where(f => f.Id == 1 || f.Id == 3); foreach (var faction in executiveFactions) { diff --git a/ReallifeGamemode.Server/Finance/Economy.cs b/ReallifeGamemode.Server/Finance/Economy.cs index 496f5321..89e7fde9 100644 --- a/ReallifeGamemode.Server/Finance/Economy.cs +++ b/ReallifeGamemode.Server/Finance/Economy.cs @@ -208,7 +208,7 @@ namespace ReallifeGamemode.Server.Finance logger.LogInformation("Medic faction got a health insurance payment of {0} dollars from player {1}", paycheck.HealthInsurance, client.Name); dbContext.Factions.Include(f => f.BankAccount).Where(f => f.Id == 9).First().BankAccount.Balance += (int)(paycheck.gez); - logger.LogInformation("Medic faction got a gez payment of {0} dollars from player {1}", paycheck.gez, client.Name); + logger.LogInformation("NR faction got a gez payment of {0} dollars from player {1}", paycheck.gez, client.Name); if (rentals.Any()) { From 0e34b9f88a1f28ba22a0da405b8d6561e1442ce6 Mon Sep 17 00:00:00 2001 From: "michael.reiswich" Date: Sun, 23 May 2021 15:00:34 +0200 Subject: [PATCH 48/82] =?UTF-8?q?Notfallkit=20nicht=20beim=20Waffentranspo?= =?UTF-8?q?rter=20m=C3=B6glich?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs b/ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs index 5ea73a88..d1b61dda 100644 --- a/ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs +++ b/ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs @@ -5,7 +5,7 @@ using ReallifeGamemode.Server.Extensions; using ReallifeGamemode.Server.Managers; using ReallifeGamemode.Server.Services; using ReallifeGamemode.Database.Models; - +using ReallifeGamemode.Server.WeaponDeal; namespace ReallifeGamemode.Server.Inventory.Items { @@ -35,7 +35,7 @@ namespace ReallifeGamemode.Server.Inventory.Items if (veh == null) { - player.SendNotification("Es befindet sich kein Fahrzeug in deiner Nähe"); + player.SendNotification("Es befindet sich kein Fahrzeug in deiner Nähe!"); return false; } @@ -51,10 +51,15 @@ namespace ReallifeGamemode.Server.Inventory.Items return false; } + if((VehicleHash)veh.Model == WeaponDealManager.WEAPON_DEAL_GANG_VEHICLE_HASH || (VehicleHash)veh.Model == WeaponDealManager.WEAPON_DEAL_STAATSFRAK_VEHICLE_HASH) + { + player.SendNotification("Du kannst den Waffentransporter nicht Reparieren!"); + return false; + } + using (var dbContext = new DatabaseContext()) { Vector3 position = veh.Position; - ChatService.SendMessage(player, $"~b~[AMDIN]~s~ Das Fahrzeug repariert"); player.SendNotification("Du hast ~g~" + InventoryManager.GetItemById(uItem.ItemId).Name + " ~s~verwendet.", false); InventoryManager.RemoveUserItem(player.GetUser(), uItem, 1); ServerVehicle serverVehicle = veh.GetServerVehicle(dbContext); From e4247faa2c8e118fd85b14ecc0ab3ed0d6599ff8 Mon Sep 17 00:00:00 2001 From: Luke Date: Sun, 23 May 2021 23:08:55 +0000 Subject: [PATCH 49/82] repairkit notifications textlich angepasst --- ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs b/ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs index d1b61dda..89d74d6f 100644 --- a/ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs +++ b/ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs @@ -1,4 +1,4 @@ -using GTANetworkAPI; +using GTANetworkAPI; using ReallifeGamemode.Database.Entities; using System.Linq; using ReallifeGamemode.Server.Extensions; @@ -47,20 +47,20 @@ namespace ReallifeGamemode.Server.Inventory.Items if(veh.Controller == null) { - player.SendNotification("Es sitzt jemand im Auto du kannst es nicht Reparieren!"); + player.SendNotification("Du kannst dieses Fahrzeug nicht reparieren, weil Jemand bereits im Fahrzeug sitzt"); return false; } if((VehicleHash)veh.Model == WeaponDealManager.WEAPON_DEAL_GANG_VEHICLE_HASH || (VehicleHash)veh.Model == WeaponDealManager.WEAPON_DEAL_STAATSFRAK_VEHICLE_HASH) { - player.SendNotification("Du kannst den Waffentransporter nicht Reparieren!"); + player.SendNotification("Du kannst den Waffentransporter nicht reparieren!"); return false; } using (var dbContext = new DatabaseContext()) { Vector3 position = veh.Position; - player.SendNotification("Du hast ~g~" + InventoryManager.GetItemById(uItem.ItemId).Name + " ~s~verwendet.", false); + player.SendNotification("Du hast ~g~" + InventoryManager.GetItemById(uItem.ItemId).Name + " ~s~verwendet", false); InventoryManager.RemoveUserItem(player.GetUser(), uItem, 1); ServerVehicle serverVehicle = veh.GetServerVehicle(dbContext); serverVehicle.Spawn(veh).Position = position; From 6e0f6a00efbb53f0dedf8460f015e0634ce78f48 Mon Sep 17 00:00:00 2001 From: hydrant Date: Mon, 24 May 2021 12:36:56 +0200 Subject: [PATCH 50/82] fix managefactionranks --- ReallifeGamemode.Client/FactionManagement/main.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ReallifeGamemode.Client/FactionManagement/main.ts b/ReallifeGamemode.Client/FactionManagement/main.ts index fc53aee7..6fb3ebbb 100644 --- a/ReallifeGamemode.Client/FactionManagement/main.ts +++ b/ReallifeGamemode.Client/FactionManagement/main.ts @@ -4,7 +4,7 @@ * @copyright (c) 2008 - 2018 Life of German */ -export default function factionManagement() { +export default function factionManagement(globalData: IGlobalData) { var manageFactionRanksBrowser = null; var rankData = null; @@ -21,7 +21,7 @@ export default function factionManagement() { manageFactionRanksBrowser.execute(`setFactionName('${rankData.FactionName}')`); manageFactionRanksBrowser.execute(`loadData(` + JSON.stringify(rankData.Ranks) + `)`); mp.gui.cursor.show(true, true); - this.data.InMenu = true; + globalData.InMenu = true; } }); @@ -30,7 +30,7 @@ export default function factionManagement() { manageFactionRanksBrowser.destroy(); mp.gui.cursor.show(false, false); mp.gui.chat.activate(true); - this.data.InMenu = false; + globalData.InMenu = false; var obj: FactionRanks = { factionId: rankData.FactionId, From d295726df64e6d730e11413ca993d5c95e951d58 Mon Sep 17 00:00:00 2001 From: hydrant Date: Mon, 24 May 2021 12:41:29 +0200 Subject: [PATCH 51/82] fix mfr --- ReallifeGamemode.Client/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReallifeGamemode.Client/index.ts b/ReallifeGamemode.Client/index.ts index 48040737..6647ae0e 100644 --- a/ReallifeGamemode.Client/index.ts +++ b/ReallifeGamemode.Client/index.ts @@ -84,7 +84,7 @@ import doorManager from './DoorManager/doormanager'; doorManager(); import factionManagement from './FactionManagement/main'; -factionManagement(); +factionManagement(globalData); import deathScreen from './Gui/deathscreen'; deathScreen(); From 294b0f5aa858d34650dcdbe4295b64a0c12bceee Mon Sep 17 00:00:00 2001 From: "michael.reiswich" Date: Mon, 24 May 2021 13:08:14 +0200 Subject: [PATCH 52/82] spawnschutz raus & SF, LV rein zum gucken --- ReallifeGamemode.Client/dlcpacks/sflv/dlc.rpf | 3 +++ ReallifeGamemode.Client/index.ts | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 ReallifeGamemode.Client/dlcpacks/sflv/dlc.rpf diff --git a/ReallifeGamemode.Client/dlcpacks/sflv/dlc.rpf b/ReallifeGamemode.Client/dlcpacks/sflv/dlc.rpf new file mode 100644 index 00000000..7b44d5cc --- /dev/null +++ b/ReallifeGamemode.Client/dlcpacks/sflv/dlc.rpf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d36249ba786d67112478ed20ca73cde717b4f275697fac83352be0ec845b24fb +size 205517312 diff --git a/ReallifeGamemode.Client/index.ts b/ReallifeGamemode.Client/index.ts index 48040737..b9430a61 100644 --- a/ReallifeGamemode.Client/index.ts +++ b/ReallifeGamemode.Client/index.ts @@ -280,8 +280,8 @@ handsup(); //import charSurgery from './CharCreator/surgery'; //charSurgery(globalData); -import spawnschutz from './Player/spawnschutz'; -spawnschutz(); +//import spawnschutz from './Player/spawnschutz'; +//spawnschutz(); import bigmap from './Gui/bigmap'; bigmap(); From da83d4825650599c6b3bf65f107f5f1727880e28 Mon Sep 17 00:00:00 2001 From: "michael.reiswich" Date: Mon, 24 May 2021 13:29:11 +0200 Subject: [PATCH 53/82] fix spawnschutz raus --- ReallifeGamemode.Client/Player/spawnschutz.ts | 2 +- ReallifeGamemode.Client/dlcpacks/sflv/dlc.rpf | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) delete mode 100644 ReallifeGamemode.Client/dlcpacks/sflv/dlc.rpf diff --git a/ReallifeGamemode.Client/Player/spawnschutz.ts b/ReallifeGamemode.Client/Player/spawnschutz.ts index 320a135a..983f03e5 100644 --- a/ReallifeGamemode.Client/Player/spawnschutz.ts +++ b/ReallifeGamemode.Client/Player/spawnschutz.ts @@ -1,4 +1,4 @@ -export let spawnschutzEnabled = true; +export let spawnschutzEnabled = false; var spawnschutzTimer; export default function spawnschutz() { diff --git a/ReallifeGamemode.Client/dlcpacks/sflv/dlc.rpf b/ReallifeGamemode.Client/dlcpacks/sflv/dlc.rpf deleted file mode 100644 index 7b44d5cc..00000000 --- a/ReallifeGamemode.Client/dlcpacks/sflv/dlc.rpf +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d36249ba786d67112478ed20ca73cde717b4f275697fac83352be0ec845b24fb -size 205517312 From 679ae7edd508c461596aeabd88cf8c43e650721d Mon Sep 17 00:00:00 2001 From: "michael.reiswich" Date: Mon, 24 May 2021 21:55:58 +0200 Subject: [PATCH 54/82] ipl-load at connect --- ReallifeGamemode.Server/Events/Connect.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ReallifeGamemode.Server/Events/Connect.cs b/ReallifeGamemode.Server/Events/Connect.cs index 19ce8c88..0ac0f6a7 100644 --- a/ReallifeGamemode.Server/Events/Connect.cs +++ b/ReallifeGamemode.Server/Events/Connect.cs @@ -83,6 +83,8 @@ namespace ReallifeGamemode.Server.Events player.TriggerEvent("CLIENT:AddPed", 8, "ig_siemonyetarian", 1222.0868, 2726.5286, 38.00415, 113.77263, 0, false, true, 0, "none", true, true, true);//Ped Rentcar Knast player.TriggerEvent("CLIENT:AddPed", 9, "ig_siemonyetarian", -215.4218292236328, 6218.90478515625, 31.491567611694336, -135.07437133789062, 0, false, true, 0, "none", true, true, true);//Ped Rentcar Paleto player.TriggerEvent("CLIENT:AddPed", 10, "ig_siemonyetarian", 818.239990234375, -1040.833984375, 26.750696182250977, 3.0542829036712646, 0, false, true, 0, "none", true, true, true);//Ped Rentcar Lamesa + NAPI.World.RemoveIpl("dt1_03_shutter"); // ips doors asservatenkammer + NAPI.World.RequestIpl("finbank"); // asservatenkammer (interior) TimeSpan currentTime = TimeManager.CurrentTime; bool disableLightMode = currentTime > LightModeTimeFrom && currentTime < LightModeTimeTo; From 9fe9cb14662b561b44800bf43a878e0d935c9caf Mon Sep 17 00:00:00 2001 From: "michael.reiswich" Date: Mon, 24 May 2021 23:35:20 +0200 Subject: [PATCH 55/82] weitere ipls rein --- ReallifeGamemode.Server/Events/Connect.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ReallifeGamemode.Server/Events/Connect.cs b/ReallifeGamemode.Server/Events/Connect.cs index 0ac0f6a7..2f1ce662 100644 --- a/ReallifeGamemode.Server/Events/Connect.cs +++ b/ReallifeGamemode.Server/Events/Connect.cs @@ -84,7 +84,9 @@ namespace ReallifeGamemode.Server.Events player.TriggerEvent("CLIENT:AddPed", 9, "ig_siemonyetarian", -215.4218292236328, 6218.90478515625, 31.491567611694336, -135.07437133789062, 0, false, true, 0, "none", true, true, true);//Ped Rentcar Paleto player.TriggerEvent("CLIENT:AddPed", 10, "ig_siemonyetarian", 818.239990234375, -1040.833984375, 26.750696182250977, 3.0542829036712646, 0, false, true, 0, "none", true, true, true);//Ped Rentcar Lamesa NAPI.World.RemoveIpl("dt1_03_shutter"); // ips doors asservatenkammer - NAPI.World.RequestIpl("finbank"); // asservatenkammer (interior) + NAPI.World.RequestIpl("finbank"); // asservatenkammer (interior) + NAPI.World.RequestIpl("ferris_finale_Anim"); // Riesenrad + NAPI.World.RequestIpl("Carwash_with_spinners"); // Carwash TimeSpan currentTime = TimeManager.CurrentTime; bool disableLightMode = currentTime > LightModeTimeFrom && currentTime < LightModeTimeTo; From d58a19033dd404750fcae20f640052f3451d85bb Mon Sep 17 00:00:00 2001 From: "michael.reiswich" Date: Tue, 25 May 2021 15:28:41 +0200 Subject: [PATCH 56/82] add selbsteinknasten --- ReallifeGamemode.Server/Events/Key.cs | 31 +++++++++++++++++-- .../Managers/PositionManager.cs | 25 +++++++++++++++ ReallifeGamemode.Server/Wanted/Jail.cs | 4 +++ 3 files changed, 58 insertions(+), 2 deletions(-) diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs index dde1e8cf..fa4449a5 100644 --- a/ReallifeGamemode.Server/Events/Key.cs +++ b/ReallifeGamemode.Server/Events/Key.cs @@ -21,6 +21,7 @@ using ReallifeGamemode.Server.Types; using ReallifeGamemode.Server.Util; using ReallifeGamemode.Server.WeaponDeal; using ReallifeGamemode.Server.Log; +using ReallifeGamemode.Server.Wanted; /** * @overview Life of German Reallife - Event Key (Key.cs) @@ -241,6 +242,7 @@ namespace ReallifeGamemode.Server.Events Player nearestCuffPlayer = PositionManager.cuffPoints.Find(s => s.Position.DistanceTo(player.Position) <= 1.6 && user.GetData("duty")); AmmunationPoint nearestAmmunationPoint = PositionManager.AmmunationPoints.Find(s => s.Position.DistanceTo(player.Position) <= 1.5); RentcarPoint nearestRentcarPoint = PositionManager.rentcarPoints.Find(s => s.Position.DistanceTo(player.Position) <= 1.5); + JailPoint nearestjailPoint = PositionManager.jailPoints.Find(s => s.Position.DistanceTo(player.Position) <= 1.5); if (user?.FactionId != null) { @@ -502,8 +504,33 @@ namespace ReallifeGamemode.Server.Events } } - //Rentcar Points - if (nearestRentcarPoint != null) + using var dbcontext = new DatabaseContext(); + + User client = player.GetUser(dbcontext); + + if (nearestjailPoint != null) + { + int oStaatsfrak = NAPI.Pools.GetAllPlayers().Where(p => !p.IsAfk() && p.IsLoggedIn() && p.GetUser(dbcontext).FactionId == 1).Count() + + NAPI.Pools.GetAllPlayers().Where(p => !p.IsAfk() && p.IsLoggedIn() && p.GetUser(dbcontext).FactionId == 3).Count(); + if(oStaatsfrak > 0) + { + player.SendNotification("~y~[Info]~w~ Es sind genügend Beamte online!"); + return; + } + + if (client.Wanteds <= 0) + { + player.SendNotification("~y~[Info]~w~ Du wirst nicht gesucht!"); + return; + } + client.SetJailTime(true, dbcontext); + Jail.Check_PutBehindBars(client, JailInLocations.Outside); + player.SendNotification("Du hast dich selbst eingeknastet"); + ChatService.HQMessage(player.Name + " wurde ins Gefängnis eingeliefert."); + } + + //Rentcar Points + if (nearestRentcarPoint != null) { if (player.IsInVehicle) { diff --git a/ReallifeGamemode.Server/Managers/PositionManager.cs b/ReallifeGamemode.Server/Managers/PositionManager.cs index 76e9ad3f..44a3172b 100644 --- a/ReallifeGamemode.Server/Managers/PositionManager.cs +++ b/ReallifeGamemode.Server/Managers/PositionManager.cs @@ -40,6 +40,7 @@ namespace ReallifeGamemode.Server.Managers public static List carwashPoints = new List(); + public static List jailPoints = new List(); public static Vector3 eventportPosition; public static bool eventportActive = false; @@ -121,6 +122,25 @@ namespace ReallifeGamemode.Server.Managers #endregion WeaponPoints + #region JailPoints + + JailPoint jail = new JailPoint() + { + Position = new Vector3(1854.06, 2582.38, 45.67) + }; + + + jailPoints.Add(jail); + + foreach (JailPoint j in jailPoints) + { + NAPI.Marker.CreateMarker(1, new Vector3(j.Position.X, j.Position.Y, j.Position.Z - 2), new Vector3(j.Position.X, j.Position.Y, j.Position.Z + 1), + new Vector3(0, 0, 0), 1.5f, new Color(255, 255, 255, 0), false, 0); + NAPI.TextLabel.CreateTextLabel("Stellen - Dr\u00fccke ~y~E", j.Position, 7, 1, 0, new Color(255, 255, 255), false, 0); + } + + #endregion JailReleasePoints + #region JailReleasePoints JailReleasePoint jailPointLSPD = new JailReleasePoint() @@ -558,3 +578,8 @@ public class CarwashPoint public Vector3 Position { get; set; } } +public class JailPoint +{ + public Vector3 Position { get; set; } +} + diff --git a/ReallifeGamemode.Server/Wanted/Jail.cs b/ReallifeGamemode.Server/Wanted/Jail.cs index f3aadfdf..76479d30 100644 --- a/ReallifeGamemode.Server/Wanted/Jail.cs +++ b/ReallifeGamemode.Server/Wanted/Jail.cs @@ -134,8 +134,10 @@ namespace ReallifeGamemode.Server.Wanted if (user.JailTime <= 0) { Jailtime.Remove(user.Id); + user.Wanteds = 0; player.SafeTeleport(JailOut_Point); player.TriggerEvent("jailTime", 0); + dbContext.SaveChanges(); return; } if (user.JailTime > 0) @@ -175,6 +177,7 @@ namespace ReallifeGamemode.Server.Wanted using (var dbContext = new DatabaseContext()) { player.GetUser(dbContext).JailTime = 0; + player.GetUser(dbContext).Wanteds = 0; dbContext.SaveChanges(); } player.SafeSetHealth(100); @@ -195,6 +198,7 @@ namespace ReallifeGamemode.Server.Wanted Jailtime.Remove(user.Id); user.JailTime = 0; + user.Wanteds = 0; dbContext.SaveChanges(); target.SafeSetHealth(100); From 79aa46b48fb94556fd93de9967951ee315a1792b Mon Sep 17 00:00:00 2001 From: "michael.reiswich" Date: Tue, 25 May 2021 17:07:45 +0200 Subject: [PATCH 57/82] will unterscheid sehen --- ReallifeGamemode.Client/util/weapondamage.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ReallifeGamemode.Client/util/weapondamage.ts b/ReallifeGamemode.Client/util/weapondamage.ts index 49f3bc55..7fd0b8cf 100644 --- a/ReallifeGamemode.Client/util/weapondamage.ts +++ b/ReallifeGamemode.Client/util/weapondamage.ts @@ -21,9 +21,12 @@ function isTargetInPolygon(pos): boolean { export default function weapondamageUtil(globalData: IGlobalData) { let blockInput = false; - mp.players.local.setSuffersCriticalHits(false); + mp.players.local.setSuffersCriticalHits(false); + mp.players.forEachInStreamRange((player) => { + let playermodel = player.model; + mp.gui.chat.push(playermodel.toString()); player.setSuffersCriticalHits(false); }); From 5df58c9532f293c6267901f3e35b94e216743726 Mon Sep 17 00:00:00 2001 From: "michael.reiswich" Date: Tue, 25 May 2021 17:22:36 +0200 Subject: [PATCH 58/82] test --- ReallifeGamemode.Client/util/weapondamage.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ReallifeGamemode.Client/util/weapondamage.ts b/ReallifeGamemode.Client/util/weapondamage.ts index 7fd0b8cf..535818e2 100644 --- a/ReallifeGamemode.Client/util/weapondamage.ts +++ b/ReallifeGamemode.Client/util/weapondamage.ts @@ -25,8 +25,6 @@ export default function weapondamageUtil(globalData: IGlobalData) { mp.players.local.setSuffersCriticalHits(false); mp.players.forEachInStreamRange((player) => { - let playermodel = player.model; - mp.gui.chat.push(playermodel.toString()); player.setSuffersCriticalHits(false); }); @@ -163,6 +161,8 @@ export default function weapondamageUtil(globalData: IGlobalData) { mp.events.add("entityStreamIn", (entity) => { if (entity.type === "player") { entity.setSuffersCriticalHits(false); + let playermodel = entity.Model; + mp.gui.chat.push(playermodel.toString()); } }); From 71594857428e9b988cec20fcc2b76d37f6d87632 Mon Sep 17 00:00:00 2001 From: "michael.reiswich" Date: Tue, 25 May 2021 17:26:41 +0200 Subject: [PATCH 59/82] raus --- ReallifeGamemode.Client/util/weapondamage.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ReallifeGamemode.Client/util/weapondamage.ts b/ReallifeGamemode.Client/util/weapondamage.ts index 535818e2..4790bd42 100644 --- a/ReallifeGamemode.Client/util/weapondamage.ts +++ b/ReallifeGamemode.Client/util/weapondamage.ts @@ -26,6 +26,7 @@ export default function weapondamageUtil(globalData: IGlobalData) { mp.players.forEachInStreamRange((player) => { player.setSuffersCriticalHits(false); + }); mp.events.add(RageEnums.EventKey.INCOMING_DAMAGE, (sourceEntity: EntityMp, sourcePlayer: PlayerMp, targetEntity: EntityMp, weapon: number, boneIndex: number, damage: number) => { @@ -161,8 +162,6 @@ export default function weapondamageUtil(globalData: IGlobalData) { mp.events.add("entityStreamIn", (entity) => { if (entity.type === "player") { entity.setSuffersCriticalHits(false); - let playermodel = entity.Model; - mp.gui.chat.push(playermodel.toString()); } }); From 5044c8e295627fe1cdef5fa33093cbb62cc05347 Mon Sep 17 00:00:00 2001 From: "michael.reiswich" Date: Tue, 25 May 2021 21:04:35 +0200 Subject: [PATCH 60/82] changes something --- ReallifeGamemode.Server/Events/Key.cs | 15 ++++++++------- ReallifeGamemode.Server/Wanted/Jail.cs | 1 + 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs index fa4449a5..8ba7d69b 100644 --- a/ReallifeGamemode.Server/Events/Key.cs +++ b/ReallifeGamemode.Server/Events/Key.cs @@ -510,19 +510,20 @@ namespace ReallifeGamemode.Server.Events if (nearestjailPoint != null) { - int oStaatsfrak = NAPI.Pools.GetAllPlayers().Where(p => !p.IsAfk() && p.IsLoggedIn() && p.GetUser(dbcontext).FactionId == 1).Count() + - NAPI.Pools.GetAllPlayers().Where(p => !p.IsAfk() && p.IsLoggedIn() && p.GetUser(dbcontext).FactionId == 3).Count(); - if(oStaatsfrak > 0) - { - player.SendNotification("~y~[Info]~w~ Es sind genügend Beamte online!"); - return; - } + int oStaatsfrak = NAPI.Pools.GetAllPlayers().Where(p => !p.IsAfk() && p.IsDuty() && p.IsLoggedIn() && p.GetUser(dbcontext).FactionId == 1).Count() + + NAPI.Pools.GetAllPlayers().Where(p => !p.IsAfk() && p.IsDuty() && p.IsLoggedIn() && p.GetUser(dbcontext).FactionId == 3).Count(); if (client.Wanteds <= 0) { player.SendNotification("~y~[Info]~w~ Du wirst nicht gesucht!"); return; } + + if (oStaatsfrak > 2) + { + player.SendNotification("~y~[Info]~w~ Es sind genügend Beamte online!"); + return; + } client.SetJailTime(true, dbcontext); Jail.Check_PutBehindBars(client, JailInLocations.Outside); player.SendNotification("Du hast dich selbst eingeknastet"); diff --git a/ReallifeGamemode.Server/Wanted/Jail.cs b/ReallifeGamemode.Server/Wanted/Jail.cs index 76479d30..5ff73870 100644 --- a/ReallifeGamemode.Server/Wanted/Jail.cs +++ b/ReallifeGamemode.Server/Wanted/Jail.cs @@ -112,6 +112,7 @@ namespace ReallifeGamemode.Server.Wanted user.SetJailTime(false, dbContext); user.SetBlipAndNametagColor(); user.AnnouncePlayerJailedIn(); + user.Wanteds = 0; dbContext.SaveChanges(); //HERE: Freilauf Check_PutBehindBars(user, JailInLocations.Outside); From 1152c4b11bd44cb7865db32d9d0bb9c4f6e51382 Mon Sep 17 00:00:00 2001 From: "michael.reiswich" Date: Tue, 25 May 2021 21:26:47 +0200 Subject: [PATCH 61/82] changes --- ReallifeGamemode.Server/Events/Key.cs | 2 +- ReallifeGamemode.Server/Finance/Economy.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs index 8ba7d69b..6bffa2d9 100644 --- a/ReallifeGamemode.Server/Events/Key.cs +++ b/ReallifeGamemode.Server/Events/Key.cs @@ -524,7 +524,7 @@ namespace ReallifeGamemode.Server.Events player.SendNotification("~y~[Info]~w~ Es sind genügend Beamte online!"); return; } - client.SetJailTime(true, dbcontext); + client.SetJailTime(false, dbcontext); Jail.Check_PutBehindBars(client, JailInLocations.Outside); player.SendNotification("Du hast dich selbst eingeknastet"); ChatService.HQMessage(player.Name + " wurde ins Gefängnis eingeliefert."); diff --git a/ReallifeGamemode.Server/Finance/Economy.cs b/ReallifeGamemode.Server/Finance/Economy.cs index 89e7fde9..1750ce42 100644 --- a/ReallifeGamemode.Server/Finance/Economy.cs +++ b/ReallifeGamemode.Server/Finance/Economy.cs @@ -140,7 +140,7 @@ namespace ReallifeGamemode.Server.Finance factionMoney = factionWage; } int otheramount = user.otheramount; - int amount = wage - (int)(wage * financialInterest) - vehicleTaxation - (int)propertyTax + (int)financialHelp - rentalFees - healthInsurance + gez + (factionMoney ?? 0) + otheramount; + int amount = wage - (int)(wage * financialInterest) - vehicleTaxation - (int)propertyTax + (int)financialHelp - rentalFees - healthInsurance - gez + (factionMoney ?? 0) + otheramount; Paycheck paycheck = new Paycheck(financialHelp, financialInterest, vehicleTaxation, propertyTax, wage, amount, rentalFees, healthInsurance, gez, factionMoney, otheramount); Paychecks[user.Id] = paycheck; From 2aadef55dd09ef580c43b3ac9e6fd21084edfa7a Mon Sep 17 00:00:00 2001 From: "michael.reiswich" Date: Tue, 25 May 2021 21:28:10 +0200 Subject: [PATCH 62/82] danke kopf entwicklung hydrant --- ReallifeGamemode.Server/Events/Key.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs index 6bffa2d9..1485d094 100644 --- a/ReallifeGamemode.Server/Events/Key.cs +++ b/ReallifeGamemode.Server/Events/Key.cs @@ -527,7 +527,8 @@ namespace ReallifeGamemode.Server.Events client.SetJailTime(false, dbcontext); Jail.Check_PutBehindBars(client, JailInLocations.Outside); player.SendNotification("Du hast dich selbst eingeknastet"); - ChatService.HQMessage(player.Name + " wurde ins Gefängnis eingeliefert."); + ChatService.HQMessage(player.Name + " wurde ins Gefängnis eingeliefert."); + dbcontext.SaveChanges(); } //Rentcar Points From cb78c351e6b56c92259c7f3351e6cc68836c1a7f Mon Sep 17 00:00:00 2001 From: Luke Date: Tue, 25 May 2021 20:21:19 +0000 Subject: [PATCH 63/82] jeder kann in den chat schreiben --- ReallifeGamemode.Client/Gui/deathscreen.ts | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/ReallifeGamemode.Client/Gui/deathscreen.ts b/ReallifeGamemode.Client/Gui/deathscreen.ts index 32826cce..5aeb9d91 100644 --- a/ReallifeGamemode.Client/Gui/deathscreen.ts +++ b/ReallifeGamemode.Client/Gui/deathscreen.ts @@ -26,12 +26,7 @@ export default function deathScreen() { mp.events.add("startDeathTimer", (isAdmin) => { if (isDeath === false) { isDeath = true; - if (isAdmin) { - mp.gui.chat.activate(true); - } - else { - mp.gui.chat.activate(false); - } + mp.gui.chat.activate(true); mp.game.audio.playSoundFrontend(-1, "Bed", "WastedSounds", true); deathDate = new Date(); respawnTime = Math.floor(deathDate.getTime() / 1000 + maxDeathTime); From d9ecae1d1d9b83d9e0d55d1220ce0ad4c11780df Mon Sep 17 00:00:00 2001 From: "michael.reiswich" Date: Wed, 26 May 2021 00:16:38 +0200 Subject: [PATCH 64/82] changes on Notfallkit & Rubbellos --- ReallifeGamemode.Server/Events/Key.cs | 2 +- ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs | 4 ++-- ReallifeGamemode.Server/Inventory/Items/Rubellos.cs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs index 1485d094..4df1b585 100644 --- a/ReallifeGamemode.Server/Events/Key.cs +++ b/ReallifeGamemode.Server/Events/Key.cs @@ -521,7 +521,7 @@ namespace ReallifeGamemode.Server.Events if (oStaatsfrak > 2) { - player.SendNotification("~y~[Info]~w~ Es sind genügend Beamte online!"); + player.SendNotification("~y~[Info]~w~ Es sind genügend Beamte im Dienst!"); return; } client.SetJailTime(false, dbcontext); diff --git a/ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs b/ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs index 89d74d6f..b6d19fe3 100644 --- a/ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs +++ b/ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs @@ -1,4 +1,4 @@ -using GTANetworkAPI; +using GTANetworkAPI; using ReallifeGamemode.Database.Entities; using System.Linq; using ReallifeGamemode.Server.Extensions; @@ -17,7 +17,7 @@ namespace ReallifeGamemode.Server.Inventory.Items public override int Gewicht => 1000; public override string Einheit => "g"; public override uint Object => 875075437; - public override int Price => 500; + public override int Price => 2500; public override bool Use(UserItem uItem) { diff --git a/ReallifeGamemode.Server/Inventory/Items/Rubellos.cs b/ReallifeGamemode.Server/Inventory/Items/Rubellos.cs index 7372b6f1..4a36ce7f 100644 --- a/ReallifeGamemode.Server/Inventory/Items/Rubellos.cs +++ b/ReallifeGamemode.Server/Inventory/Items/Rubellos.cs @@ -29,7 +29,7 @@ namespace ReallifeGamemode.Server.Inventory.Items return false; } Random random = new Random(); - int randomNumber = random.Next(1, 2); + int randomNumber = random.Next(1, 4); if (randomNumber == 1) { using (var dbContext = new DatabaseContext()) From 7bd406cfa75bbef6f9923f021dd7d828002b93eb Mon Sep 17 00:00:00 2001 From: Luke Date: Tue, 25 May 2021 22:24:25 +0000 Subject: [PATCH 65/82] numberplates aktualisiert --- .../Extensions/ServerVehicleExtensions.cs | 30 +------------------ 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/ReallifeGamemode.Server/Extensions/ServerVehicleExtensions.cs b/ReallifeGamemode.Server/Extensions/ServerVehicleExtensions.cs index 170b9681..498cc3b8 100644 --- a/ReallifeGamemode.Server/Extensions/ServerVehicleExtensions.cs +++ b/ReallifeGamemode.Server/Extensions/ServerVehicleExtensions.cs @@ -1,4 +1,4 @@ -using GTANetworkAPI; +using GTANetworkAPI; using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Server.Job; using ReallifeGamemode.Server.Managers; @@ -47,16 +47,6 @@ namespace ReallifeGamemode.Server.Extensions string numberplate = $"{veh.Id}"; - if (veh is FactionVehicle fV) - { - numberplate = $"F{string.Join(".", fV.GetOwners())} " + numberplate; - } - - if (veh is UserVehicle uV) - { - numberplate = $"U{uV.UserId} " + numberplate; - } - if (veh is ShopVehicle sV) { numberplate = "Shop"; @@ -67,24 +57,6 @@ namespace ReallifeGamemode.Server.Extensions newVeh.SetSharedData("shopVehicleTextLabel", label.Handle.Value); } - if (veh is GroupVehicle gV) - { - numberplate = $"G{gV.GroupId} " + numberplate; - } - - if (veh is JobVehicle jV) - { - numberplate = $"J{jV.JobId} " + numberplate; - } - if (veh is SchoolVehicle) - { - numberplate = "FS" + numberplate; - } - if (veh is NoobVehicle) - { - numberplate = "NV" + numberplate; - } - NAPI.Vehicle.SetVehicleNumberPlate(newVeh, numberplate); veh.NumberPlate = numberplate; From 6782751d092de7a01b0fc73dcc7d707d3c4680d6 Mon Sep 17 00:00:00 2001 From: Luke Date: Wed, 26 May 2021 17:54:45 +0000 Subject: [PATCH 66/82] eventport nachrichten angepasst --- ReallifeGamemode.Server/Commands/UserCommands.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ReallifeGamemode.Server/Commands/UserCommands.cs b/ReallifeGamemode.Server/Commands/UserCommands.cs index 7aeebd80..e0a7fe1a 100644 --- a/ReallifeGamemode.Server/Commands/UserCommands.cs +++ b/ReallifeGamemode.Server/Commands/UserCommands.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text.RegularExpressions; @@ -61,7 +61,7 @@ namespace ReallifeGamemode.Server.Commands PositionManager.eventportActive = true; player.SendChatMessage("~y~Du hast hier erfolgreich einen Eventport gesetzt."); - ChatService.BroadcastAdmin($"~b~[ADMIN]~s~ ~y~{player.Name}~s~ hat einen Eventport erstellt.", AdminLevel.ADMIN); + ChatService.BroadcastAdmin($"~y~[EVENTPORT] ~s~{player.Name} hat den Eventport aktiviert.", AdminLevel.ADMIN); logger.LogInformation("Admin {0} created the eventport at x: {1}, y: {2}, z: {3}", player.Name, position.X, position.Y, position.Z); return; } @@ -74,14 +74,14 @@ namespace ReallifeGamemode.Server.Commands } PositionManager.eventportActive = false; player.SendChatMessage("~y~Du hast den Eventport deaktiviert."); - ChatService.BroadcastAdmin($"~b~[ADMIN]~s~ ~y~{player.Name}~s~ hat einen Eventport deaktiviert.", AdminLevel.ADMIN); + ChatService.BroadcastAdmin($"~y~[EVENTPORT] ~s~{player.Name} hat den Eventport deaktiviert.", AdminLevel.ADMIN); logger.LogInformation("Admin {0} removed the eventport", player.Name); return; } if (!PositionManager.eventportActive || PositionManager.eventportPosition == null) { - player.SendChatMessage("~y~Im Moment ist kein Eventport aktiv."); + ChatService.ErrorMessage(player, "Es ist kein Eventport aktiv"); return; } @@ -105,7 +105,7 @@ namespace ReallifeGamemode.Server.Commands logger.LogInformation("Player {0} used the eventport to x: {1}, y: {2}, z: {3}", player.Name, currentEventport.X, currentEventport.Y, currentEventport.Z); player.SafeTeleport(teleportPosition); - player.SendNotification("Du hast dich zum Event teleportiert"); + player.SendChatMessage("~y~[EVENTPORT] ~s~Du hast dich zum Event teleportiert"); } [Command("sms", "~m~Benutzung: ~s~/sms [Spieler] [Nachricht]", GreedyArg = true)] From 467e0a4248629076b6d95ba57e0d419efa024bfd Mon Sep 17 00:00:00 2001 From: hydrant Date: Thu, 20 May 2021 11:58:15 +0200 Subject: [PATCH 67/82] Add legal option to items --- .../Inventory/Interfaces/IItem.cs | 2 ++ .../Inventory/Items/BaseItem.cs | 18 ++++++++++++++++++ .../Inventory/Items/Cannabis.cs | 15 +++------------ .../Inventory/Items/ConsumableItem.cs | 16 ++++++++-------- .../Inventory/Items/DropItem.cs | 14 +++++++------- .../Inventory/Items/UseItem.cs | 14 +++++++------- .../Inventory/Items/WeaponDealItem.cs | 14 +++++++------- 7 files changed, 52 insertions(+), 41 deletions(-) create mode 100644 ReallifeGamemode.Server/Inventory/Items/BaseItem.cs diff --git a/ReallifeGamemode.Server/Inventory/Interfaces/IItem.cs b/ReallifeGamemode.Server/Inventory/Interfaces/IItem.cs index dd364314..4605aed4 100644 --- a/ReallifeGamemode.Server/Inventory/Interfaces/IItem.cs +++ b/ReallifeGamemode.Server/Inventory/Interfaces/IItem.cs @@ -14,5 +14,7 @@ namespace ReallifeGamemode.Server.Inventory.Interfaces int Gewicht { get; } string Einheit { get; } int Price { get; } + + bool Legal { get; } } } diff --git a/ReallifeGamemode.Server/Inventory/Items/BaseItem.cs b/ReallifeGamemode.Server/Inventory/Items/BaseItem.cs new file mode 100644 index 00000000..a47fdb82 --- /dev/null +++ b/ReallifeGamemode.Server/Inventory/Items/BaseItem.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Text; +using ReallifeGamemode.Server.Inventory.Interfaces; + +namespace ReallifeGamemode.Server.Inventory.Items +{ + public abstract class BaseItem : IItem + { + public abstract int Id { get; } + public abstract string Name { get; } + public abstract string Description { get; } + public abstract int Gewicht { get; } + public abstract string Einheit { get; } + public abstract int Price { get; } + public virtual bool Legal => true; + } +} diff --git a/ReallifeGamemode.Server/Inventory/Items/Cannabis.cs b/ReallifeGamemode.Server/Inventory/Items/Cannabis.cs index a0845bd6..bd82e7af 100644 --- a/ReallifeGamemode.Server/Inventory/Items/Cannabis.cs +++ b/ReallifeGamemode.Server/Inventory/Items/Cannabis.cs @@ -9,13 +9,13 @@ using ReallifeGamemode.Server.Inventory.Interfaces; namespace ReallifeGamemode.Server.Inventory.Items { - public class Cannabis : ConsumableItem + public class Cannabis : DropItem { public override int Id => 108; - public override string Name => "Grünes Gift"; + public override string Name => "Cannabis"; - public override string Description => "puff puff and pass"; + public override string Description => "kein brokkoli"; public override int Gewicht => 2; @@ -24,14 +24,5 @@ namespace ReallifeGamemode.Server.Inventory.Items public override uint Object => 3076948544; public override int Price => 0; - - public override int HpAmount => -5; - - public override float Cooldown => 20000; - - public override void Consume(UserItem uItem) - { - //nothing - } } } diff --git a/ReallifeGamemode.Server/Inventory/Items/ConsumableItem.cs b/ReallifeGamemode.Server/Inventory/Items/ConsumableItem.cs index d5a96232..abfaa298 100644 --- a/ReallifeGamemode.Server/Inventory/Items/ConsumableItem.cs +++ b/ReallifeGamemode.Server/Inventory/Items/ConsumableItem.cs @@ -8,17 +8,17 @@ using ReallifeGamemode.Server.Util; namespace ReallifeGamemode.Server.Inventory.Items { - public abstract class ConsumableItem : IUsableItem + public abstract class ConsumableItem : BaseItem, IUsableItem { public abstract int HpAmount { get; } - public abstract int Id { get; } - public abstract string Name { get; } - public abstract string Description { get; } - public abstract int Gewicht { get; } - public abstract string Einheit { get; } - public abstract uint Object { get; } - public abstract int Price { get; } + public override int Id { get; } + public override string Name { get; } + public override string Description { get; } + public override int Gewicht { get; } + public override string Einheit { get; } + public override int Price { get; } public abstract float Cooldown { get; } + public abstract uint Object { get; } public abstract void Consume(UserItem uItem); diff --git a/ReallifeGamemode.Server/Inventory/Items/DropItem.cs b/ReallifeGamemode.Server/Inventory/Items/DropItem.cs index 52bf1fc2..e41f034a 100644 --- a/ReallifeGamemode.Server/Inventory/Items/DropItem.cs +++ b/ReallifeGamemode.Server/Inventory/Items/DropItem.cs @@ -6,15 +6,15 @@ using ReallifeGamemode.Server.Managers; namespace ReallifeGamemode.Server.Inventory.Items { - public abstract class DropItem : IDroppableItem + public abstract class DropItem : BaseItem, IDroppableItem { - public abstract int Id { get; } - public abstract string Name { get; } - public abstract string Description { get; } - public abstract int Gewicht { get; } - public abstract string Einheit { get; } + public override int Id { get; } + public override string Name { get; } + public override string Description { get; } + public override int Gewicht { get; } + public override string Einheit { get; } public abstract uint Object { get; } - public abstract int Price { get; } + public override int Price { get; } public void Drop(UserItem uItem, Player player, int amount) { diff --git a/ReallifeGamemode.Server/Inventory/Items/UseItem.cs b/ReallifeGamemode.Server/Inventory/Items/UseItem.cs index 7da16564..9674fb70 100644 --- a/ReallifeGamemode.Server/Inventory/Items/UseItem.cs +++ b/ReallifeGamemode.Server/Inventory/Items/UseItem.cs @@ -10,15 +10,15 @@ using ReallifeGamemode.Server.Managers; namespace ReallifeGamemode.Server.Inventory.Items { - public abstract class UseItem : IUsableItem + public abstract class UseItem : BaseItem, IUsableItem { - public abstract int Id { get; } - public abstract string Name { get; } - public abstract string Description { get; } - public abstract int Gewicht { get; } - public abstract string Einheit { get; } + public override int Id { get; } + public override string Name { get; } + public override string Description { get; } + public override int Gewicht { get; } + public override string Einheit { get; } + public override int Price { get; } public abstract uint Object { get; } - public abstract int Price { get; } public abstract bool Use(UserItem uItem); diff --git a/ReallifeGamemode.Server/Inventory/Items/WeaponDealItem.cs b/ReallifeGamemode.Server/Inventory/Items/WeaponDealItem.cs index d36904d7..b38a907a 100644 --- a/ReallifeGamemode.Server/Inventory/Items/WeaponDealItem.cs +++ b/ReallifeGamemode.Server/Inventory/Items/WeaponDealItem.cs @@ -6,15 +6,15 @@ using ReallifeGamemode.Server.WeaponDeal; namespace ReallifeGamemode.Server.Inventory.Items { - public abstract class WeaponDealItem : IWeaponDealItem + public abstract class WeaponDealItem : BaseItem, IWeaponDealItem { - public abstract int Id { get; } - public abstract string Name { get; } - public abstract string Description { get; } - public abstract int Gewicht { get; } - public abstract string Einheit { get; } + public override int Id { get; } + public override string Name { get; } + public override string Description { get; } + public override int Gewicht { get; } + public override string Einheit { get; } + public override int Price { get; } public abstract uint Object { get; } - public abstract int Price { get; } public bool noTransfer(Player client, UserItem uItem, FactionVehicle fVeh) { From 34033eb8757f1ded6ff91f778705efaab813e149 Mon Sep 17 00:00:00 2001 From: hydrant Date: Sat, 22 May 2021 14:52:29 +0200 Subject: [PATCH 68/82] Add Hanf items, some inventory mess removed --- .../html/inventory/img/inventory/108.svg | 37 +---------------- .../html/inventory/img/inventory/109.svg | 1 + .../html/inventory/img/inventory/110.svg | 1 + .../Commands/AdminCommands.cs | 21 ++++------ .../Inventory/Interfaces/IUsableItem.cs | 7 +++- .../Inventory/Items/Apfel.cs | 6 +-- .../Inventory/Items/AviateChips.cs | 6 +-- .../Inventory/Items/Baklava.cs | 6 +-- .../Inventory/Items/Bier.cs | 4 +- .../Inventory/Items/CannabisSeeds.cs | 17 ++++++++ .../Inventory/Items/Cheeseburger.cs | 6 +-- .../Inventory/Items/Chips.cs | 6 +-- .../Inventory/Items/Cocain.cs | 6 ++- .../Inventory/Items/ConsumableItem.cs | 17 ++++---- .../Inventory/Items/Joint.cs | 28 +++++++++++++ .../Inventory/Items/Kebab.cs | 6 +-- .../Inventory/Items/Notfallkit.cs | 18 ++++----- .../Inventory/Items/Rubellos.cs | 40 ++++++------------- .../Inventory/Items/UseItem.cs | 4 +- .../Managers/InventoryManager.cs | 24 +++++++---- 20 files changed, 126 insertions(+), 135 deletions(-) create mode 100644 ReallifeGamemode.Client/assets/html/inventory/img/inventory/109.svg create mode 100644 ReallifeGamemode.Client/assets/html/inventory/img/inventory/110.svg create mode 100644 ReallifeGamemode.Server/Inventory/Items/CannabisSeeds.cs create mode 100644 ReallifeGamemode.Server/Inventory/Items/Joint.cs diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/108.svg b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/108.svg index 92a41b9c..a8f2824b 100644 --- a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/108.svg +++ b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/108.svg @@ -1,36 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/109.svg b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/109.svg new file mode 100644 index 00000000..52ae40dd --- /dev/null +++ b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/109.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/110.svg b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/110.svg new file mode 100644 index 00000000..cefab709 --- /dev/null +++ b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/110.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ReallifeGamemode.Server/Commands/AdminCommands.cs b/ReallifeGamemode.Server/Commands/AdminCommands.cs index c1d5f487..3e12ecd9 100644 --- a/ReallifeGamemode.Server/Commands/AdminCommands.cs +++ b/ReallifeGamemode.Server/Commands/AdminCommands.cs @@ -2231,26 +2231,19 @@ namespace ReallifeGamemode.Server.Commands return; } - var invWeight = 0; + var invWeight = InventoryManager.GetUserInventoryWeight(target); - using (var context = new DatabaseContext()) - { - List userItems = context.UserItems.ToList().FindAll(i => i.UserId == target.GetUser().Id); - foreach (var uItem in userItems) - { - invWeight += uItem.Amount * InventoryManager.GetItemById(uItem.ItemId).Gewicht; - } - } + IItem item = InventoryManager.GetItemById(itemId); - if (invWeight + (amount * InventoryManager.GetItemById(itemId).Gewicht) > 40000) + if (invWeight + (amount * item.Gewicht) > InventoryManager.MAX_USER_INVENTORY) { ChatService.SendMessage(player, "~y~" + target.Name + " ~s~hat nicht mehr genug Platz in seinem Inventar."); } else { - UserItem item = new UserItem() { ItemId = itemId, UserId = target.GetUser().Id, Amount = amount }; - InventoryManager.AddItemToInventory(target, item.ItemId, item.Amount); - ChatService.SendMessage(player, "~b~[ADMIN]~s~ Du hast " + target.Name + " ~g~" + amount + "~s~ mal das Item gegeben."); + UserItem userItem = new UserItem() { ItemId = itemId, UserId = target.GetUser().Id, Amount = amount }; + InventoryManager.AddItemToInventory(target, userItem.ItemId, userItem.Amount); + ChatService.SendMessage(player, $"~b~[ADMIN]~s~ Du hast ~y~{target.Name}~y~ ~y~{amount}~s~ mal das Item ~y~{item.Name}~s~ gegeben."); } } @@ -2340,7 +2333,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("inventory", "~m~Benutzung: ~s~/inventory [Spieler]")] - public void CmdAdminGiveItem(Player player, string targetname) + public void CmdAdminInventory(Player player, string targetname) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { diff --git a/ReallifeGamemode.Server/Inventory/Interfaces/IUsableItem.cs b/ReallifeGamemode.Server/Inventory/Interfaces/IUsableItem.cs index 67650c24..24539b6c 100644 --- a/ReallifeGamemode.Server/Inventory/Interfaces/IUsableItem.cs +++ b/ReallifeGamemode.Server/Inventory/Interfaces/IUsableItem.cs @@ -1,4 +1,6 @@ -using ReallifeGamemode.Database.Entities; +using GTANetworkAPI; +using ReallifeGamemode.Database.Entities; +using ReallifeGamemode.Database.Models; /** * @overview Life of German Reallife - Inventory Interfaces UsableItem (IUsableItem.cs) @@ -10,6 +12,7 @@ namespace ReallifeGamemode.Server.Inventory.Interfaces { public interface IUsableItem : IItem, IDroppableItem //marker Interface { - bool Use(UserItem uItem); + bool RemoveWhenUsed { get; } + bool Use(Player player, User user, DatabaseContext databaseContext); } } diff --git a/ReallifeGamemode.Server/Inventory/Items/Apfel.cs b/ReallifeGamemode.Server/Inventory/Items/Apfel.cs index 4b396c17..81fafb8b 100644 --- a/ReallifeGamemode.Server/Inventory/Items/Apfel.cs +++ b/ReallifeGamemode.Server/Inventory/Items/Apfel.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Text; using GTANetworkAPI; using ReallifeGamemode.Database.Entities; +using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Extensions; using ReallifeGamemode.Server.Managers; @@ -20,10 +21,8 @@ namespace ReallifeGamemode.Server.Inventory.Items public override int Price => 50; public override float Cooldown => 60000; - public override void Consume(UserItem uItem) + public override void Consume(Player player, User user, DatabaseContext databaseContext) { - Player player = uItem.GetUser().Player; - int amountToAdd = HpAmount; if (player.Health + amountToAdd > 100) { @@ -32,7 +31,6 @@ namespace ReallifeGamemode.Server.Inventory.Items player.SafeSetHealth(player.Health + amountToAdd); player.SendNotification("Du hast einen ~y~" + Name + " ~s~gegessen.", false); - InventoryManager.RemoveUserItem(player.GetUser(), uItem, 1); } } } diff --git a/ReallifeGamemode.Server/Inventory/Items/AviateChips.cs b/ReallifeGamemode.Server/Inventory/Items/AviateChips.cs index b65f0f86..49b597fb 100644 --- a/ReallifeGamemode.Server/Inventory/Items/AviateChips.cs +++ b/ReallifeGamemode.Server/Inventory/Items/AviateChips.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Text; using GTANetworkAPI; using ReallifeGamemode.Database.Entities; +using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Extensions; using ReallifeGamemode.Server.Managers; @@ -21,10 +22,8 @@ namespace ReallifeGamemode.Server.Inventory.Items public override float Cooldown => 60000; - public override void Consume(UserItem uItem) + public override void Consume(Player player, User user, DatabaseContext databaseContext) { - Player player = uItem.GetUser().Player; - int amountToAdd = HpAmount; if (player.Health + amountToAdd > 100) { @@ -33,7 +32,6 @@ namespace ReallifeGamemode.Server.Inventory.Items player.SafeSetHealth(player.Health + amountToAdd); player.SendNotification("Du hast ~y~" + Name + " ~s~gegessen.", false); - InventoryManager.RemoveUserItem(player.GetUser(), uItem, 1); } } } diff --git a/ReallifeGamemode.Server/Inventory/Items/Baklava.cs b/ReallifeGamemode.Server/Inventory/Items/Baklava.cs index e5825cf8..6b07dfdc 100644 --- a/ReallifeGamemode.Server/Inventory/Items/Baklava.cs +++ b/ReallifeGamemode.Server/Inventory/Items/Baklava.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Text; using GTANetworkAPI; using ReallifeGamemode.Database.Entities; +using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Extensions; using ReallifeGamemode.Server.Managers; @@ -21,10 +22,8 @@ namespace ReallifeGamemode.Server.Inventory.Items public override float Cooldown => 180000; - public override void Consume(UserItem uItem) + public override void Consume(Player player, User user, DatabaseContext databaseContext) { - Player player = uItem.GetUser().Player; - int amountToAdd = HpAmount; if (player.Health + amountToAdd > 100) { @@ -33,7 +32,6 @@ namespace ReallifeGamemode.Server.Inventory.Items player.SafeSetHealth(player.Health + amountToAdd); player.SendNotification("Du hast ein ~y~" + Name + " ~s~gegessen.", false); - InventoryManager.RemoveUserItem(player.GetUser(), uItem, 1); } } } diff --git a/ReallifeGamemode.Server/Inventory/Items/Bier.cs b/ReallifeGamemode.Server/Inventory/Items/Bier.cs index 99fc67a5..73852580 100644 --- a/ReallifeGamemode.Server/Inventory/Items/Bier.cs +++ b/ReallifeGamemode.Server/Inventory/Items/Bier.cs @@ -1,7 +1,9 @@ using System; using System.Collections.Generic; using System.Text; +using GTANetworkAPI; using ReallifeGamemode.Database.Entities; +using ReallifeGamemode.Database.Models; namespace ReallifeGamemode.Server.Inventory.Items { @@ -18,7 +20,7 @@ namespace ReallifeGamemode.Server.Inventory.Items public override float Cooldown => 1000; - public override void Consume(UserItem uItem) + public override void Consume(Player player, User user, DatabaseContext databaseContext) { //nothing } diff --git a/ReallifeGamemode.Server/Inventory/Items/CannabisSeeds.cs b/ReallifeGamemode.Server/Inventory/Items/CannabisSeeds.cs new file mode 100644 index 00000000..63f0f0db --- /dev/null +++ b/ReallifeGamemode.Server/Inventory/Items/CannabisSeeds.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace ReallifeGamemode.Server.Inventory.Items +{ + public class CannabisSeeds : BaseItem + { + public override int Id { get; } = 109; + public override string Name { get; } = "Cannabis Samen"; + public override string Description { get; } = "vierhundertzwanzig lodere es"; + public override int Gewicht { get; } = 10; + public override string Einheit { get; } = "g"; + public override int Price { get; } = 0; + public override bool Legal => false; + } +} diff --git a/ReallifeGamemode.Server/Inventory/Items/Cheeseburger.cs b/ReallifeGamemode.Server/Inventory/Items/Cheeseburger.cs index 225962ba..38f0775c 100644 --- a/ReallifeGamemode.Server/Inventory/Items/Cheeseburger.cs +++ b/ReallifeGamemode.Server/Inventory/Items/Cheeseburger.cs @@ -1,5 +1,6 @@ using GTANetworkAPI; using ReallifeGamemode.Database.Entities; +using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Extensions; using ReallifeGamemode.Server.Managers; @@ -23,10 +24,8 @@ namespace ReallifeGamemode.Server.Inventory.Items public override int Price => 100; public override float Cooldown => 120000; - public override void Consume(UserItem uItem) + public override void Consume(Player player, User user, DatabaseContext databaseContext) { - Player player = uItem.GetUser().Player; - int amountToAdd = HpAmount; if (player.Health + amountToAdd > 100) { @@ -35,7 +34,6 @@ namespace ReallifeGamemode.Server.Inventory.Items player.SafeSetHealth(player.Health + amountToAdd); player.SendNotification("Du hast einen ~y~" + Name + " ~s~gegessen.", false); - InventoryManager.RemoveUserItem(player.GetUser(), uItem, 1); } } } diff --git a/ReallifeGamemode.Server/Inventory/Items/Chips.cs b/ReallifeGamemode.Server/Inventory/Items/Chips.cs index 3198deb5..a6cb4623 100644 --- a/ReallifeGamemode.Server/Inventory/Items/Chips.cs +++ b/ReallifeGamemode.Server/Inventory/Items/Chips.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Text; using GTANetworkAPI; using ReallifeGamemode.Database.Entities; +using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Extensions; using ReallifeGamemode.Server.Managers; @@ -21,10 +22,8 @@ namespace ReallifeGamemode.Server.Inventory.Items public override float Cooldown => 30000; - public override void Consume(UserItem uItem) + public override void Consume(Player player, User user, DatabaseContext databaseContext) { - Player player = uItem.GetUser().Player; - int amountToAdd = HpAmount; if (player.Health + amountToAdd > 100) { @@ -33,7 +32,6 @@ namespace ReallifeGamemode.Server.Inventory.Items player.SafeSetHealth(player.Health + amountToAdd); player.SendNotification("Du hast ~y~" + Name + " ~s~gegessen.", false); - InventoryManager.RemoveUserItem(player.GetUser(), uItem, 1); } } } diff --git a/ReallifeGamemode.Server/Inventory/Items/Cocain.cs b/ReallifeGamemode.Server/Inventory/Items/Cocain.cs index 60e5000c..3137798e 100644 --- a/ReallifeGamemode.Server/Inventory/Items/Cocain.cs +++ b/ReallifeGamemode.Server/Inventory/Items/Cocain.cs @@ -1,4 +1,6 @@ -using ReallifeGamemode.Database.Entities; +using GTANetworkAPI; +using ReallifeGamemode.Database.Entities; +using ReallifeGamemode.Database.Models; /** * @overview Life of German Reallife - Inventory Items Chickenburger (Chickenburger.cs) @@ -21,7 +23,7 @@ namespace ReallifeGamemode.Server.Inventory.Items public override float Cooldown => 20000; - public override void Consume(UserItem uItem) + public override void Consume(Player player, User user, DatabaseContext databaseContext) { //nothing } diff --git a/ReallifeGamemode.Server/Inventory/Items/ConsumableItem.cs b/ReallifeGamemode.Server/Inventory/Items/ConsumableItem.cs index abfaa298..ea7d5f90 100644 --- a/ReallifeGamemode.Server/Inventory/Items/ConsumableItem.cs +++ b/ReallifeGamemode.Server/Inventory/Items/ConsumableItem.cs @@ -1,6 +1,7 @@ using System; using GTANetworkAPI; using ReallifeGamemode.Database.Entities; +using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Extensions; using ReallifeGamemode.Server.Inventory.Interfaces; using ReallifeGamemode.Server.Managers; @@ -8,7 +9,7 @@ using ReallifeGamemode.Server.Util; namespace ReallifeGamemode.Server.Inventory.Items { - public abstract class ConsumableItem : BaseItem, IUsableItem + public abstract class ConsumableItem : UseItem { public abstract int HpAmount { get; } public override int Id { get; } @@ -18,28 +19,28 @@ namespace ReallifeGamemode.Server.Inventory.Items public override string Einheit { get; } public override int Price { get; } public abstract float Cooldown { get; } - public abstract uint Object { get; } + public abstract override uint Object { get; } + public override bool RemoveWhenUsed => true; - public abstract void Consume(UserItem uItem); + public abstract void Consume(Player player, User user, DatabaseContext databaseContext); - public bool Use(UserItem uItem) + public override bool Use(Player player, User user, DatabaseContext databaseContext) { - User user = uItem.GetUser(); if (user.Player == null || !user.Player.IsLoggedIn()) return false; - if (!HasCooldownElapsed(user)) + if (!HasCooldownElapsed(user) && Cooldown > 0) { DateTime time = InventoryManager.itemCooldown[user.Id]; int timeUntillNextUse = (int)(time - DateTime.Now).TotalSeconds; - uItem.GetUser().Player.TriggerEvent("Error", $"Versuche es nach {timeUntillNextUse} Sekunden erneut."); + user.Player.TriggerEvent("Error", $"Versuche es nach {timeUntillNextUse} Sekunden erneut."); return false; } DateTime cooldown = DateTime.Now.AddMilliseconds(Cooldown); InventoryManager.itemCooldown.Add(user.Id, cooldown); - Consume(uItem); + Consume(player, user, databaseContext); return true; } diff --git a/ReallifeGamemode.Server/Inventory/Items/Joint.cs b/ReallifeGamemode.Server/Inventory/Items/Joint.cs new file mode 100644 index 00000000..27bfc0d6 --- /dev/null +++ b/ReallifeGamemode.Server/Inventory/Items/Joint.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Text; +using GTANetworkAPI; +using ReallifeGamemode.Database.Entities; +using ReallifeGamemode.Database.Models; +using ReallifeGamemode.Server.Services; + +namespace ReallifeGamemode.Server.Inventory.Items +{ + public class Joint : UseItem + { + public override int Id { get; } = 110; + public override string Name { get; } = "Joint"; + public override string Description { get; } = "stay high bis zum tod"; + public override int Gewicht { get; } = 20; + public override string Einheit { get; } = "g"; + public override int Price { get; } = 0; + public override uint Object { get; } + public override bool Legal => false; + public override bool RemoveWhenUsed => true; + + public override bool Use(Player player, User user, DatabaseContext databaseContext) + { + return true; + } + } +} diff --git a/ReallifeGamemode.Server/Inventory/Items/Kebab.cs b/ReallifeGamemode.Server/Inventory/Items/Kebab.cs index 508e9c50..eced1333 100644 --- a/ReallifeGamemode.Server/Inventory/Items/Kebab.cs +++ b/ReallifeGamemode.Server/Inventory/Items/Kebab.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Text; using GTANetworkAPI; using ReallifeGamemode.Database.Entities; +using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Extensions; using ReallifeGamemode.Server.Managers; @@ -21,10 +22,8 @@ namespace ReallifeGamemode.Server.Inventory.Items public override float Cooldown => 300000; - public override void Consume(UserItem uItem) + public override void Consume(Player player, User user, DatabaseContext databaseContext) { - Player player = uItem.GetUser().Player; - int amountToAdd = HpAmount; if (player.Health + amountToAdd > 100) { @@ -33,7 +32,6 @@ namespace ReallifeGamemode.Server.Inventory.Items player.SafeSetHealth(player.Health + amountToAdd); player.SendNotification("Du hast ein ~y~" + Name + " ~s~gegessen.", false); - InventoryManager.RemoveUserItem(player.GetUser(), uItem, 1); } } } diff --git a/ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs b/ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs index b6d19fe3..4a5bfe40 100644 --- a/ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs +++ b/ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs @@ -19,17 +19,12 @@ namespace ReallifeGamemode.Server.Inventory.Items public override uint Object => 875075437; public override int Price => 2500; - public override bool Use(UserItem uItem) + public override bool RemoveWhenUsed { get; } = true; + + public override bool Use(Player player, User user, DatabaseContext databaseContext) { - Player player = uItem.GetUser().Player; - - if (uItem.ItemId != 201) - { - return false; - } - Vehicle veh = null; - + var nearestVeh = NAPI.Pools.GetAllVehicles().Where(v => v.Position.DistanceTo(player.Position) <= 5).FirstOrDefault(); veh = nearestVeh; @@ -39,13 +34,13 @@ namespace ReallifeGamemode.Server.Inventory.Items return false; } - if(player.IsInVehicle) + if (player.IsInVehicle) { player.SendNotification("Du musst aus deinem Fahrzeug aussteigen!"); return false; } - if(veh.Controller == null) + if (veh.Controller == null) { player.SendNotification("Du kannst dieses Fahrzeug nicht reparieren, weil Jemand bereits im Fahrzeug sitzt"); return false; @@ -62,6 +57,7 @@ namespace ReallifeGamemode.Server.Inventory.Items Vector3 position = veh.Position; player.SendNotification("Du hast ~g~" + InventoryManager.GetItemById(uItem.ItemId).Name + " ~s~verwendet", false); InventoryManager.RemoveUserItem(player.GetUser(), uItem, 1); + InventoryManager.RemoveUserItem(player.GetUser(), uItem, 1); ServerVehicle serverVehicle = veh.GetServerVehicle(dbContext); serverVehicle.Spawn(veh).Position = position; Vehicle newVeh = serverVehicle.Spawn(veh); diff --git a/ReallifeGamemode.Server/Inventory/Items/Rubellos.cs b/ReallifeGamemode.Server/Inventory/Items/Rubellos.cs index 4a36ce7f..416252a6 100644 --- a/ReallifeGamemode.Server/Inventory/Items/Rubellos.cs +++ b/ReallifeGamemode.Server/Inventory/Items/Rubellos.cs @@ -19,40 +19,24 @@ namespace ReallifeGamemode.Server.Inventory.Items public override string Einheit => "g"; public override uint Object => 875075437; public override int Price => 500; + public override bool RemoveWhenUsed => true; - public override bool Use(UserItem uItem) - { - Player player = uItem.GetUser().Player; - - if (uItem.ItemId != 200) + public override bool Use(Player player, User user, DatabaseContext databaseContext) { - return false; - } - Random random = new Random(); - int randomNumber = random.Next(1, 4); - if (randomNumber == 1) - { - using (var dbContext = new DatabaseContext()) + Random random = new Random(); + int randomNumber = random.Next(1, 2); + if (randomNumber == 1) { - User winner = player.GetUser(dbContext); - winner.Handmoney += 1000; + user.Handmoney += 1000; //player.TriggerEvent("SERVER:SET_HANDMONEY", winner.Handmoney); - dbContext.SaveChanges(); - } player.SendNotification("Glückwunsch du hast ~g~$~w~1000 gewonnen!"); - } - else - { + } + else + { player.SendNotification("Leider kein Gewinn, viel Glück beim nächsten mal."); + } + player.SendNotification("Du hast ein ~g~" + Name + " ~s~verwendet.", false); + return true; } - player.SendNotification("Du hast ~g~" + InventoryManager.GetItemById(uItem.ItemId).Name + " ~s~verwendet.", false); - InventoryManager.RemoveUserItem(player.GetUser(), uItem, 1); - return true; } - - -} - - - } diff --git a/ReallifeGamemode.Server/Inventory/Items/UseItem.cs b/ReallifeGamemode.Server/Inventory/Items/UseItem.cs index 9674fb70..59cf30ea 100644 --- a/ReallifeGamemode.Server/Inventory/Items/UseItem.cs +++ b/ReallifeGamemode.Server/Inventory/Items/UseItem.cs @@ -19,8 +19,8 @@ namespace ReallifeGamemode.Server.Inventory.Items public override string Einheit { get; } public override int Price { get; } public abstract uint Object { get; } + public abstract bool RemoveWhenUsed { get; } - public abstract bool Use(UserItem uItem); - + public abstract bool Use(Player player, User user, DatabaseContext databaseContext); } } diff --git a/ReallifeGamemode.Server/Managers/InventoryManager.cs b/ReallifeGamemode.Server/Managers/InventoryManager.cs index 38d5d00d..4658cd12 100644 --- a/ReallifeGamemode.Server/Managers/InventoryManager.cs +++ b/ReallifeGamemode.Server/Managers/InventoryManager.cs @@ -27,7 +27,7 @@ namespace ReallifeGamemode.Server.Managers { public class InventoryManager : Script { - private const int MAX_USER_INVENTORY = 40000; + public const int MAX_USER_INVENTORY = 40000; private static readonly ILogger logger = LogManager.GetLogger(); public static List itemList; @@ -82,7 +82,11 @@ namespace ReallifeGamemode.Server.Managers { player.TriggerEvent("Error", "Du kannst deinen Kofferraum gerade nicht öffnen."); } - Vehicle veh = NAPI.Pools.GetAllVehicles().ToList().Where(v => v.Position.DistanceTo(player.Position) <= 4).FirstOrDefault(); + Vehicle veh = NAPI.Pools.GetAllVehicles() + .ToList() + .Where(v => v.Position.DistanceTo(player.Position) <= 4) + .OrderBy(v => v.Position.DistanceTo(player.Position)) + .FirstOrDefault(); if (veh == null) { player.TriggerEvent("Error", "Kein Fahrzeug in der Nähe!"); @@ -270,7 +274,7 @@ namespace ReallifeGamemode.Server.Managers } } - public static void GetUserItemsAsAdmin(Player player, User user) + public static void GetUserItemsAsAdmin(Player admin, User user) { var inventoryWeight = 0; @@ -292,7 +296,7 @@ namespace ReallifeGamemode.Server.Managers items[userItems.IndexOf(item)][4] = item.Slot.ToString(); items[userItems.IndexOf(item)][5] = item.Id.ToString(); } - player.TriggerEvent("showInventoryToAdmin", user.Name, inventoryWeight, items); + admin.TriggerEvent("showInventoryToAdmin", user.Name, inventoryWeight, items); } } @@ -510,10 +514,10 @@ namespace ReallifeGamemode.Server.Managers int itemId = JsonConvert.DeserializeObject(jsonItemId); string type = JsonConvert.DeserializeObject(jsonType); - User user = player.GetUser(); using (var context = new DatabaseContext()) { + User user = player.GetUser(context); UserItem fItem = context.UserItems.Where(u => u.UserId == user.Id && u.ItemId == itemId).FirstOrDefault(); IItem iItem = GetItemById(fItem.ItemId); @@ -534,8 +538,14 @@ namespace ReallifeGamemode.Server.Managers if (iItem is IUsableItem usableItemObj) { - if (usableItemObj.Use(fItem)) + logger.LogInformation("Player {0} used the item {1} ({2})", player.Name, iItem.Name, iItem.Id); + if (usableItemObj.Use(player, user, context)) { + if (usableItemObj.RemoveWhenUsed) + { + RemoveUserItem(user, fItem, 1); + } + SetBackpackItems(player); player.TriggerEvent("aproveUse", 1, iItem.Name); } @@ -559,6 +569,7 @@ namespace ReallifeGamemode.Server.Managers if (iItem is IDroppableItem usableItemObj2) { + logger.LogInformation("Player {0} dropped the item {1} ({2})", player.Name, iItem.Name, iItem.Id); Vector3 dropPosition = PlayerExtension.GetPositionFromPlayer(player, 0.6f, 0); //new Vector3(player.Position.X, player.Position.Y, player.Position.Z - 0.8f); Random r = new Random(); @@ -617,7 +628,6 @@ namespace ReallifeGamemode.Server.Managers if (GetUserInventoryWeight(client) + shopItem.Gewicht > MAX_USER_INVENTORY) { - return; } From 848353053b12ad113c28f227e327708b0aa6b5b0 Mon Sep 17 00:00:00 2001 From: hydrant Date: Sat, 22 May 2021 19:10:40 +0200 Subject: [PATCH 69/82] addserver function to set inventory show --- ReallifeGamemode.Client/inventory/inventory.ts | 6 +++--- ReallifeGamemode.Server/Events/Key.cs | 2 +- .../Extensions/ClientExtension.cs | 12 ++++++++++++ .../Util/InventoryToggleOption.cs | 11 +++++++++++ 4 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 ReallifeGamemode.Server/Util/InventoryToggleOption.cs diff --git a/ReallifeGamemode.Client/inventory/inventory.ts b/ReallifeGamemode.Client/inventory/inventory.ts index 1f2a7504..05a90982 100644 --- a/ReallifeGamemode.Client/inventory/inventory.ts +++ b/ReallifeGamemode.Client/inventory/inventory.ts @@ -21,14 +21,14 @@ invBrowser = mp.browsers.new('package://assets/html/inventory/inventory.html'); }); - mp.events.add('inventoryShow', () => { - if (!globalData.InMenu && !loaded) { + mp.events.add('inventoryShow', (force = undefined) => { + if (!globalData.InMenu && !loaded || force === true) { globalData.InMenu = true; mp.gui.cursor.show(true, true); loaded = true; invBrowser.execute(`showInventory()`); - } else if (loaded) { + } else if (loaded || force === true) { globalData.InMenu = false; mp.gui.cursor.show(false, false); loaded = false; diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs index 234616eb..b77f8649 100644 --- a/ReallifeGamemode.Server/Events/Key.cs +++ b/ReallifeGamemode.Server/Events/Key.cs @@ -769,7 +769,7 @@ namespace ReallifeGamemode.Server.Events if (!player.IsLoggedIn() || player.GetData("isDead")) return; if (player.GetData("isDead")) return; - player.TriggerEvent("inventoryShow"); + player.ToggleInventory(); InventoryManager.SetBackpackItems(player); } diff --git a/ReallifeGamemode.Server/Extensions/ClientExtension.cs b/ReallifeGamemode.Server/Extensions/ClientExtension.cs index 817d2ee4..2ffa1af2 100644 --- a/ReallifeGamemode.Server/Extensions/ClientExtension.cs +++ b/ReallifeGamemode.Server/Extensions/ClientExtension.cs @@ -477,5 +477,17 @@ namespace ReallifeGamemode.Server.Extensions if (player.GetUser().Wanteds > 0) PositionManager.cuffPoints.Add(player); } + + public static void ToggleInventory(this Player player, InventoryToggleOption option = InventoryToggleOption.TOGGLE) + { + if(option == InventoryToggleOption.TOGGLE) + { + player.TriggerEvent("inventoryShow"); + } + else + { + player.TriggerEvent("inventoryShow", option == InventoryToggleOption.SHOW); + } + } } } diff --git a/ReallifeGamemode.Server/Util/InventoryToggleOption.cs b/ReallifeGamemode.Server/Util/InventoryToggleOption.cs new file mode 100644 index 00000000..863e6210 --- /dev/null +++ b/ReallifeGamemode.Server/Util/InventoryToggleOption.cs @@ -0,0 +1,11 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace ReallifeGamemode.Server.Util +{ + public enum InventoryToggleOption + { + TOGGLE, SHOW, HIDE + } +} From d72f7216cc8e4b7778f5a80161ad76a83ead423f Mon Sep 17 00:00:00 2001 From: hydrant Date: Sun, 23 May 2021 20:18:30 +0200 Subject: [PATCH 70/82] fix pedmanager --- ReallifeGamemode.Client/Ped/PedCreator.ts | 30 +++++++++++++++---- .../Managers/PedManager.cs | 3 +- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/ReallifeGamemode.Client/Ped/PedCreator.ts b/ReallifeGamemode.Client/Ped/PedCreator.ts index 600599be..0048c40b 100644 --- a/ReallifeGamemode.Client/Ped/PedCreator.ts +++ b/ReallifeGamemode.Client/Ped/PedCreator.ts @@ -741,28 +741,48 @@ u_m_y_tattoo_01: 0x94AE2B8C, u_m_y_zombie_01: 0xAC4B4506, } - var CreatedPeds = []; + var CreatedPeds: Array = []; mp.events.add("SERVER:CreateStaticPeds", (jsonVector3s, jsonHeadings, jsonCharHashes, jsonDimension) => { var vector3s = JSON.parse(jsonVector3s); var headings = JSON.parse(jsonHeadings); var charHashes = JSON.parse(jsonCharHashes); + var dimension = JSON.parse(jsonDimension); for (var i = 0; i < vector3s.length; i++) { - let p = mp.peds.new(Number(charHashes[i]), vector3s[i], headings[i], dimension[i]); + var hash = charHashes[i]; + + var tmpHash = getPedHashByName(hash); + if (tmpHash != -1) { + hash = tmpHash; + } + + //mp.gui.chat.push(`adding ped ${hash} (${charHashes[i]}`); + + let p = mp.peds.new(hash, vector3s[i], headings[i], dimension[i]); p.freezePosition(true); p.setInvincible(true); - p.setCollision(false, false); + //p.setCollision(false, false); CreatedPeds.push(p); } }); mp.events.add('entityStreamIn', (entity: EntityMp) => { CreatedPeds.forEach(function (p) { if (entity == p) { - + p.freezePosition(true); p.setInvincible(true); - p.setCollision(false, false); + //p.setCollision(false, false); } }); }); + + function getPedHashByName(name: string) { + var keys = Object.keys(PedHashes); + var idx = keys.indexOf(name) !== -1; + if (idx) { + return PedHashes[name]; + } + + return -1; + } } \ No newline at end of file diff --git a/ReallifeGamemode.Server/Managers/PedManager.cs b/ReallifeGamemode.Server/Managers/PedManager.cs index 0a176366..0bc860c9 100644 --- a/ReallifeGamemode.Server/Managers/PedManager.cs +++ b/ReallifeGamemode.Server/Managers/PedManager.cs @@ -68,7 +68,8 @@ namespace ReallifeGamemode.Server.Managers { WeponDealPed, DepartmentPed, - PrisonPed + PrisonPed, + } public class PedData From a49fcf09c7ddd597f13ca0c19619e226f9e12363 Mon Sep 17 00:00:00 2001 From: hydrant Date: Mon, 24 May 2021 00:04:55 +0200 Subject: [PATCH 71/82] samen kaufen und hanf -> joint --- ReallifeGamemode.Client/Ped/PedCreator.ts | 1515 +++++++++-------- ReallifeGamemode.Client/drugs/hanf.ts | 67 + ReallifeGamemode.Client/index.ts | 3 + ReallifeGamemode.Client/util/animationSync.ts | 64 +- ReallifeGamemode.Server/BaseScript.cs | 19 + ReallifeGamemode.Server/Events/Key.cs | 14 + .../Inventory/Items/Joint.cs | 4 +- ReallifeGamemode.Server/Main.cs | 1 + .../Managers/HanfManager.cs | 178 ++ .../Managers/InventoryManager.cs | 37 +- ReallifeGamemode.Server/Util/Colors.cs | 12 + 11 files changed, 1126 insertions(+), 788 deletions(-) create mode 100644 ReallifeGamemode.Client/drugs/hanf.ts create mode 100644 ReallifeGamemode.Server/BaseScript.cs create mode 100644 ReallifeGamemode.Server/Managers/HanfManager.cs create mode 100644 ReallifeGamemode.Server/Util/Colors.cs diff --git a/ReallifeGamemode.Client/Ped/PedCreator.ts b/ReallifeGamemode.Client/Ped/PedCreator.ts index 0048c40b..e2559dbd 100644 --- a/ReallifeGamemode.Client/Ped/PedCreator.ts +++ b/ReallifeGamemode.Client/Ped/PedCreator.ts @@ -1,747 +1,751 @@ -export default function PedCreator() { - // Update 04/03/2020, Ped count [739] - var PedHashes = { - a_c_boar: 0xCE5FF074, - a_c_cat_01: 0x573201B8, - a_c_chickenhawk: 0xAAB71F62, - a_c_chimp: 0xA8683715, - a_c_chop: 0x14EC17EA, - a_c_cormorant: 0x56E29962, - a_c_cow: 0xFCFA9E1E, - a_c_coyote: 0x644AC75E, - a_c_crow: 0x18012A9F, - a_c_deer: 0xD86B5A95, - a_c_dolphin: 0x8BBAB455, - a_c_fish: 0x2FD800B7, - a_c_hen: 0x6AF51FAF, - a_c_humpback: 0x471BE4B2, - a_c_husky: 0x4E8F95A2, - a_c_killerwhale: 0x8D8AC8B9, - a_c_mtlion: 0x1250D7BA, - a_c_pig: 0xB11BAB56, - a_c_pigeon: 0x06A20728, - a_c_poodle: 0x431D501C, - a_c_pug: 0x6D362854, - a_c_rabbit_01: 0xDFB55C81, - a_c_rat: 0xC3B52966, - a_c_retriever: 0x349F33E1, - a_c_rhesus: 0xC2D06F53, - a_c_rottweiler: 0x9563221D, - a_c_seagull: 0xD3939DFD, - a_c_sharkhammer: 0x3C831724, - a_c_sharktiger: 0x06C3F072, - a_c_shepherd: 0x431FC24C, - a_c_stingray: 0xA148614D, - a_c_westy: 0xAD7844BB, - a_f_m_beach_01: 0x303638A7, - a_f_m_bevhills_01: 0xBE086EFD, - a_f_m_bevhills_02: 0xA039335F, - a_f_m_bodybuild_01: 0x3BD99114, - a_f_m_business_02: 0x1FC37DBC, - a_f_m_downtown_01: 0x654AD86E, - a_f_m_eastsa_01: 0x9D3DCB7A, - a_f_m_eastsa_02: 0x63C8D891, - a_f_m_fatbla_01: 0xFAB48BCB, - a_f_m_fatcult_01: 0xB5CF80E4, - a_f_m_fatwhite_01: 0x38BAD33B, - a_f_m_ktown_01: 0x52C824DE, - a_f_m_ktown_02: 0x41018151, - a_f_m_prolhost_01: 0x169BD1E1, - a_f_m_salton_01: 0xDE0E0969, - a_f_m_skidrow_01: 0xB097523B, - a_f_m_soucent_01: 0x745855A1, - a_f_m_soucent_02: 0xF322D338, - a_f_m_soucentmc_01: 0xCDE955D2, - a_f_m_tourist_01: 0x505603B9, - a_f_m_tramp_01: 0x48F96F5B, - a_f_m_trampbeac_01: 0x8CA0C266, - a_f_o_genstreet_01: 0x61C81C85, - a_f_o_indian_01: 0xBAD7BB80, - a_f_o_ktown_01: 0x47CF5E96, - a_f_o_salton_01: 0xCCFF7D8A, - a_f_o_soucent_01: 0x3DFA1830, - a_f_o_soucent_02: 0xA56DE716, - a_f_y_beach_01: 0xC79F6928, - a_f_y_bevhills_01: 0x445AC854, - a_f_y_bevhills_02: 0x5C2CF7F8, - a_f_y_bevhills_03: 0x20C8012F, - a_f_y_bevhills_04: 0x36DF2D5D, - a_f_y_business_01: 0x2799EFD8, - a_f_y_business_02: 0x31430342, - a_f_y_business_03: 0xAE86FDB4, - a_f_y_business_04: 0xB7C61032, - a_f_y_eastsa_01: 0xF5B0079D, - a_f_y_eastsa_02: 0x0438A4AE, - a_f_y_eastsa_03: 0x51C03FA4, - a_f_y_epsilon_01: 0x689C2A80, - a_f_y_femaleagent: 0x50610C43, - a_f_y_fitness_01: 0x457C64FB, - a_f_y_fitness_02: 0x13C4818C, - a_f_y_genhot_01: 0x2F4AEC3E, - a_f_y_golfer_01: 0x7DD8FB58, - a_f_y_hiker_01: 0x30830813, - a_f_y_hippie_01: 0x1475B827, - a_f_y_hipster_01: 0x8247D331, - a_f_y_hipster_02: 0x97F5FE8D, - a_f_y_hipster_03: 0xA5BA9A16, - a_f_y_hipster_04: 0x199881DC, - a_f_y_indian_01: 0x092D9CC1, - a_f_y_juggalo_01: 0xDB134533, - a_f_y_runner_01: 0xC7496729, - a_f_y_rurmeth_01: 0x3F789426, - a_f_y_scdressy_01: 0xDB5EC400, - a_f_y_skater_01: 0x695FE666, - a_f_y_soucent_01: 0x2C641D7A, - a_f_y_soucent_02: 0x5A8EF9CF, - a_f_y_soucent_03: 0x87B25415, - a_f_y_tennis_01: 0x550C79C6, - a_f_y_topless_01: 0x9CF26183, - a_f_y_tourist_01: 0x563B8570, - a_f_y_tourist_02: 0x9123FB40, - a_f_y_vinewood_01: 0x19F41F65, - a_f_y_vinewood_02: 0xDAB6A0EB, - a_f_y_vinewood_03: 0x379DDAB8, - a_f_y_vinewood_04: 0xFAE46146, - a_f_y_yoga_01: 0xC41B062E, - a_m_m_acult_01: 0x5442C66B, - a_m_m_afriamer_01: 0xD172497E, - a_m_m_beach_01: 0x403DB4FD, - a_m_m_beach_02: 0x787FA588, - a_m_m_bevhills_01: 0x54DBEE1F, - a_m_m_bevhills_02: 0x3FB5C3D3, - a_m_m_business_01: 0x7E6A64B7, - a_m_m_eastsa_01: 0xF9A6F53F, - a_m_m_eastsa_02: 0x07DD91AC, - a_m_m_farmer_01: 0x94562DD7, - a_m_m_fatlatin_01: 0x61D201B3, - a_m_m_genfat_01: 0x06DD569F, - a_m_m_genfat_02: 0x13AEF042, - a_m_m_golfer_01: 0xA9EB0E42, - a_m_m_hasjew_01: 0x6BD9B68C, - a_m_m_hillbilly_01: 0x6C9B2849, - a_m_m_hillbilly_02: 0x7B0E452F, - a_m_m_indian_01: 0xDDCAAA2C, - a_m_m_ktown_01: 0xD15D7E71, - a_m_m_malibu_01: 0x2FDE6EB7, - a_m_m_mexcntry_01: 0xDD817EAD, - a_m_m_mexlabor_01: 0xB25D16B2, - a_m_m_og_boss_01: 0x681BD012, - a_m_m_paparazzi_01: 0xECCA8C15, - a_m_m_polynesian_01: 0xA9D9B69E, - a_m_m_prolhost_01: 0x9712C38F, - a_m_m_rurmeth_01: 0x3BAD4184, - a_m_m_salton_01: 0x4F2E038A, - a_m_m_salton_02: 0x60F4A717, - a_m_m_salton_03: 0xB28C4A45, - a_m_m_salton_04: 0x964511B7, - a_m_m_skater_01: 0xD9D7588C, - a_m_m_skidrow_01: 0x01EEA6BD, - a_m_m_socenlat_01: 0x0B8D69E3, - a_m_m_soucent_01: 0x6857C9B7, - a_m_m_soucent_02: 0x9F6D37E1, - a_m_m_soucent_03: 0x8BD990BA, - a_m_m_soucent_04: 0xC2FBFEFE, - a_m_m_stlat_02: 0xC2A87702, - a_m_m_tennis_01: 0x546A5344, - a_m_m_tourist_01: 0xC89F0184, - a_m_m_tramp_01: 0x1EC93FD0, - a_m_m_trampbeac_01: 0x53B57EB0, - a_m_m_tranvest_01: 0xE0E69974, - a_m_m_tranvest_02: 0xF70EC5C4, - a_m_o_acult_01: 0x55446010, - a_m_o_acult_02: 0x4BA14CCA, - a_m_o_beach_01: 0x8427D398, - a_m_o_genstreet_01: 0xAD54E7A8, - a_m_o_ktown_01: 0x1536D95A, - a_m_o_salton_01: 0x20208E4D, - a_m_o_soucent_01: 0x2AD8921B, - a_m_o_soucent_02: 0x4086BD77, - a_m_o_soucent_03: 0x0E32D8D0, - a_m_o_tramp_01: 0x174D4245, - a_m_y_acult_01: 0xB564882B, - a_m_y_acult_02: 0x80E59F2E, - a_m_y_beach_01: 0xD1FEB884, - a_m_y_beach_02: 0x23C7DC11, - a_m_y_beach_03: 0xE7A963D9, - a_m_y_beachvesp_01: 0x7E0961B8, - a_m_y_beachvesp_02: 0xCA56FA52, - a_m_y_bevhills_01: 0x76284640, - a_m_y_bevhills_02: 0x668BA707, - a_m_y_breakdance_01: 0x379F9596, - a_m_y_busicas_01: 0x9AD32FE9, - a_m_y_business_01: 0xC99F21C4, - a_m_y_business_02: 0xB3B3F5E6, - a_m_y_business_03: 0xA1435105, - a_m_y_cyclist_01: 0xFDC653C7, - a_m_y_dhill_01: 0xFF3E88AB, - a_m_y_downtown_01: 0x2DADF4AA, - a_m_y_eastsa_01: 0xA4471173, - a_m_y_eastsa_02: 0x168775F6, - a_m_y_epsilon_01: 0x77D41A3E, - a_m_y_epsilon_02: 0xAA82FF9B, - a_m_y_gay_01: 0xD1CCE036, - a_m_y_gay_02: 0xA5720781, - a_m_y_genstreet_01: 0x9877EF71, - a_m_y_genstreet_02: 0x3521A8D2, - a_m_y_golfer_01: 0xD71FE131, - a_m_y_hasjew_01: 0xE16D8F01, - a_m_y_hiker_01: 0x50F73C0C, - a_m_y_hippy_01: 0x7D03E617, - a_m_y_hipster_01: 0x2307A353, - a_m_y_hipster_02: 0x14D506EE, - a_m_y_hipster_03: 0x4E4179C6, - a_m_y_indian_01: 0x2A22FBCE, - a_m_y_jetski_01: 0x2DB7EEF3, - a_m_y_juggalo_01: 0x91CA3E2C, - a_m_y_ktown_01: 0x1AF6542C, - a_m_y_ktown_02: 0x297FF13F, - a_m_y_latino_01: 0x132C1A8E, - a_m_y_methhead_01: 0x696BE0A9, - a_m_y_mexthug_01: 0x3053E555, - a_m_y_motox_01: 0x64FDEA7D, - a_m_y_motox_02: 0x77AC8FDA, - a_m_y_musclbeac_01: 0x4B652906, - a_m_y_musclbeac_02: 0xC923247C, - a_m_y_polynesian_01: 0x8384FC9F, - a_m_y_roadcyc_01: 0xF561A4C6, - a_m_y_runner_01: 0x25305EEE, - a_m_y_runner_02: 0x843D9D0F, - a_m_y_salton_01: 0xD7606C30, - a_m_y_skater_01: 0xC1C46677, - a_m_y_skater_02: 0xAFFAC2E4, - a_m_y_soucent_01: 0xE716BDCB, - a_m_y_soucent_02: 0xACA3C8CA, - a_m_y_soucent_03: 0xC3F0F764, - a_m_y_soucent_04: 0x8A3703F1, - a_m_y_stbla_01: 0xCF92ADE9, - a_m_y_stbla_02: 0x98C7404F, - a_m_y_stlat_01: 0x8674D5FC, - a_m_y_stwhi_01: 0x2418C430, - a_m_y_stwhi_02: 0x36C6E98C, - a_m_y_sunbathe_01: 0xB7292F0C, - a_m_y_surfer_01: 0xEAC2C7EE, - a_m_y_vindouche_01: 0xC19377E7, - a_m_y_vinewood_01: 0x4B64199D, - a_m_y_vinewood_02: 0x5D15BD00, - a_m_y_vinewood_03: 0x1FDF4294, - a_m_y_vinewood_04: 0x31C9E669, - a_m_y_yoga_01: 0xAB0A7155, - cs_amandatownley: 0x95EF18E3, - cs_andreas: 0xE7565327, - cs_ashley: 0x26C3D079, - cs_bankman: 0x9760192E, - cs_barry: 0x69591CF7, - cs_beverly: 0xB46EC356, - cs_brad: 0xEFE5AFE6, - cs_bradcadaver: 0x7228AF60, - cs_carbuyer: 0x8CCE790F, - cs_casey: 0xEA969C40, - cs_chengsr: 0x30DB9D7B, - cs_chrisformage: 0xC1F380E6, - cs_clay: 0xDBCB9834, - cs_dale: 0x0CE81655, - cs_davenorton: 0x8587248C, - cs_debra: 0xECD04FE9, - cs_denise: 0x6F802738, - cs_devin: 0x2F016D02, - cs_dom: 0x4772AF42, - cs_dreyfuss: 0x3C60A153, - cs_drfriedlander: 0xA3A35C2F, - cs_fabien: 0x47035EC1, - cs_fbisuit_01: 0x585C0B52, - cs_floyd: 0x062547E7, - cs_guadalope: 0x0F9513F1, - cs_gurk: 0xC314F727, - cs_hunter: 0x5B44892C, - cs_janet: 0x3034F9E2, - cs_jewelass: 0x4440A804, - cs_jimmyboston: 0x039677BD, - cs_jimmydisanto: 0xB8CC92B4, - cs_joeminuteman: 0xF09D5E29, - cs_johnnyklebitz: 0xFA8AB881, - cs_josef: 0x459762CA, - cs_josh: 0x450EEF9D, - cs_karen_daniels: 0x4BAF381C, - cs_lamardavis: 0x45463A0D, - cs_lazlow: 0x38951A1B, - cs_lestercrest: 0xB594F5C3, - cs_lifeinvad_01: 0x72551375, - cs_magenta: 0x5816C61A, - cs_manuel: 0xFBB374CA, - cs_marnie: 0x574DE134, - cs_martinmadrazo: 0x43595670, - cs_maryann: 0x0998C7AD, - cs_michelle: 0x70AEB9C8, - cs_milton: 0xB76A330F, - cs_molly: 0x45918E44, - cs_movpremf_01: 0x4BBA84D9, - cs_movpremmale: 0x8D67EE7D, - cs_mrk: 0xC3CC9A75, - cs_mrs_thornhill: 0x4F921E6E, - cs_mrsphillips: 0xCBFDA3CF, - cs_natalia: 0x4EFEB1F0, - cs_nervousron: 0x7896DA94, - cs_nigel: 0xE1479C0B, - cs_old_man1a: 0x1EEC7BDC, - cs_old_man2: 0x98F9E770, - cs_omega: 0x8B70B405, - cs_orleans: 0xAD340F5A, - cs_paper: 0x6B38B8F8, - cs_patricia: 0xDF8B1301, - cs_priest: 0x4D6DE57E, - cs_prolsec_02: 0x1E9314A2, - cs_russiandrunk: 0x46521A32, - cs_siemonyetarian: 0xC0937202, - cs_solomon: 0xF6D1E04E, - cs_stevehains: 0xA4E0A1FE, - cs_stretch: 0x893D6805, - cs_tanisha: 0x42FE5370, - cs_taocheng: 0x8864083D, - cs_taostranslator: 0x53536529, - cs_tenniscoach: 0x5C26040A, - cs_terry: 0x3A5201C5, - cs_tom: 0x69E8ABC3, - cs_tomepsilon: 0x8C0FD4E2, - cs_tracydisanto: 0x0609B130, - cs_wade: 0xD266D9D6, - cs_zimbor: 0xEAACAAF0, - csb_abigail: 0x89768941, - csb_agent: 0xD770C9B4, - csb_anita: 0x0703F106, - csb_anton: 0xA5C787B6, - csb_ballasog: 0xABEF0004, - csb_bride: 0x82BF7EA1, - csb_burgerdrug: 0x8CDCC057, - csb_car3guy1: 0x04430687, - csb_car3guy2: 0x1383A508, - csb_chef: 0xA347CA8A, - csb_chef2: 0xAE5BE23A, - csb_chin_goon: 0xA8C22996, - csb_cletus: 0xCAE9E5D5, - csb_cop: 0x9AB35F63, - csb_customer: 0xA44F6F8B, - csb_denise_friend: 0xB58D2529, - csb_fos_rep: 0x1BCC157B, - csb_g: 0xA28E71D7, - csb_groom: 0x7AAB19D2, - csb_grove_str_dlr: 0xE8594E22, - csb_hao: 0xEC9E8F1C, - csb_hugh: 0x6F139B54, - csb_imran: 0xE3420BDB, - csb_jackhowitzer: 0x44BC7BB1, - csb_janitor: 0xC2005A40, - csb_maude: 0xBCC475CB, - csb_money: 0x989DFD9A, - csb_mp_agent14: 0x6DBBFC8B, - csb_mweather: 0x613E626C, - csb_ortega: 0xC0DB04CF, - csb_oscar: 0xF41F399B, - csb_paige: 0x5B1FA0C3, - csb_popov: 0x617D89E2, - csb_porndudes: 0x2F4AFE35, - csb_prologuedriver: 0xF00B49DB, - csb_prolsec: 0x7FA2F024, - csb_ramp_gang: 0xC2800DBE, - csb_ramp_hic: 0x858C94B8, - csb_ramp_hipster: 0x21F58BB4, - csb_ramp_marine: 0x616C97B9, - csb_ramp_mex: 0xF64ED7D0, - csb_rashcosvki: 0x188099A9, - csb_reporter: 0x2E420A24, - csb_roccopelosi: 0xAA64168C, - csb_screen_writer: 0x8BE12CEC, - csb_stripper_01: 0xAEEA76B5, - csb_stripper_02: 0x81441B71, - csb_tonya: 0x6343DD19, - csb_trafficwarden: 0xDE2937F3, - csb_undercover: 0xEF785A6A, - csb_vagspeak: 0x48FF4CA9, - g_f_importexport_01: 0x84A1B11A, - g_f_y_ballas_01: 0x158C439C, - g_f_y_families_01: 0x4E0CE5D3, - g_f_y_lost_01: 0xFD5537DE, - g_f_y_vagos_01: 0x5AA42C21, - g_m_importexport_01: 0xBCA2CCEA, - g_m_m_armboss_01: 0xF1E823A2, - g_m_m_armgoon_01: 0xFDA94268, - g_m_m_armlieut_01: 0xE7714013, - g_m_m_chemwork_01: 0xF6157D8F, - g_m_m_chiboss_01: 0xB9DD0300, - g_m_m_chicold_01: 0x106D9A99, - g_m_m_chigoon_01: 0x7E4F763F, - g_m_m_chigoon_02: 0xFF71F826, - g_m_m_korboss_01: 0x352A026F, - g_m_m_mexboss_01: 0x5761F4AD, - g_m_m_mexboss_02: 0x4914D813, - g_m_y_armgoon_02: 0xC54E878A, - g_m_y_azteca_01: 0x68709618, - g_m_y_ballaeast_01: 0xF42EE883, - g_m_y_ballaorig_01: 0x231AF63F, - g_m_y_ballasout_01: 0x23B88069, - g_m_y_famca_01: 0xE83B93B7, - g_m_y_famdnf_01: 0xDB729238, - g_m_y_famfor_01: 0x84302B09, - g_m_y_korean_01: 0x247502A9, - g_m_y_korean_02: 0x8FEDD989, - g_m_y_korlieut_01: 0x7CCBE17A, - g_m_y_lost_01: 0x4F46D607, - g_m_y_lost_02: 0x3D843282, - g_m_y_lost_03: 0x32B11CDC, - g_m_y_mexgang_01: 0xBDDD5546, - g_m_y_mexgoon_01: 0x26EF3426, - g_m_y_mexgoon_02: 0x31A3498E, - g_m_y_mexgoon_03: 0x964D12DC, - g_m_y_pologoon_01: 0x4F3FBA06, - g_m_y_pologoon_02: 0xA2E86156, - g_m_y_salvaboss_01: 0x905CE0CA, - g_m_y_salvagoon_01: 0x278C8CB7, - g_m_y_salvagoon_02: 0x3273A285, - g_m_y_salvagoon_03: 0x03B8C510, - g_m_y_strpunk_01: 0xFD1C49BB, - g_m_y_strpunk_02: 0x0DA1EAC6, - hc_driver: 0x3B474ADF, - hc_gunman: 0x0B881AEE, - hc_hacker: 0x99BB00F8, - ig_abigail: 0x400AEC41, - ig_agent: 0x246AF208, - ig_amandatownley: 0x6D1E15F7, - ig_andreas: 0x47E4EEA0, - ig_ashley: 0x7EF440DB, - ig_avon: 0xFCE270C2, - ig_ballasog: 0xA70B4A92, - ig_bankman: 0x909D9E7F, - ig_barry: 0x2F8845A3, - ig_benny: 0xC4B715D2, - ig_bestmen: 0x5746CD96, - ig_beverly: 0xBDA21E5C, - ig_brad: 0xBDBB4922, - ig_bride: 0x6162EC47, - ig_car3guy1: 0x84F9E937, - ig_car3guy2: 0x75C34ACA, - ig_casey: 0xE0FA2554, - ig_chef: 0x49EADBF6, - ig_chef2: 0x85889AC3, - ig_chengsr: 0xAAE4EA7B, - ig_chrisformage: 0x286E54A7, - ig_clay: 0x6CCFE08A, - ig_claypain: 0x9D0087A8, - ig_cletus: 0xE6631195, - ig_dale: 0x467415E9, - ig_davenorton: 0x15CD4C33, - ig_denise: 0x820B33BD, - ig_devin: 0x7461A0B0, - ig_dom: 0x9C2DB088, - ig_dreyfuss: 0xDA890932, - ig_drfriedlander: 0xCBFC0DF5, - ig_fabien: 0xD090C350, - ig_fbisuit_01: 0x3AE4A33B, - ig_floyd: 0xB1B196B2, - ig_g: 0x841BA933, - ig_groom: 0xFECE8B85, - ig_hao: 0x65978363, - ig_hunter: 0xCE1324DE, - ig_janet: 0x0D6D9C49, - ig_jay_norris: 0x7A32EE74, - ig_jewelass: 0x0F5D26BB, - ig_jimmyboston: 0xEDA0082D, - ig_jimmydisanto: 0x570462B9, - ig_joeminuteman: 0xBE204C9B, - ig_johnnyklebitz: 0x87CA80AE, - ig_josef: 0xE11A9FB4, - ig_josh: 0x799E9EEE, - ig_karen_daniels: 0xEB51D959, - ig_kerrymcintosh: 0x5B3BD90D, - ig_lamardavis: 0x65B93076, - ig_lazlow: 0xDFE443E5, - ig_lestercrest_2: 0x6E42FD26, - ig_lestercrest: 0x4DA6E849, - ig_lifeinvad_01: 0x5389A93C, - ig_lifeinvad_02: 0x27BD51D4, - ig_magenta: 0xFCDC910A, - ig_malc: 0xF1BCA919, - ig_manuel: 0xFD418E10, - ig_marnie: 0x188232D0, - ig_maryann: 0xA36F9806, - ig_maude: 0x3BE8287E, - ig_michelle: 0xBF9672F4, - ig_milton: 0xCB3059B2, - ig_molly: 0xAF03DDE1, - ig_money: 0x37FACDA6, - ig_mp_agent14: 0xFBF98469, - ig_mrk: 0xEDDCAB6D, - ig_mrs_thornhill: 0x1E04A96B, - ig_mrsphillips: 0x3862EEA8, - ig_natalia: 0xDE17DD3B, - ig_nervousron: 0xBD006AF1, - ig_nigel: 0xC8B7167D, - ig_old_man1a: 0x719D27F4, - ig_old_man2: 0xEF154C47, - ig_omega: 0x60E6A7D8, - ig_oneil: 0x2DC6D3E7, - ig_orleans: 0x61D4C771, - ig_ortega: 0x26A562B7, - ig_paige: 0x154FCF3F, - ig_paper: 0x999B00C6, - ig_patricia: 0xC56E118C, - ig_popov: 0x267630FE, - ig_priest: 0x6437E77D, - ig_prolsec_02: 0x27B3AD75, - ig_ramp_gang: 0xE52E126C, - ig_ramp_hic: 0x45753032, - ig_ramp_hipster: 0xDEEF9F6E, - ig_ramp_mex: 0xE6AC74A4, - ig_rashcosvki: 0x380C4DE6, - ig_roccopelosi: 0xD5BA52FF, - ig_russiandrunk: 0x3D0A5EB1, - ig_screen_writer: 0xFFE63677, - ig_siemonyetarian: 0x4C7B2F05, - ig_solomon: 0x86BDFE26, - ig_stevehains: 0x382121C8, - ig_stretch: 0x36984358, - ig_talina: 0xE793C8E8, - ig_tanisha: 0x0D810489, - ig_taocheng: 0xDC5C5EA5, - ig_taostranslator: 0x7C851464, - ig_tenniscoach: 0xA23B5F57, - ig_terry: 0x67000B94, - ig_tomepsilon: 0xCD777AAA, - ig_tonya: 0xCAC85344, - ig_tracydisanto: 0xDE352A35, - ig_trafficwarden: 0x5719786D, - ig_tylerdix: 0x5265F707, - ig_vagspeak: 0xF9FD068C, - ig_wade: 0x92991B72, - ig_zimbor: 0x0B34D6F5, - mp_f_boatstaff_01: 0x3293B9CE, - mp_f_cardesign_01: 0x242C34A7, - mp_f_chbar_01: 0xC3F6E385, - mp_f_cocaine_01: 0x4B657AF8, - mp_f_counterfeit_01: 0xB788F1F5, - mp_f_deadhooker: 0x73DEA88B, - mp_f_execpa_01: 0x432CA064, - mp_f_execpa_02: 0x5972CCF0, - mp_f_forgery_01: 0x781A3CF8, - mp_f_freemode_01: 0x9C9EFFD8, - mp_f_helistaff_01: 0x19B6FF06, - mp_f_meth_01: 0xD2B27EC1, - mp_f_misty_01: 0xD128FF9D, - mp_f_stripperlite: 0x2970A494, - mp_f_weed_01: 0xB26573A3, - mp_g_m_pros_01: 0x6C9DD7C9, - mp_m_avongoon: 0x9C13CB95, - mp_m_boatstaff_01: 0xC85F0A88, - mp_m_bogdangoon: 0x4D5696F7, - mp_m_claude_01: 0xC0F371B7, - mp_m_cocaine_01: 0x56D38F95, - mp_m_counterfeit_01: 0x9855C974, - mp_m_exarmy_01: 0x45348DBB, - mp_m_execpa_01: 0x3E8417BC, - mp_m_famdd_01: 0x33A464E5, - mp_m_fibsec_01: 0x5CDEF405, - mp_m_forgery_01: 0x613E709B, - mp_m_freemode_01: 0x705E61F2, - mp_m_g_vagfun_01: 0xC4A617BD, - mp_m_marston_01: 0x38430167, - mp_m_meth_01: 0xEDB42F3F, - mp_m_niko_01: 0xEEDACFC9, - mp_m_securoguard_01: 0xDA2C984E, - mp_m_shopkeep_01: 0x18CE57D0, - mp_m_waremech_01: 0xF7A74139, - mp_m_weapexp_01: 0x36EA5B09, - mp_m_weapwork_01: 0x4186506E, - mp_m_weed_01: 0x917ED459, - mp_s_m_armoured_01: 0xCDEF5408, - player_one: 0x9B22DBAF, - player_two: 0x9B810FA2, - player_zero: 0x0D7114C9, - s_f_m_fembarber: 0x163B875B, - s_f_m_maid_01: 0xE093C5C6, - s_f_m_shop_high: 0xAE47E4B0, - s_f_m_sweatshop_01: 0x312B5BC0, - s_f_y_airhostess_01: 0x5D71A46F, - s_f_y_bartender_01: 0x780C01BD, - s_f_y_baywatch_01: 0x4A8E5536, - s_f_y_cop_01: 0x15F8700D, - s_f_y_factory_01: 0x69F46BF3, - s_f_y_hooker_01: 0x028ABF95, - s_f_y_hooker_02: 0x14C3E407, - s_f_y_hooker_03: 0x031640AC, - s_f_y_migrant_01: 0xD55B2BF5, - s_f_y_movprem_01: 0x2300C816, - s_f_y_ranger_01: 0x9FC7F637, - s_f_y_scrubs_01: 0xAB594AB6, - s_f_y_sheriff_01: 0x4161D042, - s_f_y_shop_low: 0xA96E2604, - s_f_y_shop_mid: 0x3EECBA5D, - s_f_y_stripper_01: 0x52580019, - s_f_y_stripper_02: 0x6E0FB794, - s_f_y_stripperlite: 0x5C14EDFA, - s_f_y_sweatshop_01: 0x8502B6B2, - s_m_m_ammucountry: 0x0DE9A30A, - s_m_m_armoured_01: 0x95C76ECD, - s_m_m_armoured_02: 0x63858A4A, - s_m_m_autoshop_01: 0x040EABE3, - s_m_m_autoshop_02: 0xF06B849D, - s_m_m_bouncer_01: 0x9FD4292D, - s_m_m_ccrew_01: 0xC9E5F56B, - s_m_m_chemsec_01: 0x2EFEAFD5, - s_m_m_ciasec_01: 0x625D6958, - s_m_m_cntrybar_01: 0x1A021B83, - s_m_m_dockwork_01: 0x14D7B4E0, - s_m_m_doctor_01: 0xD47303AC, - s_m_m_fiboffice_01: 0xEDBC7546, - s_m_m_fiboffice_02: 0x26F067AD, - s_m_m_fibsec_01: 0x7B8B434B, - s_m_m_gaffer_01: 0xA956BD9E, - s_m_m_gardener_01: 0x49EA5685, - s_m_m_gentransport: 0x1880ED06, - s_m_m_hairdress_01: 0x418DFF92, - s_m_m_highsec_01: 0xF161D212, - s_m_m_highsec_02: 0x2930C1AB, - s_m_m_janitor: 0xA96BD9EC, - s_m_m_lathandy_01: 0x9E80D2CE, - s_m_m_lifeinvad_01: 0xDE0077FD, - s_m_m_linecook: 0xDB9C0997, - s_m_m_lsmetro_01: 0x765AAAE4, - s_m_m_mariachi_01: 0x7EA4FFA6, - s_m_m_marine_01: 0xF2DAA2ED, - s_m_m_marine_02: 0xF0259D83, - s_m_m_migrant_01: 0xED0CE4C6, - s_m_m_movalien_01: 0x64611296, - s_m_m_movprem_01: 0xD85E6D28, - s_m_m_movspace_01: 0xE7B31432, - s_m_m_paramedic_01: 0xB353629E, - s_m_m_pilot_01: 0xE75B4B1C, - s_m_m_pilot_02: 0xF63DE8E1, - s_m_m_postal_01: 0x62599034, - s_m_m_postal_02: 0x7367324F, - s_m_m_prisguard_01: 0x56C96FC6, - s_m_m_scientist_01: 0x4117D39B, - s_m_m_security_01: 0xD768B228, - s_m_m_snowcop_01: 0x1AE8BB58, - s_m_m_strperf_01: 0x795AC7A8, - s_m_m_strpreach_01: 0x1C0077FB, - s_m_m_strvend_01: 0xCE9113A9, - s_m_m_trucker_01: 0x59511A6C, - s_m_m_ups_01: 0x9FC37F22, - s_m_m_ups_02: 0xD0BDE116, - s_m_o_busker_01: 0xAD9EF1BB, - s_m_y_airworker: 0x62018559, - s_m_y_ammucity_01: 0x9E08633D, - s_m_y_armymech_01: 0x62CC28E2, - s_m_y_autopsy_01: 0xB2273D4E, - s_m_y_barman_01: 0xE5A11106, - s_m_y_baywatch_01: 0x0B4A6862, - s_m_y_blackops_01: 0xB3F3EE34, - s_m_y_blackops_02: 0x7A05FA59, - s_m_y_blackops_03: 0x5076A73B, - s_m_y_busboy_01: 0xD8F9CD47, - s_m_y_chef_01: 0x0F977CEB, - s_m_y_clown_01: 0x04498DDE, - s_m_y_construct_01: 0xD7DA9E99, - s_m_y_construct_02: 0xC5FEFADE, - s_m_y_cop_01: 0x5E3DA4A4, - s_m_y_dealer_01: 0xE497BBEF, - s_m_y_devinsec_01: 0x9B557274, - s_m_y_dockwork_01: 0x867639D1, - s_m_y_doorman_01: 0x22911304, - s_m_y_dwservice_01: 0x75D30A91, - s_m_y_dwservice_02: 0xF5908A06, - s_m_y_factory_01: 0x4163A158, - s_m_y_fireman_01: 0xB6B1EDA8, - s_m_y_garbage: 0xEE75A00F, - s_m_y_grip_01: 0x309E7DEA, - s_m_y_hwaycop_01: 0x739B1EF5, - s_m_y_marine_01: 0x65793043, - s_m_y_marine_02: 0x58D696FE, - s_m_y_marine_03: 0x72C0CAD2, - s_m_y_mime: 0x3CDCA742, - s_m_y_pestcont_01: 0x48114518, - s_m_y_pilot_01: 0xAB300C07, - s_m_y_prismuscl_01: 0x5F2113A1, - s_m_y_prisoner_01: 0xB1BB9B59, - s_m_y_ranger_01: 0xEF7135AE, - s_m_y_robber_01: 0xC05E1399, - s_m_y_sheriff_01: 0xB144F9B9, - s_m_y_shop_mask: 0x6E122C06, - s_m_y_strvend_01: 0x927F2323, - s_m_y_swat_01: 0x8D8F1B10, - s_m_y_uscg_01: 0xCA0050E9, - s_m_y_valet_01: 0x3B96F23E, - s_m_y_waiter_01: 0xAD4C724C, - s_m_y_winclean_01: 0x550D8D9D, - s_m_y_xmech_01: 0x441405EC, - s_m_y_xmech_02_mp: 0x69147A0D, - s_m_y_xmech_02: 0xBE20FA04, - u_f_m_corpse_01: 0x2E140314, - u_f_m_drowned_01: 0xD7F37609, - u_f_m_miranda: 0x414FA27B, - u_f_m_promourn_01: 0xA20899E7, - u_f_o_moviestar: 0x35578634, - u_f_o_prolhost_01: 0xC512DD23, - u_f_y_bikerchic: 0xFA389D4F, - u_f_y_comjane: 0xB6AA85CE, - u_f_y_corpse_01: 0x9C70109D, - u_f_y_corpse_02: 0x0D9C72F8, - u_f_y_hotposh_01: 0x969B6DFE, - u_f_y_jewelass_01: 0xF0D4BE2E, - u_f_y_mistress: 0x5DCA2528, - u_f_y_poppymich: 0x23E9A09E, - u_f_y_princess: 0xD2E3A284, - u_f_y_spyactress: 0x5B81D86C, - u_m_m_aldinapoli: 0xF0EC56E2, - u_m_m_bankman: 0xC306D6F5, - u_m_m_bikehire_01: 0x76474545, - u_m_m_doa_01: 0x621E6BFD, - u_m_m_edtoh: 0x2A797197, - u_m_m_fibarchitect: 0x342333D3, - u_m_m_filmdirector: 0x2B6E1BB6, - u_m_m_glenstank_01: 0x45BB1666, - u_m_m_griff_01: 0xC454BCBB, - u_m_m_jesus_01: 0xCE2CB751, - u_m_m_jewelsec_01: 0xACCCBDB6, - u_m_m_jewelthief: 0xE6CC3CDC, - u_m_m_markfost: 0x1C95CB0B, - u_m_m_partytarget: 0x81F74DE7, - u_m_m_prolsec_01: 0x709220C7, - u_m_m_promourn_01: 0xCE96030B, - u_m_m_rivalpap: 0x60D5D6DA, - u_m_m_spyactor: 0xAC0EA5D8, - u_m_m_streetart_01: 0x6C19E962, - u_m_m_willyfist: 0x90769A8F, - u_m_o_filmnoir: 0x2BACC2DB, - u_m_o_finguru_01: 0x46E39E63, - u_m_o_taphillbilly: 0x9A1E5E52, - u_m_o_tramp_01: 0x6A8F1F9B, - u_m_y_abner: 0xF0AC2626, - u_m_y_antonb: 0xCF623A2C, - u_m_y_babyd: 0xDA116E7E, - u_m_y_baygor: 0x5244247D, - u_m_y_burgerdrug_01: 0x8B7D3766, - u_m_y_chip: 0x24604B2B, - u_m_y_corpse_01: 0x94C2A03F, - u_m_y_cyclist_01: 0x2D0EFCEB, - u_m_y_fibmugger_01: 0x85B9C668, - u_m_y_guido_01: 0xC6B49A2F, - u_m_y_gunvend_01: 0xB3229752, - u_m_y_hippie_01: 0xF041880B, - u_m_y_imporage: 0x348065F5, - u_m_y_juggernaut_01: 0x90EF5134, - u_m_y_justin: 0x7DC3908F, - u_m_y_mani: 0xC8BB1E52, - u_m_y_militarybum: 0x4705974A, - u_m_y_paparazzi: 0x5048B328, - u_m_y_party_01: 0x36E70600, - u_m_y_pogo_01: 0xDC59940D, - u_m_y_prisoner_01: 0x7B9B4BC0, - u_m_y_proldriver_01: 0x855E36A3, - u_m_y_rsranger_01: 0x3C438CD2, - u_m_y_sbike: 0x6AF4185D, - u_m_y_staggrm_01: 0x9194CE03, - u_m_y_tattoo_01: 0x94AE2B8C, - u_m_y_zombie_01: 0xAC4B4506, - } - var CreatedPeds: Array = []; +var PedHashes = { + a_c_boar: 0xCE5FF074, + a_c_cat_01: 0x573201B8, + a_c_chickenhawk: 0xAAB71F62, + a_c_chimp: 0xA8683715, + a_c_chop: 0x14EC17EA, + a_c_cormorant: 0x56E29962, + a_c_cow: 0xFCFA9E1E, + a_c_coyote: 0x644AC75E, + a_c_crow: 0x18012A9F, + a_c_deer: 0xD86B5A95, + a_c_dolphin: 0x8BBAB455, + a_c_fish: 0x2FD800B7, + a_c_hen: 0x6AF51FAF, + a_c_humpback: 0x471BE4B2, + a_c_husky: 0x4E8F95A2, + a_c_killerwhale: 0x8D8AC8B9, + a_c_mtlion: 0x1250D7BA, + a_c_pig: 0xB11BAB56, + a_c_pigeon: 0x06A20728, + a_c_poodle: 0x431D501C, + a_c_pug: 0x6D362854, + a_c_rabbit_01: 0xDFB55C81, + a_c_rat: 0xC3B52966, + a_c_retriever: 0x349F33E1, + a_c_rhesus: 0xC2D06F53, + a_c_rottweiler: 0x9563221D, + a_c_seagull: 0xD3939DFD, + a_c_sharkhammer: 0x3C831724, + a_c_sharktiger: 0x06C3F072, + a_c_shepherd: 0x431FC24C, + a_c_stingray: 0xA148614D, + a_c_westy: 0xAD7844BB, + a_f_m_beach_01: 0x303638A7, + a_f_m_bevhills_01: 0xBE086EFD, + a_f_m_bevhills_02: 0xA039335F, + a_f_m_bodybuild_01: 0x3BD99114, + a_f_m_business_02: 0x1FC37DBC, + a_f_m_downtown_01: 0x654AD86E, + a_f_m_eastsa_01: 0x9D3DCB7A, + a_f_m_eastsa_02: 0x63C8D891, + a_f_m_fatbla_01: 0xFAB48BCB, + a_f_m_fatcult_01: 0xB5CF80E4, + a_f_m_fatwhite_01: 0x38BAD33B, + a_f_m_ktown_01: 0x52C824DE, + a_f_m_ktown_02: 0x41018151, + a_f_m_prolhost_01: 0x169BD1E1, + a_f_m_salton_01: 0xDE0E0969, + a_f_m_skidrow_01: 0xB097523B, + a_f_m_soucent_01: 0x745855A1, + a_f_m_soucent_02: 0xF322D338, + a_f_m_soucentmc_01: 0xCDE955D2, + a_f_m_tourist_01: 0x505603B9, + a_f_m_tramp_01: 0x48F96F5B, + a_f_m_trampbeac_01: 0x8CA0C266, + a_f_o_genstreet_01: 0x61C81C85, + a_f_o_indian_01: 0xBAD7BB80, + a_f_o_ktown_01: 0x47CF5E96, + a_f_o_salton_01: 0xCCFF7D8A, + a_f_o_soucent_01: 0x3DFA1830, + a_f_o_soucent_02: 0xA56DE716, + a_f_y_beach_01: 0xC79F6928, + a_f_y_bevhills_01: 0x445AC854, + a_f_y_bevhills_02: 0x5C2CF7F8, + a_f_y_bevhills_03: 0x20C8012F, + a_f_y_bevhills_04: 0x36DF2D5D, + a_f_y_business_01: 0x2799EFD8, + a_f_y_business_02: 0x31430342, + a_f_y_business_03: 0xAE86FDB4, + a_f_y_business_04: 0xB7C61032, + a_f_y_eastsa_01: 0xF5B0079D, + a_f_y_eastsa_02: 0x0438A4AE, + a_f_y_eastsa_03: 0x51C03FA4, + a_f_y_epsilon_01: 0x689C2A80, + a_f_y_femaleagent: 0x50610C43, + a_f_y_fitness_01: 0x457C64FB, + a_f_y_fitness_02: 0x13C4818C, + a_f_y_genhot_01: 0x2F4AEC3E, + a_f_y_golfer_01: 0x7DD8FB58, + a_f_y_hiker_01: 0x30830813, + a_f_y_hippie_01: 0x1475B827, + a_f_y_hipster_01: 0x8247D331, + a_f_y_hipster_02: 0x97F5FE8D, + a_f_y_hipster_03: 0xA5BA9A16, + a_f_y_hipster_04: 0x199881DC, + a_f_y_indian_01: 0x092D9CC1, + a_f_y_juggalo_01: 0xDB134533, + a_f_y_runner_01: 0xC7496729, + a_f_y_rurmeth_01: 0x3F789426, + a_f_y_scdressy_01: 0xDB5EC400, + a_f_y_skater_01: 0x695FE666, + a_f_y_soucent_01: 0x2C641D7A, + a_f_y_soucent_02: 0x5A8EF9CF, + a_f_y_soucent_03: 0x87B25415, + a_f_y_tennis_01: 0x550C79C6, + a_f_y_topless_01: 0x9CF26183, + a_f_y_tourist_01: 0x563B8570, + a_f_y_tourist_02: 0x9123FB40, + a_f_y_vinewood_01: 0x19F41F65, + a_f_y_vinewood_02: 0xDAB6A0EB, + a_f_y_vinewood_03: 0x379DDAB8, + a_f_y_vinewood_04: 0xFAE46146, + a_f_y_yoga_01: 0xC41B062E, + a_m_m_acult_01: 0x5442C66B, + a_m_m_afriamer_01: 0xD172497E, + a_m_m_beach_01: 0x403DB4FD, + a_m_m_beach_02: 0x787FA588, + a_m_m_bevhills_01: 0x54DBEE1F, + a_m_m_bevhills_02: 0x3FB5C3D3, + a_m_m_business_01: 0x7E6A64B7, + a_m_m_eastsa_01: 0xF9A6F53F, + a_m_m_eastsa_02: 0x07DD91AC, + a_m_m_farmer_01: 0x94562DD7, + a_m_m_fatlatin_01: 0x61D201B3, + a_m_m_genfat_01: 0x06DD569F, + a_m_m_genfat_02: 0x13AEF042, + a_m_m_golfer_01: 0xA9EB0E42, + a_m_m_hasjew_01: 0x6BD9B68C, + a_m_m_hillbilly_01: 0x6C9B2849, + a_m_m_hillbilly_02: 0x7B0E452F, + a_m_m_indian_01: 0xDDCAAA2C, + a_m_m_ktown_01: 0xD15D7E71, + a_m_m_malibu_01: 0x2FDE6EB7, + a_m_m_mexcntry_01: 0xDD817EAD, + a_m_m_mexlabor_01: 0xB25D16B2, + a_m_m_og_boss_01: 0x681BD012, + a_m_m_paparazzi_01: 0xECCA8C15, + a_m_m_polynesian_01: 0xA9D9B69E, + a_m_m_prolhost_01: 0x9712C38F, + a_m_m_rurmeth_01: 0x3BAD4184, + a_m_m_salton_01: 0x4F2E038A, + a_m_m_salton_02: 0x60F4A717, + a_m_m_salton_03: 0xB28C4A45, + a_m_m_salton_04: 0x964511B7, + a_m_m_skater_01: 0xD9D7588C, + a_m_m_skidrow_01: 0x01EEA6BD, + a_m_m_socenlat_01: 0x0B8D69E3, + a_m_m_soucent_01: 0x6857C9B7, + a_m_m_soucent_02: 0x9F6D37E1, + a_m_m_soucent_03: 0x8BD990BA, + a_m_m_soucent_04: 0xC2FBFEFE, + a_m_m_stlat_02: 0xC2A87702, + a_m_m_tennis_01: 0x546A5344, + a_m_m_tourist_01: 0xC89F0184, + a_m_m_tramp_01: 0x1EC93FD0, + a_m_m_trampbeac_01: 0x53B57EB0, + a_m_m_tranvest_01: 0xE0E69974, + a_m_m_tranvest_02: 0xF70EC5C4, + a_m_o_acult_01: 0x55446010, + a_m_o_acult_02: 0x4BA14CCA, + a_m_o_beach_01: 0x8427D398, + a_m_o_genstreet_01: 0xAD54E7A8, + a_m_o_ktown_01: 0x1536D95A, + a_m_o_salton_01: 0x20208E4D, + a_m_o_soucent_01: 0x2AD8921B, + a_m_o_soucent_02: 0x4086BD77, + a_m_o_soucent_03: 0x0E32D8D0, + a_m_o_tramp_01: 0x174D4245, + a_m_y_acult_01: 0xB564882B, + a_m_y_acult_02: 0x80E59F2E, + a_m_y_beach_01: 0xD1FEB884, + a_m_y_beach_02: 0x23C7DC11, + a_m_y_beach_03: 0xE7A963D9, + a_m_y_beachvesp_01: 0x7E0961B8, + a_m_y_beachvesp_02: 0xCA56FA52, + a_m_y_bevhills_01: 0x76284640, + a_m_y_bevhills_02: 0x668BA707, + a_m_y_breakdance_01: 0x379F9596, + a_m_y_busicas_01: 0x9AD32FE9, + a_m_y_business_01: 0xC99F21C4, + a_m_y_business_02: 0xB3B3F5E6, + a_m_y_business_03: 0xA1435105, + a_m_y_cyclist_01: 0xFDC653C7, + a_m_y_dhill_01: 0xFF3E88AB, + a_m_y_downtown_01: 0x2DADF4AA, + a_m_y_eastsa_01: 0xA4471173, + a_m_y_eastsa_02: 0x168775F6, + a_m_y_epsilon_01: 0x77D41A3E, + a_m_y_epsilon_02: 0xAA82FF9B, + a_m_y_gay_01: 0xD1CCE036, + a_m_y_gay_02: 0xA5720781, + a_m_y_genstreet_01: 0x9877EF71, + a_m_y_genstreet_02: 0x3521A8D2, + a_m_y_golfer_01: 0xD71FE131, + a_m_y_hasjew_01: 0xE16D8F01, + a_m_y_hiker_01: 0x50F73C0C, + a_m_y_hippy_01: 0x7D03E617, + a_m_y_hipster_01: 0x2307A353, + a_m_y_hipster_02: 0x14D506EE, + a_m_y_hipster_03: 0x4E4179C6, + a_m_y_indian_01: 0x2A22FBCE, + a_m_y_jetski_01: 0x2DB7EEF3, + a_m_y_juggalo_01: 0x91CA3E2C, + a_m_y_ktown_01: 0x1AF6542C, + a_m_y_ktown_02: 0x297FF13F, + a_m_y_latino_01: 0x132C1A8E, + a_m_y_methhead_01: 0x696BE0A9, + a_m_y_mexthug_01: 0x3053E555, + a_m_y_motox_01: 0x64FDEA7D, + a_m_y_motox_02: 0x77AC8FDA, + a_m_y_musclbeac_01: 0x4B652906, + a_m_y_musclbeac_02: 0xC923247C, + a_m_y_polynesian_01: 0x8384FC9F, + a_m_y_roadcyc_01: 0xF561A4C6, + a_m_y_runner_01: 0x25305EEE, + a_m_y_runner_02: 0x843D9D0F, + a_m_y_salton_01: 0xD7606C30, + a_m_y_skater_01: 0xC1C46677, + a_m_y_skater_02: 0xAFFAC2E4, + a_m_y_soucent_01: 0xE716BDCB, + a_m_y_soucent_02: 0xACA3C8CA, + a_m_y_soucent_03: 0xC3F0F764, + a_m_y_soucent_04: 0x8A3703F1, + a_m_y_stbla_01: 0xCF92ADE9, + a_m_y_stbla_02: 0x98C7404F, + a_m_y_stlat_01: 0x8674D5FC, + a_m_y_stwhi_01: 0x2418C430, + a_m_y_stwhi_02: 0x36C6E98C, + a_m_y_sunbathe_01: 0xB7292F0C, + a_m_y_surfer_01: 0xEAC2C7EE, + a_m_y_vindouche_01: 0xC19377E7, + a_m_y_vinewood_01: 0x4B64199D, + a_m_y_vinewood_02: 0x5D15BD00, + a_m_y_vinewood_03: 0x1FDF4294, + a_m_y_vinewood_04: 0x31C9E669, + a_m_y_yoga_01: 0xAB0A7155, + cs_amandatownley: 0x95EF18E3, + cs_andreas: 0xE7565327, + cs_ashley: 0x26C3D079, + cs_bankman: 0x9760192E, + cs_barry: 0x69591CF7, + cs_beverly: 0xB46EC356, + cs_brad: 0xEFE5AFE6, + cs_bradcadaver: 0x7228AF60, + cs_carbuyer: 0x8CCE790F, + cs_casey: 0xEA969C40, + cs_chengsr: 0x30DB9D7B, + cs_chrisformage: 0xC1F380E6, + cs_clay: 0xDBCB9834, + cs_dale: 0x0CE81655, + cs_davenorton: 0x8587248C, + cs_debra: 0xECD04FE9, + cs_denise: 0x6F802738, + cs_devin: 0x2F016D02, + cs_dom: 0x4772AF42, + cs_dreyfuss: 0x3C60A153, + cs_drfriedlander: 0xA3A35C2F, + cs_fabien: 0x47035EC1, + cs_fbisuit_01: 0x585C0B52, + cs_floyd: 0x062547E7, + cs_guadalope: 0x0F9513F1, + cs_gurk: 0xC314F727, + cs_hunter: 0x5B44892C, + cs_janet: 0x3034F9E2, + cs_jewelass: 0x4440A804, + cs_jimmyboston: 0x039677BD, + cs_jimmydisanto: 0xB8CC92B4, + cs_joeminuteman: 0xF09D5E29, + cs_johnnyklebitz: 0xFA8AB881, + cs_josef: 0x459762CA, + cs_josh: 0x450EEF9D, + cs_karen_daniels: 0x4BAF381C, + cs_lamardavis: 0x45463A0D, + cs_lazlow: 0x38951A1B, + cs_lestercrest: 0xB594F5C3, + cs_lifeinvad_01: 0x72551375, + cs_magenta: 0x5816C61A, + cs_manuel: 0xFBB374CA, + cs_marnie: 0x574DE134, + cs_martinmadrazo: 0x43595670, + cs_maryann: 0x0998C7AD, + cs_michelle: 0x70AEB9C8, + cs_milton: 0xB76A330F, + cs_molly: 0x45918E44, + cs_movpremf_01: 0x4BBA84D9, + cs_movpremmale: 0x8D67EE7D, + cs_mrk: 0xC3CC9A75, + cs_mrs_thornhill: 0x4F921E6E, + cs_mrsphillips: 0xCBFDA3CF, + cs_natalia: 0x4EFEB1F0, + cs_nervousron: 0x7896DA94, + cs_nigel: 0xE1479C0B, + cs_old_man1a: 0x1EEC7BDC, + cs_old_man2: 0x98F9E770, + cs_omega: 0x8B70B405, + cs_orleans: 0xAD340F5A, + cs_paper: 0x6B38B8F8, + cs_patricia: 0xDF8B1301, + cs_priest: 0x4D6DE57E, + cs_prolsec_02: 0x1E9314A2, + cs_russiandrunk: 0x46521A32, + cs_siemonyetarian: 0xC0937202, + cs_solomon: 0xF6D1E04E, + cs_stevehains: 0xA4E0A1FE, + cs_stretch: 0x893D6805, + cs_tanisha: 0x42FE5370, + cs_taocheng: 0x8864083D, + cs_taostranslator: 0x53536529, + cs_tenniscoach: 0x5C26040A, + cs_terry: 0x3A5201C5, + cs_tom: 0x69E8ABC3, + cs_tomepsilon: 0x8C0FD4E2, + cs_tracydisanto: 0x0609B130, + cs_wade: 0xD266D9D6, + cs_zimbor: 0xEAACAAF0, + csb_abigail: 0x89768941, + csb_agent: 0xD770C9B4, + csb_anita: 0x0703F106, + csb_anton: 0xA5C787B6, + csb_ballasog: 0xABEF0004, + csb_bride: 0x82BF7EA1, + csb_burgerdrug: 0x8CDCC057, + csb_car3guy1: 0x04430687, + csb_car3guy2: 0x1383A508, + csb_chef: 0xA347CA8A, + csb_chef2: 0xAE5BE23A, + csb_chin_goon: 0xA8C22996, + csb_cletus: 0xCAE9E5D5, + csb_cop: 0x9AB35F63, + csb_customer: 0xA44F6F8B, + csb_denise_friend: 0xB58D2529, + csb_fos_rep: 0x1BCC157B, + csb_g: 0xA28E71D7, + csb_groom: 0x7AAB19D2, + csb_grove_str_dlr: 0xE8594E22, + csb_hao: 0xEC9E8F1C, + csb_hugh: 0x6F139B54, + csb_imran: 0xE3420BDB, + csb_jackhowitzer: 0x44BC7BB1, + csb_janitor: 0xC2005A40, + csb_maude: 0xBCC475CB, + csb_money: 0x989DFD9A, + csb_mp_agent14: 0x6DBBFC8B, + csb_mweather: 0x613E626C, + csb_ortega: 0xC0DB04CF, + csb_oscar: 0xF41F399B, + csb_paige: 0x5B1FA0C3, + csb_popov: 0x617D89E2, + csb_porndudes: 0x2F4AFE35, + csb_prologuedriver: 0xF00B49DB, + csb_prolsec: 0x7FA2F024, + csb_ramp_gang: 0xC2800DBE, + csb_ramp_hic: 0x858C94B8, + csb_ramp_hipster: 0x21F58BB4, + csb_ramp_marine: 0x616C97B9, + csb_ramp_mex: 0xF64ED7D0, + csb_rashcosvki: 0x188099A9, + csb_reporter: 0x2E420A24, + csb_roccopelosi: 0xAA64168C, + csb_screen_writer: 0x8BE12CEC, + csb_stripper_01: 0xAEEA76B5, + csb_stripper_02: 0x81441B71, + csb_tonya: 0x6343DD19, + csb_trafficwarden: 0xDE2937F3, + csb_undercover: 0xEF785A6A, + csb_vagspeak: 0x48FF4CA9, + g_f_importexport_01: 0x84A1B11A, + g_f_y_ballas_01: 0x158C439C, + g_f_y_families_01: 0x4E0CE5D3, + g_f_y_lost_01: 0xFD5537DE, + g_f_y_vagos_01: 0x5AA42C21, + g_m_importexport_01: 0xBCA2CCEA, + g_m_m_armboss_01: 0xF1E823A2, + g_m_m_armgoon_01: 0xFDA94268, + g_m_m_armlieut_01: 0xE7714013, + g_m_m_chemwork_01: 0xF6157D8F, + g_m_m_chiboss_01: 0xB9DD0300, + g_m_m_chicold_01: 0x106D9A99, + g_m_m_chigoon_01: 0x7E4F763F, + g_m_m_chigoon_02: 0xFF71F826, + g_m_m_korboss_01: 0x352A026F, + g_m_m_mexboss_01: 0x5761F4AD, + g_m_m_mexboss_02: 0x4914D813, + g_m_y_armgoon_02: 0xC54E878A, + g_m_y_azteca_01: 0x68709618, + g_m_y_ballaeast_01: 0xF42EE883, + g_m_y_ballaorig_01: 0x231AF63F, + g_m_y_ballasout_01: 0x23B88069, + g_m_y_famca_01: 0xE83B93B7, + g_m_y_famdnf_01: 0xDB729238, + g_m_y_famfor_01: 0x84302B09, + g_m_y_korean_01: 0x247502A9, + g_m_y_korean_02: 0x8FEDD989, + g_m_y_korlieut_01: 0x7CCBE17A, + g_m_y_lost_01: 0x4F46D607, + g_m_y_lost_02: 0x3D843282, + g_m_y_lost_03: 0x32B11CDC, + g_m_y_mexgang_01: 0xBDDD5546, + g_m_y_mexgoon_01: 0x26EF3426, + g_m_y_mexgoon_02: 0x31A3498E, + g_m_y_mexgoon_03: 0x964D12DC, + g_m_y_pologoon_01: 0x4F3FBA06, + g_m_y_pologoon_02: 0xA2E86156, + g_m_y_salvaboss_01: 0x905CE0CA, + g_m_y_salvagoon_01: 0x278C8CB7, + g_m_y_salvagoon_02: 0x3273A285, + g_m_y_salvagoon_03: 0x03B8C510, + g_m_y_strpunk_01: 0xFD1C49BB, + g_m_y_strpunk_02: 0x0DA1EAC6, + hc_driver: 0x3B474ADF, + hc_gunman: 0x0B881AEE, + hc_hacker: 0x99BB00F8, + ig_abigail: 0x400AEC41, + ig_agent: 0x246AF208, + ig_amandatownley: 0x6D1E15F7, + ig_andreas: 0x47E4EEA0, + ig_ashley: 0x7EF440DB, + ig_avon: 0xFCE270C2, + ig_ballasog: 0xA70B4A92, + ig_bankman: 0x909D9E7F, + ig_barry: 0x2F8845A3, + ig_benny: 0xC4B715D2, + ig_bestmen: 0x5746CD96, + ig_beverly: 0xBDA21E5C, + ig_brad: 0xBDBB4922, + ig_bride: 0x6162EC47, + ig_car3guy1: 0x84F9E937, + ig_car3guy2: 0x75C34ACA, + ig_casey: 0xE0FA2554, + ig_chef: 0x49EADBF6, + ig_chef2: 0x85889AC3, + ig_chengsr: 0xAAE4EA7B, + ig_chrisformage: 0x286E54A7, + ig_clay: 0x6CCFE08A, + ig_claypain: 0x9D0087A8, + ig_cletus: 0xE6631195, + ig_dale: 0x467415E9, + ig_davenorton: 0x15CD4C33, + ig_denise: 0x820B33BD, + ig_devin: 0x7461A0B0, + ig_dom: 0x9C2DB088, + ig_dreyfuss: 0xDA890932, + ig_drfriedlander: 0xCBFC0DF5, + ig_fabien: 0xD090C350, + ig_fbisuit_01: 0x3AE4A33B, + ig_floyd: 0xB1B196B2, + ig_g: 0x841BA933, + ig_groom: 0xFECE8B85, + ig_hao: 0x65978363, + ig_hunter: 0xCE1324DE, + ig_janet: 0x0D6D9C49, + ig_jay_norris: 0x7A32EE74, + ig_jewelass: 0x0F5D26BB, + ig_jimmyboston: 0xEDA0082D, + ig_jimmydisanto: 0x570462B9, + ig_joeminuteman: 0xBE204C9B, + ig_johnnyklebitz: 0x87CA80AE, + ig_josef: 0xE11A9FB4, + ig_josh: 0x799E9EEE, + ig_karen_daniels: 0xEB51D959, + ig_kerrymcintosh: 0x5B3BD90D, + ig_lamardavis: 0x65B93076, + ig_lazlow: 0xDFE443E5, + ig_lestercrest_2: 0x6E42FD26, + ig_lestercrest: 0x4DA6E849, + ig_lifeinvad_01: 0x5389A93C, + ig_lifeinvad_02: 0x27BD51D4, + ig_magenta: 0xFCDC910A, + ig_malc: 0xF1BCA919, + ig_manuel: 0xFD418E10, + ig_marnie: 0x188232D0, + ig_maryann: 0xA36F9806, + ig_maude: 0x3BE8287E, + ig_michelle: 0xBF9672F4, + ig_milton: 0xCB3059B2, + ig_molly: 0xAF03DDE1, + ig_money: 0x37FACDA6, + ig_mp_agent14: 0xFBF98469, + ig_mrk: 0xEDDCAB6D, + ig_mrs_thornhill: 0x1E04A96B, + ig_mrsphillips: 0x3862EEA8, + ig_natalia: 0xDE17DD3B, + ig_nervousron: 0xBD006AF1, + ig_nigel: 0xC8B7167D, + ig_old_man1a: 0x719D27F4, + ig_old_man2: 0xEF154C47, + ig_omega: 0x60E6A7D8, + ig_oneil: 0x2DC6D3E7, + ig_orleans: 0x61D4C771, + ig_ortega: 0x26A562B7, + ig_paige: 0x154FCF3F, + ig_paper: 0x999B00C6, + ig_patricia: 0xC56E118C, + ig_popov: 0x267630FE, + ig_priest: 0x6437E77D, + ig_prolsec_02: 0x27B3AD75, + ig_ramp_gang: 0xE52E126C, + ig_ramp_hic: 0x45753032, + ig_ramp_hipster: 0xDEEF9F6E, + ig_ramp_mex: 0xE6AC74A4, + ig_rashcosvki: 0x380C4DE6, + ig_roccopelosi: 0xD5BA52FF, + ig_russiandrunk: 0x3D0A5EB1, + ig_screen_writer: 0xFFE63677, + ig_siemonyetarian: 0x4C7B2F05, + ig_solomon: 0x86BDFE26, + ig_stevehains: 0x382121C8, + ig_stretch: 0x36984358, + ig_talina: 0xE793C8E8, + ig_tanisha: 0x0D810489, + ig_taocheng: 0xDC5C5EA5, + ig_taostranslator: 0x7C851464, + ig_tenniscoach: 0xA23B5F57, + ig_terry: 0x67000B94, + ig_tomepsilon: 0xCD777AAA, + ig_tonya: 0xCAC85344, + ig_tracydisanto: 0xDE352A35, + ig_trafficwarden: 0x5719786D, + ig_tylerdix: 0x5265F707, + ig_vagspeak: 0xF9FD068C, + ig_wade: 0x92991B72, + ig_zimbor: 0x0B34D6F5, + mp_f_boatstaff_01: 0x3293B9CE, + mp_f_cardesign_01: 0x242C34A7, + mp_f_chbar_01: 0xC3F6E385, + mp_f_cocaine_01: 0x4B657AF8, + mp_f_counterfeit_01: 0xB788F1F5, + mp_f_deadhooker: 0x73DEA88B, + mp_f_execpa_01: 0x432CA064, + mp_f_execpa_02: 0x5972CCF0, + mp_f_forgery_01: 0x781A3CF8, + mp_f_freemode_01: 0x9C9EFFD8, + mp_f_helistaff_01: 0x19B6FF06, + mp_f_meth_01: 0xD2B27EC1, + mp_f_misty_01: 0xD128FF9D, + mp_f_stripperlite: 0x2970A494, + mp_f_weed_01: 0xB26573A3, + mp_g_m_pros_01: 0x6C9DD7C9, + mp_m_avongoon: 0x9C13CB95, + mp_m_boatstaff_01: 0xC85F0A88, + mp_m_bogdangoon: 0x4D5696F7, + mp_m_claude_01: 0xC0F371B7, + mp_m_cocaine_01: 0x56D38F95, + mp_m_counterfeit_01: 0x9855C974, + mp_m_exarmy_01: 0x45348DBB, + mp_m_execpa_01: 0x3E8417BC, + mp_m_famdd_01: 0x33A464E5, + mp_m_fibsec_01: 0x5CDEF405, + mp_m_forgery_01: 0x613E709B, + mp_m_freemode_01: 0x705E61F2, + mp_m_g_vagfun_01: 0xC4A617BD, + mp_m_marston_01: 0x38430167, + mp_m_meth_01: 0xEDB42F3F, + mp_m_niko_01: 0xEEDACFC9, + mp_m_securoguard_01: 0xDA2C984E, + mp_m_shopkeep_01: 0x18CE57D0, + mp_m_waremech_01: 0xF7A74139, + mp_m_weapexp_01: 0x36EA5B09, + mp_m_weapwork_01: 0x4186506E, + mp_m_weed_01: 0x917ED459, + mp_s_m_armoured_01: 0xCDEF5408, + player_one: 0x9B22DBAF, + player_two: 0x9B810FA2, + player_zero: 0x0D7114C9, + s_f_m_fembarber: 0x163B875B, + s_f_m_maid_01: 0xE093C5C6, + s_f_m_shop_high: 0xAE47E4B0, + s_f_m_sweatshop_01: 0x312B5BC0, + s_f_y_airhostess_01: 0x5D71A46F, + s_f_y_bartender_01: 0x780C01BD, + s_f_y_baywatch_01: 0x4A8E5536, + s_f_y_cop_01: 0x15F8700D, + s_f_y_factory_01: 0x69F46BF3, + s_f_y_hooker_01: 0x028ABF95, + s_f_y_hooker_02: 0x14C3E407, + s_f_y_hooker_03: 0x031640AC, + s_f_y_migrant_01: 0xD55B2BF5, + s_f_y_movprem_01: 0x2300C816, + s_f_y_ranger_01: 0x9FC7F637, + s_f_y_scrubs_01: 0xAB594AB6, + s_f_y_sheriff_01: 0x4161D042, + s_f_y_shop_low: 0xA96E2604, + s_f_y_shop_mid: 0x3EECBA5D, + s_f_y_stripper_01: 0x52580019, + s_f_y_stripper_02: 0x6E0FB794, + s_f_y_stripperlite: 0x5C14EDFA, + s_f_y_sweatshop_01: 0x8502B6B2, + s_m_m_ammucountry: 0x0DE9A30A, + s_m_m_armoured_01: 0x95C76ECD, + s_m_m_armoured_02: 0x63858A4A, + s_m_m_autoshop_01: 0x040EABE3, + s_m_m_autoshop_02: 0xF06B849D, + s_m_m_bouncer_01: 0x9FD4292D, + s_m_m_ccrew_01: 0xC9E5F56B, + s_m_m_chemsec_01: 0x2EFEAFD5, + s_m_m_ciasec_01: 0x625D6958, + s_m_m_cntrybar_01: 0x1A021B83, + s_m_m_dockwork_01: 0x14D7B4E0, + s_m_m_doctor_01: 0xD47303AC, + s_m_m_fiboffice_01: 0xEDBC7546, + s_m_m_fiboffice_02: 0x26F067AD, + s_m_m_fibsec_01: 0x7B8B434B, + s_m_m_gaffer_01: 0xA956BD9E, + s_m_m_gardener_01: 0x49EA5685, + s_m_m_gentransport: 0x1880ED06, + s_m_m_hairdress_01: 0x418DFF92, + s_m_m_highsec_01: 0xF161D212, + s_m_m_highsec_02: 0x2930C1AB, + s_m_m_janitor: 0xA96BD9EC, + s_m_m_lathandy_01: 0x9E80D2CE, + s_m_m_lifeinvad_01: 0xDE0077FD, + s_m_m_linecook: 0xDB9C0997, + s_m_m_lsmetro_01: 0x765AAAE4, + s_m_m_mariachi_01: 0x7EA4FFA6, + s_m_m_marine_01: 0xF2DAA2ED, + s_m_m_marine_02: 0xF0259D83, + s_m_m_migrant_01: 0xED0CE4C6, + s_m_m_movalien_01: 0x64611296, + s_m_m_movprem_01: 0xD85E6D28, + s_m_m_movspace_01: 0xE7B31432, + s_m_m_paramedic_01: 0xB353629E, + s_m_m_pilot_01: 0xE75B4B1C, + s_m_m_pilot_02: 0xF63DE8E1, + s_m_m_postal_01: 0x62599034, + s_m_m_postal_02: 0x7367324F, + s_m_m_prisguard_01: 0x56C96FC6, + s_m_m_scientist_01: 0x4117D39B, + s_m_m_security_01: 0xD768B228, + s_m_m_snowcop_01: 0x1AE8BB58, + s_m_m_strperf_01: 0x795AC7A8, + s_m_m_strpreach_01: 0x1C0077FB, + s_m_m_strvend_01: 0xCE9113A9, + s_m_m_trucker_01: 0x59511A6C, + s_m_m_ups_01: 0x9FC37F22, + s_m_m_ups_02: 0xD0BDE116, + s_m_o_busker_01: 0xAD9EF1BB, + s_m_y_airworker: 0x62018559, + s_m_y_ammucity_01: 0x9E08633D, + s_m_y_armymech_01: 0x62CC28E2, + s_m_y_autopsy_01: 0xB2273D4E, + s_m_y_barman_01: 0xE5A11106, + s_m_y_baywatch_01: 0x0B4A6862, + s_m_y_blackops_01: 0xB3F3EE34, + s_m_y_blackops_02: 0x7A05FA59, + s_m_y_blackops_03: 0x5076A73B, + s_m_y_busboy_01: 0xD8F9CD47, + s_m_y_chef_01: 0x0F977CEB, + s_m_y_clown_01: 0x04498DDE, + s_m_y_construct_01: 0xD7DA9E99, + s_m_y_construct_02: 0xC5FEFADE, + s_m_y_cop_01: 0x5E3DA4A4, + s_m_y_dealer_01: 0xE497BBEF, + s_m_y_devinsec_01: 0x9B557274, + s_m_y_dockwork_01: 0x867639D1, + s_m_y_doorman_01: 0x22911304, + s_m_y_dwservice_01: 0x75D30A91, + s_m_y_dwservice_02: 0xF5908A06, + s_m_y_factory_01: 0x4163A158, + s_m_y_fireman_01: 0xB6B1EDA8, + s_m_y_garbage: 0xEE75A00F, + s_m_y_grip_01: 0x309E7DEA, + s_m_y_hwaycop_01: 0x739B1EF5, + s_m_y_marine_01: 0x65793043, + s_m_y_marine_02: 0x58D696FE, + s_m_y_marine_03: 0x72C0CAD2, + s_m_y_mime: 0x3CDCA742, + s_m_y_pestcont_01: 0x48114518, + s_m_y_pilot_01: 0xAB300C07, + s_m_y_prismuscl_01: 0x5F2113A1, + s_m_y_prisoner_01: 0xB1BB9B59, + s_m_y_ranger_01: 0xEF7135AE, + s_m_y_robber_01: 0xC05E1399, + s_m_y_sheriff_01: 0xB144F9B9, + s_m_y_shop_mask: 0x6E122C06, + s_m_y_strvend_01: 0x927F2323, + s_m_y_swat_01: 0x8D8F1B10, + s_m_y_uscg_01: 0xCA0050E9, + s_m_y_valet_01: 0x3B96F23E, + s_m_y_waiter_01: 0xAD4C724C, + s_m_y_winclean_01: 0x550D8D9D, + s_m_y_xmech_01: 0x441405EC, + s_m_y_xmech_02_mp: 0x69147A0D, + s_m_y_xmech_02: 0xBE20FA04, + u_f_m_corpse_01: 0x2E140314, + u_f_m_drowned_01: 0xD7F37609, + u_f_m_miranda: 0x414FA27B, + u_f_m_promourn_01: 0xA20899E7, + u_f_o_moviestar: 0x35578634, + u_f_o_prolhost_01: 0xC512DD23, + u_f_y_bikerchic: 0xFA389D4F, + u_f_y_comjane: 0xB6AA85CE, + u_f_y_corpse_01: 0x9C70109D, + u_f_y_corpse_02: 0x0D9C72F8, + u_f_y_hotposh_01: 0x969B6DFE, + u_f_y_jewelass_01: 0xF0D4BE2E, + u_f_y_mistress: 0x5DCA2528, + u_f_y_poppymich: 0x23E9A09E, + u_f_y_princess: 0xD2E3A284, + u_f_y_spyactress: 0x5B81D86C, + u_m_m_aldinapoli: 0xF0EC56E2, + u_m_m_bankman: 0xC306D6F5, + u_m_m_bikehire_01: 0x76474545, + u_m_m_doa_01: 0x621E6BFD, + u_m_m_edtoh: 0x2A797197, + u_m_m_fibarchitect: 0x342333D3, + u_m_m_filmdirector: 0x2B6E1BB6, + u_m_m_glenstank_01: 0x45BB1666, + u_m_m_griff_01: 0xC454BCBB, + u_m_m_jesus_01: 0xCE2CB751, + u_m_m_jewelsec_01: 0xACCCBDB6, + u_m_m_jewelthief: 0xE6CC3CDC, + u_m_m_markfost: 0x1C95CB0B, + u_m_m_partytarget: 0x81F74DE7, + u_m_m_prolsec_01: 0x709220C7, + u_m_m_promourn_01: 0xCE96030B, + u_m_m_rivalpap: 0x60D5D6DA, + u_m_m_spyactor: 0xAC0EA5D8, + u_m_m_streetart_01: 0x6C19E962, + u_m_m_willyfist: 0x90769A8F, + u_m_o_filmnoir: 0x2BACC2DB, + u_m_o_finguru_01: 0x46E39E63, + u_m_o_taphillbilly: 0x9A1E5E52, + u_m_o_tramp_01: 0x6A8F1F9B, + u_m_y_abner: 0xF0AC2626, + u_m_y_antonb: 0xCF623A2C, + u_m_y_babyd: 0xDA116E7E, + u_m_y_baygor: 0x5244247D, + u_m_y_burgerdrug_01: 0x8B7D3766, + u_m_y_chip: 0x24604B2B, + u_m_y_corpse_01: 0x94C2A03F, + u_m_y_cyclist_01: 0x2D0EFCEB, + u_m_y_fibmugger_01: 0x85B9C668, + u_m_y_guido_01: 0xC6B49A2F, + u_m_y_gunvend_01: 0xB3229752, + u_m_y_hippie_01: 0xF041880B, + u_m_y_imporage: 0x348065F5, + u_m_y_juggernaut_01: 0x90EF5134, + u_m_y_justin: 0x7DC3908F, + u_m_y_mani: 0xC8BB1E52, + u_m_y_militarybum: 0x4705974A, + u_m_y_paparazzi: 0x5048B328, + u_m_y_party_01: 0x36E70600, + u_m_y_pogo_01: 0xDC59940D, + u_m_y_prisoner_01: 0x7B9B4BC0, + u_m_y_proldriver_01: 0x855E36A3, + u_m_y_rsranger_01: 0x3C438CD2, + u_m_y_sbike: 0x6AF4185D, + u_m_y_staggrm_01: 0x9194CE03, + u_m_y_tattoo_01: 0x94AE2B8C, + u_m_y_zombie_01: 0xAC4B4506, + hanf_verarbeiter_typ: 0x6C8C08E5, + hanf_verarbeiter_wachmann: 0x7ED5AD78, + hanf_verarbeiter_wachhund: 0x9563221D +}; +var CreatedPeds: Array = []; + +export default function PedCreator() { + mp.events.add("SERVER:CreateStaticPeds", (jsonVector3s, jsonHeadings, jsonCharHashes, jsonDimension) => { var vector3s = JSON.parse(jsonVector3s); var headings = JSON.parse(jsonHeadings); @@ -756,7 +760,7 @@ hash = tmpHash; } - //mp.gui.chat.push(`adding ped ${hash} (${charHashes[i]}`); + mp.gui.chat.push(`adding ped ${hash} (${charHashes[i]}`); let p = mp.peds.new(hash, vector3s[i], headings[i], dimension[i]); p.freezePosition(true); @@ -775,14 +779,19 @@ } }); }); +} - function getPedHashByName(name: string) { - var keys = Object.keys(PedHashes); - var idx = keys.indexOf(name) !== -1; - if (idx) { - return PedHashes[name]; - } - - return -1; +function getPedHashByName(name: string) { + var keys = Object.keys(PedHashes); + var idx = keys.indexOf(name) !== -1; + if (idx) { + return PedHashes[name]; } + + return -1; +} + +export function getCreatedPedByName(name: string): PedMp { + var hash = getPedHashByName(name); + return CreatedPeds.filter(p => p.model === hash)[0]; } \ No newline at end of file diff --git a/ReallifeGamemode.Client/drugs/hanf.ts b/ReallifeGamemode.Client/drugs/hanf.ts new file mode 100644 index 00000000..1fb4cdcb --- /dev/null +++ b/ReallifeGamemode.Client/drugs/hanf.ts @@ -0,0 +1,67 @@ +import { Menu, Point, UIMenuSliderItem, UIMenuItem, Color, UIMenuListItem, ItemsCollection } from "../libs/NativeUI"; +import { createMenuItem } from "../util"; +import moneyformat from "../moneyformat"; +import { getAnimFromId } from "../util/animationSync"; +import { getCreatedPedByName } from "../Ped/PedCreator"; + +export default function hanfSystem(globalData: IGlobalData) { + mp.events.add("SERVER:Hanf_BuySeed", price => { + if (globalData.InMenu || globalData.InChat) { + return; + } + + globalData.InMenu = true; + + var menu = new Menu("Samen kaufen", "Kaufe dir Hanfsamen", new Point(50, 50)); + + var seedsToBuy = 0; + + var countItems = [...Array(50).keys()].map(x => x + 1); + + var soloPriceItem = createMenuItem("Einzelpreis", "Preis pro Samen", item => { + item.SetRightLabel("$" + moneyformat(price)); + }); + menu.AddItem(soloPriceItem); + + var countItem = new UIMenuListItem("Anzahl", "Wähle die Anzahl der Samen aus", new ItemsCollection(countItems), 0); + menu.AddItem(countItem); + + var buyItem = new UIMenuItem("Kaufen", "Kaufe die Samen"); + buyItem.BackColor = new Color(0, 100, 0); + buyItem.HighlightedBackColor = new Color(0, 150, 0); + menu.AddItem(buyItem); + + var completePriceItem = new UIMenuItem("Gesamtpreis", "Preis für alle Samen"); + menu.AddItem(completePriceItem); + + menu.ListChange.on((item, index) => { + if (item === countItem) { + seedsToBuy = Number(countItem.SelectedValue); + completePriceItem.SetRightLabel("$" + moneyformat(seedsToBuy * price)); + } + }); + + menu.ItemSelect.on((item, index) => { + if (item === buyItem) { + mp.events.callRemote("CLIENT:Hanf_BuySeeds", seedsToBuy); + menu.Close(); + } + }); + + menu.MenuClose.on(() => { + globalData.InMenu = false; + }); + + menu.Open(); + }); + + mp.events.add("SERVER:Hanf_PlayManufacturerAnim", animId => { + var anim = getAnimFromId(animId); + var npc = getCreatedPedByName("hanf_verarbeiter_typ"); + npc.taskPlayAnim(anim.dict, anim.name, 1, 0, 1000 * 10, 1, 0, !1, !1, !1); + setTimeout(() => { + npc.stopAnim(anim.name, anim.dict, 3); + npc.stopAnimTask(anim.dict, anim.name, 3); + }, 1000 * 10); + }); +} \ No newline at end of file diff --git a/ReallifeGamemode.Client/index.ts b/ReallifeGamemode.Client/index.ts index 763acf17..512ea377 100644 --- a/ReallifeGamemode.Client/index.ts +++ b/ReallifeGamemode.Client/index.ts @@ -295,6 +295,9 @@ rentCar(globalData); import Carwash from './util/carwash'; Carwash(globalData); +import hanfSystem from './drugs/hanf'; +hanfSystem(globalData); + require('./Gui/policedepartment'); require('./Gui/helptext'); require('./admin/spectate'); diff --git a/ReallifeGamemode.Client/util/animationSync.ts b/ReallifeGamemode.Client/util/animationSync.ts index f786b64a..e0842af2 100644 --- a/ReallifeGamemode.Client/util/animationSync.ts +++ b/ReallifeGamemode.Client/util/animationSync.ts @@ -1,5 +1,42 @@ import { debug } from "util"; +const animationSyncData = +{ + animations: [], + + register: function (name, animDict, animName, duration, loop, flag, endless) { + let id = mp.game.joaat(name); + + if (!this.animations.hasOwnProperty(id)) { + this.animations[id] = + { + id: id, + name: name, + animDict: animDict, + animName: animName, + duration: duration, + loop: loop, + flag: flag, + endless: endless + }; + } else { + mp.game.graphics.notify("Animation Sync Error: ~r~Duplicate Entry"); + } + }, + + getAnimFromId: function (name: string): { dict: string, name: string } { + var anim = this.animations[mp.game.joaat(name)]; + return { + dict: anim.animDict, + name: anim.animName + } + } +}; + +export function getAnimFromId(name: string) { + return animationSyncData.getAnimFromId(name); +} + export default function animationSync() { let blockInput = false; let animationBreakTimer; @@ -12,37 +49,13 @@ export default function animationSync() { animationSyncData.register("getUncuff", "mp_arresting", "b_uncuff", 5500, false, 0, false); animationSyncData.register("hup", "mp_am_hold_up", "handsup_base", -1, true, 50, true); animationSyncData.register("carryBox", "anim@heists@box_carry@", "idle", -1, true, 50, true); + animationSyncData.register("manufacturJoint", "anim@mp_snowball", "pickup_snowball", 1000 * 10, false, 1, false); }); const animationBreakMessage = [ { animName: "Cuffed", msg: "Handschellen gebrochen." } ]; - const animationSyncData = - { - animations: [], - - register: function (name, animDict, animName, duration, loop, flag, endless) { - let id = mp.game.joaat(name); - - if (!this.animations.hasOwnProperty(id)) { - this.animations[id] = - { - id: id, - name: name, - animDict: animDict, - animName: animName, - duration: duration, - loop: loop, - flag: flag, - endless: endless - }; - } else { - mp.game.graphics.notify("Animation Sync Error: ~r~Duplicate Entry"); - } - } - }; - /* mp.events.add("entityStreamIn", (entity) => { if (entity.type === "player" && entity.animationData) { @@ -90,6 +103,7 @@ export default function animationSync() { clearTimeout(animationBreakTimer); animationBreakTimer = null; } + if (string == null) { blockInput = false; return; diff --git a/ReallifeGamemode.Server/BaseScript.cs b/ReallifeGamemode.Server/BaseScript.cs new file mode 100644 index 00000000..969ff10c --- /dev/null +++ b/ReallifeGamemode.Server/BaseScript.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Text; +using GTANetworkAPI; +using Microsoft.Extensions.Logging; +using ReallifeGamemode.Server.Log; + +namespace ReallifeGamemode.Server +{ + public abstract class BaseScript : Script + { + protected readonly ILogger logger; + + public BaseScript() + { + logger = LogManager.GetLogger(this.GetType()); + } + } +} diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs index b77f8649..79274414 100644 --- a/ReallifeGamemode.Server/Events/Key.cs +++ b/ReallifeGamemode.Server/Events/Key.cs @@ -243,6 +243,8 @@ namespace ReallifeGamemode.Server.Events AmmunationPoint nearestAmmunationPoint = PositionManager.AmmunationPoints.Find(s => s.Position.DistanceTo(player.Position) <= 1.5); RentcarPoint nearestRentcarPoint = PositionManager.rentcarPoints.Find(s => s.Position.DistanceTo(player.Position) <= 1.5); JailPoint nearestjailPoint = PositionManager.jailPoints.Find(s => s.Position.DistanceTo(player.Position) <= 1.5); + bool isNearCannabisSeedBuyPoint = HanfManager.IsPlayerNearSeedBuyPoint(player); + bool isNearJointManufacturerPoint = HanfManager.IsPlayerNearJointManufacturer(player); if (user?.FactionId != null) { @@ -761,6 +763,18 @@ namespace ReallifeGamemode.Server.Events return; } } + + if (isNearCannabisSeedBuyPoint) + { + player.TriggerEvent("SERVER:Hanf_BuySeed", HanfManager.SEED_PRICE); + return; + } + + if (isNearJointManufacturerPoint) + { + HanfManager.BuildJointsFromCannabis(player); + return; + } } [RemoteEvent("keyPress:I")] diff --git a/ReallifeGamemode.Server/Inventory/Items/Joint.cs b/ReallifeGamemode.Server/Inventory/Items/Joint.cs index 27bfc0d6..97ffc677 100644 --- a/ReallifeGamemode.Server/Inventory/Items/Joint.cs +++ b/ReallifeGamemode.Server/Inventory/Items/Joint.cs @@ -4,7 +4,8 @@ using System.Text; using GTANetworkAPI; using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Database.Models; -using ReallifeGamemode.Server.Services; +using ReallifeGamemode.Server.Extensions; +using ReallifeGamemode.Server.Util; namespace ReallifeGamemode.Server.Inventory.Items { @@ -22,6 +23,7 @@ namespace ReallifeGamemode.Server.Inventory.Items public override bool Use(Player player, User user, DatabaseContext databaseContext) { + player.ToggleInventory(InventoryToggleOption.HIDE); return true; } } diff --git a/ReallifeGamemode.Server/Main.cs b/ReallifeGamemode.Server/Main.cs index 439d20df..d3be0fe4 100644 --- a/ReallifeGamemode.Server/Main.cs +++ b/ReallifeGamemode.Server/Main.cs @@ -147,6 +147,7 @@ namespace ReallifeGamemode.Server PositionManager.LoadPositionManager(); LoadManager.LoadLoadManager(); Rentcar.Setup(); + HanfManager.Load(); World.WeatherSync.Load(); diff --git a/ReallifeGamemode.Server/Managers/HanfManager.cs b/ReallifeGamemode.Server/Managers/HanfManager.cs new file mode 100644 index 00000000..76b7a3a9 --- /dev/null +++ b/ReallifeGamemode.Server/Managers/HanfManager.cs @@ -0,0 +1,178 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Timers; +using GTANetworkAPI; +using Microsoft.Extensions.Logging; +using ReallifeGamemode.Database.Entities; +using ReallifeGamemode.Database.Models; +using ReallifeGamemode.Server.Extensions; +using ReallifeGamemode.Server.Inventory.Interfaces; +using ReallifeGamemode.Server.Inventory.Items; +using ReallifeGamemode.Server.Services; +using ReallifeGamemode.Server.Util; + +namespace ReallifeGamemode.Server.Managers +{ + public class HanfManager : BaseScript + { + /// + /// Punkte zum Samen kaufen + /// + private readonly static List _seedsBuyPoints = new List(); + + /// + /// Aktueller Samen-Preis + /// + public static int SEED_PRICE = 50; + + /// + /// Wie viele Joints man aus einem Cannabis bekommt + /// + public static int CANNABIS_TO_JOINT_RATIO = 3; + + /// + /// Flag, ob der Verarbeiter aktuell benutzt wird + /// + private static bool _manufacturerCurrentlyUsed = false; + + /// + /// Marihuana -> Joint + /// + private readonly static Vector3 _jointManufacturerPoint = new Vector3(-127.726105, 1921.5142, 197.31104); + + /// + /// Animations-ID des Verarbeitens + /// + private const string _manufacturerAnim = "manufacturJoint"; + + private static Timer _manufacturerDoneTimer = new Timer(TimeSpan.FromSeconds(10).TotalMilliseconds); + + static HanfManager() + { + _manufacturerDoneTimer.Elapsed += ManufacturerDoneTimerCallback; + } + + /// + /// Ladefunktion zum + /// + public static void Load() + { + _seedsBuyPoints.Add(new Vector3(-30.21876, -585.3222, 17.917326)); + _seedsBuyPoints.Add(new Vector3(-680.89386, -634.6783, 25.29923)); + _seedsBuyPoints.Add(new Vector3(-1310.743, -608.9064, 29.382874)); + _seedsBuyPoints.Add(new Vector3(-758.6156, -1595.2686, 6.302392)); + _seedsBuyPoints.Add(new Vector3(-441.0504, 1595.4435, 358.4195)); + + ColShape colShape = null; + + foreach (Vector3 buyPoint in _seedsBuyPoints) + { + colShape = NAPI.ColShape.CreateSphereColShape(buyPoint, 20.0f); + colShape.OnEntityEnterColShape += OnSeedBuyRangeColShapeEnter; + } + } + + private static void OnSeedBuyRangeColShapeEnter(ColShape colShape, Player player) + { + ChatService.SendMessage(player, $"Fremder sagt: Pssst.. Willst paar Samen erwerben?"); + } + + internal static bool IsPlayerNearSeedBuyPoint(Player player) + { + return _seedsBuyPoints.Any(p => player.Position.DistanceTo(p) <= 2.5f); + } + + internal static bool IsPlayerNearJointManufacturer(Player player) + { + return _jointManufacturerPoint.DistanceTo(player.Position) <= 2.5f; + } + + [RemoteEvent("CLIENT:Hanf_BuySeeds")] + public void HanfManagerBuySeeds(Player player, int amount) + { + if (!player.IsLoggedIn()) + { + return; + } + + using var dbContext = new DatabaseContext(); + var user = player.GetUser(dbContext); + + IItem seedItem = InventoryManager.GetItem(); + var newAmount = seedItem.Gewicht * amount; + + if (!InventoryManager.CanPlayerHoldMoreWeight(player, newAmount)) + { + player.TriggerEvent("~r~So viele Samen passen nicht mehr in deine Hosentasche"); + return; + } + + var price = amount * SEED_PRICE; + + if (user.Handmoney < price) + { + player.SendNotification("~r~Du hast nicht genug Geld dafür"); + return; + } + + logger.LogInformation("Player {0} bought {1} cannabis seeds for {2} dollars (price per seed: {3})", player.Name, amount, price, SEED_PRICE); // <-- WICHTIG LOGS + + user.Handmoney -= price; + dbContext.SaveChanges(); + + InventoryManager.AddItemToInventory(player, seedItem.Id, amount); + + player.SendNotification($"Du hast {amount} Hanfsamen gekauft"); + } + + internal static void BuildJointsFromCannabis(Player player) + { + if(player.HasAnimation(_manufacturerAnim) || _manufacturerCurrentlyUsed) + { + return; + } + + using var dbContext = new DatabaseContext(); + var user = player.GetUser(dbContext); + var userItems = InventoryManager.GetUserItems(player, dbContext); + + IItem cannabisItem = InventoryManager.GetItem(); + IItem jointItem = InventoryManager.GetItem(); + + var addWeight = jointItem.Gewicht * CANNABIS_TO_JOINT_RATIO - cannabisItem.Gewicht; + + if (!InventoryManager.CanPlayerHoldMoreWeight(player, addWeight)) + { + player.SendNotification("~r~Für die Verarbeitung hast du nicht genug Platz im Rucksack"); + return; + } + + UserItem userCannabisItem = userItems.Where(i => i.ItemId == cannabisItem.Id).FirstOrDefault(); + if (userCannabisItem == null) + { + player.SendNotification("~r~Du hast kein Cannabis dabei"); + return; + } + + _manufacturerCurrentlyUsed = true; + _manufacturerDoneTimer.Start(); + + player.SyncAnimation(_manufacturerAnim); + + InventoryManager.RemoveUserItem(user, userCannabisItem, 1); + InventoryManager.AddItemToInventory(player, jointItem.Id, CANNABIS_TO_JOINT_RATIO); + + player.SendNotification($"Du hast 1 Cannabis in {CANNABIS_TO_JOINT_RATIO} Joints verarbeitet"); + + NAPI.ClientEvent.TriggerClientEventInRange(player.Position, 100.0f, "SERVER:Hanf_PlayManufacturerAnim", _manufacturerAnim); + } + + private static void ManufacturerDoneTimerCallback(object sender, EventArgs args) + { + _manufacturerDoneTimer.Stop(); + _manufacturerCurrentlyUsed = false; + } + } +} diff --git a/ReallifeGamemode.Server/Managers/InventoryManager.cs b/ReallifeGamemode.Server/Managers/InventoryManager.cs index 4658cd12..a5d04b93 100644 --- a/ReallifeGamemode.Server/Managers/InventoryManager.cs +++ b/ReallifeGamemode.Server/Managers/InventoryManager.cs @@ -75,6 +75,11 @@ namespace ReallifeGamemode.Server.Managers player.SetSharedData("backpackItems", JsonConvert.SerializeObject(backpackItems[player].ToArray())); } + internal static IItem GetItem() where T : IItem + { + return itemList.Where(i => i.GetType() == typeof(T)).First(); + } + [RemoteEvent("CLIENT:getVehicleInventory")] public static void SetVehicleItems(Player player) { @@ -134,6 +139,11 @@ namespace ReallifeGamemode.Server.Managers player.SetSharedData("vehicleItems", JsonConvert.SerializeObject(vehicleItems[player].ToArray())); } + public static bool CanPlayerHoldMoreWeight(Player player, int moreWeight) + { + return GetUserInventoryWeight(player) + moreWeight <= MAX_USER_INVENTORY; + } + public static void LoadItems() { itemList = new List(); @@ -179,12 +189,8 @@ namespace ReallifeGamemode.Server.Managers if (userItem.Amount == 0) { dbContext.Remove(userItem); - dbContext.SaveChanges(); } - Player player = user.Player; - List itemList = GetUserItems(player); - if (itemList == null) return; dbContext.SaveChanges(); } } @@ -216,16 +222,29 @@ namespace ReallifeGamemode.Server.Managers return new DatabaseContext().VehicleItems.ToList().FindAll(i => i.GetVehicle().GetVehicle() == vehicle); } - public static List GetUserItems(Player player) + public static List GetUserItems(Player player, DatabaseContext dbContext = null) { - var user = player.GetUser(); - - using (var context = new DatabaseContext()) + if (dbContext == null) { - return context.UserItems.ToList().FindAll(i => i.UserId == user.Id); + using (dbContext = new DatabaseContext()) + { + return GetUserItemsInternal(player, dbContext); + } + } + else + { + return GetUserItemsInternal(player, dbContext); } } + private static List GetUserItemsInternal(Player player, DatabaseContext dbContext) + { + var user = player.GetUser(dbContext); + + return dbContext.UserItems.ToList().FindAll(i => i.UserId == user.Id); + } + + public static int GetUserInventoryWeight(Player player) { var user = player.GetUser(); diff --git a/ReallifeGamemode.Server/Util/Colors.cs b/ReallifeGamemode.Server/Util/Colors.cs new file mode 100644 index 00000000..13271ad9 --- /dev/null +++ b/ReallifeGamemode.Server/Util/Colors.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Text; +using GTANetworkAPI; + +namespace ReallifeGamemode.Server.Util +{ + public static class Colors + { + public static Color White = new Color(255, 255, 255); + } +} From 3abf2a2d0ef2b4825db043e582739564270a2037 Mon Sep 17 00:00:00 2001 From: hydrant Date: Tue, 25 May 2021 20:10:58 +0200 Subject: [PATCH 72/82] hanf continuation --- ReallifeGamemode.Client/Ped/PedCreator.ts | 2 +- ReallifeGamemode.Client/drugs/hanf.ts | 167 ++ ReallifeGamemode.Client/global.d.ts | 10 +- .../Entities/CannabisPlant.cs | 30 + ...210524202105_AddCannabisPlants.Designer.cs | 2223 +++++++++++++++++ .../20210524202105_AddCannabisPlants.cs | 47 + .../DatabaseContextModelSnapshot.cs | 40 + .../Models/DatabaseContext.cs | 2 + ReallifeGamemode.Server/Events/Connect.cs | 2 + .../Inventory/Items/CannabisSeeds.cs | 20 +- .../Managers/HanfManager.cs | 122 +- .../Managers/InventoryManager.cs | 5 +- ReallifeGamemode.Server/Util/CannabisData.cs | 19 + 13 files changed, 2681 insertions(+), 8 deletions(-) create mode 100644 ReallifeGamemode.Database/Entities/CannabisPlant.cs create mode 100644 ReallifeGamemode.Database/Migrations/20210524202105_AddCannabisPlants.Designer.cs create mode 100644 ReallifeGamemode.Database/Migrations/20210524202105_AddCannabisPlants.cs create mode 100644 ReallifeGamemode.Server/Util/CannabisData.cs diff --git a/ReallifeGamemode.Client/Ped/PedCreator.ts b/ReallifeGamemode.Client/Ped/PedCreator.ts index e2559dbd..98e14dad 100644 --- a/ReallifeGamemode.Client/Ped/PedCreator.ts +++ b/ReallifeGamemode.Client/Ped/PedCreator.ts @@ -760,7 +760,7 @@ export default function PedCreator() { hash = tmpHash; } - mp.gui.chat.push(`adding ped ${hash} (${charHashes[i]}`); + //mp.gui.chat.push(`adding ped ${hash} (${charHashes[i]}`); let p = mp.peds.new(hash, vector3s[i], headings[i], dimension[i]); p.freezePosition(true); diff --git a/ReallifeGamemode.Client/drugs/hanf.ts b/ReallifeGamemode.Client/drugs/hanf.ts index 1fb4cdcb..9876f1b5 100644 --- a/ReallifeGamemode.Client/drugs/hanf.ts +++ b/ReallifeGamemode.Client/drugs/hanf.ts @@ -3,8 +3,24 @@ import { createMenuItem } from "../util"; import moneyformat from "../moneyformat"; import { getAnimFromId } from "../util/animationSync"; import { getCreatedPedByName } from "../Ped/PedCreator"; +import KeyBinder from 'ragemp-better-bindings'; + +const hanfPlantObjects = { + stage1: mp.game.joaat('bkr_prop_weed_bud_pruned_01a'), + stage2: mp.game.joaat('bkr_prop_weed_bud_01b'), + stage3: mp.game.joaat('prop_weed_02'), + stage4: mp.game.joaat('prop_weed_01') +}; + +const minimumPlantDistance = 5; export default function hanfSystem(globalData: IGlobalData) { + + let currentPlantingPreviewObject: ObjectMp = null; + let currentPlantingMarkerPreview: MarkerMp = null; + let currentlyPlanting: boolean = false; + let lastPlantingState = true; + mp.events.add("SERVER:Hanf_BuySeed", price => { if (globalData.InMenu || globalData.InChat) { return; @@ -64,4 +80,155 @@ export default function hanfSystem(globalData: IGlobalData) { npc.stopAnimTask(anim.dict, anim.name, 3); }, 1000 * 10); }); + + mp.events.add("SERVER:Hanf_StartPlanting", _ => { + let player = mp.players.local; + currentPlantingPreviewObject = mp.objects.new(hanfPlantObjects.stage1, player.position, { + alpha: 255 + }); + currentPlantingPreviewObject.notifyStreaming = true; + + currentlyPlanting = true; + }); + + mp.events.add(RageEnums.EventKey.RENDER, _ => { + if (!currentlyPlanting) { + return; + } + + var player = mp.players.local; + + var newPlantState = isAbleToPlant(); + + var markerColor: [number, number, number, number] = [0, 255, 0, 255]; + if (!newPlantState) { + markerColor = [255, 0, 0, 255]; + } + + if (currentPlantingMarkerPreview) { + currentPlantingMarkerPreview.destroy(); + } + + var playerPos = player.position; + var objectPos = new mp.Vector3(playerPos.x, playerPos.y, playerPos.z - 1.0); + + currentPlantingMarkerPreview = mp.markers.new(25, objectPos, 0.7, { + color: markerColor, + visible: true, + rotation: new mp.Vector3(1, 0, 0) + }); + }); + + mp.events.add(RageEnums.EventKey.ENTITY_STREAM_IN, entity => { + if (entity === currentPlantingPreviewObject) { + currentPlantingPreviewObject.attachTo(Number(mp.players.local.handle), 0, 0, 0.2, -0.95, 0, 0, 0, true, false, false, false, 0, true); + } + }); + + function isAbleToPlant() { + var player = mp.players.local; + + if (isNearPlant()) { + return false; + } + + if (!isSurfaceAllowed()) { + return false; + } + + if (currentPlantingPreviewObject) { + var objectPos = getPlantPreviewPosition(); + var realZ = mp.game.gameplay.getGroundZFor3dCoord(objectPos.x, objectPos.y, objectPos.z + 1, 0, false); + if (realZ > objectPos.z + 1) { + return false; + } + } + + if (player.isSwimming() || player.isSwimmingUnderWater() || !player.isOnFoot()) { + return false; + } + + return true; + } + + const RAYCAST_POINT_TO_POINT_NATIVE = "0x377906D8A31E5586"; + const GET_RAYCAST_RESULT_NATIVE = "0x65287525D951F6BE"; + + function isSurfaceAllowed() { + const player = mp.players.local; + var position = player.position; + var raycast = mp.game.invoke(RAYCAST_POINT_TO_POINT_NATIVE, position.x, position.y, position.z + 5, position.x, position.y, position.z - 5, -1, undefined, 0); + mp.gui.chat.push("raycast = " + raycast); + var hit: boolean, coord: Vector3Mp, surfaceNormal: Vector3Mp, materialHash: number, entityHit: EntityMp; + var raycastResult = mp.game.invoke(GET_RAYCAST_RESULT_NATIVE, raycast, hit, coord, surfaceNormal, materialHash, entityHit); + + mp.gui.chat.push("result: " + raycastResult + ", hit = " + hit + ", test = " + materialHash); + + return true; + } + + KeyBinder.bind('e', _ => { + if (!currentlyPlanting || globalData.InChat) { + return; + } + + if (!lastPlantingState) { + mp.game.graphics.notify("~r~Hier kann kein Hanf platziert werden"); + return; + } + + currentlyPlanting = false; + + var player = mp.players.local; + + if (currentPlantingPreviewObject) { + currentPlantingPreviewObject.destroy(); + } + + if (currentPlantingMarkerPreview) { + currentPlantingMarkerPreview.destroy(); + } + + var position = getPlantPreviewPosition(); + var realZ = mp.game.gameplay.getGroundZFor3dCoord(position.x, position.y, position.z + 2, 0, false); + + mp.events.callRemote("CLIENT:Hanf_PlantHanf", position.x, position.z, realZ); + }); + + function getPlantPreviewPosition(): Vector3Mp { + return mp.players.local.getOffsetFromInWorldCoords(0, 0.2, -1); + } + + function isNearPlant(): boolean { + var position = getPlantPreviewPosition(); + var nearPlant = false; + + Object.keys(hanfPlantObjects).forEach(k => { + var hash = hanfPlantObjects[k]; + var obj = mp.game.object.getClosestObjectOfType(position.x, position.y, position.z, minimumPlantDistance, hash, false, false, false); + if (obj && obj != currentPlantingPreviewObject.handle) { + nearPlant = true; + } + }); + + return nearPlant; + } + + let currentHanfData: Array = null; + let hanfDataIdToObjectMap: Map = null; + + mp.events.add("SERVER:Hanf_UpdateHanfData", dataJson => { + var data: Array = >JSON.parse(dataJson) + if (currentHanfData == null) { + currentHanfData = data; + } + + var newPlants = data.filter(d => currentHanfData.filter(x => x.id === d.id).length == 0); + var removedPlants = currentHanfData.filter(d => data.filter(x => x.id === d.id).length == 0); + var existingPlants = data.filter(d => currentHanfData.filter(x => x.id === d.id).length == 1); + + mp.gui.chat.push(`new: ${newPlants.length}, removed: ${removedPlants.length}, existing: ${existingPlants.length}`); + + currentHanfData = data; + }); } \ No newline at end of file diff --git a/ReallifeGamemode.Client/global.d.ts b/ReallifeGamemode.Client/global.d.ts index a3a3e4b2..9a836413 100644 --- a/ReallifeGamemode.Client/global.d.ts +++ b/ReallifeGamemode.Client/global.d.ts @@ -22,7 +22,7 @@ declare type AccountData = { nextPayday: number; stateFaction: boolean; playTime: number; - userWarn: number; + userWarn: number; } declare type JobData = { @@ -97,6 +97,14 @@ declare type RentcarProperty = { Price: number; } +declare type CannabisData = { + id: number; + x: number; + y: number; + z: number; + time: Date; +} + declare type PlayerCharacterData = { Gender: boolean; Father: number; diff --git a/ReallifeGamemode.Database/Entities/CannabisPlant.cs b/ReallifeGamemode.Database/Entities/CannabisPlant.cs new file mode 100644 index 00000000..1697942b --- /dev/null +++ b/ReallifeGamemode.Database/Entities/CannabisPlant.cs @@ -0,0 +1,30 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Text; + +namespace ReallifeGamemode.Database.Entities +{ + public class CannabisPlant + { + [Key] + [DatabaseGenerated(DatabaseGeneratedOption.Identity)] + public long Id { get; set; } + + public DateTime PlantDate { get; set; } + + public float X { get; set; } + + public float Y { get; set; } + + public float Z { get; set; } + + public bool Harvested { get; set; } + + public User PlantedBy { get; set; } + + [ForeignKey(nameof(PlantedBy))] + public int PlantedById { get; set; } + } +} diff --git a/ReallifeGamemode.Database/Migrations/20210524202105_AddCannabisPlants.Designer.cs b/ReallifeGamemode.Database/Migrations/20210524202105_AddCannabisPlants.Designer.cs new file mode 100644 index 00000000..26238f60 --- /dev/null +++ b/ReallifeGamemode.Database/Migrations/20210524202105_AddCannabisPlants.Designer.cs @@ -0,0 +1,2223 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using ReallifeGamemode.Database.Models; + +namespace ReallifeGamemode.Database.Migrations +{ + [DbContext(typeof(DatabaseContext))] + [Migration("20210524202105_AddCannabisPlants")] + partial class AddCannabisPlants + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "3.1.3") + .HasAnnotation("PropertyAccessMode", PropertyAccessMode.PreferFieldDuringConstruction) + .HasAnnotation("Relational:MaxIdentifierLength", 64); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.ATM", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Active") + .HasColumnType("tinyint(1)"); + + b.Property("Balance") + .HasColumnType("int"); + + b.Property("Faulty") + .HasColumnType("tinyint(1)"); + + b.Property("X") + .HasColumnType("float"); + + b.Property("Y") + .HasColumnType("float"); + + b.Property("Z") + .HasColumnType("float"); + + b.HasKey("Id"); + + b.ToTable("ATMs"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Ban", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Applied") + .HasColumnType("int"); + + b.Property("BannedBy") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("Reason") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("UntilDateTime") + .HasColumnType("int"); + + b.Property("UserId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("Bans"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.BusRoute", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Description") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.HasKey("Id"); + + b.ToTable("BusRoutes"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.BusRoutePoint", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("BusRouteId") + .HasColumnType("int"); + + b.Property("Description") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("X") + .HasColumnType("float"); + + b.Property("Y") + .HasColumnType("float"); + + b.Property("Z") + .HasColumnType("float"); + + b.HasKey("Id"); + + b.HasIndex("BusRouteId"); + + b.ToTable("BusRoutesPoints"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.BusinessBankAccount", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Balance") + .HasColumnType("int"); + + b.Property("BusinessId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("BusinessId") + .IsUnique(); + + b.ToTable("BusinessBankAccounts"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.BusinessData", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("BusinessId") + .HasColumnType("int"); + + b.Property("Price") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("BusinessData"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.CannabisPlant", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + b.Property("Harvested") + .HasColumnType("tinyint(1)"); + + b.Property("PlantDate") + .HasColumnType("datetime(6)"); + + b.Property("PlantedById") + .HasColumnType("int"); + + b.Property("X") + .HasColumnType("float"); + + b.Property("Y") + .HasColumnType("float"); + + b.Property("Z") + .HasColumnType("float"); + + b.HasKey("Id"); + + b.HasIndex("PlantedById"); + + b.ToTable("CannabisPlants"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Character", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Ageing") + .HasColumnType("tinyint unsigned"); + + b.Property("AgeingOpacity") + .HasColumnType("float"); + + b.Property("BeardColor") + .HasColumnType("tinyint unsigned"); + + b.Property("Blemishes") + .HasColumnType("tinyint unsigned"); + + b.Property("BlemishesOpacity") + .HasColumnType("float"); + + b.Property("Blush") + .HasColumnType("tinyint unsigned"); + + b.Property("BlushColor") + .HasColumnType("tinyint unsigned"); + + b.Property("BlushOpacity") + .HasColumnType("float"); + + b.Property("BrowDepth") + .HasColumnType("float"); + + b.Property("BrowHeight") + .HasColumnType("float"); + + b.Property("CheekDepth") + .HasColumnType("float"); + + b.Property("CheekboneHeight") + .HasColumnType("float"); + + b.Property("CheekboneWidth") + .HasColumnType("float"); + + b.Property("ChestHair") + .HasColumnType("tinyint unsigned"); + + b.Property("ChestHairColor") + .HasColumnType("tinyint unsigned"); + + b.Property("ChestHairOpacity") + .HasColumnType("float"); + + b.Property("ChinDepth") + .HasColumnType("float"); + + b.Property("ChinHeight") + .HasColumnType("float"); + + b.Property("ChinIndent") + .HasColumnType("float"); + + b.Property("ChinWidth") + .HasColumnType("float"); + + b.Property("Complexion") + .HasColumnType("tinyint unsigned"); + + b.Property("ComplexionOpacity") + .HasColumnType("float"); + + b.Property("EyeColor") + .HasColumnType("tinyint unsigned"); + + b.Property("EyeSize") + .HasColumnType("float"); + + b.Property("EyebrowColor") + .HasColumnType("tinyint unsigned"); + + b.Property("Eyebrows") + .HasColumnType("tinyint unsigned"); + + b.Property("EyebrowsOpacity") + .HasColumnType("float"); + + b.Property("FacialHair") + .HasColumnType("tinyint unsigned"); + + b.Property("FacialHairOpacity") + .HasColumnType("float"); + + b.Property("Father") + .HasColumnType("tinyint unsigned"); + + b.Property("Freckles") + .HasColumnType("tinyint unsigned"); + + b.Property("FrecklesOpacity") + .HasColumnType("float"); + + b.Property("Gender") + .HasColumnType("tinyint(1)"); + + b.Property("Hair") + .HasColumnType("tinyint unsigned"); + + b.Property("HairColor") + .HasColumnType("tinyint unsigned"); + + b.Property("HairHighlightColor") + .HasColumnType("tinyint unsigned"); + + b.Property("JawShape") + .HasColumnType("float"); + + b.Property("JawWidth") + .HasColumnType("float"); + + b.Property("LipThickness") + .HasColumnType("float"); + + b.Property("Lipstick") + .HasColumnType("tinyint unsigned"); + + b.Property("LipstickColor") + .HasColumnType("tinyint unsigned"); + + b.Property("LipstickOpacity") + .HasColumnType("float"); + + b.Property("Makeup") + .HasColumnType("tinyint unsigned"); + + b.Property("MakeupOpacity") + .HasColumnType("float"); + + b.Property("Mother") + .HasColumnType("tinyint unsigned"); + + b.Property("NeckWidth") + .HasColumnType("float"); + + b.Property("NoseBottomHeight") + .HasColumnType("float"); + + b.Property("NoseBridgeDepth") + .HasColumnType("float"); + + b.Property("NoseBroken") + .HasColumnType("float"); + + b.Property("NoseTipHeight") + .HasColumnType("float"); + + b.Property("NoseTipLength") + .HasColumnType("float"); + + b.Property("NoseWidth") + .HasColumnType("float"); + + b.Property("Similarity") + .HasColumnType("float"); + + b.Property("SkinSimilarity") + .HasColumnType("float"); + + b.Property("SunDamage") + .HasColumnType("tinyint unsigned"); + + b.Property("SunDamageOpacity") + .HasColumnType("float"); + + b.Property("UserId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("Characters"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.CharacterCloth", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("ClothId") + .HasColumnType("int"); + + b.Property("Duty") + .HasColumnType("tinyint(1)"); + + b.Property("SlotId") + .HasColumnType("int"); + + b.Property("SlotType") + .HasColumnType("tinyint unsigned"); + + b.Property("Texture") + .HasColumnType("int"); + + b.Property("UserId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("CharacterClothes"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.ClothCombination", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Gender") + .HasColumnType("tinyint(1)"); + + b.Property("Top") + .HasColumnType("int"); + + b.Property("Torso") + .HasColumnType("int"); + + b.Property("Undershirt") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("ClothCombinations"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Door", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("AlwaysOpen") + .HasColumnType("tinyint(1)"); + + b.Property("Category") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("FactionId") + .HasColumnType("int"); + + b.Property("Locked") + .HasColumnType("tinyint(1)"); + + b.Property("Model") + .HasColumnType("int"); + + b.Property("Name") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("Radius") + .HasColumnType("float"); + + b.Property("X") + .HasColumnType("float"); + + b.Property("Y") + .HasColumnType("float"); + + b.Property("Z") + .HasColumnType("float"); + + b.HasKey("Id"); + + b.HasIndex("FactionId"); + + b.ToTable("Doors"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.DutyCloth", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("ClothId") + .HasColumnType("int"); + + b.Property("FactionId") + .HasColumnType("int"); + + b.Property("Gender") + .HasColumnType("tinyint(1)"); + + b.Property("SlotId") + .HasColumnType("int"); + + b.Property("SlotType") + .HasColumnType("tinyint unsigned"); + + b.HasKey("Id"); + + b.HasIndex("FactionId"); + + b.ToTable("DutyClothes"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Faction", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("BankAccountId") + .HasColumnType("int"); + + b.Property("GangOwned") + .HasColumnType("tinyint(1)"); + + b.Property("Name") + .HasColumnType("varchar(32) CHARACTER SET utf8mb4") + .HasMaxLength(32); + + b.Property("StateOwned") + .HasColumnType("tinyint(1)"); + + b.Property("WeaponDealTime") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("BankAccountId"); + + b.ToTable("Factions"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.FactionBankAccount", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Active") + .HasColumnType("tinyint(1)"); + + b.Property("Balance") + .HasColumnType("int"); + + b.Property("Bic") + .HasColumnType("varchar(12) CHARACTER SET utf8mb4") + .HasMaxLength(12); + + b.Property("Iban") + .HasColumnType("varchar(32) CHARACTER SET utf8mb4") + .HasMaxLength(32); + + b.HasKey("Id"); + + b.ToTable("FactionBankAccounts"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.FactionRank", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("FactionId") + .HasColumnType("int"); + + b.Property("Order") + .HasColumnType("int"); + + b.Property("RankName") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.HasKey("Id"); + + b.HasIndex("FactionId"); + + b.ToTable("FactionRanks"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.FactionWeapon", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Ammount") + .HasColumnType("int"); + + b.Property("FactionId") + .HasColumnType("int"); + + b.Property("Rank") + .HasColumnType("int"); + + b.Property("SlotID") + .HasColumnType("int"); + + b.Property("WeaponModel") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.HasKey("Id"); + + b.HasIndex("FactionId"); + + b.ToTable("FactionWeapons"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.GotoPoint", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Active") + .HasColumnType("tinyint(1)"); + + b.Property("Description") + .HasColumnType("varchar(32) CHARACTER SET utf8mb4") + .HasMaxLength(32); + + b.Property("X") + .HasColumnType("float"); + + b.Property("Y") + .HasColumnType("float"); + + b.Property("Z") + .HasColumnType("float"); + + b.HasKey("Id"); + + b.ToTable("GotoPoints"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Group", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("BankAccountId") + .HasColumnType("int"); + + b.Property("Name") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.HasKey("Id"); + + b.HasIndex("BankAccountId"); + + b.ToTable("Groups"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.GroupBankAccount", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Balance") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("GroupBankAccounts"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.House", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("BankAccountId") + .HasColumnType("int"); + + b.Property("CanRentIn") + .HasColumnType("tinyint(1)"); + + b.Property("LastRentSetTime") + .HasColumnType("datetime(6)"); + + b.Property("OwnerId") + .HasColumnType("int"); + + b.Property("Price") + .HasColumnType("int"); + + b.Property("RentalFee") + .HasColumnType("int"); + + b.Property("Type") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("X") + .HasColumnType("float"); + + b.Property("Y") + .HasColumnType("float"); + + b.Property("Z") + .HasColumnType("float"); + + b.HasKey("Id"); + + b.HasIndex("BankAccountId"); + + b.HasIndex("OwnerId"); + + b.ToTable("Houses"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.HouseBankAccount", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Balance") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("HouseBankAccounts"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.HouseRental", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("HouseId") + .HasColumnType("int"); + + b.Property("UserId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("HouseId"); + + b.HasIndex("UserId"); + + b.ToTable("HouseRentals"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Interior", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("EnterPositionStr") + .HasColumnName("EnterPosition") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("ExitPositionStr") + .HasColumnName("ExitPosition") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("Name") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.HasKey("Id"); + + b.ToTable("Interiors"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Location", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Description") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("Heading") + .HasColumnType("double"); + + b.Property("X") + .HasColumnType("double"); + + b.Property("Y") + .HasColumnType("double"); + + b.Property("Z") + .HasColumnType("double"); + + b.HasKey("Id"); + + b.ToTable("Locations"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Logs.BankAccountTransactionHistory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Fee") + .HasColumnType("int"); + + b.Property("MoneySent") + .HasColumnType("int"); + + b.Property("NewReceiverBalance") + .HasColumnType("int"); + + b.Property("NewSenderBalance") + .HasColumnType("int"); + + b.Property("Origin") + .HasColumnType("varchar(32) CHARACTER SET utf8mb4") + .HasMaxLength(32); + + b.Property("Receiver") + .HasColumnType("varchar(32) CHARACTER SET utf8mb4") + .HasMaxLength(32); + + b.Property("ReceiverBalance") + .HasColumnType("int"); + + b.Property("Sender") + .HasColumnType("varchar(32) CHARACTER SET utf8mb4") + .HasMaxLength(32); + + b.Property("SenderBalance") + .HasColumnType("int"); + + b.Property("Timestamp") + .ValueGeneratedOnAdd() + .HasColumnType("datetime(6)"); + + b.HasKey("Id"); + + b.ToTable("BankAccountTransactionLogs"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Logs.Chat.ChatLogEntry", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + b.Property("Discriminator") + .IsRequired() + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("Text") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("Time") + .ValueGeneratedOnAdd() + .HasColumnType("datetime(6)"); + + b.Property("UserId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("ChatLogs"); + + b.HasDiscriminator("Discriminator").HasValue("ChatLogEntry"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Logs.CommandLogEntry", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + b.Property("Command") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("Time") + .HasColumnType("datetime(6)"); + + b.Property("UserId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("CommandLogs"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Logs.Death", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CauseOfDeath") + .HasColumnType("varchar(64) CHARACTER SET utf8mb4") + .HasMaxLength(64); + + b.Property("KillerHeading") + .HasColumnType("float"); + + b.Property("KillerId") + .HasColumnType("int"); + + b.Property("KillerPositionX") + .HasColumnType("float"); + + b.Property("KillerPositionY") + .HasColumnType("float"); + + b.Property("KillerPositionZ") + .HasColumnType("float"); + + b.Property("Timestamp") + .ValueGeneratedOnAdd() + .HasColumnType("datetime(6)"); + + b.Property("VictimHeading") + .HasColumnType("float"); + + b.Property("VictimId") + .HasColumnType("int"); + + b.Property("VictimPositionX") + .HasColumnType("float"); + + b.Property("VictimPositionY") + .HasColumnType("float"); + + b.Property("VictimPositionZ") + .HasColumnType("float"); + + b.HasKey("Id"); + + b.HasIndex("KillerId"); + + b.HasIndex("VictimId"); + + b.ToTable("DeathLogs"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Logs.LoginLogoutLogEntry", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + b.Property("IpAddress") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("LoginLogout") + .HasColumnType("tinyint(1)"); + + b.Property("PlayerId") + .HasColumnType("bigint"); + + b.Property("SocialClubName") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("Time") + .HasColumnType("datetime(6)"); + + b.Property("UserId") + .HasColumnType("int"); + + b.Property("Username") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("LoginLogoutLogs"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.News", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Active") + .HasColumnType("tinyint(1)"); + + b.Property("Caption") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("Content") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("Timestamp") + .HasColumnType("int"); + + b.Property("UserId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("News"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Saves.SavedBlip", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Active") + .HasColumnType("tinyint(1)"); + + b.Property("Alpha") + .HasColumnType("tinyint unsigned"); + + b.Property("Color") + .HasColumnType("tinyint unsigned"); + + b.Property("Dimension") + .HasColumnType("tinyint unsigned"); + + b.Property("DrawDistance") + .HasColumnType("float"); + + b.Property("Name") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("PositionX") + .HasColumnType("float"); + + b.Property("PositionY") + .HasColumnType("float"); + + b.Property("PositionZ") + .HasColumnType("float"); + + b.Property("Rotation") + .HasColumnType("float"); + + b.Property("Scale") + .HasColumnType("float"); + + b.Property("ShortRange") + .HasColumnType("tinyint(1)"); + + b.Property("Sprite") + .HasColumnType("smallint"); + + b.HasKey("Id"); + + b.ToTable("Blips"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Saves.SavedMarker", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Active") + .HasColumnType("tinyint(1)"); + + b.Property("ColorA") + .HasColumnType("tinyint unsigned"); + + b.Property("ColorB") + .HasColumnType("tinyint unsigned"); + + b.Property("ColorG") + .HasColumnType("tinyint unsigned"); + + b.Property("ColorR") + .HasColumnType("tinyint unsigned"); + + b.Property("Dimension") + .HasColumnType("tinyint unsigned"); + + b.Property("DirectionX") + .HasColumnType("float"); + + b.Property("DirectionY") + .HasColumnType("float"); + + b.Property("DirectionZ") + .HasColumnType("float"); + + b.Property("PositionX") + .HasColumnType("float"); + + b.Property("PositionY") + .HasColumnType("float"); + + b.Property("PositionZ") + .HasColumnType("float"); + + b.Property("RotationX") + .HasColumnType("float"); + + b.Property("RotationY") + .HasColumnType("float"); + + b.Property("RotationZ") + .HasColumnType("float"); + + b.Property("Scale") + .HasColumnType("float"); + + b.Property("Type") + .HasColumnType("tinyint unsigned"); + + b.Property("Visible") + .HasColumnType("tinyint(1)"); + + b.HasKey("Id"); + + b.ToTable("Markers"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Saves.SavedPed", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Active") + .HasColumnType("tinyint(1)"); + + b.Property("Dimension") + .HasColumnType("tinyint unsigned"); + + b.Property("HashModel") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("Heading") + .HasColumnType("float"); + + b.Property("PositionX") + .HasColumnType("float"); + + b.Property("PositionY") + .HasColumnType("float"); + + b.Property("PositionZ") + .HasColumnType("float"); + + b.Property("Type") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("Peds"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Saves.SavedPickup", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Active") + .HasColumnType("tinyint(1)"); + + b.Property("Dimension") + .HasColumnType("tinyint unsigned"); + + b.Property("PositionX") + .HasColumnType("float") + .HasMaxLength(128); + + b.Property("PositionY") + .HasColumnType("float"); + + b.Property("PositionZ") + .HasColumnType("float"); + + b.Property("RespawnTime") + .HasColumnType("int"); + + b.Property("RotationX") + .HasColumnType("float"); + + b.Property("RotationY") + .HasColumnType("float"); + + b.Property("RotationZ") + .HasColumnType("float"); + + b.Property("Vehicle") + .HasColumnType("tinyint(1)"); + + b.HasKey("Id"); + + b.ToTable("Pickups"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Saves.SavedTextLabel", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Active") + .HasColumnType("tinyint(1)"); + + b.Property("ColorA") + .HasColumnType("tinyint unsigned"); + + b.Property("ColorB") + .HasColumnType("tinyint unsigned"); + + b.Property("ColorG") + .HasColumnType("tinyint unsigned"); + + b.Property("ColorR") + .HasColumnType("tinyint unsigned"); + + b.Property("Dimension") + .HasColumnType("tinyint unsigned"); + + b.Property("DrawDistance") + .HasColumnType("float"); + + b.Property("Font") + .HasColumnType("tinyint unsigned"); + + b.Property("LOS") + .HasColumnType("tinyint(1)"); + + b.Property("PositionX") + .HasColumnType("float"); + + b.Property("PositionY") + .HasColumnType("float"); + + b.Property("PositionZ") + .HasColumnType("float"); + + b.Property("Text") + .IsRequired() + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.HasKey("Id"); + + b.ToTable("TextLabels"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.ServerVariable", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Value") + .HasColumnType("int"); + + b.Property("Variable") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.HasKey("Id"); + + b.ToTable("ServerVariables"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.ServerVehicle", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Active") + .ValueGeneratedOnAdd() + .HasColumnType("tinyint(1)") + .HasDefaultValue(true); + + b.Property("Discriminator") + .IsRequired() + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("DistanceDriven") + .HasColumnType("float"); + + b.Property("Heading") + .HasColumnType("float"); + + b.Property("Livery") + .HasColumnType("int"); + + b.Property("Locked") + .HasColumnType("tinyint(1)"); + + b.Property("Model") + .HasColumnType("int unsigned"); + + b.Property("NumberPlate") + .HasColumnType("varchar(8) CHARACTER SET utf8mb4") + .HasMaxLength(8); + + b.Property("PositionX") + .HasColumnType("float"); + + b.Property("PositionY") + .HasColumnType("float"); + + b.Property("PositionZ") + .HasColumnType("float"); + + b.Property("PrimaryColor") + .HasColumnType("int"); + + b.Property("SecondaryColor") + .HasColumnType("int"); + + b.Property("TankAmount") + .HasColumnType("float"); + + b.HasKey("Id"); + + b.ToTable("ServerVehicles"); + + b.HasDiscriminator("Discriminator").HasValue("ServerVehicle"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.ShopClothe", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Category") + .HasColumnType("int"); + + b.Property("ClotheId") + .HasColumnType("int"); + + b.Property("ComponentId") + .HasColumnType("int"); + + b.Property("Gender") + .HasColumnType("tinyint(1)"); + + b.Property("Price") + .HasColumnType("int"); + + b.Property("TypeId") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.HasKey("Id"); + + b.ToTable("ShopClothes"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.ShopItem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Amount") + .HasColumnType("int"); + + b.Property("ItemId") + .HasColumnType("int"); + + b.Property("Price") + .HasColumnType("int"); + + b.Property("ShopId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("ShopItems"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.TuningGarage", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("X") + .HasColumnType("float"); + + b.Property("Y") + .HasColumnType("float"); + + b.Property("Z") + .HasColumnType("float"); + + b.HasKey("Id"); + + b.ToTable("TuningGarages"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Turfs", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Color") + .HasColumnType("int"); + + b.Property("FactionId") + .HasColumnType("int"); + + b.Property("MaxValue") + .HasColumnType("int"); + + b.Property("Name") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("Owner") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("Range") + .HasColumnType("float"); + + b.Property("Rotation") + .HasColumnType("float"); + + b.Property("Surplus") + .HasColumnType("tinyint(1)"); + + b.Property("Value") + .HasColumnType("int"); + + b.Property("Vector") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("X") + .HasColumnType("float"); + + b.Property("Y") + .HasColumnType("float"); + + b.HasKey("Id"); + + b.ToTable("Turfs"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.User", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("AdminLevel") + .HasColumnType("int"); + + b.Property("BanId") + .HasColumnType("int"); + + b.Property("BankAccountId") + .HasColumnType("int"); + + b.Property("BusSkill") + .HasColumnType("int"); + + b.Property("BusinessId") + .HasColumnType("int"); + + b.Property("CharacterId") + .HasColumnType("int"); + + b.Property("Dead") + .HasColumnType("tinyint(1)"); + + b.Property("DriverLicenseBike") + .HasColumnType("tinyint(1)"); + + b.Property("DriverLicenseVehicle") + .HasColumnType("tinyint(1)"); + + b.Property("Email") + .HasColumnType("varchar(64) CHARACTER SET utf8mb4") + .HasMaxLength(64); + + b.Property("FactionId") + .HasColumnType("int"); + + b.Property("FactionLeader") + .HasColumnType("tinyint(1)"); + + b.Property("FactionRankId") + .HasColumnType("int"); + + b.Property("FlyingLicensePlane") + .HasColumnType("tinyint(1)"); + + b.Property("FreeSurgery") + .HasColumnType("tinyint(1)"); + + b.Property("GroupId") + .HasColumnType("int"); + + b.Property("GroupRank") + .HasColumnType("int"); + + b.Property("Handmoney") + .HasColumnType("int"); + + b.Property("HouseId") + .HasColumnType("int"); + + b.Property("JailTime") + .HasColumnType("int"); + + b.Property("JobId") + .HasColumnType("int"); + + b.Property("LogUserId") + .HasColumnType("int"); + + b.Property("Name") + .HasColumnType("varchar(32) CHARACTER SET utf8mb4") + .HasMaxLength(32); + + b.Property("Password") + .HasColumnType("varchar(64) CHARACTER SET utf8mb4") + .HasMaxLength(64); + + b.Property("PaydayTimer") + .HasColumnType("int"); + + b.Property("PilotSkill") + .HasColumnType("int"); + + b.Property("PlayedMinutes") + .HasColumnType("int"); + + b.Property("Points") + .HasColumnType("int"); + + b.Property("PositionX") + .HasColumnType("float"); + + b.Property("PositionY") + .HasColumnType("float"); + + b.Property("PositionZ") + .HasColumnType("float"); + + b.Property("RegistrationDate") + .ValueGeneratedOnAdd() + .HasColumnType("datetime(6)"); + + b.Property("SocialClubName") + .HasColumnType("varchar(32) CHARACTER SET utf8mb4") + .HasMaxLength(32); + + b.Property("Wage") + .HasColumnType("int"); + + b.Property("Wanteds") + .HasColumnType("int"); + + b.Property("WeaponLicense") + .HasColumnType("tinyint(1)"); + + b.Property("failpoints") + .HasColumnType("int"); + + b.Property("otheramount") + .HasColumnType("int"); + + b.Property("trashcount") + .HasColumnType("int"); + + b.Property("warn") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("BanId"); + + b.HasIndex("BankAccountId"); + + b.HasIndex("BusinessId") + .IsUnique(); + + b.HasIndex("CharacterId"); + + b.HasIndex("FactionId"); + + b.HasIndex("FactionRankId"); + + b.HasIndex("GroupId"); + + b.HasIndex("HouseId"); + + b.HasIndex("Name") + .IsUnique(); + + b.ToTable("Users"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.UserBankAccount", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Active") + .HasColumnType("tinyint(1)"); + + b.Property("Balance") + .HasColumnType("int"); + + b.Property("Bic") + .HasColumnType("varchar(12) CHARACTER SET utf8mb4") + .HasMaxLength(12); + + b.Property("Iban") + .HasColumnType("varchar(32) CHARACTER SET utf8mb4") + .HasMaxLength(32); + + b.HasKey("Id"); + + b.ToTable("UserBankAccounts"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.UserItem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Amount") + .HasColumnType("int"); + + b.Property("ItemId") + .HasColumnType("int"); + + b.Property("Slot") + .HasColumnType("int"); + + b.Property("UserId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("UserItems"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.UserWeapon", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Ammo") + .HasColumnType("int"); + + b.Property("UserId") + .HasColumnType("int"); + + b.Property("WeaponId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.HasIndex("WeaponId"); + + b.ToTable("UserWeapons"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.VehicleItem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Amount") + .HasColumnType("int"); + + b.Property("ItemId") + .HasColumnType("int"); + + b.Property("Slot") + .HasColumnType("int"); + + b.Property("VehicleId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("VehicleId"); + + b.ToTable("VehicleItems"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.VehicleMod", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("ModId") + .HasColumnType("int"); + + b.Property("ServerVehicleId") + .HasColumnType("int"); + + b.Property("Slot") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("ServerVehicleId", "Slot") + .IsUnique(); + + b.ToTable("VehicleMods"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Weapon", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Ammo") + .HasColumnType("int"); + + b.Property("AmmunationActive") + .HasColumnType("tinyint(1)"); + + b.Property("CategoryId") + .HasColumnType("int"); + + b.Property("Legal") + .HasColumnType("tinyint(1)"); + + b.Property("Price") + .HasColumnType("float"); + + b.Property("SlotID") + .HasColumnType("int"); + + b.Property("WeaponModel") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.HasKey("Id"); + + b.HasIndex("CategoryId"); + + b.ToTable("Weapons"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.WeaponCategory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Category") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.HasKey("Id"); + + b.ToTable("WeaponCategories"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Whitelist", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("SocialClubName") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.HasKey("Id"); + + b.ToTable("WhitelistEntries"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Logs.Chat.DepartmentChatLogEntry", b => + { + b.HasBaseType("ReallifeGamemode.Database.Entities.Logs.Chat.ChatLogEntry"); + + b.HasDiscriminator().HasValue("DepartmentChatLogEntry"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Logs.Chat.FactionChatLogEntry", b => + { + b.HasBaseType("ReallifeGamemode.Database.Entities.Logs.Chat.ChatLogEntry"); + + b.Property("FactionId") + .HasColumnType("int"); + + b.HasIndex("FactionId"); + + b.HasDiscriminator().HasValue("FactionChatLogEntry"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Logs.Chat.GangChatLogEntry", b => + { + b.HasBaseType("ReallifeGamemode.Database.Entities.Logs.Chat.ChatLogEntry"); + + b.HasDiscriminator().HasValue("GangChatLogEntry"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Logs.Chat.GroupChatLogEntry", b => + { + b.HasBaseType("ReallifeGamemode.Database.Entities.Logs.Chat.ChatLogEntry"); + + b.Property("GroupId") + .HasColumnType("int"); + + b.HasIndex("GroupId"); + + b.HasDiscriminator().HasValue("GroupChatLogEntry"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Logs.Chat.LeaderChatLogEntry", b => + { + b.HasBaseType("ReallifeGamemode.Database.Entities.Logs.Chat.ChatLogEntry"); + + b.HasDiscriminator().HasValue("LeaderChatLogEntry"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Logs.Chat.LocalChatLogEntry", b => + { + b.HasBaseType("ReallifeGamemode.Database.Entities.Logs.Chat.ChatLogEntry"); + + b.HasDiscriminator().HasValue("LocalChatLogEntry"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Logs.Chat.NewsChatLogEntry", b => + { + b.HasBaseType("ReallifeGamemode.Database.Entities.Logs.Chat.ChatLogEntry"); + + b.HasDiscriminator().HasValue("NewsChatLogEntry"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Logs.Chat.OChatLogEntry", b => + { + b.HasBaseType("ReallifeGamemode.Database.Entities.Logs.Chat.ChatLogEntry"); + + b.HasDiscriminator().HasValue("OChatLogEntry"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.FactionVehicle", b => + { + b.HasBaseType("ReallifeGamemode.Database.Entities.ServerVehicle"); + + b.Property("BuyPrice") + .HasColumnType("int"); + + b.Property("Owners") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.ToTable("FactionVehicles"); + + b.HasDiscriminator().HasValue("FactionVehicle"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.GroupVehicle", b => + { + b.HasBaseType("ReallifeGamemode.Database.Entities.ServerVehicle"); + + b.Property("GroupId") + .HasColumnType("int"); + + b.HasIndex("GroupId"); + + b.HasDiscriminator().HasValue("GroupVehicle"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.JobVehicle", b => + { + b.HasBaseType("ReallifeGamemode.Database.Entities.ServerVehicle"); + + b.Property("JobId") + .HasColumnType("int"); + + b.HasDiscriminator().HasValue("JobVehicle"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.NoobSpawnVehicle", b => + { + b.HasBaseType("ReallifeGamemode.Database.Entities.ServerVehicle"); + + b.HasDiscriminator().HasValue("NoobSpawnVehicle"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.NoobVehicle", b => + { + b.HasBaseType("ReallifeGamemode.Database.Entities.ServerVehicle"); + + b.HasDiscriminator().HasValue("NoobVehicle"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Saves.SavedVehicle", b => + { + b.HasBaseType("ReallifeGamemode.Database.Entities.ServerVehicle"); + + b.HasDiscriminator().HasValue("SavedVehicle"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.SchoolVehicle", b => + { + b.HasBaseType("ReallifeGamemode.Database.Entities.ServerVehicle"); + + b.Property("SchoolId") + .HasColumnType("int"); + + b.HasDiscriminator().HasValue("SchoolVehicle"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.ShopVehicle", b => + { + b.HasBaseType("ReallifeGamemode.Database.Entities.ServerVehicle"); + + b.Property("BusinessId") + .HasColumnType("int"); + + b.Property("Price") + .HasColumnType("int"); + + b.ToTable("ShopVehicles"); + + b.HasDiscriminator().HasValue("ShopVehicle"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.UserVehicle", b => + { + b.HasBaseType("ReallifeGamemode.Database.Entities.ServerVehicle"); + + b.Property("BusinessId") + .HasColumnName("UserVehicle_BusinessId") + .HasColumnType("int"); + + b.Property("Price") + .HasColumnName("UserVehicle_Price") + .HasColumnType("int"); + + b.Property("UserId") + .HasColumnType("int"); + + b.HasIndex("UserId"); + + b.ToTable("UserVehicles"); + + b.HasDiscriminator().HasValue("UserVehicle"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Ban", b => + { + b.HasOne("ReallifeGamemode.Database.Entities.User", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.BusRoutePoint", b => + { + b.HasOne("ReallifeGamemode.Database.Entities.BusRoute", "BusRoute") + .WithMany("RoutePoints") + .HasForeignKey("BusRouteId"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.CannabisPlant", b => + { + b.HasOne("ReallifeGamemode.Database.Entities.User", "PlantedBy") + .WithMany() + .HasForeignKey("PlantedById") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Character", b => + { + b.HasOne("ReallifeGamemode.Database.Entities.User", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.CharacterCloth", b => + { + b.HasOne("ReallifeGamemode.Database.Entities.User", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Door", b => + { + b.HasOne("ReallifeGamemode.Database.Entities.Faction", "Faction") + .WithMany() + .HasForeignKey("FactionId"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.DutyCloth", b => + { + b.HasOne("ReallifeGamemode.Database.Entities.Faction", "Faction") + .WithMany() + .HasForeignKey("FactionId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Faction", b => + { + b.HasOne("ReallifeGamemode.Database.Entities.FactionBankAccount", "BankAccount") + .WithMany() + .HasForeignKey("BankAccountId"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.FactionRank", b => + { + b.HasOne("ReallifeGamemode.Database.Entities.Faction", "Faction") + .WithMany() + .HasForeignKey("FactionId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.FactionWeapon", b => + { + b.HasOne("ReallifeGamemode.Database.Entities.Faction", "Faction") + .WithMany() + .HasForeignKey("FactionId"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Group", b => + { + b.HasOne("ReallifeGamemode.Database.Entities.GroupBankAccount", "BankAccount") + .WithMany() + .HasForeignKey("BankAccountId"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.House", b => + { + b.HasOne("ReallifeGamemode.Database.Entities.HouseBankAccount", "BankAccount") + .WithMany() + .HasForeignKey("BankAccountId"); + + b.HasOne("ReallifeGamemode.Database.Entities.User", "Owner") + .WithMany() + .HasForeignKey("OwnerId"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.HouseRental", b => + { + b.HasOne("ReallifeGamemode.Database.Entities.House", "House") + .WithMany("Rentals") + .HasForeignKey("HouseId"); + + b.HasOne("ReallifeGamemode.Database.Entities.User", "User") + .WithMany() + .HasForeignKey("UserId"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Logs.Chat.ChatLogEntry", b => + { + b.HasOne("ReallifeGamemode.Database.Entities.User", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Logs.CommandLogEntry", b => + { + b.HasOne("ReallifeGamemode.Database.Entities.User", "User") + .WithMany() + .HasForeignKey("UserId"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Logs.Death", b => + { + b.HasOne("ReallifeGamemode.Database.Entities.User", "Killer") + .WithMany() + .HasForeignKey("KillerId"); + + b.HasOne("ReallifeGamemode.Database.Entities.User", "Victim") + .WithMany() + .HasForeignKey("VictimId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Logs.LoginLogoutLogEntry", b => + { + b.HasOne("ReallifeGamemode.Database.Entities.User", "User") + .WithMany() + .HasForeignKey("UserId"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.News", b => + { + b.HasOne("ReallifeGamemode.Database.Entities.User", "User") + .WithMany() + .HasForeignKey("UserId"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.User", b => + { + b.HasOne("ReallifeGamemode.Database.Entities.Ban", "Ban") + .WithMany() + .HasForeignKey("BanId"); + + b.HasOne("ReallifeGamemode.Database.Entities.UserBankAccount", "BankAccount") + .WithMany() + .HasForeignKey("BankAccountId"); + + b.HasOne("ReallifeGamemode.Database.Entities.Character", "Character") + .WithMany() + .HasForeignKey("CharacterId"); + + b.HasOne("ReallifeGamemode.Database.Entities.Faction", "Faction") + .WithMany() + .HasForeignKey("FactionId"); + + b.HasOne("ReallifeGamemode.Database.Entities.FactionRank", "FactionRank") + .WithMany() + .HasForeignKey("FactionRankId"); + + b.HasOne("ReallifeGamemode.Database.Entities.Group", "Group") + .WithMany() + .HasForeignKey("GroupId"); + + b.HasOne("ReallifeGamemode.Database.Entities.House", "House") + .WithMany() + .HasForeignKey("HouseId"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.UserItem", b => + { + b.HasOne("ReallifeGamemode.Database.Entities.User", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.UserWeapon", b => + { + b.HasOne("ReallifeGamemode.Database.Entities.User", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("ReallifeGamemode.Database.Entities.Weapon", "Weapon") + .WithMany() + .HasForeignKey("WeaponId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.VehicleItem", b => + { + b.HasOne("ReallifeGamemode.Database.Entities.ServerVehicle", "Vehicle") + .WithMany() + .HasForeignKey("VehicleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.VehicleMod", b => + { + b.HasOne("ReallifeGamemode.Database.Entities.ServerVehicle", "Vehicle") + .WithMany() + .HasForeignKey("ServerVehicleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Weapon", b => + { + b.HasOne("ReallifeGamemode.Database.Entities.WeaponCategory", "WeaponCategory") + .WithMany() + .HasForeignKey("CategoryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Logs.Chat.FactionChatLogEntry", b => + { + b.HasOne("ReallifeGamemode.Database.Entities.Faction", "Faction") + .WithMany() + .HasForeignKey("FactionId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Logs.Chat.GroupChatLogEntry", b => + { + b.HasOne("ReallifeGamemode.Database.Entities.Group", "Group") + .WithMany() + .HasForeignKey("GroupId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.GroupVehicle", b => + { + b.HasOne("ReallifeGamemode.Database.Entities.Group", "Group") + .WithMany() + .HasForeignKey("GroupId"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.UserVehicle", b => + { + b.HasOne("ReallifeGamemode.Database.Entities.User", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/ReallifeGamemode.Database/Migrations/20210524202105_AddCannabisPlants.cs b/ReallifeGamemode.Database/Migrations/20210524202105_AddCannabisPlants.cs new file mode 100644 index 00000000..0663b19c --- /dev/null +++ b/ReallifeGamemode.Database/Migrations/20210524202105_AddCannabisPlants.cs @@ -0,0 +1,47 @@ +using System; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; + +namespace ReallifeGamemode.Database.Migrations +{ + public partial class AddCannabisPlants : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "CannabisPlants", + columns: table => new + { + Id = table.Column(nullable: false) + .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), + PlantDate = table.Column(nullable: false), + X = table.Column(nullable: false), + Y = table.Column(nullable: false), + Z = table.Column(nullable: false), + Harvested = table.Column(nullable: false), + PlantedById = table.Column(nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_CannabisPlants", x => x.Id); + table.ForeignKey( + name: "FK_CannabisPlants_Users_PlantedById", + column: x => x.PlantedById, + principalTable: "Users", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateIndex( + name: "IX_CannabisPlants_PlantedById", + table: "CannabisPlants", + column: "PlantedById"); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "CannabisPlants"); + } + } +} diff --git a/ReallifeGamemode.Database/Migrations/DatabaseContextModelSnapshot.cs b/ReallifeGamemode.Database/Migrations/DatabaseContextModelSnapshot.cs index 341f3a2d..ceeeb6b5 100644 --- a/ReallifeGamemode.Database/Migrations/DatabaseContextModelSnapshot.cs +++ b/ReallifeGamemode.Database/Migrations/DatabaseContextModelSnapshot.cs @@ -154,6 +154,37 @@ namespace ReallifeGamemode.Database.Migrations b.ToTable("BusinessData"); }); + modelBuilder.Entity("ReallifeGamemode.Database.Entities.CannabisPlant", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + b.Property("Harvested") + .HasColumnType("tinyint(1)"); + + b.Property("PlantDate") + .HasColumnType("datetime(6)"); + + b.Property("PlantedById") + .HasColumnType("int"); + + b.Property("X") + .HasColumnType("float"); + + b.Property("Y") + .HasColumnType("float"); + + b.Property("Z") + .HasColumnType("float"); + + b.HasKey("Id"); + + b.HasIndex("PlantedById"); + + b.ToTable("CannabisPlants"); + }); + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Character", b => { b.Property("Id") @@ -1931,6 +1962,15 @@ namespace ReallifeGamemode.Database.Migrations .HasForeignKey("BusRouteId"); }); + modelBuilder.Entity("ReallifeGamemode.Database.Entities.CannabisPlant", b => + { + b.HasOne("ReallifeGamemode.Database.Entities.User", "PlantedBy") + .WithMany() + .HasForeignKey("PlantedById") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Character", b => { b.HasOne("ReallifeGamemode.Database.Entities.User", "User") diff --git a/ReallifeGamemode.Database/Models/DatabaseContext.cs b/ReallifeGamemode.Database/Models/DatabaseContext.cs index 6a8fb10d..20b5e151 100644 --- a/ReallifeGamemode.Database/Models/DatabaseContext.cs +++ b/ReallifeGamemode.Database/Models/DatabaseContext.cs @@ -179,6 +179,8 @@ namespace ReallifeGamemode.Database.Models //Server Variablen public DbSet ServerVariables { get; set; } + + public DbSet CannabisPlants { get; set; } } public class DesignTimeDbContextFactory : IDesignTimeDbContextFactory diff --git a/ReallifeGamemode.Server/Events/Connect.cs b/ReallifeGamemode.Server/Events/Connect.cs index 2f1ce662..1c43f5b7 100644 --- a/ReallifeGamemode.Server/Events/Connect.cs +++ b/ReallifeGamemode.Server/Events/Connect.cs @@ -88,6 +88,8 @@ namespace ReallifeGamemode.Server.Events NAPI.World.RequestIpl("ferris_finale_Anim"); // Riesenrad NAPI.World.RequestIpl("Carwash_with_spinners"); // Carwash + HanfManager.UpdateHanfForPlayer(player); + TimeSpan currentTime = TimeManager.CurrentTime; bool disableLightMode = currentTime > LightModeTimeFrom && currentTime < LightModeTimeTo; diff --git a/ReallifeGamemode.Server/Inventory/Items/CannabisSeeds.cs b/ReallifeGamemode.Server/Inventory/Items/CannabisSeeds.cs index 63f0f0db..f3fa752d 100644 --- a/ReallifeGamemode.Server/Inventory/Items/CannabisSeeds.cs +++ b/ReallifeGamemode.Server/Inventory/Items/CannabisSeeds.cs @@ -1,10 +1,15 @@ using System; using System.Collections.Generic; using System.Text; +using GTANetworkAPI; +using ReallifeGamemode.Database.Entities; +using ReallifeGamemode.Database.Models; +using ReallifeGamemode.Server.Extensions; +using ReallifeGamemode.Server.Managers; namespace ReallifeGamemode.Server.Inventory.Items { - public class CannabisSeeds : BaseItem + public class CannabisSeeds : UseItem { public override int Id { get; } = 109; public override string Name { get; } = "Cannabis Samen"; @@ -13,5 +18,18 @@ namespace ReallifeGamemode.Server.Inventory.Items public override string Einheit { get; } = "g"; public override int Price { get; } = 0; public override bool Legal => false; + + public override uint Object { get; } + public override bool RemoveWhenUsed { get; } = false; + + public override bool Use(Player player, User user, DatabaseContext databaseContext) + { + if(!player.IsInVehicle) + { + HanfManager.StartCannabisPlanting(player); + } + + return true; + } } } diff --git a/ReallifeGamemode.Server/Managers/HanfManager.cs b/ReallifeGamemode.Server/Managers/HanfManager.cs index 76b7a3a9..ff74bfa5 100644 --- a/ReallifeGamemode.Server/Managers/HanfManager.cs +++ b/ReallifeGamemode.Server/Managers/HanfManager.cs @@ -5,6 +5,7 @@ using System.Text; using System.Timers; using GTANetworkAPI; using Microsoft.Extensions.Logging; +using Newtonsoft.Json; using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Extensions; @@ -47,8 +48,18 @@ namespace ReallifeGamemode.Server.Managers /// private const string _manufacturerAnim = "manufacturJoint"; + /// + /// Data-Key, ob der Spieler grade eine Pflanze anpflanzt + /// + private const string PLAYER_CURRENTLY_PLANTING_DATA_KEY = "isPlantingCannabis"; + + /// + /// Timer der den Status des Verarbeiters zurücksetzt + /// private static Timer _manufacturerDoneTimer = new Timer(TimeSpan.FromSeconds(10).TotalMilliseconds); + private static List _currentCannabisData = new List(); + static HanfManager() { _manufacturerDoneTimer.Elapsed += ManufacturerDoneTimerCallback; @@ -72,11 +83,29 @@ namespace ReallifeGamemode.Server.Managers colShape = NAPI.ColShape.CreateSphereColShape(buyPoint, 20.0f); colShape.OnEntityEnterColShape += OnSeedBuyRangeColShapeEnter; } + + UpdateHanfWorldData(new DatabaseContext()); + + Timer updateHanfDataTimer = new Timer(TimeSpan.FromMinutes(1).TotalMilliseconds); + updateHanfDataTimer.Elapsed += UpdateHanfDataTimer_Elapsed; + updateHanfDataTimer.Start(); + } + + private static void UpdateHanfDataTimer_Elapsed(object sender, ElapsedEventArgs e) + { + using var dbContext = new DatabaseContext(); + UpdateHanfWorldData(dbContext); } private static void OnSeedBuyRangeColShapeEnter(ColShape colShape, Player player) { - ChatService.SendMessage(player, $"Fremder sagt: Pssst.. Willst paar Samen erwerben?"); + var user = player.GetUser(); + if (user.Faction.StateOwned) + { + return; + } + + ChatService.SendMessage(player, $"Fremder sagt: Pssst.. Willst du Samen kaufen?"); } internal static bool IsPlayerNearSeedBuyPoint(Player player) @@ -89,6 +118,95 @@ namespace ReallifeGamemode.Server.Managers return _jointManufacturerPoint.DistanceTo(player.Position) <= 2.5f; } + internal static void StartCannabisPlanting(Player player) + { + player.ToggleInventory(InventoryToggleOption.HIDE); + + if (!player.IsAlive()) + { + return; + } + + var dbContext = new DatabaseContext(); + var user = player.GetUser(dbContext); + if (user.Faction?.StateOwned ?? false) + { + player.SendNotification("~r~Du darfst keine Hanfsamen einfplanzen"); + return; + } + + if (player.HasData(PLAYER_CURRENTLY_PLANTING_DATA_KEY) && player.GetData(PLAYER_CURRENTLY_PLANTING_DATA_KEY)) + { + player.SendNotification("~r~Du pflanzt aktuell schon einen Hanfsamen ein"); + return; + } + + player.SetData(PLAYER_CURRENTLY_PLANTING_DATA_KEY, true); + + player.TriggerEvent("SERVER:Hanf_StartPlanting"); + } + + [RemoteEvent("CLIENT:Hanf_PlantHanf")] + public void HanfManagerPlantHanf(Player player, float x, float y, float z) + { + player.ResetData(PLAYER_CURRENTLY_PLANTING_DATA_KEY); + + IItem cannabisSeedItem = InventoryManager.GetItem(); + UserItem userCannabisSeedsItem = InventoryManager.UserHasThisItem(player, cannabisSeedItem.Id); + if (userCannabisSeedsItem == null) + { + player.SendNotification("~r~Du hast keine Samen mehr"); + return; + } + + logger.LogInformation("Player {0} planted a cannabis plant at x: {1}, y: {2}, z: {3}", player.Name, x, y, z); + + using var dbContext = new DatabaseContext(); + var user = player.GetUser(dbContext); + + InventoryManager.RemoveUserItem(user, userCannabisSeedsItem, 1); + + CannabisPlant newPlant = new CannabisPlant() + { + X = x, + Y = y, + Z = z, + PlantedBy = user, + PlantDate = DateTime.Now, + }; + + dbContext.CannabisPlants.Add(newPlant); + dbContext.SaveChanges(); + + UpdateHanfWorldData(dbContext); + } + + public static void UpdateHanfWorldData(DatabaseContext dbContext) + { + var activePlants = dbContext.CannabisPlants.Where(p => !p.Harvested).Select(p => new CannabisData() + { + Id = p.Id, + Time = p.PlantDate, + X = p.X, + Y = p.Y, + Z = p.Z + }).ToList(); + + _currentCannabisData = activePlants; + + NAPI.Pools.GetAllPlayers().ForEach(p => + { + UpdateHanfForPlayer(p, activePlants); + }); + } + + public async static void UpdateHanfForPlayer(Player player, List cannabisData = null) + { + cannabisData ??= _currentCannabisData; + var x = await NAPI.Task.WaitForMainThread(); + player.TriggerEvent("SERVER:Hanf_UpdateHanfData", JsonConvert.SerializeObject(cannabisData)); + } + [RemoteEvent("CLIENT:Hanf_BuySeeds")] public void HanfManagerBuySeeds(Player player, int amount) { @@ -129,7 +247,7 @@ namespace ReallifeGamemode.Server.Managers internal static void BuildJointsFromCannabis(Player player) { - if(player.HasAnimation(_manufacturerAnim) || _manufacturerCurrentlyUsed) + if (player.HasAnimation(_manufacturerAnim) || _manufacturerCurrentlyUsed) { return; } diff --git a/ReallifeGamemode.Server/Managers/InventoryManager.cs b/ReallifeGamemode.Server/Managers/InventoryManager.cs index a5d04b93..aaa1b434 100644 --- a/ReallifeGamemode.Server/Managers/InventoryManager.cs +++ b/ReallifeGamemode.Server/Managers/InventoryManager.cs @@ -563,10 +563,9 @@ namespace ReallifeGamemode.Server.Managers if (usableItemObj.RemoveWhenUsed) { RemoveUserItem(user, fItem, 1); + SetBackpackItems(player); + player.TriggerEvent("aproveUse", 1, iItem.Name); } - - SetBackpackItems(player); - player.TriggerEvent("aproveUse", 1, iItem.Name); } } else player.TriggerEvent("Error", "Du kannst dieses Item nicht benutzen."); diff --git a/ReallifeGamemode.Server/Util/CannabisData.cs b/ReallifeGamemode.Server/Util/CannabisData.cs new file mode 100644 index 00000000..ed1180d7 --- /dev/null +++ b/ReallifeGamemode.Server/Util/CannabisData.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace ReallifeGamemode.Server.Util +{ + public class CannabisData + { + public long Id { get; set; } + + public float X { get; set; } + + public float Y { get; set; } + + public float Z { get; set; } + + public DateTime Time { get; set; } + } +} From 4be3137cc55fac93c2adc9d0197d751d7fbb2728 Mon Sep 17 00:00:00 2001 From: hydrant Date: Wed, 26 May 2021 01:33:31 +0200 Subject: [PATCH 73/82] hanf wachstum --- ReallifeGamemode.Client/drugs/hanf.ts | 170 ++++++++++++++---- ReallifeGamemode.Client/game.ts | 2 +- ReallifeGamemode.Client/global.d.ts | 10 +- .../Commands/AdminCommands.cs | 13 ++ ReallifeGamemode.Server/Events/Connect.cs | 2 - ReallifeGamemode.Server/Events/Login.cs | 2 + ReallifeGamemode.Server/Events/Register.cs | 7 +- .../Managers/HanfManager.cs | 106 ++++++++++- 8 files changed, 271 insertions(+), 41 deletions(-) diff --git a/ReallifeGamemode.Client/drugs/hanf.ts b/ReallifeGamemode.Client/drugs/hanf.ts index 9876f1b5..3dd44235 100644 --- a/ReallifeGamemode.Client/drugs/hanf.ts +++ b/ReallifeGamemode.Client/drugs/hanf.ts @@ -12,7 +12,29 @@ const hanfPlantObjects = { stage4: mp.game.joaat('prop_weed_01') }; -const minimumPlantDistance = 5; +const hanfTimeToObject = [ + { + minutes: 15, + object: hanfPlantObjects.stage1, + }, + { + minutes: 60 * 1, + object: hanfPlantObjects.stage2 + }, + { + minutes: 60 * 3, + object: hanfPlantObjects.stage3 + }, + { + minutes: 60 * 4, + object: hanfPlantObjects.stage4 + } +] + +const minimumPlantDistance = 2; + +const maximumPlantDuration = 6 * 60 * 60 * 1000; // 6 Stunden / 360 Minuten / 21600 Sekunden / 21600000 Millisekunden +const timeToHarvestPlant = 4 * 60 * 60 * 1000; // 4 Stunden export default function hanfSystem(globalData: IGlobalData) { @@ -128,13 +150,13 @@ export default function hanfSystem(globalData: IGlobalData) { function isAbleToPlant() { var player = mp.players.local; - if (isNearPlant()) { + if (isNearPlant(minimumPlantDistance)) { return false; } - if (!isSurfaceAllowed()) { - return false; - } + //if (!isSurfaceAllowed()) { + // return false; + //} if (currentPlantingPreviewObject) { var objectPos = getPlantPreviewPosition(); @@ -144,7 +166,7 @@ export default function hanfSystem(globalData: IGlobalData) { } } - if (player.isSwimming() || player.isSwimmingUnderWater() || !player.isOnFoot()) { + if (player.isSwimming() || player.isSwimmingUnderWater() || !player.isOnFoot() || player.isSprinting() || player.isShooting()) { return false; } @@ -168,7 +190,19 @@ export default function hanfSystem(globalData: IGlobalData) { } KeyBinder.bind('e', _ => { - if (!currentlyPlanting || globalData.InChat) { + if (globalData.InChat) { + return; + } + + if (!currentlyPlanting) { + var nearPlant = isNearPlant(0.5); + + if (!nearPlant) { + return; + } + + mp.events.callRemote("CLIENT:Hanf_HarvestHanf", nearPlant.Id); + return; } @@ -183,52 +217,128 @@ export default function hanfSystem(globalData: IGlobalData) { if (currentPlantingPreviewObject) { currentPlantingPreviewObject.destroy(); + currentPlantingPreviewObject = null; } if (currentPlantingMarkerPreview) { currentPlantingMarkerPreview.destroy(); + currentPlantingMarkerPreview = null; } var position = getPlantPreviewPosition(); var realZ = mp.game.gameplay.getGroundZFor3dCoord(position.x, position.y, position.z + 2, 0, false); - mp.events.callRemote("CLIENT:Hanf_PlantHanf", position.x, position.z, realZ); + mp.events.callRemote("CLIENT:Hanf_PlantHanf", position.x, position.y, realZ); }); function getPlantPreviewPosition(): Vector3Mp { return mp.players.local.getOffsetFromInWorldCoords(0, 0.2, -1); } - function isNearPlant(): boolean { - var position = getPlantPreviewPosition(); - var nearPlant = false; - - Object.keys(hanfPlantObjects).forEach(k => { - var hash = hanfPlantObjects[k]; - var obj = mp.game.object.getClosestObjectOfType(position.x, position.y, position.z, minimumPlantDistance, hash, false, false, false); - if (obj && obj != currentPlantingPreviewObject.handle) { - nearPlant = true; - } - }); - - return nearPlant; + function getPlantText(plant: CannabisData) { + var time = Date.now() - Date.parse(plant.Time); + if (time > maximumPlantDuration) { + return ("~g~Hanf~n~~r~Verrottet"); + } + return (`~g~Hanf~n~Fortschritt: ${getPlantPercentage(plant).toFixed(2)}%`); } - let currentHanfData: Array = null; - let hanfDataIdToObjectMap: Map = null; + function getPlantPercentage(plant: CannabisData) { + var time = Date.now() - Date.parse(plant.Time); + return Math.min((time / timeToHarvestPlant) * 100, 100); + } - mp.events.add("SERVER:Hanf_UpdateHanfData", dataJson => { - var data: Array = >JSON.parse(dataJson) - if (currentHanfData == null) { - currentHanfData = data; + function isNearPlant(distance: number): CannabisData { + var pos = getPlantPreviewPosition(); + var nearPlants = currentHanfData.filter(h => + mp.game.gameplay.getDistanceBetweenCoords(pos.x, pos.y, pos.z, h.X, h.Y, h.Z, true) < distance); + + if (!nearPlants || nearPlants.length == 0) { + return null; } - var newPlants = data.filter(d => currentHanfData.filter(x => x.id === d.id).length == 0); - var removedPlants = currentHanfData.filter(d => data.filter(x => x.id === d.id).length == 0); - var existingPlants = data.filter(d => currentHanfData.filter(x => x.id === d.id).length == 1); + nearPlants = nearPlants.sort((a, b) => + Number(mp.game.gameplay.getDistanceBetweenCoords(pos.x, pos.y, pos.z, a.X, a.Y, a.Z, true) < + mp.game.gameplay.getDistanceBetweenCoords(pos.x, pos.y, pos.z, b.X, b.Y, b.Z, true))); + + return nearPlants[0]; + } + + let currentHanfData: Array = []; + let hanfDataIdToObjectMap: Map = new Map(); + let hanfDataIdToTextLabelMap: Map = new Map(); + + mp.events.add("SERVER:Hanf_UpdateHanfData", dataJson => { + mp.console.logInfo(dataJson); + var data: Array = >JSON.parse(dataJson) + + var newPlants = data.filter(d => currentHanfData.filter(x => x.Id === d.Id).length == 0); + var removedPlants = currentHanfData.filter(d => data.filter(x => x.Id === d.Id).length == 0); + var existingPlants = data.filter(d => currentHanfData.filter(x => x.Id === d.Id).length == 1); mp.gui.chat.push(`new: ${newPlants.length}, removed: ${removedPlants.length}, existing: ${existingPlants.length}`); + newPlants.forEach(plant => { + var model = getPlantModel(plant); + mp.gui.chat.push("new id: " + plant.Id + ", model = " + model); + var object = mp.objects.new(getPlantModel(plant), new mp.Vector3(plant.X, plant.Y, plant.Z)); + hanfDataIdToObjectMap.set(plant.Id, object); + + var textLabel = mp.labels.new(getPlantText(plant), new mp.Vector3(plant.X, plant.Y, plant.Z + 1), { + los: true, + drawDistance: 2 + }); + hanfDataIdToTextLabelMap.set(plant.Id, textLabel); + }); + + removedPlants.forEach(plant => { + //mp.gui.chat.push("removed id: " + plant.Id); + var object = hanfDataIdToObjectMap.get(plant.Id); + hanfDataIdToObjectMap.delete(plant.Id); + object.destroy(); + var textLabel = hanfDataIdToTextLabelMap.get(plant.Id); + textLabel.destroy(); + hanfDataIdToTextLabelMap.delete(plant.Id); + }); + + existingPlants.forEach(plant => { + //mp.gui.chat.push("existing plant: " + plant.Id + ", plant time = " + new Date(plant.Time).toLocaleTimeString() + ", current time = " + new Date().toLocaleTimeString()); + var object = hanfDataIdToObjectMap.get(plant.Id); + var model = getPlantModel(plant); + if (model != object.model) { + //mp.gui.chat.push("existing plant: " + plant.Id + ", changing model to = " + model); + object.destroy(); + var object = mp.objects.new(model, new mp.Vector3(plant.X, plant.Y, plant.Z)); + hanfDataIdToObjectMap.delete(plant.Id); + hanfDataIdToObjectMap.set(plant.Id, object); + } + + var textLabel = hanfDataIdToTextLabelMap.get(plant.Id); + textLabel.text = getPlantText(plant); + }); + currentHanfData = data; }); + + function getPlantModel(plant: CannabisData): number { + var diff = Date.now() - Date.parse(plant.Time); + var model = -1; + + var dbgTxt; + + if (diff <= 30 * 60 * 1000) { // 0 - 30 Minuten + model = hanfPlantObjects.stage1; + dbgTxt = "30 Minuten"; + } else if (diff <= 4 * 60 * 60 * 1000) { // 30 - 240 Minuten / 4 Stunden + model = hanfPlantObjects.stage3; + dbgTxt = "3 Stunden"; + } else { // Ausgewachsen / Ab 4 Stunden + model = hanfPlantObjects.stage4; + dbgTxt = "4 Stunden"; + } + + //mp.gui.chat.push("plant id = " + plant.Id + ", age = " + dbgTxt); + + return model; + } } \ No newline at end of file diff --git a/ReallifeGamemode.Client/game.ts b/ReallifeGamemode.Client/game.ts index c201e07d..bc89c7ed 100644 --- a/ReallifeGamemode.Client/game.ts +++ b/ReallifeGamemode.Client/game.ts @@ -168,5 +168,5 @@ export { EntityType, AccountData, VehicleData, - DoorState + DoorState, } \ No newline at end of file diff --git a/ReallifeGamemode.Client/global.d.ts b/ReallifeGamemode.Client/global.d.ts index 9a836413..d577d1a2 100644 --- a/ReallifeGamemode.Client/global.d.ts +++ b/ReallifeGamemode.Client/global.d.ts @@ -98,11 +98,11 @@ declare type RentcarProperty = { } declare type CannabisData = { - id: number; - x: number; - y: number; - z: number; - time: Date; + Id: number; + X: number; + Y: number; + Z: number; + Time: string; } declare type PlayerCharacterData = { diff --git a/ReallifeGamemode.Server/Commands/AdminCommands.cs b/ReallifeGamemode.Server/Commands/AdminCommands.cs index 3e12ecd9..8230c661 100644 --- a/ReallifeGamemode.Server/Commands/AdminCommands.cs +++ b/ReallifeGamemode.Server/Commands/AdminCommands.cs @@ -3391,6 +3391,19 @@ namespace ReallifeGamemode.Server.Commands ChatService.SendMessage(player, "~b~[ADMIN]~s~ Die Türen wurden erfolgreich neugeladen."); } + [Command("reloadhanf", "~m~Benutzung: ~s~/reloadhanf")] + public void CmdAdminReloadHanf(Player player) + { + if (!player.GetUser().IsAdmin(AdminLevel.HEADADMIN)) + { + ChatService.NotAuthorized(player); + return; + } + + HanfManager.UpdateHanfWorldData(new DatabaseContext()); + ChatService.SendMessage(player, "~b~[ADMIN]~s~ Die Hanfpflanzen wurden erfolgreich neugeladen."); + } + //[Command("house", "~m~Benutzung: ~s~/house [add / remove / price / type / reloadhouses]", GreedyArg = true)] //public void CmdAdminHouse(Player player, string option1 = null, string option2 = null) //{ diff --git a/ReallifeGamemode.Server/Events/Connect.cs b/ReallifeGamemode.Server/Events/Connect.cs index 1c43f5b7..2f1ce662 100644 --- a/ReallifeGamemode.Server/Events/Connect.cs +++ b/ReallifeGamemode.Server/Events/Connect.cs @@ -88,8 +88,6 @@ namespace ReallifeGamemode.Server.Events NAPI.World.RequestIpl("ferris_finale_Anim"); // Riesenrad NAPI.World.RequestIpl("Carwash_with_spinners"); // Carwash - HanfManager.UpdateHanfForPlayer(player); - TimeSpan currentTime = TimeManager.CurrentTime; bool disableLightMode = currentTime > LightModeTimeFrom && currentTime < LightModeTimeTo; diff --git a/ReallifeGamemode.Server/Events/Login.cs b/ReallifeGamemode.Server/Events/Login.cs index 328525b3..a7c1c4d5 100644 --- a/ReallifeGamemode.Server/Events/Login.cs +++ b/ReallifeGamemode.Server/Events/Login.cs @@ -115,6 +115,8 @@ namespace ReallifeGamemode.Server.Events ChatService.BroadcastGroup(msg, user.Group); } + HanfManager.UpdateHanfForPlayer(player); + string message = string.Empty; if (GlobalHelper.CustomJoinMessages.ContainsKey(player.SocialClubName)) diff --git a/ReallifeGamemode.Server/Events/Register.cs b/ReallifeGamemode.Server/Events/Register.cs index c67bd0b8..af1111e7 100644 --- a/ReallifeGamemode.Server/Events/Register.cs +++ b/ReallifeGamemode.Server/Events/Register.cs @@ -7,6 +7,7 @@ using ReallifeGamemode.Server.Extensions; using ReallifeGamemode.Server.Util; using System; using ReallifeGamemode.Database.Entities.Logs; +using ReallifeGamemode.Server.Managers; /** * @overview Life of German Reallife - Event Register (Register.cs) @@ -29,7 +30,7 @@ namespace ReallifeGamemode.Server.Events player.TriggerEvent("SERVER:Login_Error", "Das Passwort muss aus mindestens 6 Zeichen bestehen."); return; } - if (dbContext.Users.Where(u => u.SocialClubName == player.SocialClubName).Count()!= 0) + if (dbContext.Users.Where(u => u.SocialClubName == player.SocialClubName).Count() != 0) { player.TriggerEvent("SERVER:Login_Error", "Es ist schon ein Konto mit dieser Socialclub-ID registriert."); return; @@ -79,10 +80,12 @@ namespace ReallifeGamemode.Server.Events currentPlayerCreatorDimension++; NAPI.Data.SetWorldData("playerCreatorDimension", currentPlayerCreatorDimension); player.Dimension = NAPI.Data.GetWorldData("playerCreatorDimension"); - player.TriggerEvent("toggleCreator",false); + player.TriggerEvent("toggleCreator", false); player.SafeTeleport(new Vector3(402.8664, -996.4108, -99.00027)); //player.Position = new Vector3(user.PositionX, user.PositionY, user.PositionZ); + HanfManager.UpdateHanfForPlayer(player); + if (GlobalHelper.CountdownUntil > DateTime.Now) { player.TriggerEvent("countdown", (GlobalHelper.CountdownUntil - DateTime.Now).TotalSeconds, GlobalHelper.CountdownText); diff --git a/ReallifeGamemode.Server/Managers/HanfManager.cs b/ReallifeGamemode.Server/Managers/HanfManager.cs index ff74bfa5..fa1ffd2e 100644 --- a/ReallifeGamemode.Server/Managers/HanfManager.cs +++ b/ReallifeGamemode.Server/Managers/HanfManager.cs @@ -53,11 +53,23 @@ namespace ReallifeGamemode.Server.Managers /// private const string PLAYER_CURRENTLY_PLANTING_DATA_KEY = "isPlantingCannabis"; + /// + /// Ab welcher Zeit Pflanzen verwelken + /// + private static readonly TimeSpan MAX_PLANT_TIME = TimeSpan.FromHours(6); + + private static readonly TimeSpan MIN_PLANT_TIME_TO_HARVEST = TimeSpan.FromHours(4); + /// /// Timer der den Status des Verarbeiters zurücksetzt /// private static Timer _manufacturerDoneTimer = new Timer(TimeSpan.FromSeconds(10).TotalMilliseconds); + /// + /// Zufallsgenerator für weibliche Pflanze und erhaltenes Cannabis + /// + private static Random _random = new Random(); + private static List _currentCannabisData = new List(); static HanfManager() @@ -99,8 +111,13 @@ namespace ReallifeGamemode.Server.Managers private static void OnSeedBuyRangeColShapeEnter(ColShape colShape, Player player) { + if (!player.IsLoggedIn()) + { + return; + } + var user = player.GetUser(); - if (user.Faction.StateOwned) + if (user?.Faction?.StateOwned == true) { return; } @@ -245,6 +262,93 @@ namespace ReallifeGamemode.Server.Managers player.SendNotification($"Du hast {amount} Hanfsamen gekauft"); } + [RemoteEvent("CLIENT:Hanf_HarvestHanf")] + public void HanfManagerHarvestHanf(Player player, long hanfId) + { + if (!player.IsLoggedIn()) + { + return; + } + + using var dbContext = new DatabaseContext(); + + User user = player.GetUser(dbContext); + CannabisPlant plant = dbContext.CannabisPlants.Find(hanfId); + if (plant == null) + { + logger.LogError("Player {0} tried to harvest cannabis plant {1} but it was not found in database", player.Name, hanfId); + } + + if (user.Faction?.StateOwned == true && !(user.FactionId == 3 && player.IsDuty())) + { + player.SendNotification("~r~Du kannst kein Hanf ernten"); + return; + } + + if (plant.Harvested) + { + return; + } + + plant.Harvested = true; + + if (user.FactionId != 3) // Zivi / Gangmember erntet ab + { + bool isPlantRotten = DateTime.Now - plant.PlantDate > MAX_PLANT_TIME; + if (isPlantRotten) + { + player.SendNotification("~r~Die Pflanze ist leider verrottet"); + } + else + { + bool isPlantReadyToHarvest = DateTime.Now - plant.PlantDate > MIN_PLANT_TIME_TO_HARVEST; + if (!isPlantReadyToHarvest) // Wenn die Pflanze noch nicht ausgewachsen ist + { + bool getSeedBack = _random.Next(0, 2) == 1; // 50% Chance + if(getSeedBack) + { + IItem cannabisSeedItem = InventoryManager.GetItem(); + InventoryManager.AddItemToInventory(player, cannabisSeedItem.Id, 1); + player.SendNotification("~g~Du konntest den Samen wieder ausgraben"); + } + else + { + player.SendNotification("~r~Du konntest den Samen leider nicht wieder ausgraben"); + } + } + else + { + bool isFemalePlant = _random.Next(0, 10) + 1 <= 8; // 80% Chance dass es eine weibliche Pflanze ist + if (isFemalePlant) + { + int cannabisAmount = _random.Next(4, 10) + 1; // zwischen 5 und 10g Cannabis + IItem cannabisItem = InventoryManager.GetItem(); + var newWeight = cannabisAmount * cannabisItem.Gewicht; + if (!InventoryManager.CanPlayerHoldMoreWeight(player, newWeight)) + { + int restWeightPlayerCanHold = InventoryManager.MAX_USER_INVENTORY - InventoryManager.GetUserInventoryWeight(player); + cannabisAmount = restWeightPlayerCanHold / cannabisItem.Gewicht; + player.SendNotification("~o~Warnung:~s~ Du hast nicht das komplette Cannabis der Pflanze erhalten, da dein Inventar voll ist"); + } + player.SendNotification("~g~" + cannabisAmount + "g Cannabis geerntet"); + InventoryManager.AddItemToInventory(player, cannabisItem.Id, cannabisAmount); + } + else + { + player.SendNotification("~r~Du hast die falschen Samen eingesät und keinen Ertrag aus dieser Pflanze erhalten"); + } + } + } + } + else // FIB erntet ab + { + + } + + dbContext.SaveChanges(); + UpdateHanfWorldData(dbContext); + } + internal static void BuildJointsFromCannabis(Player player) { if (player.HasAnimation(_manufacturerAnim) || _manufacturerCurrentlyUsed) From 211269d03a526a6f92739511e41120e0fbf07f3a Mon Sep 17 00:00:00 2001 From: hydrant Date: Wed, 26 May 2021 21:01:36 +0200 Subject: [PATCH 74/82] wt bruch micha bekommt keine gitlab rechte mehr --- ReallifeGamemode.Server/Events/EnterVehicle.cs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/ReallifeGamemode.Server/Events/EnterVehicle.cs b/ReallifeGamemode.Server/Events/EnterVehicle.cs index 6702336d..a6e48c1f 100644 --- a/ReallifeGamemode.Server/Events/EnterVehicle.cs +++ b/ReallifeGamemode.Server/Events/EnterVehicle.cs @@ -23,7 +23,7 @@ namespace ReallifeGamemode.Server.Events if (vehicle.HasMarkerBehind()) vehicle.RemoveMarkerBehind(); - if(vehicle != null && !string.IsNullOrEmpty(client.Name)) + if (vehicle != null && !string.IsNullOrEmpty(client.Name)) { if (!VehicleManager.lastDriversInVehicle.ContainsKey(vehicle)) { @@ -39,15 +39,12 @@ namespace ReallifeGamemode.Server.Events if ((vehicle.Class != 16 && vehicle.Class != 15) && u.DriverLicenseVehicle == false) { client.SendNotification("Du besitzt keinen Führerschein!"); - return; } - - if ((vehicle.Class == 16 && u.FlyingLicensePlane == false) || (vehicle.Class == 15 && u.FlyingLicensePlane == false)) //planes = 16 helicopter = 15 + else if ((vehicle.Class == 16 && u.FlyingLicensePlane == false) || (vehicle.Class == 15 && u.FlyingLicensePlane == false)) //planes = 16 helicopter = 15 { client.SendNotification("Du besitzt keinen Flugschein!"); - return; } - + } From 60f55e0eeb0105c048a556b32953b4ab014f80ab Mon Sep 17 00:00:00 2001 From: hydrant Date: Thu, 27 May 2021 21:06:20 +0200 Subject: [PATCH 75/82] hanf vielleicht fertig --- .../Interaction/factioninteraction.ts | 31 +- ReallifeGamemode.Client/drugs/hanf.ts | 133 +- ReallifeGamemode.Client/util/animationSync.ts | 14 +- .../util/attachmentMngr.ts | 7 +- ReallifeGamemode.Database/Entities/User.cs | 4 + ...901_AddUserCannabisSeedBuyData.Designer.cs | 2229 +++++++++++++++++ ...210527144901_AddUserCannabisSeedBuyData.cs | 33 + .../DatabaseContextModelSnapshot.cs | 6 + ReallifeGamemode.Server/BaseScript.cs | 2 +- ReallifeGamemode.Server/Events/Death.cs | 8 + ReallifeGamemode.Server/Events/Disconnect.cs | 8 + ReallifeGamemode.Server/Events/Key.cs | 92 +- ReallifeGamemode.Server/Events/Vehicle.cs | 6 + .../Inventory/Interfaces/IIllegalItem.cs | 11 + .../Inventory/Items/Cannabis.cs | 6 +- .../Inventory/Items/CannabisSeeds.cs | 8 +- .../Inventory/Items/Joint.cs | 29 +- .../Managers/HanfManager.cs | 253 +- .../Managers/InteractionManager.cs | 145 ++ .../Managers/InventoryManager.cs | 27 +- 20 files changed, 2996 insertions(+), 56 deletions(-) create mode 100644 ReallifeGamemode.Database/Migrations/20210527144901_AddUserCannabisSeedBuyData.Designer.cs create mode 100644 ReallifeGamemode.Database/Migrations/20210527144901_AddUserCannabisSeedBuyData.cs create mode 100644 ReallifeGamemode.Server/Inventory/Interfaces/IIllegalItem.cs diff --git a/ReallifeGamemode.Client/Interaction/factioninteraction.ts b/ReallifeGamemode.Client/Interaction/factioninteraction.ts index 1b75b5ed..506e47a1 100644 --- a/ReallifeGamemode.Client/Interaction/factioninteraction.ts +++ b/ReallifeGamemode.Client/Interaction/factioninteraction.ts @@ -31,7 +31,7 @@ export default function factionInteraction(globalData: IGlobalData) { var ticketName: string; var pointsName: string; - var factionInteractionMenu; + var factionInteractionMenu: NativeUI.Menu; var healTaskMenuMedic; var reviveTaskMenuMedic; var insDate; @@ -42,7 +42,10 @@ export default function factionInteraction(globalData: IGlobalData) { //LSPD let ticketTaskMenuLSPD; let pointsTaskMenuLSPD; - let wantedsMenuLSPD + let wantedsMenuLSPD; + + let friskUserMenuItem: NativeUI.UIMenuItem; + let friskVehicleMenuItem: NativeUI.UIMenuItem; if (userFactionId == 1 || userFactionId == 3) { if (isDuty) { mp.gui.chat.activate(false); @@ -59,6 +62,12 @@ export default function factionInteraction(globalData: IGlobalData) { wantedsMenuLSPD = new UIMenuItem("Verbrecher Liste"); factionInteractionMenu.AddItem(wantedsMenuLSPD); + friskUserMenuItem = new UIMenuItem("Spieler durchsuchen", "Einen Spieler auf illegale Gegenstände durchsuchen."); + factionInteractionMenu.AddItem(friskUserMenuItem); + + friskVehicleMenuItem = new UIMenuItem("Fahrzeug durchsuchen", "Das nächste Fahrzeug auf illegale Gegenstände durchsuchen.") + factionInteractionMenu.AddItem(friskVehicleMenuItem); + /*TaskMenuLSPD = new UIMenuItem(""); TaskMenuLSPD.SetRightLabel(""); factionInteractionMenu.AddItem(TaskMenuLSPD);*/ //weiteres @@ -107,6 +116,20 @@ export default function factionInteraction(globalData: IGlobalData) { globalData.InMenu = false; mp.events.callRemote("CLIENT:wantedlist"); break; + + case friskUserMenuItem: + factionInteractionMenu.Visible = false; + var input = new InputHelper("Welchem Spieler möchtest du Strafpunkte geben (Name / ID)?", globalData); + input.show(); + input.getValue(name => { + mp.events.callRemote("CLIENT:InteractionMenu_LSPD_FriskUser", name); + globalData.InMenu = false; + }); + break; + + case friskVehicleMenuItem: + factionInteractionMenu.Close(); + mp.events.callRemote("CLIENT:InteractionMenu_LSPD_FriskVehicle"); } }); @@ -273,7 +296,7 @@ export default function factionInteraction(globalData: IGlobalData) { mp.gui.chat.activate(true); globalData.InMenu = false; mp.events.callRemote("updateMedicTask", 1, activeTask.Victim, true); - mp.events.call("destroyMedicTaskCheckpoint"); + mp.events.call("destroyMedicTaskCheckpoint"); break; } @@ -357,7 +380,7 @@ export default function factionInteraction(globalData: IGlobalData) { } aTask1.SetRightLabel(mp.game.gameplay.getDistanceBetweenCoords(player.position.x, player.position.y, player.position.z, tasks[i].Position.x, tasks[i].Position.y, tasks[i].Position.z, true).toFixed(2).toString() + " ~g~m"); - healTaskMenuMedic.AddItem(aTask1); + healTaskMenuMedic.AddItem(aTask1); } let backItem1 = new UIMenuItem("Zur\u00fcck", "Zur\u00fcck zur Fraktionsinteraktion."); diff --git a/ReallifeGamemode.Client/drugs/hanf.ts b/ReallifeGamemode.Client/drugs/hanf.ts index 3dd44235..4c5339c1 100644 --- a/ReallifeGamemode.Client/drugs/hanf.ts +++ b/ReallifeGamemode.Client/drugs/hanf.ts @@ -5,7 +5,7 @@ import { getAnimFromId } from "../util/animationSync"; import { getCreatedPedByName } from "../Ped/PedCreator"; import KeyBinder from 'ragemp-better-bindings'; -const hanfPlantObjects = { +export const hanfPlantObjects = { stage1: mp.game.joaat('bkr_prop_weed_bud_pruned_01a'), stage2: mp.game.joaat('bkr_prop_weed_bud_01b'), stage3: mp.game.joaat('prop_weed_02'), @@ -43,7 +43,7 @@ export default function hanfSystem(globalData: IGlobalData) { let currentlyPlanting: boolean = false; let lastPlantingState = true; - mp.events.add("SERVER:Hanf_BuySeed", price => { + mp.events.add("SERVER:Hanf_BuySeed", (maxSeedsToBuy, price) => { if (globalData.InMenu || globalData.InChat) { return; } @@ -54,7 +54,7 @@ export default function hanfSystem(globalData: IGlobalData) { var seedsToBuy = 0; - var countItems = [...Array(50).keys()].map(x => x + 1); + var countItems = [...Array(maxSeedsToBuy).keys()].map(x => x + 1); var soloPriceItem = createMenuItem("Einzelpreis", "Preis pro Samen", item => { item.SetRightLabel("$" + moneyformat(price)); @@ -93,6 +93,56 @@ export default function hanfSystem(globalData: IGlobalData) { menu.Open(); }); + mp.events.add("SERVER:Hanf_SellCannabisMenu", (maxCannabisToSell, price) => { + if (globalData.InMenu || globalData.InChat) { + return; + } + + globalData.InMenu = true; + + var menu = new Menu("Cannabis verkaufen", "Verkaufe dein Cannabis", new Point(50, 50)); + + var cannabisToSell = 0; + + var countItems = [...Array(maxCannabisToSell).keys()].map(x => x + 1); + + var soloPriceItem = createMenuItem("Einzelpreis", "Preis pro Hanfblüte", item => { + item.SetRightLabel("$" + moneyformat(price)); + }); + menu.AddItem(soloPriceItem); + + var countItem = new UIMenuListItem("Anzahl", "Wähle die Anzahl der Blüten aus", new ItemsCollection(countItems), 0); + menu.AddItem(countItem); + + var buyItem = new UIMenuItem("Verkaufen", "Verkaufe dein Cannabis"); + buyItem.BackColor = new Color(0, 100, 0); + buyItem.HighlightedBackColor = new Color(0, 150, 0); + menu.AddItem(buyItem); + + var completePriceItem = new UIMenuItem("Gesamtpreis", "Preis für alle Blüten"); + menu.AddItem(completePriceItem); + + menu.ListChange.on((item, index) => { + if (item === countItem) { + cannabisToSell = Number(countItem.SelectedValue); + completePriceItem.SetRightLabel("$" + moneyformat(cannabisToSell * price)); + } + }); + + menu.ItemSelect.on((item, index) => { + if (item === buyItem) { + mp.events.callRemote("CLIENT:Hanf_SellCannabis", cannabisToSell); + menu.Close(); + } + }); + + menu.MenuClose.on(() => { + globalData.InMenu = false; + }); + + menu.Open(); + }); + mp.events.add("SERVER:Hanf_PlayManufacturerAnim", animId => { var anim = getAnimFromId(animId); var npc = getCreatedPedByName("hanf_verarbeiter_typ"); @@ -154,9 +204,9 @@ export default function hanfSystem(globalData: IGlobalData) { return false; } - //if (!isSurfaceAllowed()) { - // return false; - //} + if (!isSurfaceAllowed()) { + return false; + } if (currentPlantingPreviewObject) { var objectPos = getPlantPreviewPosition(); @@ -177,14 +227,29 @@ export default function hanfSystem(globalData: IGlobalData) { const GET_RAYCAST_RESULT_NATIVE = "0x65287525D951F6BE"; function isSurfaceAllowed() { + return true; const player = mp.players.local; - var position = player.position; - var raycast = mp.game.invoke(RAYCAST_POINT_TO_POINT_NATIVE, position.x, position.y, position.z + 5, position.x, position.y, position.z - 5, -1, undefined, 0); + var position = getPlantPreviewPosition(); + var raycast = mp.game.invoke(RAYCAST_POINT_TO_POINT_NATIVE, position.x, position.y, position.z + 5, position.x, position.y, position.z - 5, 1, 0, 7); mp.gui.chat.push("raycast = " + raycast); - var hit: boolean, coord: Vector3Mp, surfaceNormal: Vector3Mp, materialHash: number, entityHit: EntityMp; - var raycastResult = mp.game.invoke(GET_RAYCAST_RESULT_NATIVE, raycast, hit, coord, surfaceNormal, materialHash, entityHit); + var resultObj = { + hit: [false], + coord: [new mp.Vector3()], + surface: [new mp.Vector3()], + material: [0], + entityHit: [null] + }; - mp.gui.chat.push("result: " + raycastResult + ", hit = " + hit + ", test = " + materialHash); + var raycastResult = -1; + var retries = 10; + + do { + raycastResult = mp.game.invoke(GET_RAYCAST_RESULT_NATIVE, raycast, resultObj.hit, resultObj.coord, resultObj.surface, resultObj.material, resultObj.entityHit); + retries--; + } while (raycastResult != 0 && raycastResult != 2 && retries > 0); + + + mp.gui.chat.push("result: " + raycastResult + ", result = " + JSON.stringify(resultObj)); return true; } @@ -270,17 +335,15 @@ export default function hanfSystem(globalData: IGlobalData) { mp.events.add("SERVER:Hanf_UpdateHanfData", dataJson => { mp.console.logInfo(dataJson); + var data: Array = >JSON.parse(dataJson) var newPlants = data.filter(d => currentHanfData.filter(x => x.Id === d.Id).length == 0); var removedPlants = currentHanfData.filter(d => data.filter(x => x.Id === d.Id).length == 0); var existingPlants = data.filter(d => currentHanfData.filter(x => x.Id === d.Id).length == 1); - mp.gui.chat.push(`new: ${newPlants.length}, removed: ${removedPlants.length}, existing: ${existingPlants.length}`); - newPlants.forEach(plant => { var model = getPlantModel(plant); - mp.gui.chat.push("new id: " + plant.Id + ", model = " + model); var object = mp.objects.new(getPlantModel(plant), new mp.Vector3(plant.X, plant.Y, plant.Z)); hanfDataIdToObjectMap.set(plant.Id, object); @@ -292,7 +355,6 @@ export default function hanfSystem(globalData: IGlobalData) { }); removedPlants.forEach(plant => { - //mp.gui.chat.push("removed id: " + plant.Id); var object = hanfDataIdToObjectMap.get(plant.Id); hanfDataIdToObjectMap.delete(plant.Id); object.destroy(); @@ -302,11 +364,9 @@ export default function hanfSystem(globalData: IGlobalData) { }); existingPlants.forEach(plant => { - //mp.gui.chat.push("existing plant: " + plant.Id + ", plant time = " + new Date(plant.Time).toLocaleTimeString() + ", current time = " + new Date().toLocaleTimeString()); var object = hanfDataIdToObjectMap.get(plant.Id); var model = getPlantModel(plant); if (model != object.model) { - //mp.gui.chat.push("existing plant: " + plant.Id + ", changing model to = " + model); object.destroy(); var object = mp.objects.new(model, new mp.Vector3(plant.X, plant.Y, plant.Z)); hanfDataIdToObjectMap.delete(plant.Id); @@ -341,4 +401,43 @@ export default function hanfSystem(globalData: IGlobalData) { return model; } + + mp.events.addProc("SERVER:Hanf_GetModelToGivePlayer", id => { + var plant = currentHanfData.filter(x => x.Id == id)[0]; + var model = getPlantModel(plant); + if (model == hanfPlantObjects.stage1) { + return 1; + } else if (model == hanfPlantObjects.stage3) { + return 2; + } else if (model == hanfPlantObjects.stage4) { + return 3; + } + }); + + //var rotationTestObject: ObjectMp = null; + //var a1: number, a2: number, a3: number, a4: number, a5: number, a6: number; + //mp.events.add(RageEnums.EventKey.PLAYER_COMMAND, (f) => { + // var args = f.split(' '); + // if (args[0] != "a") { + // return; + // } + + // a1 = parseFloat(args[1] || "0"); + // a2 = parseFloat(args[2] || "0"); + // a3 = parseFloat(args[3] || "0"); + // a4 = parseFloat(args[4] || "0"); + // a5 = parseFloat(args[5] || "0"); + // a6 = parseFloat(args[6] || "0"); + + // mp.gui.chat.push(`a1: ${a1.toFixed(2)}, a2: ${a2.toFixed(2)}, a3: ${a3.toFixed(2)}, a4: ${a4.toFixed(2)}, a5: ${a5.toFixed(2)}, a6: ${a6.toFixed(2)},`) + + // if (rotationTestObject != null) { + // rotationTestObject.attachTo(Number(mp.players.local.handle), mp.players.local.getBoneIndex(57005), a1, a2, a3, a4, a5, a6, true, false, false, false, 0, true); + // return; + // } + + // rotationTestObject = mp.objects.new(mp.game.joaat("prop_cs_trowel"), mp.players.local.position, { + // alpha: 255 + // }); + //}); } \ No newline at end of file diff --git a/ReallifeGamemode.Client/util/animationSync.ts b/ReallifeGamemode.Client/util/animationSync.ts index e0842af2..02f51191 100644 --- a/ReallifeGamemode.Client/util/animationSync.ts +++ b/ReallifeGamemode.Client/util/animationSync.ts @@ -4,7 +4,7 @@ const animationSyncData = { animations: [], - register: function (name, animDict, animName, duration, loop, flag, endless) { + register: function (name, animDict, animName, duration, loop, flag, endless, eventAfter: string = null) { let id = mp.game.joaat(name); if (!this.animations.hasOwnProperty(id)) { @@ -17,7 +17,8 @@ const animationSyncData = duration: duration, loop: loop, flag: flag, - endless: endless + endless: endless, + eventAfter: eventAfter }; } else { mp.game.graphics.notify("Animation Sync Error: ~r~Duplicate Entry"); @@ -50,6 +51,10 @@ export default function animationSync() { animationSyncData.register("hup", "mp_am_hold_up", "handsup_base", -1, true, 50, true); animationSyncData.register("carryBox", "anim@heists@box_carry@", "idle", -1, true, 50, true); animationSyncData.register("manufacturJoint", "anim@mp_snowball", "pickup_snowball", 1000 * 10, false, 1, false); + //animationSyncData.register("harvestPlantEnter", "amb@world_human_gardener_plant@female@enter", "enter_female", 1000 * 3.5, false, 1, false); + animationSyncData.register("harvestPlant", "amb@world_human_gardener_plant@male@base", "base", 1000 * 10, false, 1, false, "Hanf_FinishDiggingAnimation"); + //animationSyncData.register("harvestPlantExit", "amb@world_human_gardener_plant@female@exit", "exit_female", 1000 * 3.5, false, 1, false, "Hanf_FinishDiggingAnimation"); + animationSyncData.register("jointUse", "amb@world_human_smoking_pot@male@base", "base", 1000 * 10, false, 1, false); }); const animationBreakMessage = [ @@ -115,7 +120,7 @@ export default function animationSync() { let animData = animationSyncData.animations[index]; - let { id, name, animDict, animName, duration, loop, flag, endless } = animData; + let { id, name, animDict, animName, duration, loop, flag, endless, eventAfter } = animData; loadAnimDict(animDict, function () { mp.players.exists(entity) && 0 !== entity.handle && entity.taskPlayAnim(animDict, animName, 1, 0, duration, parseInt(flag), 0, !1, !1, !1) @@ -130,6 +135,9 @@ export default function animationSync() { let a = setTimeout(function () { clearTimeout(a); mp.events.callRemote("CLIENT:ClearAnimationData", true); + if (eventAfter) { + mp.events.callRemote("CLIENT:" + eventAfter); + } }, duration); } } diff --git a/ReallifeGamemode.Client/util/attachmentMngr.ts b/ReallifeGamemode.Client/util/attachmentMngr.ts index d46da114..82d32b94 100644 --- a/ReallifeGamemode.Client/util/attachmentMngr.ts +++ b/ReallifeGamemode.Client/util/attachmentMngr.ts @@ -1,4 +1,5 @@ import { IGame, IEntity } from "../game"; +import { hanfPlantObjects } from "../drugs/hanf"; export default function attachmentManager(game: IGame) { mp.events.add("SERVER:LoadAttachments", () => { @@ -9,6 +10,10 @@ export default function attachmentManager(game: IGame) { attachmentMngr.register("weapondeal1", "ex_office_swag_guns02", "chassis_dummy", new mp.Vector3(0, 0.8, 0), new mp.Vector3(0, 0, 0)); attachmentMngr.register("weapondeal2", "w_sg_pumpshotgun", "chassis_dummy", new mp.Vector3(0.4, 1.6, 0.62), new mp.Vector3(90, 0, 180)); attachmentMngr.register("handcuffs", "p_cs_cuffs_02_s", 28422, new mp.Vector3(-0.05, 0, 0), new mp.Vector3(90, 90, 0)); + attachmentMngr.register("shovel", "prop_cs_trowel", 28422, new mp.Vector3(0.1, 0.0, 0.0), new mp.Vector3(120, 70, 0)); + attachmentMngr.register("CannabisPlantInHand1", hanfPlantObjects.stage1, 28422, new mp.Vector3(), new mp.Vector3()); + attachmentMngr.register("CannabisPlantInHand2", hanfPlantObjects.stage3, 28422, new mp.Vector3(), new mp.Vector3()); + attachmentMngr.register("CannabisPlantInHand3", hanfPlantObjects.stage4, 28422, new mp.Vector3(), new mp.Vector3()); }); const attachmentMngr = @@ -140,7 +145,7 @@ export default function attachmentManager(game: IGame) { targetEntity, bone, offset.x, offset.y, offset.z, rotation.x, rotation.y, rotation.z, - false, false, false, false, 2, true + true, false, false, false, 0, true ); } diff --git a/ReallifeGamemode.Database/Entities/User.cs b/ReallifeGamemode.Database/Entities/User.cs index 197224eb..eec30f5b 100644 --- a/ReallifeGamemode.Database/Entities/User.cs +++ b/ReallifeGamemode.Database/Entities/User.cs @@ -129,6 +129,10 @@ namespace ReallifeGamemode.Database.Entities public bool FreeSurgery { get; set; } = true; + public DateTime? LastTimeBoughtCannabisSeeds { get; set; } + + public int CannabisSeedsBoughtToday { get; set; } + [NotMapped] public Player Player { diff --git a/ReallifeGamemode.Database/Migrations/20210527144901_AddUserCannabisSeedBuyData.Designer.cs b/ReallifeGamemode.Database/Migrations/20210527144901_AddUserCannabisSeedBuyData.Designer.cs new file mode 100644 index 00000000..6f55b056 --- /dev/null +++ b/ReallifeGamemode.Database/Migrations/20210527144901_AddUserCannabisSeedBuyData.Designer.cs @@ -0,0 +1,2229 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using ReallifeGamemode.Database.Models; + +namespace ReallifeGamemode.Database.Migrations +{ + [DbContext(typeof(DatabaseContext))] + [Migration("20210527144901_AddUserCannabisSeedBuyData")] + partial class AddUserCannabisSeedBuyData + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "3.1.3") + .HasAnnotation("PropertyAccessMode", PropertyAccessMode.PreferFieldDuringConstruction) + .HasAnnotation("Relational:MaxIdentifierLength", 64); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.ATM", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Active") + .HasColumnType("tinyint(1)"); + + b.Property("Balance") + .HasColumnType("int"); + + b.Property("Faulty") + .HasColumnType("tinyint(1)"); + + b.Property("X") + .HasColumnType("float"); + + b.Property("Y") + .HasColumnType("float"); + + b.Property("Z") + .HasColumnType("float"); + + b.HasKey("Id"); + + b.ToTable("ATMs"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Ban", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Applied") + .HasColumnType("int"); + + b.Property("BannedBy") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("Reason") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("UntilDateTime") + .HasColumnType("int"); + + b.Property("UserId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("Bans"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.BusRoute", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Description") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.HasKey("Id"); + + b.ToTable("BusRoutes"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.BusRoutePoint", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("BusRouteId") + .HasColumnType("int"); + + b.Property("Description") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("X") + .HasColumnType("float"); + + b.Property("Y") + .HasColumnType("float"); + + b.Property("Z") + .HasColumnType("float"); + + b.HasKey("Id"); + + b.HasIndex("BusRouteId"); + + b.ToTable("BusRoutesPoints"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.BusinessBankAccount", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Balance") + .HasColumnType("int"); + + b.Property("BusinessId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("BusinessId") + .IsUnique(); + + b.ToTable("BusinessBankAccounts"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.BusinessData", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("BusinessId") + .HasColumnType("int"); + + b.Property("Price") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("BusinessData"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.CannabisPlant", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + b.Property("Harvested") + .HasColumnType("tinyint(1)"); + + b.Property("PlantDate") + .HasColumnType("datetime(6)"); + + b.Property("PlantedById") + .HasColumnType("int"); + + b.Property("X") + .HasColumnType("float"); + + b.Property("Y") + .HasColumnType("float"); + + b.Property("Z") + .HasColumnType("float"); + + b.HasKey("Id"); + + b.HasIndex("PlantedById"); + + b.ToTable("CannabisPlants"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Character", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Ageing") + .HasColumnType("tinyint unsigned"); + + b.Property("AgeingOpacity") + .HasColumnType("float"); + + b.Property("BeardColor") + .HasColumnType("tinyint unsigned"); + + b.Property("Blemishes") + .HasColumnType("tinyint unsigned"); + + b.Property("BlemishesOpacity") + .HasColumnType("float"); + + b.Property("Blush") + .HasColumnType("tinyint unsigned"); + + b.Property("BlushColor") + .HasColumnType("tinyint unsigned"); + + b.Property("BlushOpacity") + .HasColumnType("float"); + + b.Property("BrowDepth") + .HasColumnType("float"); + + b.Property("BrowHeight") + .HasColumnType("float"); + + b.Property("CheekDepth") + .HasColumnType("float"); + + b.Property("CheekboneHeight") + .HasColumnType("float"); + + b.Property("CheekboneWidth") + .HasColumnType("float"); + + b.Property("ChestHair") + .HasColumnType("tinyint unsigned"); + + b.Property("ChestHairColor") + .HasColumnType("tinyint unsigned"); + + b.Property("ChestHairOpacity") + .HasColumnType("float"); + + b.Property("ChinDepth") + .HasColumnType("float"); + + b.Property("ChinHeight") + .HasColumnType("float"); + + b.Property("ChinIndent") + .HasColumnType("float"); + + b.Property("ChinWidth") + .HasColumnType("float"); + + b.Property("Complexion") + .HasColumnType("tinyint unsigned"); + + b.Property("ComplexionOpacity") + .HasColumnType("float"); + + b.Property("EyeColor") + .HasColumnType("tinyint unsigned"); + + b.Property("EyeSize") + .HasColumnType("float"); + + b.Property("EyebrowColor") + .HasColumnType("tinyint unsigned"); + + b.Property("Eyebrows") + .HasColumnType("tinyint unsigned"); + + b.Property("EyebrowsOpacity") + .HasColumnType("float"); + + b.Property("FacialHair") + .HasColumnType("tinyint unsigned"); + + b.Property("FacialHairOpacity") + .HasColumnType("float"); + + b.Property("Father") + .HasColumnType("tinyint unsigned"); + + b.Property("Freckles") + .HasColumnType("tinyint unsigned"); + + b.Property("FrecklesOpacity") + .HasColumnType("float"); + + b.Property("Gender") + .HasColumnType("tinyint(1)"); + + b.Property("Hair") + .HasColumnType("tinyint unsigned"); + + b.Property("HairColor") + .HasColumnType("tinyint unsigned"); + + b.Property("HairHighlightColor") + .HasColumnType("tinyint unsigned"); + + b.Property("JawShape") + .HasColumnType("float"); + + b.Property("JawWidth") + .HasColumnType("float"); + + b.Property("LipThickness") + .HasColumnType("float"); + + b.Property("Lipstick") + .HasColumnType("tinyint unsigned"); + + b.Property("LipstickColor") + .HasColumnType("tinyint unsigned"); + + b.Property("LipstickOpacity") + .HasColumnType("float"); + + b.Property("Makeup") + .HasColumnType("tinyint unsigned"); + + b.Property("MakeupOpacity") + .HasColumnType("float"); + + b.Property("Mother") + .HasColumnType("tinyint unsigned"); + + b.Property("NeckWidth") + .HasColumnType("float"); + + b.Property("NoseBottomHeight") + .HasColumnType("float"); + + b.Property("NoseBridgeDepth") + .HasColumnType("float"); + + b.Property("NoseBroken") + .HasColumnType("float"); + + b.Property("NoseTipHeight") + .HasColumnType("float"); + + b.Property("NoseTipLength") + .HasColumnType("float"); + + b.Property("NoseWidth") + .HasColumnType("float"); + + b.Property("Similarity") + .HasColumnType("float"); + + b.Property("SkinSimilarity") + .HasColumnType("float"); + + b.Property("SunDamage") + .HasColumnType("tinyint unsigned"); + + b.Property("SunDamageOpacity") + .HasColumnType("float"); + + b.Property("UserId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("Characters"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.CharacterCloth", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("ClothId") + .HasColumnType("int"); + + b.Property("Duty") + .HasColumnType("tinyint(1)"); + + b.Property("SlotId") + .HasColumnType("int"); + + b.Property("SlotType") + .HasColumnType("tinyint unsigned"); + + b.Property("Texture") + .HasColumnType("int"); + + b.Property("UserId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("CharacterClothes"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.ClothCombination", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Gender") + .HasColumnType("tinyint(1)"); + + b.Property("Top") + .HasColumnType("int"); + + b.Property("Torso") + .HasColumnType("int"); + + b.Property("Undershirt") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("ClothCombinations"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Door", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("AlwaysOpen") + .HasColumnType("tinyint(1)"); + + b.Property("Category") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("FactionId") + .HasColumnType("int"); + + b.Property("Locked") + .HasColumnType("tinyint(1)"); + + b.Property("Model") + .HasColumnType("int"); + + b.Property("Name") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("Radius") + .HasColumnType("float"); + + b.Property("X") + .HasColumnType("float"); + + b.Property("Y") + .HasColumnType("float"); + + b.Property("Z") + .HasColumnType("float"); + + b.HasKey("Id"); + + b.HasIndex("FactionId"); + + b.ToTable("Doors"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.DutyCloth", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("ClothId") + .HasColumnType("int"); + + b.Property("FactionId") + .HasColumnType("int"); + + b.Property("Gender") + .HasColumnType("tinyint(1)"); + + b.Property("SlotId") + .HasColumnType("int"); + + b.Property("SlotType") + .HasColumnType("tinyint unsigned"); + + b.HasKey("Id"); + + b.HasIndex("FactionId"); + + b.ToTable("DutyClothes"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Faction", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("BankAccountId") + .HasColumnType("int"); + + b.Property("GangOwned") + .HasColumnType("tinyint(1)"); + + b.Property("Name") + .HasColumnType("varchar(32) CHARACTER SET utf8mb4") + .HasMaxLength(32); + + b.Property("StateOwned") + .HasColumnType("tinyint(1)"); + + b.Property("WeaponDealTime") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("BankAccountId"); + + b.ToTable("Factions"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.FactionBankAccount", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Active") + .HasColumnType("tinyint(1)"); + + b.Property("Balance") + .HasColumnType("int"); + + b.Property("Bic") + .HasColumnType("varchar(12) CHARACTER SET utf8mb4") + .HasMaxLength(12); + + b.Property("Iban") + .HasColumnType("varchar(32) CHARACTER SET utf8mb4") + .HasMaxLength(32); + + b.HasKey("Id"); + + b.ToTable("FactionBankAccounts"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.FactionRank", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("FactionId") + .HasColumnType("int"); + + b.Property("Order") + .HasColumnType("int"); + + b.Property("RankName") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.HasKey("Id"); + + b.HasIndex("FactionId"); + + b.ToTable("FactionRanks"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.FactionWeapon", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Ammount") + .HasColumnType("int"); + + b.Property("FactionId") + .HasColumnType("int"); + + b.Property("Rank") + .HasColumnType("int"); + + b.Property("SlotID") + .HasColumnType("int"); + + b.Property("WeaponModel") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.HasKey("Id"); + + b.HasIndex("FactionId"); + + b.ToTable("FactionWeapons"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.GotoPoint", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Active") + .HasColumnType("tinyint(1)"); + + b.Property("Description") + .HasColumnType("varchar(32) CHARACTER SET utf8mb4") + .HasMaxLength(32); + + b.Property("X") + .HasColumnType("float"); + + b.Property("Y") + .HasColumnType("float"); + + b.Property("Z") + .HasColumnType("float"); + + b.HasKey("Id"); + + b.ToTable("GotoPoints"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Group", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("BankAccountId") + .HasColumnType("int"); + + b.Property("Name") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.HasKey("Id"); + + b.HasIndex("BankAccountId"); + + b.ToTable("Groups"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.GroupBankAccount", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Balance") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("GroupBankAccounts"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.House", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("BankAccountId") + .HasColumnType("int"); + + b.Property("CanRentIn") + .HasColumnType("tinyint(1)"); + + b.Property("LastRentSetTime") + .HasColumnType("datetime(6)"); + + b.Property("OwnerId") + .HasColumnType("int"); + + b.Property("Price") + .HasColumnType("int"); + + b.Property("RentalFee") + .HasColumnType("int"); + + b.Property("Type") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("X") + .HasColumnType("float"); + + b.Property("Y") + .HasColumnType("float"); + + b.Property("Z") + .HasColumnType("float"); + + b.HasKey("Id"); + + b.HasIndex("BankAccountId"); + + b.HasIndex("OwnerId"); + + b.ToTable("Houses"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.HouseBankAccount", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Balance") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("HouseBankAccounts"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.HouseRental", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("HouseId") + .HasColumnType("int"); + + b.Property("UserId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("HouseId"); + + b.HasIndex("UserId"); + + b.ToTable("HouseRentals"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Interior", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("EnterPositionStr") + .HasColumnName("EnterPosition") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("ExitPositionStr") + .HasColumnName("ExitPosition") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("Name") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.HasKey("Id"); + + b.ToTable("Interiors"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Location", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Description") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("Heading") + .HasColumnType("double"); + + b.Property("X") + .HasColumnType("double"); + + b.Property("Y") + .HasColumnType("double"); + + b.Property("Z") + .HasColumnType("double"); + + b.HasKey("Id"); + + b.ToTable("Locations"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Logs.BankAccountTransactionHistory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Fee") + .HasColumnType("int"); + + b.Property("MoneySent") + .HasColumnType("int"); + + b.Property("NewReceiverBalance") + .HasColumnType("int"); + + b.Property("NewSenderBalance") + .HasColumnType("int"); + + b.Property("Origin") + .HasColumnType("varchar(32) CHARACTER SET utf8mb4") + .HasMaxLength(32); + + b.Property("Receiver") + .HasColumnType("varchar(32) CHARACTER SET utf8mb4") + .HasMaxLength(32); + + b.Property("ReceiverBalance") + .HasColumnType("int"); + + b.Property("Sender") + .HasColumnType("varchar(32) CHARACTER SET utf8mb4") + .HasMaxLength(32); + + b.Property("SenderBalance") + .HasColumnType("int"); + + b.Property("Timestamp") + .ValueGeneratedOnAdd() + .HasColumnType("datetime(6)"); + + b.HasKey("Id"); + + b.ToTable("BankAccountTransactionLogs"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Logs.Chat.ChatLogEntry", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + b.Property("Discriminator") + .IsRequired() + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("Text") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("Time") + .ValueGeneratedOnAdd() + .HasColumnType("datetime(6)"); + + b.Property("UserId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("ChatLogs"); + + b.HasDiscriminator("Discriminator").HasValue("ChatLogEntry"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Logs.CommandLogEntry", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + b.Property("Command") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("Time") + .HasColumnType("datetime(6)"); + + b.Property("UserId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("CommandLogs"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Logs.Death", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CauseOfDeath") + .HasColumnType("varchar(64) CHARACTER SET utf8mb4") + .HasMaxLength(64); + + b.Property("KillerHeading") + .HasColumnType("float"); + + b.Property("KillerId") + .HasColumnType("int"); + + b.Property("KillerPositionX") + .HasColumnType("float"); + + b.Property("KillerPositionY") + .HasColumnType("float"); + + b.Property("KillerPositionZ") + .HasColumnType("float"); + + b.Property("Timestamp") + .ValueGeneratedOnAdd() + .HasColumnType("datetime(6)"); + + b.Property("VictimHeading") + .HasColumnType("float"); + + b.Property("VictimId") + .HasColumnType("int"); + + b.Property("VictimPositionX") + .HasColumnType("float"); + + b.Property("VictimPositionY") + .HasColumnType("float"); + + b.Property("VictimPositionZ") + .HasColumnType("float"); + + b.HasKey("Id"); + + b.HasIndex("KillerId"); + + b.HasIndex("VictimId"); + + b.ToTable("DeathLogs"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Logs.LoginLogoutLogEntry", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + b.Property("IpAddress") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("LoginLogout") + .HasColumnType("tinyint(1)"); + + b.Property("PlayerId") + .HasColumnType("bigint"); + + b.Property("SocialClubName") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("Time") + .HasColumnType("datetime(6)"); + + b.Property("UserId") + .HasColumnType("int"); + + b.Property("Username") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("LoginLogoutLogs"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.News", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Active") + .HasColumnType("tinyint(1)"); + + b.Property("Caption") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("Content") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("Timestamp") + .HasColumnType("int"); + + b.Property("UserId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("News"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Saves.SavedBlip", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Active") + .HasColumnType("tinyint(1)"); + + b.Property("Alpha") + .HasColumnType("tinyint unsigned"); + + b.Property("Color") + .HasColumnType("tinyint unsigned"); + + b.Property("Dimension") + .HasColumnType("tinyint unsigned"); + + b.Property("DrawDistance") + .HasColumnType("float"); + + b.Property("Name") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("PositionX") + .HasColumnType("float"); + + b.Property("PositionY") + .HasColumnType("float"); + + b.Property("PositionZ") + .HasColumnType("float"); + + b.Property("Rotation") + .HasColumnType("float"); + + b.Property("Scale") + .HasColumnType("float"); + + b.Property("ShortRange") + .HasColumnType("tinyint(1)"); + + b.Property("Sprite") + .HasColumnType("smallint"); + + b.HasKey("Id"); + + b.ToTable("Blips"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Saves.SavedMarker", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Active") + .HasColumnType("tinyint(1)"); + + b.Property("ColorA") + .HasColumnType("tinyint unsigned"); + + b.Property("ColorB") + .HasColumnType("tinyint unsigned"); + + b.Property("ColorG") + .HasColumnType("tinyint unsigned"); + + b.Property("ColorR") + .HasColumnType("tinyint unsigned"); + + b.Property("Dimension") + .HasColumnType("tinyint unsigned"); + + b.Property("DirectionX") + .HasColumnType("float"); + + b.Property("DirectionY") + .HasColumnType("float"); + + b.Property("DirectionZ") + .HasColumnType("float"); + + b.Property("PositionX") + .HasColumnType("float"); + + b.Property("PositionY") + .HasColumnType("float"); + + b.Property("PositionZ") + .HasColumnType("float"); + + b.Property("RotationX") + .HasColumnType("float"); + + b.Property("RotationY") + .HasColumnType("float"); + + b.Property("RotationZ") + .HasColumnType("float"); + + b.Property("Scale") + .HasColumnType("float"); + + b.Property("Type") + .HasColumnType("tinyint unsigned"); + + b.Property("Visible") + .HasColumnType("tinyint(1)"); + + b.HasKey("Id"); + + b.ToTable("Markers"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Saves.SavedPed", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Active") + .HasColumnType("tinyint(1)"); + + b.Property("Dimension") + .HasColumnType("tinyint unsigned"); + + b.Property("HashModel") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("Heading") + .HasColumnType("float"); + + b.Property("PositionX") + .HasColumnType("float"); + + b.Property("PositionY") + .HasColumnType("float"); + + b.Property("PositionZ") + .HasColumnType("float"); + + b.Property("Type") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("Peds"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Saves.SavedPickup", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Active") + .HasColumnType("tinyint(1)"); + + b.Property("Dimension") + .HasColumnType("tinyint unsigned"); + + b.Property("PositionX") + .HasColumnType("float") + .HasMaxLength(128); + + b.Property("PositionY") + .HasColumnType("float"); + + b.Property("PositionZ") + .HasColumnType("float"); + + b.Property("RespawnTime") + .HasColumnType("int"); + + b.Property("RotationX") + .HasColumnType("float"); + + b.Property("RotationY") + .HasColumnType("float"); + + b.Property("RotationZ") + .HasColumnType("float"); + + b.Property("Vehicle") + .HasColumnType("tinyint(1)"); + + b.HasKey("Id"); + + b.ToTable("Pickups"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Saves.SavedTextLabel", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Active") + .HasColumnType("tinyint(1)"); + + b.Property("ColorA") + .HasColumnType("tinyint unsigned"); + + b.Property("ColorB") + .HasColumnType("tinyint unsigned"); + + b.Property("ColorG") + .HasColumnType("tinyint unsigned"); + + b.Property("ColorR") + .HasColumnType("tinyint unsigned"); + + b.Property("Dimension") + .HasColumnType("tinyint unsigned"); + + b.Property("DrawDistance") + .HasColumnType("float"); + + b.Property("Font") + .HasColumnType("tinyint unsigned"); + + b.Property("LOS") + .HasColumnType("tinyint(1)"); + + b.Property("PositionX") + .HasColumnType("float"); + + b.Property("PositionY") + .HasColumnType("float"); + + b.Property("PositionZ") + .HasColumnType("float"); + + b.Property("Text") + .IsRequired() + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.HasKey("Id"); + + b.ToTable("TextLabels"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.ServerVariable", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Value") + .HasColumnType("int"); + + b.Property("Variable") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.HasKey("Id"); + + b.ToTable("ServerVariables"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.ServerVehicle", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Active") + .ValueGeneratedOnAdd() + .HasColumnType("tinyint(1)") + .HasDefaultValue(true); + + b.Property("Discriminator") + .IsRequired() + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("DistanceDriven") + .HasColumnType("float"); + + b.Property("Heading") + .HasColumnType("float"); + + b.Property("Livery") + .HasColumnType("int"); + + b.Property("Locked") + .HasColumnType("tinyint(1)"); + + b.Property("Model") + .HasColumnType("int unsigned"); + + b.Property("NumberPlate") + .HasColumnType("varchar(8) CHARACTER SET utf8mb4") + .HasMaxLength(8); + + b.Property("PositionX") + .HasColumnType("float"); + + b.Property("PositionY") + .HasColumnType("float"); + + b.Property("PositionZ") + .HasColumnType("float"); + + b.Property("PrimaryColor") + .HasColumnType("int"); + + b.Property("SecondaryColor") + .HasColumnType("int"); + + b.Property("TankAmount") + .HasColumnType("float"); + + b.HasKey("Id"); + + b.ToTable("ServerVehicles"); + + b.HasDiscriminator("Discriminator").HasValue("ServerVehicle"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.ShopClothe", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Category") + .HasColumnType("int"); + + b.Property("ClotheId") + .HasColumnType("int"); + + b.Property("ComponentId") + .HasColumnType("int"); + + b.Property("Gender") + .HasColumnType("tinyint(1)"); + + b.Property("Price") + .HasColumnType("int"); + + b.Property("TypeId") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.HasKey("Id"); + + b.ToTable("ShopClothes"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.ShopItem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Amount") + .HasColumnType("int"); + + b.Property("ItemId") + .HasColumnType("int"); + + b.Property("Price") + .HasColumnType("int"); + + b.Property("ShopId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("ShopItems"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.TuningGarage", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("X") + .HasColumnType("float"); + + b.Property("Y") + .HasColumnType("float"); + + b.Property("Z") + .HasColumnType("float"); + + b.HasKey("Id"); + + b.ToTable("TuningGarages"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Turfs", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Color") + .HasColumnType("int"); + + b.Property("FactionId") + .HasColumnType("int"); + + b.Property("MaxValue") + .HasColumnType("int"); + + b.Property("Name") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("Owner") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("Range") + .HasColumnType("float"); + + b.Property("Rotation") + .HasColumnType("float"); + + b.Property("Surplus") + .HasColumnType("tinyint(1)"); + + b.Property("Value") + .HasColumnType("int"); + + b.Property("Vector") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("X") + .HasColumnType("float"); + + b.Property("Y") + .HasColumnType("float"); + + b.HasKey("Id"); + + b.ToTable("Turfs"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.User", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("AdminLevel") + .HasColumnType("int"); + + b.Property("BanId") + .HasColumnType("int"); + + b.Property("BankAccountId") + .HasColumnType("int"); + + b.Property("BusSkill") + .HasColumnType("int"); + + b.Property("BusinessId") + .HasColumnType("int"); + + b.Property("CannabisSeedsBoughtToday") + .HasColumnType("int"); + + b.Property("CharacterId") + .HasColumnType("int"); + + b.Property("Dead") + .HasColumnType("tinyint(1)"); + + b.Property("DriverLicenseBike") + .HasColumnType("tinyint(1)"); + + b.Property("DriverLicenseVehicle") + .HasColumnType("tinyint(1)"); + + b.Property("Email") + .HasColumnType("varchar(64) CHARACTER SET utf8mb4") + .HasMaxLength(64); + + b.Property("FactionId") + .HasColumnType("int"); + + b.Property("FactionLeader") + .HasColumnType("tinyint(1)"); + + b.Property("FactionRankId") + .HasColumnType("int"); + + b.Property("FlyingLicensePlane") + .HasColumnType("tinyint(1)"); + + b.Property("FreeSurgery") + .HasColumnType("tinyint(1)"); + + b.Property("GroupId") + .HasColumnType("int"); + + b.Property("GroupRank") + .HasColumnType("int"); + + b.Property("Handmoney") + .HasColumnType("int"); + + b.Property("HouseId") + .HasColumnType("int"); + + b.Property("JailTime") + .HasColumnType("int"); + + b.Property("JobId") + .HasColumnType("int"); + + b.Property("LastTimeBoughtCannabisSeeds") + .HasColumnType("datetime(6)"); + + b.Property("LogUserId") + .HasColumnType("int"); + + b.Property("Name") + .HasColumnType("varchar(32) CHARACTER SET utf8mb4") + .HasMaxLength(32); + + b.Property("Password") + .HasColumnType("varchar(64) CHARACTER SET utf8mb4") + .HasMaxLength(64); + + b.Property("PaydayTimer") + .HasColumnType("int"); + + b.Property("PilotSkill") + .HasColumnType("int"); + + b.Property("PlayedMinutes") + .HasColumnType("int"); + + b.Property("Points") + .HasColumnType("int"); + + b.Property("PositionX") + .HasColumnType("float"); + + b.Property("PositionY") + .HasColumnType("float"); + + b.Property("PositionZ") + .HasColumnType("float"); + + b.Property("RegistrationDate") + .ValueGeneratedOnAdd() + .HasColumnType("datetime(6)"); + + b.Property("SocialClubName") + .HasColumnType("varchar(32) CHARACTER SET utf8mb4") + .HasMaxLength(32); + + b.Property("Wage") + .HasColumnType("int"); + + b.Property("Wanteds") + .HasColumnType("int"); + + b.Property("WeaponLicense") + .HasColumnType("tinyint(1)"); + + b.Property("failpoints") + .HasColumnType("int"); + + b.Property("otheramount") + .HasColumnType("int"); + + b.Property("trashcount") + .HasColumnType("int"); + + b.Property("warn") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("BanId"); + + b.HasIndex("BankAccountId"); + + b.HasIndex("BusinessId") + .IsUnique(); + + b.HasIndex("CharacterId"); + + b.HasIndex("FactionId"); + + b.HasIndex("FactionRankId"); + + b.HasIndex("GroupId"); + + b.HasIndex("HouseId"); + + b.HasIndex("Name") + .IsUnique(); + + b.ToTable("Users"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.UserBankAccount", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Active") + .HasColumnType("tinyint(1)"); + + b.Property("Balance") + .HasColumnType("int"); + + b.Property("Bic") + .HasColumnType("varchar(12) CHARACTER SET utf8mb4") + .HasMaxLength(12); + + b.Property("Iban") + .HasColumnType("varchar(32) CHARACTER SET utf8mb4") + .HasMaxLength(32); + + b.HasKey("Id"); + + b.ToTable("UserBankAccounts"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.UserItem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Amount") + .HasColumnType("int"); + + b.Property("ItemId") + .HasColumnType("int"); + + b.Property("Slot") + .HasColumnType("int"); + + b.Property("UserId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("UserItems"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.UserWeapon", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Ammo") + .HasColumnType("int"); + + b.Property("UserId") + .HasColumnType("int"); + + b.Property("WeaponId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.HasIndex("WeaponId"); + + b.ToTable("UserWeapons"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.VehicleItem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Amount") + .HasColumnType("int"); + + b.Property("ItemId") + .HasColumnType("int"); + + b.Property("Slot") + .HasColumnType("int"); + + b.Property("VehicleId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("VehicleId"); + + b.ToTable("VehicleItems"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.VehicleMod", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("ModId") + .HasColumnType("int"); + + b.Property("ServerVehicleId") + .HasColumnType("int"); + + b.Property("Slot") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("ServerVehicleId", "Slot") + .IsUnique(); + + b.ToTable("VehicleMods"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Weapon", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Ammo") + .HasColumnType("int"); + + b.Property("AmmunationActive") + .HasColumnType("tinyint(1)"); + + b.Property("CategoryId") + .HasColumnType("int"); + + b.Property("Legal") + .HasColumnType("tinyint(1)"); + + b.Property("Price") + .HasColumnType("float"); + + b.Property("SlotID") + .HasColumnType("int"); + + b.Property("WeaponModel") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.HasKey("Id"); + + b.HasIndex("CategoryId"); + + b.ToTable("Weapons"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.WeaponCategory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Category") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.HasKey("Id"); + + b.ToTable("WeaponCategories"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Whitelist", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("SocialClubName") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.HasKey("Id"); + + b.ToTable("WhitelistEntries"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Logs.Chat.DepartmentChatLogEntry", b => + { + b.HasBaseType("ReallifeGamemode.Database.Entities.Logs.Chat.ChatLogEntry"); + + b.HasDiscriminator().HasValue("DepartmentChatLogEntry"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Logs.Chat.FactionChatLogEntry", b => + { + b.HasBaseType("ReallifeGamemode.Database.Entities.Logs.Chat.ChatLogEntry"); + + b.Property("FactionId") + .HasColumnType("int"); + + b.HasIndex("FactionId"); + + b.HasDiscriminator().HasValue("FactionChatLogEntry"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Logs.Chat.GangChatLogEntry", b => + { + b.HasBaseType("ReallifeGamemode.Database.Entities.Logs.Chat.ChatLogEntry"); + + b.HasDiscriminator().HasValue("GangChatLogEntry"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Logs.Chat.GroupChatLogEntry", b => + { + b.HasBaseType("ReallifeGamemode.Database.Entities.Logs.Chat.ChatLogEntry"); + + b.Property("GroupId") + .HasColumnType("int"); + + b.HasIndex("GroupId"); + + b.HasDiscriminator().HasValue("GroupChatLogEntry"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Logs.Chat.LeaderChatLogEntry", b => + { + b.HasBaseType("ReallifeGamemode.Database.Entities.Logs.Chat.ChatLogEntry"); + + b.HasDiscriminator().HasValue("LeaderChatLogEntry"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Logs.Chat.LocalChatLogEntry", b => + { + b.HasBaseType("ReallifeGamemode.Database.Entities.Logs.Chat.ChatLogEntry"); + + b.HasDiscriminator().HasValue("LocalChatLogEntry"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Logs.Chat.NewsChatLogEntry", b => + { + b.HasBaseType("ReallifeGamemode.Database.Entities.Logs.Chat.ChatLogEntry"); + + b.HasDiscriminator().HasValue("NewsChatLogEntry"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Logs.Chat.OChatLogEntry", b => + { + b.HasBaseType("ReallifeGamemode.Database.Entities.Logs.Chat.ChatLogEntry"); + + b.HasDiscriminator().HasValue("OChatLogEntry"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.FactionVehicle", b => + { + b.HasBaseType("ReallifeGamemode.Database.Entities.ServerVehicle"); + + b.Property("BuyPrice") + .HasColumnType("int"); + + b.Property("Owners") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.ToTable("FactionVehicles"); + + b.HasDiscriminator().HasValue("FactionVehicle"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.GroupVehicle", b => + { + b.HasBaseType("ReallifeGamemode.Database.Entities.ServerVehicle"); + + b.Property("GroupId") + .HasColumnType("int"); + + b.HasIndex("GroupId"); + + b.HasDiscriminator().HasValue("GroupVehicle"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.JobVehicle", b => + { + b.HasBaseType("ReallifeGamemode.Database.Entities.ServerVehicle"); + + b.Property("JobId") + .HasColumnType("int"); + + b.HasDiscriminator().HasValue("JobVehicle"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.NoobSpawnVehicle", b => + { + b.HasBaseType("ReallifeGamemode.Database.Entities.ServerVehicle"); + + b.HasDiscriminator().HasValue("NoobSpawnVehicle"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.NoobVehicle", b => + { + b.HasBaseType("ReallifeGamemode.Database.Entities.ServerVehicle"); + + b.HasDiscriminator().HasValue("NoobVehicle"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Saves.SavedVehicle", b => + { + b.HasBaseType("ReallifeGamemode.Database.Entities.ServerVehicle"); + + b.HasDiscriminator().HasValue("SavedVehicle"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.SchoolVehicle", b => + { + b.HasBaseType("ReallifeGamemode.Database.Entities.ServerVehicle"); + + b.Property("SchoolId") + .HasColumnType("int"); + + b.HasDiscriminator().HasValue("SchoolVehicle"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.ShopVehicle", b => + { + b.HasBaseType("ReallifeGamemode.Database.Entities.ServerVehicle"); + + b.Property("BusinessId") + .HasColumnType("int"); + + b.Property("Price") + .HasColumnType("int"); + + b.ToTable("ShopVehicles"); + + b.HasDiscriminator().HasValue("ShopVehicle"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.UserVehicle", b => + { + b.HasBaseType("ReallifeGamemode.Database.Entities.ServerVehicle"); + + b.Property("BusinessId") + .HasColumnName("UserVehicle_BusinessId") + .HasColumnType("int"); + + b.Property("Price") + .HasColumnName("UserVehicle_Price") + .HasColumnType("int"); + + b.Property("UserId") + .HasColumnType("int"); + + b.HasIndex("UserId"); + + b.ToTable("UserVehicles"); + + b.HasDiscriminator().HasValue("UserVehicle"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Ban", b => + { + b.HasOne("ReallifeGamemode.Database.Entities.User", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.BusRoutePoint", b => + { + b.HasOne("ReallifeGamemode.Database.Entities.BusRoute", "BusRoute") + .WithMany("RoutePoints") + .HasForeignKey("BusRouteId"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.CannabisPlant", b => + { + b.HasOne("ReallifeGamemode.Database.Entities.User", "PlantedBy") + .WithMany() + .HasForeignKey("PlantedById") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Character", b => + { + b.HasOne("ReallifeGamemode.Database.Entities.User", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.CharacterCloth", b => + { + b.HasOne("ReallifeGamemode.Database.Entities.User", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Door", b => + { + b.HasOne("ReallifeGamemode.Database.Entities.Faction", "Faction") + .WithMany() + .HasForeignKey("FactionId"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.DutyCloth", b => + { + b.HasOne("ReallifeGamemode.Database.Entities.Faction", "Faction") + .WithMany() + .HasForeignKey("FactionId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Faction", b => + { + b.HasOne("ReallifeGamemode.Database.Entities.FactionBankAccount", "BankAccount") + .WithMany() + .HasForeignKey("BankAccountId"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.FactionRank", b => + { + b.HasOne("ReallifeGamemode.Database.Entities.Faction", "Faction") + .WithMany() + .HasForeignKey("FactionId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.FactionWeapon", b => + { + b.HasOne("ReallifeGamemode.Database.Entities.Faction", "Faction") + .WithMany() + .HasForeignKey("FactionId"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Group", b => + { + b.HasOne("ReallifeGamemode.Database.Entities.GroupBankAccount", "BankAccount") + .WithMany() + .HasForeignKey("BankAccountId"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.House", b => + { + b.HasOne("ReallifeGamemode.Database.Entities.HouseBankAccount", "BankAccount") + .WithMany() + .HasForeignKey("BankAccountId"); + + b.HasOne("ReallifeGamemode.Database.Entities.User", "Owner") + .WithMany() + .HasForeignKey("OwnerId"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.HouseRental", b => + { + b.HasOne("ReallifeGamemode.Database.Entities.House", "House") + .WithMany("Rentals") + .HasForeignKey("HouseId"); + + b.HasOne("ReallifeGamemode.Database.Entities.User", "User") + .WithMany() + .HasForeignKey("UserId"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Logs.Chat.ChatLogEntry", b => + { + b.HasOne("ReallifeGamemode.Database.Entities.User", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Logs.CommandLogEntry", b => + { + b.HasOne("ReallifeGamemode.Database.Entities.User", "User") + .WithMany() + .HasForeignKey("UserId"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Logs.Death", b => + { + b.HasOne("ReallifeGamemode.Database.Entities.User", "Killer") + .WithMany() + .HasForeignKey("KillerId"); + + b.HasOne("ReallifeGamemode.Database.Entities.User", "Victim") + .WithMany() + .HasForeignKey("VictimId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Logs.LoginLogoutLogEntry", b => + { + b.HasOne("ReallifeGamemode.Database.Entities.User", "User") + .WithMany() + .HasForeignKey("UserId"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.News", b => + { + b.HasOne("ReallifeGamemode.Database.Entities.User", "User") + .WithMany() + .HasForeignKey("UserId"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.User", b => + { + b.HasOne("ReallifeGamemode.Database.Entities.Ban", "Ban") + .WithMany() + .HasForeignKey("BanId"); + + b.HasOne("ReallifeGamemode.Database.Entities.UserBankAccount", "BankAccount") + .WithMany() + .HasForeignKey("BankAccountId"); + + b.HasOne("ReallifeGamemode.Database.Entities.Character", "Character") + .WithMany() + .HasForeignKey("CharacterId"); + + b.HasOne("ReallifeGamemode.Database.Entities.Faction", "Faction") + .WithMany() + .HasForeignKey("FactionId"); + + b.HasOne("ReallifeGamemode.Database.Entities.FactionRank", "FactionRank") + .WithMany() + .HasForeignKey("FactionRankId"); + + b.HasOne("ReallifeGamemode.Database.Entities.Group", "Group") + .WithMany() + .HasForeignKey("GroupId"); + + b.HasOne("ReallifeGamemode.Database.Entities.House", "House") + .WithMany() + .HasForeignKey("HouseId"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.UserItem", b => + { + b.HasOne("ReallifeGamemode.Database.Entities.User", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.UserWeapon", b => + { + b.HasOne("ReallifeGamemode.Database.Entities.User", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("ReallifeGamemode.Database.Entities.Weapon", "Weapon") + .WithMany() + .HasForeignKey("WeaponId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.VehicleItem", b => + { + b.HasOne("ReallifeGamemode.Database.Entities.ServerVehicle", "Vehicle") + .WithMany() + .HasForeignKey("VehicleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.VehicleMod", b => + { + b.HasOne("ReallifeGamemode.Database.Entities.ServerVehicle", "Vehicle") + .WithMany() + .HasForeignKey("ServerVehicleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Weapon", b => + { + b.HasOne("ReallifeGamemode.Database.Entities.WeaponCategory", "WeaponCategory") + .WithMany() + .HasForeignKey("CategoryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Logs.Chat.FactionChatLogEntry", b => + { + b.HasOne("ReallifeGamemode.Database.Entities.Faction", "Faction") + .WithMany() + .HasForeignKey("FactionId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.Logs.Chat.GroupChatLogEntry", b => + { + b.HasOne("ReallifeGamemode.Database.Entities.Group", "Group") + .WithMany() + .HasForeignKey("GroupId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.GroupVehicle", b => + { + b.HasOne("ReallifeGamemode.Database.Entities.Group", "Group") + .WithMany() + .HasForeignKey("GroupId"); + }); + + modelBuilder.Entity("ReallifeGamemode.Database.Entities.UserVehicle", b => + { + b.HasOne("ReallifeGamemode.Database.Entities.User", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/ReallifeGamemode.Database/Migrations/20210527144901_AddUserCannabisSeedBuyData.cs b/ReallifeGamemode.Database/Migrations/20210527144901_AddUserCannabisSeedBuyData.cs new file mode 100644 index 00000000..bc63b452 --- /dev/null +++ b/ReallifeGamemode.Database/Migrations/20210527144901_AddUserCannabisSeedBuyData.cs @@ -0,0 +1,33 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; + +namespace ReallifeGamemode.Database.Migrations +{ + public partial class AddUserCannabisSeedBuyData : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "CannabisSeedsBoughtToday", + table: "Users", + nullable: false, + defaultValue: 0); + + migrationBuilder.AddColumn( + name: "LastTimeBoughtCannabisSeeds", + table: "Users", + nullable: true); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "CannabisSeedsBoughtToday", + table: "Users"); + + migrationBuilder.DropColumn( + name: "LastTimeBoughtCannabisSeeds", + table: "Users"); + } + } +} diff --git a/ReallifeGamemode.Database/Migrations/DatabaseContextModelSnapshot.cs b/ReallifeGamemode.Database/Migrations/DatabaseContextModelSnapshot.cs index ceeeb6b5..ccb4e8cc 100644 --- a/ReallifeGamemode.Database/Migrations/DatabaseContextModelSnapshot.cs +++ b/ReallifeGamemode.Database/Migrations/DatabaseContextModelSnapshot.cs @@ -1456,6 +1456,9 @@ namespace ReallifeGamemode.Database.Migrations b.Property("BusinessId") .HasColumnType("int"); + b.Property("CannabisSeedsBoughtToday") + .HasColumnType("int"); + b.Property("CharacterId") .HasColumnType("int"); @@ -1505,6 +1508,9 @@ namespace ReallifeGamemode.Database.Migrations b.Property("JobId") .HasColumnType("int"); + b.Property("LastTimeBoughtCannabisSeeds") + .HasColumnType("datetime(6)"); + b.Property("LogUserId") .HasColumnType("int"); diff --git a/ReallifeGamemode.Server/BaseScript.cs b/ReallifeGamemode.Server/BaseScript.cs index 969ff10c..d9a27f6a 100644 --- a/ReallifeGamemode.Server/BaseScript.cs +++ b/ReallifeGamemode.Server/BaseScript.cs @@ -9,7 +9,7 @@ namespace ReallifeGamemode.Server { public abstract class BaseScript : Script { - protected readonly ILogger logger; + protected static ILogger logger { get; private set; } public BaseScript() { diff --git a/ReallifeGamemode.Server/Events/Death.cs b/ReallifeGamemode.Server/Events/Death.cs index 4c3a3637..697e2159 100644 --- a/ReallifeGamemode.Server/Events/Death.cs +++ b/ReallifeGamemode.Server/Events/Death.cs @@ -47,6 +47,14 @@ namespace ReallifeGamemode.Server.Events return; } + if(player.HasData("IsCarryingPlant") || player.GetData("IsCarryingPlant")) + { + var currentModel = player.GetData("HoldingCannabisPlant"); + + player.AddAttachment("CannabisPlantInHand" + currentModel, true); + player.ResetData("IsCarryingPlant"); + } + using var dbContext = new DatabaseContext(); User user = player.GetUser(dbContext); diff --git a/ReallifeGamemode.Server/Events/Disconnect.cs b/ReallifeGamemode.Server/Events/Disconnect.cs index ca1ba2ab..b8af1ce7 100644 --- a/ReallifeGamemode.Server/Events/Disconnect.cs +++ b/ReallifeGamemode.Server/Events/Disconnect.cs @@ -41,6 +41,14 @@ namespace ReallifeGamemode.Server.Events return; } + if (player.HasData("IsCarryingPlant") || player.GetData("IsCarryingPlant")) + { + var currentModel = player.GetData("HoldingCannabisPlant"); + + player.AddAttachment("CannabisPlantInHand" + currentModel, true); + player.ResetData("IsCarryingPlant"); + } + var logEntry = new LoginLogoutLogEntry() { LoginLogout = false, diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs index 79274414..bf14ab2d 100644 --- a/ReallifeGamemode.Server/Events/Key.cs +++ b/ReallifeGamemode.Server/Events/Key.cs @@ -21,6 +21,8 @@ using ReallifeGamemode.Server.Types; using ReallifeGamemode.Server.Util; using ReallifeGamemode.Server.WeaponDeal; using ReallifeGamemode.Server.Log; +using ReallifeGamemode.Server.Inventory.Items; +using Microsoft.EntityFrameworkCore; using ReallifeGamemode.Server.Wanted; /** @@ -217,9 +219,61 @@ namespace ReallifeGamemode.Server.Events [RemoteEvent("keyPress:E")] public void KeyPressE(Player player) { - if (!player.IsLoggedIn() || player.GetData("isDead") || player.IsInVehicle) return; + if (!player.IsLoggedIn() || player.GetData("isDead")) return; var user = player.GetUser(); + if (player.IsInVehicle + && player.VehicleSeat == 0 + && player.Vehicle.Model == (uint)VehicleHash.Riot + && (user.FactionId == 1 || user.FactionId == 3) + && player.Position.DistanceTo(HanfManager.ASSERVATENKAMMER_POSITION) <= 3 + /*&& player.IsDuty()*/) + { + using var dbContext = new DatabaseContext(); + GTANetworkAPI.Vehicle veh = player.Vehicle; + ServerVehicle serverVehicle = veh.GetServerVehicle(dbContext); + + List items = InventoryManager.GetVehicleItems(veh); + if (items.Count() == 0) + { + player.SendNotification("Der Riot ist leer"); + return; + } + + IIllegalItem cannabisItem = InventoryManager.GetItem(); + IIllegalItem cannabisSeedItem = InventoryManager.GetItem(); + + VehicleItem vehicleCannabisItem = items.Where(i => i.ItemId == cannabisItem.Id).FirstOrDefault(); + VehicleItem vehicleCannabisSeedItem = items.Where(i => i.ItemId == cannabisSeedItem.Id).FirstOrDefault(); + + int cannabisAmount = vehicleCannabisItem?.Amount ?? 0; + int cannabisSeedAmount = vehicleCannabisSeedItem?.Amount ?? 0; + + InventoryManager.RemoveVehicleItem(serverVehicle, vehicleCannabisItem, cannabisAmount, player); + InventoryManager.RemoveVehicleItem(serverVehicle, vehicleCannabisSeedItem, cannabisSeedAmount, player); + + var price = cannabisSeedAmount * cannabisSeedItem.PriceForConfiscation + cannabisAmount * cannabisItem.PriceForConfiscation; + + logger.LogInformation("Player {0} unloaded the riot truck with {1} cannabis and {2} cannabis seed and the faction got {3}", player.Name, cannabisAmount, cannabisSeedAmount, price); + + var factions = dbContext.Factions.Include(f => f.BankAccount).Where(f => f.Id == 1 || f.Id == 3); + foreach (var faction in factions) + { + faction.BankAccount.Balance += price; + } + + player.SendNotification("~g~Der Riot wurde erfolgreich entladen"); + + dbContext.SaveChanges(); + + return; + } + + if (player.IsInVehicle) + { + return; + } + if (player.HasData("nearATM")) { ATMManager.ShowAtmUi(player, player.GetData("nearATM")); @@ -245,6 +299,7 @@ namespace ReallifeGamemode.Server.Events JailPoint nearestjailPoint = PositionManager.jailPoints.Find(s => s.Position.DistanceTo(player.Position) <= 1.5); bool isNearCannabisSeedBuyPoint = HanfManager.IsPlayerNearSeedBuyPoint(player); bool isNearJointManufacturerPoint = HanfManager.IsPlayerNearJointManufacturer(player); + bool isNearCannabisSellPoint = HanfManager.IsPlayerNearCannabisSellPoint(player); if (user?.FactionId != null) { @@ -766,7 +821,7 @@ namespace ReallifeGamemode.Server.Events if (isNearCannabisSeedBuyPoint) { - player.TriggerEvent("SERVER:Hanf_BuySeed", HanfManager.SEED_PRICE); + HanfManager.ShowPlayerBuySeedMenu(player); return; } @@ -775,6 +830,39 @@ namespace ReallifeGamemode.Server.Events HanfManager.BuildJointsFromCannabis(player); return; } + + if (isNearCannabisSellPoint) + { + HanfManager.PlayerSellCannabis(player); + return; + } + + if (player.HasData("IsCarryingPlant") || player.GetData("IsCarryingPlant") && (user.FactionId == 3 || user.FactionId == 1) && player.IsDuty()) + { + using var dbContext = new DatabaseContext(); + FactionVehicle riot = dbContext.FactionVehicles.Where(f => f.Model == VehicleHash.Riot).ToList().Where(f => f.GetOwners().Contains(3)).FirstOrDefault(); + if (riot == null) + { + return; + } + GTANetworkAPI.Vehicle riotVehicle = VehicleManager.GetVehicleFromServerVehicle(riot); + if (riotVehicle.Position.DistanceTo(player.Position) > 3) + { + return; + } + + var currentModel = player.GetData("HoldingCannabisPlant"); + + player.AddAttachment("CannabisPlantInHand" + currentModel, true); + player.ResetData("IsCarryingPlant"); + + var cannabisItem = InventoryManager.GetItem(); + var cannabisSeedsItem = InventoryManager.GetItem(); + int itemIdToGive = currentModel == 3 ? cannabisItem.Id : cannabisSeedsItem.Id; + int amountToGive = currentModel == 3 ? new Random().Next(4, 10) + 1 : 1; + + InventoryManager.AddItemToVehicleInventory(riotVehicle, itemIdToGive, amountToGive); + } } [RemoteEvent("keyPress:I")] diff --git a/ReallifeGamemode.Server/Events/Vehicle.cs b/ReallifeGamemode.Server/Events/Vehicle.cs index ff21e6d8..4be3db76 100644 --- a/ReallifeGamemode.Server/Events/Vehicle.cs +++ b/ReallifeGamemode.Server/Events/Vehicle.cs @@ -1,17 +1,21 @@ using System; using System.Linq; using GTANetworkAPI; +using Microsoft.Extensions.Logging; using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Extensions; using ReallifeGamemode.Server.Types; using ReallifeGamemode.Server.Util; using ReallifeGamemode.Server.WeaponDeal; +using ReallifeGamemode.Server.Log; namespace ReallifeGamemode.Server.Events { public class Vehicle : Script { + private static readonly ILogger logger = LogManager.GetLogger(); + [RemoteEvent("VehicleMenu_ToggleEngine")] public void VehicleMenuToggleEngineEvent(Player player) { @@ -271,6 +275,8 @@ namespace ReallifeGamemode.Server.Events sV.PositionZ = pos.Z; sV.Heading = v.Heading; + logger.LogInformation("Player {0} parked the car {1} at x:{2}, y:{3}, z:{4}", player.Name, sV.Id, pos.X, pos.Y, pos.Z); + player.SendNotification("~g~Das Fahrzeug wurde geparkt."); diff --git a/ReallifeGamemode.Server/Inventory/Interfaces/IIllegalItem.cs b/ReallifeGamemode.Server/Inventory/Interfaces/IIllegalItem.cs new file mode 100644 index 00000000..caac39a5 --- /dev/null +++ b/ReallifeGamemode.Server/Inventory/Interfaces/IIllegalItem.cs @@ -0,0 +1,11 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace ReallifeGamemode.Server.Inventory.Interfaces +{ + interface IIllegalItem : IItem + { + int PriceForConfiscation { get; } + } +} diff --git a/ReallifeGamemode.Server/Inventory/Items/Cannabis.cs b/ReallifeGamemode.Server/Inventory/Items/Cannabis.cs index bd82e7af..11f2c7bf 100644 --- a/ReallifeGamemode.Server/Inventory/Items/Cannabis.cs +++ b/ReallifeGamemode.Server/Inventory/Items/Cannabis.cs @@ -9,7 +9,7 @@ using ReallifeGamemode.Server.Inventory.Interfaces; namespace ReallifeGamemode.Server.Inventory.Items { - public class Cannabis : DropItem + public class Cannabis : DropItem, IIllegalItem { public override int Id => 108; @@ -24,5 +24,9 @@ namespace ReallifeGamemode.Server.Inventory.Items public override uint Object => 3076948544; public override int Price => 0; + + public override bool Legal => false; + + public int PriceForConfiscation { get; } = 5; } } diff --git a/ReallifeGamemode.Server/Inventory/Items/CannabisSeeds.cs b/ReallifeGamemode.Server/Inventory/Items/CannabisSeeds.cs index f3fa752d..7d3d098a 100644 --- a/ReallifeGamemode.Server/Inventory/Items/CannabisSeeds.cs +++ b/ReallifeGamemode.Server/Inventory/Items/CannabisSeeds.cs @@ -5,11 +5,12 @@ using GTANetworkAPI; using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Extensions; +using ReallifeGamemode.Server.Inventory.Interfaces; using ReallifeGamemode.Server.Managers; namespace ReallifeGamemode.Server.Inventory.Items { - public class CannabisSeeds : UseItem + public class CannabisSeeds : UseItem, IIllegalItem { public override int Id { get; } = 109; public override string Name { get; } = "Cannabis Samen"; @@ -21,14 +22,15 @@ namespace ReallifeGamemode.Server.Inventory.Items public override uint Object { get; } public override bool RemoveWhenUsed { get; } = false; + public int PriceForConfiscation { get; } = 10; public override bool Use(Player player, User user, DatabaseContext databaseContext) { - if(!player.IsInVehicle) + if (!player.IsInVehicle) { HanfManager.StartCannabisPlanting(player); } - + return true; } } diff --git a/ReallifeGamemode.Server/Inventory/Items/Joint.cs b/ReallifeGamemode.Server/Inventory/Items/Joint.cs index 97ffc677..21ed6a6f 100644 --- a/ReallifeGamemode.Server/Inventory/Items/Joint.cs +++ b/ReallifeGamemode.Server/Inventory/Items/Joint.cs @@ -5,12 +5,16 @@ using GTANetworkAPI; using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Extensions; +using ReallifeGamemode.Server.Inventory.Interfaces; using ReallifeGamemode.Server.Util; namespace ReallifeGamemode.Server.Inventory.Items { - public class Joint : UseItem + public class Joint : UseItem, IIllegalItem { + private static Dictionary lastJointUse = new Dictionary(); + private static readonly TimeSpan _jointCooldown = TimeSpan.FromMinutes(10); + public override int Id { get; } = 110; public override string Name { get; } = "Joint"; public override string Description { get; } = "stay high bis zum tod"; @@ -21,10 +25,33 @@ namespace ReallifeGamemode.Server.Inventory.Items public override bool Legal => false; public override bool RemoveWhenUsed => true; + public int PriceForConfiscation { get; } = 25; + public override bool Use(Player player, User user, DatabaseContext databaseContext) { + if (!CanUserUseJoint(user)) + { + player.TriggerEvent("Error", $"Versuche es nach {-1 * (int)((DateTime.Now - lastJointUse[user.Id]) - _jointCooldown).TotalSeconds} Sekunden erneut."); + return false; + } + + player.SyncAnimation("jointUse"); + player.ToggleInventory(InventoryToggleOption.HIDE); + int armorToSet = Math.Min(player.Armor + 25, 100); + player.SafeSetArmor(armorToSet); + lastJointUse[user.Id] = DateTime.Now; return true; } + + private bool CanUserUseJoint(User user) + { + if(!lastJointUse.ContainsKey(user.Id)) + { + return true; + } + + return DateTime.Now - lastJointUse[user.Id] > _jointCooldown; + } } } diff --git a/ReallifeGamemode.Server/Managers/HanfManager.cs b/ReallifeGamemode.Server/Managers/HanfManager.cs index fa1ffd2e..a2916668 100644 --- a/ReallifeGamemode.Server/Managers/HanfManager.cs +++ b/ReallifeGamemode.Server/Managers/HanfManager.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Text; using System.Timers; using GTANetworkAPI; +using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; using Newtonsoft.Json; using ReallifeGamemode.Database.Entities; @@ -12,6 +13,7 @@ using ReallifeGamemode.Server.Extensions; using ReallifeGamemode.Server.Inventory.Interfaces; using ReallifeGamemode.Server.Inventory.Items; using ReallifeGamemode.Server.Services; +using ReallifeGamemode.Server.Types; using ReallifeGamemode.Server.Util; namespace ReallifeGamemode.Server.Managers @@ -23,10 +25,28 @@ namespace ReallifeGamemode.Server.Managers /// private readonly static List _seedsBuyPoints = new List(); + private readonly static List _cannabisSellPoints = new List(); + /// /// Aktueller Samen-Preis /// - public static int SEED_PRICE = 50; + public static int SEED_PRICE = 0; + + private const int SEED_PRICE_MIN = 40; + private const int SEED_PRICE_MAX = 75; + + /// + /// Aktueller Hanf-Verkaufspreis + /// + public static int CANNABIS_PRICE = 0; + + private const int CANNABIS_PRICE_MIN = 50; + private const int CANNABIS_PRICE_MAX = 125; + + /// + /// Wie viele Samen ein Spieler pro Tag maximal kaufen darf + /// + private const int MAX_SEEDS_PER_DAY = 50; /// /// Wie viele Joints man aus einem Cannabis bekommt @@ -72,6 +92,8 @@ namespace ReallifeGamemode.Server.Managers private static List _currentCannabisData = new List(); + public static readonly Vector3 ASSERVATENKAMMER_POSITION = new Vector3(-5.45, -670.03, 32.33); + static HanfManager() { _manufacturerDoneTimer.Elapsed += ManufacturerDoneTimerCallback; @@ -82,6 +104,12 @@ namespace ReallifeGamemode.Server.Managers /// public static void Load() { + var priceRandom = new Random(); + + SEED_PRICE = priceRandom.Next(SEED_PRICE_MIN, SEED_PRICE_MAX + 1); + CANNABIS_PRICE = priceRandom.Next(CANNABIS_PRICE_MIN, CANNABIS_PRICE_MAX + 1); + logger.LogInformation("Generated hanf prices: seed = {0}, cannabis = {1}", SEED_PRICE, CANNABIS_PRICE); + _seedsBuyPoints.Add(new Vector3(-30.21876, -585.3222, 17.917326)); _seedsBuyPoints.Add(new Vector3(-680.89386, -634.6783, 25.29923)); _seedsBuyPoints.Add(new Vector3(-1310.743, -608.9064, 29.382874)); @@ -92,17 +120,58 @@ namespace ReallifeGamemode.Server.Managers foreach (Vector3 buyPoint in _seedsBuyPoints) { - colShape = NAPI.ColShape.CreateSphereColShape(buyPoint, 20.0f); + colShape = NAPI.ColShape.CreateSphereColShape(buyPoint, 10.0f); colShape.OnEntityEnterColShape += OnSeedBuyRangeColShapeEnter; } - UpdateHanfWorldData(new DatabaseContext()); + _cannabisSellPoints.Add(new Vector3(2220.04, 5614.24, 54.72)); + _cannabisSellPoints.Add(new Vector3(201.77, 2442.06, 60.45)); + _cannabisSellPoints.Add(new Vector3(155.87, -3103.26, 7.03)); + + foreach (Vector3 sellPoint in _cannabisSellPoints) + { + colShape = NAPI.ColShape.CreateSphereColShape(sellPoint, 10.0f); + colShape.OnEntityEnterColShape += OnCannabisSellRangeColShapeEnter; + } + + NAPI.Marker.CreateMarker(GTANetworkAPI.MarkerType.VerticalCylinder, ASSERVATENKAMMER_POSITION.Subtract(new Vector3(0, 0, 3.0)), new Vector3(), new Vector3(), 3.0f, Colors.White); + NAPI.TextLabel.CreateTextLabel("Asservatenkammer~n~Drücke ~y~E, um den ~y~Riot~s~ zu entladen", ASSERVATENKAMMER_POSITION, 10.0f, 10.0f, 0, Colors.White); + + using var dbContext = new DatabaseContext(); + HarvestRottenPlants(dbContext); + UpdateHanfWorldData(dbContext); Timer updateHanfDataTimer = new Timer(TimeSpan.FromMinutes(1).TotalMilliseconds); updateHanfDataTimer.Elapsed += UpdateHanfDataTimer_Elapsed; updateHanfDataTimer.Start(); } + private static void OnCannabisSellRangeColShapeEnter(ColShape colShape, Player player) + { + if (!player.IsLoggedIn()) + { + return; + } + + var user = player.GetUser(); + if (user?.Faction?.StateOwned == true) + { + return; + } + + ChatService.SendMessage(player, $"Fremder sagt: Pssst.. Hier kannst du dein Brokkoli loswerden."); + } + + private static void HarvestRottenPlants(DatabaseContext dbContext) + { + var rottenPlants = dbContext.CannabisPlants.Where(p => EF.Functions.DateDiffHour(p.PlantDate, DateTime.Now) > MAX_PLANT_TIME.TotalHours); + foreach (var plant in rottenPlants) + { + plant.Harvested = true; + } + dbContext.SaveChanges(); + } + private static void UpdateHanfDataTimer_Elapsed(object sender, ElapsedEventArgs e) { using var dbContext = new DatabaseContext(); @@ -148,7 +217,7 @@ namespace ReallifeGamemode.Server.Managers var user = player.GetUser(dbContext); if (user.Faction?.StateOwned ?? false) { - player.SendNotification("~r~Du darfst keine Hanfsamen einfplanzen"); + player.SendNotification("~r~Du darfst keine Hanfsamen einpflanzen"); return; } @@ -220,7 +289,7 @@ namespace ReallifeGamemode.Server.Managers public async static void UpdateHanfForPlayer(Player player, List cannabisData = null) { cannabisData ??= _currentCannabisData; - var x = await NAPI.Task.WaitForMainThread(); + await NAPI.Task.WaitForMainThread(); player.TriggerEvent("SERVER:Hanf_UpdateHanfData", JsonConvert.SerializeObject(cannabisData)); } @@ -235,6 +304,12 @@ namespace ReallifeGamemode.Server.Managers using var dbContext = new DatabaseContext(); var user = player.GetUser(dbContext); + if (amount > GetAmountOfCannabisSeedsPlayerCanBuyToday(user)) + { + player.SendNotification("~r~Du kannst heute nicht mehr so viele Samen kaufen"); + return; + } + IItem seedItem = InventoryManager.GetItem(); var newAmount = seedItem.Gewicht * amount; @@ -254,6 +329,16 @@ namespace ReallifeGamemode.Server.Managers logger.LogInformation("Player {0} bought {1} cannabis seeds for {2} dollars (price per seed: {3})", player.Name, amount, price, SEED_PRICE); // <-- WICHTIG LOGS + if (user.LastTimeBoughtCannabisSeeds == null || user.LastTimeBoughtCannabisSeeds.Value.Date != DateTime.Now.Date) + { + user.CannabisSeedsBoughtToday = amount; + } + else + { + user.CannabisSeedsBoughtToday += amount; + } + user.LastTimeBoughtCannabisSeeds = DateTime.Now; + user.Handmoney -= price; dbContext.SaveChanges(); @@ -263,7 +348,7 @@ namespace ReallifeGamemode.Server.Managers } [RemoteEvent("CLIENT:Hanf_HarvestHanf")] - public void HanfManagerHarvestHanf(Player player, long hanfId) + public async void HanfManagerHarvestHanf(Player player, long hanfId) { if (!player.IsLoggedIn()) { @@ -273,15 +358,10 @@ namespace ReallifeGamemode.Server.Managers using var dbContext = new DatabaseContext(); User user = player.GetUser(dbContext); - CannabisPlant plant = dbContext.CannabisPlants.Find(hanfId); + CannabisPlant plant = dbContext.CannabisPlants.Include(p => p.PlantedBy).Where(p => p.Id == hanfId).FirstOrDefault(); if (plant == null) { logger.LogError("Player {0} tried to harvest cannabis plant {1} but it was not found in database", player.Name, hanfId); - } - - if (user.Faction?.StateOwned == true && !(user.FactionId == 3 && player.IsDuty())) - { - player.SendNotification("~r~Du kannst kein Hanf ernten"); return; } @@ -290,10 +370,32 @@ namespace ReallifeGamemode.Server.Managers return; } - plant.Harvested = true; - - if (user.FactionId != 3) // Zivi / Gangmember erntet ab + if (player.IsAdminDuty() && player.IsTSupport() && user.IsAdmin(AdminLevel.ADMIN)) { + player.SendNotification($"Du hast die Hanf-Pflanze von ~y~{plant.PlantedBy.Name}~s~ entfernt"); + plant.Harvested = true; + dbContext.SaveChanges(); + UpdateHanfWorldData(dbContext); + return; + } + + if (user.Faction?.StateOwned == true) + { + if (!((user.FactionId == 1 || user.FactionId == 3) && player.IsDuty())) + { + player.SendNotification("~r~Du kannst kein Hanf ernten"); + return; + } + } + + //player.SyncAnimation(new[] { "harvestPlantEnter", "harvestPlant", "harvestPlantExit" }.ToList()); + //player.SyncAnimation("harvestPlant"); + //player.AddAttachment("shovel", false); + + if (user.FactionId != 3 && user.FactionId != 1) // Zivi / Gangmember erntet ab + { + player.SyncAnimation("harvestPlant"); + plant.Harvested = true; bool isPlantRotten = DateTime.Now - plant.PlantDate > MAX_PLANT_TIME; if (isPlantRotten) { @@ -305,7 +407,7 @@ namespace ReallifeGamemode.Server.Managers if (!isPlantReadyToHarvest) // Wenn die Pflanze noch nicht ausgewachsen ist { bool getSeedBack = _random.Next(0, 2) == 1; // 50% Chance - if(getSeedBack) + if (getSeedBack) { IItem cannabisSeedItem = InventoryManager.GetItem(); InventoryManager.AddItemToInventory(player, cannabisSeedItem.Id, 1); @@ -340,15 +442,32 @@ namespace ReallifeGamemode.Server.Managers } } } - else // FIB erntet ab + else // FIB / LSPD erntet ab { + if (!(player.HasData("IsCarryingPlant") || player.GetData("IsCarryingPlant"))) + { + player.SetData("IsCarryingPlant", true); + player.SendNotification($"Du hast eine Pflanze von ~y~{plant.PlantedBy.Name}~s~ ausgegraben"); + + player.SyncAnimation("harvestPlant"); + plant.Harvested = true; + + var modelToGet = await player.TriggerProcedure("SERVER:Hanf_GetModelToGivePlayer", plant.Id); + player.SetData("HoldingCannabisPlant", modelToGet); + player.AddAttachment("CannabisPlantInHand" + modelToGet, false); + } } dbContext.SaveChanges(); UpdateHanfWorldData(dbContext); } + internal static bool IsPlayerNearCannabisSellPoint(Player player) + { + return _cannabisSellPoints.Any(p => p.DistanceTo(player.Position) <= 3); + } + internal static void BuildJointsFromCannabis(Player player) { if (player.HasAnimation(_manufacturerAnim) || _manufacturerCurrentlyUsed) @@ -396,5 +515,105 @@ namespace ReallifeGamemode.Server.Managers _manufacturerDoneTimer.Stop(); _manufacturerCurrentlyUsed = false; } + + [RemoteEvent("CLIENT:Hanf_FinishDiggingAnimation")] + public void HanfManagerFinishDiggingAnimation(Player player) + { + player.AddAttachment("shovel", true); + } + + private static int GetAmountOfCannabisSeedsPlayerCanBuyToday(User user) + { + if (user.LastTimeBoughtCannabisSeeds == null) + { + return MAX_SEEDS_PER_DAY; + } + + if (user.LastTimeBoughtCannabisSeeds.Value.Date != DateTime.Now.Date) + { + return MAX_SEEDS_PER_DAY; + } + + return MAX_SEEDS_PER_DAY - user.CannabisSeedsBoughtToday; + } + + internal static void ShowPlayerBuySeedMenu(Player player) + { + var user = player.GetUser(); + + if (user.Faction?.StateOwned == true) + { + return; + } + + var seedsUserCanBuy = GetAmountOfCannabisSeedsPlayerCanBuyToday(user); + + if (seedsUserCanBuy == 0) + { + player.SendNotification("~r~Du kannst heute keine Samen mehr kaufen"); + return; + } + + player.TriggerEvent("SERVER:Hanf_BuySeed", seedsUserCanBuy, SEED_PRICE); + } + + internal static void PlayerSellCannabis(Player player) + { + if (!player.IsLoggedIn()) + { + return; + } + using var dbContext = new DatabaseContext(); + var user = player.GetUser(dbContext); + + if (user.Faction?.StateOwned == true) + { + return; + } + + List items = InventoryManager.GetUserItems(player, dbContext); + + IItem cannabisItem = InventoryManager.GetItem(); + var cannabisAmount = items.Where(i => i.ItemId == cannabisItem.Id).FirstOrDefault()?.Amount ?? 0; + + if (cannabisAmount == 0) + { + player.SendNotification("~r~Du hast kein Cannabis dabei"); + return; + } + + player.TriggerEvent("SERVER:Hanf_SellCannabisMenu", cannabisAmount, CANNABIS_PRICE); + } + + [RemoteEvent("CLIENT:Hanf_SellCannabis")] + public void HanfManagerSellCannabis(Player player, int amount) + { + if (!player.IsLoggedIn()) + { + return; + } + + using var dbContext = new DatabaseContext(); + var user = player.GetUser(dbContext); + List items = InventoryManager.GetUserItems(player, dbContext); + + IItem cannabisItem = InventoryManager.GetItem(); + var cannabisUserItem = items.Where(i => i.ItemId == cannabisItem.Id).FirstOrDefault(); + var cannabisAmount = cannabisUserItem?.Amount ?? 0; + + if (cannabisAmount < amount) + { + player.SendNotification("~r~Du hast nicht so viel Cannabis dabei"); + return; + } + + var price = amount * CANNABIS_PRICE; + user.Handmoney += price; + InventoryManager.RemoveUserItem(user, cannabisUserItem, amount); + + logger.LogInformation("Player {0} sold {1} cannabis to the server for {2} dollars", player.Name, amount, price); + + player.SendNotification($"Du hast ~g~{amount} Hanfblüten~s~ für ~g~{price.ToMoneyString()}~s~ verkauft"); + } } } diff --git a/ReallifeGamemode.Server/Managers/InteractionManager.cs b/ReallifeGamemode.Server/Managers/InteractionManager.cs index d6d6e0ed..c769b235 100644 --- a/ReallifeGamemode.Server/Managers/InteractionManager.cs +++ b/ReallifeGamemode.Server/Managers/InteractionManager.cs @@ -18,6 +18,7 @@ using ReallifeGamemode.Server.Core.API; using ReallifeGamemode.Server.Factions.Medic; using Microsoft.Extensions.Logging; using ReallifeGamemode.Server.Log; +using ReallifeGamemode.Server.Inventory.Interfaces; /** * @overview Life of German Reallife - Managers Interaction (InteractionManager.cs) @@ -758,6 +759,150 @@ namespace ReallifeGamemode.Server.Managers } } + [RemoteEvent("CLIENT:InteractionMenu_LSPD_FriskUser")] + public void InteractionMenuLspdFriskUser(Player player, string name) + { + if (!player.IsLoggedIn()) + { + return; + } + + Player target = PlayerService.GetPlayerByNameOrId(name); + if (!target.IsLoggedIn()) + { + ChatService.PlayerNotFound(player); + return; + } + + using var dbContext = new DatabaseContext(); + var user = player.GetUser(dbContext); + + if ((user.FactionId != 1 && user.FactionId != 3) || !player.IsDuty()) + { + return; + } + + if (player.Position.DistanceTo(target.Position) > 5) + { + player.SendNotification("~r~Der Spieler ist nicht in deiner Nähe"); + return; + } + + var targetUser = target.GetUser(dbContext); + + var targetItems = InventoryManager.GetUserItems(target, dbContext); + List illItemsList = new List(); + bool illegalItemsFound = false; + var price = 0; + + foreach (var targetItem in targetItems) + { + IItem item = InventoryManager.GetItemById(targetItem.ItemId); + if (!item.Legal) + { + illItemsList.Add($"{targetItem.Amount}x {item.Name}"); + InventoryManager.RemoveUserItem(targetUser, targetItem, targetItem.Amount); + illegalItemsFound = true; + price += ((IIllegalItem)item).PriceForConfiscation * targetItem.Amount; + logger.LogInformation("Player {0} confiscated the illegal item {1} ({2}, amount: {3}) from player {4}", player.Name, item.Name, item.Id, targetItem.Amount, target.Name); + } + } + + if (!illegalItemsFound) + { + player.SendNotification("~g~Der Spieler hat keine illegalen Gegenstände dabei"); + return; + } + + logger.LogInformation("executive factions got {0} dollars from the confiscation", price); + var factions = dbContext.Factions.Include(f => f.BankAccount).Where(f => f.Id == 1 || f.Id == 3); + foreach (var faction in factions) + { + faction.BankAccount.Balance += price; + } + + dbContext.SaveChanges(); + + string illItemsStr = "~y~" + string.Join("~s~,~y~ ", illItemsList) + "~s~"; + ChatService.SendMessage(player, $"Du hast ~y~{target.Name}~s~ folgende Gegenstände abgenommen: {illItemsStr}"); + ChatService.SendMessage(target, $"~y~{player.Name}~s~ hat die folgende Gegenstände abgenommen: {illItemsStr}"); + + } + + [RemoteEvent("CLIENT:InteractionMenu_LSPD_FriskVehicle")] + public void InteractionMenuLspdFriskVehicle(Player player) + { + if (!player.IsLoggedIn()) + { + return; + } + + using var dbContext = new DatabaseContext(); + var user = player.GetUser(dbContext); + + if ((user.FactionId != 1 && user.FactionId != 3) || !player.IsDuty()) + { + return; + } + + var vehicle = NAPI.Pools.GetAllVehicles().Where(v => v.Position.DistanceTo(player.Position) <= 5).OrderBy(v => v.Position.DistanceTo(player.Position)).FirstOrDefault(); + if (vehicle == null) + { + player.SendNotification("~r~Es befindet sich kein Fahrzeug in deiner Nähe"); + return; + } + + ServerVehicle serverVehicle = vehicle.GetServerVehicle(dbContext); + if (serverVehicle == null) + { + player.SendNotification("~r~Dieses Fahrzeug kann nicht durchsucht werden"); + return; + } + + if (VehicleStreaming.GetLockState(vehicle) || serverVehicle.Locked) + { + player.SendNotification("~r~Dieses Fahrzeug ist abgeschlossen"); + return; + } + + var targetItems = InventoryManager.GetVehicleItems(vehicle); + List illItemsList = new List(); + bool illegalItemsFound = false; + var price = 0; + + foreach (var targetItem in targetItems) + { + IItem item = InventoryManager.GetItemById(targetItem.ItemId); + if (!item.Legal) + { + illItemsList.Add($"{targetItem.Amount}x {item.Name}"); + InventoryManager.RemoveVehicleItem(serverVehicle, targetItem, targetItem.Amount, null); + illegalItemsFound = true; + price += ((IIllegalItem)item).PriceForConfiscation * targetItem.Amount; + logger.LogInformation("Player {0} confiscated the illegal item {1} ({2}, amount: {3}) from vehicle {4}", player.Name, item.Name, item.Id, targetItem.Amount, serverVehicle.Id); + } + } + + if (!illegalItemsFound) + { + player.SendNotification("~g~Im Kofferraum sind keine illegalen Gegenstände"); + return; + } + + logger.LogInformation("executive factions got {0} dollars from the confiscation", price); + + var factions = dbContext.Factions.Include(f => f.BankAccount).Where(f => f.Id == 1 || f.Id == 3); + foreach (var faction in factions) + { + faction.BankAccount.Balance += price; + } + + dbContext.SaveChanges(); + + string illItemsStr = "~y~" + string.Join("~s~,~y~ ", illItemsList) + "~s~"; + ChatService.SendInRange(player.Position, 20, $"{player.Name} hat aus dem Kofferraum folgende Gegenstände beschlagnahmt: {illItemsStr}"); + } + [RemoteEvent("CLIENT:InteractionMenu_Pay")] public void InteractionMenu_Pay(Player player, string jsonNameOrId, string stringAmount) { diff --git a/ReallifeGamemode.Server/Managers/InventoryManager.cs b/ReallifeGamemode.Server/Managers/InventoryManager.cs index aaa1b434..e8cfea56 100644 --- a/ReallifeGamemode.Server/Managers/InventoryManager.cs +++ b/ReallifeGamemode.Server/Managers/InventoryManager.cs @@ -47,7 +47,7 @@ namespace ReallifeGamemode.Server.Managers public int Amount; public int ItemId; public int Weight; - public Vehicle vehicle; + public ushort vehicle; } public static void SetBackpackItems(Player player) @@ -75,9 +75,9 @@ namespace ReallifeGamemode.Server.Managers player.SetSharedData("backpackItems", JsonConvert.SerializeObject(backpackItems[player].ToArray())); } - internal static IItem GetItem() where T : IItem + internal static T GetItem() where T : IItem { - return itemList.Where(i => i.GetType() == typeof(T)).First(); + return (T)itemList.Where(i => i.GetType() == typeof(T)).First(); } [RemoteEvent("CLIENT:getVehicleInventory")] @@ -86,7 +86,9 @@ namespace ReallifeGamemode.Server.Managers if (player.IsInVehicle) { player.TriggerEvent("Error", "Du kannst deinen Kofferraum gerade nicht öffnen."); + return; } + Vehicle veh = NAPI.Pools.GetAllVehicles() .ToList() .Where(v => v.Position.DistanceTo(player.Position) <= 4) @@ -131,7 +133,7 @@ namespace ReallifeGamemode.Server.Managers Amount = i.Amount, ItemId = i.ItemId, Weight = GetVehicleInventoryWeight(veh), - vehicle = veh, + vehicle = veh.Handle.Value, }; vehicleItems[player].Add(newItem); } @@ -197,6 +199,10 @@ namespace ReallifeGamemode.Server.Managers public static void RemoveVehicleItem(ServerVehicle sVeh, VehicleItem item, int amount, Player player) { + if (item == null) + { + return; + } using (var dbContext = new DatabaseContext()) { var vehicleItem = dbContext.VehicleItems.FirstOrDefault(i => i.Id == item.Id); @@ -327,20 +333,29 @@ namespace ReallifeGamemode.Server.Managers using (var context = new DatabaseContext()) { + User user = player.GetUser(context); if (!vehicleItems.ContainsKey(player)) vehicleItems.Add(player, new List()); Vehicle veh = null; if (vehicleItems[player].Count != 0) - veh = vehicleItems[player].FirstOrDefault().vehicle; + veh = new NetHandle(vehicleItems[player].FirstOrDefault().vehicle, EntityType.Vehicle).Entity(); ServerVehicle serverVehicle = VehicleManager.GetServerVehicleFromVehicle(veh, context); - VehicleItem vehItem = context.VehicleItems.Where(v => v.VehicleId == serverVehicle.Id && v.ItemId == itemID).FirstOrDefault(); if (vehItem == null) { player.TriggerEvent("Error", "Transfer nicht möglich."); return; } + if (serverVehicle is FactionVehicle factionVehicle) + { + IItem item = GetItemById(itemID); + if (factionVehicle.Model == VehicleHash.Riot && user.Faction?.StateOwned == true) + { + player.TriggerEvent("Error", "Transfer nicht möglich."); + return; + } + } RemoveVehicleItem(serverVehicle, vehItem, itemAmount, player); SetVehicleItems(player); From 48b4cc22a7564eac38a8bef4160a35d713a104af Mon Sep 17 00:00:00 2001 From: hydrant Date: Thu, 27 May 2021 21:12:44 +0200 Subject: [PATCH 76/82] fix merge --- ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs b/ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs index 4a5bfe40..896ee597 100644 --- a/ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs +++ b/ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs @@ -46,18 +46,16 @@ namespace ReallifeGamemode.Server.Inventory.Items return false; } - if((VehicleHash)veh.Model == WeaponDealManager.WEAPON_DEAL_GANG_VEHICLE_HASH || (VehicleHash)veh.Model == WeaponDealManager.WEAPON_DEAL_STAATSFRAK_VEHICLE_HASH) + if ((VehicleHash)veh.Model == WeaponDealManager.WEAPON_DEAL_GANG_VEHICLE_HASH || (VehicleHash)veh.Model == WeaponDealManager.WEAPON_DEAL_STAATSFRAK_VEHICLE_HASH) { player.SendNotification("Du kannst den Waffentransporter nicht reparieren!"); - return false; + return false; } using (var dbContext = new DatabaseContext()) { Vector3 position = veh.Position; - player.SendNotification("Du hast ~g~" + InventoryManager.GetItemById(uItem.ItemId).Name + " ~s~verwendet", false); - InventoryManager.RemoveUserItem(player.GetUser(), uItem, 1); - InventoryManager.RemoveUserItem(player.GetUser(), uItem, 1); + player.SendNotification("Du hast ~g~" + Name + " ~s~verwendet", false); ServerVehicle serverVehicle = veh.GetServerVehicle(dbContext); serverVehicle.Spawn(veh).Position = position; Vehicle newVeh = serverVehicle.Spawn(veh); From 1dea6bc28d82a205587711679d350a52fe9c35f1 Mon Sep 17 00:00:00 2001 From: hydrant Date: Thu, 27 May 2021 21:41:24 +0200 Subject: [PATCH 77/82] diverse fixes und improvments --- .../Commands/AdminCommands.cs | 3 +- ReallifeGamemode.Server/Events/Key.cs | 6 ++- .../Inventory/Items/Notfallkit.cs | 7 ++-- .../Managers/VehicleManager.cs | 41 +++++++++---------- 4 files changed, 29 insertions(+), 28 deletions(-) diff --git a/ReallifeGamemode.Server/Commands/AdminCommands.cs b/ReallifeGamemode.Server/Commands/AdminCommands.cs index 8230c661..3ee952f5 100644 --- a/ReallifeGamemode.Server/Commands/AdminCommands.cs +++ b/ReallifeGamemode.Server/Commands/AdminCommands.cs @@ -2243,7 +2243,8 @@ namespace ReallifeGamemode.Server.Commands { UserItem userItem = new UserItem() { ItemId = itemId, UserId = target.GetUser().Id, Amount = amount }; InventoryManager.AddItemToInventory(target, userItem.ItemId, userItem.Amount); - ChatService.SendMessage(player, $"~b~[ADMIN]~s~ Du hast ~y~{target.Name}~y~ ~y~{amount}~s~ mal das Item ~y~{item.Name}~s~ gegeben."); + ChatService.SendMessage(player, $"~b~[ADMIN]~s~ Du hast {target.Name} ~y~{amount}~s~x ~y~{item.Name}~s~ gegeben."); + ChatService.SendMessage(target, $"~b~[ADMIN]~s~ {player.Name} hat dir ~y~{amount}~s~x ~y~{item.Name}~s~ gegeben."); } } diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs index bf14ab2d..b0dbac78 100644 --- a/ReallifeGamemode.Server/Events/Key.cs +++ b/ReallifeGamemode.Server/Events/Key.cs @@ -588,8 +588,8 @@ namespace ReallifeGamemode.Server.Events dbcontext.SaveChanges(); } - //Rentcar Points - if (nearestRentcarPoint != null) + //Rentcar Points + if (nearestRentcarPoint != null) { if (player.IsInVehicle) { @@ -861,6 +861,8 @@ namespace ReallifeGamemode.Server.Events int itemIdToGive = currentModel == 3 ? cannabisItem.Id : cannabisSeedsItem.Id; int amountToGive = currentModel == 3 ? new Random().Next(4, 10) + 1 : 1; + player.SendNotification($"Du hast {(currentModel == 3 ? "das Cannabis" : "die Samen")} in den Riot geladen"); + InventoryManager.AddItemToVehicleInventory(riotVehicle, itemIdToGive, amountToGive); } } diff --git a/ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs b/ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs index 896ee597..8cb12da7 100644 --- a/ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs +++ b/ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs @@ -14,7 +14,7 @@ namespace ReallifeGamemode.Server.Inventory.Items public override int Id => 201; public override string Name => "Notfallkit"; public override string Description => "Fahrzeug reparieren"; - public override int Gewicht => 1000; + public override int Gewicht => 5000; public override string Einheit => "g"; public override uint Object => 875075437; public override int Price => 2500; @@ -55,12 +55,13 @@ namespace ReallifeGamemode.Server.Inventory.Items using (var dbContext = new DatabaseContext()) { Vector3 position = veh.Position; + float heading = veh.Heading; player.SendNotification("Du hast ~g~" + Name + " ~s~verwendet", false); ServerVehicle serverVehicle = veh.GetServerVehicle(dbContext); - serverVehicle.Spawn(veh).Position = position; Vehicle newVeh = serverVehicle.Spawn(veh); newVeh.Repair(); - newVeh.Rotation = new Vector3(0, 0, serverVehicle.Heading); + newVeh.Position = position; + newVeh.Rotation = new Vector3(0, 0, heading); return true; } } diff --git a/ReallifeGamemode.Server/Managers/VehicleManager.cs b/ReallifeGamemode.Server/Managers/VehicleManager.cs index db220f30..b7ae3bb5 100644 --- a/ReallifeGamemode.Server/Managers/VehicleManager.cs +++ b/ReallifeGamemode.Server/Managers/VehicleManager.cs @@ -887,7 +887,7 @@ namespace ReallifeGamemode.Server.Managers "pounder2" }; - public VehicleManager () + public VehicleManager() { #region add_VehicleRespawnPoints VehicleRespawnPoints.Add(pos1); @@ -1114,30 +1114,24 @@ namespace ReallifeGamemode.Server.Managers vehicle.Delete(); return; } - InventoryManager.RemoveAllItemsfromVehicleInventory(vehicle); CheckVehicleDeath(vehicle.Id); } public static void CheckVehicleDeath(int id) { - using (var dbContext = new DatabaseContext()) { Vehicle vehicle = NAPI.Pools.GetAllVehicles().Find(v => v.Id == id); ServerVehicle sV = vehicle.GetServerVehicle(dbContext); - if (sV is UserVehicle) + if (sV is UserVehicle uV) { foreach (VehicleRespawnPoint point in VehicleRespawnPoints) { - if (NAPI.Pools.GetAllVehicles().Any(v => v.Position.DistanceTo(point.Position) < 1)) - { - ChatService.Broadcast("Fahrzeug zu nah"); - } - else + if (!NAPI.Pools.GetAllVehicles().Any(v => v.Position.DistanceTo(point.Position) < 1)) { sV.PositionX = point.Position.X; sV.PositionY = point.Position.Y; @@ -1147,17 +1141,20 @@ namespace ReallifeGamemode.Server.Managers break; } } + User user = dbContext.Users.Find(uV.UserId); + user.Player?.SendNotification("Dein Fahrzeug ist zerstört~n~Du kannst es im Interaktionsmenü unter \"Fahrzeuge\" orten"); vehicle.Delete(); Vehicle newVeh = sV.Spawn(vehicle); newVeh.Repair(); } - + if (sV is FactionVehicle || sV is GroupVehicle) { vehicle.Delete(); Vehicle newVeh = sV.Spawn(vehicle); newVeh.Repair(); } + InventoryManager.RemoveAllItemsfromVehicleInventory(vehicle); } } @@ -1171,26 +1168,26 @@ namespace ReallifeGamemode.Server.Managers } #region spawnpositions-vehicleInWater - public static List VehicleRespawnPoints = new List (); + public static List VehicleRespawnPoints = new List(); VehicleRespawnPoint pos1 = new VehicleRespawnPoint() - { + { Position = new Vector3(-307.84, -909.04, 31.07), Heading = 167.46f }; VehicleRespawnPoint pos2 = new VehicleRespawnPoint() { - Position = new Vector3(-311.52, -908.40, 31.07), + Position = new Vector3(-311.52, -908.40, 31.07), Heading = 170.40f }; VehicleRespawnPoint pos3 = new VehicleRespawnPoint() { - Position = new Vector3(-315.18, -907.68, 31.07), + Position = new Vector3(-315.18, -907.68, 31.07), Heading = 167.17f }; VehicleRespawnPoint pos4 = new VehicleRespawnPoint() { - Position = new Vector3(-319.09, -906.68, 31.07), + Position = new Vector3(-319.09, -906.68, 31.07), Heading = 168.41f }; VehicleRespawnPoint pos5 = new VehicleRespawnPoint() @@ -1205,27 +1202,27 @@ namespace ReallifeGamemode.Server.Managers }; VehicleRespawnPoint pos7 = new VehicleRespawnPoint() { - Position = new Vector3(-325.95, -905.17, 31.07), + Position = new Vector3(-325.95, -905.17, 31.07), Heading = 168.26f }; VehicleRespawnPoint pos8 = new VehicleRespawnPoint() { - Position = new Vector3(-329.77, -904.33, 31.07), + Position = new Vector3(-329.77, -904.33, 31.07), Heading = 168.17f }; VehicleRespawnPoint pos9 = new VehicleRespawnPoint() { - Position = new Vector3(-333.31, -903.61, 31.07), + Position = new Vector3(-333.31, -903.61, 31.07), Heading = 169.17f - }; + }; VehicleRespawnPoint pos10 = new VehicleRespawnPoint() { - Position = new Vector3(-336.86, -902.80, 31.07), + Position = new Vector3(-336.86, -902.80, 31.07), Heading = 167.65f }; VehicleRespawnPoint pos11 = new VehicleRespawnPoint() { - Position = new Vector3(-340.41, -902.12, 31.07), + Position = new Vector3(-340.41, -902.12, 31.07), Heading = 162.65f }; VehicleRespawnPoint pos12 = new VehicleRespawnPoint() @@ -1266,7 +1263,7 @@ namespace ReallifeGamemode.Server.Managers VehicleRespawnPoint pos19 = new VehicleRespawnPoint() { Position = new Vector3(-346.58, -973.31, 31.08), - Heading = -19.79f + Heading = -19.79f }; VehicleRespawnPoint pos20 = new VehicleRespawnPoint() { From 60fedce0bce4563c835c5f8de458b3eb2614d7fa Mon Sep 17 00:00:00 2001 From: hydrant Date: Thu, 27 May 2021 21:47:17 +0200 Subject: [PATCH 78/82] fix rubellos --- ReallifeGamemode.Server/Inventory/Items/Rubellos.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReallifeGamemode.Server/Inventory/Items/Rubellos.cs b/ReallifeGamemode.Server/Inventory/Items/Rubellos.cs index 416252a6..09a37d7a 100644 --- a/ReallifeGamemode.Server/Inventory/Items/Rubellos.cs +++ b/ReallifeGamemode.Server/Inventory/Items/Rubellos.cs @@ -24,7 +24,7 @@ namespace ReallifeGamemode.Server.Inventory.Items public override bool Use(Player player, User user, DatabaseContext databaseContext) { Random random = new Random(); - int randomNumber = random.Next(1, 2); + int randomNumber = random.Next(1, 4); if (randomNumber == 1) { user.Handmoney += 1000; From 5fb233cef5a7027888aa8b135f845bdd50b5f1eb Mon Sep 17 00:00:00 2001 From: hydrant Date: Thu, 27 May 2021 22:07:10 +0200 Subject: [PATCH 79/82] =?UTF-8?q?frisk=20typo,=20hanf=20nur=20f=C3=BCr=20g?= =?UTF-8?q?angs,=2010=20cannabis=20f=C3=BCr=201=20joint,=20no=20riot=20fri?= =?UTF-8?q?sk?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Interaction/factioninteraction.ts | 2 +- ReallifeGamemode.Server/Events/Key.cs | 6 ++-- .../Managers/HanfManager.cs | 29 +++++++------------ .../Managers/InteractionManager.cs | 6 ++++ 4 files changed, 20 insertions(+), 23 deletions(-) diff --git a/ReallifeGamemode.Client/Interaction/factioninteraction.ts b/ReallifeGamemode.Client/Interaction/factioninteraction.ts index 506e47a1..8c27c245 100644 --- a/ReallifeGamemode.Client/Interaction/factioninteraction.ts +++ b/ReallifeGamemode.Client/Interaction/factioninteraction.ts @@ -119,7 +119,7 @@ export default function factionInteraction(globalData: IGlobalData) { case friskUserMenuItem: factionInteractionMenu.Visible = false; - var input = new InputHelper("Welchem Spieler möchtest du Strafpunkte geben (Name / ID)?", globalData); + var input = new InputHelper("Welchen Spieler möchtest du durchsuchen (Name / ID)?", globalData); input.show(); input.getValue(name => { mp.events.callRemote("CLIENT:InteractionMenu_LSPD_FriskUser", name); diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs index b0dbac78..78ccd594 100644 --- a/ReallifeGamemode.Server/Events/Key.cs +++ b/ReallifeGamemode.Server/Events/Key.cs @@ -819,19 +819,19 @@ namespace ReallifeGamemode.Server.Events } } - if (isNearCannabisSeedBuyPoint) + if (isNearCannabisSeedBuyPoint && user.Faction?.GangOwned == true) { HanfManager.ShowPlayerBuySeedMenu(player); return; } - if (isNearJointManufacturerPoint) + if (isNearJointManufacturerPoint && user.Faction?.GangOwned == true) { HanfManager.BuildJointsFromCannabis(player); return; } - if (isNearCannabisSellPoint) + if (isNearCannabisSellPoint && user.Faction?.GangOwned == true) { HanfManager.PlayerSellCannabis(player); return; diff --git a/ReallifeGamemode.Server/Managers/HanfManager.cs b/ReallifeGamemode.Server/Managers/HanfManager.cs index a2916668..965720ea 100644 --- a/ReallifeGamemode.Server/Managers/HanfManager.cs +++ b/ReallifeGamemode.Server/Managers/HanfManager.cs @@ -49,9 +49,9 @@ namespace ReallifeGamemode.Server.Managers private const int MAX_SEEDS_PER_DAY = 50; /// - /// Wie viele Joints man aus einem Cannabis bekommt + /// Wie viel Cannabis man für einen Joint braucht /// - public static int CANNABIS_TO_JOINT_RATIO = 3; + private const int CANNABIS_NEEDED_FOR_JOINT = 10; /// /// Flag, ob der Verarbeiter aktuell benutzt wird @@ -91,7 +91,6 @@ namespace ReallifeGamemode.Server.Managers private static Random _random = new Random(); private static List _currentCannabisData = new List(); - public static readonly Vector3 ASSERVATENKAMMER_POSITION = new Vector3(-5.45, -670.03, 32.33); static HanfManager() @@ -154,7 +153,7 @@ namespace ReallifeGamemode.Server.Managers } var user = player.GetUser(); - if (user?.Faction?.StateOwned == true) + if (user?.Faction?.StateOwned == true || user.Faction?.GangOwned == false) { return; } @@ -186,7 +185,7 @@ namespace ReallifeGamemode.Server.Managers } var user = player.GetUser(); - if (user?.Faction?.StateOwned == true) + if (user?.Faction?.StateOwned == true || user.Faction?.GangOwned == false) { return; } @@ -215,7 +214,7 @@ namespace ReallifeGamemode.Server.Managers var dbContext = new DatabaseContext(); var user = player.GetUser(dbContext); - if (user.Faction?.StateOwned ?? false) + if (user.Faction?.StateOwned ?? false || user.Faction?.GangOwned == false) { player.SendNotification("~r~Du darfst keine Hanfsamen einpflanzen"); return; @@ -482,18 +481,10 @@ namespace ReallifeGamemode.Server.Managers IItem cannabisItem = InventoryManager.GetItem(); IItem jointItem = InventoryManager.GetItem(); - var addWeight = jointItem.Gewicht * CANNABIS_TO_JOINT_RATIO - cannabisItem.Gewicht; - - if (!InventoryManager.CanPlayerHoldMoreWeight(player, addWeight)) - { - player.SendNotification("~r~Für die Verarbeitung hast du nicht genug Platz im Rucksack"); - return; - } - UserItem userCannabisItem = userItems.Where(i => i.ItemId == cannabisItem.Id).FirstOrDefault(); - if (userCannabisItem == null) + if (userCannabisItem == null || userCannabisItem.Amount < CANNABIS_NEEDED_FOR_JOINT) { - player.SendNotification("~r~Du hast kein Cannabis dabei"); + player.SendNotification($"~r~Du hast nicht genug Cannabis dabei~n~Zur Herstellung eines Joints werden {CANNABIS_NEEDED_FOR_JOINT} Hanfblüten benötigt"); return; } @@ -502,10 +493,10 @@ namespace ReallifeGamemode.Server.Managers player.SyncAnimation(_manufacturerAnim); - InventoryManager.RemoveUserItem(user, userCannabisItem, 1); - InventoryManager.AddItemToInventory(player, jointItem.Id, CANNABIS_TO_JOINT_RATIO); + InventoryManager.RemoveUserItem(user, userCannabisItem, CANNABIS_NEEDED_FOR_JOINT); + InventoryManager.AddItemToInventory(player, jointItem.Id, 1); - player.SendNotification($"Du hast 1 Cannabis in {CANNABIS_TO_JOINT_RATIO} Joints verarbeitet"); + player.SendNotification($"Du hast{CANNABIS_NEEDED_FOR_JOINT} Hanfblüten in einen Joint verarbeitet"); NAPI.ClientEvent.TriggerClientEventInRange(player.Position, 100.0f, "SERVER:Hanf_PlayManufacturerAnim", _manufacturerAnim); } diff --git a/ReallifeGamemode.Server/Managers/InteractionManager.cs b/ReallifeGamemode.Server/Managers/InteractionManager.cs index c769b235..9c04f95f 100644 --- a/ReallifeGamemode.Server/Managers/InteractionManager.cs +++ b/ReallifeGamemode.Server/Managers/InteractionManager.cs @@ -859,6 +859,12 @@ namespace ReallifeGamemode.Server.Managers return; } + if (serverVehicle.Model == VehicleHash.Riot) + { + player.SendNotification("~r~Der Riot muss zur Asservatenkammer gefahren werden"); + return; + } + if (VehicleStreaming.GetLockState(vehicle) || serverVehicle.Locked) { player.SendNotification("~r~Dieses Fahrzeug ist abgeschlossen"); From 899fbd2fde1a6e3a98bc5f623af14a0329410fb2 Mon Sep 17 00:00:00 2001 From: hydrant Date: Thu, 27 May 2021 22:09:20 +0200 Subject: [PATCH 80/82] typo --- ReallifeGamemode.Server/Managers/HanfManager.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReallifeGamemode.Server/Managers/HanfManager.cs b/ReallifeGamemode.Server/Managers/HanfManager.cs index 965720ea..2ea69f0e 100644 --- a/ReallifeGamemode.Server/Managers/HanfManager.cs +++ b/ReallifeGamemode.Server/Managers/HanfManager.cs @@ -496,7 +496,7 @@ namespace ReallifeGamemode.Server.Managers InventoryManager.RemoveUserItem(user, userCannabisItem, CANNABIS_NEEDED_FOR_JOINT); InventoryManager.AddItemToInventory(player, jointItem.Id, 1); - player.SendNotification($"Du hast{CANNABIS_NEEDED_FOR_JOINT} Hanfblüten in einen Joint verarbeitet"); + player.SendNotification($"Du hast {CANNABIS_NEEDED_FOR_JOINT} Hanfblüten in einen Joint verarbeitet"); NAPI.ClientEvent.TriggerClientEventInRange(player.Position, 100.0f, "SERVER:Hanf_PlayManufacturerAnim", _manufacturerAnim); } From 2ff0312ef0d7e638f1af83833d31cb68be6d2b4c Mon Sep 17 00:00:00 2001 From: hydrant Date: Thu, 27 May 2021 22:23:58 +0200 Subject: [PATCH 81/82] delete illegal items when dead --- ReallifeGamemode.Server/Events/Death.cs | 5 ++++- .../Managers/InventoryManager.cs | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/ReallifeGamemode.Server/Events/Death.cs b/ReallifeGamemode.Server/Events/Death.cs index 697e2159..beb87ae1 100644 --- a/ReallifeGamemode.Server/Events/Death.cs +++ b/ReallifeGamemode.Server/Events/Death.cs @@ -47,7 +47,9 @@ namespace ReallifeGamemode.Server.Events return; } - if(player.HasData("IsCarryingPlant") || player.GetData("IsCarryingPlant")) + player.ToggleInventory(InventoryToggleOption.HIDE); + + if (player.HasData("IsCarryingPlant") || player.GetData("IsCarryingPlant")) { var currentModel = player.GetData("HoldingCannabisPlant"); @@ -241,6 +243,7 @@ namespace ReallifeGamemode.Server.Events public void RespawnPlayerAtHospital(Player player) { logger.LogInformation("Player {0} respawned at the hospital", player.Name); + InventoryManager.RemoveIllegalItemsFromInventory(player); player.SetData("isDead", false); using (var dbContext = new DatabaseContext()) { diff --git a/ReallifeGamemode.Server/Managers/InventoryManager.cs b/ReallifeGamemode.Server/Managers/InventoryManager.cs index e8cfea56..a2ff976f 100644 --- a/ReallifeGamemode.Server/Managers/InventoryManager.cs +++ b/ReallifeGamemode.Server/Managers/InventoryManager.cs @@ -685,5 +685,24 @@ namespace ReallifeGamemode.Server.Managers //client.TriggerEvent("SERVER:SET_HANDMONEY", user.Handmoney); } } + + public static void RemoveIllegalItemsFromInventory(Player player) + { + if (!player.IsLoggedIn()) + { + return; + } + + var user = player.GetUser(); + + List items = GetUserItems(player); + foreach (var item in items) + { + if (!GetItemById(item.ItemId).Legal) + { + RemoveUserItem(user, item, item.Amount); + } + } + } } } From e7be855f6fd73e897d9a8fc5ffcb9ae45bdc0d07 Mon Sep 17 00:00:00 2001 From: hydrant Date: Thu, 27 May 2021 22:26:18 +0200 Subject: [PATCH 82/82] fix inventory --- ReallifeGamemode.Client/inventory/inventory.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReallifeGamemode.Client/inventory/inventory.ts b/ReallifeGamemode.Client/inventory/inventory.ts index 05a90982..2d3385be 100644 --- a/ReallifeGamemode.Client/inventory/inventory.ts +++ b/ReallifeGamemode.Client/inventory/inventory.ts @@ -28,7 +28,7 @@ loaded = true; invBrowser.execute(`showInventory()`); - } else if (loaded || force === true) { + } else if (loaded || force === false) { globalData.InMenu = false; mp.gui.cursor.show(false, false); loaded = false;