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; } } }