Impproved Adversary Sheet Data Display (#751)

* Impproved Adversary Sheet Data Display
Fixes #604

* FIX: formula lables for attacks and weapons

---------

Co-authored-by: Joaquin Pereyra <joaquinpereyra98@users.noreply.github.com>

module/data/action/attackAction.mjs

@@ -42,4 +42,32 @@ export default class DHAttackAction extends DHDamageAction {
 
         return result;
     }
+
+    /**
+     * Generate a localized label array for this item subtype.
+     * @returns {(string | { value: string, icons: string[] })[]} An array of localized strings and damage label objects.
+     */
+    _getLabels() {
+        const labels = [];
+        const { roll, range, damage } = this;
+
+        if (roll.trait) labels.push(game.i18n.localize(`DAGGERHEART.CONFIG.Traits.${roll.trait}.short`))
+        if (range) labels.push(game.i18n.localize(`DAGGERHEART.CONFIG.Range.${range}.short`));
+
+        for (const { value, type } of damage.parts) {
+            const str = Roll.replaceFormulaData(value.getFormula(), this.actor?.getRollData() ?? {});
+
+            const icons = Array.from(type)
+                .map(t => CONFIG.DH.GENERAL.damageTypes[t]?.icon)
+                .filter(Boolean);
+
+            if (icons.length === 0) {
+                labels.push(str);
+            } else {
+                labels.push({ value: str, icons });
+            }
+        }
+
+        return labels;
+    }
 }

module/data/actor/character.mjs

