cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-03-07 14:36:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix reaction roll

Browse source
This commit is contained in:
Dapoolp 2025-07-02 21:10:49 +02:00
parent df18ccce1a
commit e2f55a8d79
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
module/applications/roll.mjs
View file

@ -38,6 +38,7 @@ export class DHRoll extends Roll {
if (config.dialog.configure !== false) { if (config.dialog.configure !== false) {
// Open Roll Dialog // Open Roll Dialog
const DialogClass = config.dialog?.class ?? this.DefaultDialog; const DialogClass = config.dialog?.class ?? this.DefaultDialog;
console.log(roll, config)
const configDialog = await DialogClass.configure(roll, config, message); const configDialog = await DialogClass.configure(roll, config, message);
if (!configDialog) return; if (!configDialog) return;
} }
@ -246,13 +247,15 @@ export class D20Roll extends DHRoll {
} }
applyBaseBonus() { applyBaseBonus() {
this.options.roll.modifiers = [ this.options.roll.modifiers = [];
if(!this.options.roll.bonus) return;
this.options.roll.modifiers.push(
{ {
label: 'Bonus to Hit', label: 'Bonus to Hit',
value: this.options.roll.bonus value: this.options.roll.bonus
// value: Roll.replaceFormulaData('@attackBonus', this.data) // value: Roll.replaceFormulaData('@attackBonus', this.data)
} }
]; );
} }
static postEvaluate(roll, config = {}) { static postEvaluate(roll, config = {}) {
@ -398,12 +401,14 @@ export class DualityRoll extends D20Roll {
} }
applyBaseBonus() { applyBaseBonus() {
this.options.roll.modifiers = [ this.options.roll.modifiers = [];
if(!this.options.roll.trait) return;
this.options.roll.modifiers.push(
{ {
label: `DAGGERHEART.Abilities.${this.options.roll.trait}.name`, label: `DAGGERHEART.Abilities.${this.options.roll.trait}.name`,
value: Roll.replaceFormulaData(`@traits.${this.options.roll.trait}.total`, this.data) value: Roll.replaceFormulaData(`@traits.${this.options.roll.trait}.total`, this.data)
} }
]; );
} }
static postEvaluate(roll, config = {}) { static postEvaluate(roll, config = {}) {

2
module/applications/sheets/actors/adversary.mjs
View file

@ -87,7 +87,7 @@ export default class AdversarySheet extends DaggerheartSheet(ActorSheetV2) {
event: event, event: event,
title: `${this.actor.name} - Reaction Roll`, title: `${this.actor.name} - Reaction Roll`,
roll: { roll: {
modifier: null, // modifier: null,
type: 'reaction' type: 'reaction'
}, },
chatMessage: { chatMessage: {