From f3a77a1d24ec067749892d50c35b51fa6c0abd28 Mon Sep 17 00:00:00 2001
From: Shark that walks like a man <106829671+stwlam@users.noreply.github.com>
Date: Tue, 12 Mar 2024 15:41:41 -0500
Subject: [PATCH] Restore range penalties to strike attack rolls (#14192)

---
 src/module/actor/character/document.ts | 3 ++-
 src/module/actor/helpers.ts            | 4 ++--
 static/lang/en.json                    | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/module/actor/character/document.ts b/src/module/actor/character/document.ts
index c3444776db4..686cfe3a775 100644
--- a/src/module/actor/character/document.ts
+++ b/src/module/actor/character/document.ts
@@ -1549,7 +1549,8 @@ class CharacterPF2e<TParent extends TokenDocumentPF2e | null = TokenDocumentPF2e
                 const statistic = context.origin.statistic ?? action;
                 const maps = calculateMAPs(context.origin.item, { domains: context.domains, options: context.options });
                 const maPenalty = createMAPenalty(maps, mapIncreases, context.options);
-                const check = checkModifiers[mapIncreases](statistic, R.compact([maPenalty]));
+                const allModifiers = R.compact([maPenalty, params.modifiers, context.origin.modifiers].flat());
+                const check = checkModifiers[mapIncreases](statistic, allModifiers);
 
                 // Check whether target is out of maximum range; abort early if so
                 if (context.origin.item.isRanged && typeof context.target?.distance === "number") {
diff --git a/src/module/actor/helpers.ts b/src/module/actor/helpers.ts
index 9d16c961a84..dd53165f855 100644
--- a/src/module/actor/helpers.ts
+++ b/src/module/actor/helpers.ts
@@ -520,7 +520,6 @@ function strikeFromMeleeItem(item: MeleePF2e<ActorPF2e>): NPCStrike {
                 }
             }
 
-            const otherModifiers = R.compact([map]);
             const title = game.i18n.format(
                 item.isMelee ? "PF2E.Action.Strike.MeleeLabel" : "PF2E.Action.Strike.RangedLabel",
                 { weapon: item.name },
@@ -538,7 +537,8 @@ function strikeFromMeleeItem(item: MeleePF2e<ActorPF2e>): NPCStrike {
             );
             const dosAdjustments = extractDegreeOfSuccessAdjustments(context.origin.actor.synthetics, domains);
 
-            const check = new CheckModifier("strike", context.origin.statistic ?? strike, otherModifiers);
+            const allModifiers = R.compact([map, params.modifiers, context.origin.modifiers].flat());
+            const check = new CheckModifier("strike", context.origin.statistic ?? strike, allModifiers);
             const checkContext: CheckCheckContext = {
                 type: "attack-roll",
                 identifier: `${item.id}.${attackSlug}.${meleeOrRanged}`,
diff --git a/static/lang/en.json b/static/lang/en.json
index ceaecf9e1f8..eb00c3bde85 100644
--- a/static/lang/en.json
+++ b/static/lang/en.json
@@ -902,8 +902,8 @@
                     "AdjustedTarget": "<opposer>Target: {opposer}</opposer> <dc>({dcType} <preadjusted>{preadjusted}</preadjusted> <adjusted>{adjusted}</adjusted>)</dc>",
                     "NoChangeTarget": "<opposer>Target: {opposer}</opposer> <dc>({dcType} <adjusted>{adjusted}</adjusted>)</dc>",
                     "NoTarget": "<dc>{dcType} {dc}</dc>",
-                    "WithTarget": "<opposer>Target: {opposer}</target> <dc>({dcType} {dc})</dc>",
-                    "WithOrigin": "<opposer>Origin: {opposer}</target> <dc>({dcType} {dc})</dc>"
+                    "WithTarget": "<opposer>Target: {opposer}</opposer> <dc>({dcType} {dc})</dc>",
+                    "WithOrigin": "<opposer>Origin: {opposer}</opposer> <dc>({dcType} {dc})</dc>"
                 },
                 "Specific": {
                     "armor": "AC",