Added Job Quit to Interaction -> JOB

This commit is contained in:
VegaZ
2021-04-18 00:54:55 +02:00
parent 6a28cbe60d
commit 0b8be38254
4 changed files with 20 additions and 1 deletions

View File

@@ -464,6 +464,23 @@ export default function (globalData: IGlobalData) {
wageItem.SetRightLabel("$" + jobdata.wage.toString())
}
jobMenu.AddItem(wageItem);
if (jobdata.isActive) {
var quitJobItem = new UIMenuItem("Job Beenden", "Beendet den Job und bringt dich zurück zur Base")
jobMenu.AddItem(quitJobItem);
quitJobItem.HighlightedBackColor = new Color(213, 0, 0);
quitJobItem.BackColor = new Color(229, 57, 53);
jobMenu.ItemSelect.on((item, index) => {
if (item == quitJobItem) {
mp.events.callRemote("CLIENT:Job_StopJob");
jobMenu.Close(true);
mp.gui.chat.activate(true);
globalData.InMenu = false;
}
});
}
jobMenu.Visible = false;
mp.gui.chat.show(false);
return jobMenu;

View File

@@ -30,6 +30,7 @@ declare type JobData = {
busskill: number;
pilotskill: number;
wage: number;
isActive: boolean;
}
declare type VehicleData = {

View File

@@ -168,6 +168,7 @@ namespace ReallifeGamemode.Server.Events
busskill = u.BusSkill,
pilotskill = u.PilotSkill,
wage = u.Wage,
isActive = JobBase.GetPlayerInJob().Contains(player),
};
var memberList = dbContext.Users.Where(f => f.FactionId == u.FactionId && u.FactionId != 0).OrderByDescending(f => f.FactionRank.Order).ThenBy(f => f.Name).Select(m => new

View File

@@ -186,7 +186,7 @@ namespace ReallifeGamemode.Server.Managers
{
VehicleStreaming.SetEngineState(player.Vehicle, false);
}
player.Position = playerJobStartPosition[player];
job.StopJob(player);
if (playerTimersJobVehicleRespawn.ContainsKey(player))