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

Commented Task Sorting

Browse Source
This commit is contained in:
VegaZ
2019-03-06 18:27:58 +01:00
parent b8ce900c72
commit fd06c11a0d
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ReallifeGamemode.Client/Interaction/factioninteraction.js
View File

@@ -108,7 +108,7 @@ mp.events.add("showMedicTasks", (type, taskList) => {
globalData.Interaction = true; globalData.Interaction = true;
switch (type) { switch (type) {
case 0: 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; let aTask;
for (var i = 0; i < tasks.length; i++) { for (var i = 0; i < tasks.length; i++) {
if (tasks[i].MedicName === "none") { if (tasks[i].MedicName === "none") {
@@ -168,7 +168,7 @@ mp.events.add("sortFactionTasks", (sortByKey) => {
if (firstSorting) { if (firstSorting) {
sortText = "Nach Uhrzeit"; sortText = "Nach Uhrzeit";
firstSorting = false; firstSorting = false;
mp.gui.chat.push("Init Sort"); //mp.gui.chat.push("Init Sort");
return; return;
} else { } else {
if (sortByKey) { if (sortByKey) {

10
ReallifeGamemode.Client/Player/keys.js
View File

@@ -34,11 +34,11 @@ mp.keys.bind(0x26, false, function () {
}); });
//RIGHT ARROW (Interaktion mit anderen Spielern) //RIGHT ARROW (Interaktion mit anderen Spielern)
mp.keys.bind(0x27, false, function () { //mp.keys.bind(0x27, false, function () {
if (!globalData.InChat && !showInv && !globalData.Interaction) { // if (!globalData.InChat && !showInv && !globalData.Interaction) {
mp.events.callRemote("keyPress:RIGHT_ARROW"); // mp.events.callRemote("keyPress:RIGHT_ARROW");
} // }
}); //});
//DOWN ARROW (Interaktion mit anderen Spielern) //DOWN ARROW (Interaktion mit anderen Spielern)
mp.keys.bind(0x28, false, function () { mp.keys.bind(0x28, false, function () {

2
ReallifeGamemode.Server/Events/Key.cs
View File

@@ -62,12 +62,10 @@ namespace reallife_gamemode.Server.Events
{ {
if (!player.IsLoggedIn()) return; if (!player.IsLoggedIn()) return;
User user = player.GetUser(); User user = player.GetUser();
player.SendChatMessage("RIGHT_ARROW TRIGGER");
switch (user.FactionId) switch (user.FactionId)
{ {
//LSFD //LSFD
case 2: 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()); player.TriggerEvent("showFactionInteraction", user.FactionId, user.GetFaction().Name, user.FactionLeader, Medic.ReviveTasks.Count.ToString(), Medic.HealTasks.Count.ToString(), Medic.FireTasks.Count.ToString());
break; break;
} }