Fix Inventory, add different Trunk sizes

ReallifeGamemode.Client/Interaction/ItemShop.ts

@@ -26,10 +26,9 @@ export default function itemShopList(globalData: IGlobalData) {
     function addItems(data) {
 
         // Fill it
-
         for (const item of data) {
             
-            const tempItem = new UIMenuItem(item.Name, "");
+            const tempItem = new UIMenuItem(item.Name, item.Description);
 
             tempItem.SetRightLabel(`${item.Price > 0 ? `$${item.Price}` : "FREE"}`);
 
@@ -70,6 +69,8 @@ export default function itemShopList(globalData: IGlobalData) {
             // Reset some variables
             currentMenuIdx = -1;
             menuTransition = false;
+            items = [];
+
 
 
             // Create a new main menu
@@ -84,6 +85,7 @@ export default function itemShopList(globalData: IGlobalData) {
             // Main menu events
             mainMenu.ItemSelect.on((selectedItem, itemIndex) => {
                 const nextItem = items[itemIndex];
+                mp.console.logInfo(JSON.stringify(items));
                 mp.events.callRemote("SERVER:BuyItems", nextItem.Name);
 
             });

ReallifeGamemode.Client/assets/html/inventory/css/inventory.css

@@ -14,9 +14,7 @@
     -ms-user-select: none;
     user-select: none;
 }
-div {
-    user-select: none;
-}
+
 
 body {
     width: 100%;
@@ -618,8 +616,8 @@ t#tf_nameorid {
     display: inline-block;
     font-size: 0.5vw;
     position: relative;
-    left: 7.7vw;
-    top: 1vw;
+    left: -7vw;
+    top: 5vw;
     color: #ffffff;
 }
 
@@ -633,8 +631,8 @@ t#tf_nameorid {
     display: inline-block;
     font-size: 0.5vw;
     position: relative;
-    left: 12.5vw;
-    top: -0.3vw;
+    left: 5.5vw;
+    top: -0.1vw;
     color: #ffffff;
     transition: 0.3s;
 }
@@ -653,7 +651,7 @@ t#tf_nameorid {
     display: inline-block;
     font-size: 0.5vw;
     position: relative;
-    left: -5.4vw;
+    left: 5.7vw;
     top: 6vw;
     color: #ffffff;
     transition: 0.3s;

ReallifeGamemode.Client/assets/html/inventory/inventory.html

@@ -62,7 +62,7 @@
     <div name="vehClass" class="veh hidden">
         <div class="main">
             <div class="title">
-                <div class="titlecount"><span id="count2">0</span> / 250 Kilogramm</div>
+                <div class="titlecount"><span id="count2">0</span> / <span id="trunkSize">0</span> Kilogramm</div>
                 <div class="titletext">Fahrzeug</div>
             </div>
             <div class="Betrag4" style="display: none;">
@@ -193,9 +193,11 @@
             mp.trigger("CEF:callVehicleInventory");
         }
 
-        function setVehicleItems(jsonItemArr) {
+        function setVehicleItems(jsonItemArr, trunkSize) {
             var parsedItemArr = JSON.parse(jsonItemArr)
             vehInv = [];
+            $('#trunkSize').html(trunkSize / 1000);
+
             for (var i = 0; i < parsedItemArr.length; i++) {
                 var item = parsedItemArr[i];
                 var newItem = { Name: item.Name, ID: item.ItemId, Amount: item.Amount, Category: 0 };
@@ -463,7 +465,7 @@
                 blueButtonImg.setAttribute("class", "blueImg");
                 blueButton.appendChild(blueButtonImg);
 
-                var listLength = list.length;
+                var listLength = list.getElementsByTagName("li").length;
 
                 var row = 1;
 
@@ -483,7 +485,7 @@
                     row = 6;
                 }
 
-                var Litem = document.createElement("div");
+                var Litem = document.createElement("li");
                 Litem.setAttribute("class", "item" + row);
                 Litem.setAttribute("id", i);
                 Litem.setAttribute("name", "List" + item.Category);
@@ -505,7 +507,7 @@
             while (child) {
                 e.removeChild(child);
                 child = e.lastElementChild;
-            } console.log(handelInv);
+            }
 
             for (var i = 0; i < vehInv.length; i++) {
                 var item = vehInv[i];
@@ -533,7 +535,7 @@
                 blueButtonImg.setAttribute("class", "blueImg");
                 blueButton.appendChild(blueButtonImg);
 
-                var listLength = list.length;
+                var listLength = list.getElementsByTagName("li").length;
 
                 var row = 1;
 

ReallifeGamemode.Client/inventory/inventory.ts

@@ -8,6 +8,7 @@
     var offerItemArr;
     var tradeItemArr;
     var vehItemArr;
+    var trunkSize;
 
     var loaded = false;
 
@@ -36,18 +37,18 @@
     var tradeItemWeight;
 
     mp.events.add('openInventory', () => {
-            globalData.InMenu = true;
-            mp.gui.cursor.show(true, true);
-            itemArr = [];
-            vehItemArr = [];
-            invBrowser = mp.browsers.new('package://assets/html/inventory/inventory.html');        
+        globalData.InMenu = true;
+        mp.gui.cursor.show(true, true);
+        itemArr = [];
+        vehItemArr = [];
+        invBrowser = mp.browsers.new('package://assets/html/inventory/inventory.html');
     });
     mp.events.add('closeInventory', () => {
-            invBrowser.destroy()
-            invBrowser = null;
-            globalData.InMenu = false;
-            loaded = false;
-            mp.gui.cursor.show(false, false);
+        invBrowser.destroy()
+        invBrowser = null;
+        globalData.InMenu = false;
+        loaded = false;
+        mp.gui.cursor.show(false, false);
         return;
     });
 
@@ -60,18 +61,24 @@
     });
 
     mp.events.addDataHandler("backpackItems", (entity: EntityMp, jsonItemArr) => {
-        if (entity.handle != mp.players.local.handle) return;
+        if (entity != mp.players.local) return;
         itemArr = JSON.parse(jsonItemArr);
         if (loaded)
             invBrowser.execute(`setBackpackItems('${JSON.stringify(itemArr)}',true)`);
     });
 
+    mp.events.addDataHandler("setVehicleTrunk", (entity: EntityMp, size) => {
+        if (entity != mp.players.local) return;
+        trunkSize = size;
+    });
+
     mp.events.addDataHandler("vehicleItems", (entity: EntityMp, jsonItemArr) => {
         if (entity != mp.players.local) return;
         vehItemArr = JSON.parse(jsonItemArr);
 
-        if (loaded)
-            invBrowser.execute(`setVehicleItems('${JSON.stringify(vehItemArr)}')`);
+        if (loaded) {
+            invBrowser.execute(`setVehicleItems('${JSON.stringify(vehItemArr)}', '${trunkSize}')`);
+        }
     });
 
     mp.events.add("CEF:InventoryLoaded", () => {
@@ -79,7 +86,7 @@
         if (vehItemArr.length != 0) {
             invBrowser.execute(`setVehicleItems('${JSON.stringify(vehItemArr)}')`);
         }
-       
+
         //invBrowser.execute(`setTradeItems('${JSON.stringify(tradeItemArr)}')`);
         //invBrowser.execute(`setOfferItems('${JSON.stringify(offerItemArr)}')`);
         loaded = true;
@@ -98,7 +105,7 @@
     });
 
     mp.events.add("CEF:useItem", (type, amount, id) => {
-        mp.events.callRemote("itemInteract", type, amount, id);  
+        mp.events.callRemote("itemInteract", type, amount, id);
     });
 
     mp.events.add("removeItem", (id, amount) => {
@@ -110,7 +117,7 @@
     mp.events.add("aproveUse", (amount, name) => {
         if (invBrowser !== null) {
             mp.game.audio.playSoundFrontend(1, "LOCAL_PLYR_CASH_COUNTER_COMPLETE", "DLC_HEISTS_GENERAL_FRONTEND_SOUNDS", true);
-            invBrowser.execute(`alertGreen('${JSON.stringify(amount)}','${JSON.stringify(name)}')`);    
+            invBrowser.execute(`alertGreen('${JSON.stringify(amount)}','${JSON.stringify(name)}')`);
             mp.events.call("closeInventory");
         }
     });
@@ -136,7 +143,6 @@
         }
     });
 
-
     mp.events.add("CEF:acceptTrade", () => {
         if (invBrowser !== null) {
             mp.events.callRemote('acceptTrade');