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

Weitere Fehler behoben, DEBUG hinzugefügt, pls TEST

Browse Source
This commit is contained in:
VegaZ
2021-02-06 20:35:54 +01:00
parent 466ab4cc63
commit 8169ba60f8
3 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,7 +17,7 @@ export default function deathScreen() {
var deathSeconds; var deathSeconds;
var fade; var fade;
var deathDate: Date; var deathDate: Date;
var taskTimeout = false;
const maxDeathTime = 30; const maxDeathTime = 30;
const medicJobTime = maxDeathTime * 2; const medicJobTime = maxDeathTime * 2;
@@ -37,6 +37,7 @@ export default function deathScreen() {
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);
taskTimeout = false;
} }
}); });
@@ -53,13 +54,19 @@ export default function deathScreen() {
mp.game.gameplay.setFadeOutAfterDeath(false); mp.game.gameplay.setFadeOutAfterDeath(false);
mp.events.callRemote('RespawnPlayerAtHospital'); mp.events.callRemote('RespawnPlayerAtHospital');
mp.game.graphics.setStreamedTextureDictAsNoLongerNeeded("Mptattoos"); mp.game.graphics.setStreamedTextureDictAsNoLongerNeeded("Mptattoos");
mp.events.callRemote("CutMedicEarnings");
}); });
mp.events.add("updateDutyMedics", (count) => { mp.events.add("updateDutyMedics", (count) => {
dutyMedics = count; dutyMedics = count;
}); });
mp.events.add("medicTaskTimeout", (count) => {
taskTimeout = true;
mp.events.callRemote("MedicTaskTimeout");
mp.events.callRemote("RemoveMedicCheckpoint");
});
mp.events.add("render", () => { mp.events.add("render", () => {
var currentDate = new Date(); var currentDate = new Date();
@@ -104,13 +111,11 @@ export default function deathScreen() {
mp.game.graphics.drawRect(0.5, 0.5, 1, 1, 0, 0, 0, alpha); mp.game.graphics.drawRect(0.5, 0.5, 1, 1, 0, 0, 0, alpha);
} else { } else {
mp.events.call("respawnDeathPlayer"); mp.events.call("respawnDeathPlayer");
mp.events.callRemote("CutMedicEarnings");
} }
} else { } else {
if (deathSeconds > medicJobTime) { if (deathSeconds > medicJobTime && taskTimeout == false) {
mp.events.callRemote("MedicTaskTimeout"); mp.events.callRemote("medicTaskTimeout");
mp.events.callRemote("RemoveMedicCheckpoint");
} }
} }
}); });

5
ReallifeGamemode.Client/Interaction/factioninteraction.ts
View File

@@ -477,15 +477,18 @@ export default function factionInteraction(globalData: IGlobalData) {
}); });
mp.events.add('playerEnterCheckpoint', (activeCheckpoint) => { mp.events.add('playerEnterCheckpoint', (activeCheckpoint) => {
mp.gui.chat.push("DEBUG: Checkpoint NACH wiederbelebung des Spielers betreten")
if (deadRespawned == true) { if (deadRespawned == true) {
activeTask = false; activeTask = false;
activeCheckpoint.destroy(); activeCheckpoint.destroy();
mp.events.callRemote("delReviveTask"); mp.events.callRemote("delReviveTask");
mp.events.callRemote("payCutMedicEarnings"); mp.events.callRemote("PayCutMedicEarnings");
mp.gui.chat.push("DEBUG: Hälfte ausgezahlt")
deadRespawned = false; deadRespawned = false;
} else { } else {
activeTask = false; activeTask = false;
activeCheckpoint.destroy(); activeCheckpoint.destroy();
mp.gui.chat.push("DEBUG: Checkpoint VOR wiederbelebung des Spielers betreten")
} }
}); });

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

@@ -144,8 +144,9 @@ namespace ReallifeGamemode.Server.Factions.Medic
MedicTask task = ReviveTasks.FirstOrDefault(t => t.Victim == player.Name); MedicTask task = ReviveTasks.FirstOrDefault(t => t.Victim == player.Name);
var medic = PlayerService.GetPlayerByNameOrId(task.MedicName); var medic = PlayerService.GetPlayerByNameOrId(task.MedicName);
medic.TriggerEvent("cutMedicEarnings"); medic.TriggerEvent("cutMedicEarnings");
medic.SendChatMessage("DEBUG: Der Spieler wurde respawnt. Nur noch 50% des Verdienst");
} }
[RemoteEvent("payCutMedicEarnings")] [RemoteEvent("PayCutMedicEarnings")]
public void PayCutMedicEarnings(Player player) public void PayCutMedicEarnings(Player player)
{ {
using var dbContext = new DatabaseContext(); using var dbContext = new DatabaseContext();