Inventory item stack test

Author: sheep-realms

res/class/Constructor.js

@@ -1,6 +1,15 @@
+/**
+ * 方块构造器
+ * @class
+ */
 class BlockConstructor {
     constructor() {}
 
+    /**
+     * 构造方块
+     * @param {Block} block 方块对象
+     * @returns {String} DOM
+     */
     static getBlock(block) {
         if (block.searched) {
             if (block.type == 'air') {
@@ -77,9 +86,18 @@ class BlockConstructor {
     }
 }
 
+/**
+ * 地图构造器
+ * @class
+ */
 class MapConstructor {
     constructor() {}
 
+    /**
+     * 构造地图
+     * @param {Stage} stage 楼层对象
+     * @returns {String} DOM
+     */
     static getMap(stage) {
         let before = `<div id="map" style="--map-size: ${Math.max(stage.size.height, stage.size.width)}; --map-size-height: ${stage.size.height}; --map-size-width: ${stage.size.width};">`;
         let str = '';

res/class/LootTable.js

@@ -102,16 +102,16 @@ class LootTable {
     }
 
     weightedRandom(options) {
-        var i;
+        let i;
 
-        var weights = [];
+        let weights = [];
 
         for (i = 0; i < options.length; i++) {
             options[i].weight = options[i]?.weight != undefined ? options[i].weight : 1;
             weights[i]        = options[i].weight + (weights[i - 1] || 0);
         }
 
-        var random = SMath.randomFloat(this.randomSeed) * weights[weights.length - 1];
+        let random = SMath.randomFloat(this.randomSeed) * weights[weights.length - 1];
 
         for (i = 0; i < weights.length; i++)
             if (weights[i] > random)

res/class/Player.js

@@ -163,16 +163,50 @@ class Player {
     /**
      * 给予物品
      * @param {Item} item 物品
-     * @returns 状态和数据
+     * @returns {Object} 状态和数据
      */
     give(item) {
         if (item instanceof Item == false) return { state: 'fail', failReason: 'item_invalid' };
-        let index = this.inventory.push(item);
+        let items = this.inventory.filter(function(e) {
+            return e.id == item.id;
+        });
+        if (items.length <= 0) {
+            this.inventory.push(item);
+        } else {
+            let joined = false;
+            items.forEach(e => {
+                let r = e.join(item);
+                if (r != -1) {
+                    joined = true;
+                    return;
+                }
+            });
+            if (!joined) {
+                this.inventory.push(item);
+            }
+        }
         return {
             state: 'success',
             data: {
                 item: item,
-                inventoryIndex: index - 1
+            }
+        }
+    }
+
+    /**
+     * 替换物品
+     * @param {Number} index 物品栏索引
+     * @param {Item} item 物品
+     * @returns {Object} 状态和数据
+     */
+    replaceItem(index, item) {
+        if (item instanceof Item == false) return { state: 'fail', failReason: 'item_invalid' };
+        this.inventory[index] = item;
+        return {
+            state: 'success',
+            data: {
+                item: item,
+                inventoryIndex: index
             }
         }
     }
@@ -181,7 +215,7 @@ class Player {
      * 切换快捷栏物品
      * @param {Number} solt 快捷栏槽位
      * @param {Number} index 物品栏索引
-     * @returns 状态和数据
+     * @returns {Object} 状态和数据
      */
     switchHotbarItem(solt, index) {
         let item, hotbarItem;

res/data/items.js

@@ -2,6 +2,12 @@ let db_items = [
     {
         id: 'magnifier',
         type: 'search'
+    }, {
+        id: 'emerald',
+        type: 'item'
+    }, {
+        id: 'monster_crystal',
+        type: 'item'
     }, {
         id: 'sword',
         type: 'weapon',

res/img/item/item.png

@@ -12,10 +12,10 @@ w.create();
 
 let p = new Player(w);
 w.playerJoin(p);
-let psi = p.give(new Item('magnifier')).data.inventoryIndex;
-let pwi = p.give(new Weapon('sword')).data.inventoryIndex;
-p.switchHotbarItem(1, pwi);
-p.switchHotbarItem(0, psi);
+let psi = p.replaceItem(0, new Item('magnifier'));
+let pwi = p.replaceItem(1, new Weapon('sword'));
+p.switchHotbarItem(1, 1);
+p.switchHotbarItem(0, 0);
 
 // let ts_map = [
 //     ['air', 'air', 'air', 'chest', 'monster'],

res/script/test.js

@@ -17,6 +17,8 @@
 }
 
 .item-icon[data-item-id='magnifier'] { --icon-pos-x: 0; --icon-pos-y: 0; }
+.item-icon[data-item-id='emerald'] { --icon-pos-x: -1; --icon-pos-y: 0; }
+.item-icon[data-item-id='monster_crystal'] { --icon-pos-x: -2; --icon-pos-y: 0; }
 
 .item-icon[data-item-id='sword'] { --icon-pos-x: 0; --icon-pos-y: 0; }
 .item-icon[data-item-id='dagger'] { --icon-pos-x: -1; --icon-pos-y: 0; }