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 show = false;
var showAdmin = false; var showAdmin = false;
var trading = false;
const { x: screenX, y: screenY } = mp.game.graphics.getScreenActiveResolution(0, 0); const { x: screenX, y: screenY } = mp.game.graphics.getScreenActiveResolution(0, 0);
let rxC = 0.5; let rxC = 0.5;
let ryC = 0.5; let ryC = 0.4;
let rWidth = 0.4; let rWidth = 0.4;
let sX = (screenX * 0.1 / 1000); let sX = (screenX * 0.1 / 1000);
let sY = (screenY * 0.1 / 1000); let sY = (screenY * 0.1 / 1000);
@@ -15,6 +14,7 @@ let sizeMul = 0.08;
let yMul = 1.8; let yMul = 1.8;
var targetPlayerName; var targetPlayerName;
let closePos = [0.7125, 0.17] let closePos = [0.7125, 0.17]
let tradeBoxPos = [0.7125, 0.82]
var clickTime; var clickTime;
var itemRadial = false; var itemRadial = false;
var hoverGrid; var hoverGrid;
@@ -26,31 +26,46 @@ var downRColor = 222;
var leftRColor = 222; var leftRColor = 222;
var rightRColor = 222; var rightRColor = 222;
var radialDescription; var radialDescription;
var tradePartner = "Keinem";
var tradePrize = 0;
var tradeConfirm = false;
var isTrading = false;
var isTradingResult = false;
var dragTradeItem = null;
var inventoryWeight; var inventoryWeight;
var items = [[]]; var items = [[]];
var tradeItems = [];
var tradeResultItems = [[]];
var grid = []; var grid = [];
grid[0] = [0.3375, 0.305] grid[0] = [0.3375, 0.205]
grid[1] = [0.4195, 0.305] grid[1] = [0.4195, 0.205]
grid[2] = [0.5015, 0.305] grid[2] = [0.5015, 0.205]
grid[3] = [0.5835, 0.305] grid[3] = [0.5835, 0.205]
grid[4] = [0.6655, 0.305] grid[4] = [0.6655, 0.205]
grid[5] = [0.3375, 0.455] grid[5] = [0.3375, 0.355]
grid[6] = [0.4195, 0.455] grid[6] = [0.4195, 0.355]
grid[7] = [0.5015, 0.455] grid[7] = [0.5015, 0.355]
grid[8] = [0.5835, 0.455] grid[8] = [0.5835, 0.355]
grid[9] = [0.6655, 0.455] grid[9] = [0.6655, 0.355]
grid[10] = [0.3375, 0.605] grid[10] = [0.3375, 0.505]
grid[11] = [0.4195, 0.605] grid[11] = [0.4195, 0.505]
grid[12] = [0.5015, 0.605] grid[12] = [0.5015, 0.505]
grid[13] = [0.5835, 0.605] grid[13] = [0.5835, 0.505]
grid[14] = [0.6655, 0.605] grid[14] = [0.6655, 0.505]
grid[15] = [0.3375, 0.755] grid[15] = [0.3375, 0.655]
grid[16] = [0.4195, 0.755] grid[16] = [0.4195, 0.655]
grid[17] = [0.5015, 0.755] grid[17] = [0.5015, 0.655]
grid[18] = [0.5835, 0.755] grid[18] = [0.5835, 0.655]
grid[19] = [0.6655, 0.755] 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 mouseLDown = false;
var mouseRDown = false; var mouseRDown = false;
@@ -58,8 +73,10 @@ var hoverItem;
var dragItem = null; var dragItem = null;
var oldDragSlot; var oldDragSlot;
var actFreeSlot; var actFreeSlot;
var actFreeTradeSlot;
var bufferItem = []; var bufferItem = [];
var stackToItem; var stackToItem;
var stackToTradeItem;
mp.events.add("showInventory", (invWeight, itemArr) => { mp.events.add("showInventory", (invWeight, itemArr) => {
if (show === false) { if (show === false) {
@@ -79,9 +96,17 @@ mp.events.add("showInventory", (invWeight, itemArr) => {
inventoryWeight = 0; inventoryWeight = 0;
items = null; items = null;
itemRadial = false; itemRadial = false;
if (tradeItems.length === 0) {
isTrading = false;
}
} }
}); });
mp.events.add("openTradeMenu", (tradePartnerName) => {
tradePartner = tradePartnerName;
isTrading = true;
});
mp.events.add("showInventoryToAdmin", (pName, invWeight, itemArr) => { mp.events.add("showInventoryToAdmin", (pName, invWeight, itemArr) => {
if (showAdmin === false) { if (showAdmin === false) {
targetPlayerName = pName; 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) => { mp.events.add("removeItem", (userItemId, amount) => {
if (show) { if (show) {
var arrIndex; var arrIndex;
@@ -122,16 +166,16 @@ mp.events.add("render", () => {
mp.game.graphics.set2dLayer(1); mp.game.graphics.set2dLayer(1);
//INVENTARHINTERGRUND //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); mp.game.graphics.set2dLayer(2);
//INVENTARÜBERSCHRIFT //INVENTARÜBERSCHRIFT
mp.game.graphics.drawText("Inventar ~g~" + inventoryWeight + "/40000g", [rxC, ryC - (rWidth / 1.20)], { mp.game.graphics.drawText("Inventar ~g~" + inventoryWeight + "/40000g", [rxC, ryC - (rWidth / 1.20)], {
font: 7, font: 7,
color: [112, 128, 144, 254], color: [112, 128, 144, 254],
scale: [0.7, 0.7], scale: [0.7, 0.7],
outline: true, outline: true,
}); });
//SLOTS [RECHTECKE] [SLOTZAHLEN] //SLOTS [RECHTECKE] [SLOTZAHLEN]
var tempSlot; var tempSlot;
@@ -144,7 +188,7 @@ mp.events.add("render", () => {
outline: true, outline: true,
}); });
} }
mp.game.graphics.set2dLayer(3); mp.game.graphics.set2dLayer(3);
//SPRITES + ITEMANZAHL //SPRITES + ITEMANZAHL
for (var currentItem = 0; currentItem < items.length; currentItem++) { for (var currentItem = 0; currentItem < items.length; currentItem++) {
@@ -193,12 +237,20 @@ mp.events.add("render", () => {
//WENN MOUSE DOWN //WENN MOUSE DOWN
if (mouseLDown && dragItem !== null || mouseRDown && dragItem !== null) { 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); mp.game.graphics.set2dLayer(5);
if (itemRadial === true) { 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], { mp.game.graphics.drawText("~g~" + radialDescription, [pos[0] / screenX, pos[1] / screenY - 0.033], {
font: 4, font: 4,
color: [255, 255, 255, 255], color: [255, 255, 255, 255],
scale: [0.4, 0.4], scale: [0.5, 0.5],
outline: true, 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 ////--------------------------------------------------------------DEBUG
//mp.game.graphics.drawText(itemRadial.toString() + " ~y~" + radialSelect, [0.5, 0.05], { //mp.game.graphics.drawText(itemRadial.toString() + " ~y~" + radialSelect, [0.5, 0.05], {
// font: 7, // font: 7,
@@ -230,14 +395,12 @@ mp.events.add("render", () => {
// outline: true, // outline: true,
//}); //});
////KOORDINATEN ////KOORDINATEN
//if (ifMouseSelectRadial(pos[0], pos[1])) { //mp.game.graphics.drawText((pos[0] / screenX).toFixed(3) + " / " + (pos[1] / screenY).toFixed(3) + " " + tradeItems.length, [pos[0] / screenX, pos[1] / screenY - 0.02], {
// mp.game.graphics.drawText((pos[0] / screenX).toFixed(3) + " / " + (pos[1] / screenY).toFixed(3), [pos[0] / screenX, pos[1] / screenY - 0.02], { // font: 4,
// font: 4, // color: [255, 255, 255, 255],
// color: [255, 255, 255, 255], // scale: [0.4, 0.4],
// scale: [0.4, 0.4], // outline: true,
// outline: true, //});
// });
//}
////----------------------------------------------------------DEBUG END ////----------------------------------------------------------DEBUG END
} }
if (showAdmin === true) { if (showAdmin === true) {
@@ -266,7 +429,7 @@ mp.events.add("render", () => {
scale: [0.3, 0.3], scale: [0.3, 0.3],
outline: true, outline: true,
}); });
} }
mp.game.graphics.set2dLayer(3); mp.game.graphics.set2dLayer(3);
//SPRITES + ITEMANZAHL //SPRITES + ITEMANZAHL
@@ -313,6 +476,7 @@ mp.events.add("render", () => {
outline: true, outline: true,
}); });
} }
if (isMouseOverX(pos[0], pos[1])) { 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); mp.game.graphics.drawSprite("itemimages", "x", closePos[0], closePos[1], 0.02, 0.035, 0, 220, 20, 60, 255);
} else { } 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) { function isMouseOverFreeSlot(cX2, cY2) {
var x = cX2 / screenX; var x = cX2 / screenX;
var y = cY2 / screenY; var y = cY2 / screenY;
var a;
var b;
var c;
var isItemOnSlot = 0; var isItemOnSlot = 0;
for (var s = 0; s < 20; s++) { 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); 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++) { for (i = 0; i < items.length; i++) {
if (parseInt(items[i][4]) === invSlot) { if (parseInt(items[i][4]) === invSlot) {
isItemOnSlot++; isItemOnSlot++;
@@ -407,28 +591,81 @@ function isMouseOverFreeSlot(cX2, cY2) {
} }
} }
function isItemOverSameItem(cX2, cY2) { function isMouseOverFreeTradeSlot(cX2, cY2) {
if (dragItem !== null) {
if (tradeConfirm === false) {
var x = cX2 / screenX; var x = cX2 / screenX;
var y = cY2 / screenY; var y = cY2 / screenY;
var a; var isItemOnSlot = 0;
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);
for (var s = 0; s < 5; s++) {
var invSlot = (s + 1); 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++) { 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]) { if (dragTradeItem === false) {
stackToItem = i; if (items[dragItem][0] === items[i][0] && parseInt(items[i][4]) === invSlot && items[hoverItem][4] !== items[i][4]) {
return true; 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) { if (showAdmin) {
var x = cX2 / screenX; var x = cX2 / screenX;
var y = cY2 / screenY; var y = cY2 / screenY;
var a;
var b;
var c;
a = closePos[0] - x; if (x > closePos[0] - 0.01 && x < closePos[0] + 0.01 && y > closePos[1] - 0.0175 && y < closePos[1] + 0.0175) {
b = closePos[1] - y; return true;
c = Math.sqrt(a * a + b * b); }
if (c < 0.018) { }
}
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; return true;
} }
} }
@@ -500,57 +753,34 @@ mp.events.add('click', (x, y, upOrDown, leftOrRight, relativeX, relativeY, world
var cX = x / screenX; var cX = x / screenX;
var cY = y / screenY; 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) { if (show) {
//LINKE MAUSTASTE //LINKE MAUSTASTE
//RUNTER //RUNTER
if (upOrDown === "down" && leftOrRight === "left" && mouseLDown === false && mouseRDown === false) { 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; mouseLDown = true;
if (isMouseOverItem(x, y) && dragItem === null && itemRadial === false) { if (isMouseOverItem(x, y) && dragItem === null && itemRadial === false) {
dragItem = hoverItem; dragItem = hoverItem;
oldDragSlot = items[dragItem][4]; oldDragSlot = items[dragItem][4];
items[dragItem][4] = "-1"; items[dragItem][4] = "-1";
dragTradeItem = false;
} else if (ifMouseSelectRadial(x, y)) { } else if (ifMouseSelectRadial(x, y)) {
switch (radialSelect) { switch (radialSelect) {
case "up": case "up":
@@ -566,8 +796,8 @@ mp.events.add('click', (x, y, upOrDown, leftOrRight, relativeX, relativeY, world
return; return;
} }
mp.events.callRemote('itemInteract', "drop", items[clickedItem][5], parseInt(amount)); mp.events.callRemote('itemInteract', "drop", items[clickedItem][5], parseInt(amount));
}); });
itemRadial = false; itemRadial = false;
break; break;
case "down": case "down":
@@ -580,7 +810,12 @@ mp.events.add('click', (x, y, upOrDown, leftOrRight, relativeX, relativeY, world
case "right": case "right":
itemRadial = false; itemRadial = false;
break; 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 (dragItem !== null) {
if (isMouseOverFreeSlot(x, y)) { 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; oldDragSlot = null;
dragItem = null; dragItem = null;
hoverItem = null; hoverItem = null;
} else if (isItemOverSameItem(x, y)) { } else if (isItemOverSameItem(x, y)) {
var newAmount = parseInt(items[stackToItem][3]) + parseInt(items[dragItem][3]); if (dragTradeItem === false) {
items[stackToItem][3] = newAmount.toString(); var newAmount = parseInt(items[stackToItem][3]) + parseInt(items[dragItem][3]);
items[dragItem][4] = "-1"; 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; 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 { } else {
items[dragItem][4] = oldDragSlot; if (dragTradeItem === false) {
items[dragItem][4] = oldDragSlot;
} else {
tradeItems[dragItem][4] = oldDragSlot;
}
dragItem = null; dragItem = null;
hoverItem = null; hoverItem = null;
} }
@@ -616,17 +888,24 @@ 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;
oldDragSlot = items[hoverItem][4]; oldDragSlot = items[hoverItem][4];
bufferItem = [items[hoverItem][0], items[hoverItem][1], items[hoverItem][2], items[hoverItem][3], items[hoverItem][4], items[hoverItem][5]]; 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 //HOCH
if (upOrDown === "up" && leftOrRight === "right" && mouseRDown === true && itemRadial === false) { if (upOrDown === "up" && leftOrRight === "right" && mouseRDown === true && itemRadial === false) {
mouseRDown = false; mouseRDown = false;
if (Date.now() - clickTime < 300 && isMouseOverItem(x, y)) { if (Date.now() - clickTime < 100 && isMouseOverItem(x, y)) {
clickedItem = hoverItem; clickedItem = hoverItem;
items[hoverItem][3]++; items[hoverItem][3]++;
itemRadial = true; itemRadial = true;
@@ -636,23 +915,67 @@ mp.events.add('click', (x, y, upOrDown, leftOrRight, relativeX, relativeY, world
} else { } else {
if (dragItem !== null) { if (dragItem !== null) {
if (isMouseOverFreeSlot(x, y)) { if (isMouseOverFreeSlot(x, y)) {
if (dragTradeItem === false) {
items.push([items[dragItem][0], items[dragItem][1], items[dragItem][2], "1", actFreeSlot.toString(), "-1"]); items.push([items[dragItem][0], items[dragItem][1], items[dragItem][2], "1", actFreeSlot.toString(), "-1"]);
if (items[hoverItem][3] === 0) { if (items[hoverItem][3] === 0) {
items[hoverItem][4] = "-1"; 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; dragItem = null;
hoverItem = null; hoverItem = null;
} else if (isItemOverSameItem(x, y)) { } else if (isItemOverSameItem(x, y)) {
items[stackToItem][3]++; items[stackToItem][3]++;
if (items[hoverItem][3] === 0) { if (dragTradeItem === false) {
items[hoverItem][4] = "-1"; if (items[hoverItem][3] === 0) {
items[hoverItem][4] = "-1";
}
} else {
if (tradeItems[hoverItem][3] === 0) {
tradeItems.splice(hoverItem, 1);
}
} }
bufferItem = null; bufferItem = null;
dragItem = null; dragItem = null;
hoverItem = 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 { } else {
items[hoverItem][3]++; if (dragTradeItem === false) {
items[hoverItem][3]++;
} else {
tradeItems[hoverItem][3]++;
}
bufferItem = null; bufferItem = null;
dragItem = null; dragItem = null;
hoverItem = null; hoverItem = null;
@@ -673,7 +996,7 @@ mp.events.add('click', (x, y, upOrDown, leftOrRight, relativeX, relativeY, world
} }
} }
//RECHTE MAUSTASTEshowAdmin = true; //RECHTE MAUSTASTE
//RUNTER //RUNTER
if (upOrDown === "down" && leftOrRight === "right" && mouseLDown === false && mouseRDown === false) { if (upOrDown === "down" && leftOrRight === "right" && mouseLDown === false && mouseRDown === false) {

266
Client/Interaction/interaction.js Normal file
View File

@@ -0,0 +1,266 @@
var nearbyPlayers = [];
let screenRes = mp.game.graphics.getScreenResolution(0, 0);
var tradeRequest;
var tradeRequester;
var timerBarSize = 0.5;
var tradeTimeLeft;
var tradeSelection = "none";
var tradeSelectHover = "none";
var acceptColor = 100;
var declineColor = 100;
const { x: screenX, y: screenY } = mp.game.graphics.getScreenActiveResolution(0, 0);
let rxC = 0.5;
let ryC = 0.4;
let rWidth = 0.4;
let sX = (screenX * 0.1 / 1000);
let sY = (screenY * 0.1 / 1000);
let eX = sX - 0.1;
let eY = sY - 0.1;
let sizeMul = 0.08;
let yMul = 1.8;
var receivedTradePrize;
var receivedTradeItems = [[]];
var receivedTradeGrid = [];
receivedTradeGrid[0] = [0.3375, 0.5]
receivedTradeGrid[1] = [0.4195, 0.5]
receivedTradeGrid[2] = [0.5015, 0.5]
receivedTradeGrid[3] = [0.5835, 0.5]
receivedTradeGrid[4] = [0.6655, 0.5]
const NativeUI = require("nativeui");
const Menu = NativeUI.Menu;
const UIMenuItem = NativeUI.UIMenuItem;
const UIMenuListItem = NativeUI.UIMenuListItem;
const UIMenuCheckboxItem = NativeUI.UIMenuCheckboxItem;
const BadgeStyle = NativeUI.BadgeStyle;
const Point = NativeUI.Point;
const ItemsCollection = NativeUI.ItemsCollection;
const Color = NativeUI.Color;
mp.events.add("showPlayerInteraction", (nearPlayerArr) => {
mp.gui.chat.activate(false);
nearbyPlayers = JSON.parse(nearPlayerArr);
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));
playerInteractionMenu.AddItem(playerSelect);
playerInteractionMenu.AddItem(new UIMenuItem("Handeln", "Sende dem Spieler eine Handlungsanfrage"));
let cancelItem = new UIMenuItem("Schlie\u00dfen", "Schlie\u00dft die Spielerinteraktion");
cancelItem.BackColor = new Color(213, 0, 0);
cancelItem.HighlightedBackColor = new Color(229, 57, 53);
playerInteractionMenu.AddItem(cancelItem);
playerInteractionMenu.Visible = true;
playerInteractionMenu.ItemSelect.on((item) => {
if (item.Text === "Handeln") {
mp.events.callRemote("openTradeInventory", playerSelect.SelectedValue);
playerInteractionMenu.Visible = false;
mp.gui.chat.activate(true);
globalData.PlayerInteraction = false;
} else if (item.Text === "Abbrechen") {
globalData.PlayerInteraction = false;
playerInteractionMenu.Visible = false;
mp.gui.chat.activate(true);
globalData.PlayerInteraction = false;
}
});
});
mp.events.add("showTradeRequest", (tradeRequesterName, tradeItemsArr, tradePrizeSent) => {
receivedTradeItems = tradeItemsArr;
receivedTradePrize = tradePrizeSent;
mp.gui.cursor.show(true, true);
tradeRequester = tradeRequesterName;
tradeRequest = true;
tradeTime = new Date().getTime();
tradeTimeEnd = tradeTime + 30000;
});
mp.events.add("render", () => {
if (tradeRequest) {
var pos = mp.gui.cursor.position;
var actualTime = new Date().getTime();
tradeTimeLeft = (tradeTimeEnd - actualTime) / 1000;
mp.game.graphics.set2dLayer(1);
mp.game.graphics.drawRect(0.5, 0.5, 0.5, 0.3, 255, 255, 255, 200);
mp.game.graphics.drawText("Handelsanfrage von ~y~" + tradeRequester + " ~s~ für ~g~" + receivedTradePrize + "$", [0.5, 0.5 - 0.13], {
font: 7,
color: [112, 128, 144, 254],
scale: [0.7, 0.7],
outline: true,
});
mp.game.graphics.set2dLayer(2);
for (var slots = 0; slots < receivedTradeGrid.length; slots++) {
mp.game.graphics.drawRect(receivedTradeGrid[slots][0], receivedTradeGrid[slots][1], sizeMul, sizeMul * yMul, 112, 128, 144, 254);
mp.game.graphics.drawText(tempSlot2 = slots + 1, [receivedTradeGrid[slots][0] - (sizeMul / 2) + 0.006, receivedTradeGrid[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 (receivedTradeItems.length !== 0) {
for (var currentItem = 0; currentItem < receivedTradeItems.length; currentItem++) {
if (receivedTradeItems[currentItem][4] !== "-1") {
mp.game.graphics.drawSprite("itemimages", receivedTradeItems[currentItem][0].toLowerCase(), receivedTradeGrid[parseInt(receivedTradeItems[currentItem][4] - 1)][0], receivedTradeGrid[parseInt(receivedTradeItems[currentItem][4] - 1)][1], rWidth / 8, rWidth / 5, 0, 255, 255, 255, 255);
mp.game.graphics.drawText("(~y~" + receivedTradeItems[currentItem][3] + "~s~)", [receivedTradeGrid[parseInt(receivedTradeItems[currentItem][4] - 1)][0] + (sizeMul / 2) - 0.008, receivedTradeGrid[parseInt(receivedTradeItems[currentItem][4] - 1)][1] + 0.05], {
font: 0,
color: [255, 255, 255, 255],
scale: [0.25, 0.25],
outline: true,
});
}
}
}
mp.game.graphics.set2dLayer(4);
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);
var hoverItemP = [receivedTradeItems[hoverItem][0], receivedTradeItems[hoverItem][1], receivedTradeItems[hoverItem][2], receivedTradeItems[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,
});
}
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);
mp.game.graphics.drawText("~g~Annehmen", [0.5 - 0.07, 0.5 + 0.08], {
font: 4,
color: [112, 128, 144, 254],
scale: [0.6, 0.6],
outline: true,
});
mp.game.graphics.drawText("~r~Ablehnen", [0.5 + 0.07, 0.5 + 0.08], {
font: 4,
color: [112, 128, 144, 254],
scale: [0.6, 0.6],
outline: true,
});
mp.game.graphics.set2dLayer(7);
timerBarSize = tradeTimeLeft / 30 * 0.5;
if (tradeTimeLeft > 0) {
mp.game.graphics.drawText(tradeTimeLeft.toFixed(0), [0.5, 0.5 + 0.1312], {
font: 7,
color: [255, 255, 255, 255],
scale: [0.35, 0.35],
outline: true,
});
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";
tradeRequest = false;
mp.gui.cursor.show(false, false);
}
}
});
function isMouseOverButton(cX, cY) {
if (tradeRequest) {
var x = cX / screenX;
var y = cY / screenY;
if (x > 0.5 - 0.07 - 0.03 && x < 0.5 - 0.07 + 0.03 && y > 0.5 + 0.1 - 0.02 && y < 0.5 + 0.1 + 0.02) {
acceptColor = 255;
tradeSelectHover = "accept";
return true;
} else if (x > 0.5 + 0.07 - 0.03 && x < 0.5 + 0.07 + 0.03 && y > 0.5 + 0.1 - 0.02 && y < 0.5 + 0.1 + 0.02) {
declineColor = 255;
tradeSelectHover = "decline";
return true;
} else {
acceptColor = 100;
declineColor = 100;
return false;
}
}
}
function isMouseOverTradeItem(cX, cY) {
if (tradeRequest) {
var x = cX / screenX;
var y = cY / screenY;
var a;
var b;
var c;
for (var s = 0; s < 5; s++) {
a = receivedTradeGrid[s][0] - x;
b = receivedTradeGrid[s][1] - y;
c = Math.sqrt(a * a + b * b);
var invSlot = (s + 1);
if (c < sizeMul / 2) {
for (i = 0; i < receivedTradeItems.length; i++) {
if (parseInt(receivedTradeItems[i][4]) === invSlot) {
hoverItem = i;
return true;
}
}
}
}
}
}
mp.events.add('click', (x, y, upOrDown, leftOrRight, relativeX, relativeY, worldPosition, hitEntity) => {
var cX = x / screenX;
var cY = y / screenY;
if (tradeRequest) {
//LINKE MAUSTASTE
//RUNTER
if (upOrDown === "down" && leftOrRight === "left") {
if (isMouseOverButton(x, y)) {
if (tradeSelectHover === "accept") {
tradeSelection = "accept";
} else if (tradeSelectHover === "decline") {
tradeSelection = "decline";
}
mp.events.callRemote('tradeDecision', tradeSelection, JSON.stringify(receivedTradeItems), tradeRequester);
tradeRequest = false;
mp.gui.cursor.show(false, false);
}
}
}
});

8
Client/Player/keys.js
View File

@@ -20,6 +20,14 @@ mp.keys.bind(0x0D, false, function () {
} }
}); });
//LEFT ARROW (Interaktion mit anderen Spielern)
mp.keys.bind(0x25, false, function () {
if (!chat && !showInv && !globalData.PlayerInteraction) {
mp.events.callRemote("keyPress:LEFT_ARROW");
globalData.PlayerInteraction = true;
}
});
//F7 //Unshowalles //F7 //Unshowalles
mp.keys.bind(0x76, false, function () { mp.keys.bind(0x76, false, function () {

4
Client/dlcpacks/itemimages/dlc.rpf
View File

@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:7ff24e43dc8dba5207214613cb949c6a5a8ac29bfa90ae40a985e9c82a8cde43 oid sha256:ad67a68580431746ceea4e52b889f694ce7521430d0d6c6a6cf3582db450f97a
size 69632 size 76800

21
Client/index.js
View File

@@ -6,19 +6,24 @@
let globalData = { let globalData = {
InTuning: false, InTuning: false,
HideGui: false HideGui: false,
PlayerInteraction: false
}; };
mp.game.gameplay.enableMpDlcMaps(true); mp.game.gameplay.enableMpDlcMaps(true);
require('./CharCreator/index.js'); //ALPHABETISCH SORTIERT UND ZUSAMMENGEF<45>GT
require('./Business/main.js');
require('./Business/cardealer.js');
require('./CharCreator/index.js');
require('./coloredhlights'); require('./coloredhlights');
require('./FactionManagement/main.js');
require('./DoorManager/doormanager.js'); require('./DoorManager/doormanager.js');
require('./FactionManagement/main.js');
require('./Gui/deathscreen.js'); require('./Gui/deathscreen.js');
require('./Gui/infobox.js'); require('./Gui/infobox.js');
require('./Gui/nametags.js'); require('./Gui/nametags.js');
@@ -26,6 +31,8 @@ require('./Gui/playerlist.js');
require('./Gui/Inventory/inventory.js'); require('./Gui/Inventory/inventory.js');
require('./Gui/vehiclemenu/main.js'); require('./Gui/vehiclemenu/main.js');
require('./Interaction/interaction.js');
require('./Login/main.js'); require('./Login/main.js');
require('./Player/dutycloth.js'); require('./Player/dutycloth.js');
@@ -33,15 +40,11 @@ require('./Player/keys.js');
require('./Player/quit.js'); require('./Player/quit.js');
require('./Player/freecam.js'); require('./Player/freecam.js');
require('./vehiclesync/vehiclesync.js');
require('./Save/main.js'); require('./Save/main.js');
require('./Speedometer/index.js'); require('./Speedometer/index.js');
require('./Tuning/main.js'); require('./Tuning/main.js');
require('./Tuning/sync.js'); require('./Tuning/sync.js');
require('./Tuning/sirensilence.js'); require('./Tuning/sirensilence.js');
require('./Business/main.js'); require('./vehiclesync/vehiclesync.js');
require('./Business/cardealer.js');

30
Server/Events/Key.cs
View File

@@ -38,7 +38,35 @@ namespace reallife_gamemode.Server.Events
GroundItem.PickUpGroundItem(player); GroundItem.PickUpGroundItem(player);
} }
[RemoteEvent("keyPress:E")] [RemoteEvent("keyPress:LEFT_ARROW")]
public void KeyPressLeftArrow(Client player)
{
if (!player.IsLoggedIn()) return;
List<Client> nearbyPlayers = NAPI.Player.GetPlayersInRadiusOfPlayer(3, player);
if (nearbyPlayers.Count > 0)
{
List<string> nearbyPlayerList = new List<string>();
foreach (Client nearPlayer in nearbyPlayers)
{
if (nearPlayer.Name != player.Name)
{
nearbyPlayerList.Add(nearPlayer.Name);
}
else
{
continue;
}
}
player.TriggerEvent("showPlayerInteraction", JsonConvert.SerializeObject(nearbyPlayerList));
}
else
{
player.SendNotification("~r~Es ist niemand in deiner N\u00e4he!", false);
}
}
[RemoteEvent("keyPress:E")]
public void KeyPressE(Client player) public void KeyPressE(Client player)
{ {
if (!player.IsLoggedIn()) return; if (!player.IsLoggedIn()) return;

57
Server/Managers/InteractionManager.cs Normal file
View File

@@ -0,0 +1,57 @@
using GTANetworkAPI;
using Newtonsoft.Json;
using reallife_gamemode.Server.Extensions;
using reallife_gamemode.Server.Services;
using System;
using System.Collections.Generic;
using System.Text;
/**
* @overview Life of German Reallife - Managers Interaction (InteractionManager.cs)
* @author VegaZ
* @copyright (c) 2008 - 2018 Life of German
*/
namespace reallife_gamemode.Server.Managers
{
public class InteractionManager : Script
{
[RemoteEvent("openTradeInventory")]
public void OpenTradeInventory(Client player, string targetPlayer)
{
InventoryManager.GetUserItems(player);
player.TriggerEvent("openTradeMenu", targetPlayer);
}
[RemoteEvent("sendTradeItemsToPartner")]
public void SendTradeItemsToPartner(Client player, string tradeItemArray, int tradePrize, string tradePartnerName)
{
var tradeItems = JsonConvert.DeserializeObject<string[][]>(tradeItemArray);
Client tradePartner = ClientService.GetClientByNameOrId(tradePartnerName);
InventoryManager.GetUserItems(player);
tradePartner.TriggerEvent("showTradeRequest", player.Name, tradeItems, tradePrize);
player.TriggerEvent("startTradeRequestTimer");
//player.TriggerEvent("openTradeMenu", targetPlayer);
}
[RemoteEvent("tradeDecision")]
public void TradeDecision(Client player, string tradeSelection, string tradeItemArray, string tradeRequesterName)
{
var tradeItems = JsonConvert.DeserializeObject<string[][]>(tradeItemArray);
Client tradeRequester = ClientService.GetClientByNameOrId(tradeRequesterName);
//player.SendChatMessage(tradeItemArray);
//player.SendChatMessage(tradeSelection);
if (tradeSelection == "accept")
{
InventoryManager.GetUserItems(player);
tradeRequester.TriggerEvent("clearTradeItems");
player.TriggerEvent("showTradeItems", tradeItemArray);
}
else
{
tradeRequester.TriggerEvent("unlockTradeItems");
}
}
}
}