This commit is contained in:
WBHarry 2026-01-13 18:52:36 +01:00
parent 221e1d1f62
commit e77a0042cb
3 changed files with 7 additions and 5 deletions

View file

@ -505,6 +505,7 @@ export default function DHApplicationMixin(Base) {
const doc = await getDocFromElement(target),
action = doc?.system?.attack ?? doc;
const config = action.prepareConfig(event);
config.effects = Array.from(await this.document.allApplicableEffects());
config.hasRoll = false;
return action && action.workflow.get('damage').execute(config, null, true);
}

View file

@ -112,10 +112,12 @@ export default class DamageRoll extends DHRoll {
const changeKeys = [];
for (const roll of this.options.roll) {
for (const damageType of roll.damageTypes) changeKeys.push(`system.bonuses.${type}.${damageType}`);
for (const damageType of roll.damageTypes?.values?.() ?? []) {
changeKeys.push(`system.bonuses.${type}.${damageType}`);
}
}
const item = this.data.parent.items?.get(this.options.source.item);
const item = this.data.parent?.items?.get(this.options.source.item);
if (item) {
switch (item.type) {
case 'weapon':