Inventory system improvements,

stats

Items/itemGeneration.ts

@@ -1,38 +1,20 @@
-import { enums } from "../Classes/enums";
-import { itemData } from "../Classes/itemData";
+import { itemData, persistentItemData } from "../Classes/itemData";
 import {game} from "../game";
 
-let consumableNames = ["soda", "bread"]
-let currencyNames = ["stick", "rock", "leaf", "coin"]
-let equipmentNames = ["umbrella", "sock", "bag"]
-let miscNames = ["book", "envelope"]
+function getRandom(arr){
+    return arr[Math.floor(Math.random()*arr.length)]
+}
 
-export function generateItem(itemType : number){
-    let item = new itemData()
-    item.id = ++game.itemCount;
-    item.itemType = itemType
-    item.rarity = Math.floor(Math.random()*100)
-    switch(itemType){
-        case enums.itemType.undefined:{
-            item.name = miscNames[Math.floor(Math.random()*miscNames.length)];
+export function generateItemByType(itemType : number){
+    let items = game.itemsDB.filter(i=>i.itemType == itemType)
 
-            break
-        }
-        case enums.itemType.consumable:{
-            item.name = consumableNames[Math.floor(Math.random()*consumableNames.length)];
-
-            break
-        }
-        case enums.itemType.currency:{
-            item.name = currencyNames[Math.floor(Math.random()*currencyNames.length)];
-
-            break
-        }
-        case enums.itemType.equipment:{
-            item.name = equipmentNames[Math.floor(Math.random()*equipmentNames.length)];
-
-            break
-        }
+    if(items.length == 0){
+        console.log("Error, can't generate item type " + itemType)
+        return null
+    }
+    else{
+        let itemTemplate : persistentItemData = getRandom(items)
+        let item = itemData.fromPersistentData(itemTemplate)
+        return item
     }
-    return item
 }

Items/itemSocket.ts

@@ -1,9 +1,8 @@
 import { itemData } from "../Classes/itemData";
 import { itemGenerated } from "../Classes/itemGenerated";
-import { generateItem } from "./itemGeneration";
+import { generateItemByType } from "./itemGeneration";
 import { itemRequest } from "../Classes/itemRequest";
 import { lobbyMessage } from "../Classes/lobbyMessage";
-import { userData } from "../Classes/userData";
 import { game } from "../game";
 import { playerData } from "../Classes/playerData";
 
@@ -16,21 +15,60 @@ export function registerItemCallbacks(socket){
 
         let player : playerData = socket.player
         if(player != null){
-            let message = socket.user.login + " picked up "
-            if(data1.rarity >= 95){
-                message += "<color=purple>" + data1.name + "</color> (epic)"
+            
+            let inventory = player.inventory
+            let template = game.getItemTemplate(data1.templateId)
+            let items = inventory.items.filter(i=>i.templateId == data1.templateId)
+            let totalAdded = 0
+
+            if(data1.count > template.maxCount)
+            {
+                console.log("ERROR ERROR ITEM ERROR")
+                return;
             }
-            else if(data1.rarity >= 75){
-                message += "<color=red>" + data1.name + "</color> (rare)"
+
+            items.forEach(item=>{
+                var maxAmount =  Math.min(template.maxCount - item.count, data1.count - totalAdded);
+
+                if (maxAmount > 0)
+                {
+                    item.count += maxAmount;
+                    totalAdded += maxAmount;
+                }
+            })
+
+            if(totalAdded < data1.count)
+            {
+                let maxAmount = data1.count - totalAdded
+                let itemCopy = itemData.copy(data1);
+                itemCopy.count = maxAmount;
+                totalAdded += maxAmount;
+                inventory.items.push(itemCopy);
             }
-            else if(data1.rarity >= 60){
-                message += "<color=yellow>" + data1.name + "</color> (uncommon)"
+
+            if (totalAdded == data1.count)
+            {
+                if(data1.rarity >= 75){
+                    let message = socket.user.login + " picked up "
+                    if(data1.rarity >= 95){
+                        message += "<color=purple>" + data1.name + "</color> (epic)"
+                    }
+                    else if(data1.rarity >= 75){
+                        message += "<color=red>" + data1.name + "</color> (rare)"
+                    }
+                    else if(data1.rarity >= 60){
+                        message += "<color=yellow>" + data1.name + "</color> (uncommon)"
+                    }
+                    else
+                        message += data1.name;
+    
+                    game.addMessage(new lobbyMessage(message))
+                }
             }
             else
-                message += data1.name;
-
-            player.inventory.items.push(data1)
-            game.addMessage(new lobbyMessage(message))
+            {
+                console.log("ERROR ERROR ITEM ERROR")
+            }
         }
     });
 
@@ -40,7 +78,7 @@ export function registerItemCallbacks(socket){
         let buff = Buffer.from(data, 'base64');
         let data1 = Number(buff.toString('utf-8'));
 
-        let player : playerData = socket.user.playerData
+        let player : playerData = socket.player
         let item = player.inventory.items.findIndex(i=>i.id == data1);
         if(item == -1){
             console.log("Error! Item " + item + " not found!")
@@ -56,7 +94,7 @@ export function registerItemCallbacks(socket){
 
         let response = new itemGenerated()
         response.instanceId = data1.instanceId
-        response.item = generateItem(data1.itemType)
+        response.item = generateItemByType(data1.itemType)
         
         socket.emit("item/generated", JSON.stringify(response))
     });

Items/items.ts

@@ -0,0 +1,20 @@
+import { persistentItemData } from "../Classes/itemData";
+import { game } from "../game";
+
+const fs = require('fs');
+
+export function loadItems(){
+    fs.mkdirSync(`Database/Items/`, { recursive: true })
+    fs.readdir(`Database/Items/`, (err, files) => {
+        files.forEach(file => {
+            fs.readFile(`Database/Items/${file}`, (err, data) => {
+                if (err) throw err;
+                let data1 = JSON.parse(data);
+                data1.forEach(item => {
+                    let item1 = new persistentItemData(item)
+                    game.itemsDB.push(item1) 
+                });
+            });
+        });
+    });
+}