Fix rolling army initiative

CarlosFdez · Mar 20, 2024 · c8528f8 · c8528f8
1 parent d60566c
commit c8528f8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/module/actor/army/document.ts b/src/module/actor/army/document.ts
@@ -118,7 +118,7 @@ class ArmyPF2e<TParent extends TokenDocumentPF2e | null = TokenDocumentPF2e | nu
             modifiers: R.compact([
                 new ModifierPF2e({
                     slug: "base",
-                    label: "PF2E.Kingmaker.Army.Base",
+                    label: "PF2E.ModifierTitle",
                     modifier: expectedAC - 10,
                 }),
                 acAdjustment &&
@@ -140,7 +140,7 @@ class ArmyPF2e<TParent extends TokenDocumentPF2e | null = TokenDocumentPF2e | nu
             label: "PF2E.Kingmaker.Army.Scouting",
             domains: ["scouting"],
             modifiers: R.compact([
-                new ModifierPF2e({ slug: "base", label: "PF2E.Kingmaker.Army.Base", modifier: baseScouting }),
+                new ModifierPF2e({ slug: "base", label: "PF2E.ModifierTitle", modifier: baseScouting }),
                 scoutAdjustment
                     ? new ModifierPF2e({
                           slug: "adjustment",
@@ -164,7 +164,7 @@ class ArmyPF2e<TParent extends TokenDocumentPF2e | null = TokenDocumentPF2e | nu
                 label: `PF2E.Kingmaker.Army.Save.${saveType}`,
                 domains: ["saving-throw", saveType],
                 modifiers: R.compact([
-                    new ModifierPF2e({ slug: "base", label: "PF2E.Kingmaker.Army.Base", modifier: baseValue }),
+                    new ModifierPF2e({ slug: "base", label: "PF2E.ModifierTitle", modifier: baseValue }),
                     adjustment
                         ? new ModifierPF2e({
                               slug: "adjustment",
@@ -256,7 +256,7 @@ class ArmyPF2e<TParent extends TokenDocumentPF2e | null = TokenDocumentPF2e | nu
             modifiers: R.compact([
                 new ModifierPF2e({
                     slug: "base",
-                    label: "PF2E.Kingmaker.Army.Base",
+                    label: "PF2E.ModifierTitle",
                     modifier: ARMY_STATS.attack[this.level],
                 }),
                 data.potency && new ModifierPF2e({ slug: "potency", label: "Potency", modifier: data.potency }),

diff --git a/src/module/system/statistic/statistic.ts b/src/module/system/statistic/statistic.ts
@@ -413,9 +413,10 @@ class StatisticCheck<TParent extends Statistic = Statistic> {
                     !!(args.dc?.slug || "statistic" in (args.dc ?? {})) &&
                     (!item || item.isOfType("action", "campaignFeature", "feat", "weapon"))));
 
+        // Only armies can target armies
         const isValidRoller = targetToken?.actor?.isOfType("army")
             ? self.isOfType("army")
-            : self.isOfType("creature", "hazard", "party");
+            : self.isOfType("army", "creature", "hazard", "party");
         if (!isValidRoller) return null;
 
         // This is required to determine the AC for attack dialogs

diff --git a/static/lang/kingmaker-en.json b/static/lang/kingmaker-en.json
@@ -19,7 +19,6 @@
             },
             "Ammunition": "Ammunition",
             "Armor": "Armor",
-            "Base": "Base",
             "BasicWarActions": "Basic War Actions",
             "Condition": {
                 "concealed": {