Skip to content
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

Avoid duplicate processing in mergeable roll options by returning earlier #18013

Merged
merged 1 commit into from
Jan 27, 2025
Merged

Avoid duplicate processing in mergeable roll options by returning earlier #18013

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
38 changes: 14 additions & 24 deletions src/module/rules/rule-element/roll-option/rule-element.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,28 +203,17 @@ class RollOptionRuleElement extends RuleElementPF2e<RollOptionSchema> {
}

/** Filter suboptions, including those among the same merge family. */
#resolveSuboptions(test?: Set<string>): Suboption[] {
#resolveSuboptions(test: Set<string>): Suboption[] {
// Extract local suboptions first. If any exist but all fail predication, return none so we can fail later.
const selfSuboptions = this.getSelfSuboptions();
const localSuboptions = selfSuboptions.filter((s) => !test || s.predicate.test(test));
if (this.hasSubOptions && localSuboptions.length === 0) {
return [];
}

const foreignSuboptions = this.mergeable
? this.actor.rules.flatMap((r) =>
r !== this &&
!r.ignored &&
r instanceof RollOptionRuleElement &&
r.toggleable &&
r.mergeable &&
r.domain === this.domain &&
r.option === this.option &&
(!test || r.test(test))
? r.getSelfSuboptions()
: [],
)
: [];
const foreignSuboptions = this.#resolveSuboptionRules().flatMap((r) =>
r !== this && !r.ignored && (!test || r.test(test)) ? r.getSelfSuboptions() : [],
);

const suboptions = R.uniqueBy([...localSuboptions, ...foreignSuboptions], (s) => s.value)
.filter((s) => !test || s.predicate.test(test))
Expand Down Expand Up @@ -254,9 +243,10 @@ class RollOptionRuleElement extends RuleElementPF2e<RollOptionSchema> {
/**
* Filter rules, including those with suboptions among the same merge family.
* Includes ignored rules and those with failed predications. */
#resolveSuboptionRules(): RuleElementPF2e[] {
#resolveSuboptionRules(): RollOptionRuleElement[] {
if (!this.mergeable) return [];
return this.actor.rules.filter(
(r) =>
(r): r is RollOptionRuleElement =>
r instanceof RollOptionRuleElement &&
r.toggleable &&
r.mergeable &&
Expand Down Expand Up @@ -296,26 +286,26 @@ class RollOptionRuleElement extends RuleElementPF2e<RollOptionSchema> {
}

if (this.toggleable) {
const suboptions = this.#resolveSuboptions(test);
const toggleDomain = (this.actor.synthetics.toggles[this.domain] ??= {});

// Determine if this should be disabled. If so, and there is a disabled value, set it.
// This must be done before mergeable so that conflict resolution resolves correctly
// If mergeable, only the first one matters for disabling
const enabled = this.disabledIf ? !this.disabledIf.test(test) : true;
if (!enabled && !this.alwaysActive && typeof this.disabledValue === "boolean") {
this.value = this.disabledValue;
}

// Exit early if another mergeable roll option has already completed the following
const toggleDomain = (this.actor.synthetics.toggles[this.domain] ??= {});
if (this.mergeable && toggleDomain[this.option]) return;

// Extract and consolidate all suboptions
// If no suboptions remain after predicate testing, don't set the roll option or expose the toggle.
// Also prevent further processing, such as from beforeRoll().
const suboptions = this.#resolveSuboptions(test);
if (this.hasSubOptions && suboptions.length === 0) {
this.ignored = true;
return;
}

// Exit early if another mergeable roll option has already completed the following
if (this.mergeable && toggleDomain[this.option]) return;

if (suboptions.length > 0 && !suboptions.some((s) => s.value === this.selection)) {
// If predicate testing eliminated the selected suboption, select the first and deselect the rest
this.selection = suboptions[0].value;
Expand Down
Loading