From 5c84dc177d2f9c88aadae9ab74cd63c1d9e2c65e Mon Sep 17 00:00:00 2001 From: VegaZ Date: Thu, 27 Dec 2018 22:21:59 +0100 Subject: [PATCH 1/3] Start Medic System / FactionInteraction --- Client/Gui/deathscreen.js | 1 + Client/Interaction/factioninteraction.js | 62 +++++++++++++++++++ .../{interaction.js => playerinteraction.js} | 8 +-- Client/Player/keys.js | 24 ++++++- Client/index.js | 9 ++- Server/Events/Death.cs | 15 +++++ Server/Events/Key.cs | 20 ++++-- Server/Factions/Medic/Medic.cs | 53 ++++++++++++++++ Server/Factions/Medic/MedicTask.cs | 25 ++++++++ Server/Managers/InteractionManager.cs | 8 +++ 10 files changed, 210 insertions(+), 15 deletions(-) create mode 100644 Client/Interaction/factioninteraction.js rename Client/Interaction/{interaction.js => playerinteraction.js} (98%) create mode 100644 Server/Factions/Medic/Medic.cs create mode 100644 Server/Factions/Medic/MedicTask.cs diff --git a/Client/Gui/deathscreen.js b/Client/Gui/deathscreen.js index b25bf574..ebecae07 100644 --- a/Client/Gui/deathscreen.js +++ b/Client/Gui/deathscreen.js @@ -26,6 +26,7 @@ mp.events.add("startDeathTimer", (isAdmin) => { else { mp.gui.chat.activate(false); } + mp.game.audio.playSoundFrontend(-1, "Bed", "WastedSounds", true); deathDate = new Date(); respawnTime = Math.floor(deathDate.getTime() / 1000 + 120); fade = 255 - 120; diff --git a/Client/Interaction/factioninteraction.js b/Client/Interaction/factioninteraction.js new file mode 100644 index 00000000..1b0fe6cf --- /dev/null +++ b/Client/Interaction/factioninteraction.js @@ -0,0 +1,62 @@ +let screenRes = mp.game.graphics.getScreenResolution(0, 0); + +const NativeUI = require("nativeui"); +const Menu = NativeUI.Menu; +const UIMenuItem = NativeUI.UIMenuItem; +const UIMenuListItem = NativeUI.UIMenuListItem; +const UIMenuCheckboxItem = NativeUI.UIMenuCheckboxItem; +const BadgeStyle = NativeUI.BadgeStyle; +const Point = NativeUI.Point; +const ItemsCollection = NativeUI.ItemsCollection; +const Color = NativeUI.Color; + +mp.events.add("showFactionInteraction", (userFactionId, userFactionName, isFactionLeader, reviveTaskCount, healTaskCount, fireTaskCount) => { + + mp.gui.chat.activate(false); + globalData.Interaction = true; + + + let factionInteractionMenu = new Menu("Fraktionsinteraktion", userFactionName, new Point(0, screenRes.y / 2)); + + if (isFactionLeader) { + let leaderMenu = new UIMenuItem("Leadermen\u00fc", "Verwaltung der Fraktion"); + leaderMenu.SetRightBadge(BadgeStyle.Star); + factionInteractionMenu.AddItem(leaderMenu); + } + + switch (userFactionId) { + case 2: + let reviveTaskMenu = new UIMenuItem("Reviveauftr\u00e4ge"); + reviveTaskMenu.SetRightLabel(reviveTaskCount.toString()) + factionInteractionMenu.AddItem(reviveTaskMenu); + + let healTaskMenu = new UIMenuItem("Healauftr\u00e4ge"); + reviveTaskMenu.SetRightLabel(healTaskCount.toString()) + factionInteractionMenu.AddItem(healTaskMenu); + + let fireTaskMenu = new UIMenuItem("Reviveauftr\u00e4ge"); + reviveTaskMenu.SetRightLabel(fireTaskCount.toString()) + factionInteractionMenu.AddItem(fireTaskMenu); + break; + } + + let cancelItem = new UIMenuItem("Schlie\u00dfen", "Schlie\u00dft die Spielerinteraktion"); + cancelItem.BackColor = new Color(213, 0, 0); + cancelItem.HighlightedBackColor = new Color(229, 57, 53); + factionInteractionMenu.AddItem(cancelItem); + + factionInteractionMenu.Visible = true; + + factionInteractionMenu.ItemSelect.on((item) => { + if (item.Text === "Schlie\u00dfen") { + factionInteractionMenu.Visible = false; + mp.gui.chat.activate(true); + globalData.Interaction = false; + } + }); + + factionInteractionMenu.MenuClose.on(() => { + mp.gui.chat.activate(true); + globalData.Interaction = false; + }); +}); \ No newline at end of file diff --git a/Client/Interaction/interaction.js b/Client/Interaction/playerinteraction.js similarity index 98% rename from Client/Interaction/interaction.js rename to Client/Interaction/playerinteraction.js index bad2e0be..17a68373 100644 --- a/Client/Interaction/interaction.js +++ b/Client/Interaction/playerinteraction.js @@ -42,7 +42,7 @@ const Color = NativeUI.Color; mp.events.add("showPlayerInteraction", (nearPlayerArr) => { mp.gui.chat.activate(false); nearbyPlayers = JSON.parse(nearPlayerArr); - globalData.PlayerInteraction = true; + globalData.Interaction = true; let playerInteractionMenu = new Menu("Spielerinteraktion", "", new Point(0, screenRes.y / 2)); let playerSelect = new UIMenuListItem("Mit", "~y~W\u00e4hle den Spieler aus.", new ItemsCollection(nearbyPlayers)); playerInteractionMenu.AddItem(playerSelect); @@ -60,17 +60,17 @@ mp.events.add("showPlayerInteraction", (nearPlayerArr) => { mp.events.callRemote("openTradeInventory", playerSelect.SelectedValue); playerInteractionMenu.Visible = false; mp.gui.chat.activate(true); - globalData.PlayerInteraction = false; + globalData.Interaction = false; } else if (item.Text === "Schlie\u00dfen") { playerInteractionMenu.Visible = false; mp.gui.chat.activate(true); - globalData.PlayerInteraction = false; + globalData.Interaction = false; } }); playerInteractionMenu.MenuClose.on(() => { mp.gui.chat.activate(true); - globalData.PlayerInteraction = false; + globalData.Interaction = false; }); }); diff --git a/Client/Player/keys.js b/Client/Player/keys.js index 9a9aae39..4ef12dc5 100644 --- a/Client/Player/keys.js +++ b/Client/Player/keys.js @@ -6,7 +6,6 @@ //https://docs.microsoft.com/de-de/windows/desktop/inputdev/virtual-key-codes -var chat = false; var showInventory = false; var showGui = true; var showInv = false; @@ -22,12 +21,31 @@ mp.keys.bind(0x0D, false, function () { //LEFT ARROW (Interaktion mit anderen Spielern) mp.keys.bind(0x25, false, function () { - if (!globalData.InChat && !showInv && !globalData.PlayerInteraction) { - mp.events.callRemote("keyPress:LEFT_ARROW"); + if (!globalData.InChat && !showInv && !globalData.Interaction) { + mp.events.callRemote("keyPress:LEFT_ARROW"); } }); +//UP ARROW (Interaktion mit anderen Spielern) +mp.keys.bind(0x26, false, function () { + if (!globalData.InChat && !showInv && !globalData.Interaction) { + mp.events.callRemote("keyPress:UP_ARROW"); + } +}); +//RIGHT ARROW (Interaktion mit anderen Spielern) +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 () { + if (!globalData.InChat && !showInv && !globalData.Interaction) { + mp.events.callRemote("keyPress:DOWN_ARROW"); + } +}); //F7 //Unshowalles mp.keys.bind(0x76, false, function () { if (showGui === true) { diff --git a/Client/index.js b/Client/index.js index f94dcb48..7f3182ad 100644 --- a/Client/index.js +++ b/Client/index.js @@ -2,12 +2,12 @@ * @overview Life of German Reallife - Login index.js * @author VegaZ, hydrant * @copyright (c) 2008 - 2018 Life of German - */ + **/ let globalData = { InTuning: false, HideGui: false, - PlayerInteraction: false, + Interaction: false, InChat: false }; @@ -19,6 +19,7 @@ require('./Business/main.js'); require('./Business/cardealer.js'); require('./CharCreator/index.js'); + require('./coloredhlights'); require('./DoorManager/doormanager.js'); @@ -33,7 +34,8 @@ require('./Gui/Inventory/inventory.js'); require('./Gui/vehiclemenu/main.js'); require('./Gui/interiors.js'); -require('./Interaction/interaction.js'); +require('./Interaction/factioninteraction.js'); +require('./Interaction/playerinteraction.js'); require('./Login/main.js'); @@ -43,6 +45,7 @@ require('./Player/quit.js'); require('./Player/freecam.js'); require('./Save/main.js'); + require('./Speedometer/index.js'); require('./Tuning/main.js'); diff --git a/Server/Events/Death.cs b/Server/Events/Death.cs index 578072f6..35172b26 100644 --- a/Server/Events/Death.cs +++ b/Server/Events/Death.cs @@ -6,6 +6,7 @@ using GTANetworkAPI; using GTANetworkMethods; using reallife_gamemode.Model; using reallife_gamemode.Server.Extensions; +using reallife_gamemode.Server.Factions.Medic; using reallife_gamemode.Server.Services; using reallife_gamemode.Server.Util; @@ -76,6 +77,20 @@ namespace reallife_gamemode.Server.Events ChatService.BroadcastAdmin(message, AdminLevel.ADMIN); } } + //MEDIC AUFTRAG + MedicTask reviveTask = new MedicTask() + { + Victim = player, + Position = player.Position, + CauseOfDeath = reason.ToString(), + Caller = player, + Description = "Gestorben", + Time = DateTime.Now, + Type = 0 + }; + Medic.AddTaskToList(reviveTask); + + //TODO PICTURE NOTIFICATION + SOUND für Medics using (var userDeath = new DatabaseContext()) { diff --git a/Server/Events/Key.cs b/Server/Events/Key.cs index bed77d1e..bc688146 100644 --- a/Server/Events/Key.cs +++ b/Server/Events/Key.cs @@ -8,6 +8,7 @@ using reallife_gamemode.Model; using reallife_gamemode.Server.Classes; using reallife_gamemode.Server.Entities; using reallife_gamemode.Server.Extensions; +using reallife_gamemode.Server.Factions.Medic; using reallife_gamemode.Server.Inventory; using reallife_gamemode.Server.Inventory.Interfaces; using reallife_gamemode.Server.Managers; @@ -60,12 +61,21 @@ namespace reallife_gamemode.Server.Events } player.TriggerEvent("showPlayerInteraction", JsonConvert.SerializeObject(nearbyPlayerList)); } - else - { - player.SendNotification("~r~Es ist niemand in deiner N\u00e4he!", false); - } } - + [RemoteEvent("keyPress:RIGHT_ARROW")] + public void KeyPressRightArrow(Client player) + { + if (!player.IsLoggedIn()) return; + User user = player.GetUser(); + switch (user.FactionId) + { + //LSFD + case 2: + player.TriggerEvent("showFactionInteraction", user.FactionId, user.GetFaction().Name, user.FactionLeader, Medic.ReviveTasks.Count, Medic.HealTasks.Count, Medic.FireTasks.Count); + break; + } + } + [RemoteEvent("keyPress:E")] public void KeyPressE(Client player) { diff --git a/Server/Factions/Medic/Medic.cs b/Server/Factions/Medic/Medic.cs new file mode 100644 index 00000000..a74f82bd --- /dev/null +++ b/Server/Factions/Medic/Medic.cs @@ -0,0 +1,53 @@ +using System; +using System.Collections.Generic; +using System.Text; +using GTANetworkAPI; + +/** + * @overview Life of German Reallife - Server Factions Medic Medic.cs + * @author VegaZ + * @copyright (c) 2008 - 2018 Life of German + */ + + +namespace reallife_gamemode.Server.Factions.Medic +{ + public class Medic : Script + { + public static List ReviveTasks = new List(); + public static List HealTasks = new List(); + public static List FireTasks = new List(); + + public static void AddTaskToList(MedicTask task) + { + switch (task.Type) + { + case 0: + ReviveTasks.Add(task); + break; + case 1: + HealTasks.Add(task); + break; + case 2: + FireTasks.Add(task); + break; + } + } + + public static void RemoveTaskFromList(MedicTask task) + { + switch (task.Type) + { + case 0: + ReviveTasks.Remove(task); + break; + case 1: + HealTasks.Remove(task); + break; + case 2: + FireTasks.Remove(task); + break; + } + } + } +} diff --git a/Server/Factions/Medic/MedicTask.cs b/Server/Factions/Medic/MedicTask.cs new file mode 100644 index 00000000..0ca3ad16 --- /dev/null +++ b/Server/Factions/Medic/MedicTask.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Text; +using GTANetworkAPI; + +/** + * @overview Life of German Reallife - Server Factions Medic MedicTask.cs + * @author VegaZ + * @copyright (c) 2008 - 2018 Life of German + */ + + +namespace reallife_gamemode.Server.Factions.Medic +{ + public class MedicTask + { + public Client Victim { get; set; } + public Vector3 Position { get; set; } + public byte Type { get; set; } + public string CauseOfDeath { get; set; } + public string Description { get; set; } + public Client Caller { get; set; } + public DateTime Time { get; set; } + } +} diff --git a/Server/Managers/InteractionManager.cs b/Server/Managers/InteractionManager.cs index bfe31fb7..da190715 100644 --- a/Server/Managers/InteractionManager.cs +++ b/Server/Managers/InteractionManager.cs @@ -16,6 +16,11 @@ namespace reallife_gamemode.Server.Managers { public class InteractionManager : Script { + #region Umgebungsinteraktionen PFEILTASTE-HOCH + #endregion + #region Eigeninteraktionen PFEILTASTE-RUNTER + #endregion + #region Spielerinteraktionen PFEILTASTE-LINKS [RemoteEvent("openTradeInventory")] public void OpenTradeInventory(Client player, string targetPlayer) { @@ -50,5 +55,8 @@ namespace reallife_gamemode.Server.Managers tradeRequester.TriggerEvent("unlockTradeItems"); } } + #endregion + #region Fraktionsinteraktionen / Jobinteraktionen PFEILTASTE-RECHTS + #endregion } } From 6d2ccceb53d5cdc5ab8728064d88eb51553d12a6 Mon Sep 17 00:00:00 2001 From: VegaZ Date: Tue, 8 Jan 2019 14:43:54 +0100 Subject: [PATCH 2/3] Committing for merge --- Client/Interaction/factioninteraction.js | 80 ++++++++++++++++++++---- Server/Events/Death.cs | 4 +- Server/Events/Key.cs | 2 +- Server/Factions/Medic/Medic.cs | 17 +++++ Server/Factions/Medic/MedicTask.cs | 6 +- 5 files changed, 91 insertions(+), 18 deletions(-) diff --git a/Client/Interaction/factioninteraction.js b/Client/Interaction/factioninteraction.js index 1b0fe6cf..1e4d786b 100644 --- a/Client/Interaction/factioninteraction.js +++ b/Client/Interaction/factioninteraction.js @@ -1,4 +1,5 @@ let screenRes = mp.game.graphics.getScreenResolution(0, 0); +const player = mp.players.local; const NativeUI = require("nativeui"); const Menu = NativeUI.Menu; @@ -14,7 +15,10 @@ mp.events.add("showFactionInteraction", (userFactionId, userFactionName, isFacti mp.gui.chat.activate(false); globalData.Interaction = true; - + + var rP = ((reviveTaskCount === "0") ? "~r~" : "~g~"); + var hP = ((healTaskCount === "0") ? "~r~" : "~g~"); + var fP = ((fireTaskCount === "0") ? "~r~" : "~g~"); let factionInteractionMenu = new Menu("Fraktionsinteraktion", userFactionName, new Point(0, screenRes.y / 2)); @@ -23,24 +27,27 @@ mp.events.add("showFactionInteraction", (userFactionId, userFactionName, isFacti leaderMenu.SetRightBadge(BadgeStyle.Star); factionInteractionMenu.AddItem(leaderMenu); } + let reviveTaskMenu; + let healTaskMenu; + let fireTaskMenu; switch (userFactionId) { case 2: - let reviveTaskMenu = new UIMenuItem("Reviveauftr\u00e4ge"); - reviveTaskMenu.SetRightLabel(reviveTaskCount.toString()) + reviveTaskMenu = new UIMenuItem("Reviveauftr\u00e4ge"); + reviveTaskMenu.SetRightLabel(rP + reviveTaskCount) factionInteractionMenu.AddItem(reviveTaskMenu); - let healTaskMenu = new UIMenuItem("Healauftr\u00e4ge"); - reviveTaskMenu.SetRightLabel(healTaskCount.toString()) + healTaskMenu = new UIMenuItem("Healauftr\u00e4ge"); + healTaskMenu.SetRightLabel(hP + healTaskCount) factionInteractionMenu.AddItem(healTaskMenu); - let fireTaskMenu = new UIMenuItem("Reviveauftr\u00e4ge"); - reviveTaskMenu.SetRightLabel(fireTaskCount.toString()) + fireTaskMenu = new UIMenuItem("Feuerauftr\u00e4ge"); + fireTaskMenu.SetRightLabel(fP + fireTaskCount) factionInteractionMenu.AddItem(fireTaskMenu); break; } - let cancelItem = new UIMenuItem("Schlie\u00dfen", "Schlie\u00dft die Spielerinteraktion"); + let cancelItem = new UIMenuItem("Schlie\u00dfen", "Schlie\u00dft die Fraktionsinteraktion"); cancelItem.BackColor = new Color(213, 0, 0); cancelItem.HighlightedBackColor = new Color(229, 57, 53); factionInteractionMenu.AddItem(cancelItem); @@ -48,10 +55,18 @@ mp.events.add("showFactionInteraction", (userFactionId, userFactionName, isFacti factionInteractionMenu.Visible = true; factionInteractionMenu.ItemSelect.on((item) => { - if (item.Text === "Schlie\u00dfen") { - factionInteractionMenu.Visible = false; - mp.gui.chat.activate(true); - globalData.Interaction = false; + switch (item) { + case cancelItem: + factionInteractionMenu.Visible = false; + mp.gui.chat.activate(true); + globalData.Interaction = false; + break; + case reviveTaskMenu: + mp.events.callRemote("loadMedicTasks", 0) + factionInteractionMenu.Visible = false; + mp.gui.chat.activate(true); + globalData.Interaction = false; + break; } }); @@ -59,4 +74,45 @@ mp.events.add("showFactionInteraction", (userFactionId, userFactionName, isFacti mp.gui.chat.activate(true); globalData.Interaction = false; }); +}); +mp.events.add("showMedicTaskMenu", (type, taskList) => { + var tasks = JSON.parse(taskList); + mp.gui.chat.activate(false); + globalData.Interaction = true; + switch (type) { + case 0: + let reviveTaskMenu = new Menu("Revives", "", new Point(0, screenRes.y / 2)); + + for (task in tasks) { + let aTask = new UIMenuItem(task.Victim); + //aTask.SetRightLabel(mp.game.gameplay.getDistanceBetweenCoords(player.position.X, player.position.Y, player.position.Z, task.position.x, task.position.y, task.position.z, true).toString() + "m"); + reviveTaskMenu.AddItem(aTask); + } + + let cancelItem = new UIMenuItem("Schlie\u00dfen", "Schlie\u00dft die Fraktionsinteraktion"); + cancelItem.BackColor = new Color(213, 0, 0); + cancelItem.HighlightedBackColor = new Color(229, 57, 53); + reviveTaskMenu.AddItem(cancelItem); + + reviveTaskMenu.ItemSelect.on((item) => { + switch (item) { + case cancelItem: + reviveTaskMenu.Visible = false; + mp.gui.chat.activate(true); + globalData.Interaction = false; + break; + + } + }); + + reviveTaskMenu.MenuClose.on(() => { + mp.gui.chat.activate(true); + globalData.Interaction = false; + }); + break; + case 1: + break; + case 2: + break; + } }); \ No newline at end of file diff --git a/Server/Events/Death.cs b/Server/Events/Death.cs index 35172b26..5a1a3cf3 100644 --- a/Server/Events/Death.cs +++ b/Server/Events/Death.cs @@ -80,10 +80,10 @@ namespace reallife_gamemode.Server.Events //MEDIC AUFTRAG MedicTask reviveTask = new MedicTask() { - Victim = player, + Victim = player.Name, Position = player.Position, CauseOfDeath = reason.ToString(), - Caller = player, + Caller = null, Description = "Gestorben", Time = DateTime.Now, Type = 0 diff --git a/Server/Events/Key.cs b/Server/Events/Key.cs index bc688146..ccef0686 100644 --- a/Server/Events/Key.cs +++ b/Server/Events/Key.cs @@ -71,7 +71,7 @@ namespace reallife_gamemode.Server.Events { //LSFD case 2: - player.TriggerEvent("showFactionInteraction", user.FactionId, user.GetFaction().Name, user.FactionLeader, Medic.ReviveTasks.Count, Medic.HealTasks.Count, Medic.FireTasks.Count); + player.TriggerEvent("showFactionInteraction", user.FactionId, user.GetFaction().Name, user.FactionLeader, Medic.ReviveTasks.Count.ToString(), Medic.HealTasks.Count.ToString(), Medic.FireTasks.Count.ToString()); break; } } diff --git a/Server/Factions/Medic/Medic.cs b/Server/Factions/Medic/Medic.cs index a74f82bd..641e855d 100644 --- a/Server/Factions/Medic/Medic.cs +++ b/Server/Factions/Medic/Medic.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Text; using GTANetworkAPI; +using Newtonsoft.Json; /** * @overview Life of German Reallife - Server Factions Medic Medic.cs @@ -49,5 +50,21 @@ namespace reallife_gamemode.Server.Factions.Medic break; } } + [RemoteEvent("loadMedicTasks")] + public void LoadMedicTasks(Client player, int type) + { + switch (type) + { + case 0: + player.TriggerEvent("showMedicTaskMenu", 0, JsonConvert.SerializeObject(ReviveTasks.ToArray())); + break; + case 1: + player.TriggerEvent("showMedicTaskMenu", 1, JsonConvert.SerializeObject(HealTasks.ToArray())); + break; + case 2: + player.TriggerEvent("showMedicTaskMenu", 2, JsonConvert.SerializeObject(FireTasks.ToArray())); + break; + } + } } } diff --git a/Server/Factions/Medic/MedicTask.cs b/Server/Factions/Medic/MedicTask.cs index 0ca3ad16..8494aee6 100644 --- a/Server/Factions/Medic/MedicTask.cs +++ b/Server/Factions/Medic/MedicTask.cs @@ -14,12 +14,12 @@ namespace reallife_gamemode.Server.Factions.Medic { public class MedicTask { - public Client Victim { get; set; } + public string Victim { get; set; } public Vector3 Position { get; set; } - public byte Type { get; set; } + public int Type { get; set; } public string CauseOfDeath { get; set; } public string Description { get; set; } - public Client Caller { get; set; } + public string Caller { get; set; } public DateTime Time { get; set; } } } From ad51f56b325dee445baeadd182a55f92abf822d6 Mon Sep 17 00:00:00 2001 From: VegaZ Date: Mon, 25 Feb 2019 19:59:02 +0100 Subject: [PATCH 3/3] Push files --- Client/Interaction/factioninteraction.js | 169 ++++++++++++++++++++--- Client/Player/keys.js | 7 + Client/dlcpacks/medicimages/dlc.rpf | 3 + Server/Commands/Admin.cs | 7 + Server/Commands/Faction.cs | 8 +- Server/Events/Death.cs | 3 +- Server/Factions/Medic/Medic.cs | 23 ++- Server/Factions/Medic/MedicTask.cs | 1 + 8 files changed, 193 insertions(+), 28 deletions(-) create mode 100644 Client/dlcpacks/medicimages/dlc.rpf diff --git a/Client/Interaction/factioninteraction.js b/Client/Interaction/factioninteraction.js index 1e4d786b..d9d09267 100644 --- a/Client/Interaction/factioninteraction.js +++ b/Client/Interaction/factioninteraction.js @@ -1,5 +1,17 @@ let screenRes = mp.game.graphics.getScreenResolution(0, 0); const player = mp.players.local; +var tasks; +var initTasks; +var newTasks; +var sorting = 0; +var activeTask = false; +var activeCheckpoint; +var taskStart; +var taskFinish; +var taskRange; +var ambulanceImagePos; +var rangeLeft; +var sortText = "Nach Uhrzeit" const NativeUI = require("nativeui"); const Menu = NativeUI.Menu; @@ -11,8 +23,14 @@ const Point = NativeUI.Point; const ItemsCollection = NativeUI.ItemsCollection; const Color = NativeUI.Color; -mp.events.add("showFactionInteraction", (userFactionId, userFactionName, isFactionLeader, reviveTaskCount, healTaskCount, fireTaskCount) => { +var factionInteractionMenu; +var reviveTaskMenu; +mp.events.add("updateFactionBlips", (type, taskList) => { + +}); + +mp.events.add("showFactionInteraction", (userFactionId, userFactionName, isFactionLeader, reviveTaskCount, healTaskCount, fireTaskCount) => { mp.gui.chat.activate(false); globalData.Interaction = true; @@ -20,7 +38,7 @@ mp.events.add("showFactionInteraction", (userFactionId, userFactionName, isFacti var hP = ((healTaskCount === "0") ? "~r~" : "~g~"); var fP = ((fireTaskCount === "0") ? "~r~" : "~g~"); - let factionInteractionMenu = new Menu("Fraktionsinteraktion", userFactionName, new Point(0, screenRes.y / 2)); + factionInteractionMenu = new Menu("Fraktionsinteraktion", userFactionName, new Point(0, screenRes.y / 2)); if (isFactionLeader) { let leaderMenu = new UIMenuItem("Leadermen\u00fc", "Verwaltung der Fraktion"); @@ -75,39 +93,64 @@ mp.events.add("showFactionInteraction", (userFactionId, userFactionName, isFacti globalData.Interaction = false; }); }); -mp.events.add("showMedicTaskMenu", (type, taskList) => { - var tasks = JSON.parse(taskList); + + +mp.events.add("showMedicTasks", (type, taskList) => { + tasks = JSON.parse(taskList); + if (sorting === 0) { + initTasks = tasks; + } mp.gui.chat.activate(false); globalData.Interaction = true; switch (type) { case 0: - let reviveTaskMenu = new Menu("Revives", "", new Point(0, screenRes.y / 2)); - - for (task in tasks) { - let aTask = new UIMenuItem(task.Victim); - //aTask.SetRightLabel(mp.game.gameplay.getDistanceBetweenCoords(player.position.X, player.position.Y, player.position.Z, task.position.x, task.position.y, task.position.z, true).toString() + "m"); + reviveTaskMenu = new Menu("Revives", "Sortierung: ~g~" + sortText + " ~y~[NUM 5]", new Point(0, screenRes.y / 2)); + let aTask; + for (var i = 0; i < tasks.length; i++) { + if (tasks[i].MedicName === "none") { + aTask = new UIMenuItem("~g~" + tasks[i].Victim); + } else { + aTask = new UIMenuItem("~r~" + tasks[i].Victim); + } + + aTask.SetRightLabel(mp.game.gameplay.getDistanceBetweenCoords(player.position.x, player.position.y, player.position.z, tasks[i].Position.x, tasks[i].Position.y, tasks[i].Position.z, true).toFixed(2).toString() + " ~g~m"); reviveTaskMenu.AddItem(aTask); } - let cancelItem = new UIMenuItem("Schlie\u00dfen", "Schlie\u00dft die Fraktionsinteraktion"); - cancelItem.BackColor = new Color(213, 0, 0); - cancelItem.HighlightedBackColor = new Color(229, 57, 53); - reviveTaskMenu.AddItem(cancelItem); + let backItem = new UIMenuItem("Zur\u00fcck", "Zur\u00fcck zur Fraktionsinteraktion"); + backItem.BackColor = new Color(213, 0, 0); + backItem.HighlightedBackColor = new Color(229, 57, 53); + reviveTaskMenu.AddItem(backItem); - reviveTaskMenu.ItemSelect.on((item) => { - switch (item) { - case cancelItem: + reviveTaskMenu.ItemSelect.on((item, index) => { + if (item === backItem) { + reviveTaskMenu.Visible = false; + factionInteractionMenu.Visible = true; + } else { + if (tasks[index].MedicName === "none") { + mp.game.graphics.requestStreamedTextureDict("medicimages", true); + mp.events.callRemote("updateMedicTask", 0, index, player.name); + mp.game.ui.setNewWaypoint(tasks[index].Position.x, tasks[index].Position.y); + activeCheckpoint = mp.markers.new(1, new mp.Vector3(tasks[index].Position.x, tasks[index].Position.y, tasks[index].Position.z - 2), 3.0, { + color: [255, 0, 0, 150], + visible: true, + dimension: 0 + }); reviveTaskMenu.Visible = false; mp.gui.chat.activate(true); globalData.Interaction = false; - break; - + ambulanceImagePos = 0.325 + taskStart = player.position; + taskFinish = tasks[index].Position; + taskRange = mp.game.gameplay.getDistanceBetweenCoords(player.position.x, player.position.y, player.position.z, tasks[index].Position.x, tasks[index].Position.y, tasks[index].Position.z, true); + activeTask = true; + } } }); - + reviveTaskMenu.MenuClose.on(() => { - mp.gui.chat.activate(true); - globalData.Interaction = false; + reviveTaskMenu.Visible = false; + factionInteractionMenu.Visible = true; }); break; case 1: @@ -115,4 +158,86 @@ mp.events.add("showMedicTaskMenu", (type, taskList) => { case 2: break; } -}); \ No newline at end of file +}); + +mp.events.add("sortFactionTasks", () => { + newTasks = tasks; + if (sorting < 4) { + sorting++; + } else { + sorting = 0; + } + switch (sorting) { + case 0: //Standartsortierung + + reviveTaskMenu.Close(); + factionInteractionMenu.Close(); + mp.events.call("showMedicTasks", 0, JSON.stringify(initTasks)); + sortText = "Nach Uhrzeit"; + break; + + case 1: //Sortierung nach Metern (aufsteigend) + + for (d = 0; d < newTasks.length; d++) { + for (e = 0; e < newTasks.length - 1; e++) { + if (getDistance1(e) > getDistance2(e + 1)) { + var tempTask = newTasks[e]; + newTasks[e] = newTasks[e + 1]; + newTasks[e + 1] = tempTask; + mp.gui.chat.push("SWITCH"); + } + } + } + sortText = "Entfernung aufsteigend"; + reviveTaskMenu.Close(); + factionInteractionMenu.Close(); + mp.events.call("showMedicTasks", 0, JSON.stringify(newTasks)); + break; + + //case 2: //Sortierung nach Metern (absteigend) + // mp.gui.chat.push("Sorting 2"); + // sortText = "Entfernung absteigend"; + // break; + //case 3: //Sortierung nach Zeit (aufsteigend) + // mp.gui.chat.push("Sorting 3"); + // sortText = "Restzeit aufsteigend"; + // break; + //case 4: //Sortierung nach Zeit (absteigend) + // mp.gui.chat.push("Sorting 4"); + // sortText = "Restzeit absteigend"; + // break; + } +}); + +function getDistance1(index) { + return mp.game.gameplay.getDistanceBetweenCoords(player.position.x, player.position.y, player.position.z, newTasks[index].Position.x, newTasks[index].Position.y, newTasks[index].Position.z, true).toFixed(2); +} +function getDistance2(index) { + return mp.game.gameplay.getDistanceBetweenCoords(player.position.x, player.position.y, player.position.z, newTasks[index].Position.x, newTasks[index].Position.y, newTasks[index].Position.z, true).toFixed(2); +} + +mp.events.add('render', () => { + if (activeTask) { + rangeLeft = mp.game.gameplay.getDistanceBetweenCoords(player.position.x, player.position.y, player.position.z, taskFinish.x, taskFinish.y, taskFinish.z, true).toFixed(2); + if (rangeLeft > 1.9) { + ambulanceImagePos = 0.655 - (mp.game.gameplay.getDistanceBetweenCoords(player.position.x, player.position.y, player.position.z, taskFinish.x, taskFinish.y, taskFinish.z, true) / taskRange * 0.35); + mp.game.graphics.drawRect(0.5, 0.945, 0.35, 0.025, 150, 0, 0, 200); + mp.game.graphics.drawText(rangeLeft.toString() + "m", [0.5, 0.93], { + font: 0, + color: [255, 255, 255, 255], + scale: [0.35, 0.35], + outline: true, + centre: true + }); + mp.game.graphics.drawSprite("medicimages", "finish", 0.655, 0.898, 0.04, 0.07, 0, 255, 255, 255, 255); + if (player.isInAnyVehicle(false)) { + mp.game.graphics.drawSprite("medicimages", "ambulance", ambulanceImagePos + 0.01, 0.915, 0.04, 0.07, 0, 255, 255, 255, 255); + } else { + mp.game.graphics.drawSprite("medicimages", "running", ambulanceImagePos + 0.02, 0.915, 0.02, 0.035, 0, 255, 0, 0, 255); + } + } else { + activeTask = false; + activeCheckpoint.destroy(); + } + } +}); diff --git a/Client/Player/keys.js b/Client/Player/keys.js index 4ef12dc5..092764cb 100644 --- a/Client/Player/keys.js +++ b/Client/Player/keys.js @@ -64,6 +64,13 @@ mp.keys.bind(0x62, false, function () { } }); +//NUM5 //Fraktionsinteraktion (Tasks sortieren) +mp.keys.bind(0x65, false, function () { + if (!globalData.InChat) { + mp.events.call("sortFactionTasks"); + } +}); + //E mp.keys.bind(0x45, false, function () { if (!globalData.InChat) { diff --git a/Client/dlcpacks/medicimages/dlc.rpf b/Client/dlcpacks/medicimages/dlc.rpf new file mode 100644 index 00000000..dc9b6e36 --- /dev/null +++ b/Client/dlcpacks/medicimages/dlc.rpf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3f017f66bb91eed7430558929321ad5851973a2d75f886bf4b461cda349344fc +size 12288 diff --git a/Server/Commands/Admin.cs b/Server/Commands/Admin.cs index 5adc264b..b59fc64f 100644 --- a/Server/Commands/Admin.cs +++ b/Server/Commands/Admin.cs @@ -20,6 +20,7 @@ using reallife_gamemode.Server.Saves; using reallife_gamemode.Server.Business; using System.Text.RegularExpressions; using reallife_gamemode.Server.Classes; +using reallife_gamemode.Server.Factions.Medic; /** * @overview Life of German Reallife - Admin Commands (Admin.cs) @@ -1006,6 +1007,9 @@ namespace reallife_gamemode.Server.Commands target.SetData("isDead", false); NAPI.Player.SpawnPlayer(target, target.Position); target.Health = 100; + + MedicTask task = Medic.ReviveTasks.FirstOrDefault(t => t.Victim == target.Name); + Medic.RemoveTaskFromList(task); } [Command("setarmor", "~m~Benutzung: ~s~/setarmor [Spieler] (Armor)")] @@ -1268,6 +1272,9 @@ namespace reallife_gamemode.Server.Commands NAPI.Player.SpawnPlayer(managedClient, managedClient.Position); managedClient.Health = 100; + + //MedicTask task = Medic.ReviveTasks.FirstOrDefault(t => t.Victim == managedClient.Name); + //Medic.RemoveTaskFromList(task); } player.SendChatMessage("~b~Du hast " + playerRevided + " Spieler wiederbelebt."); diff --git a/Server/Commands/Faction.cs b/Server/Commands/Faction.cs index c162e78b..57781ae7 100644 --- a/Server/Commands/Faction.cs +++ b/Server/Commands/Faction.cs @@ -3,6 +3,7 @@ using Newtonsoft.Json; using reallife_gamemode.Model; using reallife_gamemode.Server.Entities; using reallife_gamemode.Server.Extensions; +using reallife_gamemode.Server.Factions.Medic; using reallife_gamemode.Server.Services; using reallife_gamemode.Server.Util; using System; @@ -236,13 +237,16 @@ namespace reallife_gamemode.Server.Commands player.SendChatMessage("~r~[FEHLER]~s~ Du kannst dich nicht selbst wiederbeleben!"); return; } - player.PlayAnimation("amb@medic@standing@kneel@enter", "enter", 0); - + player.PlayAnimation("amb@medic@standing@kneel@enter", "enter", 0); + deadPlayer.TriggerEvent("onPlayerRevived"); deadPlayer.SendNotification("Du wurdest von ~r~" + player.Name + "~s~ wiederbelebt."); deadPlayer.SetData("isDead", false); NAPI.Player.SpawnPlayer(deadPlayer, deadPlayer.Position); deadPlayer.Health = 50; + + MedicTask task = Medic.ReviveTasks.FirstOrDefault(t => t.Victim == deadPlayer.Name); + Medic.RemoveTaskFromList(task); } [Command("heal", "~m~Benutzung: ~s~/heal [Spieler]")] //TODO Eventuell noch mit Geldbetrag wie bei SA:MP diff --git a/Server/Events/Death.cs b/Server/Events/Death.cs index 5a1a3cf3..bfc94e66 100644 --- a/Server/Events/Death.cs +++ b/Server/Events/Death.cs @@ -86,7 +86,8 @@ namespace reallife_gamemode.Server.Events Caller = null, Description = "Gestorben", Time = DateTime.Now, - Type = 0 + Type = 0, + MedicName = "none" }; Medic.AddTaskToList(reviveTask); diff --git a/Server/Factions/Medic/Medic.cs b/Server/Factions/Medic/Medic.cs index 641e855d..0b8f73b0 100644 --- a/Server/Factions/Medic/Medic.cs +++ b/Server/Factions/Medic/Medic.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Text; using GTANetworkAPI; using Newtonsoft.Json; +using reallife_gamemode.Server.Services; /** * @overview Life of German Reallife - Server Factions Medic Medic.cs @@ -56,13 +57,29 @@ namespace reallife_gamemode.Server.Factions.Medic switch (type) { case 0: - player.TriggerEvent("showMedicTaskMenu", 0, JsonConvert.SerializeObject(ReviveTasks.ToArray())); + player.TriggerEvent("showMedicTasks", 0, JsonConvert.SerializeObject(ReviveTasks)); break; case 1: - player.TriggerEvent("showMedicTaskMenu", 1, JsonConvert.SerializeObject(HealTasks.ToArray())); + player.TriggerEvent("showMedicTasks", 1, JsonConvert.SerializeObject(HealTasks)); break; case 2: - player.TriggerEvent("showMedicTaskMenu", 2, JsonConvert.SerializeObject(FireTasks.ToArray())); + player.TriggerEvent("showMedicTasks", 2, JsonConvert.SerializeObject(FireTasks)); + break; + } + } + [RemoteEvent("updateMedicTask")] + public void UpdateMedicTasks(Client player, int type, int index, string medicName) + { + switch (type) + { + case 0: + ReviveTasks[index].MedicName = medicName; + break; + case 1: + HealTasks[index].MedicName = medicName; + break; + case 2: + FireTasks[index].MedicName = medicName; break; } } diff --git a/Server/Factions/Medic/MedicTask.cs b/Server/Factions/Medic/MedicTask.cs index 8494aee6..cc432e47 100644 --- a/Server/Factions/Medic/MedicTask.cs +++ b/Server/Factions/Medic/MedicTask.cs @@ -21,5 +21,6 @@ namespace reallife_gamemode.Server.Factions.Medic public string Description { get; set; } public string Caller { get; set; } public DateTime Time { get; set; } + public string MedicName { get; set; } } }