@@ -103,7 +103,7 @@ export default class DhCharacter extends BaseDataActor {
             }),
             attack: new ActionField({
                 initial: {
-                    name: 'Attack',
+                    name: 'Unarmed Attack',
                     img: 'icons/skills/melee/unarmed-punch-fist-yellow-red.webp',
                     _id: foundry.utils.randomID(),
                     systemPath: 'attack',
@@ -394,19 +394,22 @@ export default class DhCharacter extends BaseDataActor {
         return this.parent.effects.find(x => x.type === 'beastform');
     }
 
+    /**
+     * Gets the unarmed attackwhen no primary or secondary weapon is equipped.
+     * Returns `null` if either weapon is equipped.
+     * If the actor is in beastform, overrides the attack's name and image.
+     *
+     * @returns {DHAttackAction|null}
+     */
     get usedUnarmed() {
-        const primaryWeaponEquipped = this.primaryWeapon?.system?.equipped;
+        if (this.primaryWeapon?.system?.equipped || this.secondaryWeapon?.system?.equipped) return null;
-        const secondaryWeaponEquipped = this.secondaryWeapon?.system?.equipped;
+
-        return !primaryWeaponEquipped && !secondaryWeaponEquipped
+        const attack = foundry.utils.deepClone(this.attack);
-            ? {
+        if (this.activeBeastform) {
-                  ...this.attack,
+            attack.name = 'DAGGERHEART.ITEMS.Beastform.attackName';
-                  uuid: this.attack.uuid,
+            attack.img = 'icons/creatures/claws/claw-straight-brown.webp';
-                  id: this.attack.id,
+        }
-                  name: this.activeBeastform ? 'DAGGERHEART.ITEMS.Beastform.attackName' : this.attack.name,
+        return attack;
-                  img: this.activeBeastform ? 'icons/creatures/claws/claw-straight-brown.webp' : this.attack.img,
-                  actor: this.parent
-              }
-            : null;
     }
 
     get sheetLists() {

module/data/item/armor.mjs

@@ -144,7 +144,8 @@ export default class DHArmor extends AttachableItem {
      * @returns {(string | { value: string, icons: string[] })[]} An array of localized strings and damage label objects.
      */
     _getLabels() {
-        const labels = [`${game.i18n.localize('DAGGERHEART.ITEMS.Armor.baseScore')}: ${this.baseScore}`];
+        const labels = [];
+        if(this.baseScore) labels.push(`${game.i18n.localize('DAGGERHEART.ITEMS.Armor.baseScore')}: ${this.baseScore}`)
         return labels;
     }
 

module/data/item/domainCard.mjs

@@ -89,7 +89,7 @@ export default class DHDomainCard extends BaseDataItem {
      */
     _getLabels() {
         const labels = [
-            game.i18n.localize(`DAGGERHEART.CONFIG.DomainCardTypes.${this.type}`),
+            ,
             this.domainLabel,
             {
                 value: `${this.recallCost}`, //converts the number to a string
@@ -97,6 +97,14 @@ export default class DHDomainCard extends BaseDataItem {
             }
         ];
 
+        if (this.type) labels.push(game.i18n.localize(`DAGGERHEART.CONFIG.DomainCardTypes.${this.type}`));
+        if (this.domainLabel) labels.push(this.domainLabel);
+        if (this.recallCost) {
+            labels.push({
+                value: `${this.recallCost}`, //converts the number to a string
+                icons: ['fa-bolt']
+            });
+        }
         return labels;
     }
 }

module/data/item/weapon.mjs

@@ -209,26 +209,23 @@ export default class DHWeapon extends AttachableItem {
      * @returns {(string | { value: string, icons: string[] })[]} An array of localized strings and damage label objects.
      */
     _getLabels() {
+        const labels = [];
         const { roll, range, damage } = this.attack;
 
-        const labels = [
+        if (roll.trait) labels.push(game.i18n.localize(`DAGGERHEART.CONFIG.Traits.${roll.trait}.short`))
-            game.i18n.localize(`DAGGERHEART.CONFIG.Traits.${roll.trait}.short`),
+        if (range) labels.push(game.i18n.localize(`DAGGERHEART.CONFIG.Range.${range}.short`));
-            game.i18n.localize(`DAGGERHEART.CONFIG.Range.${range}.short`)
-        ];
 
         for (const { value, type } of damage.parts) {
-            const str = [value.dice];
+            const str = Roll.replaceFormulaData(value.getFormula(), this.actor?.getRollData() ?? {});
-            if (value.bonus) str.push(value.bonus.signedString());
 
             const icons = Array.from(type)
                 .map(t => CONFIG.DH.GENERAL.damageTypes[t]?.icon)
                 .filter(Boolean);
 
-            const labelValue = str.join('');
             if (icons.length === 0) {
-                labels.push(labelValue);
+                labels.push(str);
             } else {
-                labels.push({ value: labelValue, icons });
+                labels.push({ value: str, icons });
             }
         }
 

src/packs/adversaries/adversary_Acid_Burrower_89yAh30vaNQOALlz.json

@@ -122,7 +122,7 @@
       },
       "_id": "TCKVaVweyJzhEArX",
       "systemPath": "actions",
-      "type": "",
+      "type": "attack",
       "description": "",
       "img": "icons/creatures/claws/claw-curved-jagged-yellow.webp",
       "chatDisplay": true,

src/packs/adversaries/adversary_Adult_Flickerfly_G7jiltRjgvVhZewm.json

@@ -103,7 +103,8 @@
             "base": false
           }
         ]
-      }
+      },
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Apprentice_Assassin_vNIbYQ4YSzNf0WPE.json

@@ -102,7 +102,8 @@
           }
         ]
       },
-      "img": "icons/weapons/daggers/dagger-bone-black.webp"
+      "img": "icons/weapons/daggers/dagger-bone-black.webp",
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Arch_Necromancer_WPEOIGfclNJxWb87.json

@@ -114,7 +114,8 @@
           }
         ]
       },
-      "img": "icons/magic/unholy/beam-ringed-impact-purple.webp"
+      "img": "icons/magic/unholy/beam-ringed-impact-purple.webp",
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Archer_Guard_JRhrrEg5UroURiAD.json

@@ -108,7 +108,8 @@
           }
         ]
       },
-      "img": "icons/weapons/bows/longbow-recurve-leather-brown.webp"
+      "img": "icons/weapons/bows/longbow-recurve-leather-brown.webp",
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Archer_Squadron_0ts6CGd93lLqGZI5.json

@@ -103,7 +103,8 @@
       "roll": {
         "bonus": 0,
         "type": "attack"
-      }
+      },
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Assassin_Poisoner_h5RuhzGL17dW5FBT.json

@@ -109,7 +109,8 @@
             "base": false
           }
         ]
-      }
+      },
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Battle_Box_dgH3fW9FTYLaIDvS.json

