Skip to content

Add roll options for area-fire and auto-fire saves #21547

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
surged20 wants to merge 1 commit into
base: v13-dev
Choose a base branch
from
Open

Add roll options for area-fire and auto-fire saves #21547

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
24 changes: 21 additions & 3 deletions src/module/chat-message/listeners/cards.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,8 +220,18 @@ class ChatCards {
return;
}
case "roll-area-save": {
const context = message.flags[SYSTEM_ID].context;
const type = tupleHasValue(["area-fire", "auto-fire"], context?.type) ? context.type : null;
const dc = attack && "statistic" in attack ? attack.statistic.dc : null;
return this.#rollActorSaves({ event, saveType: "reflex", origin: actor, item, dc });
const extraRollOptions = type ? [`origin:action:slug:${type}`] : [];
return this.#rollActorSaves({
event,
saveType: "reflex",
origin: actor,
item,
dc,
extraRollOptions,
});
}
case "roll-area-damage":
attack?.damage?.({ event });
Expand Down Expand Up @@ -329,7 +339,14 @@ class ChatCards {
* Apply rolled dice damage to the token or tokens which are currently controlled.
* This allows for damage to be scaled by a multiplier to account for healing, critical hits, or resistance
*/
static async #rollActorSaves({ event, saveType, origin, item, dc }: RollActorSavesParams): Promise<void> {
static async #rollActorSaves({
event,
saveType,
origin,
item,
dc,
extraRollOptions,
}: RollActorSavesParams): Promise<void> {
const tokens = game.user.getActiveTokens();
if (tokens.length === 0) {
ui.notifications.error("PF2E.ErrorMessage.NoTokenSelected", { localize: true });
Expand All @@ -340,7 +357,7 @@ class ChatCards {
const save = token.actor?.saves?.[saveType];
if (!save) return;

save.check.roll({ ...eventToRollParams(event, { type: "check" }), dc, item, origin });
save.check.roll({ ...eventToRollParams(event, { type: "check" }), dc, item, origin, extraRollOptions });
}
}
}
Expand All @@ -358,6 +375,7 @@ interface RollActorSavesParams {
origin: ActorPF2e;
item: ItemPF2e<ActorPF2e>;
dc: CheckDC | CheckDCReference | null;
extraRollOptions?: string[];
}

export { ChatCards };