mirror of
https://github.com/pagefaultgames/pokerogue.git
synced 2025-07-17 22:02:18 +02:00
Move resetSummonData to faintPhase instead of pokemon.apply
This commit is contained in:
parent
46ac822524
commit
493aff4055
@ -4762,7 +4762,6 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
|
|||||||
|
|
||||||
this.destroySubstitute();
|
this.destroySubstitute();
|
||||||
this.lapseTag(BattlerTagType.COMMANDED);
|
this.lapseTag(BattlerTagType.COMMANDED);
|
||||||
this.resetSummonData();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
@ -4824,7 +4823,6 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
|
|||||||
);
|
);
|
||||||
this.destroySubstitute();
|
this.destroySubstitute();
|
||||||
this.lapseTag(BattlerTagType.COMMANDED);
|
this.lapseTag(BattlerTagType.COMMANDED);
|
||||||
this.resetSummonData();
|
|
||||||
}
|
}
|
||||||
return damage;
|
return damage;
|
||||||
}
|
}
|
||||||
|
@ -74,6 +74,8 @@ export class FaintPhase extends PokemonPhase {
|
|||||||
|
|
||||||
const faintPokemon = this.getPokemon();
|
const faintPokemon = this.getPokemon();
|
||||||
|
|
||||||
|
faintPokemon.resetSummonData();
|
||||||
|
|
||||||
if (!isNullOrUndefined(this.destinyTag) && !isNullOrUndefined(this.source)) {
|
if (!isNullOrUndefined(this.destinyTag) && !isNullOrUndefined(this.source)) {
|
||||||
this.destinyTag.lapse(this.source, BattlerTagLapseType.CUSTOM);
|
this.destinyTag.lapse(this.source, BattlerTagLapseType.CUSTOM);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user