@@ -109,7 +109,8 @@
           }
         ]
       },
-      "range": ""
+      "range": "",
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Bear_71qKDLKO3CsrNkdy.json

@@ -111,7 +111,8 @@
           }
         ]
       },
-      "img": "icons/creatures/claws/claw-straight-brown.webp"
+      "img": "icons/creatures/claws/claw-straight-brown.webp",
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Bladed_Guard_B4LZcGuBAHzyVdzy.json

@@ -107,7 +107,8 @@
             "base": false
           }
         ]
-      }
+      },
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Brawny_Zombie_2UeZ0tEe7AzgSJNd.json

@@ -112,7 +112,8 @@
           }
         ]
       },
-      "img": "icons/skills/melee/unarmed-punch-fist-yellow-red.webp"
+      "img": "icons/skills/melee/unarmed-punch-fist-yellow-red.webp",
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Cave_Ogre_8Zkqk1jU09nKL2fy.json

@@ -108,7 +108,8 @@
         ]
       },
       "name": "Club",
-      "img": "icons/weapons/clubs/club-banded-barbed-black.webp"
+      "img": "icons/weapons/clubs/club-banded-barbed-black.webp",
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Chaos_Skull_jDmHqGvzg5wjgmxE.json

@@ -103,7 +103,8 @@
           }
         ]
       },
-      "img": "icons/magic/light/beam-rays-magenta.webp"
+      "img": "icons/magic/light/beam-rays-magenta.webp",
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Conscript_99TqczuQipBmaB8i.json

@@ -96,7 +96,8 @@
             "base": false
           }
         ]
-      }
+      },
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Construct_uOP5oT9QzXPlnf3p.json

@@ -102,7 +102,8 @@
         ]
       },
       "name": "Fist Slam",
-      "img": "icons/skills/melee/unarmed-punch-fist-yellow-red.webp"
+      "img": "icons/skills/melee/unarmed-punch-fist-yellow-red.webp",
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Courtesan_ZxWaWPdzFIUPNC62.json

@@ -113,7 +113,8 @@
           }
         ]
       },
-      "img": "icons/weapons/daggers/dagger-straight-cracked.webp"
+      "img": "icons/weapons/daggers/dagger-straight-cracked.webp",
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Courtier_CBBuEXAlLKFMJdjg.json

@@ -107,7 +107,8 @@
           }
         ]
       },
-      "img": "icons/weapons/daggers/dagger-twin-green.webp"
+      "img": "icons/weapons/daggers/dagger-twin-green.webp",
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Cult_Adept_0NxCSugvKQ4W8OYZ.json

@@ -114,7 +114,8 @@
         ]
       },
       "range": "far",
-      "img": "icons/weapons/staves/staff-ornate-purple.webp"
+      "img": "icons/weapons/staves/staff-ornate-purple.webp",
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Cult_Fang_tyBOpLfigAhI9bU3.json

@@ -103,7 +103,8 @@
           }
         ]
       },
-      "range": ""
+      "range": "",
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Cult_Initiate_zx99sOGTXicP4SSD.json

@@ -95,7 +95,8 @@
             "base": false
           }
         ]
-      }
+      },
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Deeproot_Defender_9x2xY9zwc3xzbXo5.json

@@ -108,7 +108,8 @@
           }
         ]
       },
-      "img": "icons/magic/nature/root-vines-grow-brown.webp"
+      "img": "icons/magic/nature/root-vines-grow-brown.webp",
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Demon_of_Avarice_pnyjIGxxvurcWmTv.json

@@ -108,7 +108,8 @@
             "base": false
           }
         ]
-      }
+      },
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Demon_of_Despair_kE4dfhqmIQpNd44e.json

@@ -108,7 +108,8 @@
             "base": false
           }
         ]
-      }
+      },
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Demon_of_Hubris_2VN3BftageoTTIzu.json

@@ -109,7 +109,8 @@
             "base": false
           }
         ]
-      }
+      },
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Demon_of_Jealousy_SxSOkM4bcVOFyjbo.json

@@ -109,7 +109,8 @@
           }
         ]
       },
