Added Job Quit to Interaction -> JOB
This commit is contained in:
@@ -464,6 +464,23 @@ export default function (globalData: IGlobalData) {
|
|||||||
wageItem.SetRightLabel("$" + jobdata.wage.toString())
|
wageItem.SetRightLabel("$" + jobdata.wage.toString())
|
||||||
}
|
}
|
||||||
jobMenu.AddItem(wageItem);
|
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;
|
jobMenu.Visible = false;
|
||||||
mp.gui.chat.show(false);
|
mp.gui.chat.show(false);
|
||||||
return jobMenu;
|
return jobMenu;
|
||||||
|
|||||||
1
ReallifeGamemode.Client/global.d.ts
vendored
1
ReallifeGamemode.Client/global.d.ts
vendored
@@ -30,6 +30,7 @@ declare type JobData = {
|
|||||||
busskill: number;
|
busskill: number;
|
||||||
pilotskill: number;
|
pilotskill: number;
|
||||||
wage: number;
|
wage: number;
|
||||||
|
isActive: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
declare type VehicleData = {
|
declare type VehicleData = {
|
||||||
|
|||||||
@@ -168,6 +168,7 @@ namespace ReallifeGamemode.Server.Events
|
|||||||
busskill = u.BusSkill,
|
busskill = u.BusSkill,
|
||||||
pilotskill = u.PilotSkill,
|
pilotskill = u.PilotSkill,
|
||||||
wage = u.Wage,
|
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
|
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
|
||||||
|
|||||||
@@ -186,7 +186,7 @@ namespace ReallifeGamemode.Server.Managers
|
|||||||
{
|
{
|
||||||
VehicleStreaming.SetEngineState(player.Vehicle, false);
|
VehicleStreaming.SetEngineState(player.Vehicle, false);
|
||||||
}
|
}
|
||||||
|
player.Position = playerJobStartPosition[player];
|
||||||
job.StopJob(player);
|
job.StopJob(player);
|
||||||
|
|
||||||
if (playerTimersJobVehicleRespawn.ContainsKey(player))
|
if (playerTimersJobVehicleRespawn.ContainsKey(player))
|
||||||
|
|||||||
Reference in New Issue
Block a user