Moved the roll total to bottom right. A bunch of label fixes

daggerheart.mjs

@@ -218,7 +218,7 @@ Hooks.on('chatMessage', (_, message) => {
                     attribute: attribute
                         ? {
                               value: attribute.data.value,
-                              label: `${game.i18n.localize(abilities[attributeValue].label)} ${attribute.data.value >= 0 ? `+` : `-`}${attribute.data.value}`
+                              label: `${game.i18n.localize(abilities[attributeValue].label)} ${attribute.data.value >= 0 ? `+` : ``}${attribute.data.value}`
                           }
                         : undefined,
                     title

module/applications/settings.mjs

@@ -218,11 +218,12 @@ export const registerDHPSettings = () => {
     game.settings.register(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.DualityRollColor, {
         name: game.i18n.localize('DAGGERHEART.Settings.DualityRollColor.Name'),
         hint: game.i18n.localize('DAGGERHEART.Settings.DualityRollColor.Hint'),
-        scope: 'world',
+        scope: 'client',
         config: true,
         type: Number,
         choices: Object.values(DualityRollColor),
-        default: DualityRollColor.colorful.value
+        default: DualityRollColor.colorful.value,
+        requiresReload: true
     });
 
     game.settings.registerMenu(SYSTEM.id, SYSTEM.SETTINGS.menu.Automation.Name, {

module/applications/sheets/pc.mjs

@@ -489,7 +489,7 @@ export default class PCSheet extends DaggerheartSheet(ActorSheetV2) {
 
     static async rollAttribute(event, button) {
         const { roll, hope, fear, advantage, disadvantage, modifiers } = await this.document.dualityRoll(
-            { title: 'Attribute Bonus', value: button.dataset.value },
+            { title: game.i18n.localize(abilities[button.dataset.attribute].label), value: button.dataset.value },
             event.shiftKey
         );
 

module/data/dualityRoll.mjs

@@ -81,7 +81,7 @@ export default class DhpDualityRoll extends foundry.abstract.TypeDataModel {
         const total = this.modifiers.reduce((acc, x) => acc + x.value, 0);
         return {
             value: total,
-            label: total > 0 ? `+${total}` : total < 0 ? `-${total}` : ''
+            label: total > 0 ? `+${total}` : total < 0 ? `${total}` : ''
         };
     }
 

module/documents/actor.mjs

@@ -116,16 +116,19 @@ export default class DhpActor extends Actor {
             disadvantageDice = null,
             bonusDamageString = '';
 
-        const modifiers = [
+        const modifiers =
+            modifier.value !== null
+                ? [
                       {
                           value: modifier.value ? Number.parseInt(modifier.value) : 0,
                           label:
                               modifier.value >= 0
                                   ? `${modifier.title} +${modifier.value}`
-                        : `${modifier.title} -${modifier.value}`,
+                                  : `${modifier.title} ${modifier.value}`,
                           title: modifier.title
                       }
-        ];
+                  ]
+                : [];
         if (!shiftKey) {
             const dialogClosed = new Promise((resolve, _) => {
                 new RollSelectionDialog(

styles/chat.less

@@ -21,15 +21,6 @@
                 align-items: end;
                 justify-content: space-between;
                 padding: 0 8px;
-
-                .duality-result-value {
-                    border: 1px solid var(--color-dark-5);
-                    padding: 2px;
-                    font-weight: bold;
-                    background: var(--color-dark-1);
-                    margin-bottom: 4px;
-                    font-size: 16px;
-                }
             }
 
             .duality-modifiers {
@@ -211,7 +202,7 @@
             text-shadow: 0 0 1px black;
             font-weight: bold;
             background: var(--color-dark-1);
-            padding: 4px;
+            padding: 4px 4px 0 4px;
             border-radius: 6px 0 0 0;
         }
 

styles/daggerheart.css

@@ -1369,14 +1369,6 @@
   justify-content: space-between;
   padding: 0 8px;
 }
-.chat-message.duality .duality-data .duality-title .duality-result-value {
-  border: 1px solid var(--color-dark-5);
-  padding: 2px;
-  font-weight: bold;
-  background: var(--color-dark-1);
-  margin-bottom: 4px;
-  font-size: 16px;
-}
 .chat-message.duality .duality-data .duality-modifiers {
   display: flex;
   gap: 2px;
@@ -1504,7 +1496,7 @@
   text-shadow: 0 0 1px black;
   font-weight: bold;
   background: var(--color-dark-1);
-  padding: 4px;
+  padding: 4px 4px 0 4px;
   border-radius: 6px 0 0 0;
 }
 .chat-message.duality .duality-actions {

templates/chat/attack-roll.hbs

@@ -1,9 +1,8 @@
-<div class="daggerheart chat roll" data-action="expandRoll">
+{{#if this.colorful}}
-    {{#if this.colorful}}
+    <div class="daggerheart chat roll" data-action="expandRoll">
         <div class="duality-data">
             <div class="duality-title">
                 <div>{{localize "DAGGERHEART.Chat.AttackRoll.Title" attack=this.title}}</div>
-                <div class="duality-result-value">{{this.total}}</div>
             </div>
             <div class="duality-modifiers">
                 {{#each this.modifiers}}
@@ -62,7 +61,7 @@
                 </div>
                 {{#if (not this.damage.value)}}
                     <div class="duality-result">
-                        <div>{{#if (eq dualityResult 1)}}With Hope{{else}}{{#if (eq dualityResult 2)}}With Fear{{else}}Critical Success{{/if}}{{/if}}</div>
+                        <div>{{this.total}} {{#if (eq dualityResult 1)}}With Hope{{else}}{{#if (eq dualityResult 2)}}With Fear{{else}}Critical Success{{/if}}{{/if}}</div>
                     </div>
                 {{/if}}
             </div>
@@ -83,11 +82,12 @@
             <div class="duality-actions">
                 <button class="duality-action" data-value="{{this.total}}" data-damage="{{this.damage.value}}" data-damage-type="{{this.damage.type}}" {{#if this.damage.disabled}}disabled{{/if}}><span>Roll Damage</span></button>  
                 <div class="duality-result">
-                    <div>{{#if (eq dualityResult 1)}}With Hope{{else}}{{#if (eq dualityResult 2)}}With Fear{{else}}Critical Success{{/if}}{{/if}}</div>
+                    <div>{{this.total}} {{#if (eq dualityResult 1)}}With Hope{{else}}{{#if (eq dualityResult 2)}}With Fear{{else}}Critical Success{{/if}}{{/if}}</div>
                 </div>
             </div>
         {{/if}}
-    {{else}}
+    </div>
+{{else}}
     <div class="dice-roll daggerheart chat roll" data-action="expandRoll">
         <div class="dice-flavor">{{localize "DAGGERHEART.Chat.AttackRoll.Title" attack=this.title}}</div>
         <div class="dice-result">
@@ -168,5 +168,4 @@
             </div>
         </div>
     </div>
-    {{/if}}
+{{/if}}
-</div>

templates/chat/duality-roll.hbs

@@ -1,9 +1,8 @@
-<div class="daggerheart chat roll" data-action="expandRoll">
+{{#if this.colorful}}
-    {{#if this.colorful}}
+    <div class="daggerheart chat roll" data-action="expandRoll">
         <div class="duality-data">
             <div class="duality-title">
                 <div>{{this.title}}</div>
-                <div class="duality-result-value">{{this.total}}</div>
             </div>
             <div class="duality-modifiers">
                 {{#each this.modifiers}}
@@ -62,7 +61,7 @@
                 </div>
                 {{#if (not this.damage.value)}}
                     <div class="duality-result">
-                        <div>{{#if (eq dualityResult 1)}}With Hope{{else}}{{#if (eq dualityResult 2)}}With Fear{{else}}Critical Success{{/if}}{{/if}}</div>
+                        <div>{{this.total}} {{#if (eq dualityResult 1)}}With Hope{{else}}{{#if (eq dualityResult 2)}}With Fear{{else}}Critical Success{{/if}}{{/if}}</div>
                     </div>
                 {{/if}}
             </div>
@@ -75,7 +74,9 @@
                 </div>
             </div>
         {{/if}}
-    {{else}}
+    </div>
+{{else}}
+    <div class="dice-roll daggerheart chat roll" data-action="expandRoll">
         <div class="dice-flavor">{{this.title}}</div>
         <div class="dice-result">
             <div class="dice-formula">{{roll}}</div>
@@ -138,5 +139,5 @@
                 </div>
             </div>
         </div>
-    {{/if}}
+    </div>
-</div>
+{{/if}}