Impproved Adversary Sheet Data Display

Fixes #604

templates/characterCreation/setupTabs/domainCards.hbs

@@ -10,9 +10,7 @@
                 {{#each domainCards as |domainCard id|}}
                     <div class="selections-container domain-card" data-card="{{id}}"> 
                         {{#> "systems/daggerheart/templates/components/card-preview.hbs" domainCard }}
-                            {{#each @root.class.system.domains }}
-                                <div>{{localize (concat "DAGGERHEART.GENERAL.Domain." this ".label")}}</div>
-                            {{/each}}
+                            {{#each @root.classDomains }}<div>{{this}}</div>{{/each}}
                         {{/"systems/daggerheart/templates/components/card-preview.hbs"}}
                     </div>
                 {{/each}}

templates/dialogs/dice-roll/costSelection.hbs

@@ -5,25 +5,29 @@
             <li class="scalable-input">
                 <div class="form-group span-2">
                     <div class="form-fields nest-inputs">
-                        <input name="uses.enabled" type="checkbox"{{#if uses.enabled}} checked{{/if}}>
-                        <label for="uses.enabled">Uses{{#if uses.consumeOnSuccess}}<span class="hint">{{localize "DAGGERHEART.ACTIONS.Settings.consumeOnSuccess.short"}}{{/if}}</span></label>
+                        <input id="action-uses" name="uses.enabled" type="checkbox"{{#if uses.enabled}} checked{{/if}}>
+                        <label for="action-uses">Uses{{#if uses.consumeOnSuccess}}<span class="hint">{{localize "DAGGERHEART.ACTIONS.Settings.consumeOnSuccess.short"}}{{/if}}</span></label>
                     </div>
                 </div>
-                <label class="modifier-label">1/{{uses.remaining}}</label>
+                <label class="modifier-label" for="action-uses">1/{{uses.remaining}}</label>
             </li>
         {{/if}}
         {{#each costs as | cost index |}}
         <li class="scalable-input">
             <div class="form-group{{#unless (and scalable maxStep)}} span-2{{/unless}}">
                 <div class="form-fields nest-inputs">
-                    <input name="costs.{{index}}.enabled" type="checkbox"{{#if enabled}} checked{{/if}}>
-                    <label>{{label}}{{#if cost.consumeOnSuccess}}<span class="hint">{{localize "DAGGERHEART.ACTIONS.Settings.consumeOnSuccess.short"}}</span>{{/if}}</label>
+                    <input id="action-costs-{{index}}" name="costs.{{index}}.enabled" type="checkbox"{{#if enabled}} checked{{/if}}>
+                    <label for="action-costs-{{index}}">
+                        {{label}}
+                        {{#if cost.consumeOnSuccess}}<span class="hint">{{localize "DAGGERHEART.ACTIONS.Settings.consumeOnSuccess.short"}}</span>{{/if}}
+                        {{#if cost.extKey}}<span class="hint">{{name}}</span>{{/if}}
+                    </label>
                 </div>
             </div>
             {{#if (and scalable maxStep)}}
                 <input type="range" value="{{scale}}" min="0" max="{{maxStep}}" step="1" name="costs.{{index}}.scale" data-tooltip="{{localize "DAGGERHEART.ACTIONS.Settings.cost.stepTooltip" step=step}}" data-tooltip-direction="UP">
             {{/if}}
-            <label class="modifier-label">{{total}}/{{max}}</label>
+            <label class="modifier-label" for="action-costs-{{index}}">{{total}}/{{max}}</label>
         </li>
         {{/each}}
     </ul>

templates/dialogs/dice-roll/damageSelection.hbs

@@ -24,6 +24,22 @@
             <input type="text" value="{{extraFormula}}" name="roll.{{ @index }}.extraFormula" placeholder="Situational Bonus">
         </div>
     {{/each}}
+    {{#unless (empty @root.modifiers)}}
+        <fieldset class="modifier-container two-columns">
+            <legend>{{localize "DAGGERHEART.GENERAL.Modifier.plural"}}</legend>
+            {{#each @root.modifiers}}
+                <span class="formula-label">{{ localize label }}</span>
+                {{#if (hasProperty this "values")}}
+                    <select name="modifiers.{{@key}}.value">
+                        {{selectOptions values blank="" selected=value}}
+                    </select>
+                {{/if}}
+                {{#if (hasProperty this "enabled")}}
+                    <input type="checkbox" name="modifiers.{{@key}}.enabled" {{ checked enabled }}>
+                {{/if}}
+            {{/each}}
+        </fieldset>
+    {{/unless}}
     <div class="damage-section-controls">
         {{#if directDamage}}
             <select class="roll-mode-select" name="selectedRollMode">

templates/dialogs/rerollDialog/damage/main.hbs

@@ -0,0 +1,35 @@
+<div class="reroll-outer-container">
+    {{#each damage}}
+        <h2>{{localize (concat 'DAGGERHEART.CONFIG.HealingType.' @key '.name')}}</h2>
+        {{#each this}}
+            <div class="dices-container">
+                {{#each this}}
+                    <fieldset class="dice-outer-container">
+                        <legend>
+                            <input class="to-reroll-input" type="checkbox" data-type="{{@../../key}}" data-part="{{@../key}}" data-dice="{{@key}}" {{checked this.toReroll}} />
+                            <i class="fa-solid fa-dice"></i>
+                            <span>{{this.selectedResults}}/{{this.maxSelected}} Selected</span>
+                        </legend>
+
+                        <div class="dice-container">
+                            {{#each this.results}}
+                                <div 
+                                    class="result-container {{../dice}} {{#if this.active}}selected{{/if}}" 
+                                    data-action="selectRoll" data-type="{{@../../../key}}" data-part="{{@../../key}}" data-dice="{{@../key}}" data-result="{{@key}}"
+                                >
+                                    {{this.result}}
+                                    {{#if this.active}}
+                                    <a class="to-reroll-result" data-action="toggleResult" data-type="{{@../../../key}}" data-part="{{@../../key}}" data-dice="{{@../key}}" data-result="{{@key}}">
+                                        <input class="to-reroll-result-input" type="checkbox" {{checked this.toReroll}} />
+                                        <i class="fa-solid fa-dice"></i>
+                                    </a>
+                                    {{/if}}
+                                </div>
+                            {{/each}}
+                        </div>
+                    </fieldset>
+                {{/each}}
+            </div>
+        {{/each}}
+    {{/each}}
+</div>

templates/dialogs/rerollDialog/footer.hbs

@@ -0,0 +1,4 @@
+<footer>
+    <button type="button" data-action="doReroll" {{disabled disabledReroll}}>{{localize "Reroll"}} <i class="fa-solid fa-dice"></i></button>
+    <button type="button" data-action="save" {{disabled saveDisabled}}>{{localize "DAGGERHEART.APPLICATIONS.RerollDialog.acceptCurrentRolls"}}</button>
+</footer>

templates/dialogs/rerollDialog/main.hbs

@@ -0,0 +1,35 @@
+<div class="reroll-outer-container">
+    {{#each damage}}
+        <h2>{{localize (concat 'DAGGERHEART.CONFIG.HealingType.' @key '.name')}}</h2>
+        {{#each this}}
+            <div class="dices-container">
+                {{#each this}}
+                    <fieldset class="dice-outer-container">
+                        <legend>
+                            <input class="to-reroll-input" type="checkbox" data-type="{{@../../key}}" data-part="{{@../key}}" data-dice="{{@key}}" {{checked this.toReroll}} />
+                            <i class="fa-solid fa-dice"></i>
+                            <span>{{this.selectedResults}}/{{this.results.length}} Selected</span>
+                        </legend>
+
+                        <div class="dice-container">
+                            {{#each this.results}}
+                                    <div 
+                                        class="result-container {{../dice}} {{#if this.active}}selected{{/if}}" 
+                                        data-action="selectRoll" data-type="{{@../../../key}}" data-part="{{@../../key}}" data-dice="{{@../key}}" data-result="{{@key}}"
+                                    >
+                                        {{this.result}}
+                                        {{#if this.active}}
+                                        <a class="to-reroll-result" data-action="toggleResult" data-type="{{@../../../key}}" data-part="{{@../../key}}" data-dice="{{@../key}}" data-result="{{@key}}">
+                                            <input class="to-reroll-result-input" type="checkbox" {{checked this.toReroll}} />
+                                            <i class="fa-solid fa-dice"></i>
+                                        </a>
+                                        {{/if}}
+                                    </div>
+                            {{/each}}
+                        </div>
+                    </fieldset>
+                {{/each}}
+            </div>
+        {{/each}}
+    {{/each}}
+</div>

templates/settings/appearance-settings.hbs

@@ -69,7 +69,13 @@
                             {{selectOptions diceSoNiceMaterials selected=diceTab.source.material valueAttr="key" labelAttr="name" localize=true}}
                         </select>
                     </div>
-                </div>
+                    <div class="button-container">
+                        <button data-action="preview">
+                            <i class="fa-solid fa-dice"></i>
+                            <span>{{localize "Preview"}}</span>
+                        </button>
+                    </div>
+               </div>
             </div>
         </fieldset>
     {{/if}}

templates/settings/variant-rules.hbs

@@ -11,7 +11,6 @@
         {{formGroup settingFields.schema.fields.rangeMeasurement.fields.veryClose value=settingFields._source.rangeMeasurement.veryClose localize=true}}
         {{formGroup settingFields.schema.fields.rangeMeasurement.fields.close value=settingFields._source.rangeMeasurement.close localize=true}}
         {{formGroup settingFields.schema.fields.rangeMeasurement.fields.far value=settingFields._source.rangeMeasurement.far localize=true}}
-        {{formGroup settingFields.schema.fields.rangeMeasurement.fields.veryFar value=settingFields._source.rangeMeasurement.veryFar localize=true}}
     </fieldset>
 
     <div class="form-group">

templates/sheets-settings/adversary-settings/attack.hbs

@@ -5,19 +5,19 @@
 >
     <fieldset class="one-column">
         <legend>{{localize "DAGGERHEART.GENERAL.basics"}}</legend>
-        {{formGroup systemFields.attack.fields.img value=document.system.attack.img label="DAGGERHEART.GENERAL.imagePath" name="system.attack.img" localize=true}}
-        {{formGroup systemFields.attack.fields.name value=document.system.attack.name label="DAGGERHEART.ACTIONS.Settings.attackName" name="system.attack.name" localize=true}}
+        {{formGroup systemFields.attack.fields.img value=document._source.system.attack.img label="DAGGERHEART.GENERAL.imagePath" name="system.attack.img" localize=true}}
+        {{formGroup systemFields.attack.fields.name value=document._source.system.attack.name label="DAGGERHEART.ACTIONS.Settings.attackName" name="system.attack.name" localize=true}}
     </fieldset>
     <fieldset class="flex">
         <legend>{{localize "DAGGERHEART.GENERAL.attack"}}</legend>
-            {{formField systemFields.attack.fields.roll.fields.bonus value=document.system.attack.roll.bonus label="DAGGERHEART.ACTIONS.Settings.attackBonus" name="system.attack.roll.bonus" localize=true}}
-            {{formField systemFields.attack.fields.range value=document.system.attack.range label="DAGGERHEART.GENERAL.range" name="system.attack.range" localize=true}}
+            {{formField systemFields.attack.fields.roll.fields.bonus value=document._source.system.attack.roll.bonus label="DAGGERHEART.ACTIONS.Settings.attackBonus" name="system.attack.roll.bonus" localize=true}}
+            {{formField systemFields.attack.fields.range value=document._source.system.attack.range label="DAGGERHEART.GENERAL.range" name="system.attack.range" localize=true}}
             {{#if systemFields.attack.fields.target.fields}}
-                {{ formField systemFields.attack.fields.target.fields.type value=document.system.attack.target.type label="DAGGERHEART.GENERAL.Target.single" name="system.attack.target.type" localize=true }}
-                {{#if (and document.system.attack.target.type (not (eq document.system.attack.target.type 'self')))}}
-                    {{ formField systemFields.attack.fields.target.fields.amount value=document.system.attack.target.amount label="DAGGERHEART.GENERAL.amount" name="system.attack.target.amount" localize=true}}
+                {{ formField systemFields.attack.fields.target.fields.type value=document._source.system.attack.target.type label="DAGGERHEART.GENERAL.Target.single" name="system.attack.target.type" localize=true }}
+                {{#if (and document._source.system.attack.target.type (not (eq document._source.system.attack.target.type 'self')))}}
+                    {{ formField systemFields.attack.fields.target.fields.amount value=document._source.system.attack.target.amount label="DAGGERHEART.GENERAL.amount" name="system.attack.target.amount" localize=true}}
                 {{/if}}
             {{/if}}
     </fieldset>
-    {{> 'systems/daggerheart/templates/actionTypes/damage.hbs' fields=systemFields.attack.fields.damage.fields.parts.element.fields source=document.system.attack.damage path="system.attack." horde=(eq document.system.type 'horde')}}
+    {{> 'systems/daggerheart/templates/actionTypes/damage.hbs' fields=systemFields.attack.fields.damage.fields.parts.element.fields source=document.system.attack.damage path="system.attack." horde=(eq document._source.system.type 'horde')}}
 </section>

templates/sheets-settings/adversary-settings/details.hbs

@@ -6,33 +6,33 @@
     <fieldset class="one-column">
         <legend>{{localize 'DAGGERHEART.GENERAL.basics'}}</legend>
         <div class="nest-inputs">
-            {{formGroup systemFields.tier value=document.system.tier localize=true}}
-            {{formGroup systemFields.type value=document.system.type localize=true}}
-            {{#if (eq document.system.type 'horde')}}
-                {{formGroup systemFields.hordeHp value=document.system.hordeHp label=(localize "DAGGERHEART.ACTORS.Adversary.horderHp")}}
+            {{formGroup systemFields.tier value=document._source.system.tier localize=true}}
+            {{formGroup systemFields.type value=document._source.system.type localize=true}}
+            {{#if (eq document._source.system.type 'horde')}}
+                {{formGroup systemFields.hordeHp value=document._source.system.hordeHp label=(localize "DAGGERHEART.ACTORS.Adversary.horderHp")}}
             {{/if}}
-            {{formGroup systemFields.difficulty value=document.system.difficulty localize=true}}
+            {{formGroup systemFields.difficulty value=document._source.system.difficulty localize=true}}
         </div>
-        {{formField systemFields.description value=document.system.description label=(localize "DAGGERHEART.ACTORS.Adversary.FIELDS.description.label")}}
-        {{formField systemFields.motivesAndTactics value=document.system.motivesAndTactics label=(localize "DAGGERHEART.ACTORS.Adversary.FIELDS.motivesAndTactics.label")}}
+        {{formField systemFields.description value=document._source.system.description label=(localize "DAGGERHEART.ACTORS.Adversary.FIELDS.description.label")}}
+        {{formField systemFields.motivesAndTactics value=document._source.system.motivesAndTactics label=(localize "DAGGERHEART.ACTORS.Adversary.FIELDS.motivesAndTactics.label")}}
     </fieldset>
 
     <div class="fieldsets-section">
         <fieldset class="flex">
             <legend>{{localize "DAGGERHEART.GENERAL.HitPoints.plural"}}</legend>
-            {{formGroup systemFields.resources.fields.hitPoints.fields.value value=document.system.resources.hitPoints.value label=(localize "DAGGERHEART.ACTORS.Adversary.FIELDS.resources.hitPoints.value.label")}}
-            {{formGroup systemFields.resources.fields.hitPoints.fields.max value=document.system.resources.hitPoints.max}}
+            {{formGroup systemFields.resources.fields.hitPoints.fields.value value=document._source.system.resources.hitPoints.value label=(localize "DAGGERHEART.ACTORS.Adversary.FIELDS.resources.hitPoints.value.label")}}
+            {{formGroup systemFields.resources.fields.hitPoints.fields.max value=document._source.system.resources.hitPoints.max}}
         </fieldset>
         <fieldset class="flex">
             <legend>{{localize "DAGGERHEART.GENERAL.stress"}}</legend>
-            {{formGroup systemFields.resources.fields.stress.fields.value value=document.system.resources.stress.value label=(localize "DAGGERHEART.ACTORS.Adversary.FIELDS.resources.stress.value.label")}}
-            {{formGroup systemFields.resources.fields.stress.fields.max value=document.system.resources.stress.max}}
+            {{formGroup systemFields.resources.fields.stress.fields.value value=document._source.system.resources.stress.value label=(localize "DAGGERHEART.ACTORS.Adversary.FIELDS.resources.stress.value.label")}}
+            {{formGroup systemFields.resources.fields.stress.fields.max value=document._source.system.resources.stress.max}}
         </fieldset>
     </div>
 
     <fieldset class="flex">
         <legend>{{localize "DAGGERHEART.GENERAL.DamageThresholds.title"}}</legend>
-        {{formGroup systemFields.damageThresholds.fields.major value=document.system.damageThresholds.major label=(localize "DAGGERHEART.GENERAL.DamageThresholds.majorThreshold")}}
-        {{formGroup systemFields.damageThresholds.fields.severe value=document.system.damageThresholds.severe label=(localize "DAGGERHEART.GENERAL.DamageThresholds.severeThreshold")}}
+        {{formGroup systemFields.damageThresholds.fields.major value=document._source.system.damageThresholds.major label=(localize "DAGGERHEART.GENERAL.DamageThresholds.majorThreshold")}}
+        {{formGroup systemFields.damageThresholds.fields.severe value=document._source.system.damageThresholds.severe label=(localize "DAGGERHEART.GENERAL.DamageThresholds.severeThreshold")}}
     </fieldset>
 </section>

templates/sheets-settings/adversary-settings/experiences.hbs

@@ -10,7 +10,7 @@
     <fieldset>
         <legend>{{localize tabs.experiences.label}}</legend>
         <ul class="experience-list">
-            {{#each document.system.experiences as |experience key|}}
+            {{#each document._source.system.experiences as |experience key|}}
                 <li class="experience-item">
                     <div class="experience-inner-item">
                         <input class="name" type="text" name="system.experiences.{{key}}.name" value="{{experience.name}}" />

templates/sheets-settings/adversary-settings/features.hbs

@@ -10,7 +10,7 @@
         <legend>{{localize tabs.features.label}}</legend>
         <ul class="feature-list">
             {{#each document.system.features as |feature|}}
-                <li class="feature-item" id="{{feature.id}}">
+                <li class="feature-item" id="{{feature.id}}" draggable="true">
                     <img src="{{feature.img}}" alt="">
                     <div class="label">
                         <span>{{feature.name}}</span>
@@ -22,5 +22,8 @@
                 </li>
             {{/each}}
         </ul>
+        <div class="features-dragger">
+            {{localize "DAGGERHEART.GENERAL.dropFeaturesHere"}}
+        </div>
     </fieldset>
 </section>

templates/sheets-settings/companion-settings/attack.hbs

@@ -5,16 +5,16 @@
 >
     <fieldset class="one-column">
         <legend>{{localize "DAGGERHEART.GENERAL.basics"}}</legend>
-        {{formGroup systemFields.attack.fields.img value=document.system.attack.img label="DAGGERHEART.GENERAL.imagePath" name="system.attack.img" localize=true}}
-        {{formGroup systemFields.attack.fields.name value=document.system.attack.name label="DAGGERHEART.ACTIONS.Settings.attackName" name="system.attack.name" localize=true}}
+        {{formGroup systemFields.attack.fields.img value=document._source.system.attack.img label="DAGGERHEART.GENERAL.imagePath" name="system.attack.img" localize=true}}
+        {{formGroup systemFields.attack.fields.name value=document._source.system.attack.name label="DAGGERHEART.ACTIONS.Settings.attackName" name="system.attack.name" localize=true}}
     </fieldset>
     <fieldset class="flex">
         <legend>{{localize "DAGGERHEART.GENERAL.attack"}}</legend>
-            {{formField systemFields.attack.fields.range value=document.system.attack.range label="DAGGERHEART.GENERAL.range" name="system.attack.range" localize=true}}
+            {{formField systemFields.attack.fields.range value=document._source.system.attack.range label="DAGGERHEART.GENERAL.range" name="system.attack.range" localize=true}}
             {{#if systemFields.attack.fields.target.fields}}
-                {{ formField systemFields.attack.fields.target.fields.type value=document.system.attack.target.type label="DAGGERHEART.GENERAL.Target.single" name="system.attack.target.type" localize=true}}
-                {{#if (and document.system.attack.target.type (not (eq document.system.attack.target.type 'self')))}}
-                    {{ formField systemFields.attack.fields.target.fields.amount value=document.system.attack.target.amount label="DAGGERHEART.GENERAL.amount" name="system.attack.target.amount" localize=true}}
+                {{ formField systemFields.attack.fields.target.fields.type value=document._source.system.attack.target.type label="DAGGERHEART.GENERAL.Target.single" name="system.attack.target.type" localize=true}}
+                {{#if (and document._source.system.attack.target.type (not (eq document._source.system.attack.target.type 'self')))}}
+                    {{ formField systemFields.attack.fields.target.fields.amount value=document._source.system.attack.target.amount label="DAGGERHEART.GENERAL.amount" name="system.attack.target.amount" localize=true}}
                 {{/if}}
             {{/if}}
     </fieldset>

templates/sheets-settings/companion-settings/details.hbs

@@ -6,18 +6,18 @@
     <fieldset class="one-column">
         <legend>{{localize 'DAGGERHEART.GENERAL.basics'}}</legend>
         <div class="nest-inputs">
-            {{formGroup systemFields.evasion value=document.system.evasion localize=true}}
-            {{formGroup systemFields.resources.fields.stress.fields.value value=document.system.resources.stress.value label='DAGGERHEART.ACTORS.Companion.FIELDS.resources.stress.currentStress.label' localize=true}}
-            {{formGroup systemFields.resources.fields.stress.fields.max value=document.system.resources.stress.max label='DAGGERHEART.ACTORS.Companion.FIELDS.resources.stress.maxStress.label' localize=true}}
+            {{formGroup systemFields.evasion value=document._source.system.evasion localize=true}}
+            {{formGroup systemFields.resources.fields.stress.fields.value value=document._source.system.resources.stress.value label='DAGGERHEART.ACTORS.Companion.FIELDS.resources.stress.currentStress.label' localize=true}}
+            {{formGroup systemFields.resources.fields.stress.fields.max value=document._source.system.resources.stress.max label='DAGGERHEART.ACTORS.Companion.FIELDS.resources.stress.maxStress.label' localize=true}}
         </div>
         <div class="form-group">
             <div class="form-fields">
                 <label>{{localize "DAGGERHEART.ACTORS.Companion.FIELDS.partner.label"}}</label>
                 <select class="partner-value" name="system.partner">
-                    {{selectOptions playerCharacters selected=document.system.partner.uuid labelAttr="name" valueAttr="key" blank=""}}
+                    {{selectOptions playerCharacters selected=document._source.system.partner.uuid labelAttr="name" valueAttr="key" blank=""}}
                 </select>
             </div>
         </div>
     </fieldset>
-    <button type="button" data-action="levelUp" {{#if (not document.system.levelData.canLevelUp)}}disabled{{/if}}>{{localize "DAGGERHEART.GENERAL.levelUp"}}</button>
+    <button type="button" data-action="levelUp" {{#if (not document._source.system.levelData.canLevelUp)}}disabled{{/if}}>{{localize "DAGGERHEART.GENERAL.levelUp"}}</button>
 </section>

templates/sheets-settings/environment-settings/details.hbs

@@ -6,11 +6,11 @@
     <fieldset class="one-column">
         <legend>{{localize 'DAGGERHEART.GENERAL.basics'}}</legend>
         <div class="nest-inputs">
-            {{formGroup systemFields.tier value=document.system.tier localize=true}}
-            {{formGroup systemFields.type value=document.system.type localize=true}}
-            {{formGroup systemFields.difficulty value=document.system.difficulty localize=true}}
+            {{formGroup systemFields.tier value=document._source.system.tier localize=true}}
+            {{formGroup systemFields.type value=document._source.system.type localize=true}}
+            {{formGroup systemFields.difficulty value=document._source.system.difficulty localize=true}}
         </div>
-        {{formField systemFields.description value=document.system.description label=(localize "DAGGERHEART.ACTORS.Environment.FIELDS.description.label")}}
-        {{formField systemFields.impulses value=document.system.impulses label=(localize "DAGGERHEART.ACTORS.Environment.FIELDS.impulses.label")}}
+        {{formField systemFields.description value=document._source.system.description label=(localize "DAGGERHEART.ACTORS.Environment.FIELDS.description.label")}}
+        {{formField systemFields.impulses value=document._source.system.impulses label=(localize "DAGGERHEART.ACTORS.Environment.FIELDS.impulses.label")}}
     </fieldset>
 </section>

templates/sheets/actors/character/header.hbs

@@ -87,9 +87,9 @@
         </div>
         {{#if document.system.class.value}}
             <div class="domains-section">
-                {{#each document.system.class.value.system.domains as |domain|}}
+                {{#each document.system.domainData as |data|}}
                     <div class="domain">
-                        <img src="{{concat 'systems/daggerheart/assets/icons/domains/' domain '.svg'}}" alt="" data-tooltip="{{localize (concat 'DAGGERHEART.GENERAL.Domain.' domain '.label')}}" />
+                        <img src="{{data.src}}" alt="" data-tooltip="{{data.label}}" />
                     </div>
                 {{/each}}
             </div>

templates/sheets/global/partials/inventory-fieldset-items-V2.hbs

@@ -26,7 +26,7 @@ Parameters:
   <legend>
     {{localize title}}
     {{#if canCreate}}
-    <a data-action="{{ifThen (or (eq type 'effect') (eq type 'feature')) 'createDoc' 'addNewItem' }}" data-document-class="{{ifThen (eq type 'effect') 'ActiveEffect' 'Item' }}"
+    <a data-action="{{ifThen (or (eq type 'effect') (eq type 'feature') (eq type 'action')) 'createDoc' 'addNewItem' }}" data-document-class="{{ifThen (eq type 'effect') 'ActiveEffect' 'Item' }}"
       data-type="{{ifThen (eq type 'effect') 'base' type}}"
       {{#if inVault}}data-in-vault="{{inVault}}"{{/if}}
       {{#if disabled}} data-disabled="{{disabled}}"{{/if}}

templates/ui/chat/chat-message.hbs

@@ -3,17 +3,19 @@
     <header class="message-header flexrow">
         <div class="message-header-main">
             <img class="actor-img" src="{{actor.img}}" />
-            {{#if (eq message.type 'base')}}
-                <div class="message-sub-header-container">
-                    <h4>{{actor.name}}</h4>
-                    <div>{{author.name}}</div>
-                </div>
-            {{else}}
-                <div class="message-sub-header-container">
-                    <h4>{{ifThen message.title message.title alias}}</h4>
-                    <div>{{actor.name}} {{#if author.isGM}}(GM){{/if}}</div>
-                </div>
-            {{/if}}
+            <div class="message-sub-header-container">
+                {{#unless actor.name}}
+                    <h4>{{author.name}}</h4>
+                {{else}}
+                    {{#if (eq message.type 'base')}}
+                        <h4>{{actor.name}}</h4>
+                        <div>{{author.name}}</div>
+                    {{else}}
+                        <h4>{{ifThen message.title message.title alias}}</h4>
+                        <div>{{actor.name}} {{#if author.isGM}}(GM){{/if}}</div>
+                    {{/if}}
+                {{/unless}}
+            </div>
         </div>
         <div class="message-header-metadata">
             <span class="message-metadata">
@@ -33,13 +35,12 @@
             {{#if isWhisper}}
             <span class="whisper-to">{{localize 'CHAT.To'}}: {{whisperTo}}</span>
             {{/if}}
-
-            {{#if message.flavor}}
-            <span class="flavor-text">{{{message.flavor}}}</span>
-            {{/if}}
         </div>
     </header>
     <div class="message-content">
         {{{message.content}}}
+        {{#if message.flavor}}
+            <span class="flavor-text">{{{message.flavor}}}</span>
+        {{/if}}
     </div>
 </li>

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

@@ -1,17 +1,17 @@
 <div class="roll-buttons">
     {{#if hasDamage}}
         {{#unless (empty damage)}}
-            <button class="duality-action damage-button">{{localize "DAGGERHEART.UI.Chat.damageRoll.dealDamage"}}</button>
+            {{#if canButtonApply}}<button class="duality-action damage-button">{{localize "DAGGERHEART.UI.Chat.damageRoll.dealDamage"}}</button>{{/if}}
         {{else}}
             <button class="duality-action duality-action-damage">{{localize "DAGGERHEART.UI.Chat.attackRoll.rollDamage"}}</button>
         {{/unless}}
     {{/if}}
     {{#if hasHealing}}
         {{#unless (empty damage)}}
-            <button class="duality-action damage-button">{{localize "DAGGERHEART.UI.Chat.healingRoll.applyHealing"}}</button>
+            {{#if canButtonApply}}<button class="duality-action damage-button">{{localize "DAGGERHEART.UI.Chat.healingRoll.applyHealing"}}</button>{{/if}}
         {{else}}
             <button class="duality-action duality-action-damage">{{localize "DAGGERHEART.UI.Chat.attackRoll.rollHealing"}}</button>
         {{/unless}}
     {{/if}}
-    {{#if hasEffect}}<button class="duality-action-effect">{{localize "DAGGERHEART.UI.Chat.attackRoll.applyEffect"}}</button>{{/if}}
+    {{#if (and hasEffect canButtonApply)}}<button class="duality-action-effect">{{localize "DAGGERHEART.UI.Chat.attackRoll.applyEffect"}}</button>{{/if}}
 </div>

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

@@ -29,7 +29,13 @@
                                     {{#each results}}
                                         {{#unless discarded}}
                                             <div class="roll-die{{#unless @../first}} has-plus{{/unless}}">
-                                                <div class="dice {{../dice}}">{{result}}</div>
+                                                <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 "Rerolled"}}"></i>{{/if}}
+                                                    {{result}}
+                                                </div>
                                             </div>
                                         {{/unless}}
                                     {{/each}}

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

@@ -14,14 +14,15 @@
         </div>
         {{#if roll.difficulty}}
             <span class="roll-difficulty{{#unless roll.success}} is-miss{{/unless}}">
-                {{#if canViewSecret}}
+                {{!-- {{#if canViewSecret}} --}}
                     difficulty {{roll.difficulty}}
-                {{else}}
+                {{!-- {{else}}
                     {{localize (ifThen roll.success "DAGGERHEART.GENERAL.success" "DAGGERHEART.GENERAL.failure")}}
-                {{/if}}
+                {{/if}} --}}
             </span>
         {{/if}}
     </div>
+    {{#unless isPrivate}}
     <div class="dice-roll" data-action="expandRoll">
         <div class="roll-part-header"><div><span>{{localize "DAGGERHEART.GENERAL.formula"}}</span></div></div>
         <div class="roll-part-content dice-result">
@@ -56,7 +57,7 @@
                             {{/if}}
                             {{#if roll.rally.dice}}
                                 <div class="roll-die has-plus">
-                                    <label>{{localize "DAGGERHEART.GENERAL.fear"}}</label>
+                                    <label>{{localize "DAGGERHEART.CLASS.Feature.short"}}</label>
                                     <div class="dice {{roll.rally.dice}}">{{roll.rally.value}}</div>
                                 </div>
                             {{/if}}
@@ -87,4 +88,5 @@
             </div>
         </div>
     </div>
+    {{/unless}}
 </div>

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

@@ -14,12 +14,12 @@
     <div class="roll-part-content dice-result">
         <div class="dice-tooltip">
             <div class="wrapper">
-                {{#if targets.length}}
+                {{#if (and parent.isAuthor targets.length)}}
                     <div class="target-selector">
                         <div class="roll-part-header"><div></div></div>
                         <div class="target-choice">
-                            <div class="button-target-selection{{#if targetSelection}} target-selected{{/if}}" data-target-hit="true">{{localize "DAGGERHEART.UI.Chat.damageRoll.hitTarget"}}</div>
-                            <div class="button-target-selection{{#unless targetSelection}} target-selected{{/unless}}">{{localize "DAGGERHEART.UI.Chat.damageRoll.currentTarget"}}</div>
+                            <div class="button-target-selection{{#if targetMode}} target-selected{{/if}}" data-target-hit="true">{{localize "DAGGERHEART.UI.Chat.damageRoll.hitTarget"}}</div>
+                            <div class="button-target-selection{{#unless targetMode}} target-selected{{/unless}}">{{localize "DAGGERHEART.UI.Chat.damageRoll.currentTarget"}}</div>
                         </div>
                         <div class="roll-part-header"><div></div></div>
                     </div>
@@ -29,8 +29,8 @@
                     <div class="roll-target" data-token="{{id}}">
                         <img class="target-img" src="{{img}}">
                         <div class="target-data">
-                            <div class="target-name" data-perm-id="{{actorId}}">{{name}}</div>
-                            {{#if (and ../targetSelection ../hasRoll)}}
+                            <div class="target-name" data-perm-id="{{actorId}}"><span>{{name}}</span></div>
+                            {{#if (and ../targetMode ../hasRoll)}}
                                 <div class="target-hit-status {{#if hit}}is-hit{{else}}is-miss{{/if}}">
                                     {{#if hit}}
                                         {{localize "DAGGERHEART.GENERAL.hit.single"}}
@@ -40,7 +40,7 @@
                                 </div>
                             {{/if}}
                         </div>
-                        {{#if (and ../hasSave (or hit (not @root.targetSelection)))}}
+                        {{#if (and ../hasSave (or hit (not @root.hasRoll)))}}
                             <div class="target-save{{#if saved.result includeZero=true}} is-rolled{{/if}}" data-perm-id="{{actorId}}">
                                 <i class="fa-solid {{#if saved.result includeZero=true}}{{#if saved.success}}fa-check{{else}}fa-xmark{{/if}}{{else}}fa-shield{{/if}} fa-lg"></i>
                             </div>

templates/ui/chat/roll.hbs

@@ -5,4 +5,4 @@
     {{#if hasTarget}}{{> 'systems/daggerheart/templates/ui/chat/parts/target-part.hbs'}}{{/if}}
     <div class="roll-part-header"><div></div></div>
 </div>
-{{> 'systems/daggerheart/templates/ui/chat/parts/button-part.hbs'}}
+{{#if (or parent.isAuthor canButtonApply)}}{{> 'systems/daggerheart/templates/ui/chat/parts/button-part.hbs'}}{{/if}}

templates/ui/combatTracker/combatTrackerHeader.hbs

@@ -51,19 +51,6 @@
     {{/if}}
 
     <div class="encounter-controls {{#if hasCombat}}combat{{/if}}">
-        {{#if hasCombat}}
-            <div class="encounter-fear-controls">
-                <div class="encounter-fear-dice-container">
-                    <div class="encounter-control-fear-container">
-                        <img class="dice " src="../icons/svg/d12-grey.svg"/>
-                        <i class="fas fa-skull encounter-control-fear"></i>
-                    </div>
-                    <div>{{fear}}</div>
-                </div>
-                <a class="encounter-countdowns" data-tooltip="{{localize "DAGGERHEART.APPLICATIONS.Countdown.title" type=(localize "DAGGERHEART.APPLICATIONS.Countdown.types.encounter")}}" data-action="openCountdowns"><i class="fa-solid fa-stopwatch"></i></a>
-            </div>
-        {{/if}}
-
         {{!-- Combat Status --}}
         <strong class="encounter-title">
             {{#if combats.length}}
@@ -78,14 +65,16 @@
         </strong>
 
         {{!-- Combat Controls --}}
-        {{#if hasCombat}}
-            <div class="control-buttons right flexrow">
-                <div class="spacer"></div>
-                <button type="button" class="encounter-context-menu inline-control combat-control icon fa-solid fa-ellipsis-vertical"
-                        {{#unless (and user.isGM hasCombat)}}disabled{{/unless}}></button>
-            </div>
-        {{/if}}
-
+        <div class="inner-controls">
+            {{#if hasCombat}}
+                <button data-action="openCountdowns">{{localize "DAGGERHEART.APPLICATIONS.CombatTracker.openCountdowns"}}</button>
+                <div class="control-buttons right flexrow">
+                    <div class="spacer"></div>
+                    <button type="button" class="encounter-context-menu inline-control combat-control icon fa-solid fa-ellipsis-vertical"
+                            {{#unless (and user.isGM hasCombat)}}disabled{{/unless}}></button>
+                </div>
+            {{/if}}
+        </div>
     </div>
 
 </header>