diff --git a/ReallifeGamemode.Client/util/Gangwar.ts b/ReallifeGamemode.Client/util/Gangwar.ts index ba7bd552..efb498fc 100644 --- a/ReallifeGamemode.Client/util/Gangwar.ts +++ b/ReallifeGamemode.Client/util/Gangwar.ts @@ -263,7 +263,7 @@ self.attacker = null; //self.blip.setFlashes(false); mp.game.invoke(Natives.SET_BLIP_FLASHES, self.blip, false); - self.blip.destroy(); + //self.blip.destroy(); self.setColor(self.owner); self.blip.setColour(self.color); mp.game.invoke(Natives.SET_BLIP_COLOUR, self.blip, self.color); diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs index 97c73d91..ed77f397 100644 --- a/ReallifeGamemode.Server/Events/Key.cs +++ b/ReallifeGamemode.Server/Events/Key.cs @@ -546,8 +546,7 @@ namespace ReallifeGamemode.Server.Events player.TriggerEvent("renderTextOnScreen", "Steige nun in eines der Fahrzeuge und starte den Motor mit der Taste 'N'."); return; } - }else - { + } else { player.SendNotification("~r~[Fehler] ~w~ Du hast diesen Job nicht angenommen."); return; } @@ -569,40 +568,38 @@ namespace ReallifeGamemode.Server.Events player.TriggerEvent("renderTextOnScreen", "Steige nun in eines der Flugzeuge und starte den Motor mit der Taste 'N'."); return; } - }else - { - player.SendNotification("~r~[Fehler] ~w~ Du hast diesen Job nicht angenommen."); - return; - } - - if (nearestJobPoint.Skill >= 300 && player.GetUser().PilotSkill >= 300) - { - if (job.GetUsersInJob().Contains(player)) - { - player.SetData("PilotenBase", 2); - jobb.StopJob(player); - return; - } - if (!job.GetUsersInJob().Contains(player)) - { - 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; - } } else { - player.SendChatMessage("~y~[JOB] ~r~Dein Skilllevel ist noch zu niedrig."); + player.SendNotification("~r~[Fehler] ~w~ Du hast diesen Job nicht angenommen."); return; } - }else + + if (nearestJobPoint.Skill >= 300 && player.GetUser().PilotSkill >= 300) { - player.SendNotification("~r~[Fehler] ~w~ Du hast diesen Job nicht angenommen."); + if (job.GetUsersInJob().Contains(player)) + { + player.SetData("PilotenBase", 2); + jobb.StopJob(player); + return; + } + if (!job.GetUsersInJob().Contains(player)) + { + 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; + } + } else { + player.SendChatMessage("~y~[JOB] ~r~Dein Skilllevel ist noch zu niedrig."); return; } + } else { + player.SendNotification("~r~[Fehler] ~w~ Du hast diesen Job nicht angenommen."); + return; } } + } [RemoteEvent("keyPress:I")] public void KeyPressI(Player player) diff --git a/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs b/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs index 10e3e038..8fab42e2 100644 --- a/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs +++ b/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs @@ -220,18 +220,18 @@ namespace ReallifeGamemode.Server.Job { return; } - - foreach (var data in muellmanData) + using (var dbContext = new DatabaseContext()) { - if (data.getDataFromClient(player) == null) continue; - Player target = data.getPartnerClient(player); - User user1 = player.GetUser(); - User user2 = target.GetUser(); - using (var dbContext = new DatabaseContext()) + foreach (var data in muellmanData) { - user1 = player.GetUser(dbContext); - user2 = target.GetUser(dbContext); - user1.trashcount += 1; + if (data.getDataFromClient(player) == null) continue; + Player target = data.getPartnerClient(player); + User user1 = player.GetUser(dbContext); + User user2 = target.GetUser(dbContext); + + //user1 = player.GetUser(dbContext); + //user2 = target.GetUser(dbContext); + /*user1.trashcount += 1; if (user1.trashcount == 20) { @@ -249,11 +249,12 @@ namespace ReallifeGamemode.Server.Job target.SendChatMessage("~y~Dies ist dein 20ter Müllsack."); } } + dbContext.SaveChanges(); - } - player.AddAttachment("binbag", true); - if (target != null) - if (player.GetUser().trashcount >= 20) + player.AddAttachment("binbag", true); + */ + + if (player.GetUser(dbContext).trashcount >= 20) { ChatService.SendMessage((Player)player, "~y~Job: ~s~Der Müllwagen ist voll. Fahre nun zurück zur Recyclinganlage!"); if (target != null) @@ -265,23 +266,20 @@ namespace ReallifeGamemode.Server.Job } else { - using (var dbContext = new DatabaseContext()) + //user1 = player.GetUser(dbContext); + //user2 = target.GetUser(dbContext); + user1.trashcount += 1; + player.SendNotification("Müllsack: " + user1.trashcount + " von 20."); + if (target != null) { - user1 = player.GetUser(dbContext); - user2 = target.GetUser(dbContext); - user1.trashcount += 1; - player.SendNotification("Müllsack: " + user1.trashcount + " von 20."); - if (target != null) - { - target.SendNotification("Müllsack: " + user2.trashcount + " von 20."); - user2.trashcount += 1; - } - dbContext.SaveChanges(); + target.SendNotification("Müllsack: " + user2.trashcount + " von 20."); + user2.trashcount += 1; } + dbContext.SaveChanges(); } - player.AddAttachment("binbag", true); - if (target != null) - if (player.GetUser().trashcount >= 20) + player.AddAttachment("binbag", true); + + if (player.GetUser(dbContext).trashcount >= 20) { ChatService.SendMessage((Player)player, "~y~Job: ~s~Der Müllwagen ist voll. Fahre nun zurück zur Recyclinganlage!"); if (target != null) @@ -293,17 +291,22 @@ namespace ReallifeGamemode.Server.Job } else { + //user1 = player.GetUser(dbContext); + //user2 = target.GetUser(dbContext); + if (target != null) { - player.GetUser().Wage += 10; - target.GetUser().Wage += 10; + user1.Wage += 10; + user2.Wage += 10; } else { - player.GetUser().Wage += 20; + user1.Wage += 20; } + dbContext.SaveChanges(); } + } return; } } @@ -321,25 +324,24 @@ namespace ReallifeGamemode.Server.Job if (target != null) ChatService.SendMessage((Player)target, $"~y~Job: ~s~Fahrzeug wurde entleert. Säcke: {target.GetUser().trashcount}"); ChatService.SendMessage((Player)player, $"~y~Job: ~s~Fahrzeug wurde entleert. Säcke: {player.GetUser().trashcount}"); //bonus pro sack - if (target != null) - { - player.GetUser().Wage += 100; - target.GetUser().Wage += 100; - } - else - { - player.GetUser().Wage += 200; - } - User user1 = player.GetUser(); - User user2 = target.GetUser(); using (var dbContext = new DatabaseContext()) { - user1 = player.GetUser(dbContext); - user2 = target.GetUser(dbContext); + User user1 = player.GetUser(dbContext); + User user2 = target.GetUser(dbContext); - user1.trashcount -= user1.trashcount; if (target != null) - user2.trashcount -= user2.trashcount; + { + user1.Wage += 100; + user2.Wage += 100; + } + else + { + user1.Wage += 200; + } + + user1.trashcount -= user1.trashcount; + if (target != null) user2.trashcount -= user2.trashcount; + dbContext.SaveChanges(); } Console.WriteLine($"[DATA DEBUG] vehicle: {data.vehicle.DisplayName} | Players: {data.getClientsFromData().Count} | Säcke: {data.getTrashCount()}"); diff --git a/ReallifeGamemode.Server/Main.cs b/ReallifeGamemode.Server/Main.cs index f21fe826..dcb7cfe2 100644 --- a/ReallifeGamemode.Server/Main.cs +++ b/ReallifeGamemode.Server/Main.cs @@ -169,6 +169,9 @@ namespace ReallifeGamemode.Server { user.Player.TriggerEvent("SERVER:SET_HANDMONEY", user.Handmoney); }; + + //IPLS + NAPI.World.RequestIpl("vw_casino_garage"); } [RemoteEvent("CLIENT:Event")]