From f11b018bd727e1e348124b47f765d404f3afd35e Mon Sep 17 00:00:00 2001
From: Carlos Fernandez <CarlosFdez@users.noreply.github.com>
Date: Sun, 28 Dec 2025 13:07:12 -0500
Subject: [PATCH] Support drag/drop resorting of adversary features (#1469)

---
 module/applications/sheets/actors/adversary.mjs | 7 +++++++
 templates/sheets/actors/adversary/features.hbs  | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/module/applications/sheets/actors/adversary.mjs b/module/applications/sheets/actors/adversary.mjs
index 789543cf..98282d9f 100644
--- a/module/applications/sheets/actors/adversary.mjs
+++ b/module/applications/sheets/actors/adversary.mjs
@@ -93,6 +93,13 @@ export default class AdversarySheet extends DHBaseActorSheet {
         context.resources.stress.emptyPips =
             context.resources.stress.max < maxResource ? maxResource - context.resources.stress.max : 0;
 
+        const featureForms = ['passive', 'action', 'reaction'];
+        context.features = this.document.system.features.sort((a, b) =>
+            a.system.featureForm !== b.system.featureForm
+                ? featureForms.indexOf(a.system.featureForm) - featureForms.indexOf(b.system.featureForm)
+                : a.sort - b.sort
+        );
+
         return context;
     }
 
diff --git a/templates/sheets/actors/adversary/features.hbs b/templates/sheets/actors/adversary/features.hbs
index 98c1cedb..a24342fc 100644
--- a/templates/sheets/actors/adversary/features.hbs
+++ b/templates/sheets/actors/adversary/features.hbs
@@ -4,7 +4,7 @@
         {{> 'daggerheart.inventory-items'
             title=tabs.features.label
             type='feature'
-            collection=document.system.features
+            collection=@root.features
             hideContextMenu=true
             canCreate=true
             showActions=true