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

Finish Medic-extension; Clean up Code, remove DEBUG

Browse Source
This commit is contained in:
VegaZ
2021-02-13 18:07:26 +01:00
parent 49514130b3
commit f41430c5ae
2 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,10 +27,8 @@ export default function factionInteraction(globalData: IGlobalData) {
var rangeLeft; var rangeLeft;
var sortText; var sortText;
var deadRespawned = false; var deadRespawned = false;
var isRevived = false;
var timeLeft = 0; var timeLeft = 0;
var deathTime; var deathTime;
var taskTimeout = false;
var ticketName: string; var ticketName: string;
var pointsName: string; var pointsName: string;
@@ -478,7 +476,6 @@ export default function factionInteraction(globalData: IGlobalData) {
} }
mp.events.add("cutMedicEarnings", () => { mp.events.add("cutMedicEarnings", () => {
mp.gui.chat.push("DEBUG: Nur noch hälfte Verdienst!")
deadRespawned = true; deadRespawned = true;
}); });
@@ -491,15 +488,11 @@ export default function factionInteraction(globalData: IGlobalData) {
mp.events.add('playerEnterCheckpoint', (activeCheckpoint) => { mp.events.add('playerEnterCheckpoint', (activeCheckpoint) => {
if (deadRespawned == true) { if (deadRespawned == true) {
mp.gui.chat.push("DEBUG: Checkpoint NACH wiederbelebung des Spielers betreten")
mp.gui.chat.push("DEBUG: Hälfte ausgezahlt")
activeCheckpoint.destroy(); activeCheckpoint.destroy();
mp.events.callRemote("PayCutMedicEarnings"); mp.events.callRemote("PayCutMedicEarnings");
activeTask = false; activeTask = false;
deadRespawned = false; deadRespawned = false;
timeLeft = 0; timeLeft = 0;
} else {
mp.gui.chat.push("DEBUG: Checkpoint VOR wiederbelebung des Spielers betreten")
} }
}); });
@@ -534,7 +527,8 @@ export default function factionInteraction(globalData: IGlobalData) {
timeLeft = Math.round(Math.abs(Math.floor(currentDate.getTime() / 1000) - deathTime - 60)); timeLeft = Math.round(Math.abs(Math.floor(currentDate.getTime() / 1000) - deathTime - 60));
if (timeLeft < 1) mp.events.call("destroyMedicTaskCheckpoint"); if (timeLeft < 1) mp.events.call("destroyMedicTaskCheckpoint");
} }
/*DEBUG TIMER für die Zeit die man noch hat zur Wiederbelebung
if (deadRespawned == false) { if (deadRespawned == false) {
mp.game.graphics.drawText(timeLeft.toString() + "s ", [0.5, 0.88], { mp.game.graphics.drawText(timeLeft.toString() + "s ", [0.5, 0.88], {
font: 7, font: 7,
@@ -553,7 +547,7 @@ export default function factionInteraction(globalData: IGlobalData) {
centre: true centre: true
}); });
} }
} } */
} }
}); });
} }

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

@@ -149,8 +149,6 @@ 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");
NAPI.Chat.SendChatMessageToAll("DEBUG: Player:" + player.Name + " Medic:" + medic.Name);
} }
[RemoteEvent("PayCutMedicEarnings")] [RemoteEvent("PayCutMedicEarnings")]
public void PayCutMedicEarnings(Player player) public void PayCutMedicEarnings(Player player)