From a98e1cef909f1b9825b8e5b8f276911c38e492bd Mon Sep 17 00:00:00 2001
From: WBHarry <williambjrklund@gmail.com>
Date: Sat, 18 Jul 2026 22:29:07 +0200
Subject: [PATCH] Improved DamageDialog

---
 .../dialogs/dice-roll/damageSelection.hbs     | 39 +++++++++----------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/templates/dialogs/dice-roll/damageSelection.hbs b/templates/dialogs/dice-roll/damageSelection.hbs
index 1f03ea07..e865ebe6 100644
--- a/templates/dialogs/dice-roll/damageSelection.hbs
+++ b/templates/dialogs/dice-roll/damageSelection.hbs
@@ -16,6 +16,23 @@
         </fieldset>
     {{/if}}
     
+    {{#if damageOptions.groupAttack}}
+        <fieldset class="group-attack-container">
+            <legend>{{localize "DAGGERHEART.ACTIONS.Settings.groupAttack.label"}}</legend>
+
+            <div class="group-attack-inner-container">
+                <input type="text" data-dtype="Number" name="damageOptions.groupAttack.numAttackers" value="{{damageOptions.groupAttack.numAttackers}}" />
+
+                <div class="group-attack-tools">
+                    <select name="damageOptions.groupAttack.range">
+                        {{selectOptions rangeOptions selected=damageOptions.groupAttack.range localize=true}}
+                    </select>
+                    <button data-action="updateGroupAttack"><i class="fa-solid fa-crosshairs"></i></button>
+                </div>
+            </div>
+        </fieldset>
+    {{/if}}
+    
     {{#if @root.damageFormula}}
         {{#with @root.damageFormula}}
             <div class="damage-formula">
@@ -41,10 +58,6 @@
         {{/with}}
     {{/if}}
 
-    {{#unless (empty @root.resourceFormulas)}}
-        <div class="section-header">{{localize "Resource Drain"}}</div>
-    {{/unless}}
-
     {{#each @root.resourceFormulas}}
         <div class="damage-formula">
             <span class="damage-resource"><b>{{localize "DAGGERHEART.GENERAL.formula"}}:</b> {{roll.formula}}</span>
@@ -59,23 +72,6 @@
         </div>
     {{/each}}
 
-    {{#if damageOptions.groupAttack}}
-        <fieldset class="group-attack-container">
-            <legend>{{localize "DAGGERHEART.ACTIONS.Settings.groupAttack.label"}}</legend>
-
-            <div class="group-attack-inner-container">
-                <input type="text" data-dtype="Number" name="damageOptions.groupAttack.numAttackers" value="{{damageOptions.groupAttack.numAttackers}}" />
-
-                <div class="group-attack-tools">
-                    <select name="damageOptions.groupAttack.range">
-                        {{selectOptions rangeOptions selected=damageOptions.groupAttack.range localize=true}}
-                    </select>
-                    <button data-action="updateGroupAttack"><i class="fa-solid fa-crosshairs"></i></button>
-                </div>
-            </div>
-        </fieldset>
-    {{/if}}
-
     {{#unless (empty @root.modifiers)}}
         <fieldset class="modifier-container two-columns">
             <legend>{{localize "DAGGERHEART.GENERAL.Modifier.plural"}}</legend>
@@ -92,6 +88,7 @@
             {{/each}}
         </fieldset>
     {{/unless}}
+
     <div class="damage-section-controls">
         {{#if directDamage}}
             <select class="roll-mode-select" name="selectedMessageMode">