mirror of
https://github.com/Foundryborne/daggerheart.git
synced 2026-01-17 07:36:26 +01:00
Fixes
This commit is contained in:
parent
a659375157
commit
1c93f9e656
2 changed files with 7 additions and 1 deletions
|
|
@ -141,7 +141,12 @@ export default class D20RollDialog extends HandlebarsApplicationMixin(Applicatio
|
||||||
this.roll[key] = value;
|
this.roll[key] = value;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
if(rest.hasOwnProperty("trait")) this.config.roll.trait = rest.trait;
|
if(rest.hasOwnProperty("trait")) {
|
||||||
|
this.config.roll.trait = rest.trait;
|
||||||
|
this.config.title = game.i18n.format('DAGGERHEART.UI.Chat.dualityRoll.abilityCheckTitle', {
|
||||||
|
ability: game.i18n.localize(abilities[this.config.roll.trait]?.label)
|
||||||
|
});
|
||||||
|
}
|
||||||
this.config.extraFormula = rest.extraFormula;
|
this.config.extraFormula = rest.extraFormula;
|
||||||
this.render();
|
this.render();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -30,6 +30,7 @@ export default class DamageField extends fields.SchemaField {
|
||||||
* @param {boolean} [force=false] If the method should be executed outside of Action workflow, for ChatMessage button for example.
|
* @param {boolean} [force=false] If the method should be executed outside of Action workflow, for ChatMessage button for example.
|
||||||
*/
|
*/
|
||||||
static async execute(config, messageId = null, force = false) {
|
static async execute(config, messageId = null, force = false) {
|
||||||
|
if(!this.hasDamage && !this.hasHealing) return;
|
||||||
if((this.hasRoll && DamageField.getAutomation() === CONFIG.DH.SETTINGS.actionAutomationChoices.never.id) && !force) return;
|
if((this.hasRoll && DamageField.getAutomation() === CONFIG.DH.SETTINGS.actionAutomationChoices.never.id) && !force) return;
|
||||||
|
|
||||||
let formulas = this.damage.parts.map(p => ({
|
let formulas = this.damage.parts.map(p => ({
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue