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

globalData InMenu bugfix

Browse Source
This commit is contained in:
kookroach
2021-04-03 21:06:53 +02:00
parent 64fcd3749f
commit 14c296505e
3 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -87,8 +87,6 @@ export default function factionInteraction(globalData: IGlobalData) {
factionInteractionMenu.Visible = false; factionInteractionMenu.Visible = false;
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 = 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 => {
@@ -101,8 +99,6 @@ export default function factionInteraction(globalData: IGlobalData) {
factionInteractionMenu.Visible = false; factionInteractionMenu.Visible = false;
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 = 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 => {

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

@@ -169,7 +169,6 @@ export default function (globalData: IGlobalData) {
} 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 = 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();

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

@@ -11,9 +11,7 @@ const player = mp.players.local;
export default function keys(globalData: IGlobalData) { export default function keys(globalData: IGlobalData) {
var showInventory = false;
var showGui = true; var showGui = true;
var showInv = false;
//ENTER //ENTER
mp.keys.bind(0x0D, false, function () { mp.keys.bind(0x0D, false, function () {
@@ -24,21 +22,21 @@ export default function keys(globalData: IGlobalData) {
//LEFT ARROW (Interaktion mit anderen Spielern) //LEFT ARROW (Interaktion mit anderen Spielern)
mp.keys.bind(0x25, false, function () { mp.keys.bind(0x25, false, function () {
if (!globalData.InChat && !showInv && !globalData.InMenu) { if (!globalData.InChat) {
mp.events.callRemote("keyPress:LEFT_ARROW"); mp.events.callRemote("keyPress:LEFT_ARROW");
} }
}); });
//UP ARROW (Interaktion mit Spielwelt) //UP ARROW (Interaktion mit Spielwelt)
mp.keys.bind(0x26, false, function () { mp.keys.bind(0x26, false, function () {
if (!globalData.InChat && !showInv && !globalData.InMenu) { if (!globalData.InChat) {
mp.events.callRemote("keyPress:UP_ARROW"); mp.events.callRemote("keyPress:UP_ARROW");
} }
}); });
//RIGHT ARROW (Fraktionsinteraktion) //RIGHT ARROW (Fraktionsinteraktion)
mp.keys.bind(0x27, false, function () { mp.keys.bind(0x27, false, function () {
if (!globalData.InChat && !showInv && !globalData.InMenu) { if (!globalData.InChat) {
mp.events.callRemote("keyPress:RIGHT_ARROW"); mp.events.callRemote("keyPress:RIGHT_ARROW");
} }
}); });
@@ -70,7 +68,7 @@ export default function keys(globalData: IGlobalData) {
//E //E
mp.keys.bind(0x45, false, function () { mp.keys.bind(0x45, false, function () {
if (!globalData.InChat && !globalData.InMenu) { if (!globalData.InChat) {
mp.events.callRemote("keyPress:E"); mp.events.callRemote("keyPress:E");
} }
}); });
@@ -78,19 +76,14 @@ export default function keys(globalData: IGlobalData) {
//I //Inventar //I //Inventar
mp.keys.bind(0x49, false, function () { mp.keys.bind(0x49, false, function () {
if (!globalData.InChat && !globalData.InTuning && !globalData.InMenu) { if (!globalData.InChat && !globalData.InTuning) {
if (showInv === false) {
showInv = true;
} else {
showInv = false;
}
mp.events.callRemote("keyPress:I"); mp.events.callRemote("keyPress:I");
} }
}); });
//O //Spielerliste //O //Spielerliste
mp.keys.bind(0x4F, true, function () { mp.keys.bind(0x4F, true, function () {
if (!globalData.InChat && !globalData.InMenu && !globalData.InTuning && !showInv) { if (!globalData.InChat && !globalData.InTuning ) {
mp.events.callRemote("keyPress:O"); mp.events.callRemote("keyPress:O");
//mp.events.call("showPlayerlist"); //mp.events.call("showPlayerlist");
} }
@@ -112,7 +105,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.InMenu && !globalData.InTuning) { if (!globalData.InChat && !globalData.InTuning) {
mp.events.callRemote("keyPress:M"); mp.events.callRemote("keyPress:M");
} }
}); });
@@ -142,7 +135,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.InMenu && !globalData.InMenu && globalData.LoggedIn) { if (!globalData.InChat && globalData.LoggedIn) {
mp.events.callRemote("CLIENT:JobManager_ShowJobMenu"); mp.events.callRemote("CLIENT:JobManager_ShowJobMenu");
} }
}); });