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

Small fix in Interaction

Browse Source
This commit is contained in:
VegaZ
2018-12-26 23:32:57 +01:00
parent ab0cb88281
commit 78726f3f6a
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Client/Interaction/interaction.js
View File

@@ -42,7 +42,7 @@ const Color = NativeUI.Color;
mp.events.add("showPlayerInteraction", (nearPlayerArr) => { mp.events.add("showPlayerInteraction", (nearPlayerArr) => {
mp.gui.chat.activate(false); mp.gui.chat.activate(false);
nearbyPlayers = JSON.parse(nearPlayerArr); nearbyPlayers = JSON.parse(nearPlayerArr);
playerInteractionMenu.Visible = true;
let playerInteractionMenu = new Menu("Spielerinteraktion", "", new Point(0, screenRes.y / 2)); let playerInteractionMenu = new Menu("Spielerinteraktion", "", new Point(0, screenRes.y / 2));
let playerSelect = new UIMenuListItem("Mit", "~y~W\u00e4hle den Spieler aus.", new ItemsCollection(nearbyPlayers)); let playerSelect = new UIMenuListItem("Mit", "~y~W\u00e4hle den Spieler aus.", new ItemsCollection(nearbyPlayers));
playerInteractionMenu.AddItem(playerSelect); playerInteractionMenu.AddItem(playerSelect);
@@ -52,16 +52,14 @@ mp.events.add("showPlayerInteraction", (nearPlayerArr) => {
cancelItem.BackColor = new Color(213, 0, 0); cancelItem.BackColor = new Color(213, 0, 0);
cancelItem.HighlightedBackColor = new Color(229, 57, 53); cancelItem.HighlightedBackColor = new Color(229, 57, 53);
playerInteractionMenu.AddItem(cancelItem); playerInteractionMenu.AddItem(cancelItem);
playerInteractionMenu.Visible = true;
playerInteractionMenu.ItemSelect.on((item) => { playerInteractionMenu.ItemSelect.on((item) => {
if (item.Text === "Handeln") { if (item.Text === "Handeln") {
mp.events.callRemote("openTradeInventory", playerSelect.SelectedValue); mp.events.callRemote("openTradeInventory", playerSelect.SelectedValue);
playerInteractionMenu.Visible = false; playerInteractionMenu.Visible = false;
mp.gui.chat.activate(true); mp.gui.chat.activate(true);
globalData.PlayerInteraction = false; globalData.PlayerInteraction = false;
} else if (item.Text === "Abbrechen") { } else if (item.Text === "Schlie\u00dfen") {
globalData.PlayerInteraction = false; globalData.PlayerInteraction = false;
playerInteractionMenu.Visible = false; playerInteractionMenu.Visible = false;
mp.gui.chat.activate(true); mp.gui.chat.activate(true);

3
Client/Player/keys.js
View File

@@ -24,8 +24,7 @@ mp.keys.bind(0x0D, false, function () {
//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 (!chat && !showInv && !globalData.PlayerInteraction) { if (!chat && !showInv && !globalData.PlayerInteraction) {
mp.events.callRemote("keyPress:LEFT_ARROW"); mp.events.callRemote("keyPress:LEFT_ARROW");
globalData.PlayerInteraction = true;
} }
}); });