ShuriZma
/
pokerogue
mirror of https://github.com/pagefaultgames/pokerogue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move resetSummonData to faintPhase instead of pokemon.apply

This commit is contained in:
Sirz Benjie 2025-04-08 15:21:54 -05:00
parent 92a21c5666
commit 60f507e015
No known key found for this signature in database
GPG Key ID: 4A524B4D196C759E
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/field/pokemon.ts
View File

@ -4552,7 +4552,6 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
this.destroySubstitute();
this.lapseTag(BattlerTagType.COMMANDED);
this.resetSummonData();
}
return result;
@ -4614,7 +4613,6 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
);
this.destroySubstitute();
this.lapseTag(BattlerTagType.COMMANDED);
this.resetSummonData();
}
return damage;
}

2
src/phases/faint-phase.ts
View File

@ -74,6 +74,8 @@ export class FaintPhase extends PokemonPhase {
const faintPokemon = this.getPokemon();
faintPokemon.resetSummonData();
if (!isNullOrUndefined(this.destinyTag) && !isNullOrUndefined(this.source)) {
this.destinyTag.lapse(this.source, BattlerTagLapseType.CUSTOM);
}