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

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

Browse Source
This commit is contained in:
Lukas Moungos
2021-04-08 02:00:43 +02:00
parent f4e7aa619c
commit a016a5e065
2 changed files with 13 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
ReallifeGamemode.Client/Interaction/interactionmenu.ts
View File

@@ -14,7 +14,6 @@ let screenRes = mp.game.graphics.getScreenResolution(0, 0);
import { getStreetName, getZoneName } from '../streetnames';
export default function (globalData: IGlobalData) {
var menuClose = false;
var accountItem = new UIMenuItem("Account", "Account Informationen");
@@ -44,8 +43,6 @@ export default function (globalData: IGlobalData) {
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) => {
var accountData: AccountData = JSON.parse(accountDataJson);
var jobData: JobData = JSON.parse(jobDataJson);
//var ticket_amount = JSON.parse(ticket_amountJson);
@@ -80,7 +77,7 @@ export default function (globalData: IGlobalData) {
menu.AddItem(factionleaderItem);
menu.BindMenuToItem(getFactionLeaderMenu(faction, accountData.factionVehicles, accountData.stateFaction, menu), factionleaderItem);
}
menu.AddItem(jobItem);
menu.AddItem(jobItem);
menu.BindMenuToItem(getJobMenu(jobData, menu), jobItem);
if (group) {
@@ -88,10 +85,7 @@ export default function (globalData: IGlobalData) {
menu.AddItem(groupItem);
menu.BindMenuToItem(getGroupMenu(group, menu), groupItem);
}
menu.AddItem(HouseItem);
menu.AddItem(HouseItem);
if (accountData.paycheck) {
var p = accountData.paycheck;
@@ -211,12 +205,12 @@ export default function (globalData: IGlobalData) {
menuItem = new UIMenuItem("Fraktionsrang");
menuItem.SetRightLabel(data.factionRank);
accountMenu.AddItem(menuItem);
}
}
if (data.group != null) {
menuItem = new UIMenuItem("Gruppe");
menuItem.SetRightLabel(data.group);
accountMenu.AddItem(menuItem);
accountMenu.AddItem(menuItem);
menuItem = new UIMenuItem("Gruppenrang");
menuItem.SetRightLabel(data.groupRank);
accountMenu.AddItem(menuItem);
@@ -242,7 +236,7 @@ export default function (globalData: IGlobalData) {
return accountMenu;
}
function getLicenseMenu(accdata: AccountData, data: Licenses, parentMenu: NativeUI.Menu, ): NativeUI.Menu {
function getLicenseMenu(accdata: AccountData, data: Licenses, parentMenu: NativeUI.Menu,): NativeUI.Menu {
var licenseMenu = new NativeUI.Menu("Lizenzen", mp.players.local.name, new Point(0, screenRes.y / 3), null, null);
var menuItem = new UIMenuItem("Auto Führerschein");
@@ -305,17 +299,14 @@ export default function (globalData: IGlobalData) {
globalData.InMenu = false;
});
}
});
return licenseMenu;
}
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);
factionMenu.Visible = false;
if (vehData.length > 0) {
@@ -327,7 +318,6 @@ export default function (globalData: IGlobalData) {
return factionMenu;
}
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);
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.ItemSelect.on((item, index) => {
if (index === 0) { // Inviten
globalData.InMenu = true;
@@ -396,7 +385,7 @@ export default function (globalData: IGlobalData) {
pilotSkillItem.SetRightLabel(jobdata.pilotskill + "/300")
break;
case 2:
pilotSkillItem.SetRightLabel(jobdata.pilotskill + "/MAX")
pilotSkillItem.SetRightLabel("MAX")
break;
}
jobMenu.AddItem(pilotSkillItem);
@@ -410,7 +399,7 @@ export default function (globalData: IGlobalData) {
busSkillItem.SetRightLabel(jobdata.busskill + "/800")
break;
case 3:
busSkillItem.SetRightLabel(jobdata.busskill + "/MAX")
busSkillItem.SetRightLabel("MAX")
break;
}
jobMenu.AddItem(busSkillItem);
@@ -420,7 +409,7 @@ export default function (globalData: IGlobalData) {
wageItem.SetRightLabel("~g~$" + jobdata.wage.toString())
} else {
wageItem.SetRightLabel("$" + jobdata.wage.toString())
}
}
jobMenu.AddItem(wageItem);
jobMenu.Visible = false;
mp.gui.chat.show(false);
@@ -480,7 +469,7 @@ export default function (globalData: IGlobalData) {
groupMenu.Close();
mp.gui.chat.show(true);
globalData.InMenu = false;
mp.events.callRemote("CLIENT:InteractionMenu_LeaveGroup", "Gruppe");
mp.events.callRemote("CLIENT:InteractionMenu_LeaveGroup", "Gruppe");
break;
case 5: //Gruppe löschen (als Leiter)
@@ -490,7 +479,6 @@ export default function (globalData: IGlobalData) {
mp.events.callRemote("CLIENT:InteractionMenu_DeleteGroup", "Gruppe");
break;
}
});
return groupMenu;
}
@@ -505,11 +493,9 @@ export default function (globalData: IGlobalData) {
servicesMenu.ItemSelect.on((item, index) => {
if (index === 0) { // Taxi
mp.events.callRemote("CLIENT:InteractionMenu_CallService_Taxi", getStreetName(), getZoneName());
}
else if (index === 1) { // Sanitäter
mp.events.callRemote("CLIENT:InteractionMenu_CallService_Sani");
}
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 {
var desc = "Finden";
var menu = new Menu("Fahrzeuge", desc, new Point(0, screenRes.y / 3), null, null);
var items: string[] = ["Finden"];
@@ -577,7 +562,7 @@ export default function (globalData: IGlobalData) {
return menu;
}
function getTicketMenu(ticket_amount: number, parentMenu: NativeUI.Menu): NativeUI.Menu {
var ticketMenu = new NativeUI.Menu("Ticket", `Ticket in Höhe von ${ticket_amount}$`, new Point(0, screenRes.y / 3), null, null);
ticketMenu.AddItem(new UIMenuItem("Ticket annehmen"));
@@ -599,7 +584,7 @@ export default function (globalData: IGlobalData) {
return ticketMenu;
}
mp.events.add("CLIENT:InteractionMenu_Pay_Name", (name) => {
payName = name;
globalData.InMenu = true;
@@ -612,4 +597,4 @@ export default function (globalData: IGlobalData) {
globalData.InMenu = false;
});
});
}
}

8
ReallifeGamemode.Server/Commands/UserCommands.cs
View File

@@ -16,14 +16,6 @@ namespace ReallifeGamemode.Server.Commands
{
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]")]
public void CmdUserId(Player player, String targetname)
{