Move Job Infos Interaktionsmenü in eigenes Menü
This commit is contained in:
@@ -27,6 +27,8 @@ export default function (globalData: IGlobalData) {
|
||||
|
||||
var groupItem = new UIMenuItem("Gruppe", "Verwalte deine Gruppe");
|
||||
|
||||
var jobItem = new UIMenuItem("Job", "Infos zu deinem Job");
|
||||
|
||||
var paycheckItem = new UIMenuItem("Gehaltsscheck", "Schaue dir deinen Verdienst der letzten Stunde an");
|
||||
|
||||
var licenseItem = new UIMenuItem("Lizenzen", "Lizenzen Informationen");
|
||||
@@ -41,10 +43,11 @@ export default function (globalData: IGlobalData) {
|
||||
|
||||
var groupRank = null;
|
||||
|
||||
mp.events.add("SERVER:InteractionMenu_OpenMenu", (accountDataJson: string, factionleader: string, faction: string, group: string, factionInvite: boolean, groupInvite: boolean, ticket_boolean: boolean, ticket_amount, house: boolean) => {
|
||||
mp.events.add("SERVER:InteractionMenu_OpenMenu", (accountDataJson: string, factionleader: string, jobDataJson: string, faction: string, group: string, factionInvite: boolean, groupInvite: boolean, ticket_boolean: boolean, ticket_amount, house: boolean) => {
|
||||
|
||||
|
||||
var accountData: AccountData = JSON.parse(accountDataJson);
|
||||
var jobData: JobData = JSON.parse(jobDataJson);
|
||||
//var ticket_amount = JSON.parse(ticket_amountJson);
|
||||
|
||||
var menu = getInteractionMenu();
|
||||
@@ -77,6 +80,8 @@ export default function (globalData: IGlobalData) {
|
||||
menu.AddItem(factionleaderItem);
|
||||
menu.BindMenuToItem(getFactionLeaderMenu(faction, accountData.factionVehicles, accountData.stateFaction, menu), factionleaderItem);
|
||||
}
|
||||
menu.AddItem(jobItem);
|
||||
menu.BindMenuToItem(getJobMenu(jobData, menu), jobItem);
|
||||
|
||||
if (group) {
|
||||
groupItem.SetRightLabel(group);
|
||||
@@ -206,11 +211,7 @@ export default function (globalData: IGlobalData) {
|
||||
menuItem = new UIMenuItem("Fraktionsrang");
|
||||
menuItem.SetRightLabel(data.factionRank);
|
||||
accountMenu.AddItem(menuItem);
|
||||
}
|
||||
|
||||
menuItem = new UIMenuItem("Job");
|
||||
menuItem.SetRightLabel(data.job);
|
||||
accountMenu.AddItem(menuItem);
|
||||
}
|
||||
|
||||
if (data.group != null) {
|
||||
menuItem = new UIMenuItem("Gruppe");
|
||||
@@ -365,6 +366,67 @@ export default function (globalData: IGlobalData) {
|
||||
return factionMenu;
|
||||
}
|
||||
|
||||
function getJobMenu(jobdata: JobData, parentMenu: NativeUI.Menu): NativeUI.Menu {
|
||||
var jobMenu = new NativeUI.Menu("Job", "Job Infos / Skillpunkte", new Point(0, screenRes.y / 3), null, null);
|
||||
|
||||
var pilotLevel;
|
||||
var busLevel;
|
||||
|
||||
if (jobdata.pilotskill >= 300) {
|
||||
pilotLevel = 2;
|
||||
} else {
|
||||
pilotLevel = 1;
|
||||
}
|
||||
|
||||
if (jobdata.busskill >= 800) {
|
||||
busLevel = 3;
|
||||
} else if (jobdata.busskill >= 300) {
|
||||
busLevel = 2;
|
||||
} else {
|
||||
busLevel = 1;
|
||||
}
|
||||
|
||||
var actJobItem = new UIMenuItem("Aktueller Job:");
|
||||
actJobItem.SetRightLabel(jobdata.job)
|
||||
jobMenu.AddItem(actJobItem);
|
||||
|
||||
var pilotSkillItem = new UIMenuItem("Pilot Skill (LVL " + pilotLevel + ")");
|
||||
switch (pilotLevel) {
|
||||
case 1:
|
||||
pilotSkillItem.SetRightLabel(jobdata.pilotskill + "/300")
|
||||
break;
|
||||
case 2:
|
||||
pilotSkillItem.SetRightLabel(jobdata.pilotskill + "/MAX")
|
||||
break;
|
||||
}
|
||||
jobMenu.AddItem(pilotSkillItem);
|
||||
|
||||
var busSkillItem = new UIMenuItem("Bus Skill (LVL " + busLevel + ")");
|
||||
switch (busLevel) {
|
||||
case 1:
|
||||
busSkillItem.SetRightLabel(jobdata.busskill + "/300")
|
||||
break;
|
||||
case 2:
|
||||
busSkillItem.SetRightLabel(jobdata.busskill + "/800")
|
||||
break;
|
||||
case 3:
|
||||
busSkillItem.SetRightLabel(jobdata.busskill + "/MAX")
|
||||
break;
|
||||
}
|
||||
jobMenu.AddItem(busSkillItem);
|
||||
|
||||
var wageItem = new UIMenuItem("Verdienst");
|
||||
if (jobdata.wage > 0) {
|
||||
wageItem.SetRightLabel("~g~$" + jobdata.wage.toString())
|
||||
} else {
|
||||
wageItem.SetRightLabel("$" + jobdata.wage.toString())
|
||||
}
|
||||
jobMenu.AddItem(wageItem);
|
||||
jobMenu.Visible = false;
|
||||
mp.gui.chat.show(false);
|
||||
return jobMenu;
|
||||
}
|
||||
|
||||
function getGroupMenu(group: string, parentMenu: NativeUI.Menu): NativeUI.Menu {
|
||||
var groupMenu = new NativeUI.Menu("Gruppe", group, new Point(0, screenRes.y / 3), null, null);
|
||||
if (groupRank == "Manager" || groupRank == "Besitzer") groupMenu.AddItem(new UIMenuItem("Spieler einladen"));
|
||||
|
||||
Reference in New Issue
Block a user