mirror of
https://github.com/pagefaultgames/pokerogue.git
synced 2025-06-30 13:33:01 +02:00
[Bug] Maintain Gimmighoul evo counter when fusing (#5411)
This commit is contained in:
parent
b95bedce7a
commit
d14f71d27a
@ -4634,6 +4634,7 @@ export class PlayerPokemon extends Pokemon {
|
|||||||
newPokemon.fusionLuck = this.fusionLuck;
|
newPokemon.fusionLuck = this.fusionLuck;
|
||||||
newPokemon.fusionTeraType = this.fusionTeraType;
|
newPokemon.fusionTeraType = this.fusionTeraType;
|
||||||
newPokemon.usedTMs = this.usedTMs;
|
newPokemon.usedTMs = this.usedTMs;
|
||||||
|
newPokemon.evoCounter = this.evoCounter;
|
||||||
|
|
||||||
globalScene.getPlayerParty().push(newPokemon);
|
globalScene.getPlayerParty().push(newPokemon);
|
||||||
newPokemon.evolve((!isFusion ? newEvolution : new FusionSpeciesFormEvolution(this.id, newEvolution)), evoSpecies);
|
newPokemon.evolve((!isFusion ? newEvolution : new FusionSpeciesFormEvolution(this.id, newEvolution)), evoSpecies);
|
||||||
@ -4702,6 +4703,7 @@ export class PlayerPokemon extends Pokemon {
|
|||||||
this.fusionGender = pokemon.gender;
|
this.fusionGender = pokemon.gender;
|
||||||
this.fusionLuck = pokemon.luck;
|
this.fusionLuck = pokemon.luck;
|
||||||
this.fusionCustomPokemonData = pokemon.customPokemonData;
|
this.fusionCustomPokemonData = pokemon.customPokemonData;
|
||||||
|
this.evoCounter = Math.max(pokemon.evoCounter, this.evoCounter);
|
||||||
if (pokemon.pauseEvolutions || this.pauseEvolutions) {
|
if (pokemon.pauseEvolutions || this.pauseEvolutions) {
|
||||||
this.pauseEvolutions = true;
|
this.pauseEvolutions = true;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user