From 6ef28abd03df3a58a64d068f47459e528da2d382 Mon Sep 17 00:00:00 2001
From: WBHarry <89362246+WBHarry@users.noreply.github.com>
Date: Sun, 3 Aug 2025 14:34:33 +0200
Subject: [PATCH] Fixed Hope&Fear (#538)

---
 module/applications/ui/chatLog.mjs    |  2 +-
 styles/less/ui/chat/chat.less         | 19 +++++++++++++++++--
 templates/ui/chat/parts/roll-part.hbs | 18 ++++++++++++------
 3 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/module/applications/ui/chatLog.mjs b/module/applications/ui/chatLog.mjs
index 151b1cc5..958d0386 100644
--- a/module/applications/ui/chatLog.mjs
+++ b/module/applications/ui/chatLog.mjs
@@ -223,7 +223,7 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo
             if (!confirmed) return;
         }
 
-        const target = event.target.closest('button[data-die-index]');
+        const target = event.target.closest('[data-die-index]');
         let originalRoll_parsed = message.rolls.map(roll => JSON.parse(roll))[0];
         const rollClass =
             game.system.api.dice[
diff --git a/styles/less/ui/chat/chat.less b/styles/less/ui/chat/chat.less
index 99cb981b..941b6896 100644
--- a/styles/less/ui/chat/chat.less
+++ b/styles/less/ui/chat/chat.less
@@ -467,14 +467,25 @@
                         > :last-child {
                             margin-bottom: 5px;
                         }
+
+                        .roll-die {
+                            position: relative;
+
+                            .dice-rerolled {
+                                position: absolute;
+                                top: 0;
+                                right: 0;
+                                font-size: 10px;
+                                z-index: 2;
+                                filter: drop-shadow(0 0 3px black);
+                            }
+                        }
                     }
                 }
 
                 .roll-result-container {
                     display: flex;
                     justify-content: center;
-                    align-items: center;
-                    gap: 10px;
                     color: var(--text-color);
                     font-weight: 700;
                     font-family: 'Cinzel', sans-serif;
@@ -486,6 +497,10 @@
                     .roll-result-desc {
                         font-size: var(--font-size-16);
                         margin-top: 2px;
+
+                        span {
+                            margin-left: 10px;
+                        }
                     }
                 }
 
diff --git a/templates/ui/chat/parts/roll-part.hbs b/templates/ui/chat/parts/roll-part.hbs
index f5518936..0d9ce15d 100644
--- a/templates/ui/chat/parts/roll-part.hbs
+++ b/templates/ui/chat/parts/roll-part.hbs
@@ -4,18 +4,18 @@
             <span class="roll-result-value">{{roll.total}}</span>
             <span class="roll-result-desc">
                 {{#if roll.isCritical}}
-                    {{localize "DAGGERHEART.GENERAL.criticalShort"}}
+                    <span>{{localize "DAGGERHEART.GENERAL.criticalShort"}}</span>
                 {{else}}
                     {{#if roll.result}}
-                        {{localize "DAGGERHEART.GENERAL.withThing" thing=roll.result.label}}
+                        <span>{{localize "DAGGERHEART.GENERAL.withThing" thing=roll.result.label}}</span>
                     {{/if}}
                 {{/if}}
             </span>
         </div>
-        {{#if roll.difficulty}}<span class="roll-difficulty{{#unless roll.success}} is-miss{{/unless}}">difficulty {{roll.difficulty}}</span>{{/if}}
+        {{#if roll.difficulty}}<span class="roll-difficulty{{#unless roll.success}} is-miss{{/unless}}">{{localize "DAGGERHEART.GENERAL.difficulty"}} {{roll.difficulty}}</span>{{/if}}
     </div>
     <div class="dice-roll" data-action="expandRoll">
-        <div class="roll-part-header"><div><span>Formula</span></div></div>
+        <div class="roll-part-header"><div><span>{{localize "DAGGERHEART.GENERAL.formula"}}</span></div></div>
         <div class="roll-part-content dice-result">
             <div class="dice-tooltip">
                 <div class="wrapper">
@@ -23,7 +23,10 @@
                         {{#if roll.hope}}
                             <div class="roll-die">
                                 <label>{{localize "DAGGERHEART.GENERAL.hope"}}</label>
-                                <div class="dice {{roll.hope.dice}} color-hope">{{roll.hope.value}}</div>
+                                <div class="dice {{roll.hope.dice}} color-hope reroll-button" data-die-index="0" data-type="hope" data-tooltip="{{localize "DAGGERHEART.GENERAL.rerollThing" thing=(localize "DAGGERHEART.GENERAL.hope")}}">
+                                    {{#if roll.hope.rerolled.any}}<i class="fa-solid fa-dice dice-rerolled" data-tooltip="{{localize "DAGGERHEART.UI.Tooltip.diceIsRerolled" times=roll.hope.rerolled.rerolls.length}}"></i>{{/if}}
+                                    {{roll.hope.value}}
+                                </div>
                             </div>
                             <div class="roll-die">
                                 <label></label>
@@ -31,7 +34,10 @@
                             </div>
                             <div class="roll-die">
                                 <label>{{localize "DAGGERHEART.GENERAL.fear"}}</label>
-                                <div class="dice {{roll.fear.dice}} color-fear" style="--svg-folder: 'fear';">{{roll.fear.value}}</div>
+                                <div class="dice {{roll.fear.dice}} color-fear reroll-button" data-die-index="2" data-type="fear" style="--svg-folder: 'fear';" data-tooltip="{{localize "DAGGERHEART.GENERAL.rerollThing" thing=(localize "DAGGERHEART.GENERAL.fear")}}">
+                                    {{#if roll.fear.rerolled.any}}<i class="fa-solid fa-dice dice-rerolled" data-tooltip="{{localize "DAGGERHEART.UI.Tooltip.diceIsRerolled" times=roll.fear.rerolled.rerolls.length}}"></i>{{/if}}
+                                    {{roll.fear.value}}
+                                </div>
                             </div>
                             {{#if roll.advantage.type}}
                                 <div class="roll-die">