[v14] Add toggle for critical damage (#1762)

* Fix rolling critical damage after rerolling into a crit

* Add toggle for critical damage

---------

Co-authored-by: WBHarry <williambjrklund@gmail.com>

lang/en.json

@@ -55,6 +55,7 @@
                 },
                 "damage": {
                     "name": "Damage",
+                    "critical": "Damage (Critical)",
                     "tooltip": "Direct damage without a roll."
                 },
                 "effect": {

module/applications/dialogs/damageDialog.mjs

@@ -22,6 +22,7 @@ export default class DamageDialog extends HandlebarsApplicationMixin(Application
         },
         actions: {
             toggleSelectedEffect: this.toggleSelectedEffect,
+            toggleCritical: this.toggleCritical,
             submitRoll: this.submitRoll
         },
         form: {
@@ -53,6 +54,7 @@ export default class DamageDialog extends HandlebarsApplicationMixin(Application
         context.hasHealing = this.config.hasHealing;
         context.directDamage = this.config.directDamage;
         context.selectedMessageMode = this.config.selectedMessageMode;
+        context.isCritical = this.config.isCritical;
         context.rollModes = Object.entries(CONFIG.ChatMessage.modes).map(([action, { label, icon }]) => ({
             action,
             label,
@@ -74,6 +76,11 @@ export default class DamageDialog extends HandlebarsApplicationMixin(Application
         this.render();
     }
 
+    static toggleCritical() {
+        this.config.isCritical = !this.config.isCritical;
+        this.render();
+    }
+
     static toggleSelectedEffect(_event, button) {
         this.selectedEffects[button.dataset.key].selected = !this.selectedEffects[button.dataset.key].selected;
         this.render();

module/dice/damageRoll.mjs

@@ -7,6 +7,10 @@ export default class DamageRoll extends DHRoll {
         super(formula, data, options);
     }
 
+    get isCritical() {
+        return !!this.options.isCritical;
+    }
+
     static DefaultDialog = DamageDialog;
 
     static async buildEvaluate(roll, config = {}, message = {}) {
@@ -138,6 +142,7 @@ export default class DamageRoll extends DHRoll {
     }
 
     constructFormula(config) {
+        this.options.isCritical = config.isCritical;
         for (const [index, part] of this.options.roll.entries()) {
             part.roll = new Roll(Roll.replaceFormulaData(part.formula, config.data));
             part.roll.terms = Roll.parse(part.roll.formula, config.data);

styles/less/dialog/damage-selection/sheet.less

@@ -17,6 +17,30 @@
             }
         }
 
+        .bonuses {
+            gap: 4px;
+            .critical-chip {
+                flex: 0;
+                
+                display: flex;
+                align-items: center;
+                border-radius: 5px;
+                width: fit-content;
+                gap: 5px;
+                cursor: pointer;
+                padding: 5px;
+                transition: all 0.3s ease;
+
+                background: @green-10;
+                color: @green;
+
+                &.selected {
+                    color: @beige;
+                    background: @gradient-green;
+                }
+            }
+        }
+
         .damage-section-controls {
             display: flex;
             align-items: center;

templates/dialogs/dice-roll/damageSelection.hbs

@@ -34,8 +34,12 @@
                 {{/unless}}
             </span>
         </div>
-        <div class="form-group">
+        <div class="bonuses form-group flexrow">
             <input type="text" value="{{extraFormula}}" name="roll.{{ @index }}.extraFormula" placeholder="Situational Bonus">
+            <button class="critical-chip" data-action="toggleCritical">
+                <span><i class="{{#if @root.isCritical}}fa-solid{{else}}fa-regular{{/if}} fa-circle"></i></span>
+                <span class="label">{{localize "DAGGERHEART.GENERAL.criticalShort"}}</span>
+            </button>
         </div>
     {{/each}}
     {{#unless (empty @root.modifiers)}}

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

@@ -1,5 +1,13 @@
 <div class="roll-part damage-section dice-roll" data-action="expandRoll"{{#if (empty damage)}} hidden{{/if}}>
-    <div class="roll-part-header"><div><span>{{localize (ifThen hasHealing "DAGGERHEART.ACTIONS.TYPES.healing.name" "DAGGERHEART.ACTIONS.TYPES.damage.name")}}</span></div></div>
+    <div class="roll-part-header">
+        <div>
+            {{#if hasHealing}}
+                <span>{{localize "DAGGERHEART.ACTIONS.TYPES.healing.name"}}</span>
+            {{else}}
+                <span>{{localize (ifThen roll.isCritical "DAGGERHEART.ACTIONS.TYPES.damage.critical" "DAGGERHEART.ACTIONS.TYPES.damage.name")}}</span>
+            {{/if}}
+        </div>
+    </div>
     <div class="roll-part-extra on-reduced">
         <div class="wrapper">
             {{#each damage as | roll index | }}