From 98ba18ae1d2bfdb1e28f31d89a87971099c799bb Mon Sep 17 00:00:00 2001 From: VegaZ Date: Mon, 8 Feb 2021 18:54:35 +0100 Subject: [PATCH] Fix Medic v3 --- ReallifeGamemode.Client/Gui/deathscreen.ts | 8 ++++---- ReallifeGamemode.Server/Factions/Medic/Medic.cs | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ReallifeGamemode.Client/Gui/deathscreen.ts b/ReallifeGamemode.Client/Gui/deathscreen.ts index 3868945a..366f5199 100644 --- a/ReallifeGamemode.Client/Gui/deathscreen.ts +++ b/ReallifeGamemode.Client/Gui/deathscreen.ts @@ -19,7 +19,7 @@ export default function deathScreen() { var deathDate: Date; var taskTimeout = false; const maxDeathTime = 30; - const medicJobTime = maxDeathTime * 2; + const medicJobTime = maxDeathTime * -1; mp.game.gameplay.setFadeOutAfterDeath(false); @@ -111,11 +111,11 @@ export default function deathScreen() { mp.game.graphics.drawRect(0.5, 0.5, 1, 1, 0, 0, 0, alpha); } else { - mp.events.call("respawnDeathPlayer"); + mp.events.call("respawnDeathPlayer"); } } else { - if (deathSeconds > medicJobTime && taskTimeout == false) { - mp.events.callRemote("medicTaskTimeout"); + if (deathSeconds < medicJobTime && taskTimeout == false) { + mp.events.callRemote("medicTaskTimeout"); } } }); diff --git a/ReallifeGamemode.Server/Factions/Medic/Medic.cs b/ReallifeGamemode.Server/Factions/Medic/Medic.cs index fc8beeb3..34d69700 100644 --- a/ReallifeGamemode.Server/Factions/Medic/Medic.cs +++ b/ReallifeGamemode.Server/Factions/Medic/Medic.cs @@ -97,20 +97,20 @@ namespace ReallifeGamemode.Server.Factions.Medic { case 0: - ReviveTasks[index].MedicName = victimName; + ReviveTasks[index].MedicName = player.Name; ChatService.BroadcastFaction("~y~[MEDIC] ~w~" + player.Name + " hat den Reviveauftrag von " + victimName + " angenommen.", new List() { 2 }); target.SendNotification("~w~Sanitäter~g~ " + player.Name + "~w~ eilt zur Rettung."); break; case 1: - HealTasks[index].MedicName = victimName; + HealTasks[index].MedicName = player.Name; ChatService.BroadcastFaction("~y~[MEDIC] ~w~" + player.Name + " hat den Healauftrag von " + victimName + " angenommen.", new List() { 2 }); target.SendNotification("~w~Sanitäter~g~ " + player.Name + "~w~ hat deinen Auftrag angenommen."); break; case 2: - FireTasks[index].MedicName = victimName; + FireTasks[index].MedicName = player.Name; break; } }