From 4ec055a34199ef9f63e92d1bd789adce311b4f2b Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 1 Aug 2020 00:29:31 +0200 Subject: [PATCH] fix some things --- ReallifeGamemode.Server/Events/Key.cs | 3 +++ ReallifeGamemode.Server/Events/Vehicle.cs | 4 ++- ReallifeGamemode.Server/Gangwar/Turf.cs | 4 +-- .../Managers/InteractionManager.cs | 2 +- .../Managers/JobManager.cs | 27 ++++++++++--------- 5 files changed, 24 insertions(+), 16 deletions(-) diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs index 0c25dbf4..afecbe2b 100644 --- a/ReallifeGamemode.Server/Events/Key.cs +++ b/ReallifeGamemode.Server/Events/Key.cs @@ -542,6 +542,7 @@ namespace ReallifeGamemode.Server.Events if (!job.GetUsersInJob().Contains(player)) { jobb.StartJobEvent(player); + player.TriggerEvent("renderTextOnScreen", "Steige nun in eines der Fahrzeuge und starte den Motor mit der Taste 'N'."); return; } } @@ -559,6 +560,7 @@ namespace ReallifeGamemode.Server.Events { player.SetData("PilotenBase", 1); jobb.StartJobEvent(player); + player.TriggerEvent("renderTextOnScreen", "Steige nun in eines der Flugzeuge und starte den Motor mit der Taste 'N'."); return; } } @@ -574,6 +576,7 @@ namespace ReallifeGamemode.Server.Events { player.SetData("PilotenBase", 2); jobb.StartJobEvent(player); + player.TriggerEvent("renderTextOnScreen", "Steige nun in eines der Flugzeuge und starte den Motor mit der Taste 'N'."); return; } } diff --git a/ReallifeGamemode.Server/Events/Vehicle.cs b/ReallifeGamemode.Server/Events/Vehicle.cs index eb197c89..76075751 100644 --- a/ReallifeGamemode.Server/Events/Vehicle.cs +++ b/ReallifeGamemode.Server/Events/Vehicle.cs @@ -1,4 +1,4 @@ -using System; +using System; using GTANetworkAPI; using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Database.Models; @@ -15,6 +15,7 @@ namespace ReallifeGamemode.Server.Events { if (player.IsInVehicle && player.VehicleSeat == 0) { + player.TriggerEvent("CLIENT:SELECT_ROUTE"); GTANetworkAPI.Vehicle v = player.Vehicle; User u = player.GetUser(); @@ -68,6 +69,7 @@ namespace ReallifeGamemode.Server.Events } } VehicleStreaming.SetEngineState(v, !state); + } } diff --git a/ReallifeGamemode.Server/Gangwar/Turf.cs b/ReallifeGamemode.Server/Gangwar/Turf.cs index ee9be72e..cbeec4c2 100644 --- a/ReallifeGamemode.Server/Gangwar/Turf.cs +++ b/ReallifeGamemode.Server/Gangwar/Turf.cs @@ -154,11 +154,11 @@ namespace ReallifeGamemode.Server.Gangwar { gangwarPlayer.TriggerEvent("GangwarScore", this.Attacker, this.Owner, this.Att_Score, this.Def_Score); } - if (this.Att_Score >= 5) + if (this.Att_Score >= 200) { this.takeOver(this.Attacker); } - else if (this.Def_Score >= 5) + else if (this.Def_Score >= 200) { this.takeOver(this.Owner); } diff --git a/ReallifeGamemode.Server/Managers/InteractionManager.cs b/ReallifeGamemode.Server/Managers/InteractionManager.cs index b7e9751f..aed35aff 100644 --- a/ReallifeGamemode.Server/Managers/InteractionManager.cs +++ b/ReallifeGamemode.Server/Managers/InteractionManager.cs @@ -458,7 +458,7 @@ namespace ReallifeGamemode.Server.Managers } else { - if (amount > 0 && amount < 10000) + if (amount > 0 && amount <= 10000) { player.SendNotification($"~w~Du hast ~y~{targetname} ~w~ein Ticket in Höhe von ~b~{amount}$ ~w~gestellt. Grund: ~g~{reason}~w~."); target.SendNotification($"~b~{player.GetUser().FactionRank.RankName} | {playername} ~w~hat dir ein Ticket in Höhe von ~y~{amount}$ ~w~gestellt.", true); diff --git a/ReallifeGamemode.Server/Managers/JobManager.cs b/ReallifeGamemode.Server/Managers/JobManager.cs index d0b364b7..ed46642c 100644 --- a/ReallifeGamemode.Server/Managers/JobManager.cs +++ b/ReallifeGamemode.Server/Managers/JobManager.cs @@ -11,6 +11,9 @@ using ReallifeGamemode.Server.Job; using ReallifeGamemode.Server.Services; using ReallifeGamemode.Server.Util; using ReallifeGamemode.Services; +using ReallifeGamemode.Server.Types; + + namespace ReallifeGamemode.Server.Managers { @@ -223,7 +226,7 @@ namespace ReallifeGamemode.Server.Managers { if (!player.HasData("JobVehicleFrei") || player.GetData("JobVehicleFrei") == false) { - player.SetData("DelayTime", 60000*5); + player.SetData("DelayTime", 60000 * 5); veh.SetData("timerJobVehicleRespawn", true); player.SetData("LastVehicle", veh); player.SetData("LastSVehicle", sVeh); @@ -231,7 +234,7 @@ namespace ReallifeGamemode.Server.Managers { playerTimersJobVehicleRespawn[player].Stop(); } - PlayerTimer playerTimer = new PlayerTimer(player, veh, 60000*5); + PlayerTimer playerTimer = new PlayerTimer(player, veh, 60000 * 5); playerTimer.Elapsed += PlayerTimer_Elapsed; playerTimersJobVehicleRespawn[player] = playerTimer; //player.SendChatMessage("~y~[JOB] ~w~Du hast das Fahrzeug verlassen,"); @@ -333,7 +336,7 @@ namespace ReallifeGamemode.Server.Managers { player.Position = new Vector3(-628.598388671875, -2107.609130859375, 6.072586536407471); player.Heading = (-171.50303649902344f); - + } if (player.GetUser().JobId == 2)//Müllmann { @@ -395,15 +398,15 @@ namespace ReallifeGamemode.Server.Managers if (driver.HasData("Passager")) return; driver.SetData("Passager", player.GetUser().Id); driver.SetData("hasPassager", true); - /* using (var dbContext = new DatabaseContext()) - { - int amount = (int)Math.Round(km * taxiPrice); - User contractUser = player.GetUser(dbContext); - contractUser.Handmoney -= amount; - driver.GetUser(dbContext).Wage += amount; - dbContext.SaveChanges(); - //contractUser.Player.TriggerEvent("SERVER:SET_HANDMONEY", contractUser.Handmoney); - } */ + /* using (var dbContext = new DatabaseContext()) + { + int amount = (int)Math.Round(km * taxiPrice); + User contractUser = player.GetUser(dbContext); + contractUser.Handmoney -= amount; + driver.GetUser(dbContext).Wage += amount; + dbContext.SaveChanges(); + //contractUser.Player.TriggerEvent("SERVER:SET_HANDMONEY", contractUser.Handmoney); + } */ player.TriggerEvent("CLIENT:startCustomerFare", taxiPrice, km); var taxiContracts = taxiJob.TaxiContracts.Where(t => t.Name == player.Name);