Fix modifier adjustments for top level selectors (foundryvtt#4419)

jdip · Oct 10, 2022 · 768c249 · 768c249
1 parent 22d0ec4
commit 768c249
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/src/module/actor/modifiers.ts b/src/module/actor/modifiers.ts
@@ -557,7 +557,7 @@ class CheckModifier extends StatisticModifier {
         slug: string,
         statistic: { modifiers: readonly ModifierPF2e[] },
         modifiers: ModifierPF2e[] = [],
-        rollOptions: string[] = []
+        rollOptions: string[] | Set<string> = new Set()
     ) {
         super(slug, statistic.modifiers.map((modifier) => modifier.clone()).concat(modifiers), rollOptions);
     }

diff --git a/src/module/system/statistic/index.ts b/src/module/system/statistic/index.ts
@@ -276,12 +276,15 @@ class StatisticCheck {
         this.type = data.check?.type ?? "check";
         this.label = this.#calculateLabel(data);
         this.domains = (data.domains ?? []).concat(data.check?.domains ?? []);
-        this.modifiers = parent.modifiers.concat(data.check?.modifiers ?? []);
-        if (data.check?.domains) {
-            this.modifiers.push(...extractModifiers(parent.actor.synthetics, data.check.domains));
-        }
 
         const rollOptions = parent.createRollOptions(this.domains, options);
+        const allCheckModifiers = [
+            parent.modifiers,
+            data.check?.modifiers ?? [],
+            data.check?.domains ? extractModifiers(parent.actor.synthetics, data.check.domains) : [],
+        ].flat();
+        this.modifiers = allCheckModifiers.map((modifier) => modifier.clone({ test: rollOptions }));
+
         this.#stat = new StatisticModifier(this.label, this.modifiers, rollOptions);
         this.mod = this.#stat.totalModifier;
     }
@@ -385,7 +388,7 @@ class StatisticCheck {
         };
 
         const roll = await CheckPF2e.roll(
-            new CheckModifier(this.label, this.#stat, extraModifiers),
+            new CheckModifier(this.label, this.#stat, extraModifiers, options),
             context,
             null,
             args.callback
@@ -417,13 +420,13 @@ class StatisticDifficultyClass {
 
         // Add all modifiers from all sources together, then test them
         const allDCModifiers = [
-            parent.modifiers ?? [],
+            parent.modifiers,
             data.dc?.modifiers ?? [],
             data.dc?.domains ? extractModifiers(parent.actor.synthetics, data.dc.domains) : [],
         ].flat();
         this.modifiers = allDCModifiers.map((modifier) => modifier.clone({ test: rollOptions }));
 
-        this.value = (data.dc?.base ?? 10) + new StatisticModifier("", this.modifiers).totalModifier;
+        this.value = (data.dc?.base ?? 10) + new StatisticModifier("", this.modifiers, rollOptions).totalModifier;
     }
 
     createRollOptions(args: RollOptionParameters = {}): Set<string> {