diff --git a/lang/en.json b/lang/en.json index 912fb9bf..e0ef27cb 100755 --- a/lang/en.json +++ b/lang/en.json @@ -1302,6 +1302,7 @@ "title": "Title", "true": "True", "type": "Type", + "unarmed": "Unarmed", "unarmedStrike": "Unarmed Strike", "unarmored": "Unarmored", "use": "Use", @@ -1358,10 +1359,11 @@ "features": { "label": "Nr Features" } } }, + "attackName": "Beast Attack", + "beastformEffect": "Beastform Transformation", "dialogTitle": "Beastform Selection", "tokenTitle": "Beastform Token", "transform": "Transform", - "beastformEffect": "Beastform Transformation", "evolve": "Evolve", "evolvedFeatureTitle": "Evolved", "evolvedDrag": "Drag a form here to evolve it.", diff --git a/module/data/actor/character.mjs b/module/data/actor/character.mjs index 97afbd79..605b92e1 100644 --- a/module/data/actor/character.mjs +++ b/module/data/actor/character.mjs @@ -329,8 +329,16 @@ export default class DhCharacter extends BaseDataActor { return this.parent.effects.find(x => x.type === 'beastform'); } - get unarmedIcon() { - return this.activeBeastform ? 'icons/creatures/claws/claw-straight-brown.webp' : this.attack.img; + get usedUnarmed() { + const primaryWeaponEquipped = this.primaryWeapon?.system?.equipped; + const secondaryWeaponEquipped = this.secondaryWeapon?.system?.equipped; + return !primaryWeaponEquipped && !secondaryWeaponEquipped + ? { + ...this.attack, + name: this.activeBeastform ? 'DAGGERHEART.ITEMS.Beastform.attackName' : this.attack.name, + img: this.activeBeastform ? 'icons/creatures/claws/claw-straight-brown.webp' : this.attack.img + } + : null; } get sheetLists() { diff --git a/templates/sheets/actors/character/sidebar.hbs b/templates/sheets/actors/character/sidebar.hbs index 51816443..ca36dfde 100644 --- a/templates/sheets/actors/character/sidebar.hbs +++ b/templates/sheets/actors/character/sidebar.hbs @@ -92,6 +92,9 @@