From 18c78240334cc972ddc12444b3b22b98a6f8e4fb Mon Sep 17 00:00:00 2001 From: Landon Lee Date: Tue, 7 May 2024 15:46:00 -0500 Subject: [PATCH] Fix cry when pokemon is fused with its own species If the pokemon species and form is the same as the second fusion component, then skip the logic to make a fused cry and just use the cry of the primary component. --- src/field/pokemon.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index 9ac3aec53..597ade842 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -1712,7 +1712,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { const scene = sceneOverride || this.scene; const cry = this.getSpeciesForm().cry(scene, soundConfig); let duration = cry.totalDuration * 1000; - if (this.fusionSpecies) { + if (this.fusionSpecies && this.getSpeciesForm() != this.getFusionSpeciesForm()) { let fusionCry = this.getFusionSpeciesForm().cry(scene, soundConfig, true); duration = Math.min(duration, fusionCry.totalDuration * 1000); fusionCry.destroy(); @@ -1731,7 +1731,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } faintCry(callback: Function): void { - if (this.fusionSpecies) + if (this.fusionSpecies && this.getSpeciesForm() != this.getFusionSpeciesForm()) return this.fusionFaintCry(callback); const key = this.getSpeciesForm().getCryKey(this.formIndex);