random-mirrors/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2024-11-26 00:36:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow for null user in end of move effect phase

Browse Source
This commit is contained in:
Flashfyre 2023-12-08 09:51:45 -05:00
parent 5441ecbd73
commit b29ee1be5e
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/battle-phases.ts
View File

@ -1739,12 +1739,14 @@ export class MoveEffectPhase extends PokemonPhase {
end() {
const user = this.getUserPokemon();
if (--user.turnData.hitsLeft >= 1 && this.getTarget()?.isActive())
this.scene.unshiftPhase(this.getNewHitPhase());
else {
if (user.turnData.hitCount - Math.max(user.turnData.hitsLeft, 0) > 1)
this.scene.queueMessage(`Hit ${user.turnData.hitCount} time(s)!`);
this.scene.applyModifiers(HitHealModifier, this.player, user);
if (user) {
if (--user.turnData.hitsLeft >= 1 && this.getTarget()?.isActive())
this.scene.unshiftPhase(this.getNewHitPhase());
else {
if (user.turnData.hitCount - Math.max(user.turnData.hitsLeft, 0) > 1)
this.scene.queueMessage(`Hit ${user.turnData.hitCount} time(s)!`);
this.scene.applyModifiers(HitHealModifier, this.player, user);
}
}
super.end();