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

Add globalData.InMenu to InputHelpers

Browse Source
This commit is contained in:
VegaZ
2020-06-06 16:55:54 +02:00
parent 1171c84cd6
commit 2c45a61824
8 changed files with 45 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -91,6 +91,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;
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) => {
@@ -100,11 +101,13 @@ export default function business(globalData: IGlobalData) {
return; return;
} }
globalData.InInput = 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;
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) => {
@@ -113,7 +116,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;
mp.events.callRemote('Business_WithdrawMoney', amount); mp.events.callRemote('Business_WithdrawMoney', amount);
mainMenu.Close(); mainMenu.Close();

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

@@ -852,6 +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;
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) => {
@@ -860,6 +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;
tradePrize = amount; tradePrize = amount;
}); });
} }
@@ -876,6 +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;
dropInput.show(); dropInput.show();
dropInput.getValue((data) => { dropInput.getValue((data) => {
var amount = parseInt(data); var amount = parseInt(data);
@@ -888,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;
itemRadial = false; itemRadial = false;
break; break;
case "down": case "down":

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

@@ -88,11 +88,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;
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;
}); });
} else if (item === cancelItem) { } else if (item === cancelItem) {
menu.Close(); menu.Close();

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

@@ -78,11 +78,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;
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;
}); });
break; break;
case pointsTaskMenuLSPD: case pointsTaskMenuLSPD:
@@ -90,10 +92,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;
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;
}); });
break; break;
} }
@@ -108,20 +112,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;
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;
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;
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;
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);
}); });
@@ -129,10 +137,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;
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;
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);
}); });

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

@@ -153,16 +153,19 @@ export default function (globalData: IGlobalData) {
if (item === acceptItem) { if (item === acceptItem) {
mp.events.callRemote("CLIENT:InteractionMenu_AcceptInvite", acceptItem.SelectedValue); mp.events.callRemote("CLIENT:InteractionMenu_AcceptInvite", acceptItem.SelectedValue);
menu.Close(true); menu.Close(true);
globalData.InMenu = false;
} else if (item === payItem) { } else if (item === payItem) {
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;
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;
}); });
} }
}); });
@@ -265,11 +268,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;
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;
}); });
} }
@@ -310,18 +315,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;
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);
parentMenu.Close(); parentMenu.Close();
globalData.InInput = false;
}); });
} else if (index === 1) { // Uninviten } else if (index === 1) { // Uninviten
globalData.InInput == 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);
parentMenu.Close(); parentMenu.Close();
globalData.InInput = false;
}); });
} }
}); });
@@ -337,18 +346,22 @@ export default function (globalData: IGlobalData) {
groupMenu.ItemSelect.on((item, index) => { groupMenu.ItemSelect.on((item, index) => {
if (index === 0) { // Inviten if (index === 0) { // Inviten
globalData.InInput = 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;
}); });
} else if (index === 1) { // Uninviten } else if (index === 1) { // Uninviten
globalData.InInput == 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;
}); });
} }
}); });
@@ -457,13 +470,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;
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;
}); });
}); });
} }

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

@@ -43,12 +43,6 @@ export default function keys(globalData: IGlobalData) {
} }
}); });
//DOWN ARROW (Eigeninteraktion)
mp.keys.bind(0x4D, false, function () {
if (!globalData.InChat && !showInv && !globalData.InMenu && !globalData.InInput && !globalData.InTuning) {
mp.events.callRemote("keyPress:M");
}
});
//F7 //Unshowalles //F7 //Unshowalles
mp.keys.bind(0x76, false, function () { mp.keys.bind(0x76, false, function () {
if (showGui === true) { if (showGui === true) {
@@ -116,6 +110,13 @@ export default function keys(globalData: IGlobalData) {
} }
}); });
//M (Interaktionsmenü)
mp.keys.bind(0x4D, false, function () {
if (!globalData.InChat && !showInv && !globalData.InMenu && !globalData.InInput && !globalData.InTuning) {
mp.events.callRemote("keyPress:M");
}
});
//N //Motor Starten //N //Motor Starten
mp.keys.bind(0x4E, false, function () { mp.keys.bind(0x4E, false, function () {
if (!globalData.InChat) { if (!globalData.InChat) {

4
ReallifeGamemode.Client/inputhelper/index.ts
View File

@@ -28,8 +28,8 @@ export default class InputHelper {
} }
private disableControls() { private disableControls() {
for (var i = 0; i <= 33; i++) { for (var x = 0; x < 358; x++) {
mp.game.controls.disableAllControlActions(i); mp.game.controls.disableControlAction(32, x, true);
} }
} }

BIN
ReallifeGamemode.Database/Windows PowerShell.lnk
View File

Binary file not shown.