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

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.cursor.show(true, true);
globalData.InMenu = false;
globalData.InInput = true;
globalData.InMenu = true;
var input = new InputHelper("Wie viel möchtest du einzahlen?", globalData);
input.show();
input.getValue(amount => {
mp.events.callRemote("CLIENT:payIn", amount);
mp.gui.cursor.show(false, false);
bankmenu.Close(true);
globalData.InInput = false;
globalData.InMenu = false;
});
}else if (item.Text === "Auszahlen") {
mp.gui.chat.activate(true);
mp.gui.cursor.show(true, true);
globalData.InMenu = false;
globalData.InInput = true;
globalData.InMenu = true;
var input = new InputHelper("Wie viel möchtest du Auszahlen?", globalData);
input.show();
input.getValue(amount => {
mp.events.callRemote("CLIENT:payOut", amount);
mp.gui.cursor.show(false, false);
bankmenu.Close(true);
globalData.InInput = false;
globalData.InMenu = false;
});
} else if (item.Text === "Überweisen" ) {
mp.gui.chat.activate(true);
mp.gui.cursor.show(true, true);
globalData.InMenu = false;
globalData.InInput = true;
globalData.InMenu = true;
var input = new InputHelper("Wem möchtest du Geld überweisen? (Name/ID)", globalData);
input.show();
input.getValue(name => {
mp.events.call("CLIENT:bank_name", name);
mp.gui.cursor.show(false, false);
bankmenu.Close(true);
globalData.InInput = false;
globalData.InMenu = false;
});
} else if (item.Text === "Schließen") {
mp.gui.cursor.show(false, false);
bankmenu.Close(true);
globalData.InInput = false;
globalData.InMenu = false;
}
});
@@ -119,19 +119,19 @@ export default function bankMenuHandle(globalData: IGlobalData) {
mp.events.add('removeBankmenu', () => {
mp.gui.cursor.show(false, false);
bankmenu.Close(true);
globalData.InInput = false;
globalData.InMenu = false;
});
mp.events.add("CLIENT:bank_name", (name) => {
paymentname = name;
globalData.InInput = true;
globalData.InMenu = true;
var input = new InputHelper("Wie viel möchtest du Überweisen??", globalData);
mp.gui.cursor.show(true, true);
input.show();
input.getValue(amount => {
mp.events.callRemote("CLIENT:payment", JSON.stringify(paymentname), amount);
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.gui.cursor.show(false, false);
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.cursor.show(true, true);
globalData.InMenu = false;
globalData.InInput = true;
globalData.InMenu = true;
var input = new InputHelper("Wie viel möchtest du einzahlen?", globalData);
input.show();
input.getValue(amount => {
mp.events.callRemote("CLIENT:factionPayIn", amount);
mp.gui.cursor.show(false, false);
factionBankmenu.Close(true);
globalData.InInput = false;
globalData.InMenu = false;
});
}else if (item.Text === "Schließen") {
mp.gui.cursor.show(false, false);
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.cursor.show(true, true);
globalData.InMenu = false;
globalData.InInput = true;
globalData.InMenu = true;
var input = new InputHelper("Wie viel möchtest du einzahlen?", globalData);
input.show();
input.getValue(amount => {
mp.events.callRemote("CLIENT:factionPayIn", amount);
mp.gui.cursor.show(false, false);
factionBankmenu.Close(true);
globalData.InInput = false;
globalData.InMenu = false;
});
}else if (item.Text === "Überweisen") {
mp.gui.chat.activate(true);
mp.gui.cursor.show(true, true);
globalData.InMenu = false;
globalData.InInput = true;
globalData.InMenu = true;
var input = new InputHelper("Wem möchtest du Geld überweisen? (Name/ID)", globalData);
input.show();
input.getValue(name => {
mp.events.call("CLIENT:bank_factionname", name);
mp.gui.cursor.show(false, false);
factionBankmenu.Close(true);
globalData.InInput = false;
globalData.InMenu = false;
});
}else if (item.Text === "Schließen") {
mp.gui.cursor.show(false, false);
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) => {
paymentname = name;
globalData.InInput = true;
globalData.InMenu = true;
var input = new InputHelper("Wie viel möchtest du Überweisen?", globalData);
mp.gui.cursor.show(true, true);
input.show();
input.getValue(amount => {
mp.events.callRemote("CLIENT:factionPayment", JSON.stringify(paymentname), amount);
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.cursor.show(true, true);
globalData.InMenu = false;
globalData.InInput = true;
globalData.InMenu = true;
var input = new InputHelper("Welchem Spieler möchtest du ein Ticket geben (Name / ID)?", globalData);
input.show();
input.getValue(name => {
mp.events.call("CLIENT:InteractionMenu_LSPD_Ticket", name);
mp.gui.cursor.show(false, false);
globalData.InInput = false;
globalData.InMenu = false;
});
break;
case pointsTaskMenuLSPD:
@@ -102,12 +102,12 @@ export default function factionInteraction(globalData: IGlobalData) {
mp.gui.chat.activate(true);
mp.gui.cursor.show(true, true);
globalData.InMenu = false;
globalData.InInput = true;
globalData.InMenu = true;
var input = new InputHelper("Welchem Spieler möchtest du Strafpunkte geben (Name / ID)?", globalData);
input.show();
input.getValue(name => {
mp.events.call("CLIENT:InteractionMenu_LSPD_Points", name);
globalData.InInput = false;
globalData.InMenu = false;
});
break
case wantedsMenuLSPD:
@@ -128,24 +128,24 @@ export default function factionInteraction(globalData: IGlobalData) {
});
mp.events.add("CLIENT:InteractionMenu_LSPD_Ticket", (name) => {
ticketName = name;
globalData.InInput = true;
globalData.InMenu = true;
var input = new InputHelper("Wie hoch soll der Ticketbetrag sein ?", globalData);
mp.gui.cursor.show(true, true);
input.show();
input.getValue(amount => {
globalData.InInput = false;
globalData.InMenu = false;
mp.events.call("CLIENT:InteractionMenu_LSPD_Ticket2", amount);
mp.gui.cursor.show(false, false);
});
});
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);
mp.gui.cursor.show(true, true);
input.show();
input.getValue(ticketReason => {
globalData.InInput = false;
globalData.InMenu = false;
mp.events.callRemote("CLIENT:InteractionMenu_LSPD_Ticket3", JSON.stringify(ticketName), ticketPrice, JSON.stringify(ticketReason));
mp.gui.cursor.show(false, false);
});
@@ -153,12 +153,12 @@ export default function factionInteraction(globalData: IGlobalData) {
mp.events.add("CLIENT:InteractionMenu_LSPD_Points", (name) => {
pointsName = name;
globalData.InInput = true;
globalData.InMenu = true;
var input = new InputHelper("Wieviele Punkte werden vergeben ?", globalData);
mp.gui.cursor.show(true, true);
input.show();
input.getValue(amount => {
globalData.InInput = false;
globalData.InMenu = false;
mp.events.call("CLIENT:InteractionMenu_LSPD_Points2", amount);
mp.gui.cursor.show(false, false);
});
@@ -182,12 +182,12 @@ export default function factionInteraction(globalData: IGlobalData) {
if (wantedlistBrowser !== null) {
wantedlistBrowser.destroy();
wantedlistBrowser = 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;
wantedlistBrowser = mp.browsers.new('package://assets/html/Wantedlist/wanteds.html');
mp.gui.chat.activate(false);
mp.gui.cursor.show(true, true);
@@ -203,10 +203,10 @@ export default function factionInteraction(globalData: IGlobalData) {
if (wantedlistBrowser == null) {
return;
}
else if (globalData.InInput) {
else if (globalData.InMenu) {
wantedlistBrowser.destroy();
wantedlistBrowser = null;
globalData.InInput = false;
globalData.InMenu = false;
mp.gui.cursor.show(false, false);
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.cursor.show(true, true);
globalData.InMenu = false;
globalData.InInput = true;
globalData.InMenu = true;
var input = new InputHelper("Welchem Spieler möchtest du Geld geben (Name / ID)?", globalData);
input.show();
input.getValue(name => {
mp.events.call("CLIENT:InteractionMenu_Pay_Name", name);
mp.gui.cursor.show(false, false);
menu.Close(true);
globalData.InInput = false;
globalData.InMenu = false;
});
} else if (item == HouseItem) {
mp.events.callRemote("CLIENT:InteractionMenu_FindHouse");
mp.gui.cursor.show(false, false);
menu.Close(true);
globalData.InInput = false;
globalData.InMenu = false;
}
});
@@ -289,13 +289,13 @@ export default function (globalData: IGlobalData) {
licenseMenu.ItemSelect.on((item, index) => {
if (item === showItem) {
globalData.InInput = true;
globalData.InMenu = true;
var input = new InputHelper("Welchen Spieler möchtest du deine Lizenzen zeigen (Name / ID)?", globalData);
input.show();
input.getValue(name => {
mp.events.callRemote("CLIENT:InteractionMenu_Show", "License", name);
parentMenu.Close(true);
globalData.InInput = false;
globalData.InMenu = false;
});
}
@@ -336,22 +336,22 @@ export default function (globalData: IGlobalData) {
factionMenu.ItemSelect.on((item, index) => {
if (index === 0) { // Inviten
globalData.InInput = true;
globalData.InMenu = true;
var input = new InputHelper("Welchen Spieler möchtest du inviten (Name / ID)?", globalData);
input.show();
input.getValue(name => {
mp.events.callRemote("CLIENT:InteractionMenu_Invite", "Fraktion", name);
factionMenu.Close();
globalData.InInput = false;
globalData.InMenu = false;
});
} else if (index === 1) { // Uninviten
globalData.InInput == true;
globalData.InMenu == true;
var input = new InputHelper("Welchen Spieler möchtest du uninviten (Name / ID)?", globalData);
input.show();
input.getValue(name => {
mp.events.callRemote("CLIENT:InteractionMenu_Uninvite", "Fraktion", name);
factionMenu.Close();
globalData.InInput = false;
globalData.InMenu = false;
});
}
});
@@ -372,24 +372,24 @@ export default function (globalData: IGlobalData) {
groupMenu.ItemSelect.on((item, index) => {
switch (index) {
case 0: //Spieler inviten
globalData.InInput = true;
globalData.InMenu = true;
var input = new InputHelper("Welchen Spieler möchtest du inviten (Name / ID)?", globalData);
input.show();
input.getValue(name => {
mp.events.callRemote("CLIENT:InteractionMenu_Invite", "Gruppe", name);
parentMenu.Close();
globalData.InInput = false;
globalData.InMenu = false;
});
break;
case 1: //Spieler uninviten
globalData.InInput == true;
globalData.InMenu == true;
var input = new InputHelper("Welchen Spieler möchtest du uninviten (Name / ID)?", globalData);
input.show();
input.getValue(name => {
mp.events.callRemote("CLIENT:InteractionMenu_Uninvite", "Gruppe", name);
parentMenu.Close();
globalData.InInput = false;
globalData.InMenu = false;
});
break;
@@ -398,13 +398,13 @@ export default function (globalData: IGlobalData) {
break;
case 3: //Neuen (zusätzlichen) Gruppenleiter bestimmen
globalData.InInput = true;
globalData.InMenu = true;
var input = new InputHelper("Welchen Spieler soll Manager werden (Name)? ", globalData);
input.show();
input.getValue(name => {
mp.events.callRemote("CLIENT:InteractionMenu_MakeLeader", "Gruppe", name);
parentMenu.Close();
globalData.InInput = false;
globalData.InMenu = false;
});
break;
@@ -534,14 +534,14 @@ export default function (globalData: IGlobalData) {
mp.events.add("CLIENT:InteractionMenu_Pay_Name", (name) => {
payName = name;
globalData.InInput = true;
globalData.InMenu = true;
var input = new InputHelper("Wie viel?", globalData);
mp.gui.cursor.show(true, true);
input.show();
input.getValue(amount => {
mp.events.callRemote("CLIENT:InteractionMenu_Pay", JSON.stringify(payName), amount);
mp.gui.cursor.show(false, false);
globalData.InInput = false;
globalData.InMenu = false;
});
});
}