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

Nun aber

Browse Source
This commit is contained in:
VegaZ
2021-04-09 01:00:29 +02:00
parent f355ccd50d
commit 09f7072f1a
2 changed files with 12 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,8 +18,7 @@ export default function factionInteraction(globalData: IGlobalData) {
var sorting = 0; var sorting = 0;
var firstSorting = true; var firstSorting = true;
var activeTask = null; var activeTask = null;
var activeMarker: MarkerMp; var activeCheckpoint: CheckpointMp;
var activeColshape: ColshapeMp;
var taskStart; var taskStart;
var taskFinish; var taskFinish;
var taskRange; var taskRange;
@@ -235,7 +234,7 @@ export default function factionInteraction(globalData: IGlobalData) {
factionInteractionMenu.AddItem(fireTaskMenuMedic); factionInteractionMenu.AddItem(fireTaskMenuMedic);
*/ */
if (activeTask != null) { if (activeTask != null) {
if (activeTask.Type == 1 && activeColshape && mp.colshapes.exists(activeColshape)) { if (activeTask.Type == 1 && activeCheckpoint && mp.checkpoints.exists(activeCheckpoint)) {
deleteCheckpointItem = new UIMenuItem("~r~Checkpoint löschen"); deleteCheckpointItem = new UIMenuItem("~r~Checkpoint löschen");
factionInteractionMenu.AddItem(deleteCheckpointItem); factionInteractionMenu.AddItem(deleteCheckpointItem);
} }
@@ -321,13 +320,12 @@ export default function factionInteraction(globalData: IGlobalData) {
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);
mp.game.ui.setNewWaypoint(tasks[index].Position.x, tasks[index].Position.y); mp.game.ui.setNewWaypoint(tasks[index].Position.x, tasks[index].Position.y);
activeMarker = mp.markers.new(1, new mp.Vector3(tasks[index].Position.x, tasks[index].Position.y, tasks[index].Position.z - 1), 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,
{ {
color: [255, 0, 0, 150], color: [255, 0, 0, 150],
visible: true, visible: true,
dimension: 0 dimension: 0
}); });
activeColshape = mp.colshapes.newTube(tasks[index].Position.x, tasks[index].Position.y, tasks[index].Position.z - 1, 2, 3, 0);
reviveTaskMenuMedic.Close(); reviveTaskMenuMedic.Close();
mp.gui.chat.activate(true); mp.gui.chat.activate(true);
globalData.InMenu = false; globalData.InMenu = false;
@@ -375,13 +373,12 @@ export default function factionInteraction(globalData: IGlobalData) {
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);
mp.game.ui.setNewWaypoint(tasks[index].Position.x, tasks[index].Position.y); mp.game.ui.setNewWaypoint(tasks[index].Position.x, tasks[index].Position.y);
activeMarker = mp.markers.new(1, new mp.Vector3(tasks[index].Position.x, tasks[index].Position.y, tasks[index].Position.z - 1), 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,
{ {
color: [255, 0, 0, 150], color: [255, 0, 0, 150],
visible: true, visible: true,
dimension: 0 dimension: 0
}); });
activeColshape = mp.colshapes.newTube(tasks[index].Position.x, tasks[index].Position.y, tasks[index].Position.z - 1, 2, 3, 0);
healTaskMenuMedic.Close(); healTaskMenuMedic.Close();
mp.gui.chat.activate(true); mp.gui.chat.activate(true);
globalData.InMenu = false; globalData.InMenu = false;
@@ -405,27 +402,19 @@ export default function factionInteraction(globalData: IGlobalData) {
} }
}); });
mp.events.add('playerEnterColshape', (activeColshape) => { mp.events.add('playerEnterCheckpoint', (activeCheckpoint) => {
if (activeTask.Type == 1) { if (activeTask.Type == 1) {
activeColshape.destroy(); activeCheckpoint.destroy();
activeColshape = null; activeCheckpoint = null;
if (mp.markers.exists(activeMarker)) {
activeMarker.destroy();
activeMarker = null;
}
activeTask = null; activeTask = null;
timeLeft = null; timeLeft = null;
} }
}); });
mp.events.add("destroyMedicTaskCheckpoint", () => { mp.events.add("destroyMedicTaskCheckpoint", () => {
if (activeColshape && mp.colshapes.exists(activeColshape)) { if (activeCheckpoint && mp.checkpoints.exists(activeCheckpoint)) {
activeColshape.destroy(); activeCheckpoint.destroy();
activeColshape = null; activeCheckpoint = null;
if (mp.markers.exists(activeMarker)) {
activeMarker.destroy();
activeMarker = null;
}
activeTask = null; activeTask = null;
timeLeft = null; timeLeft = null;
} }
@@ -438,15 +427,8 @@ export default function factionInteraction(globalData: IGlobalData) {
}); });
mp.events.add('updateHealCheckpoint', (xPos, yPos, zPos) => { mp.events.add('updateHealCheckpoint', (xPos, yPos, zPos) => {
mp.gui.chat.push("DEBUG: JO LÜPPT");
if (activeTask && activeTask.Type == 1) { if (activeTask && activeTask.Type == 1) {
if (mp.colshapes.exists(activeColshape) && mp.markers.exists(activeMarker)) { activeCheckpoint.setCoords2(xPos, yPos, zPos, 0, 0, 0, false);
activeMarker.setCoords2(xPos, yPos, zPos, 0, 0, 0, false);
activeColshape.setCoords2(xPos, yPos, zPos, 0, 0, 0, false);
}
taskFinish.x = xPos;
taskFinish.y = yPos;
taskFinish.z = zPos;
mp.game.ui.setNewWaypoint(xPos, yPos); mp.game.ui.setNewWaypoint(xPos, yPos);
} }
}); });

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

@@ -222,7 +222,7 @@ namespace ReallifeGamemode.Server.Factions.Medic
break; break;
case 1: case 1:
var healTask = ReviveTasks.FirstOrDefault(t => t.Victim == victim); var healTask = HealTasks.FirstOrDefault(t => t.Victim == victim);
healTask.MedicName = player.Name; healTask.MedicName = player.Name;
ChatService.BroadcastFaction("~y~[MEDIC] ~w~" + player.Name + " hat den Healauftrag von " + victim + " angenommen.", new List<int>() { 2 }); 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.");