Skip to content

feat: improve mook takeout toast to show attacker and target names #365

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

Merged
progressions merged 1 commit into from
Jan 29, 2026
Merged

feat: improve mook takeout toast to show attacker and target names #365

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
2 changes: 1 addition & 1 deletion src/components/encounters/attacks/attackHandlers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ export async function handleNonMookMultipleTargets(

const isMook = CS.isMook(targetChar)
const toastMessage = isMook
? `Took out ${effectiveWounds} ${effectiveWounds === 1 ? "mook" : "mooks"}`
? `${attacker.name} took out ${effectiveWounds} ${targetChar.name}`

Copilot AI Jan 29, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The toast message may read awkwardly when the number of mooks doesn't match the grammatical number of the character name. For example, "Brick Manly took out 1 Zombies" is grammatically incorrect (should be "1 Zombie"). Mook character names are typically plural (e.g., "Zombies", "Assassins"), but the old code handled this by using "mook"/"mooks" with conditional pluralization based on the count. Consider adding logic to handle singular vs plural forms of the mook name, or use a more flexible phrasing that works regardless of count.

Suggested change
? `${attacker.name} took out ${effectiveWounds} ${targetChar.name}`
? `${attacker.name} took out ${effectiveWounds} of the ${targetChar.name}`

Copilot uses AI. Check for mistakes.
: `Applied ${effectiveWounds} wound${effectiveWounds !== 1 ? "s" : ""} to ${targetChar.name}`
toastSuccess(toastMessage)
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/encounters/attacks/combatHandlers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ export function createWoundUpdate(

const description =
isMook && context.isMookTakedown
? `${attacker.name} took out ${wounds} ${wounds === 1 ? "mook" : "mooks"}${defenseDesc}`
? `${attacker.name} took out ${wounds} ${targetChar.name}${defenseDesc}`

Copilot AI Jan 29, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The message may read awkwardly when the number of mooks doesn't match the grammatical number of the character name. For example, "Brick Manly took out 1 Zombies" is grammatically incorrect (should be "1 Zombie"). Mook character names are typically plural (e.g., "Zombies", "Assassins"), but the old code handled this by using "mook"/"mooks" with conditional pluralization based on the count. Consider adding logic to handle singular vs plural forms of the mook name, or use a more flexible phrasing that works regardless of count.

Suggested change
? `${attacker.name} took out ${wounds} ${targetChar.name}${defenseDesc}`
? `${attacker.name} took out ${wounds} of the ${targetChar.name}${defenseDesc}`

Copilot uses AI. Check for mistakes.
: `${attacker.name} attacked ${targetChar.name}${defenseDesc} for ${wounds} wounds`

console.log(`[createWoundUpdate] Creating update for ${targetChar.name}:`, {
Expand Down
Loading