[Feature] 340-341 RollMode & ChatSpeaker (#347)

* Added RollMode to standalone DamageDialog and to RollDialog. ChatMessage now add ChatSpeaker

* Just a little fix for Damage Action

---------

Co-authored-by: Dapoolp <elcatnet@gmail.com>

lang/en.json

@@ -1231,6 +1231,7 @@
             "quantity": "Quantity",
             "range": "Range",
             "recovery": "Recovery",
+            "roll": "Roll",
             "scalable": "Scalable",
             "stress": "Stress",
             "take": "Take",

module/applications/dialogs/d20RollDialog.mjs

@@ -64,6 +64,13 @@ export default class D20RollDialog extends HandlebarsApplicationMixin(Applicatio
         context.rollConfig = this.config;
         context.hasRoll = !!this.config.roll;
         context.canRoll = true;
+        context.selectedRollMode = this.config.selectedRollMode;
+        context.rollModes = Object.entries(CONFIG.Dice.rollModes).map(([action, { label, icon }]) => ({
+            action,
+            label,
+            icon
+        }));
+
         if (this.config.costs?.length) {
             const updatedCosts = this.action.calcCosts(this.config.costs);
             context.costs = updatedCosts.map(x => ({
@@ -99,6 +106,8 @@ export default class D20RollDialog extends HandlebarsApplicationMixin(Applicatio
 
     static updateRollConfiguration(event, _, formData) {
         const { ...rest } = foundry.utils.expandObject(formData.object);
+        this.config.selectedRollMode = rest.selectedRollMode;
+
         if (this.config.costs) {
             this.config.costs = foundry.utils.mergeObject(this.config.costs, rest.costs);
         }
@@ -122,11 +131,6 @@ export default class D20RollDialog extends HandlebarsApplicationMixin(Applicatio
     }
 
     static selectExperience(_, button) {
-        /* if (this.config.experiences.find(x => x === button.dataset.key)) {
-            this.config.experiences = this.config.experiences.filter(x => x !== button.dataset.key);
-        } else {
-            this.config.experiences = [...this.config.experiences, button.dataset.key];
-        } */
         this.config.experiences =
             this.config.experiences.indexOf(button.dataset.key) > -1
                 ? this.config.experiences.filter(x => x !== button.dataset.key)

module/applications/dialogs/damageDialog.mjs

@@ -48,12 +48,22 @@ export default class DamageDialog extends HandlebarsApplicationMixin(Application
             : game.i18n.localize('DAGGERHEART.EFFECTS.ApplyLocations.damageRoll.name');
         context.extraFormula = this.config.extraFormula;
         context.formula = this.roll.constructFormula(this.config);
+        context.directDamage = this.config.directDamage;
+        context.selectedRollMode = this.config.selectedRollMode;
+        context.rollModes = Object.entries(CONFIG.Dice.rollModes).map(([action, { label, icon }]) => ({
+            action,
+            label,
+            icon
+        }));
+
         return context;
     }
 
-    static updateRollConfiguration(event, _, formData) {
+    static updateRollConfiguration(_event, _, formData) {
         const { ...rest } = foundry.utils.expandObject(formData.object);
         this.config.extraFormula = rest.extraFormula;
+        this.config.selectedRollMode = rest.selectedRollMode;
+
         this.render();
     }
 

module/applications/ui/chatLog.mjs

@@ -88,7 +88,7 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo
     onRollDamage = async (event, message) => {
         event.stopPropagation();
         const actor = await this.getActor(message.system.source.actor);
-        if (!actor || !game.user.isGM) return true;
+        if (game.user.character?.id !== actor.id && !game.user.isGM) return true;
         if (message.system.source.item && message.system.source.action) {
             const action = this.getAction(actor, message.system.source.item, message.system.source.action);
             if (!action || !action?.rollDamage) return;

module/data/action/baseAction.mjs

@@ -268,7 +268,8 @@ export default class DHBaseAction extends foundry.abstract.DataModel {
             hasDamage: !!this.damage?.parts?.length,
             hasHealing: !!this.healing,
             hasEffect: !!this.effects?.length,
-            hasSave: this.hasSave
+            hasSave: this.hasSave,
+            selectedRollMode: game.settings.get('core', 'rollMode')
         };
     }
 

module/data/action/damageAction.mjs

@@ -10,6 +10,7 @@ export default class DHDamageAction extends DHBaseAction {
     }
 
     async rollDamage(event, data) {
+        const systemData = data.system ?? data;
         let formula = this.damage.parts.map(p => this.getFormulaValue(p, data).getFormula(this.actor)).join(' + '),
             damageTypes = [...new Set(this.damage.parts.reduce((a, c) => a.concat([...c.type]), []))];
 
@@ -19,15 +20,15 @@ export default class DHDamageAction extends DHBaseAction {
         let roll = { formula: formula, total: formula },
             bonusDamage = [];
 
-        if (isNaN(formula)) formula = Roll.replaceFormulaData(formula, this.getRollData(data.system ?? data));
+        if (isNaN(formula)) formula = Roll.replaceFormulaData(formula, this.getRollData(systemData));
-
+        
         const config = {
             title: game.i18n.format('DAGGERHEART.UI.Chat.damageRoll.title', { damage: this.name }),
             roll: { formula },
-            targets: data.system?.targets.filter(t => t.hit) ?? data.targets,
+            targets: systemData.targets.filter(t => t.hit) ?? data.targets,
             hasSave: this.hasSave,
-            isCritical: data.system?.roll?.isCritical ?? false,
+            isCritical: systemData.roll?.isCritical ?? false,
-            source: data.system?.source,
+            source: systemData.source,
             data: this.getRollData(),
             damageTypes,
             event
@@ -36,6 +37,8 @@ export default class DHDamageAction extends DHBaseAction {
         if (data.system) {
             config.source.message = data._id;
             config.directDamage = false;
+        } else {
+            config.directDamage = true;
         }
 
         roll = CONFIG.Dice.daggerheart.DamageRoll.build(config);

module/dice/dhRoll.mjs

@@ -87,7 +87,7 @@ export default class DHRoll extends Roll {
                 system: config,
                 rolls: [roll]
             };
-        return await cls.create(msg);
+        return await cls.create(msg, { rollMode: config.selectedRollMode });
     }
 
     static applyKeybindings(config) {

module/documents/chatMessage.mjs

@@ -37,4 +37,15 @@ export default class DhpChatMessage extends foundry.documents.ChatMessage {
             e.setAttribute('data-use-perm', document.testUserPermission(game.user, 'OWNER'));
         });
     }
+
+    async _preCreate(data, options, user) {
+        options.speaker = ChatMessage.getSpeaker();
+        const rollActorOwner = data.rolls?.[0]?.data?.parent?.owner;
+        if (rollActorOwner) {
+            data.author = rollActorOwner ? rollActorOwner.id : data.author;
+            await this.updateSource({ author: rollActorOwner ?? user });
+        }
+
+        return super._preCreate(data, options, rollActorOwner ?? user);
+    }
 }

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

@@ -1,20 +1,34 @@
-@import '../../utils/colors.less';
+@import '../../utils/colors.less';
-
+
-.daggerheart.dialog.dh-style.views.damage-selection {
+.daggerheart.dialog.dh-style.views.damage-selection {
-    .damage-section-container {
+    .damage-section-container {
-        display: flex;
+        display: flex;
-        flex-direction: column;
+        flex-direction: column;
-        gap: 12px;
+        gap: 12px;
-
+
-        input[type='text'],
+        input[type='text'],
-        input[type='number'] {
+        input[type='number'] {
-            color: light-dark(@dark, @beige);
+            color: light-dark(@dark, @beige);
-            outline: 2px solid transparent;
+            outline: 2px solid transparent;
-            transition: all 0.3s ease;
+            transition: all 0.3s ease;
-
+
-            &:hover {
+            &:hover {
-                outline: 2px solid light-dark(@dark, @beige);
+                outline: 2px solid light-dark(@dark, @beige);
-            }
+            }
-        }
+        }
-    }
+
-}
+        .damage-section-controls {
+            display: flex;
+            align-items: center;
+            gap: 16px;
+
+            .roll-mode-select {
+                width: min-content;
+            }
+
+            button {
+                flex: 1;
+            }
+        }
+    }
+}

styles/less/dialog/dice-roll/roll-selection.less

@@ -114,5 +114,19 @@
                 }
             }
         }
+
+        .roll-dialog-controls {
+            display: flex;
+            align-items: center;
+            gap: 16px;
+
+            .roll-mode-select {
+                width: min-content;
+            }
+
+            button {
+                flex: 1;
+            }
+        }
     }
 }

templates/dialogs/dice-roll/damageSelection.hbs

@@ -6,8 +6,15 @@
     <div class="form-group">
         <input type="text" value="{{extraFormula}}" name="extraFormula" placeholder="Situational Bonus">
     </div>
-    <button class="submit-btn" data-action="submitRoll">
+    <div class="damage-section-controls">
-        <i class="fa-solid fa-dice"></i>
+        {{#if directDamage}}
-        <span class="label">Roll</span>
+            <select class="roll-mode-select" name="selectedRollMode">
-    </button>
+                {{selectOptions rollModes selected=selectedRollMode valueAttr="action" labelAttr="label" localize=true}}
+            </select>
+        {{/if}}
+        <button class="submit-btn" data-action="submitRoll">
+            <i class="fa-solid fa-dice"></i>
+            <span class="label">{{localize "DAGGERHEART.GENERAL.roll"}}</span>
+        </button>
+    </div>
 </section>

templates/dialogs/dice-roll/rollSelection.hbs

@@ -117,10 +117,15 @@
                 </fieldset>
             {{/unless}}
             <span class="formula-label"><b>Formula:</b> {{@root.formula}}</span>
-            <button class="sunmit-btn" data-action="submitRoll"{{#unless canRoll}} disabled{{/unless}}>
+            <div class="roll-dialog-controls">
-                <i class="fa-solid fa-dice"></i>
+                <select class="roll-mode-select" name="selectedRollMode">
-                <span class="label">Roll</span>
+                    {{selectOptions rollModes selected=selectedRollMode valueAttr="action" labelAttr="label" localize=true}}
-            </button>
+                </select>
+                <button class="sunmit-btn" data-action="submitRoll"{{#unless canRoll}} disabled{{/unless}}>
+                    <i class="fa-solid fa-dice"></i>
+                    <span class="label">Roll</span>
+                </button>
+            </div>
     {{else}}
         <button class="sunmit-btn" data-action="submitRoll"{{#unless canRoll}} disabled{{/unless}}>
             <span class="label">Continue</span>