From 1fd342aa11e7f882895a01de1d5f228e5b4cdace Mon Sep 17 00:00:00 2001 From: Flashfyre Date: Tue, 24 Oct 2023 00:31:09 -0400 Subject: [PATCH] Add back party heal to endless mode --- src/battle-phases.ts | 5 +---- src/modifier/modifier-type.ts | 7 +++++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/battle-phases.ts b/src/battle-phases.ts index e8d317eae..29cef5d4c 100644 --- a/src/battle-phases.ts +++ b/src/battle-phases.ts @@ -461,10 +461,7 @@ export class SelectBiomePhase extends BattlePhase { const currentBiome = this.scene.arena.biomeType; const setNextBiome = (nextBiome: Biome) => { - if (this.scene.gameMode === GameMode.CLASSIC) - this.scene.unshiftPhase(new PartyHealPhase(this.scene, false)); - else - this.scene.fadeOutBgm(2000, true); + this.scene.unshiftPhase(new PartyHealPhase(this.scene, false)); this.scene.unshiftPhase(new SwitchBiomePhase(this.scene, nextBiome)); this.end(); }; diff --git a/src/modifier/modifier-type.ts b/src/modifier/modifier-type.ts index 84ee83ea1..76b636194 100644 --- a/src/modifier/modifier-type.ts +++ b/src/modifier/modifier-type.ts @@ -860,8 +860,11 @@ export function getPlayerModifierTypeOptionsForWave(waveIndex: integer, count: i export function getEnemyModifierTypesForWave(waveIndex: integer, count: integer, party: EnemyPokemon[], poolType: ModifierPoolType.WILD | ModifierPoolType.TRAINER): PokemonHeldItemModifierType[] { const ret = new Array(count).fill(0).map(() => getNewModifierTypeOption(party, poolType).type as PokemonHeldItemModifierType); - if (waveIndex === 200) - ret.push(modifierTypes.MINI_BLACK_HOLE()); + if (waveIndex === 200) { + const miniBlackHole = modifierTypes.MINI_BLACK_HOLE(); + miniBlackHole.id = 'MINI_BLACK_HOLE'; + ret.push(miniBlackHole); + } return ret; }