-      "img": "icons/magic/symbols/rune-sigil-rough-white-teal.webp"
+      "img": "icons/magic/symbols/rune-sigil-rough-white-teal.webp",
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Demon_of_Wrath_5lphJAgzoqZI3VoG.json

@@ -109,7 +109,8 @@
             "base": false
           }
         ]
-      }
+      },
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Demonic_Hound_Pack_NoRZ1PqB8N5wcIw0.json

@@ -109,7 +109,8 @@
         "bonus": 0,
         "type": "attack"
       },
-      "range": ""
+      "range": "",
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Dire_Bat_tBWHW00epmMnkawe.json

@@ -107,7 +107,8 @@
           }
         ]
       },
-      "img": "icons/creatures/claws/claw-hooked-curved.webp"
+      "img": "icons/creatures/claws/claw-hooked-curved.webp",
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Dire_Wolf_wNzeuQLfLUMvgHlQ.json

@@ -107,7 +107,8 @@
           }
         ]
       },
-      "img": "icons/creatures/claws/claw-straight-brown.webp"
+      "img": "icons/creatures/claws/claw-straight-brown.webp",
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Dryad_wR7cFKrHvRzbzhBT.json

@@ -109,7 +109,8 @@
             "base": false
           }
         ]
-      }
+      },
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Electric_Eels_TLzY1nDw0Bu9Ud40.json

@@ -103,7 +103,8 @@
         "bonus": 0,
         "type": "attack"
       },
-      "range": ""
+      "range": "",
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Elemental_Spark_P7h54ZePFPHpYwvB.json

@@ -96,7 +96,8 @@
             "base": false
           }
         ]
-      }
+      },
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Elite_Soldier_bfhVWMBUh61b9J6n.json

@@ -87,7 +87,7 @@
       "img": "icons/weapons/polearms/spear-flared-steel.webp",
       "_id": "jmrgFi8AUL6LTbtU",
       "systemPath": "actions",
-      "type": "",
+      "type": "attack",
       "description": "",
       "chatDisplay": true,
       "actionType": "action",

src/packs/adversaries/adversary_Failed_Experiment_ChwwVqowFw8hJQwT.json

@@ -109,7 +109,8 @@
         ]
       },
       "img": "icons/creatures/claws/claw-hooked-barbed.webp",
-      "range": ""
+      "range": "",
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Fallen_Shock_Troop_OsLG2BjaEdTZUJU9.json

@@ -96,7 +96,8 @@
             "base": false
           }
         ]
-      }
+      },
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Fallen_Sorcerer_PELRry1vqjBzSAlr.json

@@ -109,7 +109,8 @@
           }
         ]
       },
-      "img": "icons/weapons/staves/staff-animal-skull-bull.webp"
+      "img": "icons/weapons/staves/staff-animal-skull-bull.webp",
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Giant_Beastmaster_8VZIgU12cB3cvlyH.json

@@ -109,7 +109,8 @@
             "base": false
           }
         ]
-      }
+      },
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Giant_Brawler_YnObCleGjPT7yqEc.json

@@ -109,7 +109,8 @@
             "base": false
           }
         ]
-      }
+      },
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Giant_Eagle_OMQ0v6PE8s1mSU0K.json

@@ -87,7 +87,7 @@
       "img": "icons/creatures/claws/claw-talons-glowing-orange.webp",
       "_id": "W2KpXQNCg6Nnorbz",
       "systemPath": "actions",
-      "type": "",
+      "type": "attack",
       "description": "",
       "chatDisplay": true,
       "actionType": "action",

src/packs/adversaries/adversary_Giant_Mosquitoes_IIWV4ysJPFPnTP7W.json

@@ -108,7 +108,8 @@
         "bonus": -2,
         "type": "attack"
       },
-      "range": ""
+      "range": "",
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Giant_Rat_4PfLnaCrOcMdb4dK.json

@@ -100,7 +100,8 @@
             "base": false
           }
         ]
-      }
+      },
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Giant_Recruit_5s8wSvpyC5rxY5aD.json

@@ -96,7 +96,8 @@
       "roll": {
         "bonus": 1,
         "type": "attack"
-      }
+      },
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Giant_Scorpion_fmfntuJ8mHRCAktP.json

@@ -107,7 +107,8 @@
             "base": false
           }
         ]
