Add support for multiple candidate statistics in action object data (f…

…oundryvtt#12583)
sbodegraven · Dec 30, 2023 · 14fac77 · 14fac77
1 parent 7886e5c
commit 14fac77
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/module/actor/actions/single-check.ts b/src/module/actor/actions/single-check.ts
@@ -28,15 +28,15 @@ interface SingleCheckActionVariantData extends BaseActionVariantData {
     modifiers?: RawModifier[];
     notes?: SingleCheckActionRollNoteData[];
     rollOptions?: string[];
-    statistic?: string;
+    statistic?: string | string[];
 }
 
 interface SingleCheckActionData extends BaseActionData<SingleCheckActionVariantData> {
     difficultyClass?: CheckDC | DCSlug;
     modifiers?: RawModifier[];
     notes?: SingleCheckActionRollNoteData[];
     rollOptions?: string[];
-    statistic: string;
+    statistic: string | string[];
 }
 
 interface SingleCheckActionUseOptions extends ActionUseOptions {
@@ -54,7 +54,7 @@ class SingleCheckActionVariant extends BaseActionVariant {
     readonly #modifiers?: RawModifier[];
     readonly #notes?: RollNoteSource[];
     readonly #rollOptions?: string[];
-    readonly #statistic?: string;
+    readonly #statistic?: string | string[];
 
     constructor(action: SingleCheckAction, data?: SingleCheckActionVariantData) {
         super(action, data);
@@ -84,7 +84,7 @@ class SingleCheckActionVariant extends BaseActionVariant {
         return this.#rollOptions ?? this.#action.rollOptions;
     }
 
-    get statistic(): string {
+    get statistic(): string | string[] {
         return this.#statistic ?? this.#action.statistic;
     }
 
@@ -100,7 +100,7 @@ class SingleCheckActionVariant extends BaseActionVariant {
             .map(toRollNoteSource)
             .map((note) => new RollNotePF2e(note));
         const rollOptions = this.rollOptions.concat(options.rollOptions ?? []);
-        const slug = options.statistic?.trim() || this.statistic;
+        const slug = options.statistic?.trim() || Array.isArray(this.statistic) ? this.statistic[0] : this.statistic;
         const title = this.name
             ? `${game.i18n.localize(this.#action.name)} - ${game.i18n.localize(this.name)}`
             : game.i18n.localize(this.#action.name);
@@ -143,7 +143,7 @@ class SingleCheckAction extends BaseAction<SingleCheckActionVariantData, SingleC
     readonly modifiers: RawModifier[];
     readonly notes: RollNoteSource[];
     readonly rollOptions: string[];
-    readonly statistic: string;
+    readonly statistic: string | string[];
 
     constructor(data: SingleCheckActionData) {
         super(data);

diff --git a/src/module/system/action-macros/basic/escape.ts b/src/module/system/action-macros/basic/escape.ts
@@ -144,7 +144,7 @@ class EscapeAction extends SingleCheckAction {
             rollOptions: ["action:escape"],
             section: "basic",
             slug: "escape",
-            statistic: "unarmed",
+            statistic: ["unarmed", "acrobatics", "athletics"],
             traits: ["attack"],
         });
     }