aviate/reallife-gamemode
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Duty-Medics / In Gangwar - TSupport wird kein Revive Auftrag erstellt

Browse Source
This commit is contained in:
VegaZ
2021-04-09 20:14:37 +02:00
parent 04998eec02
commit 1a97d0aa3c
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ReallifeGamemode.Client/Gui/deathscreen.ts
View File

@@ -36,7 +36,8 @@ export default function deathScreen() {
deathDate = new Date(); deathDate = new Date();
respawnTime = Math.floor(deathDate.getTime() / 1000 + maxDeathTime); respawnTime = Math.floor(deathDate.getTime() / 1000 + maxDeathTime);
fade = 255 - maxDeathTime; fade = 255 - maxDeathTime;
mp.game.graphics.requestStreamedTextureDict("Mptattoos", true); mp.game.graphics.requestStreamedTextureDict("Mptattoos", true);
mp.events.call("GetDutyMedics");
taskTimeout = false; taskTimeout = false;
} }
}); });

2
ReallifeGamemode.Server/Events/Death.cs
View File

@@ -97,7 +97,7 @@ namespace ReallifeGamemode.Server.Events
user.Dead = true; user.Dead = true;
if (!player.HasData("reviveSperre")) if (!player.HasData("reviveSperre") || !player.HasData("inGangWar") || player.GetData<bool>("SAdminduty") == true)
{ {
//MEDIC AUFTRAG //MEDIC AUFTRAG
MedicTask reviveTask = new MedicTask() MedicTask reviveTask = new MedicTask()

4
ReallifeGamemode.Server/Events/Key.cs
View File

@@ -300,7 +300,7 @@ namespace ReallifeGamemode.Server.Events
player.TriggerEvent("toggleDutyMode", true); player.TriggerEvent("toggleDutyMode", true);
if (player.GetUser().FactionId == 2) //Fire Department if (player.GetUser().FactionId == 2) //Fire Department
{ {
Medic.UpdateDutyMedics(1); Medic.UpdateDutyMedics();
} }
switch (factionId) switch (factionId)
{ {
@@ -338,7 +338,7 @@ namespace ReallifeGamemode.Server.Events
user.SetData("duty", false); user.SetData("duty", false);
player.SendNotification("Du bist nun ~r~außer Dienst."); player.SendNotification("Du bist nun ~r~außer Dienst.");
player.TriggerEvent("toggleDutyMode", false); player.TriggerEvent("toggleDutyMode", false);
Medic.UpdateDutyMedics(-1); Medic.UpdateDutyMedics();
UpdateCharacterCloth.LoadCharacterDefaults(player); UpdateCharacterCloth.LoadCharacterDefaults(player);
} }
user.SetBlipAndNametagColor(); user.SetBlipAndNametagColor();

7
ReallifeGamemode.Server/Factions/Medic/Medic.cs
View File

@@ -288,10 +288,11 @@ namespace ReallifeGamemode.Server.Factions.Medic
RemoveTaskFromList(task); RemoveTaskFromList(task);
} }
} }
[RemoteEvent("GetDutyMedics")]
public static void UpdateDutyMedics(int modifier) public static void UpdateDutyMedics()
{ {
dutyMedics = dutyMedics + modifier;
dutyMedics = NAPI.Pools.GetAllPlayers().Where(c => c.GetData<bool>("duty") == true && c.GetUser().FactionId == 2).ToList().Count;
NAPI.ClientEvent.TriggerClientEventForAll("updateDutyMedics", dutyMedics); NAPI.ClientEvent.TriggerClientEventForAll("updateDutyMedics", dutyMedics);
} }
} }