-      }
+      },
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Glass_Snake_8KWVLWXFhlY2kYx0.json

@@ -103,7 +103,8 @@
             "base": false
           }
         ]
-      }
+      },
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Gorgon_8mJYMpbLTb8qIOrr.json

@@ -109,7 +109,8 @@
           }
         ]
       },
-      "img": "icons/weapons/bows/shortbow-recurve-yellow.webp"
+      "img": "icons/weapons/bows/shortbow-recurve-yellow.webp",
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Greater_Earth_Elemental_dsfB3YhoL5SudvS2.json

@@ -103,7 +103,8 @@
             "base": false
           }
         ]
-      }
+      },
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Greater_Water_Elemental_xIICT6tEdnA7dKDV.json

@@ -103,7 +103,8 @@
             "base": false
           }
         ]
-      }
+      },
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Green_Ooze_SHXedd9zZPVfUgUa.json

@@ -107,7 +107,8 @@
           }
         ]
       },
-      "img": "icons/creatures/slimes/slime-movement-dripping-pseudopods-green.webp"
+      "img": "icons/creatures/slimes/slime-movement-dripping-pseudopods-green.webp",
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Hallowed_Archer_kabueAo6BALApWqp.json

@@ -103,7 +103,8 @@
             "base": false
           }
         ]
-      }
+      },
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Hallowed_Soldier_VENwg7xEFcYObjmT.json

@@ -95,7 +95,8 @@
           }
         ]
       },
-      "img": "icons/skills/melee/sword-shield-stylized-white.webp"
+      "img": "icons/skills/melee/sword-shield-stylized-white.webp",
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Harrier_uRtghKE9mHlII4rs.json

@@ -108,7 +108,8 @@
           }
         ]
       },
-      "img": "icons/weapons/polearms/spear-hooked-rounded.webp"
+      "img": "icons/weapons/polearms/spear-hooked-rounded.webp",
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Head_Guard_mK3A5FTx6k8iPU3F.json

@@ -111,7 +111,8 @@
             "base": false
           }
         ]
-      }
+      },
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Head_Vampire_i2UNbRvgyoSs07M6.json

@@ -108,7 +108,8 @@
             "base": false
           }
         ]
-      }
+      },
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_High_Seraph_r1mbfSSwKWdcFdAU.json

@@ -109,7 +109,8 @@
           }
         ]
       },
-      "img": "icons/skills/melee/strike-blade-hooked-orange-blue.webp"
+      "img": "icons/skills/melee/strike-blade-hooked-orange-blue.webp",
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Huge_Green_Ooze_6hbqmxDXFOzZJDk4.json

@@ -108,7 +108,8 @@
             "base": false
           }
         ]
-      }
+      },
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Hydra_MI126iMOOobQ1Obn.json

@@ -103,7 +103,8 @@
             "base": false
           }
         ]
-      }
+      },
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Jagged_Knife_Bandit_5Lh1T0zaT8Pkr2U2.json

@@ -107,7 +107,8 @@
           }
         ]
       },
-      "img": "icons/weapons/daggers/dagger-twin-green.webp"
+      "img": "icons/weapons/daggers/dagger-twin-green.webp",
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Jagged_Knife_Hexer_MbBPIOxaxXYNApXz.json

@@ -108,7 +108,8 @@
             "base": false
           }
         ]
-      }
+      },
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Jagged_Knife_Kneebreaker_CBKixLH3yhivZZuL.json

@@ -111,7 +111,8 @@
             "base": false
           }
         ]
-      }
+      },
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Jagged_Knife_Lackey_C0OMQqV7pN6t7ouR.json

@@ -92,7 +92,8 @@
             "base": false
           }
         ]
-      }
+      },
+      "type": "attack"
     },
     "resources": {
       "hitPoints": {

src/packs/adversaries/adversary_Jagged_Knife_Lieutenant_aTljstqteGoLpCBq.json

@@ -108,7 +108,8 @@
             "base": false
           }
         ]
-      }
+      },
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Jagged_Knife_Shadow_XF4tYTq9nPJAy2ox.json

@@ -107,7 +107,8 @@
             "base": false
           }
         ]
-      }
+      },
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Jagged_Knife_Sniper_1zuyof1XuIfi3aMG.json

