Identify the correct statistic when using a pre-existing roll for ini…

…tiative (foundryvtt#16822)
manfred7168 · Oct 9, 2024 · 6a3e30c · 6a3e30c
1 parent 9a7e335
commit 6a3e30c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/src/module/actor/initiative.ts b/src/module/actor/initiative.ts
@@ -74,7 +74,7 @@ class ActorInitiative {
         // Update the tracker unless requested not to
         const updateTracker = args.updateTracker ?? true;
         if (updateTracker) {
-            combatant.encounter.setInitiative(combatant.id, roll.total);
+            combatant.encounter.setInitiative(combatant.id, roll.total, this.statistic.base?.slug);
         }
 
         return { combatant, roll };

diff --git a/src/module/apps/sidebar/chat-log.ts b/src/module/apps/sidebar/chat-log.ts
@@ -328,7 +328,11 @@ class ChatLogPF2e extends ChatLog<ChatMessagePF2e> {
         const combatant = await CombatantPF2e.fromActor(actor);
         if (!combatant) return;
         const value = message.rolls.at(0)?.total ?? 0;
-        await combatant.encounter.setInitiative(combatant.id, value);
+        await combatant.encounter.setInitiative(
+            combatant.id,
+            value,
+            message.flags.pf2e.modifierName ? String(message.flags.pf2e.modifierName) : undefined,
+        );
 
         ui.notifications.info(
             game.i18n.format("PF2E.Encounter.InitiativeSet", { actor: token.name, initiative: value }),

diff --git a/src/module/encounter/document.ts b/src/module/encounter/document.ts
@@ -9,6 +9,7 @@ import { calculateXP } from "@scripts/macros/index.ts";
 import { ThreatRating } from "@scripts/macros/xp/index.ts";
 import * as R from "remeda";
 import type { CombatantFlags, CombatantPF2e, RolledCombatant } from "./combatant.ts";
+import { objectHasKey } from "@util";
 
 class EncounterPF2e extends Combat {
     /** Has this document completed `DataModel` initialization? */
@@ -212,14 +213,17 @@ class EncounterPF2e extends Combat {
         if (this.turn !== null) await this.update({ turn: this.turns.findIndex((c) => c.id === currentId) });
     }
 
-    override async setInitiative(id: string, value: number): Promise<void> {
+    override async setInitiative(id: string, value: number, statistic?: string): Promise<void> {
         const combatant = this.combatants.get(id, { strict: true });
         if (combatant.actor?.isOfType("character", "npc")) {
             return this.setMultipleInitiatives([
                 {
                     id: combatant.id,
                     value,
-                    statistic: combatant.actor.system.initiative.statistic || "perception",
+                    statistic:
+                        objectHasKey(CONFIG.PF2E.skills, statistic) || statistic === "perception"
+                            ? statistic
+                            : combatant.actor.system.initiative.statistic || "perception",
                 },
             ]);
         }