release 2.2.3

Drental · Feb 17, 2022 · 11a380c · 11a380c
1 parent f98b420
commit 11a380c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## [2.2.3] 2022-02-17
+
+### Changed
+
+- pf2e - restore inventory after 3.4
+
 ## [2.2.2] 2022-02-15
 
 ### Changed

diff --git a/module.json b/module.json
@@ -13,7 +13,7 @@
   ],
   "url": "https://github.com/Drental/fvtt-tokenactionhud",
   "flags": {},
-  "version": "2.2.2",
+  "version": "2.2.3",
   "minimumCoreVersion": "9.236",
   "compatibleCoreVersion": "9",
   "scripts": ["./lib/tagify/tagify.min.js", "./scripts/bundle.min.js"],
@@ -103,7 +103,7 @@
   "dependencies": [],
   "socket": false,
   "manifest": "https://github.com/Drental/fvtt-tokenactionhud/releases/latest/download/module.json",
-  "download": "https://github.com/Drental/fvtt-tokenactionhud/releases/download/2.2.2/module.zip",
+  "download": "https://github.com/Drental/fvtt-tokenactionhud/releases/download/2.2.3/module.zip",
   "protected": false,
   "coreTranslation": false,
   "library": false

diff --git a/scripts/actions/pf2e/pf2e-actions.js b/scripts/actions/pf2e/pf2e-actions.js
@@ -203,21 +203,21 @@ export class ActionHandlerPf2e extends ActionHandler {
     let items = (actor.items ?? [])
       .filter(
         (a) =>
-          a.data.data.equipped?.value && !a.data.data.containerId?.value?.length
+          ["held","worn"].includes(a.data.data.equipped?.carryType) && !a.data.data.containerId?.value?.length
       )
       .filter((i) => filter.includes(i.data.type))
       .sort(this._foundrySort);
 
     let weaponList = items.filter((i) => i.type === "weapon");
     if (actor.data.type === "character")
-      weaponList = weaponList.filter((i) => i.data.data.equipped.value);
+      weaponList = weaponList.filter((i) => ["held","worn"].includes(i.data.data.equipped?.carryType));
     let weaponActions = this._buildItemActions(tokenId, macroType, weaponList);
     let weapons = this.initializeEmptySubcategory();
     weapons.actions = weaponActions;
 
     let armourList = items.filter((i) => i.type === "armor");
     if (actor.data.type === "character")
-      armourList = armourList.filter((i) => i.data.data.equipped.value);
+      armourList = armourList.filter((i) => ["held","worn"].includes(i.data.data.equipped?.carryType));
     let armourActions = this._buildItemActions(tokenId, macroType, armourList);
     let armour = this.initializeEmptySubcategory();
     armour.actions = armourActions;