From 127f50dbc3dd6436fb28ec5692daba7ce5d2eb03 Mon Sep 17 00:00:00 2001
From: Carlos Fernandez <cfern1990@gmail.com>
Date: Sat, 25 Apr 2026 21:53:44 -0400
Subject: [PATCH] Order character sidebar equip items

---
 .../applications/sheets/actors/character.mjs  |  7 ++++++-
 templates/sheets/actors/character/sidebar.hbs | 20 +++++++++----------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/module/applications/sheets/actors/character.mjs b/module/applications/sheets/actors/character.mjs
index c59dd64e..513ad3f3 100644
--- a/module/applications/sheets/actors/character.mjs
+++ b/module/applications/sheets/actors/character.mjs
@@ -3,7 +3,7 @@ import DhDeathMove from '../../dialogs/deathMove.mjs';
 import { CharacterLevelup, LevelupViewMode } from '../../levelup/_module.mjs';
 import DhCharacterCreation from '../../characterCreation/characterCreation.mjs';
 import FilterMenu from '../../ux/filter-menu.mjs';
-import { getArmorSources, getDocFromElement, getDocFromElementSync } from '../../../helpers/utils.mjs';
+import { getArmorSources, getDocFromElement, getDocFromElementSync, sortBy } from '../../../helpers/utils.mjs';
 
 /**@typedef {import('@client/applications/_types.mjs').ApplicationClickAction} ApplicationClickAction */
 
@@ -226,6 +226,11 @@ export default class CharacterSheet extends DHBaseActorSheet {
         context.resources.stress.emptyPips =
             context.resources.stress.max < maxResource ? maxResource - context.resources.stress.max : 0;
 
+        context.equippedItems = sortBy(
+            this.document.items.filter(i => i.system.equipped),
+            i => (i.type === 'weapon' ? (i.system.secondary ? 1 : 0) : 2)
+        );
+
         context.beastformActive = this.document.effects.find(x => x.type === 'beastform');
 
         return context;
diff --git a/templates/sheets/actors/character/sidebar.hbs b/templates/sheets/actors/character/sidebar.hbs
index 0142ac1d..a0f93121 100644
--- a/templates/sheets/actors/character/sidebar.hbs
+++ b/templates/sheets/actors/character/sidebar.hbs
@@ -108,18 +108,16 @@
             </div>
             <ul class="items-sidebar-list">
                 {{#if document.system.usedUnarmed}}
-                {{> 'daggerheart.inventory-item-compact'
-                    item=document.system.usedUnarmed
-                    type='attack'
-                }}
-                {{/if}}
-                {{#each document.items as |item|}}
-                {{#if item.system.equipped}}
-                {{> 'daggerheart.inventory-item-compact'
-                    item=item
-                    type=item.type
-                }}
+                    {{> 'daggerheart.inventory-item-compact'
+                        item=document.system.usedUnarmed
+                        type='attack'
+                    }}
                 {{/if}}
+                {{#each equippedItems as |item|}}
+                    {{> 'daggerheart.inventory-item-compact'
+                        item=item
+                        type=item.type
+                    }}
                 {{/each}}
             </ul>
         </div>