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

added time in jailtime info

Browse Source
This commit is contained in:
Fabian Fabian
2019-09-05 20:49:00 +02:00
parent a79e06f41d
commit 70e4743487
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,6 +59,9 @@ export default function (globalData: GlobalData): void {
}); });
mp.events.add("toggleDutyMode", (toggle) => { mp.events.add("toggleDutyMode", (toggle) => {
if (toggle != 0) {
}
dutyMode = toggle; dutyMode = toggle;
}); });
@@ -216,7 +219,7 @@ export default function (globalData: GlobalData): void {
}) })
if (jailTime > 0) { if (jailTime > 0) {
mp.game.graphics.drawText("~y~Knastzeit: (" + jailTime + ")", [0.89, 0.441], mp.game.graphics.drawText("~y~Knastzeit: " + jailTime + " Minuten", [0.9, 0.55],
{ {
font: 4, font: 4,
color: [255, 255, 255, 255], color: [255, 255, 255, 255],

3
ReallifeGamemode.Server/Wanted/Jail.cs
View File

@@ -76,7 +76,7 @@ namespace ReallifeGamemode.Server.Wanted
Medic.RemoveTaskFromList(task); Medic.RemoveTaskFromList(task);
client.Health = 100; client.Health = 100;
client.TriggerEvent("jailTime", jailTime); client.TriggerEvent("jailTime", (int)(jailTime / 60));
ChatService.SendMessage(client, "!{#FF614A}* Du bist nun im Gefängnis für " + jailTime + " Sekunden."); ChatService.SendMessage(client, "!{#FF614A}* Du bist nun im Gefängnis für " + jailTime + " Sekunden.");
ChatService.BroadcastFaction("!{#8181E9}HQ: " + user.Name + " wurde ins Gefängnis geliefert.", new List<int>() { 1, 3 }); ChatService.BroadcastFaction("!{#8181E9}HQ: " + user.Name + " wurde ins Gefängnis geliefert.", new List<int>() { 1, 3 });
} }
@@ -166,6 +166,7 @@ namespace ReallifeGamemode.Server.Wanted
using (var dbContext = new DatabaseContext()) using (var dbContext = new DatabaseContext())
{ {
player.GetUser(dbContext).JailTime -= 60; player.GetUser(dbContext).JailTime -= 60;
player.TriggerEvent("jailTime", (int)(player.GetUser(dbContext).JailTime / 60));
dbContext.SaveChanges(); dbContext.SaveChanges();
} }
player.Health = 100; player.Health = 100;