mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-07-07 17:02:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix multi-hit early stopping

Browse Source
This commit is contained in:
innerthunder 2024-08-29 02:41:32 -07:00
parent 4652132314
commit 660d554e58
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/field/pokemon.ts
View File

@ -2257,15 +2257,15 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
source.removeTag(typeBoost.tagType); source.removeTag(typeBoost.tagType);
} }
if (cancelled) { if (cancelled || result === HitResult.IMMUNE || result === HitResult.NO_EFFECT) {
return HitResult.NO_EFFECT; source.stopMultiHit(this);
}
if (result === HitResult.IMMUNE || result === HitResult.NO_EFFECT) { if (!cancelled) {
if (result === HitResult.IMMUNE) { if (result === HitResult.IMMUNE) {
this.scene.queueMessage(i18next.t("battle:hitResultImmune", { pokemonName: getPokemonNameWithAffix(this) })); this.scene.queueMessage(i18next.t("battle:hitResultImmune", { pokemonName: getPokemonNameWithAffix(this) }));
} else { } else {
this.scene.queueMessage(i18next.t("battle:hitResultNoEffect")); this.scene.queueMessage(i18next.t("battle:hitResultNoEffect"));
}
} }
return result; return result;
} }