Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop

Client/Gui/Inventory/inventory.js

@@ -0,0 +1,332 @@
+var show = false;
+var trading = false;
+const { x: screenX, y: screenY } = mp.game.graphics.getScreenActiveResolution(0, 0);
+let rxC = 0.5;
+let ryC = 0.5;
+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 inventoryWeight;
+var items = [[]];
+
+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]
+
+var mouseLDown = false;
+var mouseRDown = false;
+var hoverItem;
+var dragItem = null;
+var oldDragSlot;
+var actFreeSlot;
+var bufferItem = [];
+var stackToItem;
+
+mp.events.add("showInventory", (invWeight, itemArr) => {
+    if (show === false) {
+        mp.gui.chat.activate(false);
+        mp.gui.cursor.show(true, true);
+        inventoryWeight = invWeight;
+        items = itemArr;
+        show = true;
+        mp.game.graphics.requestStreamedTextureDict("itemimages", true);
+    } else {
+        mp.events.callRemote('saveInventory', JSON.stringify(items));
+        mp.gui.chat.activate(true);
+        mp.gui.cursor.show(false, false);
+        show = false;
+        mp.game.graphics.setStreamedTextureDictAsNoLongerNeeded("itemimages");
+    }
+});
+
+mp.events.add("addItem", (item) => {
+    items.push(item);
+});
+
+mp.events.add("render", () => {
+    if (show === true) {
+        var pos = mp.gui.cursor.position;
+
+        mp.game.graphics.set2dLayer(1);
+        //INVENTARHINTERGRUND
+        mp.game.graphics.drawRect(rxC, ryC, 0.45, 0.7, 255, 255, 255, 200); 
+
+        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;
+        for (var slots = 0; slots < grid.length; slots++) {
+            mp.game.graphics.drawRect(grid[slots][0], grid[slots][1], sizeMul, sizeMul * yMul, 112, 128, 144, 254);
+            mp.game.graphics.drawText(tempSlot = slots + 1, [grid[slots][0] - (sizeMul / 2) + 0.006, grid[slots][1] - (sizeMul / 2 * yMul)], {
+                font: 7,
+                color: [255, 69, 0, 254],
+                scale: [0.3, 0.3],
+                outline: true,
+            });
+        }
+
+        mp.game.graphics.set2dLayer(3);
+        //SPRITES + ITEMANZAHL
+        for (var currentItem = 0; currentItem < items.length; currentItem++) {
+            if (items[currentItem][4] !== "-1") {
+                mp.game.graphics.drawSprite("itemimages", items[currentItem][0].toLowerCase(), grid[parseInt(items[currentItem][4] - 1)][0], grid[parseInt(items[currentItem][4] - 1)][1], rWidth / 8, rWidth / 5, 0, 255, 255, 255, 255);
+                mp.game.graphics.drawText("(~y~" + items[currentItem][3] + "~s~)", [grid[parseInt(items[currentItem][4] - 1)][0] + (sizeMul / 2) - 0.008, grid[parseInt(items[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);
+        //WENN MAUS ÜBER ITEM
+        if (isMouseOverItem(pos[0], pos[1]) && dragItem === null) {
+            mp.game.graphics.drawRect(pos[0] / screenX, pos[1] / screenY + 0.055, 0.14, 0.08, 0, 0, 0, 220);
+
+            var hoverItemP = [items[hoverItem][0], items[hoverItem][1], items[hoverItem][2], items[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,
+            });
+        }
+
+        //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);
+            }
+            
+        }      
+    }   
+});
+
+function isMouseOverItem(cX, cY) {
+
+    if (dragItem === null) {
+
+        var x = cX / screenX;
+        var y = cY / 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) {
+                        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) {
+            for (i = 0; i < items.length; i++) {
+                if (parseInt(items[i][4]) === invSlot) {
+                    isItemOnSlot++;
+                }
+            }
+            if (isItemOnSlot === 0) {
+                actFreeSlot = s + 1;
+                return true;
+            }
+        }
+    }   
+}
+
+function isItemOverSameItem(cX2, cY2) {
+
+    if (dragItem !== null) {
+
+        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 (items[dragItem][0] === items[i][0] && parseInt(items[i][4]) === invSlot && items[hoverItem][4] !== items[i][4]) {
+                        stackToItem = i;
+                        return true;
+                    }
+                }
+            }
+        }
+    }
+}
+
+mp.events.add('click', (x, y, upOrDown, leftOrRight, relativeX, relativeY, worldPosition, hitEntity) => {
+
+    var cX = x / screenX;
+    var cY = y / screenY;
+
+    if (show) {
+        //LINKE MAUSTASTE
+        //RUNTER
+        if (upOrDown === "down" && leftOrRight === "left" && mouseLDown === false && mouseRDown === false) {
+
+            mouseLDown = true;
+
+            if (isMouseOverItem(x, y) && dragItem === null) {
+                dragItem = hoverItem;
+                oldDragSlot = items[dragItem][4];
+                items[dragItem][4] = "-1";
+            }
+        }
+
+        //HOCH
+        if (upOrDown === "up" && leftOrRight === "left" && mouseLDown === true) {
+
+            mouseLDown = false;
+
+            if (dragItem !== null) {
+                if (isMouseOverFreeSlot(x, y)) {
+                    items[dragItem][4] = actFreeSlot;
+                    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";
+                    dragItem = null;
+                    hoverItem = null;              
+                } else {
+                    items[dragItem][4] = oldDragSlot;
+                    dragItem = null;
+                    hoverItem = null;
+                }
+            }
+        }
+
+        //RECHTE MAUSTASTE
+        //RUNTER
+        if (upOrDown === "down" && leftOrRight === "right" && mouseLDown === false && mouseRDown === false) {
+
+            mouseRDown = true;
+
+            if (isMouseOverItem(x, y) && dragItem === null) {
+                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]--;               
+            }
+        }
+
+        //HOCH
+        if (upOrDown === "up" && leftOrRight === "right" && mouseRDown === true) {
+
+            mouseRDown = false;
+
+            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";
+                    }
+                    dragItem = null;
+                    hoverItem = null;
+                } else if (isItemOverSameItem(x, y)) {
+                    items[stackToItem][3]++;
+                    items[hoverItem][4] = "-1";
+                    bufferItem = null;
+                    dragItem = null;
+                    hoverItem = null;
+                } else {
+                    items[hoverItem][3]++;
+                    bufferItem = null;
+                    dragItem = null;
+                    hoverItem = null;
+                }
+            }
+        }
+    }  
+});

