Skip to content

Upgrade baseModifier fields to support resolvable values #20539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kanongil wants to merge 1 commit into
base: v13-dev
Choose a base branch
from
Open

Upgrade baseModifier fields to support resolvable values #20539

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 19 additions & 18 deletions src/module/rules/rule-element/special-statistic.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { Statistic, StatisticData } from "@system/statistic/index.ts";
import { tupleHasValue } from "@util";
import * as R from "remeda";
import { RuleElement } from "../index.ts";
import type { ModelPropsFromRESchema, RuleElementSchema } from "./data.ts";
import { ResolvableValueField, RuleValue, type ModelPropsFromRESchema, type RuleElementSchema } from "./data.ts";
import fields = foundry.data.fields;

/** Create a special-purpose statistic for use in checks and as a DC */
Expand Down Expand Up @@ -48,9 +48,9 @@ class SpecialStatisticRuleElement extends RuleElement<SpecialStatisticSchema> {
}),
baseModifier: new fields.SchemaField(
{
mod: new fields.NumberField({ required: false, nullable: true, integer: true, initial: null }),
check: new fields.NumberField({ required: false, nullable: true, integer: true, initial: null }),
dc: new fields.NumberField({ required: false, nullable: true, integer: true, initial: null }),
mod: new ResolvableValueField({ required: false, nullable: true, initial: null }),
check: new ResolvableValueField({ required: false, nullable: true, initial: null }),
dc: new ResolvableValueField({ required: false, nullable: true, initial: null }),
},
{ required: false, nullable: true, initial: null },
),
Expand Down Expand Up @@ -83,15 +83,16 @@ class SpecialStatisticRuleElement extends RuleElement<SpecialStatisticSchema> {

const label = this.itemCasting ? (extendedFrom?.label ?? this.label) : this.label;
const checkType = this.type === "check" ? "check" : "attack-roll";
const modCheckDC =
this.baseModifier && actor.type === "npc"
? R.mapValues(this.baseModifier, (value, key) => {
const slug = typeof this.baseModifier?.mod === "number" && key !== "mod" ? `base-${key}` : "base";
const label = "PF2E.ModifierTitle";
const modifier = typeof value === "number" && key === "dc" ? value - 10 : value;
return typeof modifier === "number" ? [new Modifier({ slug, label, modifier })] : [];
})
: { mod: [], check: [], dc: [] };
const modCheckDC = this.baseModifier
? R.mapValues(this.baseModifier, (value, key) => {
const resolvedValue = this.resolveValue(value);
const slug = typeof this.baseModifier?.mod === "number" && key !== "mod" ? `base-${key}` : "base";
const label = "PF2E.ModifierTitle";
const modifier =
typeof resolvedValue === "number" && key === "dc" ? resolvedValue - 10 : resolvedValue;
return typeof modifier === "number" ? [new Modifier({ slug, label, modifier })] : [];
})
: { mod: [], check: [], dc: [] };

const data: Required<Omit<StatisticData, "filter" | "lore" | "proficient" | "rank" | "rollOptions">> = {
slug: this.slug,
Expand Down Expand Up @@ -142,12 +143,12 @@ type SpecialStatisticSchema = RuleElementSchema & {
/** A base modifier for use with NPC special statistics: separate check and DC values may also be specified. */
baseModifier: fields.SchemaField<
{
mod: fields.NumberField<number, number, false, true, true>;
check: fields.NumberField<number, number, false, true, true>;
dc: fields.NumberField<number, number, false, true, true>;
mod: ResolvableValueField<false, true, true>;
check: ResolvableValueField<false, true, true>;
dc: ResolvableValueField<false, true, true>;
},
{ mod: number | null; check: number | null; dc: number | null },
{ mod: number | null; check: number | null; dc: number | null },
{ mod: RuleValue; check: RuleValue; dc: RuleValue },
{ mod: RuleValue; check: RuleValue; dc: RuleValue },
false,
true,
true
Expand Down