[Hotfix] Change Skill maximal to MAX instead of n/MAX

This commit is contained in:
2021-04-08 02:00:43 +02:00
parent f4e7aa619c
commit a016a5e065
2 changed files with 13 additions and 36 deletions

View File

@@ -14,7 +14,6 @@ let screenRes = mp.game.graphics.getScreenResolution(0, 0);
import { getStreetName, getZoneName } from '../streetnames'; import { getStreetName, getZoneName } from '../streetnames';
export default function (globalData: IGlobalData) { export default function (globalData: IGlobalData) {
var menuClose = false; var menuClose = false;
var accountItem = new UIMenuItem("Account", "Account Informationen"); var accountItem = new UIMenuItem("Account", "Account Informationen");
@@ -44,8 +43,6 @@ export default function (globalData: IGlobalData) {
var groupRank = null; var groupRank = null;
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) => { 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 accountData: AccountData = JSON.parse(accountDataJson);
var jobData: JobData = JSON.parse(jobDataJson); var jobData: JobData = JSON.parse(jobDataJson);
//var ticket_amount = JSON.parse(ticket_amountJson); //var ticket_amount = JSON.parse(ticket_amountJson);
@@ -90,9 +87,6 @@ export default function (globalData: IGlobalData) {
} }
menu.AddItem(HouseItem); menu.AddItem(HouseItem);
if (accountData.paycheck) { if (accountData.paycheck) {
var p = accountData.paycheck; var p = accountData.paycheck;
var paycheckMenu = new Menu("Gehaltsscheck", "Dein Verdienst der letzten Stunde", new Point(0, screenRes.y / 3), null, null); var paycheckMenu = new Menu("Gehaltsscheck", "Dein Verdienst der letzten Stunde", new Point(0, screenRes.y / 3), null, null);
@@ -305,17 +299,14 @@ export default function (globalData: IGlobalData) {
globalData.InMenu = false; globalData.InMenu = false;
}); });
} }
}); });
return licenseMenu; return licenseMenu;
} }
function getFactionMenu(faction: string, vehData: VehicleData[], stateFaction: boolean, parentMenu: NativeUI.Menu): NativeUI.Menu { function getFactionMenu(faction: string, vehData: VehicleData[], stateFaction: boolean, parentMenu: NativeUI.Menu): NativeUI.Menu {
var factionMenu = new NativeUI.Menu("Fraktion", faction, new Point(0, screenRes.y / 3), null, null); var factionMenu = new NativeUI.Menu("Fraktion", faction, new Point(0, screenRes.y / 3), null, null);
factionMenu.Visible = false; factionMenu.Visible = false;
if (vehData.length > 0) { if (vehData.length > 0) {
@@ -327,7 +318,6 @@ export default function (globalData: IGlobalData) {
return factionMenu; return factionMenu;
} }
function getFactionLeaderMenu(faction: string, vehData: VehicleData[], stateFaction: boolean, parentMenu: NativeUI.Menu): NativeUI.Menu { function getFactionLeaderMenu(faction: string, vehData: VehicleData[], stateFaction: boolean, parentMenu: NativeUI.Menu): NativeUI.Menu {
var factionMenu = new NativeUI.Menu("Fraktion", faction, new Point(0, screenRes.y / 3), null, null); var factionMenu = new NativeUI.Menu("Fraktion", faction, new Point(0, screenRes.y / 3), null, null);
factionMenu.AddItem(new UIMenuItem("Spieler einladen")); factionMenu.AddItem(new UIMenuItem("Spieler einladen"));
@@ -340,7 +330,6 @@ export default function (globalData: IGlobalData) {
factionMenu.BindMenuToItem(getVehiclesMenu(vehData, "CLIENT:InteractionMenu_FactionVehicleInteraction", !stateFaction, parentMenu), factionVehicleItem); factionMenu.BindMenuToItem(getVehiclesMenu(vehData, "CLIENT:InteractionMenu_FactionVehicleInteraction", !stateFaction, parentMenu), factionVehicleItem);
} }
factionMenu.ItemSelect.on((item, index) => { factionMenu.ItemSelect.on((item, index) => {
if (index === 0) { // Inviten if (index === 0) { // Inviten
globalData.InMenu = true; globalData.InMenu = true;
@@ -396,7 +385,7 @@ export default function (globalData: IGlobalData) {
pilotSkillItem.SetRightLabel(jobdata.pilotskill + "/300") pilotSkillItem.SetRightLabel(jobdata.pilotskill + "/300")
break; break;
case 2: case 2:
pilotSkillItem.SetRightLabel(jobdata.pilotskill + "/MAX") pilotSkillItem.SetRightLabel("MAX")
break; break;
} }
jobMenu.AddItem(pilotSkillItem); jobMenu.AddItem(pilotSkillItem);
@@ -410,7 +399,7 @@ export default function (globalData: IGlobalData) {
busSkillItem.SetRightLabel(jobdata.busskill + "/800") busSkillItem.SetRightLabel(jobdata.busskill + "/800")
break; break;
case 3: case 3:
busSkillItem.SetRightLabel(jobdata.busskill + "/MAX") busSkillItem.SetRightLabel("MAX")
break; break;
} }
jobMenu.AddItem(busSkillItem); jobMenu.AddItem(busSkillItem);
@@ -490,7 +479,6 @@ export default function (globalData: IGlobalData) {
mp.events.callRemote("CLIENT:InteractionMenu_DeleteGroup", "Gruppe"); mp.events.callRemote("CLIENT:InteractionMenu_DeleteGroup", "Gruppe");
break; break;
} }
}); });
return groupMenu; return groupMenu;
} }
@@ -505,11 +493,9 @@ export default function (globalData: IGlobalData) {
servicesMenu.ItemSelect.on((item, index) => { servicesMenu.ItemSelect.on((item, index) => {
if (index === 0) { // Taxi if (index === 0) { // Taxi
mp.events.callRemote("CLIENT:InteractionMenu_CallService_Taxi", getStreetName(), getZoneName()); mp.events.callRemote("CLIENT:InteractionMenu_CallService_Taxi", getStreetName(), getZoneName());
} }
else if (index === 1) { // Sanitäter else if (index === 1) { // Sanitäter
mp.events.callRemote("CLIENT:InteractionMenu_CallService_Sani"); mp.events.callRemote("CLIENT:InteractionMenu_CallService_Sani");
} }
parentMenu.Close(true); parentMenu.Close(true);
}); });
@@ -551,7 +537,6 @@ export default function (globalData: IGlobalData) {
function getVehiclesMenuFaction(vehicles: VehicleData[], eventName: string, allowSell: boolean, parentMenu: NativeUI.Menu): NativeUI.Menu { function getVehiclesMenuFaction(vehicles: VehicleData[], eventName: string, allowSell: boolean, parentMenu: NativeUI.Menu): NativeUI.Menu {
var desc = "Finden"; var desc = "Finden";
var menu = new Menu("Fahrzeuge", desc, new Point(0, screenRes.y / 3), null, null); var menu = new Menu("Fahrzeuge", desc, new Point(0, screenRes.y / 3), null, null);
var items: string[] = ["Finden"]; var items: string[] = ["Finden"];

View File

@@ -16,14 +16,6 @@ namespace ReallifeGamemode.Server.Commands
{ {
internal class UserCommands : Script internal class UserCommands : Script
{ {
[Command("skill")]
public void CmdUserSkill(Player player)
{
User user = player.GetUser(new DatabaseContext());
player.SendChatMessage($"~c~BusSkill = {user.BusSkill}/800, PilotSkill = {user.PilotSkill}/300.");
}
[Command("id", "~m~Benutzung: ~s~/id [Name]")] [Command("id", "~m~Benutzung: ~s~/id [Name]")]
public void CmdUserId(Player player, String targetname) public void CmdUserId(Player player, String targetname)
{ {