From 52ebbbd6c9b7e4328e55f372fdf63ffd8b77607d Mon Sep 17 00:00:00 2001
From: Carlos Fernandez <cfern1990@gmail.com>
Date: Sat, 25 Apr 2026 18:32:37 -0400
Subject: [PATCH] Fix advantage/disadvantage

---
 styles/less/dialog/group-roll-dialog/main.less    |  6 ++++--
 .../dialogs/groupRollDialog/parts/member.hbs      | 15 +++++++++++----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/styles/less/dialog/group-roll-dialog/main.less b/styles/less/dialog/group-roll-dialog/main.less
index d542d671..f266dcc7 100644
--- a/styles/less/dialog/group-roll-dialog/main.less
+++ b/styles/less/dialog/group-roll-dialog/main.less
@@ -158,7 +158,7 @@
                         align-items: center;
                         justify-content: center;
                         flex-wrap: wrap;
-                        gap: 4px;
+                        gap: 2px;
 
                         .roll-dice {
                             position: relative;
@@ -175,16 +175,18 @@
                             }
 
                             img {
-                                height: 1.25rem;
+                                height: 1.3125rem;
                             }
                         }
 
                         .roll-operator {
                             font-size: var(--font-size-18);
+                            padding: 0 1px;
                         }
 
                         .roll-value {
                             font-size: var(--font-size-16);
+                            padding: 0 1px;
                         }
                     }
                 }
diff --git a/templates/dialogs/groupRollDialog/parts/member.hbs b/templates/dialogs/groupRollDialog/parts/member.hbs
index 9fa4e49c..ee857794 100644
--- a/templates/dialogs/groupRollDialog/parts/member.hbs
+++ b/templates/dialogs/groupRollDialog/parts/member.hbs
@@ -50,11 +50,18 @@
                             <span class="dice-label">{{roll.dFear.total}}</span>
                             <img src="{{concat "systems/daggerheart/assets/icons/dice/fear/" roll.dFear.denomination ".svg"}}" />
                         </a>
-                        {{#if roll.advantage.type}}
-                            <span class="roll-operator">{{#if (eq roll.advantage.type 1)}}+{{else}}-{{/if}}</span>
+                        {{#if roll.hasAdvantage}}
+                            <span class="roll-operator">+</span>
                             <span class="roll-dice">
-                                <span class="dice-label">{{roll.advantage.value}}</span>
-                                <img src="{{concat "systems/daggerheart/assets/icons/dice/" (ifThen (eq roll.advantage.type 1) "adv/" "disadv/") roll.advantage.dice ".svg"}}" />
+                                <span class="dice-label">{{roll.dAdvantage.total}}</span>
+                                <img src="{{concat "systems/daggerheart/assets/icons/dice/adv/d" roll.advantageFaces ".svg"}}" />
+                            </span>
+                        {{/if}}
+                        {{#if roll.hasDisadvantage}}
+                            <span class="roll-operator">-</span>
+                            <span class="roll-dice">
+                                <span class="dice-label">{{roll.dDisadvantage.total}}</span>
+                                <img src="{{concat "systems/daggerheart/assets/icons/dice/disadv/d" roll.advantageFaces ".svg"}}" />
                             </span>
                         {{/if}}
                         <span class="roll-operator ">{{#if (gte roll.modifierTotal 0)}}+{{else}}-{{/if}}</span>