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

Code Review

Browse Source
This commit is contained in:
VegaZ
2018-12-08 19:42:43 +01:00
parent b90ab59931
commit 0e69501aec
1 changed files with 51 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
Client/Gui/Inventory/inventory.js
View File

@@ -223,6 +223,35 @@ function isMouseOverFreeSlot(cX2, cY2) {
} }
} }
function isMouseOverSameItemType(cX2, cY2) {
var x = cX2 / screenX;
var y = cY2 / screenY;
var a;
var b;
var c;
for (var s = 0; s < 20; s++) {
a = grid[s][0] - x;
b = grid[s][1] - y;
c = Math.sqrt(a * a + b * b);
var invSlot = (s + 1);
if (c < sizeMul / 2) {
for (i = 0; i < items.length; i++) {
if (parseInt(items[i][4]) === invSlot) {
isItemOnSlot++;
}
}
if (isItemOnSlot === 0) {
actFreeSlot = s + 1;
return true;
}
}
}
}
mp.events.add('click', (x, y, upOrDown, leftOrRight, relativeX, relativeY, worldPosition, hitEntity) => { mp.events.add('click', (x, y, upOrDown, leftOrRight, relativeX, relativeY, worldPosition, hitEntity) => {
var cX = x / screenX; var cX = x / screenX;
@@ -247,15 +276,17 @@ mp.events.add('click', (x, y, upOrDown, leftOrRight, relativeX, relativeY, world
mouseLDown = false; mouseLDown = false;
if (isMouseOverFreeSlot(x, y) && dragItem !== null) { if (dragItem !== null) {
items[dragItem][4] = actFreeSlot; if (isMouseOverFreeSlot(x, y)) {
oldDragSlot = null; items[dragItem][4] = actFreeSlot;
dragItem = null; oldDragSlot = null;
} else { dragItem = null;
if (dragItem !== null) { hoverItem = null;
} else {
items[dragItem][4] = oldDragSlot; items[dragItem][4] = oldDragSlot;
dragItem = null; dragItem = null;
} hoverItem = null;
}
} }
} }
@@ -266,12 +297,9 @@ mp.events.add('click', (x, y, upOrDown, leftOrRight, relativeX, relativeY, world
mouseRDown = true; mouseRDown = true;
if (isMouseOverItem(x, y) && dragItem === null) { if (isMouseOverItem(x, y) && dragItem === null) {
dragItem = hoverItem; dragItem = hoverItem;
bufferItem = [items[hoverItem][0], items[hoverItem][1], items[hoverItem][2], items[hoverItem][3], items[hoverItem][4]]
items[hoverItem][3]--; items[hoverItem][3]--;
if (items[hoverItem][3] === "0") {
bufferItem = [items[hoverItem][0], items[hoverItem][1], items[hoverItem][2], items[hoverItem][3], items[hoverItem][4]]
items.splice(items.indexOf(items[hoverItem]), 1);
}
} }
} }
@@ -280,15 +308,20 @@ mp.events.add('click', (x, y, upOrDown, leftOrRight, relativeX, relativeY, world
mouseRDown = false; mouseRDown = false;
if (isMouseOverFreeSlot(x, y) && dragItem !== null) { if (dragItem !== null) {
if (isMouseOverFreeSlot(x, y)) {
items.push([items[dragItem][0], items[dragItem][1], items[dragItem][2], "1", actFreeSlot.toString()]); items.push([items[dragItem][0], items[dragItem][1], items[dragItem][2], "1", actFreeSlot.toString()]);
dragItem = null;
} else { if (items[hoverItem][3] === "0") {
if (dragItem !== null) { items.splice(items.indexOf(items[hoverItem]), 1);
}
dragItem = null;
hoverItem = null;
} else {
items.push(bufferItem); items.push(bufferItem);
bufferItem = null; bufferItem = null;
dragItem = null; dragItem = null;
hoverItem = null;
} }
} }
} }