@@ -108,7 +108,8 @@
             "base": false
           }
         ]
-      }
+      },
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Juvenile_Flickerfly_MYXmTx2FHcIjdfYZ.json

@@ -103,7 +103,8 @@
             "base": false
           }
         ]
-      }
+      },
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Knight_of_the_Realm_7ai2opemrclQe3VF.json

@@ -119,7 +119,8 @@
           }
         ]
       },
-      "range": ""
+      "range": "",
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Kraken_4nqv3ZwJGjnmic8j.json

@@ -109,7 +109,8 @@
           }
         ]
       },
-      "img": "icons/creatures/tentacles/tentacles-octopus-black-pink.webp"
+      "img": "icons/creatures/tentacles/tentacles-octopus-black-pink.webp",
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Masked_Thief_niBpVU7yeo5ccskE.json

@@ -109,7 +109,8 @@
           }
         ]
       },
-      "range": ""
+      "range": "",
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Master_Assassin_dNta0cUzr96xcFhf.json

@@ -114,7 +114,8 @@
             "base": false
           }
         ]
-      }
+      },
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Merchant_Al3w2CgjfdT3p9ma.json

@@ -107,7 +107,8 @@
           }
         ]
       },
-      "img": "icons/weapons/clubs/club-baton-blue.webp"
+      "img": "icons/weapons/clubs/club-baton-blue.webp",
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Merchant_Baron_Vy02IhGhkJLuezu4.json

@@ -113,7 +113,8 @@
             "base": false
           }
         ]
-      }
+      },
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Minor_Chaos_Elemental_sRn4bqerfARvhgSV.json

@@ -103,7 +103,8 @@
           }
         ]
       },
-      "range": "close"
+      "range": "close",
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Minor_Demon_3tqCjDwJAQ7JKqMb.json

@@ -102,7 +102,8 @@
             "base": false
           }
         ]
-      }
+      },
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Minor_Fire_Elemental_DscWkNVoHak6P4hh.json

@@ -103,7 +103,8 @@
             "base": false
           }
         ]
-      }
+      },
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Minor_Treant_G62k4oSkhkoXEs2D.json

@@ -95,7 +95,8 @@
             "base": false
           }
         ]
-      }
+      },
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Minotaur_Wrecker_rM9qCIYeWg9I0B4l.json

@@ -103,7 +103,8 @@
           }
         ]
       },
-      "img": "icons/weapons/axes/axe-double.webp"
+      "img": "icons/weapons/axes/axe-double.webp",
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Monarch_yx0vK2yfNVZKWUUi.json

@@ -113,7 +113,8 @@
             "base": false
           }
         ]
-      }
+      },
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Mortal_Hunter_mVV7a7KQAORoPMgZ.json

@@ -109,7 +109,8 @@
             "base": false
           }
         ]
-      }
+      },
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Oak_Treant_XK78QUfY8c8Go8Uv.json

@@ -64,7 +64,45 @@
       }
     },
     "tier": 3,
-    "description": "<p>A sturdy animate old-growth tree.</p>"
+    "description": "<p>A sturdy animate old-growth tree.</p>",
+    "attack": {
+      "name": "Attack",
+      "roll": {
+        "type": "attack",
+        "bonus": 2
+      },
+      "range": "close",
+      "damage": {
+        "parts": [
+          {
+            "value": {
+              "multiplier": "flat",
+              "flatMultiplier": 3,
+              "dice": "d8",
+              "bonus": 2,
+              "custom": {
+                "enabled": false
+              }
+            },
+            "type": ["physical"],
+            "applyTo": "hitPoints",
+            "resultBased": false,
+            "valueAlt": {
+              "multiplier": "prof",
+              "flatMultiplier": 1,
+              "dice": "d6",
+              "bonus": null,
+              "custom": {
+                "enabled": false
+              }
+            },
+            "base": false
+          }
+        ]
+      },
+      "img": "icons/skills/melee/blood-slash-foam-red.webp",
+      "type": "attack"
+    }
   },
   "flags": {},
   "_stats": {

src/packs/adversaries/adversary_Oracle_of_Doom_befIqd5IYKg6eUz2.json

@@ -109,7 +109,8 @@
           }
         ]
       },
