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

Add Trading

Browse Source
This commit is contained in:
VegaZ
2018-12-26 22:59:15 +01:00
parent b3e12588cf
commit ec1cc4b237
7 changed files with 829 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,10 +2,9 @@
var show = false;
var showAdmin = false;
var trading = false;
const { x: screenX, y: screenY } = mp.game.graphics.getScreenActiveResolution(0, 0);
let rxC = 0.5;
let ryC = 0.5;
let ryC = 0.4;
let rWidth = 0.4;
let sX = (screenX * 0.1 / 1000);
let sY = (screenY * 0.1 / 1000);
@@ -15,6 +14,7 @@ let sizeMul = 0.08;
let yMul = 1.8;
var targetPlayerName;
let closePos = [0.7125, 0.17]
let tradeBoxPos = [0.7125, 0.82]
var clickTime;
var itemRadial = false;
var hoverGrid;
@@ -26,31 +26,46 @@ var downRColor = 222;
var leftRColor = 222;
var rightRColor = 222;
var radialDescription;
var tradePartner = "Keinem";
var tradePrize = 0;
var tradeConfirm = false;
var isTrading = false;
var isTradingResult = false;
var dragTradeItem = null;
var inventoryWeight;
var items = [[]];
var tradeItems = [];
var tradeResultItems = [[]];
var grid = [];
grid[0] = [0.3375, 0.305]
grid[1] = [0.4195, 0.305]
grid[2] = [0.5015, 0.305]
grid[3] = [0.5835, 0.305]
grid[4] = [0.6655, 0.305]
grid[5] = [0.3375, 0.455]
grid[6] = [0.4195, 0.455]
grid[7] = [0.5015, 0.455]
grid[8] = [0.5835, 0.455]
grid[9] = [0.6655, 0.455]
grid[10] = [0.3375, 0.605]
grid[11] = [0.4195, 0.605]
grid[12] = [0.5015, 0.605]
grid[13] = [0.5835, 0.605]
grid[14] = [0.6655, 0.605]
grid[15] = [0.3375, 0.755]
grid[16] = [0.4195, 0.755]
grid[17] = [0.5015, 0.755]
grid[18] = [0.5835, 0.755]
grid[19] = [0.6655, 0.755]
grid[0] = [0.3375, 0.205]
grid[1] = [0.4195, 0.205]
grid[2] = [0.5015, 0.205]
grid[3] = [0.5835, 0.205]
grid[4] = [0.6655, 0.205]
grid[5] = [0.3375, 0.355]
grid[6] = [0.4195, 0.355]
grid[7] = [0.5015, 0.355]
grid[8] = [0.5835, 0.355]
grid[9] = [0.6655, 0.355]
grid[10] = [0.3375, 0.505]
grid[11] = [0.4195, 0.505]
grid[12] = [0.5015, 0.505]
grid[13] = [0.5835, 0.505]
grid[14] = [0.6655, 0.505]
grid[15] = [0.3375, 0.655]
grid[16] = [0.4195, 0.655]
grid[17] = [0.5015, 0.655]
grid[18] = [0.5835, 0.655]
grid[19] = [0.6655, 0.655]
var tradeGrid = [];
tradeGrid[0] = [0.3375, 0.925]
tradeGrid[1] = [0.4195, 0.925]
tradeGrid[2] = [0.5015, 0.925]
tradeGrid[3] = [0.5835, 0.925]
tradeGrid[4] = [0.6655, 0.925]
var mouseLDown = false;
var mouseRDown = false;
@@ -58,8 +73,10 @@ var hoverItem;
var dragItem = null;
var oldDragSlot;
var actFreeSlot;
var actFreeTradeSlot;
var bufferItem = [];
var stackToItem;
var stackToTradeItem;
mp.events.add("showInventory", (invWeight, itemArr) => {
if (show === false) {
@@ -79,9 +96,17 @@ mp.events.add("showInventory", (invWeight, itemArr) => {
inventoryWeight = 0;
items = null;
itemRadial = false;
if (tradeItems.length === 0) {
isTrading = false;
}
}
});
mp.events.add("openTradeMenu", (tradePartnerName) => {
tradePartner = tradePartnerName;
isTrading = true;
});
mp.events.add("showInventoryToAdmin", (pName, invWeight, itemArr) => {
if (showAdmin === false) {
targetPlayerName = pName;
@@ -100,6 +125,25 @@ mp.events.add("addItem", (item) => {
}
});
mp.events.add("clearTradeItems", () => {
tradeConfirm = false;
tradeItems = [[]];
tradePrize = 0;
});
mp.events.add("unlockTradeItems", () => {
tradeConfirm = false;
});
mp.events.add("showTradeItems", (tradeResultItemArray) => {
//for (var i = 0; i < tradeResultItemArray.length; i++) {
// tradeItems.push(tradeResultItemArray[i]);
//}
tradeItems = JSON.parse(tradeResultItemArray);
isTrading = true;
});
mp.events.add("removeItem", (userItemId, amount) => {
if (show) {
var arrIndex;
@@ -122,16 +166,16 @@ mp.events.add("render", () => {
mp.game.graphics.set2dLayer(1);
//INVENTARHINTERGRUND
mp.game.graphics.drawRect(rxC, ryC, 0.45, 0.7, 255, 255, 255, 200);
mp.game.graphics.drawRect(rxC, ryC, 0.45, 0.7, 255, 255, 255, 200); //inventar
mp.game.graphics.set2dLayer(2);
//INVENTARÜBERSCHRIFT
mp.game.graphics.drawText("Inventar ~g~" + inventoryWeight + "/40000g", [rxC, ryC - (rWidth / 1.20)], {
font: 7,
color: [112, 128, 144, 254],
scale: [0.7, 0.7],
outline: true,
});
});
//SLOTS [RECHTECKE] [SLOTZAHLEN]
var tempSlot;
@@ -144,7 +188,7 @@ mp.events.add("render", () => {
outline: true,
});
}
mp.game.graphics.set2dLayer(3);
//SPRITES + ITEMANZAHL
for (var currentItem = 0; currentItem < items.length; currentItem++) {
@@ -193,12 +237,20 @@ mp.events.add("render", () => {
//WENN MOUSE DOWN
if (mouseLDown && dragItem !== null || mouseRDown && dragItem !== null) {
if (isMouseOverFreeSlot(pos[0], pos[1]) || isItemOverSameItem(pos[0], pos[1])) {
mp.game.graphics.drawSprite("itemimages", items[dragItem][0].toLowerCase(), pos[0] / screenX, pos[1] / screenY, rWidth / 8, rWidth / 5, 0, 100, 255, 100, 255);
} else {
mp.game.graphics.drawSprite("itemimages", items[dragItem][0].toLowerCase(), pos[0] / screenX, pos[1] / screenY, rWidth / 8, rWidth / 5, 0, 255, 100, 100, 255);
}
if (isMouseOverFreeSlot(pos[0], pos[1]) || isMouseOverFreeTradeSlot(pos[0], pos[1]) || isItemOverSameItem(pos[0], pos[1]) || isItemOverSameTradeItem(pos[0], pos[1])) {
if (dragTradeItem === false) {
mp.game.graphics.drawSprite("itemimages", items[dragItem][0].toLowerCase(), pos[0] / screenX, pos[1] / screenY, rWidth / 8, rWidth / 5, 0, 100, 255, 100, 255);
} else {
mp.game.graphics.drawSprite("itemimages", tradeItems[dragItem][0].toLowerCase(), pos[0] / screenX, pos[1] / screenY, rWidth / 8, rWidth / 5, 0, 100, 255, 100, 255);
}
} else {
if (dragTradeItem === false) {
mp.game.graphics.drawSprite("itemimages", items[dragItem][0].toLowerCase(), pos[0] / screenX, pos[1] / screenY, rWidth / 8, rWidth / 5, 0, 255, 100, 100, 255);
} else {
mp.game.graphics.drawSprite("itemimages", tradeItems[dragItem][0].toLowerCase(), pos[0] / screenX, pos[1] / screenY, rWidth / 8, rWidth / 5, 0, 255, 100, 100, 255);
}
}
}
mp.game.graphics.set2dLayer(5);
if (itemRadial === true) {
@@ -218,10 +270,123 @@ mp.events.add("render", () => {
mp.game.graphics.drawText("~g~" + radialDescription, [pos[0] / screenX, pos[1] / screenY - 0.033], {
font: 4,
color: [255, 255, 255, 255],
scale: [0.4, 0.4],
scale: [0.5, 0.5],
outline: true,
});
}
if (isTrading) {
mp.game.graphics.set2dLayer(1);
mp.game.graphics.drawRect(rxC, 0.925, 0.45, 0.25, 255, 255, 255, 200);
mp.game.graphics.set2dLayer(2);
var tempSlot2;
for (var slots = 0; slots < tradeGrid.length; slots++) {
mp.game.graphics.drawRect(tradeGrid[slots][0], tradeGrid[slots][1], sizeMul, sizeMul * yMul, 112, 128, 144, 254);
mp.game.graphics.drawText(tempSlot2 = slots + 1, [tradeGrid[slots][0] - (sizeMul / 2) + 0.006, tradeGrid[slots][1] - (sizeMul / 2 * yMul)], {
font: 7,
color: [69, 255, 0, 254],
scale: [0.3, 0.3],
outline: true,
});
}
mp.game.graphics.set2dLayer(3);
//SPRITES + ITEMANZAHL
if (tradeItems.length !== 0) {
for (var currentItem = 0; currentItem < tradeItems.length; currentItem++) {
if (tradeItems[currentItem][4] !== "-1") {
mp.game.graphics.drawSprite("itemimages", tradeItems[currentItem][0].toLowerCase(), tradeGrid[parseInt(tradeItems[currentItem][4] - 1)][0], tradeGrid[parseInt(tradeItems[currentItem][4] - 1)][1], rWidth / 8, rWidth / 5, 0, 255, 255, 255, 255);
mp.game.graphics.drawText("(~y~" + tradeItems[currentItem][3] + "~s~)", [tradeGrid[parseInt(tradeItems[currentItem][4] - 1)][0] + (sizeMul / 2) - 0.008, tradeGrid[parseInt(tradeItems[currentItem][4] - 1)][1] + 0.05], {
font: 0,
color: [255, 255, 255, 255],
scale: [0.25, 0.25],
outline: true,
});
if (tradeConfirm === true) {
mp.game.graphics.drawSprite("itemimages", "lock", tradeGrid[parseInt(tradeItems[currentItem][4] - 1)][0], tradeGrid[parseInt(tradeItems[currentItem][4] - 1)][1], rWidth / 8 / 2, rWidth / 5 / 2, 0, 255, 255, 255, 255);
}
}
}
}
//} else {
// if (tradeResultItems.length !== 0) {
// for (var currentItem = 0; currentItem < tradeResultItems.length; currentItem++) {
// mp.game.graphics.drawSprite("itemimages", tradeResultItems[currentItem][0].toLowerCase(), tradeGrid[parseInt(tradeResultItems[currentItem][4] - 1)][0], tradeGrid[parseInt(tradeResultItems[currentItem][4] - 1)][1], rWidth / 8, rWidth / 5, 0, 255, 255, 255, 255);
// mp.game.graphics.drawText("(~y~" + tradeResultItems[currentItem][3] + "~s~)", [tradeGrid[parseInt(tradeResultItems[currentItem][4] - 1)][0] + (sizeMul / 2) - 0.008, tradeGrid[parseInt(tradeResultItems[currentItem][4] - 1)][1] + 0.05], {
// font: 0,
// color: [255, 255, 255, 255],
// scale: [0.25, 0.25],
// outline: true,
// });
// }
// }
//}
mp.game.graphics.drawText("Handel mit ~y~" + tradePartner + " ~s~ für ~g~ " + tradePrize + "$", [rxC, 0.81], {
font: 7,
color: [112, 128, 144, 254],
scale: [0.6, 0.6],
outline: true,
});
mp.game.graphics.set2dLayer(4);
if (tradeConfirm === false) {
mp.game.graphics.drawSprite("itemimages", "box", tradeBoxPos[0], tradeBoxPos[1], 0.02, 0.035, 0, 255, 255, 255, 255);
} else {
mp.game.graphics.drawSprite("itemimages", "boxticked", tradeBoxPos[0], tradeBoxPos[1], 0.02, 0.035, 0, 255, 255, 255, 255);
}
mp.game.graphics.drawSprite("itemimages", "dollar", tradeBoxPos[0] - 0.025, tradeBoxPos[1], 0.02, 0.035, 0, 255, 255, 255, 255);
if (isMouseOverTradeDollar(pos[0], pos[1])) {
mp.game.graphics.drawText("~g~ Preis festlegen", [pos[0] / screenX, pos[1] / screenY - 0.033], {
font: 4,
color: [255, 255, 255, 255],
scale: [0.5, 0.5],
outline: true,
});
}
if (isMouseOverTradeBox(pos[0], pos[1])) {
mp.game.graphics.drawText("~g~Handelsanfrage absenden", [pos[0] / screenX, pos[1] / screenY - 0.033], {
font: 4,
color: [255, 255, 255, 255],
scale: [0.5, 0.5],
outline: true,
});
}
mp.game.graphics.set2dLayer(5);
if (isMouseOverTradeItem(pos[0], pos[1]) && dragItem === null && itemRadial === false) {
mp.game.graphics.drawRect(pos[0] / screenX, pos[1] / screenY + 0.055, 0.14, 0.08, 0, 0, 0, 220);
var hoverItemP = [tradeItems[hoverItem][0], tradeItems[hoverItem][1], tradeItems[hoverItem][2], tradeItems[hoverItem][3]];
//NAME
mp.game.graphics.drawText("~g~" + hoverItemP[0], [pos[0] / screenX, pos[1] / screenY + 0.02], {
font: 4,
color: [255, 255, 255, 255],
scale: [0.4, 0.4],
outline: true,
});
//BESCHREIBUNG
mp.game.graphics.drawText(hoverItemP[1], [pos[0] / screenX, pos[1] / screenY + 0.04], {
font: 4,
color: [255, 255, 255, 255],
scale: [0.35, 0.35],
outline: true,
});
//EINZELGEWICHT
mp.game.graphics.drawText("~y~" + hoverItemP[2] + "g~s~ * " + hoverItemP[3] + "~s~ = ~y~" + hoverItemP[2] * hoverItemP[3] + "g", [pos[0] / screenX, pos[1] / screenY + 0.06], {
font: 4,
color: [255, 255, 255, 255],
scale: [0.35, 0.35],
outline: true,
});
}
}
////--------------------------------------------------------------DEBUG
//mp.game.graphics.drawText(itemRadial.toString() + " ~y~" + radialSelect, [0.5, 0.05], {
// font: 7,
@@ -230,14 +395,12 @@ mp.events.add("render", () => {
// outline: true,
//});
////KOORDINATEN
//if (ifMouseSelectRadial(pos[0], pos[1])) {
// mp.game.graphics.drawText((pos[0] / screenX).toFixed(3) + " / " + (pos[1] / screenY).toFixed(3), [pos[0] / screenX, pos[1] / screenY - 0.02], {
// font: 4,
// color: [255, 255, 255, 255],
// scale: [0.4, 0.4],
// outline: true,
// });
//}
//mp.game.graphics.drawText((pos[0] / screenX).toFixed(3) + " / " + (pos[1] / screenY).toFixed(3) + " " + tradeItems.length, [pos[0] / screenX, pos[1] / screenY - 0.02], {
// font: 4,
// color: [255, 255, 255, 255],
// scale: [0.4, 0.4],
// outline: true,
//});
////----------------------------------------------------------DEBUG END
}
if (showAdmin === true) {
@@ -266,7 +429,7 @@ mp.events.add("render", () => {
scale: [0.3, 0.3],
outline: true,
});
}
}
mp.game.graphics.set2dLayer(3);
//SPRITES + ITEMANZAHL
@@ -313,6 +476,7 @@ mp.events.add("render", () => {
outline: true,
});
}
if (isMouseOverX(pos[0], pos[1])) {
mp.game.graphics.drawSprite("itemimages", "x", closePos[0], closePos[1], 0.02, 0.035, 0, 220, 20, 60, 255);
} else {
@@ -375,25 +539,45 @@ function isMouseOverItem(cX, cY) {
}
}
}
function isMouseOverTradeItem(cX, cY) {
if (dragItem === null && isTrading) {
var x = cX / screenX;
var y = cY / screenY;
var a;
var b;
var c;
for (var s = 0; s < 5; s++) {
a = tradeGrid[s][0] - x;
b = tradeGrid[s][1] - y;
c = Math.sqrt(a * a + b * b);
var invSlot = (s + 1);
if (c < sizeMul / 2) {
for (i = 0; i < tradeItems.length; i++) {
if (parseInt(tradeItems[i][4]) === invSlot) {
hoverItem = i;
return true;
}
}
}
}
}
}
function isMouseOverFreeSlot(cX2, cY2) {
var x = cX2 / screenX;
var y = cY2 / screenY;
var a;
var b;
var c;
var isItemOnSlot = 0;
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) {
if (x > grid[s][0] - sizeMul / 2 && x < grid[s][0] + sizeMul / 2 && y > grid[s][1] - sizeMul / 2 * aspectRatioFactor && y < grid[s][1] + sizeMul / 2 * aspectRatioFactor) {
for (i = 0; i < items.length; i++) {
if (parseInt(items[i][4]) === invSlot) {
isItemOnSlot++;
@@ -407,28 +591,81 @@ function isMouseOverFreeSlot(cX2, cY2) {
}
}
function isItemOverSameItem(cX2, cY2) {
if (dragItem !== null) {
function isMouseOverFreeTradeSlot(cX2, cY2) {
if (tradeConfirm === false) {
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 isItemOnSlot = 0;
for (var s = 0; s < 5; s++) {
var invSlot = (s + 1);
if (c < sizeMul / 2) {
if (x > tradeGrid[s][0] - sizeMul / 2 && x < tradeGrid[s][0] + sizeMul / 2 && y > tradeGrid[s][1] - sizeMul / 2 * aspectRatioFactor && y < tradeGrid[s][1] + sizeMul / 2 * aspectRatioFactor) {
for (i = 0; i < tradeItems.length; i++) {
if (parseInt(tradeItems[i][4]) === invSlot) {
isItemOnSlot++;
}
}
if (isItemOnSlot === 0) {
actFreeTradeSlot = s + 1;
return true;
}
}
}
}
}
function isItemOverSameItem(cX2, cY2) {
if (dragItem !== null && items.length > 0) {
var x = cX2 / screenX;
var y = cY2 / screenY;
for (var s = 0; s < 20; s++) {
var invSlot = (s + 1);
if (x > grid[s][0] - sizeMul / 2 && x < grid[s][0] + sizeMul / 2 && y > grid[s][1] - sizeMul / 2 * aspectRatioFactor && y < grid[s][1] + sizeMul / 2 * aspectRatioFactor) {
for (i = 0; i < items.length; i++) {
if (items[dragItem][0] === items[i][0] && parseInt(items[i][4]) === invSlot && items[hoverItem][4] !== items[i][4]) {
stackToItem = i;
return true;
if (dragTradeItem === false) {
if (items[dragItem][0] === items[i][0] && parseInt(items[i][4]) === invSlot && items[hoverItem][4] !== items[i][4]) {
stackToItem = i;
return true;
}
} else {
if (tradeItems[dragItem][0] === items[i][0] && parseInt(items[i][4]) === invSlot) {
stackToItem = i;
return true;
}
}
}
}
}
}
}
function isItemOverSameTradeItem(cX2, cY2) {
if (dragItem !== null && tradeItems.length > 0) {
var x = cX2 / screenX;
var y = cY2 / screenY;
for (var s = 0; s < 5; s++) {
var invSlot = (s + 1);
if (x > tradeGrid[s][0] - sizeMul / 2 && x < tradeGrid[s][0] + sizeMul / 2 && y > tradeGrid[s][1] - sizeMul / 2 * aspectRatioFactor && y < tradeGrid[s][1] + sizeMul / 2 * aspectRatioFactor) {
for (i = 0; i < tradeItems.length; i++) {
if (dragTradeItem === false) {
if (items[dragItem][0] === tradeItems[i][0] && parseInt(tradeItems[i][4]) === invSlot) {
stackToTradeItem = i;
return true;
}
} else {
if (tradeItems[dragItem][0] === tradeItems[i][0] && parseInt(tradeItems[i][4]) === invSlot && tradeItems[hoverItem][4] !== tradeItems[i][4]) {
stackToTradeItem = i;
return true;
}
}
}
}
@@ -440,14 +677,30 @@ function isMouseOverX(cX2, cY2) {
if (showAdmin) {
var x = cX2 / screenX;
var y = cY2 / screenY;
var a;
var b;
var c;
a = closePos[0] - x;
b = closePos[1] - y;
c = Math.sqrt(a * a + b * b);
if (c < 0.018) {
if (x > closePos[0] - 0.01 && x < closePos[0] + 0.01 && y > closePos[1] - 0.0175 && y < closePos[1] + 0.0175) {
return true;
}
}
}
function isMouseOverTradeBox(cX2, cY2) {
if (show && tradeConfirm === false) {
var x = cX2 / screenX;
var y = cY2 / screenY;
if (x > tradeBoxPos[0] - 0.01 && x < tradeBoxPos[0] + 0.01 && y > tradeBoxPos[1] - 0.0175 && y < tradeBoxPos[1] + 0.0175) {
return true;
}
}
}
function isMouseOverTradeDollar(cX2, cY2) {
if (show && tradeConfirm === false) {
var x = cX2 / screenX;
var y = cY2 / screenY;
if (x > (tradeBoxPos[0] - 0.025) - 0.01 && x < (tradeBoxPos[0] - 0.025) + 0.01 && y > tradeBoxPos[1] - 0.0175 && y < tradeBoxPos[1] + 0.0175) {
return true;
}
}
@@ -500,57 +753,34 @@ mp.events.add('click', (x, y, upOrDown, leftOrRight, relativeX, relativeY, world
var cX = x / screenX;
var cY = y / screenY;
//if (upOrDown === "down" && leftOrRight === "left") {
// clickTimeL = Date.now();
// if (mouseActive === false) {
// if (clickTimeR !== null && Date.now() - clickTimeR < 100) {
// mouseActive = true;
// mp.gui.cursor.show(true, true);
// clickTimeL = null;
// clickTimeR = null;
// }
// }
// else {
// if (clickTimeR !== null && Date.now() - clickTimeR < 100) {
// mouseActive = false;
// mp.gui.cursor.show(false, false);
// clickTimeL = null;
// clickTimeR = null;
// } else {
// mp.gui.chat.push("~r~" + worldPosition.x.toFixed(3).toString() + ", ~g~" + worldPosition.y.toFixed(3).toString() + ", ~b~" + worldPosition.z.toFixed(3).toString());
// }
// }
//}
//if (upOrDown === "down" && leftOrRight === "right") {
// clickTimeR = Date.now();
// if (mouseActive === false) {
// if (clickTimeL !== null && Date.now() - clickTimeL < 100) {
// mouseActive = true;
// mp.gui.cursor.show(true, true);
// clickTimeL = null;
// clickTimeR = null;
// }
// } else {
// if (clickTimeL !== null && Date.now() - clickTimeL < 100) {
// mouseActive = false;
// mp.gui.cursor.show(false, false);
// clickTimeL = null;
// clickTimeR = null;
// }
// }
//}
if (show) {
//LINKE MAUSTASTE
//RUNTER
if (upOrDown === "down" && leftOrRight === "left" && mouseLDown === false && mouseRDown === false) {
if (isTrading && isMouseOverTradeBox(x, y) && tradePrize > 0) {
tradeConfirm = true;
mp.events.callRemote('sendTradeItemsToPartner', JSON.stringify(tradeItems), tradePrize, tradePartner);
}
if (isTrading && isMouseOverTradeDollar(x, y)) {
var tradeMoney = new InputHelper("Wie viel $ möchtest du für deine Items haben?");
tradeMoney.show();
tradeMoney.getValue((data) => {
var amount = parseInt(data);
if (isNaN(amount) || amount < 0) {
mp.game.graphics.notify('~r~Du musst eine Zahl größer als 0 eingeben!');
return;
}
tradePrize = amount;
})
}
mouseLDown = true;
if (isMouseOverItem(x, y) && dragItem === null && itemRadial === false) {
dragItem = hoverItem;
oldDragSlot = items[dragItem][4];
items[dragItem][4] = "-1";
dragTradeItem = false;
} else if (ifMouseSelectRadial(x, y)) {
switch (radialSelect) {
case "up":
@@ -566,8 +796,8 @@ mp.events.add('click', (x, y, upOrDown, leftOrRight, relativeX, relativeY, world
return;
}
mp.events.callRemote('itemInteract', "drop", items[clickedItem][5], parseInt(amount));
});
});
itemRadial = false;
break;
case "down":
@@ -580,7 +810,12 @@ mp.events.add('click', (x, y, upOrDown, leftOrRight, relativeX, relativeY, world
case "right":
itemRadial = false;
break;
}
}
} else if (isMouseOverTradeItem(x, y) && dragItem === null && itemRadial === false && tradeConfirm === false) {
dragItem = hoverItem;
oldDragSlot = tradeItems[dragItem][4];
tradeItems[dragItem][4] = "-1";
dragTradeItem = true;
}
}
@@ -591,18 +826,55 @@ mp.events.add('click', (x, y, upOrDown, leftOrRight, relativeX, relativeY, world
if (dragItem !== null) {
if (isMouseOverFreeSlot(x, y)) {
items[dragItem][4] = actFreeSlot;
if (dragTradeItem === false) {
items[dragItem][4] = actFreeSlot;
} else {
items.push([tradeItems[dragItem][0], tradeItems[dragItem][1], tradeItems[dragItem][2], tradeItems[dragItem][3], actFreeSlot.toString(), tradeItems[dragItem][5]]);
tradeItems.splice(dragItem, 1);
}
oldDragSlot = null;
dragItem = null;
hoverItem = null;
} else if (isItemOverSameItem(x, y)) {
var newAmount = parseInt(items[stackToItem][3]) + parseInt(items[dragItem][3]);
items[stackToItem][3] = newAmount.toString();
items[dragItem][4] = "-1";
if (dragTradeItem === false) {
var newAmount = parseInt(items[stackToItem][3]) + parseInt(items[dragItem][3]);
items[stackToItem][3] = newAmount.toString();
items[dragItem][4] = "-1";
} else {
var newAmount = parseInt(items[stackToItem][3]) + parseInt(tradeItems[dragItem][3]);
items[stackToItem][3] = newAmount.toString();
tradeItems.splice(dragItem,1);
}
dragItem = null;
hoverItem = null;
hoverItem = null;
} else if (isItemOverSameTradeItem(x, y)) {
if (dragTradeItem === false) {
var newAmount = parseInt(tradeItems[stackToTradeItem][3]) + parseInt(items[dragItem][3]);
tradeItems[stackToTradeItem][3] = newAmount.toString();
items[dragItem][4] = "-1";
} else {
var newAmount = parseInt(tradeItems[stackToTradeItem][3]) + parseInt(tradeItems[dragItem][3]);
tradeItems[stackToTradeItem][3] = newAmount.toString();
tradeItems[dragItem][4] = "-1";
}
dragItem = null;
hoverItem = null;
} else if (isMouseOverFreeTradeSlot(x, y)) {
if (dragTradeItem === false) {
tradeItems.push([items[dragItem][0], items[dragItem][1], items[dragItem][2], items[dragItem][3], actFreeTradeSlot.toString(), items[dragItem][5]]);
items.splice(dragItem, 1);
} else {
tradeItems[dragItem][4] = actFreeTradeSlot;
}
oldDragSlot = null;
dragItem = null;
hoverItem = null;
} else {
items[dragItem][4] = oldDragSlot;
if (dragTradeItem === false) {
items[dragItem][4] = oldDragSlot;
} else {
tradeItems[dragItem][4] = oldDragSlot;
}
dragItem = null;
hoverItem = null;
}
@@ -616,17 +888,24 @@ mp.events.add('click', (x, y, upOrDown, leftOrRight, relativeX, relativeY, world
mouseRDown = true;
if (isMouseOverItem(x, y) && dragItem === null) {
dragItem = hoverItem;
dragItem = hoverItem;
oldDragSlot = items[hoverItem][4];
bufferItem = [items[hoverItem][0], items[hoverItem][1], items[hoverItem][2], items[hoverItem][3], items[hoverItem][4], items[hoverItem][5]];
items[hoverItem][3]--;
items[hoverItem][3]--;
dragTradeItem = false;
} else if (isMouseOverTradeItem(x, y) && dragItem === null && tradeConfirm === false) {
dragItem = hoverItem;
oldDragSlot = tradeItems[hoverItem][4];
bufferItem = [tradeItems[hoverItem][0], tradeItems[hoverItem][1], tradeItems[hoverItem][2], tradeItems[hoverItem][3], tradeItems[hoverItem][4], tradeItems[hoverItem][5]];
tradeItems[hoverItem][3]--;
dragTradeItem = true;
}
}
//HOCH
if (upOrDown === "up" && leftOrRight === "right" && mouseRDown === true && itemRadial === false) {
mouseRDown = false;
if (Date.now() - clickTime < 300 && isMouseOverItem(x, y)) {
if (Date.now() - clickTime < 100 && isMouseOverItem(x, y)) {
clickedItem = hoverItem;
items[hoverItem][3]++;
itemRadial = true;
@@ -636,23 +915,67 @@ mp.events.add('click', (x, y, upOrDown, leftOrRight, relativeX, relativeY, world
} else {
if (dragItem !== null) {
if (isMouseOverFreeSlot(x, y)) {
items.push([items[dragItem][0], items[dragItem][1], items[dragItem][2], "1", actFreeSlot.toString(), "-1"]);
if (items[hoverItem][3] === 0) {
items[hoverItem][4] = "-1";
if (dragTradeItem === false) {
items.push([items[dragItem][0], items[dragItem][1], items[dragItem][2], "1", actFreeSlot.toString(), "-1"]);
if (items[hoverItem][3] === 0) {
items[hoverItem][4] = "-1";
}
} else {
items.push([tradeItems[dragItem][0], tradeItems[dragItem][1], tradeItems[dragItem][2], "1", actFreeSlot.toString(), "-1"]);
if (tradeItems[hoverItem][3] === 0) {
tradeItems.splice(hoverItem, 1);
}
}
dragItem = null;
hoverItem = null;
} else if (isItemOverSameItem(x, y)) {
items[stackToItem][3]++;
if (items[hoverItem][3] === 0) {
items[hoverItem][4] = "-1";
if (dragTradeItem === false) {
if (items[hoverItem][3] === 0) {
items[hoverItem][4] = "-1";
}
} else {
if (tradeItems[hoverItem][3] === 0) {
tradeItems.splice(hoverItem, 1);
}
}
bufferItem = null;
dragItem = null;
hoverItem = null;
} else if (isItemOverSameTradeItem(x, y)) {
tradeItems[stackToTradeItem][3]++;
if (dragTradeItem === false) {
if (items[hoverItem][3] === 0) {
items[hoverItem][4] = "-1";
}
} else {
if (tradeItems[hoverItem][3] === 0) {
tradeItems[hoverItem][4] = "-1";
}
}
bufferItem = null;
dragItem = null;
hoverItem = null;
} else if (isMouseOverFreeTradeSlot(x, y)) {
if (dragTradeItem === false) {
tradeItems.push([items[dragItem][0], items[dragItem][1], items[dragItem][2], "1", actFreeTradeSlot.toString(), "-1"]);
if (items[hoverItem][3] === 0) {
items[hoverItem][4] = "-1";
}
} else {
tradeItems.push([tradeItems[dragItem][0], tradeItems[dragItem][1], tradeItems[dragItem][2], "1", actFreeTradeSlot.toString(), "-1"]);
if (tradeItems[hoverItem][3] === 0) {
tradeItems[hoverItem][4] = "-1";
}
}
dragItem = null;
hoverItem = null;
} else {
items[hoverItem][3]++;
if (dragTradeItem === false) {
items[hoverItem][3]++;
} else {
tradeItems[hoverItem][3]++;
}
bufferItem = null;
dragItem = null;
hoverItem = null;
@@ -673,7 +996,7 @@ mp.events.add('click', (x, y, upOrDown, leftOrRight, relativeX, relativeY, world
}
}
//RECHTE MAUSTASTEshowAdmin = true;
//RECHTE MAUSTASTE
//RUNTER
if (upOrDown === "down" && leftOrRight === "right" && mouseLDown === false && mouseRDown === false) {