Acquire modifier adjustments for Volley penalty (#15610)

foundryvtt · Jul 28, 2024 · 6e63427 · 6e63427
1 parent c96b0f7
commit 6e63427
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/src/module/actor/character/elemental-blast.ts b/src/module/actor/character/elemental-blast.ts
@@ -278,7 +278,7 @@ class ElementalBlast {
         config,
         damageType,
     }: CreateModifiedItemParams): AbilityItemPF2e<CharacterPF2e> | null {
-        const { item } = this;
+        const item = this.item;
         if (!item) return null;
 
         const traits = ((): ActionTrait[] => {
@@ -299,10 +299,12 @@ class ElementalBlast {
     }
 
     #createAttackStatistic(statistic: Statistic, item: AbilityItemPF2e<ActorPF2e>): Statistic {
+        const newDomain = "elemental-blast-attack-roll";
+        const domains = [...statistic.check.domains, newDomain];
         return statistic.extend({
             check: {
-                domains: ["elemental-blast-attack-roll"],
-                modifiers: AttackTraitHelpers.createAttackModifiers({ item }),
+                domains: [newDomain],
+                modifiers: AttackTraitHelpers.createAttackModifiers({ item, domains }),
             },
         });
     }

diff --git a/src/module/actor/character/helpers.ts b/src/module/actor/character/helpers.ts
@@ -82,7 +82,7 @@ class PCAttackTraitHelpers extends AttackTraitHelpers {
             }
         });
 
-        return [...super.createAttackModifiers({ item }), ...pcSpecificModifiers];
+        return [...super.createAttackModifiers({ item, domains }), ...pcSpecificModifiers];
     }
 }
 

diff --git a/src/module/actor/creature/helpers.ts b/src/module/actor/creature/helpers.ts
@@ -4,6 +4,7 @@ import { ModifierPF2e } from "@actor/modifiers.ts";
 import { ImmunityType } from "@actor/types.ts";
 import type { AbilityItemPF2e, MeleePF2e, WeaponPF2e } from "@item";
 import { ConditionPF2e } from "@item";
+import { extractModifierAdjustments } from "@module/rules/helpers.ts";
 import { Predicate } from "@system/predication.ts";
 import { ErrorPF2e } from "@util";
 
@@ -19,8 +20,8 @@ class AttackTraitHelpers {
         return trait.replace(/-d?\d{1,3}$/, "");
     }
 
-    static createAttackModifiers({ item }: CreateAttackModifiersParams): ModifierPF2e[] {
-        const { actor } = item;
+    static createAttackModifiers({ item, domains }: CreateAttackModifiersParams): ModifierPF2e[] {
+        const actor = item.actor;
         if (!actor) throw ErrorPF2e("The weapon must be embedded");
 
         return item.system.traits.value.flatMap((trait) => {
@@ -41,6 +42,11 @@ class AttackTraitHelpers {
                             { lte: ["target:distance", penaltyRange] },
                             { not: "self:ignore-volley-penalty" },
                         ),
+                        adjustments: extractModifierAdjustments(
+                            actor.synthetics.modifierAdjustments,
+                            domains,
+                            unannotatedTrait,
+                        ),
                     });
                 }
                 case "sweep": {
@@ -70,6 +76,7 @@ class AttackTraitHelpers {
 
 interface CreateAttackModifiersParams {
     item: AbilityItemPF2e<ActorPF2e> | WeaponPF2e<ActorPF2e> | MeleePF2e<ActorPF2e>;
+    domains: string[];
 }
 
 /** Set immunities for creatures with traits call for them */

diff --git a/src/module/actor/helpers.ts b/src/module/actor/helpers.ts
@@ -479,7 +479,7 @@ function strikeFromMeleeItem(item: MeleePF2e<ActorPF2e>): NPCStrike {
     ];
 
     modifiers.push(...extractModifiers(synthetics, domains));
-    modifiers.push(...AttackTraitHelpers.createAttackModifiers({ item }));
+    modifiers.push(...AttackTraitHelpers.createAttackModifiers({ item, domains }));
 
     const attackEffects: Record<string, string | undefined> = CONFIG.PF2E.attackEffects;
     const additionalEffects = item.attackEffects.map((tag) => {