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

Remove inInput -> replace with inMenu

Browse Source
This commit is contained in:
kookroach
2021-04-03 20:32:11 +02:00
parent ee305b78ec
commit 1e05bb108c
21 changed files with 108 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ReallifeGamemode.Client/Gui/Inventory/inventory.ts
View File

@@ -852,7 +852,7 @@ export default function inventory(globalData: IGlobalData) {
//Wenn Maus über Dollar Zeichen
if (isTrading && isMouseOverTradeDollar(x, y)) {
globalData.InInput = true;
globalData.InMenu = true;
var tradeMoney = new InputHelper("Wie viel $ möchtest du für deine Items haben?", globalData);
tradeMoney.show();
tradeMoney.getValue((data) => {
@@ -861,7 +861,7 @@ export default function inventory(globalData: IGlobalData) {
mp.game.graphics.notify('~r~Du musst eine Zahl größer als 0 eingeben!');
return;
}
globalData.InInput = false;
globalData.InMenu = false;
tradePrize = amount;
});
}
@@ -878,7 +878,7 @@ export default function inventory(globalData: IGlobalData) {
switch (radialSelect) {
case "up":
var dropInput = new InputHelper("Wie viel Items möchtest du wegwerfen?", globalData);
globalData.InInput = true;
globalData.InMenu = true;
dropInput.show();
dropInput.getValue((data) => {
var amount = parseInt(data);
@@ -891,7 +891,7 @@ export default function inventory(globalData: IGlobalData) {
}
mp.events.callRemote('itemInteract', "drop", items[clickedItem][5], amount);
});
globalData.InInput = false;
globalData.InMenu = false;
itemRadial = false;
break;
case "down":

16
ReallifeGamemode.Client/Gui/ahelp.ts
View File

@@ -13,12 +13,12 @@ export default function ahelp(globalData: IGlobalData): void {
if (ahelpBrowser !== null) {
ahelpBrowser.destroy();
ahelpBrowser = null;
globalData.InInput = false;
globalData.InMenu = false;
mp.gui.cursor.show(false, false);
mp.gui.chat.activate(true);
}
else if (!globalData.InInput) {
globalData.InInput = true;
else if (!globalData.InMenu) {
globalData.InMenu = true;
ahelpBrowser = mp.browsers.new('package://assets/html/helpcommand/ahelp.html');
mp.gui.chat.activate(false);
mp.gui.cursor.show(true, true);
@@ -30,10 +30,10 @@ export default function ahelp(globalData: IGlobalData): void {
if (ahelpBrowser == null) {
return;
}
else if (globalData.InInput) {
else if (globalData.InMenu) {
ahelpBrowser.destroy();
ahelpBrowser = null;
globalData.InInput = false;
globalData.InMenu = false;
mp.gui.cursor.show(false, false);
mp.gui.chat.activate(true);
}
@@ -44,12 +44,12 @@ export default function ahelp(globalData: IGlobalData): void {
if (ahelpBrowser !== null) {
ahelpBrowser.destroy();
ahelpBrowser = null;
globalData.InInput = false;
globalData.InMenu = false;
mp.gui.cursor.show(false, false);
mp.gui.chat.activate(true);
}
else if (!globalData.InInput) {
globalData.InInput = true;
else if (!globalData.InMenu) {
globalData.InMenu = true;
ahelpBrowser = mp.browsers.new('package://assets/html/helpcommand/shelp.html');
mp.gui.chat.activate(false);
mp.gui.cursor.show(true, true);

4
ReallifeGamemode.Client/Gui/cityhall.ts
View File

@@ -89,13 +89,13 @@ export default function (globalData: IGlobalData) {
menu.ItemSelect.on((item: NativeUI.UIMenuItem, index) => {
if (item === groupCreateItem) { // Gruppe
globalData.InInput = true;
globalData.InMenu = true;
var input = new InputHelper("Wie soll die Gruppe heißen?", globalData);
input.show();
input.getValue((name: string) => {
mp.events.callRemote("CLIENT:CityHall_CreateGroup", name);
menu.Close(true);
globalData.InInput = false;
globalData.InMenu = false;
});
} else if (item === cancelItem) {
menu.Close();

10
ReallifeGamemode.Client/Gui/drivingschool.ts
View File

@@ -12,12 +12,12 @@ export default function Introduction(globalData: IGlobalData): void {
if (DrivingSchoolBrowser !== null) {
DrivingSchoolBrowser.destroy();
DrivingSchoolBrowser = null;
globalData.InInput = false;
globalData.InMenu = false;
mp.gui.cursor.show(false, false);
mp.gui.chat.activate(true);
}
else if (!globalData.InInput) {
globalData.InInput = true;
else if (!globalData.InMenu) {
globalData.InMenu = true;
DrivingSchoolBrowser = mp.browsers.new('package://assets/html/School/DrivingSchool.html');
mp.gui.chat.activate(false);
mp.gui.cursor.show(true, true);
@@ -28,10 +28,10 @@ export default function Introduction(globalData: IGlobalData): void {
if (DrivingSchoolBrowser == null) {
return;
}
else if (globalData.InInput) {
else if (globalData.InMenu) {
DrivingSchoolBrowser.destroy();
DrivingSchoolBrowser = null;
globalData.InInput = false;
globalData.InMenu = false;
mp.gui.cursor.show(false, false);
mp.gui.chat.activate(true);
}

10
ReallifeGamemode.Client/Gui/introduction.ts
View File

@@ -13,12 +13,12 @@ export default function Introduction(globalData: IGlobalData): void {
if (IntroductionBrowser !== null) {
IntroductionBrowser.destroy();
IntroductionBrowser = null;
globalData.InInput = false;
globalData.InMenu = false;
mp.gui.cursor.show(false, false);
mp.gui.chat.activate(true);
}
else if (!globalData.InInput) {
globalData.InInput = true;
else if (!globalData.InMenu) {
globalData.InMenu = true;
IntroductionBrowser = mp.browsers.new('package://assets/html/Introduction/Introduction.html');
mp.gui.chat.activate(false);
mp.gui.cursor.show(true, true);
@@ -31,10 +31,10 @@ export default function Introduction(globalData: IGlobalData): void {
if (IntroductionBrowser == null) {
return;
}
else if (globalData.InInput) {
else if (globalData.InMenu) {
IntroductionBrowser.destroy();
IntroductionBrowser = null;
globalData.InInput = false;
globalData.InMenu = false;
mp.gui.cursor.show(false, false);
mp.gui.chat.activate(true);

6
ReallifeGamemode.Client/Gui/playerlist.ts
View File

@@ -14,12 +14,12 @@ export default function playerList(globalData: IGlobalData): void {
if (playerlistBrowser !== null) {
playerlistBrowser.destroy();
playerlistBrowser = null;
globalData.InInput = false;
globalData.InMenu = false;
mp.gui.cursor.show(false, false);
mp.gui.chat.activate(true);
}
else if (!globalData.InInput) {
globalData.InInput = true;
else if (!globalData.InMenu) {
globalData.InMenu = true;
playerlistBrowser = mp.browsers.new('package://assets/html/Playerlist/Tabliste.html');
mp.gui.chat.activate(false);
mp.gui.cursor.show(true, true);

2
ReallifeGamemode.Client/Gui/taximeter.ts
View File

@@ -41,7 +41,7 @@ export default function taximeterInput(globalData: IGlobalData) {
browser.destroy();
browser = null;
}
globalData.InInput = false;
globalData.InMenu = false;
});
function myTimer() {

10
ReallifeGamemode.Client/Gui/userhelp.ts
View File

@@ -13,12 +13,12 @@ export default function userhelp(globalData: IGlobalData): void {
if (userhelpBrowser !== null) {
userhelpBrowser.destroy();
userhelpBrowser = null;
globalData.InInput = false;
globalData.InMenu = false;
mp.gui.cursor.show(false, false);
mp.gui.chat.activate(true);
}
else if (!globalData.InInput) {
globalData.InInput = true;
else if (!globalData.InMenu) {
globalData.InMenu = true;
userhelpBrowser = mp.browsers.new('package://assets/html/helpcommand/userhelp.html');
mp.gui.chat.activate(false);
mp.gui.cursor.show(true, true);
@@ -31,10 +31,10 @@ export default function userhelp(globalData: IGlobalData): void {
if (userhelpBrowser == null) {
return;
}
else if (globalData.InInput) {
else if (globalData.InMenu) {
userhelpBrowser.destroy();
userhelpBrowser = null;
globalData.InInput = false;
globalData.InMenu = false;
mp.gui.cursor.show(false, false);
mp.gui.chat.activate(true);