Merge branch 'main' into feature/style-tooltips

templates/hud/tokenHUD.hbs

@@ -46,8 +46,12 @@
     </button>
     <div class="palette status-effects" data-palette="effects">
         {{#each systemStatusEffects as |status|}}
-            <div class="effect-control-container" {{#if status.disabled}}data-tooltip="{{localize "DAGGERHEART.UI.Tooltip.immune"}}"{{else if status.title}}data-tooltip-text="{{status.title}}"{{/if}}>
-                <img class="effect-control {{status.cssClass}} {{#if (or status.disabled status.locked)}}disabled{{/if}}" src="{{status.src}}" data-action="effect" data-status-id="{{status.id}}">
+            <div 
+                class="effect-control effect-control-container {{status.cssClass}} {{#if (or status.disabled status.locked)}}disabled{{/if}}" 
+                {{#if status.disabled}}data-tooltip="{{localize "DAGGERHEART.UI.Tooltip.immune"}}"{{else if status.title}}data-tooltip-text="{{status.title}}"{{/if}}
+                data-action="effect" data-status-id="{{status.id}}"
+            >
+                <img src="{{status.src}}" />
                 {{#if status.disabled}}
                     <span class="effect-control-disabled-marker">/</span>
                 {{/if}}
@@ -57,8 +61,12 @@
         {{#if genericStatusEffects}}
             <label class="palette-category-title">{{localize "DAGGERHEART.APPLICATIONS.HUD.tokenHUD.genericEffects"}}</label>
             {{#each genericStatusEffects as |status|}}
-                <div class="effect-control-container" {{#if status.title}}data-tooltip-text="{{status.title}}"{{/if}}>
-                    <img class="effect-control {{status.cssClass}} {{#if (or status.disabled status.locked)}}disabled{{/if}}" src="{{status.src}}" data-action="effect" data-status-id="{{status.id}}" >
+                <div 
+                    class="effect-control effect-control-container {{status.cssClass}} {{#if (or status.disabled status.locked)}}disabled{{/if}}" 
+                    {{#if status.title}}data-tooltip-text="{{status.title}}"{{/if}}
+                    data-action="effect" data-status-id="{{status.id}}"
+                >
+                    <img src="{{status.src}}" />
                     {{#if status.locked}}<i class="effect-locked fa-solid fa-lock"></i>{{/if}}
                 </div>
             {{/each}}

templates/settings/homebrew-settings/change-currency-icon.hbs

@@ -0,0 +1,10 @@
+<div>
+    <div class="displayed-icon">
+        <i class="{{currentIcon}}" inert></i>
+    </div>
+    <span>{{localize "DAGGERHEART.SETTINGS.Homebrew.currency.iconName"}} (<em>{{localize "DAGGERHEART.SETTINGS.Homebrew.currency.iconNameHint"}}</em>)</span>
+    <div class="input-row">
+        <input type="text" name="icon" value="{{currentIcon}}" />
+        <button type="button" data-action="reset" class="plain icon fa-solid fa-redo"></button>
+    </div>
+</div>

templates/settings/homebrew-settings/settings.hbs

@@ -33,18 +33,22 @@
                 {{formGroup settingFields.schema.fields.currency.fields.title value=settingFields._source.currency.title localize=true}}
             </div>
             <div class="toggleable-row">
+                <button class="icon {{settingFields._source.currency.coins.icon}}" data-action="editCurrencyIcon" data-currency="coins" data-tooltip="DAGGERHEART.SETTINGS.Homebrew.currency.changeIcon"></button>
                 {{formGroup settingFields.schema.fields.currency.fields.coins.fields.label value=settingFields._source.currency.coins.label localize=true}}
                 <input type="checkbox" name="currency.coins.enabled" {{checked settingFields._source.currency.coins.enabled}} />
             </div>
             <div class="toggleable-row">
+                <button class="icon {{settingFields._source.currency.handfuls.icon}}" data-action="editCurrencyIcon" data-currency="handfuls" data-tooltip="DAGGERHEART.SETTINGS.Homebrew.currency.changeIcon"></button>
                 {{formGroup settingFields.schema.fields.currency.fields.handfuls.fields.label value=settingFields._source.currency.handfuls.label localize=true}}
                 <input type="checkbox" name="currency.handfuls.enabled" {{checked settingFields._source.currency.handfuls.enabled}} />
             </div>
             <div class="toggleable-row">
+                <button class="icon {{settingFields._source.currency.bags.icon}}" data-action="editCurrencyIcon" data-currency="bags" data-tooltip="DAGGERHEART.SETTINGS.Homebrew.currency.changeIcon"></button>
                 {{formGroup settingFields.schema.fields.currency.fields.bags.fields.label value=settingFields._source.currency.bags.label localize=true}}
                 <input type="checkbox" name="currency.bags.enabled" {{checked settingFields._source.currency.bags.enabled}} />
             </div>
             <div class="toggleable-row">
+                <button class="icon {{settingFields._source.currency.chests.icon}}" data-action="editCurrencyIcon" data-currency="chests" data-tooltip="DAGGERHEART.SETTINGS.Homebrew.currency.changeIcon"></button>
                 {{formGroup settingFields.schema.fields.currency.fields.chests.fields.label value=settingFields._source.currency.chests.label localize=true}}
                 <input type="checkbox" name="currency.chests.enabled" {{checked settingFields._source.currency.chests.enabled}} />
             </div>

templates/settings/variant-rules.hbs

@@ -22,6 +22,13 @@
         </div>
     </div>
 
+    <div class="form-group">
+        <label>{{localize "DAGGERHEART.SETTINGS.VariantRules.FIELDS.massiveDamage.title"}}</label>
+        <div class="form-fields">
+            {{formGroup settingFields.schema.fields.massiveDamage.fields.enabled value=settingFields._source.massiveDamage.enabled localize=true}}
+        </div>
+    </div>
+
     <footer class="form-footer">
         <button data-action="reset">
             <i class="fa-solid fa-arrow-rotate-left"></i>

templates/sheets/actors/character/inventory.hbs

@@ -17,7 +17,9 @@
             {{#each this.inventory.currencies as | currency |}}
                 {{#if currency.enabled}}
                     <div class="input">
-                        <span>{{localize currency.label}}</span>
+                        <span>
+                            <i class="{{currency.icon}}" inert></i> {{localize currency.label}}
+                        </span>
                         <input type="text" name="{{currency.field.fieldPath}}" data-allow-delta value="{{currency.value}}" data-dtype="Number" min="0" step="1" />
                     </div>
                 {{/if}}

templates/sheets/actors/party/inventory.hbs

@@ -20,7 +20,9 @@
             {{#each this.inventory.currencies as | currency |}}
                 {{#if currency.enabled}}
                     <div class="input">
-                        <span>{{localize currency.label}}</span>
+                        <span>
+                            <i class="{{currency.icon}}" inert></i> {{localize currency.label}}
+                        </span>
                         <input type="text" name="{{currency.field.fieldPath}}" data-allow-delta value="{{currency.value}}" data-dtype="Number" min="0" step="1" />
                     </div>
                 {{/if}}