Support dnd5e 3.0.0

Larkinabout · Feb 1, 2024 · 50042b0 · 50042b0
1 parent bebaa6e
commit 50042b0
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 20 deletions.
diff --git a/module.json b/module.json
@@ -19,7 +19,7 @@
   "version": "This is auto replaced",
   "compatibility": {
     "minimum": "10",
-    "verified": "11.313"
+    "verified": "11.315"
   },
   "esmodules": [
     "./scripts/token-action-hud-dnd5e.min.js"
@@ -89,8 +89,9 @@
         "type": "system",
         "compatibility": [
           {
-            "minimum": "2.1.0",
-            "verified": "2.3.1"
+            "minimum": "3.0.0",
+            "maximum": "3",
+            "verified": "3.0.0"
           }
         ]
       }
@@ -103,7 +104,7 @@
           {
             "minimum": "1.5.0",
             "maximum": "1.5",
-            "verified": "1.5.0"
+            "verified": "1.5.3"
           }
         ]
       }

diff --git a/scripts/action-handler.js b/scripts/action-handler.js
@@ -745,7 +745,7 @@ Hooks.once('tokenActionHudCoreApiReady', async (coreModule) => {
                         inventoryMap.get('consumables').set(key, value)
                     }
                     if (isEquippedItem) {
-                        if (type === 'backpack') {
+                        if (type === 'container') {
                             if (!inventoryMap.has('containers')) inventoryMap.set('containers', new Map())
                             inventoryMap.get('containers').set(key, value)
                         }
@@ -1277,7 +1277,7 @@ Hooks.once('tokenActionHudCoreApiReady', async (coreModule) => {
          * @param {object} spell
          */
         #getSpellInfo (spell) {
-            const components = spell.system.components
+            const components = spell.system.properties
 
             const componentsArray = []
             const info1 = {}
@@ -1481,8 +1481,8 @@ Hooks.once('tokenActionHudCoreApiReady', async (coreModule) => {
             const modifiers = entity?.modifiers ?? null
             const properties = [
                 ...entity.system?.chatProperties ?? [],
-                ...entity.system?.equippableItemChatProperties ?? [],
-                ...entity.system?.activatedEffectChatProperties ?? []
+                ...entity.system?.equippableItemCardProperties ?? [],
+                ...entity.system?.activatedEffectCardProperties ?? []
             ].filter(p => p)
             const rarity = entity?.rarity ?? null
             const traits = (entity?.type === 'weapon') ? this.#getWeaponProperties(entity?.system?.properties) : null

diff --git a/scripts/defaults.js b/scripts/defaults.js
@@ -71,15 +71,8 @@ Hooks.once('tokenActionHudCoreApiReady', async (coreModule) => {
                 name: coreModule.api.Utils.i18n('DND5E.Effects'),
                 groups: [
                     { ...groups.temporaryEffects, nestId: 'effects_temporary-effects' },
-                    { ...groups.passiveEffects, nestId: 'effects_passive-effects' }
-                ]
-            },
-            {
-                nestId: 'conditions',
-                id: 'conditions',
-                name: coreModule.api.Utils.i18n('tokenActionHud.dnd5e.conditions'),
-                groups: [
-                    { ...groups.conditions, nestId: 'conditions_conditions' }
+                    { ...groups.passiveEffects, nestId: 'effects_passive-effects' },
+                    { ...groups.conditions, nestId: 'effects_conditions' }
                 ]
             },
             {

diff --git a/scripts/roll-handler.js b/scripts/roll-handler.js
@@ -9,7 +9,7 @@ Hooks.once('tokenActionHudCoreApiReady', async (coreModule) => {
      * @param {string} encodedValue
      */
         async handleActionClick (event, encodedValue) {
-            const [actionType, actionId ] = encodedValue.split('|')
+            const [actionType, actionId] = encodedValue.split('|')
 
             if (!this.actor) {
                 for (const token of coreModule.api.Utils.getControlledTokens()) {
@@ -58,7 +58,7 @@ Hooks.once('tokenActionHudCoreApiReady', async (coreModule) => {
             case 'item':
             case 'spell':
             case 'weapon':
-                if (this.isRenderItem()) this.doRenderItem(actor, actionId)
+                if (this.isRenderItem()) this.renderItem(actor, actionId)
                 else this.#useItem(event, actor, actionId)
                 break
             case 'magicItem':

diff --git a/scripts/token-action-hud-dnd5e.min.js b/scripts/token-action-hud-dnd5e.min.js