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

Allow removal of traits and prevent duplicate traits on action usage #18422

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow removal of traits and prevent duplicate traits on action usage #18422

Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion src/module/actor/actions/simple.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import type { EffectPF2e } from "@item";
import { getSelectedActors } from "@util/token-actor-utils.ts";
import { BaseAction, BaseActionData, BaseActionVariant, BaseActionVariantData } from "./base.ts";
import { ActionCost, ActionUseOptions } from "./types.ts";
import * as R from "remeda";

interface SimpleActionVariantData extends BaseActionVariantData {
effect?: string | EffectPF2e;
Expand Down Expand Up @@ -56,7 +57,7 @@ class SimpleActionVariant extends BaseActionVariant {

const traitLabels: Record<string, string | undefined> = CONFIG.PF2E.actionTraits;
const traitDescriptions: Record<string, string | undefined> = CONFIG.PF2E.traitsDescriptions;
const traits = this.traits.concat(options.traits ?? []).map((trait) => ({
const traits = R.unique(options?.traits ?? this.traits).map((trait) => ({
description: traitDescriptions[trait],
label: traitLabels[trait] ?? trait,
slug: trait,
Expand Down
3 changes: 2 additions & 1 deletion src/module/actor/actions/single-check.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import { CheckDC } from "@system/degree-of-success.ts";
import { getActionGlyph, isObject, tupleHasValue } from "@util";
import { BaseAction, BaseActionData, BaseActionVariant, BaseActionVariantData } from "./base.ts";
import { ActionUseOptions } from "./types.ts";
import * as R from "remeda";

type SingleCheckActionRollNoteData = Omit<RollNoteSource, "selector"> & { selector?: string };
function toRollNoteSource(data: SingleCheckActionRollNoteData): RollNoteSource {
Expand Down Expand Up @@ -174,7 +175,7 @@ class SingleCheckActionVariant extends BaseActionVariant {
}
return null;
},
traits: this.traits.concat(options?.traits ?? []),
traits: R.unique(options?.traits ?? this.traits),
});

return results;
Expand Down