From fd06c11a0dfdbafb90efe6487ae503d4977d0bd1 Mon Sep 17 00:00:00 2001 From: VegaZ Date: Wed, 6 Mar 2019 18:27:58 +0100 Subject: [PATCH] Commented Task Sorting --- .../Interaction/factioninteraction.js | 4 ++-- ReallifeGamemode.Client/Player/keys.js | 10 +++++----- ReallifeGamemode.Server/Events/Key.cs | 2 -- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/ReallifeGamemode.Client/Interaction/factioninteraction.js b/ReallifeGamemode.Client/Interaction/factioninteraction.js index 3999506d..48666ed0 100644 --- a/ReallifeGamemode.Client/Interaction/factioninteraction.js +++ b/ReallifeGamemode.Client/Interaction/factioninteraction.js @@ -108,7 +108,7 @@ mp.events.add("showMedicTasks", (type, taskList) => { globalData.Interaction = true; switch (type) { case 0: - reviveTaskMenu = new Menu("Revives", "Sortierung: ~g~" + sortText + " ~y~[NUM 5]", new Point(0, screenRes.y / 2)); + reviveTaskMenu = new Menu("Revives", "\u00c4lteste zu erst", new Point(0, screenRes.y / 2)); let aTask; for (var i = 0; i < tasks.length; i++) { if (tasks[i].MedicName === "none") { @@ -168,7 +168,7 @@ mp.events.add("sortFactionTasks", (sortByKey) => { if (firstSorting) { sortText = "Nach Uhrzeit"; firstSorting = false; - mp.gui.chat.push("Init Sort"); + //mp.gui.chat.push("Init Sort"); return; } else { if (sortByKey) { diff --git a/ReallifeGamemode.Client/Player/keys.js b/ReallifeGamemode.Client/Player/keys.js index 63f61462..fea2b42f 100644 --- a/ReallifeGamemode.Client/Player/keys.js +++ b/ReallifeGamemode.Client/Player/keys.js @@ -34,11 +34,11 @@ mp.keys.bind(0x26, false, function () { }); //RIGHT ARROW (Interaktion mit anderen Spielern) -mp.keys.bind(0x27, false, function () { - if (!globalData.InChat && !showInv && !globalData.Interaction) { - mp.events.callRemote("keyPress:RIGHT_ARROW"); - } -}); +//mp.keys.bind(0x27, false, function () { +// if (!globalData.InChat && !showInv && !globalData.Interaction) { +// mp.events.callRemote("keyPress:RIGHT_ARROW"); +// } +//}); //DOWN ARROW (Interaktion mit anderen Spielern) mp.keys.bind(0x28, false, function () { diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs index 77193f48..e464c61c 100644 --- a/ReallifeGamemode.Server/Events/Key.cs +++ b/ReallifeGamemode.Server/Events/Key.cs @@ -62,12 +62,10 @@ namespace reallife_gamemode.Server.Events { if (!player.IsLoggedIn()) return; User user = player.GetUser(); - player.SendChatMessage("RIGHT_ARROW TRIGGER"); switch (user.FactionId) { //LSFD case 2: - player.SendChatMessage("RIGHT_ARROW TRIGGER - FACTION:~g~" + user.FactionId); player.TriggerEvent("showFactionInteraction", user.FactionId, user.GetFaction().Name, user.FactionLeader, Medic.ReviveTasks.Count.ToString(), Medic.HealTasks.Count.ToString(), Medic.FireTasks.Count.ToString()); break; }