Provide a subtitle with actions when using lores

Current it will show a subtitle like "Lie (PF2E.ActionsCheck.legal-lore)" when trying to use a skill that doesn't have a translation, which no lore will. Detect the lack of translation and fall back to the "PF2E.ActionsCheck.x" translation format using the label of the skill. This will result in "Lie (Legal Lore Check)" if the skill was labeled in that way.
foundryvtt · Nov 7, 2024 · 7353ad0 · 7353ad0
1 parent 6bb0bba
commit 7353ad0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/module/system/action-macros/basic/escape.ts b/src/module/system/action-macros/basic/escape.ts
@@ -86,7 +86,7 @@ function escapeCheckContext<ItemType extends ItemPF2e<ActorPF2e>>(
     );
 
     if (highest) {
-        const { checkType, stat: slug, subtitle } = ActionMacroHelpers.resolveStat(highest.statistic.slug);
+        const { checkType, stat: slug, subtitle } = ActionMacroHelpers.resolveStat(highest.statistic.slug, opts.actor);
         return {
             modifiers: data.modifiers,
             rollOptions: highest.rollOptions,

diff --git a/src/module/system/action-macros/helpers.ts b/src/module/system/action-macros/helpers.ts
@@ -30,7 +30,10 @@ import type {
 } from "./types.ts";
 
 class ActionMacroHelpers {
-    static resolveStat(stat: string): {
+    static resolveStat(
+        stat: string,
+        actor: ActorPF2e,
+    ): {
         checkType: CheckType;
         property: string;
         stat: string;
@@ -54,11 +57,14 @@ class ActionMacroHelpers {
             default: {
                 const slug = sluggify(stat);
                 const property = `skills.${slug}`;
+                let subtitle = `PF2E.ActionsCheck.${stat}`;
+                if (!game.i18n.has(subtitle))
+                    subtitle = game.i18n.format("PF2E.ActionsCheck.x", { type: actor.skills?.[stat]?.label ?? null });
                 return {
                     checkType: "skill-check",
                     property,
                     stat,
-                    subtitle: `PF2E.ActionsCheck.${stat}`,
+                    subtitle,
                 };
             }
         }
@@ -68,7 +74,7 @@ class ActionMacroHelpers {
         options: CheckContextOptions<ItemType>,
         data: CheckContextData<ItemType>,
     ): CheckMacroContext<ItemType> | undefined {
-        const { checkType: type, property, stat: slug, subtitle } = this.resolveStat(data.slug);
+        const { checkType: type, property, stat: slug, subtitle } = this.resolveStat(data.slug, options.actor);
         const statistic =
             options.actor.getStatistic(data.slug) ?? (fu.getProperty(options.actor, property) as StrikeData);
         if (!statistic) {