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

Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop

Browse Source
This commit is contained in:
Lukas Moungos
2021-04-05 23:40:25 +02:00
parent 8f225699c6 1009cca6ef
commit 08e3c19d7d
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -313,7 +313,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, index); mp.events.callRemote("updateMedicTask", 0, tasks[index].Victim);
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(1, new mp.Vector3(tasks[index].Position.x, tasks[index].Position.y, tasks[index].Position.z - 2), 3.0, activeCheckpoint = mp.checkpoints.new(1, new mp.Vector3(tasks[index].Position.x, tasks[index].Position.y, tasks[index].Position.z - 2), 3.0,
{ {
@@ -367,7 +367,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, index); mp.events.callRemote("updateMedicTask", 1, tasks[index].Victim);
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(1, new mp.Vector3(tasks[index].Position.x, tasks[index].Position.y, tasks[index].Position.z - 2), 3.0, activeCheckpoint = mp.checkpoints.new(1, new mp.Vector3(tasks[index].Position.x, tasks[index].Position.y, tasks[index].Position.z - 2), 3.0,
{ {

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

@@ -192,27 +192,27 @@ namespace ReallifeGamemode.Server.Factions.Medic
} }
[RemoteEvent("updateMedicTask")] [RemoteEvent("updateMedicTask")]
public void UpdateMedicTasks(Player player, int type, int index) public void UpdateMedicTasks(Player player, int type, string victim)
{ {
Player target = PlayerService.GetPlayerByNameOrId(ReviveTasks[index].Victim); Player target = PlayerService.GetPlayerByNameOrId(victim);
switch (type) switch (type)
{ {
case 0: case 0:
var reviveTask = ReviveTasks.FirstOrDefault(t => t.Victim == victim);
ReviveTasks[index].MedicName = player.Name; reviveTask.MedicName = player.Name;
ChatService.BroadcastFaction("~y~[MEDIC] ~w~" + player.Name + " hat den Reviveauftrag von " + ReviveTasks[index].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:
HealTasks[index].MedicName = player.Name; var healTask = ReviveTasks.FirstOrDefault(t => t.Victim == victim);
ChatService.BroadcastFaction("~y~[MEDIC] ~w~" + player.Name + " hat den Healauftrag von " + ReviveTasks[index].Victim + " angenommen.", new List<int>() { 2 }); 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."); target.SendNotification("~w~Sanitäter~g~ " + player.Name + "~w~ hat deinen Auftrag angenommen.");
break; break;
case 2: case 2:
FireTasks[index].MedicName = player.Name; //FireTasks[index].MedicName = player.Name;
break; break;
} }
} }

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

@@ -772,13 +772,13 @@ namespace ReallifeGamemode.Server.Managers
if (!player.IsLoggedIn()) return; if (!player.IsLoggedIn()) return;
List<Player> players = NAPI.Pools.GetAllPlayers(); List<Player> players = NAPI.Pools.GetAllPlayers();
var listPlayers = players.Where(p => p.GetUser().Wanteds > 0) var listPlayers = players
.Select(p => new .Select(p => new
{ {
Id = p.Handle.Value, Id = p.Handle.Value,
p.Name, p.Name,
wanted = p.GetUser().Wanteds, wanted = p.GetUser()?.Wanteds,
}); }).Where(u => u.wanted > 0).ToList();
if (listPlayers.Count() > 0) if (listPlayers.Count() > 0)
player.TriggerEvent("showWantedlist", JsonConvert.SerializeObject(listPlayers)); player.TriggerEvent("showWantedlist", JsonConvert.SerializeObject(listPlayers));