Fixed armor healing (#600)

2026-01-12 03:31:07 +01:00 · 2025-08-05 14:39:24 +02:00 · 2025-08-05 14:39:24 +02:00 · d80b5d158d
commit d80b5d158d
parent 3984417a17
16 changed files with 27 additions and 27 deletions
--- a/lang/en.json
+++ b/lang/en.json
@ -897,7 +897,7 @@
                    "name": "Hope",
                    "abbreviation": "HO"
                },
-                "armorSlot": {
+                "armor": {
                    "name": "Armor Slot",
                    "abbreviation": "AS"
                },
--- a/module/config/generalConfig.mjs
+++ b/module/config/generalConfig.mjs
@ -148,10 +148,10 @@ export const healingTypes = {
        label: 'DAGGERHEART.CONFIG.HealingType.hope.name',
        abbreviation: 'DAGGERHEART.CONFIG.HealingType.hope.abbreviation'
    },
-    armorSlot: {
-        id: 'armorSlot',
-        label: 'DAGGERHEART.CONFIG.HealingType.armorSlot.name',
-        abbreviation: 'DAGGERHEART.CONFIG.HealingType.armorSlot.abbreviation'
+    armor: {
+        id: 'armor',
+        label: 'DAGGERHEART.CONFIG.HealingType.armor.name',
+        abbreviation: 'DAGGERHEART.CONFIG.HealingType.armor.abbreviation'
    },
    fear: {
        id: 'fear',
@ -262,7 +262,7 @@ export const defaultRestOptions = {
                    actionType: 'action',
                    chatDisplay: false,
                    healing: {
-                        applyTo: healingTypes.armorSlot.id,
+                        applyTo: healingTypes.armor.id,
                        value: {
                            custom: {
                                enabled: true,
@ -350,7 +350,7 @@ export const defaultRestOptions = {
                    actionType: 'action',
                    chatDisplay: false,
                    healing: {
-                        applyTo: healingTypes.armorSlot.id,
+                        applyTo: healingTypes.armor.id,
                        value: {
                            custom: {
                                enabled: true,
--- a/module/config/itemConfig.mjs
+++ b/module/config/itemConfig.mjs
@ -675,7 +675,7 @@ export const weaponFeatures = {
                },
                cost: [
                    {
-                        type: 'armorSlot',
+                        type: 'armor',
                        value: 1
                    }
                ],
--- a/module/documents/chatMessage.mjs
+++ b/module/documents/chatMessage.mjs
@ -68,7 +68,7 @@ export default class DhpChatMessage extends foundry.documents.ChatMessage {

    getTargetList() {
        const targets = this.system.hitTargets;
-        return targets.map(target => game.canvas.tokens.documentCollection.find(t => t.actor.uuid === target.actorId));
+        return targets.map(target => game.canvas.tokens.documentCollection.find(t => t.actor?.uuid === target.actorId));
    }

    async onDamage(event) {
@ -88,7 +88,7 @@ export default class DhpChatMessage extends foundry.documents.ChatMessage {

        if (targets.length === 0)
            return ui.notifications.info(game.i18n.localize('DAGGERHEART.UI.Notifications.noTargetsSelected'));
-        
+
        for (let target of targets) {
            let damages = foundry.utils.deepClone(this.system.damage);
            if (
@ -139,9 +139,9 @@ export default class DhpChatMessage extends foundry.documents.ChatMessage {
    }

    consumeOnSuccess() {
-        if(!this.system.successConsumed && !this.system.targetSelection) {
+        if (!this.system.successConsumed && !this.system.targetSelection) {
            const action = this.system.action;
-            if(action) action.consume(this.system, true);
+            if (action) action.consume(this.system, true);
        }
    }
 }
--- a/src/packs/adversaries/adversary_Acid_Burrower_89yAh30vaNQOALlz.json
+++ b/src/packs/adversaries/adversary_Acid_Burrower_89yAh30vaNQOALlz.json
@ -490,7 +490,7 @@
                    "dice": "d6",
                    "bonus": null
                  },
-                  "applyTo": "armorSlot",
+                  "applyTo": "armor",
                  "base": false,
                  "resultBased": false,
                  "valueAlt": {
--- a/src/packs/adversaries/adversary_Glass_Snake_8KWVLWXFhlY2kYx0.json
+++ b/src/packs/adversaries/adversary_Glass_Snake_8KWVLWXFhlY2kYx0.json
@ -255,7 +255,7 @@
                    "dice": "d6",
                    "bonus": null
                  },
-                  "applyTo": "armorSlot",
+                  "applyTo": "armor",
                  "base": false,
                  "resultBased": false,
                  "valueAlt": {
--- a/src/packs/adversaries/adversary_Greater_Earth_Elemental_dsfB3YhoL5SudvS2.json
+++ b/src/packs/adversaries/adversary_Greater_Earth_Elemental_dsfB3YhoL5SudvS2.json
@ -291,7 +291,7 @@
                    "dice": "d6",
                    "bonus": null
                  },
-                  "applyTo": "armorSlot",
+                  "applyTo": "armor",
                  "type": [],
                  "base": false,
                  "resultBased": false,
--- a/src/packs/adversaries/adversary_Green_Ooze_SHXedd9zZPVfUgUa.json
+++ b/src/packs/adversaries/adversary_Green_Ooze_SHXedd9zZPVfUgUa.json
@ -298,7 +298,7 @@
                    "dice": "d6",
                    "bonus": null
                  },
-                  "applyTo": "armorSlot",
+                  "applyTo": "armor",
                  "base": false,
                  "resultBased": false,
                  "valueAlt": {
--- a/src/packs/adversaries/adversary_Huge_Green_Ooze_6hbqmxDXFOzZJDk4.json
+++ b/src/packs/adversaries/adversary_Huge_Green_Ooze_6hbqmxDXFOzZJDk4.json
@ -296,7 +296,7 @@
                    "dice": "d6",
                    "bonus": null
                  },
-                  "applyTo": "armorSlot",
+                  "applyTo": "armor",
                  "type": [],
                  "base": false,
                  "resultBased": false,
--- a/src/packs/adversaries/adversary_Shark_YmVAkdNsyuXWTtYp.json
+++ b/src/packs/adversaries/adversary_Shark_YmVAkdNsyuXWTtYp.json
@ -365,7 +365,7 @@
                    "dice": "d6",
                    "bonus": null
                  },
-                  "applyTo": "armorSlot",
+                  "applyTo": "armor",
                  "base": false,
                  "resultBased": false,
                  "valueAlt": {
--- a/src/packs/adversaries/adversary_Tiny_Green_Ooze_aLkLFuVoKz2NLoBK.json
+++ b/src/packs/adversaries/adversary_Tiny_Green_Ooze_aLkLFuVoKz2NLoBK.json
@ -250,7 +250,7 @@
                    "dice": "d6",
                    "bonus": null
                  },
-                  "applyTo": "armorSlot",
+                  "applyTo": "armor",
                  "type": [],
                  "base": false,
                  "resultBased": false,
--- a/src/packs/classes/feature_Frontline_Tank_YS1g7YdWwOaS629x.json
+++ b/src/packs/classes/feature_Frontline_Tank_YS1g7YdWwOaS629x.json
@ -42,7 +42,7 @@
                "dice": "d6",
                "bonus": null
              },
-              "applyTo": "armorSlot",
+              "applyTo": "armor",
              "base": false,
              "resultBased": false,
              "valueAlt": {
--- a/src/packs/domains/domainCard_Armorer_cy8GjBPGc9w9RaGO.json
+++ b/src/packs/domains/domainCard_Armorer_cy8GjBPGc9w9RaGO.json
@ -36,7 +36,7 @@
                "dice": "d6",
                "bonus": null
              },
-              "applyTo": "armorSlot",
+              "applyTo": "armor",
              "base": false,
              "resultBased": false,
              "valueAlt": {
--- a/src/packs/domains/domainCard_Champion_s_Edge_rnejRbUQsNGX1GMC.json
+++ b/src/packs/domains/domainCard_Champion_s_Edge_rnejRbUQsNGX1GMC.json
@ -123,7 +123,7 @@
                "dice": "d6",
                "bonus": null
              },
-              "applyTo": "armorSlot",
+              "applyTo": "armor",
              "base": false,
              "resultBased": false,
              "valueAlt": {
--- a/src/packs/domains/domainCard_Valor_Touched_k1AtYd3lSchIymBr.json
+++ b/src/packs/domains/domainCard_Valor_Touched_k1AtYd3lSchIymBr.json
@ -36,7 +36,7 @@
                "dice": "d6",
                "bonus": null
              },
-              "applyTo": "armorSlot",
+              "applyTo": "armor",
              "base": false,
              "resultBased": false,
              "valueAlt": {
--- a/templates/sheets/actors/character/sidebar.hbs
+++ b/templates/sheets/actors/character/sidebar.hbs
@ -55,10 +55,10 @@
        <div class="status-section">
            <div class="status-number">
                <div class='status-value'>
-                    <p>{{document.system.proficiency}}</p>
+                    <p>{{document.system.evasion}}</p>
                </div>
                <div class="status-label">
-                    <h4>{{localize "DAGGERHEART.GENERAL.proficiency"}}</h4>
+                    <h4>{{localize "DAGGERHEART.GENERAL.evasion"}}</h4>
                </div>
            </div>

@ -91,10 +91,10 @@

            <div class="status-number">
                <div class='status-value'>
-                    <p>{{document.system.evasion}}</p>
+                    <p>{{document.system.proficiency}}</p>
                </div>
                <div class="status-label">
-                    <h4>{{localize "DAGGERHEART.GENERAL.evasion"}}</h4>
+                    <h4>{{localize "DAGGERHEART.GENERAL.proficiency"}}</h4>
                </div>
            </div>
        </div>