Merge branch 'main' into feature/group-roll-rework

lang/en.json

@@ -2869,6 +2869,7 @@
                         "system": "Dice Preset",
                         "font": "Font",
                         "critical": "Duality Critical Animation",
+                        "muted": "Muted",
                         "diceAppearance": "Dice Appearance",
                         "animations": "Animations",
                         "defaultAnimations": "Set Animations As Player Defaults",

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 }
         };
     }
 

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()
             })
         });
 

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
             });

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;
+            }
+        }
     }
 }

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">
                 <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'>

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>
+            <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}}
 

templates/ui/chat/parts/damage-part.hbs

@@ -33,6 +33,7 @@
                                 <div class="roll-formula">{{total}}</div></span></label>
                             {{/if}}
                             <div class="roll-dice">
+                                {{#if dice.length}}
                                     {{#each dice}}
                                         {{#each results}}
                                             {{#unless discarded}}
@@ -53,11 +54,11 @@
                                             <div class="font-20">{{modifierTotal}}</div>
                                         </div>
                                     {{/if}}
-                                {{#unless dice.length}}
+                                {{else}}
                                     <div class="roll-die">
                                         <div class="font-20">{{total}}</div>
                                     </div>
-                                {{/unless}}
+                                {{/if}}
                             </div>
                         {{/each}}
                     </fieldset>