From 67d142df3d5ae908293fbae74da8d35cb96f5b4b Mon Sep 17 00:00:00 2001
From: WBHarry <williambjrklund@gmail.com>
Date: Sun, 5 Apr 2026 17:27:02 +0200
Subject: [PATCH 1/3] Fixed migration

---
 module/systemRegistration/migrations.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/systemRegistration/migrations.mjs b/module/systemRegistration/migrations.mjs
index 2851f7d4..c2c53f4e 100644
--- a/module/systemRegistration/migrations.mjs
+++ b/module/systemRegistration/migrations.mjs
@@ -345,7 +345,7 @@ export async function runMigrations() {
 
     if (foundry.utils.isNewerVersion('2.0.4', lastMigrationVersion)) {
         const downtimeMoves = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew);
-        if (restMoves.longRest.moves.repairArmor) {
+        if (downtimeMoves.restMoves.longRest.moves.repairArmor) {
             await downtimeMoves.updateSource({
                 'restMoves.longRest.moves.repairArmor': defaultRestOptions.longRest().repairArmor
             });

From 4c2d31b2f4dd7b76e4c6374bd6af3cf40a1cf56a Mon Sep 17 00:00:00 2001
From: WBHarry <89362246+WBHarry@users.noreply.github.com>
Date: Sun, 5 Apr 2026 19:28:27 +0200
Subject: [PATCH 2/3] Fixed so that expanded damage info without any dice will
 show the correct value (#1780)

---
 templates/ui/chat/parts/damage-part.hbs | 41 +++++++++++++------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/templates/ui/chat/parts/damage-part.hbs b/templates/ui/chat/parts/damage-part.hbs
index 02519a86..45b09b72 100644
--- a/templates/ui/chat/parts/damage-part.hbs
+++ b/templates/ui/chat/parts/damage-part.hbs
@@ -33,31 +33,32 @@
                                 <div class="roll-formula">{{total}}</div></span></label>
                             {{/if}}
                             <div class="roll-dice">
-                                {{#each dice}}
-                                    {{#each results}}
-                                        {{#unless discarded}}
-                                            <div class="roll-die{{#unless @../first}} has-plus{{/unless}}">
-                                                <div 
-                                                    class="dice reroll-button {{../dice}}" 
-                                                    data-die-index="0" data-type="damage" data-damage-type="{{@../../../key}}" data-part="{{@../../key}}" data-dice="{{@../key}}" data-result="{{@key}}"
-                                                >
-                                                    {{#if hasRerolls}}<i class="fa-solid fa-dice dice-rerolled" data-tooltip="{{localize "DAGGERHEART.GENERAL.rerolled"}}"></i>{{/if}}
-                                                    {{result}}
+                                {{#if dice.length}}
+                                    {{#each dice}}
+                                        {{#each results}}
+                                            {{#unless discarded}}
+                                                <div class="roll-die{{#unless @../first}} has-plus{{/unless}}">
+                                                    <div 
+                                                        class="dice reroll-button {{../dice}}" 
+                                                        data-die-index="0" data-type="damage" data-damage-type="{{@../../../key}}" data-part="{{@../../key}}" data-dice="{{@../key}}" data-result="{{@key}}"
+                                                    >
+                                                        {{#if hasRerolls}}<i class="fa-solid fa-dice dice-rerolled" data-tooltip="{{localize "DAGGERHEART.GENERAL.rerolled"}}"></i>{{/if}}
+                                                        {{result}}
+                                                    </div>
                                                 </div>
-                                            </div>
-                                        {{/unless}}
+                                            {{/unless}}
+                                        {{/each}}
                                     {{/each}}
-                                {{/each}}
-                                {{#if modifierTotal}}
-                                    <div class="roll-die{{#if (gt modifierTotal 0)}} has-plus{{/if}}">
-                                        <div class="font-20">{{modifierTotal}}</div>
-                                    </div>
-                                {{/if}}
-                                {{#unless dice.length}}
+                                    {{#if modifierTotal}}
+                                        <div class="roll-die{{#if (gt modifierTotal 0)}} has-plus{{/if}}">
+                                            <div class="font-20">{{modifierTotal}}</div>
+                                        </div>
+                                    {{/if}}
+                                {{else}}
                                     <div class="roll-die">
                                         <div class="font-20">{{total}}</div>
                                     </div>
-                                {{/unless}}
+                                {{/if}}
                             </div>
                         {{/each}}
                     </fieldset>

From fad830580ccdde5347aaeb7364449f1ff6a29494 Mon Sep 17 00:00:00 2001
From: WBHarry <89362246+WBHarry@users.noreply.github.com>
Date: Mon, 6 Apr 2026 00:18:43 +0200
Subject: [PATCH 3/3] Added checkboxes for muting the sounds of dice animations
 (#1781)

---
 lang/en.json                                  |  1 +
 module/config/generalConfig.mjs               |  4 ++--
 module/data/settings/Appearance.mjs           |  3 +++
 .../appearance-settings/diceSoNice.less       | 24 +++++++++++++++++++
 .../appearance-settings/diceSoNice.hbs        | 11 +++++++--
 .../appearance-settings/diceSoNiceTab.hbs     | 10 ++++++--
 6 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/lang/en.json b/lang/en.json
index d19dfb58..7b1e5744 100755
--- a/lang/en.json
+++ b/lang/en.json
@@ -2857,6 +2857,7 @@
                         "system": "Dice Preset",
                         "font": "Font",
                         "critical": "Duality Critical Animation",
+                        "muted": "Muted",
                         "diceAppearance": "Dice Appearance",
                         "animations": "Animations",
                         "defaultAnimations": "Set Animations As Player Defaults",
diff --git a/module/config/generalConfig.mjs b/module/config/generalConfig.mjs
index 24f1de92..918cb417 100644
--- a/module/config/generalConfig.mjs
+++ b/module/config/generalConfig.mjs
@@ -708,14 +708,14 @@ const getDiceSoNiceSFX = sfxOptions => {
     if (sfxOptions.critical && criticalAnimationData.class) {
         return {
             specialEffect: criticalAnimationData.class,
-            options: {}
+            options: { ...criticalAnimationData.options }
         };
     }
 
     if (sfxOptions.higher && sfxOptions.data.higher) {
         return {
             specialEffect: sfxOptions.data.higher.class,
-            options: {}
+            options: { ...sfxOptions.data.higher.options }
         };
     }
 
diff --git a/module/data/settings/Appearance.mjs b/module/data/settings/Appearance.mjs
index 9da3afac..4db27be0 100644
--- a/module/data/settings/Appearance.mjs
+++ b/module/data/settings/Appearance.mjs
@@ -8,6 +8,9 @@ export default class DhAppearance extends foundry.abstract.DataModel {
                 initial: null,
                 blank: true,
                 choices: CONFIG.DH.GENERAL.diceSoNiceSFXClasses
+            }),
+            options: new foundry.data.fields.SchemaField({
+                muteSound: new foundry.data.fields.BooleanField()
             })
         });
 
diff --git a/styles/less/ui/settings/appearance-settings/diceSoNice.less b/styles/less/ui/settings/appearance-settings/diceSoNice.less
index 079bebc5..a4846596 100644
--- a/styles/less/ui/settings/appearance-settings/diceSoNice.less
+++ b/styles/less/ui/settings/appearance-settings/diceSoNice.less
@@ -68,5 +68,29 @@
             text-align: center;
             white-space: nowrap;
         }
+
+        color-picker {
+            gap: 4px;
+            background: inherit;
+        }
+    }
+
+    .animation-container {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+
+        .animation-inner-container {
+            display: flex;
+            align-items: center;
+            justify-content: right;
+            gap: 8px;
+
+            .animation-control {
+                display: flex;
+                align-items: center;
+                gap: 2px;
+            }
+        }
     }
 }
diff --git a/templates/settings/appearance-settings/diceSoNice.hbs b/templates/settings/appearance-settings/diceSoNice.hbs
index afe7dd5a..6cd4e52e 100644
--- a/templates/settings/appearance-settings/diceSoNice.hbs
+++ b/templates/settings/appearance-settings/diceSoNice.hbs
@@ -9,9 +9,16 @@
         {{/if}}
         <div class="form-group"> 
             <label>{{localize "DAGGERHEART.SETTINGS.Menu.appearance.diceSoNice.critical"}}</label>
+            
             <div class="form-fields">
-                {{formInput fields.diceSoNice.fields.sfx.fields.critical.fields.class value=setting.diceSoNice.sfx.critical.class blank="" localize=true}}
-            </div>       
+                <div class="form-fields">
+                    {{formInput fields.diceSoNice.fields.sfx.fields.critical.fields.class value=setting.diceSoNice.sfx.critical.class blank="" localize=true}}
+                </div>      
+                <label>{{localize "DAGGERHEART.SETTINGS.Menu.appearance.diceSoNice.muted"}}</label>
+                <div class="form-fields">
+                    {{formInput fields.diceSoNice.fields.sfx.fields.critical.fields.options.fields.muteSound value=setting.diceSoNice.sfx.critical.options.muteSound localize=true}}
+                </div>   
+            </div>
         </div>
     </div>
     <section class='tab-navigation'>
diff --git a/templates/settings/appearance-settings/diceSoNiceTab.hbs b/templates/settings/appearance-settings/diceSoNiceTab.hbs
index a15b63ec..89b587af 100644
--- a/templates/settings/appearance-settings/diceSoNiceTab.hbs
+++ b/templates/settings/appearance-settings/diceSoNiceTab.hbs
@@ -42,9 +42,15 @@
 
     {{#if animations}}
         <h3>{{localize "DAGGERHEART.SETTINGS.Menu.appearance.diceSoNice.animations"}}</h3>      
-        <div class="label-container full-width">
+        <div class="animation-container">
             <label>{{localize "DAGGERHEART.CONFIG.DaggerheartDiceAnimationEvents.higher.name"}}</label>
-            {{formInput fields.sfx.fields.higher.fields.class value=values.sfx.higher.class blank="" localize=true}}
+            <div class="animation-inner-container">
+                {{formInput fields.sfx.fields.higher.fields.class value=values.sfx.higher.class blank="" localize=true}}
+                <div class="animation-control">
+                    <label>{{localize "DAGGERHEART.SETTINGS.Menu.appearance.diceSoNice.muted"}}</label>
+                    {{formInput fields.sfx.fields.higher.fields.options.fields.muteSound value=values.sfx.higher.options.muteSound localize=true}}
+                </div>
+            </div>
         </div>
     {{/if}}