Client/Player/keys.js

@@ -7,6 +7,7 @@
 //https://docs.microsoft.com/de-de/windows/desktop/inputdev/virtual-key-codes
 
 var chat = false;
+var showInventory = false;
 var showGui = true;
 
 const player = mp.players.local;
@@ -43,11 +44,18 @@ mp.keys.bind(0x45, false, function () {
 });
 
 
-//I //Spielerliste
+//I //Inventar
 mp.keys.bind(0x49, false, function () {
     if (!chat) {
-        mp.events.callRemote("keyPress:I");
-        //mp.events.call("showPlayerlist");   
+        mp.events.callRemote("keyPress:I");         
+    }
+});
+
+//J //Spielerliste
+mp.keys.bind(0x4A, false, function () {
+    if (!chat) {
+        mp.events.callRemote("keyPress:J");
+        //mp.events.call("showPlayerlist"); 
     }
 });
 

Client/dlcpacks/itemimages/dlc.rpf

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dcf279344c11eb9eac1801e56e6fa11172e577ff415363338c5f38d2d1152b31
+size 33792

Client/index.js

@@ -21,6 +21,7 @@ require('./Gui/deathscreen.js');
 require('./Gui/infobox.js');
 require('./Gui/nametags.js');
 require('./Gui/playerlist.js');
+require('./Gui/Inventory/inventory.js');
 
 require('./Login/main.js');