Fix modifier adjustments for single-check actions

foundryvtt · Sep 22, 2024 · dbb4ba3 · dbb4ba3
1 parent 0d47e74
commit dbb4ba3
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/src/module/system/action-macros/helpers.ts b/src/module/system/action-macros/helpers.ts
@@ -83,9 +83,18 @@ class ActionMacroHelpers {
             target: options.target,
         });
 
+        // add relevant modifier adjustments
+        const modifiers = (data.modifiers ?? [])
+            .map((modifier) => modifier.clone())
+            .map((modifier) => {
+                const adjustments = extractModifierAdjustments(options.actor.synthetics.modifierAdjustments, [type, slug], modifier.slug);
+                modifier.adjustments = (modifier.adjustments ?? []).concat(adjustments);
+                return modifier;
+            });
+
         return {
             item,
-            modifiers: data.modifiers ?? [],
+            modifiers,
             rollOptions: contextualRollOptions,
             slug,
             statistic,
@@ -172,15 +181,16 @@ class ActionMacroHelpers {
 
                 if (statistic instanceof Statistic) {
                     const dc = this.#resolveCheckDC({ unresolvedDC: options.difficultyClass });
-                    await statistic.roll({
+                    await statistic.extend({
+                        modifiers,
+                    }).roll({
                         ...eventToRollParams(options.event, { type: "check" }),
                         token: selfToken,
                         label,
                         title: label,
                         dc,
                         extraRollNotes: notes,
                         extraRollOptions: combinedOptions,
-                        modifiers,
                         target: targetData.actor,
                         traits: actionTraits,
                         createMessage: options.createMessage,