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

10
ReallifeGamemode.Client/Business/main.ts
View File

@@ -54,7 +54,7 @@ export default function business(globalData: IGlobalData) {
function keyPressHandler() { function keyPressHandler() {
mp.events.call('SERVER:Business_RemoveHelp', false); mp.events.call('SERVER:Business_RemoveHelp', false);
if (globalData.InChat || globalData.InInput || globalData.InMenu) return; if (globalData.InChat || globalData.InMenu || globalData.InMenu) return;
globalData.InMenu = true; globalData.InMenu = true;
@@ -93,7 +93,7 @@ export default function business(globalData: IGlobalData) {
bankMenu.ItemSelect.on((item, index) => { bankMenu.ItemSelect.on((item, index) => {
if (item === depositItem) { if (item === depositItem) {
globalData.InInput = true; globalData.InMenu = true;
var depositInput = new InputHelper("Wie viel Geld möchtest du auf deine Businesskasse einzahlen?", globalData); var depositInput = new InputHelper("Wie viel Geld möchtest du auf deine Businesskasse einzahlen?", globalData);
depositInput.show(); depositInput.show();
depositInput.getValue((data) => { depositInput.getValue((data) => {
@@ -103,13 +103,13 @@ export default function business(globalData: IGlobalData) {
return; return;
} }
globalData.InInput = false; globalData.InMenu = false;
mp.events.callRemote('Business_DepositMoney', amount); mp.events.callRemote('Business_DepositMoney', amount);
mainMenu.Close(); mainMenu.Close();
}); });
} else if (item === withdrawItem) { } else if (item === withdrawItem) {
globalData.InInput = true; globalData.InMenu = true;
var withdrawInput = new InputHelper("Wie viel Geld möchtest du von deiner Businesskasse abheben?", globalData); var withdrawInput = new InputHelper("Wie viel Geld möchtest du von deiner Businesskasse abheben?", globalData);
withdrawInput.show(); withdrawInput.show();
withdrawInput.getValue((data) => { withdrawInput.getValue((data) => {
@@ -118,7 +118,7 @@ export default function business(globalData: IGlobalData) {
mp.game.graphics.notify('~r~Du musst eine Nummer eingeben!'); mp.game.graphics.notify('~r~Du musst eine Nummer eingeben!');
return; return;
} }
globalData.InInput = false; globalData.InMenu = false;
mp.events.callRemote('Business_WithdrawMoney', amount); mp.events.callRemote('Business_WithdrawMoney', amount);
mainMenu.Close(); mainMenu.Close();

8
ReallifeGamemode.Client/CharCreator/main.ts
View File

@@ -317,13 +317,13 @@ export default function charCreator(globalData: IGlobalData) {
mp.game.cam.renderScriptCams(false, false, 0, true, false); mp.game.cam.renderScriptCams(false, false, 0, true, false);
mp.events.callRemote("creatorSave", currentGender, JSON.stringify(parentData), JSON.stringify(featureData), JSON.stringify(appearanceData), JSON.stringify(hairAndColors)); mp.events.callRemote("creatorSave", currentGender, JSON.stringify(parentData), JSON.stringify(featureData), JSON.stringify(appearanceData), JSON.stringify(hairAndColors));
globalData.InMenu = false; globalData.InMenu = false;
globalData.InInput = false; globalData.InMenu = false;
break; break;
case 7: case 7:
mp.events.callRemote("creator_Leave"); mp.events.callRemote("creator_Leave");
globalData.InMenu = false; globalData.InMenu = false;
globalData.InInput = false; globalData.InMenu = false;
break; break;
} }
}); });
@@ -331,7 +331,7 @@ export default function charCreator(globalData: IGlobalData) {
creatorMainMenu.MenuClose.on(() => { creatorMainMenu.MenuClose.on(() => {
mp.events.callRemote("creator_Leave"); mp.events.callRemote("creator_Leave");
globalData.InMenu = false; globalData.InMenu = false;
globalData.InInput = false; globalData.InMenu = false;
}); });
creatorMainMenu.Visible = false; creatorMainMenu.Visible = false;
@@ -560,7 +560,7 @@ export default function charCreator(globalData: IGlobalData) {
creatorCamera.setActive(true); creatorCamera.setActive(true);
globalData.InMenu = true; globalData.InMenu = true;
globalData.InInput = true; globalData.InMenu = true;
creatorMainMenu.Visible = true; creatorMainMenu.Visible = true;
mp.gui.chat.show(false); mp.gui.chat.show(false);

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

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

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

@@ -13,12 +13,12 @@ export default function ahelp(globalData: IGlobalData): void {
if (ahelpBrowser !== null) { if (ahelpBrowser !== null) {
ahelpBrowser.destroy(); ahelpBrowser.destroy();
ahelpBrowser = null; ahelpBrowser = null;
globalData.InInput = false; globalData.InMenu = false;
mp.gui.cursor.show(false, false); mp.gui.cursor.show(false, false);
mp.gui.chat.activate(true); mp.gui.chat.activate(true);
} }
else if (!globalData.InInput) { else if (!globalData.InMenu) {
globalData.InInput = true; globalData.InMenu = true;
ahelpBrowser = mp.browsers.new('package://assets/html/helpcommand/ahelp.html'); ahelpBrowser = mp.browsers.new('package://assets/html/helpcommand/ahelp.html');
mp.gui.chat.activate(false); mp.gui.chat.activate(false);
mp.gui.cursor.show(true, true); mp.gui.cursor.show(true, true);
@@ -30,10 +30,10 @@ export default function ahelp(globalData: IGlobalData): void {
if (ahelpBrowser == null) { if (ahelpBrowser == null) {
return; return;
} }
else if (globalData.InInput) { else if (globalData.InMenu) {
ahelpBrowser.destroy(); ahelpBrowser.destroy();
ahelpBrowser = null; ahelpBrowser = null;
globalData.InInput = false; globalData.InMenu = false;
mp.gui.cursor.show(false, false); mp.gui.cursor.show(false, false);
mp.gui.chat.activate(true); mp.gui.chat.activate(true);
} }
@@ -44,12 +44,12 @@ export default function ahelp(globalData: IGlobalData): void {
if (ahelpBrowser !== null) { if (ahelpBrowser !== null) {
ahelpBrowser.destroy(); ahelpBrowser.destroy();
ahelpBrowser = null; ahelpBrowser = null;
globalData.InInput = false; globalData.InMenu = false;
mp.gui.cursor.show(false, false); mp.gui.cursor.show(false, false);
mp.gui.chat.activate(true); mp.gui.chat.activate(true);
} }
else if (!globalData.InInput) { else if (!globalData.InMenu) {
globalData.InInput = true; globalData.InMenu = true;
ahelpBrowser = mp.browsers.new('package://assets/html/helpcommand/shelp.html'); ahelpBrowser = mp.browsers.new('package://assets/html/helpcommand/shelp.html');
mp.gui.chat.activate(false); mp.gui.chat.activate(false);
mp.gui.cursor.show(true, true); 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) => { menu.ItemSelect.on((item: NativeUI.UIMenuItem, index) => {
if (item === groupCreateItem) { // Gruppe if (item === groupCreateItem) { // Gruppe
globalData.InInput = true; globalData.InMenu = true;
var input = new InputHelper("Wie soll die Gruppe heißen?", globalData); var input = new InputHelper("Wie soll die Gruppe heißen?", globalData);
input.show(); input.show();
input.getValue((name: string) => { input.getValue((name: string) => {
mp.events.callRemote("CLIENT:CityHall_CreateGroup", name); mp.events.callRemote("CLIENT:CityHall_CreateGroup", name);
menu.Close(true); menu.Close(true);
globalData.InInput = false; globalData.InMenu = false;
}); });
} else if (item === cancelItem) { } else if (item === cancelItem) {
menu.Close(); menu.Close();

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

@@ -12,12 +12,12 @@ export default function Introduction(globalData: IGlobalData): void {
if (DrivingSchoolBrowser !== null) { if (DrivingSchoolBrowser !== null) {
DrivingSchoolBrowser.destroy(); DrivingSchoolBrowser.destroy();
DrivingSchoolBrowser = null; DrivingSchoolBrowser = null;
globalData.InInput = false; globalData.InMenu = false;
mp.gui.cursor.show(false, false); mp.gui.cursor.show(false, false);
mp.gui.chat.activate(true); mp.gui.chat.activate(true);
} }
else if (!globalData.InInput) { else if (!globalData.InMenu) {
globalData.InInput = true; globalData.InMenu = true;
DrivingSchoolBrowser = mp.browsers.new('package://assets/html/School/DrivingSchool.html'); DrivingSchoolBrowser = mp.browsers.new('package://assets/html/School/DrivingSchool.html');
mp.gui.chat.activate(false); mp.gui.chat.activate(false);
mp.gui.cursor.show(true, true); mp.gui.cursor.show(true, true);
@@ -28,10 +28,10 @@ export default function Introduction(globalData: IGlobalData): void {
if (DrivingSchoolBrowser == null) { if (DrivingSchoolBrowser == null) {
return; return;
} }
else if (globalData.InInput) { else if (globalData.InMenu) {
DrivingSchoolBrowser.destroy(); DrivingSchoolBrowser.destroy();
DrivingSchoolBrowser = null; DrivingSchoolBrowser = null;
globalData.InInput = false; globalData.InMenu = false;
mp.gui.cursor.show(false, false); mp.gui.cursor.show(false, false);
mp.gui.chat.activate(true); 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) { if (IntroductionBrowser !== null) {
IntroductionBrowser.destroy(); IntroductionBrowser.destroy();
IntroductionBrowser = null; IntroductionBrowser = null;
globalData.InInput = false; globalData.InMenu = false;
mp.gui.cursor.show(false, false); mp.gui.cursor.show(false, false);
mp.gui.chat.activate(true); mp.gui.chat.activate(true);
} }
else if (!globalData.InInput) { else if (!globalData.InMenu) {
globalData.InInput = true; globalData.InMenu = true;
IntroductionBrowser = mp.browsers.new('package://assets/html/Introduction/Introduction.html'); IntroductionBrowser = mp.browsers.new('package://assets/html/Introduction/Introduction.html');
mp.gui.chat.activate(false); mp.gui.chat.activate(false);
mp.gui.cursor.show(true, true); mp.gui.cursor.show(true, true);
@@ -31,10 +31,10 @@ export default function Introduction(globalData: IGlobalData): void {
if (IntroductionBrowser == null) { if (IntroductionBrowser == null) {
return; return;
} }
else if (globalData.InInput) { else if (globalData.InMenu) {
IntroductionBrowser.destroy(); IntroductionBrowser.destroy();
IntroductionBrowser = null; IntroductionBrowser = null;
globalData.InInput = false; globalData.InMenu = false;
mp.gui.cursor.show(false, false); mp.gui.cursor.show(false, false);
mp.gui.chat.activate(true); 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) { if (playerlistBrowser !== null) {
playerlistBrowser.destroy(); playerlistBrowser.destroy();
playerlistBrowser = null; playerlistBrowser = null;
globalData.InInput = false; globalData.InMenu = false;
mp.gui.cursor.show(false, false); mp.gui.cursor.show(false, false);
mp.gui.chat.activate(true); mp.gui.chat.activate(true);
} }
else if (!globalData.InInput) { else if (!globalData.InMenu) {
globalData.InInput = true; globalData.InMenu = true;
playerlistBrowser = mp.browsers.new('package://assets/html/Playerlist/Tabliste.html'); playerlistBrowser = mp.browsers.new('package://assets/html/Playerlist/Tabliste.html');
mp.gui.chat.activate(false); mp.gui.chat.activate(false);
mp.gui.cursor.show(true, true); 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.destroy();
browser = null; browser = null;
} }
globalData.InInput = false; globalData.InMenu = false;
}); });
function myTimer() { function myTimer() {

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

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

42
ReallifeGamemode.Client/Interaction/bankmenu.ts
View File

@@ -67,46 +67,46 @@ export default function bankMenuHandle(globalData: IGlobalData) {
mp.gui.chat.activate(true); mp.gui.chat.activate(true);
mp.gui.cursor.show(true, true); mp.gui.cursor.show(true, true);
globalData.InMenu = false; globalData.InMenu = false;
globalData.InInput = true; globalData.InMenu = true;
var input = new InputHelper("Wie viel möchtest du einzahlen?", globalData); var input = new InputHelper("Wie viel möchtest du einzahlen?", globalData);
input.show(); input.show();
input.getValue(amount => { input.getValue(amount => {
mp.events.callRemote("CLIENT:payIn", amount); mp.events.callRemote("CLIENT:payIn", amount);
mp.gui.cursor.show(false, false); mp.gui.cursor.show(false, false);
bankmenu.Close(true); bankmenu.Close(true);
globalData.InInput = false; globalData.InMenu = false;
}); });
}else if (item.Text === "Auszahlen") { }else if (item.Text === "Auszahlen") {
mp.gui.chat.activate(true); mp.gui.chat.activate(true);
mp.gui.cursor.show(true, true); mp.gui.cursor.show(true, true);
globalData.InMenu = false; globalData.InMenu = false;
globalData.InInput = true; globalData.InMenu = true;
var input = new InputHelper("Wie viel möchtest du Auszahlen?", globalData); var input = new InputHelper("Wie viel möchtest du Auszahlen?", globalData);
input.show(); input.show();
input.getValue(amount => { input.getValue(amount => {
mp.events.callRemote("CLIENT:payOut", amount); mp.events.callRemote("CLIENT:payOut", amount);
mp.gui.cursor.show(false, false); mp.gui.cursor.show(false, false);
bankmenu.Close(true); bankmenu.Close(true);
globalData.InInput = false; globalData.InMenu = false;
}); });
} else if (item.Text === "Überweisen" ) { } else if (item.Text === "Überweisen" ) {
mp.gui.chat.activate(true); mp.gui.chat.activate(true);
mp.gui.cursor.show(true, true); mp.gui.cursor.show(true, true);
globalData.InMenu = false; globalData.InMenu = false;
globalData.InInput = true; globalData.InMenu = true;
var input = new InputHelper("Wem möchtest du Geld überweisen? (Name/ID)", globalData); var input = new InputHelper("Wem möchtest du Geld überweisen? (Name/ID)", globalData);
input.show(); input.show();
input.getValue(name => { input.getValue(name => {
mp.events.call("CLIENT:bank_name", name); mp.events.call("CLIENT:bank_name", name);
mp.gui.cursor.show(false, false); mp.gui.cursor.show(false, false);
bankmenu.Close(true); bankmenu.Close(true);
globalData.InInput = false; globalData.InMenu = false;
}); });
} else if (item.Text === "Schließen") { } else if (item.Text === "Schließen") {
mp.gui.cursor.show(false, false); mp.gui.cursor.show(false, false);
bankmenu.Close(true); bankmenu.Close(true);
globalData.InInput = false; globalData.InMenu = false;
} }
}); });
@@ -119,19 +119,19 @@ export default function bankMenuHandle(globalData: IGlobalData) {
mp.events.add('removeBankmenu', () => { mp.events.add('removeBankmenu', () => {
mp.gui.cursor.show(false, false); mp.gui.cursor.show(false, false);
bankmenu.Close(true); bankmenu.Close(true);
globalData.InInput = false; globalData.InMenu = false;
}); });
mp.events.add("CLIENT:bank_name", (name) => { mp.events.add("CLIENT:bank_name", (name) => {
paymentname = name; paymentname = name;
globalData.InInput = true; globalData.InMenu = true;
var input = new InputHelper("Wie viel möchtest du Überweisen??", globalData); var input = new InputHelper("Wie viel möchtest du Überweisen??", globalData);
mp.gui.cursor.show(true, true); mp.gui.cursor.show(true, true);
input.show(); input.show();
input.getValue(amount => { input.getValue(amount => {
mp.events.callRemote("CLIENT:payment", JSON.stringify(paymentname), amount); mp.events.callRemote("CLIENT:payment", JSON.stringify(paymentname), amount);
mp.gui.cursor.show(false, false); mp.gui.cursor.show(false, false);
globalData.InInput = false; globalData.InMenu = false;
}); });
}); });
@@ -139,7 +139,7 @@ export default function bankMenuHandle(globalData: IGlobalData) {
mp.events.add('removeFactionBankmenu', () => { mp.events.add('removeFactionBankmenu', () => {
mp.gui.cursor.show(false, false); mp.gui.cursor.show(false, false);
factionBankmenu.Close(true); factionBankmenu.Close(true);
globalData.InInput = false; globalData.InMenu = false;
}); });
@@ -161,19 +161,19 @@ export default function bankMenuHandle(globalData: IGlobalData) {
mp.gui.chat.activate(true); mp.gui.chat.activate(true);
mp.gui.cursor.show(true, true); mp.gui.cursor.show(true, true);
globalData.InMenu = false; globalData.InMenu = false;
globalData.InInput = true; globalData.InMenu = true;
var input = new InputHelper("Wie viel möchtest du einzahlen?", globalData); var input = new InputHelper("Wie viel möchtest du einzahlen?", globalData);
input.show(); input.show();
input.getValue(amount => { input.getValue(amount => {
mp.events.callRemote("CLIENT:factionPayIn", amount); mp.events.callRemote("CLIENT:factionPayIn", amount);
mp.gui.cursor.show(false, false); mp.gui.cursor.show(false, false);
factionBankmenu.Close(true); factionBankmenu.Close(true);
globalData.InInput = false; globalData.InMenu = false;
}); });
}else if (item.Text === "Schließen") { }else if (item.Text === "Schließen") {
mp.gui.cursor.show(false, false); mp.gui.cursor.show(false, false);
factionBankmenu.Close(true); factionBankmenu.Close(true);
globalData.InInput = false; globalData.InMenu = false;
} }
}); });
@@ -201,32 +201,32 @@ export default function bankMenuHandle(globalData: IGlobalData) {
mp.gui.chat.activate(true); mp.gui.chat.activate(true);
mp.gui.cursor.show(true, true); mp.gui.cursor.show(true, true);
globalData.InMenu = false; globalData.InMenu = false;
globalData.InInput = true; globalData.InMenu = true;
var input = new InputHelper("Wie viel möchtest du einzahlen?", globalData); var input = new InputHelper("Wie viel möchtest du einzahlen?", globalData);
input.show(); input.show();
input.getValue(amount => { input.getValue(amount => {
mp.events.callRemote("CLIENT:factionPayIn", amount); mp.events.callRemote("CLIENT:factionPayIn", amount);
mp.gui.cursor.show(false, false); mp.gui.cursor.show(false, false);
factionBankmenu.Close(true); factionBankmenu.Close(true);
globalData.InInput = false; globalData.InMenu = false;
}); });
}else if (item.Text === "Überweisen") { }else if (item.Text === "Überweisen") {
mp.gui.chat.activate(true); mp.gui.chat.activate(true);
mp.gui.cursor.show(true, true); mp.gui.cursor.show(true, true);
globalData.InMenu = false; globalData.InMenu = false;
globalData.InInput = true; globalData.InMenu = true;
var input = new InputHelper("Wem möchtest du Geld überweisen? (Name/ID)", globalData); var input = new InputHelper("Wem möchtest du Geld überweisen? (Name/ID)", globalData);
input.show(); input.show();
input.getValue(name => { input.getValue(name => {
mp.events.call("CLIENT:bank_factionname", name); mp.events.call("CLIENT:bank_factionname", name);
mp.gui.cursor.show(false, false); mp.gui.cursor.show(false, false);
factionBankmenu.Close(true); factionBankmenu.Close(true);
globalData.InInput = false; globalData.InMenu = false;
}); });
}else if (item.Text === "Schließen") { }else if (item.Text === "Schließen") {
mp.gui.cursor.show(false, false); mp.gui.cursor.show(false, false);
factionBankmenu.Close(true); factionBankmenu.Close(true);
globalData.InInput = false; globalData.InMenu = false;
} }
}); });
@@ -238,14 +238,14 @@ export default function bankMenuHandle(globalData: IGlobalData) {
mp.events.add("CLIENT:bank_factionname", (name) => { mp.events.add("CLIENT:bank_factionname", (name) => {
paymentname = name; paymentname = name;
globalData.InInput = true; globalData.InMenu = true;
var input = new InputHelper("Wie viel möchtest du Überweisen?", globalData); var input = new InputHelper("Wie viel möchtest du Überweisen?", globalData);
mp.gui.cursor.show(true, true); mp.gui.cursor.show(true, true);
input.show(); input.show();
input.getValue(amount => { input.getValue(amount => {
mp.events.callRemote("CLIENT:factionPayment", JSON.stringify(paymentname), amount); mp.events.callRemote("CLIENT:factionPayment", JSON.stringify(paymentname), amount);
mp.gui.cursor.show(false, false); mp.gui.cursor.show(false, false);
globalData.InInput = false; globalData.InMenu = false;
}); });
}); });

30
ReallifeGamemode.Client/Interaction/factioninteraction.ts
View File

@@ -88,13 +88,13 @@ export default function factionInteraction(globalData: IGlobalData) {
mp.gui.chat.activate(true); mp.gui.chat.activate(true);
mp.gui.cursor.show(true, true); mp.gui.cursor.show(true, true);
globalData.InMenu = false; globalData.InMenu = false;
globalData.InInput = true; globalData.InMenu = true;
var input = new InputHelper("Welchem Spieler möchtest du ein Ticket geben (Name / ID)?", globalData); var input = new InputHelper("Welchem Spieler möchtest du ein Ticket geben (Name / ID)?", globalData);
input.show(); input.show();
input.getValue(name => { input.getValue(name => {
mp.events.call("CLIENT:InteractionMenu_LSPD_Ticket", name); mp.events.call("CLIENT:InteractionMenu_LSPD_Ticket", name);
mp.gui.cursor.show(false, false); mp.gui.cursor.show(false, false);
globalData.InInput = false; globalData.InMenu = false;
}); });
break; break;
case pointsTaskMenuLSPD: case pointsTaskMenuLSPD:
@@ -102,12 +102,12 @@ export default function factionInteraction(globalData: IGlobalData) {
mp.gui.chat.activate(true); mp.gui.chat.activate(true);
mp.gui.cursor.show(true, true); mp.gui.cursor.show(true, true);
globalData.InMenu = false; globalData.InMenu = false;
globalData.InInput = true; globalData.InMenu = true;
var input = new InputHelper("Welchem Spieler möchtest du Strafpunkte geben (Name / ID)?", globalData); var input = new InputHelper("Welchem Spieler möchtest du Strafpunkte geben (Name / ID)?", globalData);
input.show(); input.show();
input.getValue(name => { input.getValue(name => {
mp.events.call("CLIENT:InteractionMenu_LSPD_Points", name); mp.events.call("CLIENT:InteractionMenu_LSPD_Points", name);
globalData.InInput = false; globalData.InMenu = false;
}); });
break break
case wantedsMenuLSPD: case wantedsMenuLSPD:
@@ -128,24 +128,24 @@ export default function factionInteraction(globalData: IGlobalData) {
}); });
mp.events.add("CLIENT:InteractionMenu_LSPD_Ticket", (name) => { mp.events.add("CLIENT:InteractionMenu_LSPD_Ticket", (name) => {
ticketName = name; ticketName = name;
globalData.InInput = true; globalData.InMenu = true;
var input = new InputHelper("Wie hoch soll der Ticketbetrag sein ?", globalData); var input = new InputHelper("Wie hoch soll der Ticketbetrag sein ?", globalData);
mp.gui.cursor.show(true, true); mp.gui.cursor.show(true, true);
input.show(); input.show();
input.getValue(amount => { input.getValue(amount => {
globalData.InInput = false; globalData.InMenu = false;
mp.events.call("CLIENT:InteractionMenu_LSPD_Ticket2", amount); mp.events.call("CLIENT:InteractionMenu_LSPD_Ticket2", amount);
mp.gui.cursor.show(false, false); mp.gui.cursor.show(false, false);
}); });
}); });
mp.events.add("CLIENT:InteractionMenu_LSPD_Ticket2", (ticketPrice) => { mp.events.add("CLIENT:InteractionMenu_LSPD_Ticket2", (ticketPrice) => {
globalData.InInput = true; globalData.InMenu = true;
var input = new InputHelper("Um welches Vergehen handelt es sich ?", globalData); var input = new InputHelper("Um welches Vergehen handelt es sich ?", globalData);
mp.gui.cursor.show(true, true); mp.gui.cursor.show(true, true);
input.show(); input.show();
input.getValue(ticketReason => { input.getValue(ticketReason => {
globalData.InInput = false; globalData.InMenu = false;
mp.events.callRemote("CLIENT:InteractionMenu_LSPD_Ticket3", JSON.stringify(ticketName), ticketPrice, JSON.stringify(ticketReason)); mp.events.callRemote("CLIENT:InteractionMenu_LSPD_Ticket3", JSON.stringify(ticketName), ticketPrice, JSON.stringify(ticketReason));
mp.gui.cursor.show(false, false); mp.gui.cursor.show(false, false);
}); });
@@ -153,12 +153,12 @@ export default function factionInteraction(globalData: IGlobalData) {
mp.events.add("CLIENT:InteractionMenu_LSPD_Points", (name) => { mp.events.add("CLIENT:InteractionMenu_LSPD_Points", (name) => {
pointsName = name; pointsName = name;
globalData.InInput = true; globalData.InMenu = true;
var input = new InputHelper("Wieviele Punkte werden vergeben ?", globalData); var input = new InputHelper("Wieviele Punkte werden vergeben ?", globalData);
mp.gui.cursor.show(true, true); mp.gui.cursor.show(true, true);
input.show(); input.show();
input.getValue(amount => { input.getValue(amount => {
globalData.InInput = false; globalData.InMenu = false;
mp.events.call("CLIENT:InteractionMenu_LSPD_Points2", amount); mp.events.call("CLIENT:InteractionMenu_LSPD_Points2", amount);
mp.gui.cursor.show(false, false); mp.gui.cursor.show(false, false);
}); });
@@ -182,12 +182,12 @@ export default function factionInteraction(globalData: IGlobalData) {
if (wantedlistBrowser !== null) { if (wantedlistBrowser !== null) {
wantedlistBrowser.destroy(); wantedlistBrowser.destroy();
wantedlistBrowser = null; wantedlistBrowser = null;
globalData.InInput = false; globalData.InMenu = false;
mp.gui.cursor.show(false, false); mp.gui.cursor.show(false, false);
mp.gui.chat.activate(true); mp.gui.chat.activate(true);
} }
else if (!globalData.InInput) { else if (!globalData.InMenu) {
globalData.InInput = true; globalData.InMenu = true;
wantedlistBrowser = mp.browsers.new('package://assets/html/Wantedlist/wanteds.html'); wantedlistBrowser = mp.browsers.new('package://assets/html/Wantedlist/wanteds.html');
mp.gui.chat.activate(false); mp.gui.chat.activate(false);
mp.gui.cursor.show(true, true); mp.gui.cursor.show(true, true);
@@ -203,10 +203,10 @@ export default function factionInteraction(globalData: IGlobalData) {
if (wantedlistBrowser == null) { if (wantedlistBrowser == null) {
return; return;
} }
else if (globalData.InInput) { else if (globalData.InMenu) {
wantedlistBrowser.destroy(); wantedlistBrowser.destroy();
wantedlistBrowser = null; wantedlistBrowser = null;
globalData.InInput = false; globalData.InMenu = false;
mp.gui.cursor.show(false, false); mp.gui.cursor.show(false, false);
mp.gui.chat.activate(true); mp.gui.chat.activate(true);
} }

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

@@ -170,20 +170,20 @@ export default function (globalData: IGlobalData) {
mp.gui.chat.activate(true); mp.gui.chat.activate(true);
mp.gui.cursor.show(true, true); mp.gui.cursor.show(true, true);
globalData.InMenu = false; globalData.InMenu = false;
globalData.InInput = true; globalData.InMenu = true;
var input = new InputHelper("Welchem Spieler möchtest du Geld geben (Name / ID)?", globalData); var input = new InputHelper("Welchem Spieler möchtest du Geld geben (Name / ID)?", globalData);
input.show(); input.show();
input.getValue(name => { input.getValue(name => {
mp.events.call("CLIENT:InteractionMenu_Pay_Name", name); mp.events.call("CLIENT:InteractionMenu_Pay_Name", name);
mp.gui.cursor.show(false, false); mp.gui.cursor.show(false, false);
menu.Close(true); menu.Close(true);
globalData.InInput = false; globalData.InMenu = false;
}); });
} else if (item == HouseItem) { } else if (item == HouseItem) {
mp.events.callRemote("CLIENT:InteractionMenu_FindHouse"); mp.events.callRemote("CLIENT:InteractionMenu_FindHouse");
mp.gui.cursor.show(false, false); mp.gui.cursor.show(false, false);
menu.Close(true); menu.Close(true);
globalData.InInput = false; globalData.InMenu = false;
} }
}); });
@@ -289,13 +289,13 @@ export default function (globalData: IGlobalData) {
licenseMenu.ItemSelect.on((item, index) => { licenseMenu.ItemSelect.on((item, index) => {
if (item === showItem) { if (item === showItem) {
globalData.InInput = true; globalData.InMenu = true;
var input = new InputHelper("Welchen Spieler möchtest du deine Lizenzen zeigen (Name / ID)?", globalData); var input = new InputHelper("Welchen Spieler möchtest du deine Lizenzen zeigen (Name / ID)?", globalData);
input.show(); input.show();
input.getValue(name => { input.getValue(name => {
mp.events.callRemote("CLIENT:InteractionMenu_Show", "License", name); mp.events.callRemote("CLIENT:InteractionMenu_Show", "License", name);
parentMenu.Close(true); parentMenu.Close(true);
globalData.InInput = false; globalData.InMenu = false;
}); });
} }
@@ -336,22 +336,22 @@ export default function (globalData: IGlobalData) {
factionMenu.ItemSelect.on((item, index) => { factionMenu.ItemSelect.on((item, index) => {
if (index === 0) { // Inviten if (index === 0) { // Inviten
globalData.InInput = true; globalData.InMenu = true;
var input = new InputHelper("Welchen Spieler möchtest du inviten (Name / ID)?", globalData); var input = new InputHelper("Welchen Spieler möchtest du inviten (Name / ID)?", globalData);
input.show(); input.show();
input.getValue(name => { input.getValue(name => {
mp.events.callRemote("CLIENT:InteractionMenu_Invite", "Fraktion", name); mp.events.callRemote("CLIENT:InteractionMenu_Invite", "Fraktion", name);
factionMenu.Close(); factionMenu.Close();
globalData.InInput = false; globalData.InMenu = false;
}); });
} else if (index === 1) { // Uninviten } else if (index === 1) { // Uninviten
globalData.InInput == true; globalData.InMenu == true;
var input = new InputHelper("Welchen Spieler möchtest du uninviten (Name / ID)?", globalData); var input = new InputHelper("Welchen Spieler möchtest du uninviten (Name / ID)?", globalData);
input.show(); input.show();
input.getValue(name => { input.getValue(name => {
mp.events.callRemote("CLIENT:InteractionMenu_Uninvite", "Fraktion", name); mp.events.callRemote("CLIENT:InteractionMenu_Uninvite", "Fraktion", name);
factionMenu.Close(); factionMenu.Close();
globalData.InInput = false; globalData.InMenu = false;
}); });
} }
}); });
@@ -372,24 +372,24 @@ export default function (globalData: IGlobalData) {
groupMenu.ItemSelect.on((item, index) => { groupMenu.ItemSelect.on((item, index) => {
switch (index) { switch (index) {
case 0: //Spieler inviten case 0: //Spieler inviten
globalData.InInput = true; globalData.InMenu = true;
var input = new InputHelper("Welchen Spieler möchtest du inviten (Name / ID)?", globalData); var input = new InputHelper("Welchen Spieler möchtest du inviten (Name / ID)?", globalData);
input.show(); input.show();
input.getValue(name => { input.getValue(name => {
mp.events.callRemote("CLIENT:InteractionMenu_Invite", "Gruppe", name); mp.events.callRemote("CLIENT:InteractionMenu_Invite", "Gruppe", name);
parentMenu.Close(); parentMenu.Close();
globalData.InInput = false; globalData.InMenu = false;
}); });
break; break;
case 1: //Spieler uninviten case 1: //Spieler uninviten
globalData.InInput == true; globalData.InMenu == true;
var input = new InputHelper("Welchen Spieler möchtest du uninviten (Name / ID)?", globalData); var input = new InputHelper("Welchen Spieler möchtest du uninviten (Name / ID)?", globalData);
input.show(); input.show();
input.getValue(name => { input.getValue(name => {
mp.events.callRemote("CLIENT:InteractionMenu_Uninvite", "Gruppe", name); mp.events.callRemote("CLIENT:InteractionMenu_Uninvite", "Gruppe", name);
parentMenu.Close(); parentMenu.Close();
globalData.InInput = false; globalData.InMenu = false;
}); });
break; break;
@@ -398,13 +398,13 @@ export default function (globalData: IGlobalData) {
break; break;
case 3: //Neuen (zusätzlichen) Gruppenleiter bestimmen case 3: //Neuen (zusätzlichen) Gruppenleiter bestimmen
globalData.InInput = true; globalData.InMenu = true;
var input = new InputHelper("Welchen Spieler soll Manager werden (Name)? ", globalData); var input = new InputHelper("Welchen Spieler soll Manager werden (Name)? ", globalData);
input.show(); input.show();
input.getValue(name => { input.getValue(name => {
mp.events.callRemote("CLIENT:InteractionMenu_MakeLeader", "Gruppe", name); mp.events.callRemote("CLIENT:InteractionMenu_MakeLeader", "Gruppe", name);
parentMenu.Close(); parentMenu.Close();
globalData.InInput = false; globalData.InMenu = false;
}); });
break; break;
@@ -534,14 +534,14 @@ export default function (globalData: IGlobalData) {
mp.events.add("CLIENT:InteractionMenu_Pay_Name", (name) => { mp.events.add("CLIENT:InteractionMenu_Pay_Name", (name) => {
payName = name; payName = name;
globalData.InInput = true; globalData.InMenu = true;
var input = new InputHelper("Wie viel?", globalData); var input = new InputHelper("Wie viel?", globalData);
mp.gui.cursor.show(true, true); mp.gui.cursor.show(true, true);
input.show(); input.show();
input.getValue(amount => { input.getValue(amount => {
mp.events.callRemote("CLIENT:InteractionMenu_Pay", JSON.stringify(payName), amount); mp.events.callRemote("CLIENT:InteractionMenu_Pay", JSON.stringify(payName), amount);
mp.gui.cursor.show(false, false); mp.gui.cursor.show(false, false);
globalData.InInput = false; globalData.InMenu = false;
}); });
}); });
} }

4
ReallifeGamemode.Client/Login/main.ts
View File

@@ -18,7 +18,7 @@ export default function (globalData: IGlobalData): void {
mp.game.ui.displayHud(false); mp.game.ui.displayHud(false);
mp.game.ui.displayRadar(false); mp.game.ui.displayRadar(false);
globalData.InInput = true; globalData.InMenu = true;
globalData.InMenu = true; globalData.InMenu = true;
disableLightMode = disableLight; disableLightMode = disableLight;
@@ -65,7 +65,7 @@ export default function (globalData: IGlobalData): void {
mp.game.ui.displayRadar(true); mp.game.ui.displayRadar(true);
globalData.LoggedIn = true; globalData.LoggedIn = true;
globalData.InInput = false; globalData.InMenu = false;
globalData.InMenu = false; globalData.InMenu = false;
loginCam.setActive(false); loginCam.setActive(false);
mp.game.cam.renderScriptCams(false, false, 0, true, false); mp.game.cam.renderScriptCams(false, false, 0, true, false);

4
ReallifeGamemode.Client/Player/keys.ts
View File

@@ -112,7 +112,7 @@ export default function keys(globalData: IGlobalData) {
//M (Interaktionsmenü) //M (Interaktionsmenü)
mp.keys.bind(0x4D, false, function () { mp.keys.bind(0x4D, false, function () {
if (!globalData.InChat && !showInv && !globalData.InMenu && !globalData.InInput && !globalData.InTuning) { if (!globalData.InChat && !showInv && !globalData.InMenu && !globalData.InMenu && !globalData.InTuning) {
mp.events.callRemote("keyPress:M"); mp.events.callRemote("keyPress:M");
} }
}); });
@@ -142,7 +142,7 @@ export default function keys(globalData: IGlobalData) {
//J // Job Starten //J // Job Starten
mp.keys.bind(0x4A, false, () => { mp.keys.bind(0x4A, false, () => {
if (!globalData.InChat && !globalData.InInput && !globalData.InMenu && globalData.LoggedIn) { if (!globalData.InChat && !globalData.InMenu && !globalData.InMenu && globalData.LoggedIn) {
mp.events.callRemote("CLIENT:JobManager_ShowJobMenu"); mp.events.callRemote("CLIENT:JobManager_ShowJobMenu");
} }
}); });

2
ReallifeGamemode.Client/Player/reportmenu.ts
View File

@@ -107,7 +107,7 @@ export default function reportList(globalData: IGlobalData) {
reportMenu.ItemSelect.on((item) => { reportMenu.ItemSelect.on((item) => {
if (item.Text === "Absenden") { if (item.Text === "Absenden") {
globalData.InInput = true; globalData.InMenu = true;
var ticketContentBox = new InputHelper("Worin besteht dein Anliegen?", globalData); var ticketContentBox = new InputHelper("Worin besteht dein Anliegen?", globalData);
ticketContentBox.show(); ticketContentBox.show();
ticketContentBox.getValue(data => { ticketContentBox.getValue(data => {

1
ReallifeGamemode.Client/global.d.ts vendored
View File

@@ -4,7 +4,6 @@
InMenu: boolean, InMenu: boolean,
InChat: boolean, InChat: boolean,
LoggedIn: boolean, LoggedIn: boolean,
InInput: boolean
} }
declare type AccountData = { declare type AccountData = {

1
ReallifeGamemode.Client/index.ts
View File

@@ -15,7 +15,6 @@ let globalData: IGlobalData = {
HideGui: false, HideGui: false,
InChat: false, InChat: false,
LoggedIn: false, LoggedIn: false,
InInput: false,
get InMenu(): boolean { get InMenu(): boolean {
return inMenu; return inMenu;

10
ReallifeGamemode.Client/inventory/inventory.ts
View File

@@ -15,13 +15,13 @@
if (invBrowser !== null) { if (invBrowser !== null) {
invBrowser.destroy() invBrowser.destroy()
invBrowser = null; invBrowser = null;
globalData.InInput = false; globalData.InMenu = false;
loaded = false; loaded = false;
mp.gui.cursor.show(false, false); mp.gui.cursor.show(false, false);
return; return;
} }
if (!globalData.InInput) { if (!globalData.InMenu) {
globalData.InInput = true; globalData.InMenu = true;
mp.gui.cursor.show(true, true); mp.gui.cursor.show(true, true);
itemArr = []; itemArr = [];
vehItemArr = []; vehItemArr = [];
@@ -36,7 +36,7 @@
var tradeItemWeight; var tradeItemWeight;
mp.events.add('openInventory', () => { mp.events.add('openInventory', () => {
globalData.InInput = true; globalData.InMenu = true;
mp.gui.cursor.show(true, true); mp.gui.cursor.show(true, true);
itemArr = []; itemArr = [];
vehItemArr = []; vehItemArr = [];
@@ -45,7 +45,7 @@
mp.events.add('closeInventory', () => { mp.events.add('closeInventory', () => {
invBrowser.destroy() invBrowser.destroy()
invBrowser = null; invBrowser = null;
globalData.InInput = false; globalData.InMenu = false;
loaded = false; loaded = false;
mp.gui.cursor.show(false, false); mp.gui.cursor.show(false, false);
return; return;

2
ReallifeGamemode.Client/util/drivingschool.ts
View File

@@ -116,7 +116,7 @@ export default function drivingSchoolHandle(globalData: IGlobalData) {
}; };
function keyPressHandler() { function keyPressHandler() {
if (globalData.InChat || globalData.InInput || globalData.InMenu) return; if (globalData.InChat || globalData.InMenu || globalData.InMenu) return;
mp.events.call('removeDrivingSchoolMenu', false); mp.events.call('removeDrivingSchoolMenu', false);
mp.events.call('showDrivingSchoolSelector'); mp.events.call('showDrivingSchoolSelector');

2
ReallifeGamemode.Client/util/planeschool.ts
View File

@@ -62,7 +62,7 @@ export default function planeSchoolHandle(globalData: IGlobalData) {
}; };
function keyPressHandler() { function keyPressHandler() {
if (globalData.InChat || globalData.InInput || globalData.InMenu) return; if (globalData.InChat || globalData.InMenu || globalData.InMenu) return;
mp.events.call('removeplaneSchoolMenu', false); mp.events.call('removeplaneSchoolMenu', false);
mp.events.callRemote('startplaneSchool'); mp.events.callRemote('startplaneSchool');