Prevent damage alterations from disabling override dice (#15565)

foundryvtt · Jul 25, 2024 · 455757a · 455757a
1 parent 1c1e1d3
commit 455757a
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/module/rules/rule-element/damage-alteration/alteration.ts b/src/module/rules/rule-element/damage-alteration/alteration.ts
@@ -80,8 +80,11 @@ class DamageAlteration {
         const rule = this.#rule;
         if (rule.ignored) return damage;
 
-        if ("value" in damage && ["dice-faces", "dice-number"].includes(this.property)) {
-            // `damage` is a `ModifierPF2e`
+        // If this is a modifier or purely an override dice, skip
+        const isModifier = "value" in damage && ["dice-faces", "dice-number"].includes(this.property);
+        const isOverrideDice =
+            !("value" in damage) && !damage.damageType && !damage.diceNumber && !damage.dieSize && damage.override;
+        if (isModifier || isOverrideDice) {
             return damage;
         }