Merge pull request #48 from damian-pastorini/develop

- Reldens - Items System
damian-pastorini · Jan 25, 2021 · b1b75bd · b1b75bd
2 parents 0a457c5 + ce7a4d7
commit b1b75bd
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 5 deletions.
diff --git a/lib/item/type/item-base.js b/lib/item/type/item-base.js
@@ -78,9 +78,9 @@ class ItemBase
         await this.manager.fireEvent(ItemsEvents.EQUIP_BEFORE+(revert ? 'Revert': 'Apply')+'Modifiers', this);
         for(let i of Object.keys(this.modifiers)){
             if(revert){
-                this.modifiers[i].revert();
+                this.modifiers[i].revert(this.target);
             } else {
-                this.modifiers[i].apply();
+                this.modifiers[i].apply(this.target);
             }
         }
         return this.manager.fireEvent(ItemsEvents.EQUIP+(revert ? 'Reverted' : 'Applied')+'Modifiers', this);

diff --git a/lib/server/storage/models/group.js b/lib/server/storage/models/group.js
@@ -14,6 +14,21 @@ class GroupModel extends ModelClass
         return 'items_group';
     }
 
+    static get relationMappings()
+    {
+        const { ItemModel } = require('./item');
+        return {
+            parent_item: {
+                relation: ModelClass.BelongsToOneRelation,
+                modelClass: ItemModel,
+                join: {
+                    from: this.tableName+'.item_id',
+                    to: 'items_item.id'
+                }
+            }
+        };
+    }
+
 }
 
 module.exports.GroupModel = GroupModel;
diff --git a/lib/server/storage/models/item.js b/lib/server/storage/models/item.js
@@ -17,7 +17,7 @@ class ItemModel extends ModelClass
     static get relationMappings()
     {
         const { InventoryModel } = require('./inventory');
-        const { InventoryGroup } = require('./group');
+        const { GroupModel } = require('./group');
         const { ModifiersModel } = require('./modifiers');
         return {
             items_inventory: {
@@ -30,7 +30,7 @@ class ItemModel extends ModelClass
             },
             items_group_id: {
                 relation: ModelClass.HasOneRelation,
-                modelClass: InventoryGroup,
+                modelClass: GroupModel,
                 join: {
                     from: 'items_item.group_id',
                     to: 'items_group.id'
@@ -47,6 +47,12 @@ class ItemModel extends ModelClass
         };
     }
 
+    static loadItemFullData()
+    {
+        return this.query()
+            .withGraphFetched('[items_inventory, items_group_id, items_modifiers]');
+    }
+
 }
 
 module.exports.ItemModel = ItemModel;
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@reldens/items-system",
     "scope": "@reldens",
-    "version": "0.9.4",
+    "version": "0.9.5",
     "description": "Reldens - Items System",
     "author": "Damian A. Pastorini",
     "license": "MIT",