From 91584f267ada57e2d6dd81aa8b361d3a37f32beb Mon Sep 17 00:00:00 2001 From: Luke Date: Thu, 13 May 2021 22:41:47 +0200 Subject: [PATCH 1/9] fix managefactionranks (cherry picked from commit 8dc5ad48bbde67c8afa09cc02e078b4f07d41a31) --- ReallifeGamemode.Client/FactionManagement/main.ts | 3 ++- .../assets/html/factionmanagement/ranks/index.html | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ReallifeGamemode.Client/FactionManagement/main.ts b/ReallifeGamemode.Client/FactionManagement/main.ts index b9ae499a..fc53aee7 100644 --- a/ReallifeGamemode.Client/FactionManagement/main.ts +++ b/ReallifeGamemode.Client/FactionManagement/main.ts @@ -12,7 +12,6 @@ export default function factionManagement() { mp.events.add('manageFactionRanks', (ranks) => { if (manageFactionRanksBrowser !== null) return; manageFactionRanksBrowser = mp.browsers.new('package://assets/html/factionmanagement/ranks/index.html'); - mp.gui.chat.activate(false); rankData = JSON.parse(ranks); }); @@ -22,6 +21,7 @@ export default function factionManagement() { manageFactionRanksBrowser.execute(`setFactionName('${rankData.FactionName}')`); manageFactionRanksBrowser.execute(`loadData(` + JSON.stringify(rankData.Ranks) + `)`); mp.gui.cursor.show(true, true); + this.data.InMenu = true; } }); @@ -30,6 +30,7 @@ export default function factionManagement() { manageFactionRanksBrowser.destroy(); mp.gui.cursor.show(false, false); mp.gui.chat.activate(true); + this.data.InMenu = false; var obj: FactionRanks = { factionId: rankData.FactionId, diff --git a/ReallifeGamemode.Client/assets/html/factionmanagement/ranks/index.html b/ReallifeGamemode.Client/assets/html/factionmanagement/ranks/index.html index 7561a03f..f8cfa5ec 100644 --- a/ReallifeGamemode.Client/assets/html/factionmanagement/ranks/index.html +++ b/ReallifeGamemode.Client/assets/html/factionmanagement/ranks/index.html @@ -6,14 +6,16 @@ + - + +
-

: Ränge bearbeiten

+

{{ name }}: Ränge bearbeiten

@@ -27,4 +29,5 @@ + \ No newline at end of file From 2a6bd35e6db5e9153726098b29a21f27a6c01bf6 Mon Sep 17 00:00:00 2001 From: Luke Date: Sun, 9 May 2021 23:54:58 +0200 Subject: [PATCH 2/9] fix login message @airmake --- ReallifeGamemode.Server/Util/GlobalHelper.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReallifeGamemode.Server/Util/GlobalHelper.cs b/ReallifeGamemode.Server/Util/GlobalHelper.cs index 88e0a5e3..94849ec3 100644 --- a/ReallifeGamemode.Server/Util/GlobalHelper.cs +++ b/ReallifeGamemode.Server/Util/GlobalHelper.cs @@ -14,7 +14,7 @@ namespace ReallifeGamemode.Server.Util { ".MichaPlays.", "Der echte Ballas Leader ist online (MichaPlays)" }, { "iCroniX", "Life of Malle - Eimer für Alle - Alle für Malle - Böllern! (CroniX)" }, { "balboistderbeste", "Hurra! Hurra! Der Balbo ist jetzt da! (balbo)" }, - { "AirMake", "The fresh breeze of the stone ist back. (AirMake)" }, + { "AirMake", "The fresh breeze of the stone is back. (AirMake)" }, { "raviatex", "I'll remember you all in therapy. (aviate)" }, { "datgame__", "KOPF ENTWICKLUNG!! (hydrant)" }, { "Roachkook", "2head Entwickler ist wieder online (kookroach)" } From 5a9c8e55086bcff04d1c8d68a6d9acc6afec7894 Mon Sep 17 00:00:00 2001 From: Luke Date: Tue, 11 May 2021 01:14:23 +0200 Subject: [PATCH 3/9] zeit zum abtauchen auf 2,4 sekunden runtergeschraubt --- ReallifeGamemode.Client/Gui/blips.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReallifeGamemode.Client/Gui/blips.ts b/ReallifeGamemode.Client/Gui/blips.ts index a648181b..9350fe60 100644 --- a/ReallifeGamemode.Client/Gui/blips.ts +++ b/ReallifeGamemode.Client/Gui/blips.ts @@ -72,7 +72,7 @@ export default function playerBlips() { } mp.events.callRemote("CLIENT:EscapeWanted"); - }, 300000); //120000 -> 2 min , 300000 -> 5min + }, 2.4 * 60 * 1000); // 2.4 Minuten } }, 50); From df69c53a4cb4201625da8690b5ccce455d72e055 Mon Sep 17 00:00:00 2001 From: Luke Date: Thu, 13 May 2021 22:41:47 +0200 Subject: [PATCH 4/9] fix managefactionranks From c2cd6ebc7bbed7545fc89ab4d9ab2298437949e2 Mon Sep 17 00:00:00 2001 From: Luke Date: Fri, 14 May 2021 00:25:44 +0200 Subject: [PATCH 5/9] wt nachrichten angepasst --- ReallifeGamemode.Server/Events/Key.cs | 2 +- .../WeaponDeal/WeaponDealManager.cs | 17 ++++------------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs index bc347c28..99e2fe66 100644 --- a/ReallifeGamemode.Server/Events/Key.cs +++ b/ReallifeGamemode.Server/Events/Key.cs @@ -401,7 +401,7 @@ namespace ReallifeGamemode.Server.Events logger.LogInformation("Player {0} put the weapon deal item \"{1}\" (amount: {2}) in weapon rack of faction {3}", player.Name, weapon.WeaponModel, item.Amount, user.FactionId); weapon.Ammount += item.Amount; - ChatService.SendMessage(player, item.Amount + " " + iItem.Name + " wurden im Waffenlager hinzugefügt."); + ChatService.SendMessage(player, $"~y~[WT] ~s~Du hast eine ~y~Kiste abgeladen ~s~(Inhalt: {item.Amount}x {iItem.Name})."); unloadedWeaponPackage = true; context.Remove(item); } diff --git a/ReallifeGamemode.Server/WeaponDeal/WeaponDealManager.cs b/ReallifeGamemode.Server/WeaponDeal/WeaponDealManager.cs index 8cfaae03..14dd9af6 100644 --- a/ReallifeGamemode.Server/WeaponDeal/WeaponDealManager.cs +++ b/ReallifeGamemode.Server/WeaponDeal/WeaponDealManager.cs @@ -128,9 +128,9 @@ namespace ReallifeGamemode.Server.WeaponDeal msg = "Die Waffenlieferung steht zur Abholung bereit"; } - ChatService.BroadcastFaction($"~y~[WAFFENDEAL]~s~ {msg}.", user.Faction); + ChatService.BroadcastFaction($"~y~[WT]~s~ {msg}.", user.Faction); - ChatService.SendMessage(client, "~y~[WAFFENDEAL]~s~ Steige in den ~y~Transporter ~s~ein und fahre zum Übergabepunkt."); + ChatService.SendMessage(client, "~y~[WT]~s~ Steig in den ~y~Transporter ~s~ein und fahre zum Übergabepunkt."); fVeh.SetData("weaponDeal", true); InventoryManager.RemoveAllItemsfromVehicleInventory(fVeh); Faction fac = context.Factions.Where(f => f.Id == user.FactionId).FirstOrDefault(); @@ -147,15 +147,6 @@ namespace ReallifeGamemode.Server.WeaponDeal } } - /* - public static void WeaponDealTimer() - { - System.Timers.Timer timer = new System.Timers.Timer(60000); - timer.Start(); - timer.Elapsed += Timer_Elapsed; - } - */ - public static void Timer_Elapsed() { using (var context = new DatabaseContext()) @@ -259,8 +250,8 @@ namespace ReallifeGamemode.Server.WeaponDeal InventoryManager.AddItemToVehicleInventory(fVeh, item7.ItemId, item7.Amount); } - ChatService.BroadcastFaction("~y~[WAFFENDEAL] ~w~Der Transporter wurde erfolgreich beladen.", new List() { client.GetUser().Faction.Id }); - client.SendChatMessage("~y~[WAFFENDEAL] ~w~Fahre nun zu deiner Base zurück."); + ChatService.BroadcastFaction("~y~[WT] ~w~Der Transporter wurde erfolgreich beladen.", new List() { client.GetUser().Faction.Id }); + client.SendChatMessage("~y~[WT] ~w~Fahre nun zu deiner Base zurück."); BasePoints basePoints = new BasePoints(); basePoints.getbase(user.FactionId, client); } From 7a49fa4aa29562344d0faf08837456f20919d5e1 Mon Sep 17 00:00:00 2001 From: Luke Date: Fri, 14 May 2021 00:33:20 +0200 Subject: [PATCH 6/9] duty notification angepasst --- ReallifeGamemode.Server/Events/Key.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs index 99e2fe66..c41554ca 100644 --- a/ReallifeGamemode.Server/Events/Key.cs +++ b/ReallifeGamemode.Server/Events/Key.cs @@ -312,7 +312,7 @@ namespace ReallifeGamemode.Server.Events if (user.GetData("duty") == false) { user.SetData("duty", true); - player.SendNotification("Du bist nun ~g~im Dienst."); + player.SendNotification("Du bist nun ~g~im Dienst"); player.TriggerEvent("toggleDutyMode", true); player.TriggerEvent("abortSpawnschutz"); if (user.FactionId == 2) //Fire Department @@ -353,7 +353,7 @@ namespace ReallifeGamemode.Server.Events else { user.SetData("duty", false); - player.SendNotification("Du bist nun ~r~außer Dienst."); + player.SendNotification("Du bist nun ~r~nicht mehr im Dienst"); player.TriggerEvent("toggleDutyMode", false); Medic.UpdateDutyMedics(); UpdateCharacterCloth.LoadCharacterDefaults(player); From 5527c420403d6c182ab1f9edb3cc9e4edb971c35 Mon Sep 17 00:00:00 2001 From: Luke Date: Fri, 14 May 2021 00:53:46 +0200 Subject: [PATCH 7/9] mfr wurde jetzt wirklich gefixt --- .../assets/html/factionmanagement/ranks/index.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ReallifeGamemode.Client/assets/html/factionmanagement/ranks/index.html b/ReallifeGamemode.Client/assets/html/factionmanagement/ranks/index.html index f8cfa5ec..5d04d846 100644 --- a/ReallifeGamemode.Client/assets/html/factionmanagement/ranks/index.html +++ b/ReallifeGamemode.Client/assets/html/factionmanagement/ranks/index.html @@ -24,10 +24,10 @@
- - - - + + + + \ No newline at end of file From 09bd4357fde2fac4acb58d0654b7606255719e25 Mon Sep 17 00:00:00 2001 From: Luke Date: Fri, 14 May 2021 01:01:56 +0200 Subject: [PATCH 8/9] mfr: this.data.InMenu gibt error, deswegen wieder raus sorry @airmake --- ReallifeGamemode.Client/inputhelper/index.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ReallifeGamemode.Client/inputhelper/index.ts b/ReallifeGamemode.Client/inputhelper/index.ts index 62e509ae..6297caab 100644 --- a/ReallifeGamemode.Client/inputhelper/index.ts +++ b/ReallifeGamemode.Client/inputhelper/index.ts @@ -29,8 +29,7 @@ export default class InputHelper { } show() { - if (this.created) return; - this.data.InMenu = true; + if (this.created) return; this.created = true; this.browser = mp.browsers.new('package://assets/html/inputhelper/index.html'); mp.gui.cursor.show(true, true); @@ -44,11 +43,9 @@ export default class InputHelper { mp.events.remove('cef_request_title'); mp.events.remove('closeinputhelper'); this.browser.destroy(); - this.data.InMenu = false; this.created = false; this.browser = null; mp.gui.cursor.show(false, false); - } } From 6a958d77cd148c262e202da5525e5642cade034d Mon Sep 17 00:00:00 2001 From: Luke Date: Sun, 16 May 2021 20:46:14 +0200 Subject: [PATCH 9/9] /aunshow und NoClip auf Admin 1 --- ReallifeGamemode.Server/Commands/AdminCommands.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ReallifeGamemode.Server/Commands/AdminCommands.cs b/ReallifeGamemode.Server/Commands/AdminCommands.cs index ff993e82..3da213f2 100644 --- a/ReallifeGamemode.Server/Commands/AdminCommands.cs +++ b/ReallifeGamemode.Server/Commands/AdminCommands.cs @@ -1645,7 +1645,7 @@ namespace ReallifeGamemode.Server.Commands public void CmdAdminUnshow(Player player) { User user = player.GetUser(); - if (!user.IsAdmin(AdminLevel.HEADADMIN)) + if (!user.IsAdmin(AdminLevel.ADMIN)) { ChatService.NotAuthorized(player); return; @@ -3945,7 +3945,7 @@ namespace ReallifeGamemode.Server.Commands [RemoteEvent("Noclip")] public void Noclip(Player player) { - if (!player.GetUser().IsAdmin(AdminLevel.HEADADMIN)) + if (!player.GetUser().IsAdmin(AdminLevel.ADMIN)) { return; }