Merge pull request #161 from Silvertower/main

Updates to support PF2e system 6.6.2

module.json

@@ -96,8 +96,8 @@
         "id": "pf2e",
         "type": "system",
         "compatibility": {
-          "minimum": "6.5.0",
-          "verified": "6.6.0"
+          "minimum": "6.6.2",
+          "verified": "6.6.2"
         }
       }
     ],
@@ -107,7 +107,7 @@
         "type": "module",
         "compatibility": {
           "minimum": "2.0.0",
-          "verified": "2.0.5",
+          "verified": "2.0.6",
           "maximum": "2.0.99"
         }
       }

scripts/action-handler.js

@@ -91,7 +91,8 @@ Hooks.once('tokenActionHudCoreApiReady', async (coreModule) => {
                 this.#buildEffects(),
                 this.#buildFeats(),
                 this.#buildHeroActions(),
-                this.#buildHeroPoints(),
+                this.#buildPoints('heroPoints'),
+                this.#buildPoints('mythicPoints'),
                 this.#buildInitiative(),
                 this.#buildInventory(),
                 this.#buildPerceptionCheck(),
@@ -451,26 +452,47 @@ Hooks.once('tokenActionHudCoreApiReady', async (coreModule) => {
         /**
          * Build hero points
          */
-        async #buildHeroPoints () {
-            const actionType = 'heroPoints'
+        async #buildPoints (actionType) {
+            let actions, groupData
+
+            const mythicEnabled = this.actor.system.resources?.mythicPoints.max ? true : false
 
             // Create group data
-            const groupData = { id: 'hero-points', type: 'system' }
+            if (actionType === 'heroPoints' && !mythicEnabled) {
+                groupData = { id: 'hero-points', type: 'system' }
 
-            const heroPoints = this.actor.system.resources?.heroPoints
-            const value = heroPoints.value
-            const max = heroPoints.max
+                const heroPoints = this.actor.system.resources?.heroPoints
+                const value = heroPoints.value
+                const max = heroPoints.max
 
-            // Get actions
-            const actions = [{
-                id: 'heroPoints',
-                name: coreModule.api.Utils.i18n('PF2E.HeroPointsLabel'),
-                encodedValue: [actionType, actionType].join(this.delimiter),
-                info1: { text: (max > 0) ? `${value ?? 0}/${max}` : '' }
-            }]
+                // Get actions
+                actions = [{
+                    id: 'heroPoints',
+                    name: coreModule.api.Utils.i18n('PF2E.Actor.Resource.HeroPoints'),
+                    encodedValue: [actionType, actionType].join(this.delimiter),
+                    info1: { text: (max > 0) ? `${value ?? 0}/${max}` : '' }
+                }]
+            }
+            else if (actionType === 'mythicPoints' && mythicEnabled) {
+                groupData = { id: 'mythic-points', type: 'system' }
+
+                const mythicPoints = this.actor.system.resources?.mythicPoints
+                const value = mythicPoints.value
+                const max = mythicPoints.max
+
+                // Get actions
+                actions = [{
+                    id: 'mythicPoints',
+                    name: coreModule.api.Utils.i18n('PF2E.Actor.Resource.MythicPoints'),
+                    encodedValue: [actionType, actionType].join(this.delimiter),
+                    info1: { text: (max > 0) ? `${value ?? 0}/${max}` : '' }
+                }]
+            }
 
             // Add actions to action list
-            this.addActions(actions, groupData)
+            if (actions && groupData) {
+                this.addActions(actions, groupData)
+            }
         }
 
         /**
@@ -593,9 +615,9 @@ Hooks.once('tokenActionHudCoreApiReady', async (coreModule) => {
         }
 
         /**
-         * Build Hero Actions
-         * @private
-         */
+        * Build hero actions
+        * @private
+        */
         async #buildHeroActions () {
             if (!game.modules.get('pf2e-hero-actions')?.active) return
 
@@ -2126,7 +2148,9 @@ Hooks.once('tokenActionHudCoreApiReady', async (coreModule) => {
 
             if (!description && !tagsHtml && !modifiersHtml) return name
 
-            return `<div>${nameHtml}${headerTags}${description}${propertiesHtml}</div>`
+            const tooltipHtml = `<div>${nameHtml}${headerTags}${description}${propertiesHtml}</div>`
+
+            return await TextEditor.enrichHTML(tooltipHtml, { async: true })
         }
 
         /**

scripts/constants.js

@@ -194,7 +194,8 @@ export const GROUP = {
     generalFeats: { id: 'general-feats', name: 'PF2E.FeatGeneralHeader', type: 'system' },
     bonusFeats: { id: 'bonus-feats', name: 'PF2E.FeatBonusHeader', type: 'system' },
     spells: { id: 'spells', name: 'PF2E.Item.Spell.Plural', type: 'system' },
-    heroPoints: { id: 'hero-points', name: 'PF2E.HeroPointsLabel', type: 'system' },
+    heroPoints: { id: 'hero-points', name: 'PF2E.Actor.Resource.HeroPoints', type: 'system' },
+    mythicPoints: { id: 'mythic-points', name: 'PF2E.Actor.Resource.MythicPoints', type: 'system' },
     initiative: { id: 'initiative', name: 'PF2E.InitiativeLabel', type: 'system' },
     perceptionCheck: { id: 'perception-check', name: 'PF2E.PerceptionLabel', type: 'system' },
     coreSkills: { id: 'core-skills', name: 'PF2E.CoreSkillsHeader', type: 'system' },

scripts/defaults.js

@@ -85,6 +85,7 @@ Hooks.once('tokenActionHudCoreApiReady', async (coreModule) => {
                 name: coreModule.api.Utils.i18n('tokenActionHud.pf2e.attributes'),
                 groups: [
                     { ...groups.heroPoints, nestId: 'attributes_hero-points' },
+                    { ...groups.mythicPoints, nestId: 'attributes_mythic-points' },
                     { ...groups.initiative, nestId: 'attributes_initiative' },
                     { ...groups.perceptionCheck, nestId: 'attributes_perception-check' },
                     { ...groups.saves, nestId: 'attributes_saves' }

scripts/roll-handler.js

@@ -195,12 +195,15 @@ Hooks.once('tokenActionHudCoreApiReady', async (coreModule) => {
             case 'feat':
                 this.#rollItemMacro(event, actor, actionId)
                 break
-            case 'heroAction':
-                this.#performHeroAction(actor, actionId)
-                break
+             case 'heroAction':
+                 this.#performHeroAction(actor, actionId)
+                 break
             case 'heroPoints':
                 await this.#adjustResources(actor, 'heroPoints', 'value')
                 break
+            case 'mythicPoints':
+                await this.#adjustResources(actor, 'mythicPoints', 'value')
+                break
             case 'initiative':
                 this.#rollInitiative(actor, actionId)
                 break
@@ -375,7 +378,14 @@ Hooks.once('tokenActionHudCoreApiReady', async (coreModule) => {
                 }
             }
 
-            await actor.update({ "system.resources.heroPoints.value": value });
+            switch (resource) {
+            case "heroPoints":
+                await actor.update({ "system.resources.heroPoints.value": value })
+                break
+            case "mythicPoints":
+                await actor.update({ "system.resources.mythicPoints.value": value })
+                break
+            }
 
             Hooks.callAll('forceUpdateTokenActionHud')
         }