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

Feierabend

Browse Source
This commit is contained in:
VegaZ
2021-04-09 01:32:08 +02:00
parent 8476b112ed
commit 7a444a1671
3 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ReallifeGamemode.Client/Interaction/factioninteraction.ts
View File

@@ -273,6 +273,7 @@ export default function factionInteraction(globalData: IGlobalData) {
mp.gui.chat.activate(true); mp.gui.chat.activate(true);
globalData.InMenu = false; globalData.InMenu = false;
mp.events.call("destroyMedicTaskCheckpoint"); mp.events.call("destroyMedicTaskCheckpoint");
mp.events.callRemote("updateMedicTask", 1, activeTask.Victim, true);
break; break;
} }
@@ -318,7 +319,7 @@ export default function factionInteraction(globalData: IGlobalData) {
} else { } else {
if (tasks[index].MedicName === "none") { if (tasks[index].MedicName === "none") {
mp.game.graphics.requestStreamedTextureDict("medicimages", true); mp.game.graphics.requestStreamedTextureDict("medicimages", true);
mp.events.callRemote("updateMedicTask", 0, tasks[index].Victim); mp.events.callRemote("updateMedicTask", 0, tasks[index].Victim, false);
mp.game.ui.setNewWaypoint(tasks[index].Position.x, tasks[index].Position.y); mp.game.ui.setNewWaypoint(tasks[index].Position.x, tasks[index].Position.y);
activeCheckpoint = mp.checkpoints.new(4, new mp.Vector3(tasks[index].Position.x, tasks[index].Position.y, tasks[index].Position.z - 2), 3.0, activeCheckpoint = mp.checkpoints.new(4, new mp.Vector3(tasks[index].Position.x, tasks[index].Position.y, tasks[index].Position.z - 2), 3.0,
{ {
@@ -371,7 +372,7 @@ export default function factionInteraction(globalData: IGlobalData) {
} else { } else {
if (tasks[index].MedicName === "none") { if (tasks[index].MedicName === "none") {
mp.game.graphics.requestStreamedTextureDict("medicimages", true); mp.game.graphics.requestStreamedTextureDict("medicimages", true);
mp.events.callRemote("updateMedicTask", 1, tasks[index].Victim); mp.events.callRemote("updateMedicTask", 1, tasks[index].Victim, false);
mp.game.ui.setNewWaypoint(tasks[index].Position.x, tasks[index].Position.y); mp.game.ui.setNewWaypoint(tasks[index].Position.x, tasks[index].Position.y);
activeCheckpoint = mp.checkpoints.new(4, new mp.Vector3(tasks[index].Position.x, tasks[index].Position.y, tasks[index].Position.z - 2), 3.0, activeCheckpoint = mp.checkpoints.new(4, new mp.Vector3(tasks[index].Position.x, tasks[index].Position.y, tasks[index].Position.z - 2), 3.0,
{ {

25
ReallifeGamemode.Server/Factions/Medic/Medic.cs
View File

@@ -209,23 +209,38 @@ namespace ReallifeGamemode.Server.Factions.Medic
} }
[RemoteEvent("updateMedicTask")] [RemoteEvent("updateMedicTask")]
public void UpdateMedicTasks(Player player, int type, string victim) public void UpdateMedicTasks(Player player, int type, string victim, bool isRemoved)
{ {
Player target = PlayerService.GetPlayerByNameOrId(victim); Player target = PlayerService.GetPlayerByNameOrId(victim);
switch (type) switch (type)
{ {
case 0: case 0:
var reviveTask = ReviveTasks.FirstOrDefault(t => t.Victim == victim); var reviveTask = ReviveTasks.FirstOrDefault(t => t.Victim == victim);
reviveTask.MedicName = player.Name; if (isRemoved)
{
reviveTask.MedicName = "none";
}
else
{
reviveTask.MedicName = player.Name;
}
ChatService.BroadcastFaction("~y~[MEDIC] ~w~" + player.Name + " hat den Reviveauftrag von " + victim + " angenommen.", new List<int>() { 2 }); ChatService.BroadcastFaction("~y~[MEDIC] ~w~" + player.Name + " hat den Reviveauftrag von " + victim + " angenommen.", new List<int>() { 2 });
target.SendNotification("~w~Sanitäter~g~ " + player.Name + "~w~ eilt zur Rettung."); target.SendNotification("~w~Sanitäter~g~ " + player.Name + "~w~ eilt zur Rettung.");
break; break;
case 1: case 1:
var healTask = HealTasks.FirstOrDefault(t => t.Victim == victim); var healTask = HealTasks.FirstOrDefault(t => t.Victim == victim);
healTask.MedicName = player.Name; if (isRemoved)
ChatService.BroadcastFaction("~y~[MEDIC] ~w~" + player.Name + " hat den Healauftrag von " + victim + " angenommen.", new List<int>() { 2 }); {
target.SendNotification("~w~Sanitäter~g~ " + player.Name + "~w~ hat deinen Auftrag angenommen."); healTask.MedicName = "none";
}
else
{
healTask.MedicName = player.Name;
ChatService.BroadcastFaction("~y~[MEDIC] ~w~" + player.Name + " hat den Healauftrag von " + victim + " angenommen.", new List<int>() { 2 });
target.SendNotification("~w~Sanitäter~g~ " + player.Name + "~w~ hat deinen Auftrag angenommen.");
}
break; break;
case 2: case 2:

1
ReallifeGamemode.Server/Managers/InteractionManager.cs
View File

@@ -834,6 +834,7 @@ namespace ReallifeGamemode.Server.Managers
{ {
Medic.AddTaskToList(healTask); Medic.AddTaskToList(healTask);
player.SetData("healauftrag", true); player.SetData("healauftrag", true);
player.SendNotification("~w~Du hast einen Sanitäter um Hilfe gerufen");
ChatService.BroadcastFaction("~y~[MEDIC] ~w~" + player.Name + " hat soeben einen Serviceauftrag beantragt.", new List<int>() { 2 }); ChatService.BroadcastFaction("~y~[MEDIC] ~w~" + player.Name + " hat soeben einen Serviceauftrag beantragt.", new List<int>() { 2 });
} }
} }