From ecd33789d16b8afda0c939c2a54b67fbe4169372 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 2 Aug 2020 15:46:44 +0200 Subject: [PATCH] =?UTF-8?q?change=20M=C3=BCllmann?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ReallifeGamemode.Client/Jobs/RefuseCollector.ts | 8 ++++---- ReallifeGamemode.Server/Commands/AdminCommands.cs | 5 +++-- ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs | 6 +++--- ReallifeGamemode.Server/Events/ExitVehicle.cs | 2 +- ReallifeGamemode.Server/Job/RefuseCollectorJob.cs | 9 ++++++--- ReallifeGamemode.Server/Managers/JobManager.cs | 8 +++++++- 6 files changed, 24 insertions(+), 14 deletions(-) diff --git a/ReallifeGamemode.Client/Jobs/RefuseCollector.ts b/ReallifeGamemode.Client/Jobs/RefuseCollector.ts index 0b2d6789..498f08a3 100644 --- a/ReallifeGamemode.Client/Jobs/RefuseCollector.ts +++ b/ReallifeGamemode.Client/Jobs/RefuseCollector.ts @@ -29,14 +29,14 @@ vehicle = veh; for (var i = 0; i < posArr.length; i++) { let pos = new mp.Vector3(posArr[i].x, posArr[i].y, posArr[i].z - 1) - BlipTonne.push(mp.blips.new(1, pos, { name: 'Müllmann', color: 45, shortRange: false })); + BlipTonne.push(mp.blips.new(1, pos, { name: 'Mülltonne', color: 45, shortRange: false })); BlipTonne[i].setFlashTimer(2000); ShapeTonne.push(mp.colshapes.newSphere(posArr[i].x, posArr[i].y, posArr[i].z + 0.5, 1.75)); } - BlipTonneBase = mp.blips.new(1, new mp.Vector3(-535.1912, -1713.742, 19.23861 - 1), { name: 'Müllmann', color: 5, shortRange: false }); - CheckpointTonneBase = mp.markers.new(1, new mp.Vector3(-535.1912, -1713.742, 19.23861 - 1), 10, { direction: new mp.Vector3(-235.5747, -1685.475, 32.7207), color: [255, 255, 0, 150], visible: true, dimension: 0 }); - ShapeTonneBase = mp.colshapes.newSphere(-535.1912, -1713.742, 19.23861 - 1, 10); + BlipTonneBase = mp.blips.new(1, new mp.Vector3(-426.69382, -1691.0972, 19.02909 - 1), { name: 'Recylinganlage', color: 5, shortRange: false }); + CheckpointTonneBase = mp.markers.new(1, new mp.Vector3(-426.69382, -1691.0972, 19.02909 - 1), 10, { direction: new mp.Vector3(-235.5747, -1685.475, 32.7207), color: [255, 255, 0, 150], visible: true, dimension: 0 }); + ShapeTonneBase = mp.colshapes.newSphere(-426.69382, -1691.0972, 19.02909 - 1, 10); }); mp.events.add('SERVER:MuellmannBCSEntfernen', () => { for (var i = 0; i < BlipTonne.length; i++) { diff --git a/ReallifeGamemode.Server/Commands/AdminCommands.cs b/ReallifeGamemode.Server/Commands/AdminCommands.cs index b943bff7..019f7f5d 100644 --- a/ReallifeGamemode.Server/Commands/AdminCommands.cs +++ b/ReallifeGamemode.Server/Commands/AdminCommands.cs @@ -321,15 +321,16 @@ namespace ReallifeGamemode.Server.Commands [Command("o", "~m~Benutzung: ~s~/o [Nachricht]", GreedyArg = true)] public void CmdAdminO(Player player, string message) { - if (!player.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? true) + /* if (!player.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? true) { ChatService.NotAuthorized(player); return; } + */ message = Regex.Replace(message, "(~[a-zA-Z]~)|(!{(.*)})", ""); message = Regex.Replace(message, "#([0-9A-Fa-f]{6})", m => "!{" + m.Groups[0].Value + "}"); - string publicMessage = "~b~(( " + player.GetUser().AdminLevel.GetName() + " " + player.Name + ": " + message + " ~b~))"; + string publicMessage = "~b~(( " + /*player.GetUser().AdminLevel.GetName() + */ " " + player.Name + ": " + message + " ~b~))"; ChatService.Broadcast(publicMessage); } diff --git a/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs b/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs index 6e33e78a..7c75a9dc 100644 --- a/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs +++ b/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs @@ -226,7 +226,7 @@ namespace ReallifeGamemode.Server.DrivingSchool } client.SetData("ActiveSchool", 2); - client.TriggerEvent("renderTextOnScreen", "Sie haben die Führerscheinprüfung gestartet. Steigen Sie in eines der Fahrschulmotorräder ein."); + client.TriggerEvent("renderTextOnScreen", "Sie haben die Führerscheinprüfung gestartet. Steigen Sie auf eines der Fahrschulmotorräder ein."); client.TriggerEvent("waitPlayerEntersVehicle"); } @@ -259,11 +259,11 @@ namespace ReallifeGamemode.Server.DrivingSchool { if (checkpoint == 0) { - user.TriggerEvent("renderTextOnScreen", "Sollten Sie aus dem Fahrzeug aussteigen fallen Sie durch."); + user.TriggerEvent("renderTextOnScreen", "Sollten Sie vom Motorrad absteigen, fallen sie durch."); } else if (checkpoint == 12) { - user.TriggerEvent("renderTextOnScreen", "Parke nun das Auto an der markierten Stelle."); + user.TriggerEvent("renderTextOnScreen", "Parke nun das Motorrad an der markierten Stelle."); CheckPointHandle.StartCheckPointRoute(user, StopBike, 5000, 1, 7, 3, true, "bikeSchoolEventEnd"); } } diff --git a/ReallifeGamemode.Server/Events/ExitVehicle.cs b/ReallifeGamemode.Server/Events/ExitVehicle.cs index 01365cef..15f3cb9e 100644 --- a/ReallifeGamemode.Server/Events/ExitVehicle.cs +++ b/ReallifeGamemode.Server/Events/ExitVehicle.cs @@ -14,7 +14,7 @@ namespace ReallifeGamemode.Server.Events public class ExitVehicle : Script { object LastVehicle; - public static Timer timerNoobRollerRespawn = new Timer(10000); //10 Minuten Timer NoobRollerRespawn + public static Timer timerNoobRollerRespawn = new Timer(600000); //10 Minuten Timer NoobRollerRespawn [ServerEvent(Event.PlayerExitVehicleAttempt)] public void OnPlayerExitVehicle(Player client, GTANetworkAPI.Vehicle vehicle) { diff --git a/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs b/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs index 77e2e674..80253bb1 100644 --- a/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs +++ b/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs @@ -204,7 +204,7 @@ namespace ReallifeGamemode.Server.Job if (data.getDataFromClient(player) == null) continue; Player target = data.getPartnerClient(player); if (target != null) target.TriggerEvent("MuellmannUpdateColshape", colshapeIndex); - ChatService.SendMessage((Player)player, "Du hast den Müllsack in der Hand. Bringe ihm zum Müllwagen hinten."); + ChatService.SendMessage((Player)player, "Wirf den müllsack in den Müllwagen."); player.AddAttachment("binbag", false); return; } @@ -224,8 +224,11 @@ namespace ReallifeGamemode.Server.Job user1 = player.GetUser(dbContext); user2 = target.GetUser(dbContext); user1.trashcount += 1; - if (target != null) - user2.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(); } player.AddAttachment("binbag", true); diff --git a/ReallifeGamemode.Server/Managers/JobManager.cs b/ReallifeGamemode.Server/Managers/JobManager.cs index ed46642c..8d940007 100644 --- a/ReallifeGamemode.Server/Managers/JobManager.cs +++ b/ReallifeGamemode.Server/Managers/JobManager.cs @@ -83,7 +83,13 @@ namespace ReallifeGamemode.Server.Managers if (u.JobId != null) { - ChatService.ErrorMessage(player, "Du musst deinen alten Job kündigen, bevor du einen neuen ausüben kannst"); + ChatService.ErrorMessage(player, "Du musst deinen alten Job kündigen, bevor du einen neuen ausüben kannst."); + return; + } + + if(u.DriverLicenseVehicle == false) + { + ChatService.ErrorMessage(player, "Um diesen Job annehmen zu können, musst du einen Führerschein besitzen."); return; }