From d8cddb3411f5132fd420e8e3e7ef0dc19813dbe3 Mon Sep 17 00:00:00 2001 From: aviate Date: Sun, 15 Sep 2019 21:53:13 +0200 Subject: [PATCH] messages --- ReallifeGamemode.Client/Business/main.ts | 4 ++-- ReallifeGamemode.Server/Events/Login.cs | 2 +- ReallifeGamemode.Server/Report/Report.cs | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ReallifeGamemode.Client/Business/main.ts b/ReallifeGamemode.Client/Business/main.ts index fd7d5c04..f33e4973 100644 --- a/ReallifeGamemode.Client/Business/main.ts +++ b/ReallifeGamemode.Client/Business/main.ts @@ -70,14 +70,14 @@ export default function business(globalData: GlobalData) { if (businessState == 1) { // Besitzer bankAccountItem = new UIMenuItem("Businesskasse", "Verwalte die Businesskasse"); - bankAccountItem.SetRightLabel("~h~" + businessData.Balance); + bankAccountItem.SetRightLabel("~s~" + businessData.Balance); mainMenu.AddItem(bankAccountItem); var bankMenu = new Menu("Bankkonto", businessData.Name, new Point(50, 50), null, null); bankMenu.Visible = false; var infoItem = new UIMenuItem("Aktueller Kontostand"); - infoItem.SetRightLabel("~h~" + businessData.Balance); + infoItem.SetRightLabel("~s~" + businessData.Balance); bankMenu.AddItem(infoItem); var depositItem = new UIMenuItem("Einzahlen", "Zahle Geld auf die Businesskasse ein"); diff --git a/ReallifeGamemode.Server/Events/Login.cs b/ReallifeGamemode.Server/Events/Login.cs index a48075c9..75f7254b 100644 --- a/ReallifeGamemode.Server/Events/Login.cs +++ b/ReallifeGamemode.Server/Events/Login.cs @@ -74,7 +74,7 @@ namespace ReallifeGamemode.Server.Events ChatService.BroadcastAdmin("!{#FFFF00}*** " + GlobalHelper.CustomJoinMessages[player.SocialClubName] + " [ID: " + player.Handle.Value + "] (" + user.AdminLevel.GetName() + ")", AdminLevel.TEAM); } else if (user.IsAdmin(AdminLevel.TEAM)) { - ChatService.BroadcastAdmin("!{#FFFF00}*** " + user.Name +"(ID: " + player.Handle.Value + ")" + " hat sich als " + user.AdminLevel.GetName() + " eingeloggt!", AdminLevel.TEAM); + ChatService.BroadcastAdmin("!{#FFFF00}*** " + user.Name +" [ID: " + player.Handle.Value + "]" + " hat sich als " + user.AdminLevel.GetName() + " eingeloggt!", AdminLevel.TEAM); } var userItems = dbContext.UserItems.Where(u => u.UserId == user.Id).ToList(); diff --git a/ReallifeGamemode.Server/Report/Report.cs b/ReallifeGamemode.Server/Report/Report.cs index 33df658b..03d2739d 100644 --- a/ReallifeGamemode.Server/Report/Report.cs +++ b/ReallifeGamemode.Server/Report/Report.cs @@ -181,12 +181,12 @@ namespace ReallifeGamemode.Server.Report } ChatService.SendMessage(user, "!{#addc8d}Dein Ticket wurde abgeschickt"); ChatService.SendMessage(user, "!{#addc8d}Momentan sind " + GlobalHelper.DutyAdmins.Count + " Admins verfügbar"); - ChatService.BroadcastDutyAdmin("!{#008fff}[TICKET]!{#FFFFFF} Eingehendes Ticket von~r~ " + user.Name + " (" + user.Handle.Value + ")~w~: " + text + " (Benutze /showtickets)"); + ChatService.BroadcastDutyAdmin("!{#008fff}[TICKET]!{#FFFFFF} Eingehendes Ticket von~w~ " + user.Name + " (" + user.Handle.Value + ")~w~: " + text + " (Benutze /showtickets)"); ReportManage ticket = new ReportManage(user.Name, text); listReports.Add(ticket); } if (type == "Quick Report") - ChatService.BroadcastAdmin("!{#008fff}[QR]~r~ " + user.Name + " (" + user.Handle.Value + ")~w~: " + text, AdminLevel.SUPPORTER); + ChatService.BroadcastAdmin("!{#008fff}[REPORT]~w~ " + user.Name + " (" + user.Handle.Value + ")~w~: " + text, AdminLevel.SUPPORTER); } [RemoteEvent("deleteReport")]