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

Jump to bottom

[Bug][Beta] Fix "Critical Hit" message appearing before dealing damage #4259

Merged
merged 1 commit into from
Sep 14, 2024
Merged

[Bug][Beta] Fix "Critical Hit" message appearing before dealing damage #4259

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
8 changes: 4 additions & 4 deletions src/field/pokemon.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2621,10 +2621,6 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
return result;
}

if (isCritical) {
this.scene.queueMessage(i18next.t("battle:hitResultCriticalHit"));
}

// In case of fatal damage, this tag would have gotten cleared before we could lapse it.
const destinyTag = this.getTag(BattlerTagType.DESTINY_BOND);

Expand Down Expand Up @@ -2667,6 +2663,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
}
}

if (isCritical) {
this.scene.queueMessage(i18next.t("battle:hitResultCriticalHit"));
}

// want to include is.Fainted() in case multi hit move ends early, still want to render message
if (source.turnData.hitsLeft === 1 || this.isFainted()) {
switch (result) {
Expand Down
Loading