From be625ecdc7ae95bb8c6761f85df17fcabc4c97e0 Mon Sep 17 00:00:00 2001
From: WBHarry <williambjrklund@gmail.com>
Date: Sat, 19 Jul 2025 13:59:58 +0200
Subject: [PATCH] Added unarmed strike in sidebar

---
 lang/en.json                                        |  4 +++-
 module/data/actor/character.mjs                     | 12 ++++++++++--
 templates/sheets/actors/character/sidebar.hbs       |  3 +++
 templates/sheets/global/partials/inventory-item.hbs | 12 +++++++++++-
 4 files changed, 27 insertions(+), 4 deletions(-)

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 @@
             <side-line-div></side-line-div>
         </div>
         <ul class="items-sidebar-list">
+            {{#if document.system.usedUnarmed}}
+                {{> 'systems/daggerheart/templates/sheets/global/partials/inventory-item.hbs' item=document.system.usedUnarmed type='attack' isSidebar=true}}
+            {{/if}}
             {{#each document.items as |item|}}
                 {{#if item.system.equipped}}
                     {{> 'systems/daggerheart/templates/sheets/global/partials/inventory-item.hbs' item=item type=item.type isSidebar=true}}
diff --git a/templates/sheets/global/partials/inventory-item.hbs b/templates/sheets/global/partials/inventory-item.hbs
index a6373c08..b239e226 100644
--- a/templates/sheets/global/partials/inventory-item.hbs
+++ b/templates/sheets/global/partials/inventory-item.hbs
@@ -5,7 +5,7 @@
             {{#if isCompanion}}
                 <a class="item-name" data-action="attackRoll">{{item.name}}</a>
             {{else}}
-                <div class="item-name">{{item.name}}</div>
+                <div class="item-name">{{localize item.name}}</div>
             {{/if}}
             {{#if  (eq type 'weapon')}} 
                 <div class="item-tags">
@@ -125,6 +125,16 @@
                     </div>
                 </div>
             {{/if}}
+            {{#if  (eq type 'attack')}}
+                <div class="item-tags">
+                    <div class="tag">
+                        {{localize 'DAGGERHEART.GENERAL.unarmed'}}
+                    </div>
+                    <div class="tag">
+                        {{localize 'DAGGERHEART.CONFIG.ActionType.action'}}
+                    </div>
+                </div>
+            {{/if}}
         </div>
         {{#if (and (not isSidebar) (eq item.system.resource.type 'simple'))}}
             {{> "systems/daggerheart/templates/sheets/global/partials/item-resource.hbs"}}