From 20614c74a29e443c47bba9c4935414d4746a8c41 Mon Sep 17 00:00:00 2001 From: ReneGV Date: Fri, 17 May 2024 22:39:03 -0600 Subject: [PATCH] Add ribbon to pokemon fusions --- src/phases.ts | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/phases.ts b/src/phases.ts index f70fe9e857a..92d07522fe3 100644 --- a/src/phases.ts +++ b/src/phases.ts @@ -3634,10 +3634,16 @@ export class GameOverPhase extends BattlePhase { firstClear = this.scene.validateAchv(achvs.CLASSIC_VICTORY); this.scene.gameData.gameStats.sessionsWon++; for (let pokemon of this.scene.getParty()) { - this.awardRibbon(pokemon); - + this.awardRibbon(pokemon.species); if (pokemon.species.getRootSpeciesId() != pokemon.species.getRootSpeciesId(true)) { - this.awardRibbon(pokemon, true); + this.awardRibbon(pokemon.species, true); + } + + if(pokemon.isFusion()){ + this.awardRibbon(pokemon.fusionSpecies); + if (pokemon.fusionSpecies.getRootSpeciesId() != pokemon.fusionSpecies.getRootSpeciesId(true)) { + this.awardRibbon(pokemon.fusionSpecies, true); + } } } } else if (this.scene.gameMode.isDaily && newClear) @@ -3714,14 +3720,15 @@ export class GameOverPhase extends BattlePhase { } } - awardRibbon(pokemon: Pokemon, forStarter: boolean = false): void { - const speciesId = getPokemonSpecies(pokemon.species.speciesId) + awardRibbon(pokemonSpecies: PokemonSpecies, forStarter: boolean = false): void { + const speciesId = getPokemonSpecies(pokemonSpecies.speciesId) const speciesRibbonCount = this.scene.gameData.incrementRibbonCount(speciesId, forStarter); // first time classic win, award voucher if (speciesRibbonCount === 1) { - this.firstRibbons.push(getPokemonSpecies(pokemon.species.getRootSpeciesId(forStarter))); + this.firstRibbons.push(getPokemonSpecies(pokemonSpecies.getRootSpeciesId(forStarter))); } } + } export class EndCardPhase extends Phase {