-      "img": "icons/magic/symbols/rune-sigil-rough-white-teal.webp"
+      "img": "icons/magic/symbols/rune-sigil-rough-white-teal.webp",
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Outer_Realms_Abomination_A0SeeDzwjvqOsyof.json

@@ -103,7 +103,8 @@
           }
         ]
       },
-      "img": "icons/creatures/tentacles/tentacle-earth-green.webp"
+      "img": "icons/creatures/tentacles/tentacle-earth-green.webp",
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Outer_Realms_Corrupter_ms6nuOl3NFkhPj1k.json

@@ -103,7 +103,8 @@
             "base": false
           }
         ]
-      }
+      },
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Outer_Realms_Thrall_moJhHgKqTKPS2WYS.json

@@ -95,7 +95,8 @@
         "bonus": 3,
         "type": "attack"
       },
-      "img": "icons/creatures/claws/claw-talons-yellow-red.webp"
+      "img": "icons/creatures/claws/claw-talons-yellow-red.webp",
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Patchwork_Zombie_Hulk_EQTOAOUrkIvS2z88.json

@@ -112,7 +112,8 @@
           }
         ]
       },
-      "img": "icons/commodities/biological/hand-clawed-blue.webp"
+      "img": "icons/commodities/biological/hand-clawed-blue.webp",
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Perfected_Zombie_CP6iRfHdyFWniTHY.json

@@ -103,7 +103,8 @@
             "base": false
           }
         ]
-      }
+      },
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Petty_Noble_wycLpvebWdUqRhpP.json

@@ -107,7 +107,8 @@
             "base": false
           }
         ]
-      }
+      },
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Pirate_Captain_OROJbjsqagVh7ECV.json

@@ -111,7 +111,8 @@
             "base": false
           }
         ]
-      }
+      },
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Pirate_Raiders_5YgEajn0wa4i85kC.json

@@ -107,7 +107,8 @@
       "roll": {
         "bonus": 1,
         "type": "attack"
-      }
+      },
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Red_Ooze_9rVlbJVrDNn1x7PS.json

@@ -107,7 +107,8 @@
           }
         ]
       },
-      "img": "icons/creatures/slimes/slime-movement-dripping-pseudopods-green.webp"
+      "img": "icons/creatures/slimes/slime-movement-dripping-pseudopods-green.webp",
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Rotted_Zombie_gP3fWTLzSFnpA8EJ.json

@@ -87,7 +87,8 @@
           }
         ]
       },
-      "img": "icons/creatures/abilities/mouth-teeth-sharp.webp"
+      "img": "icons/creatures/abilities/mouth-teeth-sharp.webp",
+      "type": "attack"
     },
     "resources": {
       "hitPoints": {

src/packs/adversaries/adversary_Royal_Advisor_EtLJiTsilPPZvLUX.json

@@ -114,7 +114,8 @@
             "base": false
           }
         ]
-      }
+      },
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Secret_Keeper_sLAccjvCWfeedbpI.json

@@ -114,7 +114,8 @@
           }
         ]
       },
-      "img": "icons/weapons/staves/staff-ornate-purple.webp"
+      "img": "icons/weapons/staves/staff-ornate-purple.webp",
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Sellsword_bgreCaQ6ap2DVpCr.json

@@ -95,7 +95,8 @@
         "bonus": 3,
         "type": "attack"
       },
-      "img": "icons/weapons/swords/sword-guard.webp"
+      "img": "icons/weapons/swords/sword-guard.webp",
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Shambling_Zombie_2nXz4ilAY4xuhKLm.json

@@ -102,7 +102,8 @@
             "base": false
           }
         ]
-      }
+      },
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Shark_YmVAkdNsyuXWTtYp.json

@@ -103,7 +103,8 @@
             "base": false
           }
         ]
-      }
+      },
+      "type": "attack"
     }
   },
   "flags": {},

src/packs/adversaries/adversary_Siren_BK4jwyXSRx7IOQiO.json

@@ -109,7 +109,8 @@
         ]
       },
       "img": "icons/creatures/abilities/mouth-teeth-sharp.webp",
-      "range": ""
+      "range": "",
+      "type": "attack"
     }
   },
   "flags": {},