diff --git a/ReallifeGamemode.Client/Business/cardealer.ts b/ReallifeGamemode.Client/Business/cardealer.ts index cc887f7d..96b5822c 100644 --- a/ReallifeGamemode.Client/Business/cardealer.ts +++ b/ReallifeGamemode.Client/Business/cardealer.ts @@ -9,6 +9,7 @@ const Point = NativeUI.Point; const ItemsCollection = NativeUI.ItemsCollection; const Color = NativeUI.Color; const ListItem = NativeUI.ListItem; +var screenRes = mp.game.graphics.getScreenResolution(0, 0); import moneyFormat from '../moneyformat'; @@ -44,7 +45,7 @@ export default function carDealer(globalData: IGlobalData) { var veh = mp.players.local.vehicle; if (!veh) return; mp.gui.chat.show(false); - shopMenu = new Menu("Fahrzeugkauf", "Kaufe ein neues Fahrzeug", new Point(50, 50), null, null); + shopMenu = new Menu("Fahrzeugkauf", "Kaufe ein neues Fahrzeug", new Point(0, screenRes.y / 3), null, null); globalData.InMenu = true; diff --git a/ReallifeGamemode.Client/Business/main.ts b/ReallifeGamemode.Client/Business/main.ts index 53c6d0be..7737a963 100644 --- a/ReallifeGamemode.Client/Business/main.ts +++ b/ReallifeGamemode.Client/Business/main.ts @@ -9,6 +9,7 @@ const Point = NativeUI.Point; const ItemsCollection = NativeUI.ItemsCollection; const Color = NativeUI.Color; const ListItem = NativeUI.ListItem; +var screenRes = mp.game.graphics.getScreenResolution(0, 0); import InputHelper from '../inputhelper'; @@ -57,7 +58,7 @@ export default function business(globalData: IGlobalData) { globalData.InMenu = true; - mainMenu = new Menu("Businessverwaltung", businessData.Name, new Point(50, 50), null, null); + mainMenu = new Menu("Businessverwaltung", businessData.Name, new Point(0, screenRes.y / 3), null, null); var bankAccountItem: NativeUI.UIMenuItem; @@ -74,7 +75,7 @@ export default function business(globalData: IGlobalData) { bankAccountItem.SetRightLabel("~s~" + businessData.Balance); mainMenu.AddItem(bankAccountItem); - var bankMenu = new Menu("Bankkonto", businessData.Name, new Point(50, 50), null, null); + var bankMenu = new Menu("Bankkonto", businessData.Name, new Point(0, screenRes.y / 3), null, null); bankMenu.Visible = false; var infoItem = new UIMenuItem("Aktueller Kontostand"); diff --git a/ReallifeGamemode.Client/CharCreator/main.ts b/ReallifeGamemode.Client/CharCreator/main.ts index 19e34b5b..3096b6e9 100644 --- a/ReallifeGamemode.Client/CharCreator/main.ts +++ b/ReallifeGamemode.Client/CharCreator/main.ts @@ -16,6 +16,7 @@ const BadgeStyle = NativeUI.BadgeStyle; const Point = NativeUI.Point; const ItemsCollection = NativeUI.ItemsCollection; const Color = NativeUI.Color; +var screenRes = mp.game.graphics.getScreenResolution(0, 0); const creatorCoords = { camera: new mp.Vector3(402.8664, -997.5515, -98.5), @@ -213,7 +214,7 @@ export default function charCreator(globalData: IGlobalData) { for (let i = 0; i < Data.maxLipstickColor; i++) lipstickColors.push(i.toString()); // CREATOR MAIN - let creatorMainMenu = new Menu("Charaktererstellung", "", new Point(50, 50), null, null); + let creatorMainMenu = new Menu("Charaktererstellung", "", new Point(0, screenRes.y / 3), null, null); let genderItem = new UIMenuListItem("Geschlecht", "~r~Dies setzt deine Einstellungen zur\u00fcck.", new ItemsCollection(["M\u00e4nnlich", "Weiblich"])); creatorMainMenu.AddItem(genderItem); creatorMainMenu.AddItem(new UIMenuItem("Eltern", "Eltern des Charakters.")); @@ -336,7 +337,7 @@ export default function charCreator(globalData: IGlobalData) { let similarities = []; for (let i = 0; i <= 100; i++) similarities.push(i + "%"); - let creatorParentsMenu = new Menu("Eltern", "", new Point(50, 50), null, null); + let creatorParentsMenu = new Menu("Eltern", "", new Point(0, screenRes.y / 3), null, null); let fatherItem = new UIMenuListItem("Vater", "Dem Charakter sein Vadda.", new ItemsCollection(Data.fatherNames)); let motherItem = new UIMenuListItem("Mutter", "Dem Charakter seine Mudda.", new ItemsCollection(Data.motherNames)); let similarityItem = new UIMenuListItem("\u00c4hnlichkeit", "\u00c4hnlichkeit zu den Eltern.\n(niedriger = feminin, h\u00f6her = maskulin)", new ItemsCollection(similarities)); @@ -378,7 +379,7 @@ export default function charCreator(globalData: IGlobalData) { let features = []; for (let i = -1.0; i <= 1.01; i += 0.01) features.push(i.toFixed(2)); - let creatorFeaturesMenu = new Menu("Gesichtsz\u00fcge", "", new Point(50, 50), null, null); + let creatorFeaturesMenu = new Menu("Gesichtsz\u00fcge", "", new Point(0, screenRes.y / 3), null, null); for (let i = 0; i < Data.featureNames.length; i++) { let tempFeatureItem = new UIMenuListItem(Data.featureNames[i], "", new ItemsCollection(features)); @@ -420,7 +421,7 @@ export default function charCreator(globalData: IGlobalData) { let opacities = []; for (let i = 0; i <= 100; i++) opacities.push(i + "%"); - let creatorAppearanceMenu = new Menu("Aussehen", "", new Point(50, 50), null, null); + let creatorAppearanceMenu = new Menu("Aussehen", "", new Point(0, screenRes.y / 3), null, null); for (let i = 0; i < Data.appearanceNames.length; i++) { let items = []; @@ -476,7 +477,7 @@ export default function charCreator(globalData: IGlobalData) { let lipstickColorItem; let chestHairColorItem; - creatorHairMenu = new Menu("Haar & Farben", "", new Point(50, 50), null, null); + creatorHairMenu = new Menu("Haar & Farben", "", new Point(0, screenRes.y / 3), null, null); fillHairMenu(); creatorHairMenu.ItemSelect.on((item, index) => { diff --git a/ReallifeGamemode.Client/Gui/cityhall.ts b/ReallifeGamemode.Client/Gui/cityhall.ts index eb15209c..a3714bd1 100644 --- a/ReallifeGamemode.Client/Gui/cityhall.ts +++ b/ReallifeGamemode.Client/Gui/cityhall.ts @@ -8,7 +8,7 @@ const BadgeStyle = NativeUI.BadgeStyle; const Point = NativeUI.Point; const ItemsCollection = NativeUI.ItemsCollection; const Color = NativeUI.Color; - +var screenRes = mp.game.graphics.getScreenResolution(0, 0); import InputHelper from '../inputhelper'; export default function (globalData: IGlobalData) { @@ -42,7 +42,7 @@ export default function (globalData: IGlobalData) { function keyPressHandler(): void { if (globalData.InChat || globalData.InMenu) return; - menu = new Menu("Stadthalle", "", new Point(50, 50), null, null); + menu = new Menu("Stadthalle", "", new Point(0, screenRes.y / 3), null, null); globalData.InMenu = true; mp.gui.chat.show(false); @@ -50,7 +50,7 @@ export default function (globalData: IGlobalData) { var jobItem = new UIMenuItem("Jobs", "Jobcenter"); menu.AddItem(jobItem); - var jobMenu = new Menu("Jobcenter", "Suche dir einen neuen Job aus", new Point(50, 50), null, null); + var jobMenu = new Menu("Jobcenter", "Suche dir einen neuen Job aus", new Point(0, screenRes.y / 3), null, null); for (var i = 0; i < joblist.length; i++) { var job = joblist[i]; diff --git a/ReallifeGamemode.Client/Gui/house.ts b/ReallifeGamemode.Client/Gui/house.ts index 7c65dbe0..64893ff6 100644 --- a/ReallifeGamemode.Client/Gui/house.ts +++ b/ReallifeGamemode.Client/Gui/house.ts @@ -7,6 +7,7 @@ import { Key } from '../game'; var houseMenu: Menu; var houseData: any; var houseState: number; +var screenRes = mp.game.graphics.getScreenResolution(0, 0); game.events.add("SERVER:ShowHouseMenu", () => { @@ -29,7 +30,7 @@ function keyPressHandler() { subTitle += " von " + houseData.OwnerName; } - houseMenu = new Menu("Hausverwaltung", subTitle, new Point(50, 50), null, null); + houseMenu = new Menu("Hausverwaltung", subTitle, new Point(0, screenRes.y / 3), null, null); game.ui.inMenu = true; @@ -63,7 +64,7 @@ function keyPressHandler() { cancelRentalsItem.SetRightLabel(houseRentals.toString()); houseMenu.AddItem(cancelRentalsItem); - var cancelRentalsMenu = new Menu("Mieter", "Kündige einen Mieter", new Point(50, 50), null, null); + var cancelRentalsMenu = new Menu("Mieter", "Kündige einen Mieter", new Point(0, screenRes.y / 3), null, null); cancelRentalsMenu.Visible = false; houseData.Rentals.forEach(rental => { diff --git a/ReallifeGamemode.Client/Gui/policedepartment.ts b/ReallifeGamemode.Client/Gui/policedepartment.ts index ec057c0f..df378604 100644 --- a/ReallifeGamemode.Client/Gui/policedepartment.ts +++ b/ReallifeGamemode.Client/Gui/policedepartment.ts @@ -3,8 +3,8 @@ import { Key } from "../game"; import { Menu, Point, UIMenuItem } from "../libs/NativeUI"; import { createMenuItem } from "../util"; import moneyformat from "../moneyformat"; - -var menu: Menu = new Menu("Polizeirevier", "Die Hilfestelle der Polizei", new Point(50, 50)); +var screenRes = mp.game.graphics.getScreenResolution(0, 0); +var menu: Menu = new Menu("Polizeirevier", "Die Hilfestelle der Polizei", new Point(0, screenRes.y / 3)); menu.AddItem(createMenuItem("Waffenschein kaufen", "Erwerbe einen Waffenschein", (item) => { item.SetRightLabel("$" + moneyformat(5000)); diff --git a/ReallifeGamemode.Client/Gui/vehiclemenu/main.ts b/ReallifeGamemode.Client/Gui/vehiclemenu/main.ts index c2a727a1..9aed55f3 100644 --- a/ReallifeGamemode.Client/Gui/vehiclemenu/main.ts +++ b/ReallifeGamemode.Client/Gui/vehiclemenu/main.ts @@ -5,6 +5,7 @@ const UIMenuItem = NativeUI.UIMenuItem; const UIMenuListItem = NativeUI.UIMenuListItem; const Point = NativeUI.Point; const ItemsCollection = NativeUI.ItemsCollection; +var screenRes = mp.game.graphics.getScreenResolution(0, 0); export default function vehicleMenu(globalData: IGlobalData) { let menuBrowser: BrowserMp = null; @@ -49,7 +50,7 @@ export default function vehicleMenu(globalData: IGlobalData) { function showDoorsMenu() { globalData.InMenu = true; - var doorMenu = new Menu("Türen", "Türen verwalten", new Point(50, 50), null, null); + var doorMenu = new Menu("Türen", "Türen verwalten", new Point(0, screenRes.y / 3), null, null); doorMenu.AddItem(new UIMenuListItem("Tür", "Welche Tür darf's sein?", new ItemsCollection([ " Fahrertür", diff --git a/ReallifeGamemode.Client/Interaction/bankmenu.ts b/ReallifeGamemode.Client/Interaction/bankmenu.ts index 8c4a2379..7c631edf 100644 --- a/ReallifeGamemode.Client/Interaction/bankmenu.ts +++ b/ReallifeGamemode.Client/Interaction/bankmenu.ts @@ -54,7 +54,7 @@ export default function bankMenuHandle(globalData: IGlobalData) { globalData.InMenu = true; - bankmenu = new Menu("Bank", "", new Point(50, 50), null, null); + bankmenu = new Menu("Bank", "", new Point(0, screenRes.y / 3), null, null); bankmenu.AddItem(payInItem); bankmenu.AddItem(payOutItem); @@ -149,7 +149,7 @@ export default function bankMenuHandle(globalData: IGlobalData) { globalData.InMenu = true; - factionBankmenu = new Menu("Fraktionskasse", "", new Point(50, 50), null, null); + factionBankmenu = new Menu("Fraktionskasse", "", new Point(0, screenRes.y / 3), null, null); factionBankmenu.AddItem(factionBankBalance); factionBankBalance.SetRightLabel("$" + factionMoney); factionBankmenu.AddItem(factionPayInItem); @@ -188,7 +188,7 @@ export default function bankMenuHandle(globalData: IGlobalData) { globalData.InMenu = true; - factionBankmenu = new Menu("Fraktionskasse", "", new Point(50, 50), null, null); + factionBankmenu = new Menu("Fraktionskasse", "", new Point(0, screenRes.y / 3), null, null); factionBankmenu.AddItem(factionBankBalance); factionBankBalance.SetRightLabel("$" + factionMoney); factionBankmenu.AddItem(factionPayInItem); diff --git a/ReallifeGamemode.Client/Interaction/drivingschool.ts b/ReallifeGamemode.Client/Interaction/drivingschool.ts index d789a20f..d7818027 100644 --- a/ReallifeGamemode.Client/Interaction/drivingschool.ts +++ b/ReallifeGamemode.Client/Interaction/drivingschool.ts @@ -33,7 +33,7 @@ export default function drivingSchoolList(globalData: IGlobalData) { globalData.InMenu = true; - drivingMenu = new Menu("Fahrschule", "", new Point(50, 50), null, null); + drivingMenu = new Menu("Fahrschule", "", new Point(0, screenRes.y / 3), null, null); drivingMenu.AddItem(new UIMenuListItem("Prüfung", "", new ItemsCollection(["Auto", "Motorrad"]))); diff --git a/ReallifeGamemode.Client/Interaction/elevator.ts b/ReallifeGamemode.Client/Interaction/elevator.ts index 171f1015..d61c7d26 100644 --- a/ReallifeGamemode.Client/Interaction/elevator.ts +++ b/ReallifeGamemode.Client/Interaction/elevator.ts @@ -33,7 +33,7 @@ export default function elevatorList(globalData: IGlobalData) { stages = JSON.parse(stagesArr); - elevatorMenu = new Menu("Aufzug", "", new Point(50, 50), null, null); + elevatorMenu = new Menu("Aufzug", "", new Point(0, screenRes.y / 3), null, null); elevatorMenu.AddItem(new UIMenuListItem("Stock", "", new ItemsCollection(stages))); diff --git a/ReallifeGamemode.Client/Interaction/factioninteraction.ts b/ReallifeGamemode.Client/Interaction/factioninteraction.ts index b08d22a1..4970345f 100644 --- a/ReallifeGamemode.Client/Interaction/factioninteraction.ts +++ b/ReallifeGamemode.Client/Interaction/factioninteraction.ts @@ -51,7 +51,7 @@ export default function factionInteraction(globalData: IGlobalData) { mp.gui.chat.activate(false); globalData.InMenu = true; - factionInteractionMenu = new Menu("Fraktionsinteraktion", userFactionName, new Point(0, screenRes.y / 2), null, null); + factionInteractionMenu = new Menu("Fraktionsinteraktion", userFactionName, new Point(0, screenRes.y / 3), null, null); ticketTaskMenuLSPD = new UIMenuItem("Ticket ausstellen", "Einem Spieler ein Strafticket ausstellen."); factionInteractionMenu.AddItem(ticketTaskMenuLSPD); @@ -223,7 +223,7 @@ export default function factionInteraction(globalData: IGlobalData) { var hPM = ((healTaskCountMedic === "0") ? "~r~" : "~g~"); var fPM = ((fireTaskCountMedic === "0") ? "~r~" : "~g~"); - factionInteractionMenu = new Menu("Fraktionsinteraktion", userFactionName, new Point(0, screenRes.y / 2), null, null); + factionInteractionMenu = new Menu("Fraktionsinteraktion", userFactionName, new Point(0, screenRes.y / 3), null, null); //Medic let reviveTaskMenuMedic; @@ -298,7 +298,7 @@ export default function factionInteraction(globalData: IGlobalData) { globalData.InMenu = true; switch (type) { case 0: - reviveTaskMenuMedic = new Menu("Revives", "\u00c4lteste zu erst", new Point(0, screenRes.y / 2), null, null); + reviveTaskMenuMedic = new Menu("Revives", "\u00c4lteste zu erst", new Point(0, screenRes.y / 3), null, null); let aTask; for (var i = 0; i < tasks.length; i++) { if (tasks[i].MedicName === "none") { @@ -354,7 +354,7 @@ export default function factionInteraction(globalData: IGlobalData) { }); break; case 1: - healTaskMenuMedic = new Menu("Heal", "\u00c4lteste zu erst", new Point(0, screenRes.y / 2), null, null); + healTaskMenuMedic = new Menu("Heal", "\u00c4lteste zu erst", new Point(0, screenRes.y / 3), null, null); let aTask1; for (var i = 0; i < tasks.length; i++) { if (tasks[i].MedicName === "none") { diff --git a/ReallifeGamemode.Client/Interaction/interactionmenu.ts b/ReallifeGamemode.Client/Interaction/interactionmenu.ts index 9d0b0607..43e01bbf 100644 --- a/ReallifeGamemode.Client/Interaction/interactionmenu.ts +++ b/ReallifeGamemode.Client/Interaction/interactionmenu.ts @@ -10,7 +10,7 @@ const BadgeStyle = NativeUI.BadgeStyle; const Point = NativeUI.Point; const ItemsCollection = NativeUI.ItemsCollection; const Color = NativeUI.Color; - +let screenRes = mp.game.graphics.getScreenResolution(0, 0); import { getStreetName, getZoneName } from '../streetnames'; export default function (globalData: IGlobalData) { @@ -88,7 +88,7 @@ export default function (globalData: IGlobalData) { if (accountData.paycheck) { var p = accountData.paycheck; - var paycheckMenu = new Menu("Gehaltsscheck", "Dein Verdienst der letzten Stunde", new Point(50, 50), null, null); + var paycheckMenu = new Menu("Gehaltsscheck", "Dein Verdienst der letzten Stunde", new Point(0, screenRes.y / 3), null, null); paycheckMenu.Visible = false; var item: NativeUI.UIMenuItem = new UIMenuItem("Lohn"); @@ -191,11 +191,11 @@ export default function (globalData: IGlobalData) { }); function getInteractionMenu(): NativeUI.Menu { - return new Menu("Hauptmenü", "Interaktionen | " + mp.players.local.name, new Point(50, 50), null, null); + return new Menu("Hauptmenü", "Interaktionen | " + mp.players.local.name, new Point(0, screenRes.y / 3), null, null); } function getAccountMenu(data: AccountData): NativeUI.Menu { - var accountMenu = new NativeUI.Menu("Account", mp.players.local.name, new Point(50, 50), null, null); + var accountMenu = new NativeUI.Menu("Account", mp.players.local.name, new Point(0, screenRes.y / 3), null, null); var menuItem = new UIMenuItem("Fraktion"); menuItem.SetRightLabel(data.faction); @@ -230,7 +230,7 @@ export default function (globalData: IGlobalData) { } function getLicenseMenu(accdata: AccountData, data: Licenses, parentMenu: NativeUI.Menu, ): NativeUI.Menu { - var licenseMenu = new NativeUI.Menu("Lizenzen", mp.players.local.name, new Point(50, 50), null, null); + 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"); if (data.drivingLicenseCar == false) { @@ -300,7 +300,7 @@ export default function (globalData: IGlobalData) { function getFactionMenu(faction: string, vehData: VehicleData[], stateFaction: boolean, parentMenu: NativeUI.Menu): NativeUI.Menu { - var factionMenu = new NativeUI.Menu("Fraktion", faction, new Point(50, 50), null, null); + var factionMenu = new NativeUI.Menu("Fraktion", faction, new Point(0, screenRes.y / 3), null, null); factionMenu.Visible = false; @@ -315,7 +315,7 @@ export default function (globalData: IGlobalData) { } function getFactionLeaderMenu(faction: string, vehData: VehicleData[], stateFaction: boolean, parentMenu: NativeUI.Menu): NativeUI.Menu { - var factionMenu = new NativeUI.Menu("Fraktion", faction, new Point(50, 50), 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 rauswerfen")); @@ -354,7 +354,7 @@ export default function (globalData: IGlobalData) { } function getGroupMenu(group: string, parentMenu: NativeUI.Menu): NativeUI.Menu { - var groupMenu = new NativeUI.Menu("Gruppe", group, new Point(50, 50), null, null); + var groupMenu = new NativeUI.Menu("Gruppe", group, new Point(0, screenRes.y / 3), null, null); groupMenu.AddItem(new UIMenuItem("Spieler einladen")); groupMenu.AddItem(new UIMenuItem("Spieler rauswerfen")); groupMenu.Visible = false; @@ -385,7 +385,7 @@ export default function (globalData: IGlobalData) { } function getServicesMenu(parentMenu: NativeUI.Menu): NativeUI.Menu { - var servicesMenu = new Menu("Services", "Rufe einen Service", new Point(50, 50), null, null); + var servicesMenu = new Menu("Services", "Rufe einen Service", new Point(0, screenRes.y / 3), null, null); servicesMenu.AddItem(new UIMenuItem("Taxi rufen", "Rufe ein Taxi zu deiner Position")); var saniItem = new UIMenuItem("Sanitäter rufen", "Rufe einen Sanitäter zu deiner Position."); servicesMenu.AddItem(saniItem); @@ -412,7 +412,7 @@ export default function (globalData: IGlobalData) { desc += " oder Verkaufen"; } - var menu = new Menu("Fahrzeuge", desc, new Point(50, 50), null, null); + var menu = new Menu("Fahrzeuge", desc, new Point(0, screenRes.y / 3), null, null); var items: string[] = ["Finden", "Verkaufen"]; @@ -441,7 +441,7 @@ export default function (globalData: IGlobalData) { var desc = "Finden"; - var menu = new Menu("Fahrzeuge", desc, new Point(50, 50), null, null); + var menu = new Menu("Fahrzeuge", desc, new Point(0, screenRes.y / 3), null, null); var items: string[] = ["Finden"]; @@ -468,7 +468,7 @@ export default function (globalData: IGlobalData) { } 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(50, 50), null, null); + 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")); ticketMenu.AddItem(new UIMenuItem("Ticket ablehnen")); ticketMenu.Visible = false; diff --git a/ReallifeGamemode.Client/Interaction/playerinteraction.ts b/ReallifeGamemode.Client/Interaction/playerinteraction.ts index 4c1eb18c..35de349d 100644 --- a/ReallifeGamemode.Client/Interaction/playerinteraction.ts +++ b/ReallifeGamemode.Client/Interaction/playerinteraction.ts @@ -51,7 +51,7 @@ export default function playerInteraction(globalData: IGlobalData) { mp.gui.chat.activate(false); nearbyPlayers = JSON.parse(nearPlayerArr); globalData.InMenu = true; - let playerInteractionMenu = new Menu("Spielerinteraktion", "", new Point(0, screenRes.y / 2), null, null); + let playerInteractionMenu = new Menu("Spielerinteraktion", "", new Point(0, screenRes.y / 3), null, null); let playerSelect = new UIMenuListItem("Mit", "~y~W\u00e4hle den Spieler aus.", new ItemsCollection(nearbyPlayers)); playerInteractionMenu.AddItem(playerSelect); playerInteractionMenu.AddItem(new UIMenuItem("Handeln", "Sende dem Spieler eine Handlungsanfrage")); diff --git a/ReallifeGamemode.Client/Jobs/BusRouteSelect.ts b/ReallifeGamemode.Client/Jobs/BusRouteSelect.ts index 7e43192e..90e0b33e 100644 --- a/ReallifeGamemode.Client/Jobs/BusRouteSelect.ts +++ b/ReallifeGamemode.Client/Jobs/BusRouteSelect.ts @@ -32,7 +32,7 @@ export default function busRouteList(globalData: IGlobalData) { globalData.InMenu = true; routeTexts = JSON.parse(listRoutes); - routeMenu = new Menu("Bus Job", "", new Point(50, 50), null, null); + routeMenu = new Menu("Bus Job", "", new Point(0, screenRes.y / 3), null, null); routeMenu.AddItem(new UIMenuListItem("Route", "", new ItemsCollection(routeTexts))); routeMenu.AddItem(sendItem); diff --git a/ReallifeGamemode.Client/Jobs/PilotRouteSelect.ts b/ReallifeGamemode.Client/Jobs/PilotRouteSelect.ts index 3ed2554a..91ddabeb 100644 --- a/ReallifeGamemode.Client/Jobs/PilotRouteSelect.ts +++ b/ReallifeGamemode.Client/Jobs/PilotRouteSelect.ts @@ -32,7 +32,7 @@ export default function PilotRouteList(globalData: IGlobalData) { globalData.InMenu = true; routeTexts = JSON.parse(listRoutes); - routeMenu = new Menu("Pilot Job", "", new Point(50, 50), null, null); + routeMenu = new Menu("Pilot Job", "", new Point(0, screenRes.y / 3), null, null); routeMenu.AddItem(new UIMenuListItem("Route", "", new ItemsCollection(routeTexts))); routeMenu.AddItem(sendItem); diff --git a/ReallifeGamemode.Client/Player/criminalrelease.ts b/ReallifeGamemode.Client/Player/criminalrelease.ts index 26ca1f3c..7e9a9008 100644 --- a/ReallifeGamemode.Client/Player/criminalrelease.ts +++ b/ReallifeGamemode.Client/Player/criminalrelease.ts @@ -36,7 +36,7 @@ export default function jailList(globalData: IGlobalData) { prisoners = JSON.parse(prisonersArr); - jailMenu = new Menu("Gefängnis PC", "", new Point(50, 50), null, null); + jailMenu = new Menu("Gefängnis PC", "", new Point(0, screenRes.y / 3), null, null); jailMenu.AddItem(new UIMenuListItem("Gefangener", "", new ItemsCollection(prisoners))); diff --git a/ReallifeGamemode.Client/Player/dutycloth.ts b/ReallifeGamemode.Client/Player/dutycloth.ts index 99a364c0..80e8ac6e 100644 --- a/ReallifeGamemode.Client/Player/dutycloth.ts +++ b/ReallifeGamemode.Client/Player/dutycloth.ts @@ -50,7 +50,7 @@ export default function dutyCloth(globalData: IGlobalData) { legs = legsArr; shoes = shoesArr; - dutyMenu = new Menu("Dienstkleidung", "Stelle deine Dienstkleidung zusammen", new Point(50, 50), null, null); + dutyMenu = new Menu("Dienstkleidung", "Stelle deine Dienstkleidung zusammen", new Point(0, screenRes.y / 3), null, null); dutyMenu.AddItem(new UIMenuListItem("Accessoire", "", new ItemsCollection(hats))); dutyMenu.AddItem(new UIMenuListItem("Top", "", new ItemsCollection(tops))); diff --git a/ReallifeGamemode.Client/Player/reportmenu.ts b/ReallifeGamemode.Client/Player/reportmenu.ts index 05541dfb..903b2038 100644 --- a/ReallifeGamemode.Client/Player/reportmenu.ts +++ b/ReallifeGamemode.Client/Player/reportmenu.ts @@ -48,7 +48,7 @@ export default function reportList(globalData: IGlobalData) { users = JSON.parse(userTickets); reportTexts = JSON.parse(userTickets); - reportMenu = new Menu("Offene Tickets", "", new Point(50, 50), null, null); + reportMenu = new Menu("Offene Tickets", "", new Point(0, screenRes.y / 3), null, null); reportMenu.AddItem(new UIMenuListItem("Ticket", "", new ItemsCollection(reportTexts))); @@ -97,7 +97,7 @@ export default function reportList(globalData: IGlobalData) { var types = ["Quick Report", "Ticket Report"]; - reportMenu = new Menu("QuickReport/Ticket", "", new Point(50, 50), null, null); + reportMenu = new Menu("QuickReport/Ticket", "", new Point(0, screenRes.y / 3), null, null); var typesItem = new UIMenuListItem("Typ", "", new ItemsCollection(types)); reportMenu.AddItem(typesItem); diff --git a/ReallifeGamemode.Client/Player/weaponlist.ts b/ReallifeGamemode.Client/Player/weaponlist.ts index 3dfc8cd3..cb7f8ac0 100644 --- a/ReallifeGamemode.Client/Player/weaponlist.ts +++ b/ReallifeGamemode.Client/Player/weaponlist.ts @@ -60,7 +60,7 @@ export default function weaponList(globalData: IGlobalData) { dealItem.BackColor = new Color(204, 170, 0); dealItem.HighlightedBackColor = new Color(255, 213, 0); - weaponMenu = new Menu("Waffenschrank", "Stelle deine Waffenausrüstung zusammen", new Point(50, 50), null, null); + weaponMenu = new Menu("Waffenschrank", "Stelle deine Waffenausrüstung zusammen", new Point(0, screenRes.y / 3), null, null); weaponMenu.AddItem(new UIMenuListItem("Primäre", "", new ItemsCollection(secondaries))); weaponMenu.AddItem(new UIMenuListItem("Sekundäre", "", new ItemsCollection(primaries))); @@ -116,7 +116,7 @@ export default function weaponList(globalData: IGlobalData) { function getWeaponStockMenu(parentMenu: NativeUI.Menu, ): NativeUI.Menu { - var weaponStockMenu = new NativeUI.Menu("Bestand","", new Point(50, 50), null, null); + var weaponStockMenu = new NativeUI.Menu("Bestand","", new Point(0, screenRes.y / 3), null, null); var menuItem = new UIMenuItem("Pistol"); menuItem.SetRightLabel(pistol_Amount); diff --git a/ReallifeGamemode.Client/Tuning/main.ts b/ReallifeGamemode.Client/Tuning/main.ts index 818fa65f..0fdefbd4 100644 --- a/ReallifeGamemode.Client/Tuning/main.ts +++ b/ReallifeGamemode.Client/Tuning/main.ts @@ -10,7 +10,7 @@ const UIMenuItem = NativeUI.UIMenuItem; const BadgeStyle = NativeUI.BadgeStyle; const Point = NativeUI.Point; const Color = NativeUI.Color; - +let screenRes = mp.game.graphics.getScreenResolution(0, 0); import vehicleColors from './colors'; export default function tuning(globalData: IGlobalData) { @@ -171,7 +171,7 @@ export default function tuning(globalData: IGlobalData) { localVehicle.setLights(1); var carName = mp.game.ui.getLabelText(mp.game.vehicle.getDisplayNameFromVehicleModel(localVehicle.model)); - mainMenu = new Menu("Fahrzeugwerkstatt", carName, new Point(50, 50), null, null); + mainMenu = new Menu("Fahrzeugwerkstatt", carName, new Point(0, screenRes.y / 3), null, null); var repairItem = new UIMenuItem("Fahrzeug reparieren"); mainMenu.AddItem(repairItem); @@ -229,7 +229,7 @@ export default function tuning(globalData: IGlobalData) { if (modType === 18) modNum = 1; if (modType === 22) modNum = 14; - var modMenu = new Menu(modName, carName, new Point(50, 50), null, null); + var modMenu = new Menu(modName, carName, new Point(0, screenRes.y / 3), null, null); modMenu.Visible = false; @@ -464,7 +464,7 @@ export default function tuning(globalData: IGlobalData) { var primaryColor = getSingleColorMenu("Primärfarbe", currentPrimaryColor, primaryColorSelect, primaryColorChange); var secondaryColor = getSingleColorMenu("Sekundärfarbe", currentSecondaryColor, secondaryColorSelect, secondaryColorChange); - var menu = new Menu("Lackierungen", "Ändere die Farbe deines Fahrzeugs", new Point(50, 50)); + var menu = new Menu("Lackierungen", "Ändere die Farbe deines Fahrzeugs", new Point(0, screenRes.y / 3)); var primaryColorItem = new UIMenuItem("Primärfarbe"); var secondaryColorItem = new UIMenuItem("Sekundärfarbe"); @@ -487,7 +487,7 @@ export default function tuning(globalData: IGlobalData) { } function getSingleColorMenu(title: string, currentColor: number, onSelect: (color: number) => void, onChange: (color: number) => void): NativeUI.Menu { - var menu = new Menu(title, "Ändere die Farbe deines Fahrzeugs", new Point(50, 50)); + var menu = new Menu(title, "Ändere die Farbe deines Fahrzeugs", new Point(0, screenRes.y / 3)); var colorCategories = Object.keys(vehicleColors); @@ -497,7 +497,7 @@ export default function tuning(globalData: IGlobalData) { var categoryItem = new UIMenuItem(category); menu.AddItem(categoryItem); - var categoryMenu = new Menu(category, "Ändere die Farbe deines Fahrzeugs", new Point(50, 50)); + var categoryMenu = new Menu(category, "Ändere die Farbe deines Fahrzeugs", new Point(0, screenRes.y / 3)); var categoryColors = Object.keys(vehicleColors[category]); categoryColors.forEach(categoryColor => {