Merge branch 'v14-Dev' into v14/conditional-effects

This commit is contained in:
WBHarry 2026-03-16 15:25:57 +01:00
commit 6a8b0d33b9
58 changed files with 1338 additions and 762 deletions

View file

@ -528,7 +528,8 @@ export function expireActiveEffects(actor, allowedTypes = null) {
export async function getCritDamageBonus(formula) {
const critRoll = new Roll(formula);
return critRoll.dice.reduce((acc, dice) => acc + dice.faces * dice.number, 0);
await critRoll.evaluate();
return critRoll.dice.reduce((acc, dice) => acc + dice.faces * dice.results.filter(r => r.active).length, 0);
}
export function htmlToText(html) {