diff --git a/Client/Gui/Inventory/inventory.js b/Client/Gui/Inventory/inventory.js index 8c6f1ac5..ed7877cd 100644 --- a/Client/Gui/Inventory/inventory.js +++ b/Client/Gui/Inventory/inventory.js @@ -106,7 +106,9 @@ mp.events.add("openTradeMenu", (tradePartnerName) => { tradePartner = tradePartnerName; isTrading = true; }); - +mp.events.add("showTradeRequest", () => { + show = false; +}); mp.events.add("showInventoryToAdmin", (pName, invWeight, itemArr) => { if (showAdmin === false) { targetPlayerName = pName; diff --git a/Client/Interaction/interaction.js b/Client/Interaction/interaction.js index fc0be3d8..133c1de4 100644 --- a/Client/Interaction/interaction.js +++ b/Client/Interaction/interaction.js @@ -127,7 +127,12 @@ mp.events.add("render", () => { } } } - mp.game.graphics.set2dLayer(4); + mp.game.graphics.set2dLayer(4); + isMouseOverButton(pos[0], pos[1]); + mp.game.graphics.drawRect(0.5 - 0.07, 0.5 + 0.1, 0.06, 0.04, 100, acceptColor, 100, 250); + mp.game.graphics.drawRect(0.5 + 0.07, 0.5 + 0.1, 0.06, 0.04, declineColor, 100, 100, 250); + + mp.game.graphics.set2dLayer(5); if (isMouseOverTradeItem(pos[0], pos[1])) { mp.game.graphics.drawRect(pos[0] / screenX, pos[1] / screenY + 0.055, 0.14, 0.08, 0, 0, 0, 220); @@ -156,11 +161,7 @@ mp.events.add("render", () => { scale: [0.35, 0.35], outline: true, }); - } - isMouseOverButton(pos[0], pos[1]); - mp.game.graphics.set2dLayer(5); - mp.game.graphics.drawRect(0.5 - 0.07, 0.5 + 0.1, 0.06, 0.04, 100, acceptColor, 100, 250); - mp.game.graphics.drawRect(0.5 + 0.07, 0.5 + 0.1, 0.06, 0.04, declineColor, 100, 100, 250); + } mp.game.graphics.set2dLayer(6); @@ -188,8 +189,8 @@ mp.events.add("render", () => { }); mp.game.graphics.drawRect(0.5, 0.5 + 0.1412, timerBarSize, 0.018, 255, 0, 0, 250); } else { - mp.events.callRemote('tradeDecision', tradeSelection, JSON.stringify(receivedTradeItems), tradeRequester); tradeSelection = "timeup"; + mp.events.callRemote('tradeDecision', tradeSelection, JSON.stringify(receivedTradeItems), tradeRequester); tradeRequest = false; mp.gui.cursor.show(false, false); }