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

TEST: gangwar kill message

Browse Source
This commit is contained in:
Fabian
2021-04-29 18:57:46 +02:00
parent e517b4ac81
commit 3bf0f82abb
3 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
ReallifeGamemode.Client/Gui/infobox.ts
View File

@@ -56,6 +56,9 @@ export default function (globalData: IGlobalData): void {
var playerId; var playerId;
var playerMoney = "5000"; var playerMoney = "5000";
var gangwarMessage = "";
var gangwarMessageTimer;
mp.events.add("draw", (pName, pId) => { mp.events.add("draw", (pName, pId) => {
playerName = pName; playerName = pName;
playerId = pId; playerId = pId;
@@ -94,6 +97,15 @@ export default function (globalData: IGlobalData): void {
spawnschutz = toggle; spawnschutz = toggle;
}); });
mp.events.add("setGangwarKillMessage", (msg) => {
gangwarMessage = msg;
clearInterval(gangwarMessageTimer);
gangwarMessageTimer = setTimeout(() => {
gangwarMessage = "";
}, 5000);
});
mp.events.add("jailTime", (time) => { mp.events.add("jailTime", (time) => {
jailTime = JSON.parse(time); jailTime = JSON.parse(time);
}); });
@@ -307,9 +319,18 @@ export default function (globalData: IGlobalData): void {
centre: false centre: false
}) })
mp.game.graphics.drawRect(0.0, 0.555, 0.3, 0.11, 0, 0, 0, 70) mp.game.graphics.drawRect(0.0, 0.555, 0.3, 0.11, 0, 0, 0, 70)
mp.game.graphics.drawText(gangwarMessage, [0.08, 0.68],
{
font: 4,
color: [255, 255, 255, 255],
scale: [0.5, 0.5],
outline: true,
centre: false
})
}
} }
}
if (editMode === true) { if (editMode === true) {
mp.game.graphics.drawText("~r~EDIT-MODE AKTIV", [0.5, 0], mp.game.graphics.drawText("~r~EDIT-MODE AKTIV", [0.5, 0],
{ {

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

@@ -79,6 +79,12 @@ namespace ReallifeGamemode.Server.Events
var playerInGangwar = player.HasData("inGangWar"); var playerInGangwar = player.HasData("inGangWar");
var killerInGangwar = killer.HasData("inGangWar"); var killerInGangwar = killer.HasData("inGangWar");
if (playerInGangwar && killerInGangwar)
{
killer.TriggerEvent("setGangwarKillMessage", "Du hast ~r~" + player.Name + " getötet");
}
NAPI.Util.ConsoleOutput($"OnPlayerDeath - Player {player.Name} died - PlayerInGangwar = {playerInGangwar}, KillerInGangwar = {killerInGangwar}"); NAPI.Util.ConsoleOutput($"OnPlayerDeath - Player {player.Name} died - PlayerInGangwar = {playerInGangwar}, KillerInGangwar = {killerInGangwar}");
if (playerInGangwar && killerInGangwar) if (playerInGangwar && killerInGangwar)
{ {