From a72bdc7f1b3e96d355fdb02627e199fea1ee1214 Mon Sep 17 00:00:00 2001 From: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com> Date: Sun, 8 Jun 2025 00:51:35 -0500 Subject: [PATCH] Replace many instantiations of new phase with phase manager --- src/battle-scene.ts | 28 +- src/data/abilities/ability.ts | 319 ++++++++++-------- src/data/arena-tag.ts | 61 ++-- src/data/battler-tags.ts | 222 ++++++------ src/data/berry.ts | 37 +- src/data/moves/move.ts | 44 +-- .../encounters/a-trainers-test-encounter.ts | 3 +- .../an-offer-you-cant-refuse-encounter.ts | 3 +- .../encounters/dark-deal-encounter.ts | 3 +- .../encounters/delibirdy-encounter.ts | 13 +- .../encounters/fun-and-games-encounter.ts | 6 +- .../encounters/mysterious-chest-encounter.ts | 3 +- .../encounters/safari-zone-encounter.ts | 6 +- .../slumbering-snorlax-encounter.ts | 3 +- .../the-winstrate-challenge-encounter.ts | 9 +- .../utils/encounter-phase-utils.ts | 38 +-- .../utils/encounter-pokemon-utils.ts | 3 +- src/field/arena.ts | 2 +- src/field/pokemon.ts | 6 +- src/phase-manager.ts | 32 +- src/phases/attempt-capture-phase.ts | 3 +- src/phases/attempt-run-phase.ts | 6 +- src/phases/battle-end-phase.ts | 3 +- src/phases/check-status-effect-phase.ts | 3 +- src/phases/check-switch-phase.ts | 8 +- src/phases/command-phase.ts | 9 +- src/phases/egg-lapse-phase.ts | 6 +- src/phases/encounter-phase.ts | 32 +- src/phases/evolution-phase.ts | 12 +- src/phases/exp-phase.ts | 3 +- src/phases/faint-phase.ts | 20 +- src/phases/form-change-phase.ts | 3 +- src/phases/game-over-phase.ts | 28 +- src/phases/level-up-phase.ts | 6 +- src/phases/login-phase.ts | 8 +- src/phases/move-charge-phase.ts | 2 +- src/phases/move-effect-phase.ts | 5 +- src/phases/mystery-encounter-phases.ts | 55 ++- src/phases/post-game-over-phase.ts | 3 +- src/phases/revival-blessing-phase.ts | 24 +- src/phases/select-biome-phase.ts | 6 +- src/phases/select-modifier-phase.ts | 12 +- src/phases/select-starter-phase.ts | 2 +- src/phases/select-target-phase.ts | 3 +- src/phases/show-ability-phase.ts | 5 +- src/phases/show-party-exp-bar-phase.ts | 6 +- src/phases/summon-phase.ts | 9 +- src/phases/switch-summon-phase.ts | 3 +- src/phases/title-phase.ts | 21 +- src/phases/trainer-victory-phase.ts | 36 +- src/phases/turn-init-phase.ts | 8 +- src/phases/turn-start-phase.ts | 29 +- src/phases/unavailable-phase.ts | 3 +- src/phases/victory-phase.ts | 26 +- src/system/game-data.ts | 11 +- src/ui/challenges-select-ui-handler.ts | 5 +- src/ui/starter-select-ui-handler.ts | 6 +- test/testUtils/gameManager.ts | 4 +- 58 files changed, 625 insertions(+), 650 deletions(-) diff --git a/src/battle-scene.ts b/src/battle-scene.ts index 45b7396ee15..7743302cf94 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -685,8 +685,8 @@ export default class BattleScene extends SceneBase { ).then(() => loadMoveAnimAssets(defaultMoves, true)), this.initStarterColors(), ]).then(() => { - this.phaseManager.createAndPush("LoginPhase"); - this.phaseManager.createAndPush("TitlePhase"); + this.phaseManager.pushNew("LoginPhase"); + this.phaseManager.pushNew("TitlePhase"); this.phaseManager.shiftPhase(); }); @@ -1461,7 +1461,7 @@ export default class BattleScene extends SceneBase { playerField.forEach((pokemon, p) => { if (pokemon.isOnField()) { - this.phaseManager.createAndPush("ReturnPhase", p); + this.phaseManager.pushNew("ReturnPhase", p); } }); @@ -1478,7 +1478,7 @@ export default class BattleScene extends SceneBase { } if (!this.trainer.visible) { - this.phaseManager.createAndPush("ShowTrainerPhase"); + this.phaseManager.pushNew("ShowTrainerPhase"); } } @@ -1487,13 +1487,13 @@ export default class BattleScene extends SceneBase { } if (!this.gameMode.hasRandomBiomes && !isNewBiome) { - this.phaseManager.createAndPush("NextEncounterPhase"); + this.phaseManager.pushNew("NextEncounterPhase"); } else { - this.phaseManager.createAndPush("NewBiomeEncounterPhase"); + this.phaseManager.pushNew("NewBiomeEncounterPhase"); const newMaxExpLevel = this.getMaxExpLevel(); if (newMaxExpLevel > maxExpLevel) { - this.phaseManager.createAndPush("LevelCapPhase"); + this.phaseManager.pushNew("LevelCapPhase"); } } } @@ -3185,9 +3185,9 @@ export default class BattleScene extends SceneBase { if (matchingFormChange) { let phase: Phase; if (pokemon.isPlayer() && !matchingFormChange.quiet) { - phase = this.phaseManager.createPhase("FormChangePhase", pokemon, matchingFormChange, modal); + phase = this.phaseManager.create("FormChangePhase", pokemon, matchingFormChange, modal); } else { - phase = this.phaseManager.createPhase("QuietFormChangePhase", pokemon, matchingFormChange); + phase = this.phaseManager.create("QuietFormChangePhase", pokemon, matchingFormChange); } if (pokemon.isPlayer() && !matchingFormChange.quiet && modal) { this.phaseManager.overridePhase(phase); @@ -3210,7 +3210,7 @@ export default class BattleScene extends SceneBase { delayed = false, ): boolean { const phaseManager = this.phaseManager; - const phase: Phase = phaseManager.createPhase("PokemonAnimPhase", battleAnimType, pokemon, fieldAssets); + const phase: Phase = phaseManager.create("PokemonAnimPhase", battleAnimType, pokemon, fieldAssets); if (delayed) { phaseManager.pushPhase(phase); } else { @@ -3322,9 +3322,9 @@ export default class BattleScene extends SceneBase { this.currentBattle.double = true; const availablePartyMembers = this.getPlayerParty().filter(p => p.isAllowedInBattle()); if (availablePartyMembers.length > 1) { - this.phaseManager.createAndPush("ToggleDoublePositionPhase", true); + this.phaseManager.pushNew("ToggleDoublePositionPhase", true); if (!availablePartyMembers[1].isOnField()) { - this.phaseManager.createAndPush("SummonPhase", 1); + this.phaseManager.pushNew("SummonPhase", 1); } } @@ -3448,8 +3448,8 @@ export default class BattleScene extends SceneBase { const partyMemberIndex = party.indexOf(expPartyMembers[pm]); this.phaseManager.unshiftPhase( expPartyMembers[pm].isOnField() - ? this.phaseManager.createPhase("ExpPhase", partyMemberIndex, exp) - : this.phaseManager.createPhase("ShowPartyExpBarPhase", partyMemberIndex, exp), + ? this.phaseManager.create("ExpPhase", partyMemberIndex, exp) + : this.phaseManager.create("ShowPartyExpBarPhase", partyMemberIndex, exp), ); } } diff --git a/src/data/abilities/ability.ts b/src/data/abilities/ability.ts index 83a9f09dd9a..a79e2206348 100644 --- a/src/data/abilities/ability.ts +++ b/src/data/abilities/ability.ts @@ -47,15 +47,8 @@ import { Command } from "#app/ui/command-ui-handler"; import { BerryModifierType } from "#app/modifier/modifier-type"; import { getPokeballName } from "#app/data/pokeball"; import { BattleType } from "#enums/battle-type"; -import { MovePhase } from "#app/phases/move-phase"; -import { PokemonHealPhase } from "#app/phases/pokemon-heal-phase"; -import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase"; +import type { StatStageChangePhase } from "#app/phases/stat-stage-change-phase"; import { globalScene } from "#app/global-scene"; -import { SwitchPhase } from "#app/phases/switch-phase"; -import { SwitchSummonPhase } from "#app/phases/switch-summon-phase"; -import { BattleEndPhase } from "#app/phases/battle-end-phase"; -import { NewBattlePhase } from "#app/phases/new-battle-phase"; -import { PokemonTransformPhase } from "#app/phases/pokemon-transform-phase"; import { allAbilities } from "#app/data/data-lists"; import { AbAttr } from "#app/data/abilities/ab-attrs/ab-attr"; import { Ability } from "#app/data/abilities/ability-class"; @@ -76,7 +69,6 @@ import { MoveFlags } from "#enums/MoveFlags"; import { MoveTarget } from "#enums/MoveTarget"; import { MoveCategory } from "#enums/MoveCategory"; import type { BerryType } from "#enums/berry-type"; -import { CommonAnimPhase } from "#app/phases/common-anim-phase"; import { CommonAnim } from "../battle-anims"; import { getBerryEffectFunc } from "../berry"; import { BerryUsedEvent } from "#app/events/battle-scene"; @@ -97,7 +89,6 @@ import type { import type { BattlerIndex } from "#app/battle"; import type Move from "#app/data/moves/move"; import type { ArenaTrapTag, SuppressAbilitiesTag } from "#app/data/arena-tag"; -import { SelectBiomePhase } from "#app/phases/select-biome-phase"; import { noAbilityTypeOverrideMoves } from "../moves/invalid-moves"; export class BlockRecoilDamageAttr extends AbAttr { @@ -199,10 +190,13 @@ export class PostTeraFormChangeStatChangeAbAttr extends AbAttr { const statStageChangePhases: StatStageChangePhase[] = []; if (!simulated) { - statStageChangePhases.push(new StatStageChangePhase(pokemon.getBattlerIndex(), true, this.stats, this.stages)); + const phaseManager = globalScene.phaseManager; + statStageChangePhases.push( + phaseManager.create("StatStageChangePhase", pokemon.getBattlerIndex(), true, this.stats, this.stages), + ); for (const statStageChangePhase of statStageChangePhases) { - globalScene.phaseManager.unshiftPhase(statStageChangePhase); + phaseManager.unshiftPhase(statStageChangePhase); } } } @@ -580,16 +574,15 @@ export class TypeImmunityHealAbAttr extends TypeImmunityAbAttr { super.applyPreDefend(pokemon, passive, simulated, attacker, move, cancelled, args); if (!pokemon.isFullHp() && !simulated) { const abilityName = (!passive ? pokemon.getAbility() : pokemon.getPassiveAbility()).name; - globalScene.phaseManager.unshiftPhase( - new PokemonHealPhase( - pokemon.getBattlerIndex(), - toDmgValue(pokemon.getMaxHp() / 4), - i18next.t("abilityTriggers:typeImmunityHeal", { - pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), - abilityName, - }), - true, - ), + globalScene.phaseManager.unshiftNew( + "PokemonHealPhase", + pokemon.getBattlerIndex(), + toDmgValue(pokemon.getMaxHp() / 4), + i18next.t("abilityTriggers:typeImmunityHeal", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + abilityName, + }), + true, ); cancelled.value = true; // Suppresses "No Effect" message } @@ -631,8 +624,12 @@ class TypeImmunityStatStageChangeAbAttr extends TypeImmunityAbAttr { super.applyPreDefend(pokemon, passive, simulated, attacker, move, cancelled, args); cancelled.value = true; // Suppresses "No Effect" message if (!simulated) { - globalScene.phaseManager.unshiftPhase( - new StatStageChangePhase(pokemon.getBattlerIndex(), true, [this.stat], this.stages), + globalScene.phaseManager.unshiftNew( + "StatStageChangePhase", + pokemon.getBattlerIndex(), + true, + [this.stat], + this.stages, ); } } @@ -959,8 +956,12 @@ export class MoveImmunityStatStageChangeAbAttr extends MoveImmunityAbAttr { args: any[], ): void { super.applyPreDefend(pokemon, passive, simulated, attacker, move, cancelled, args); - globalScene.phaseManager.unshiftPhase( - new StatStageChangePhase(pokemon.getBattlerIndex(), true, [this.stat], this.stages), + globalScene.phaseManager.unshiftNew( + "StatStageChangePhase", + pokemon.getBattlerIndex(), + true, + [this.stat], + this.stages, ); } } @@ -1062,18 +1063,21 @@ export class PostDefendStatStageChangeAbAttr extends PostDefendAbAttr { const ally = pokemon.getAlly(); const otherPokemon = !isNullOrUndefined(ally) ? pokemon.getOpponents().concat([ally]) : pokemon.getOpponents(); for (const other of otherPokemon) { - globalScene.phaseManager.unshiftPhase( - new StatStageChangePhase(other.getBattlerIndex(), false, [this.stat], this.stages), + globalScene.phaseManager.unshiftNew( + "StatStageChangePhase", + other.getBattlerIndex(), + false, + [this.stat], + this.stages, ); } } else { - globalScene.phaseManager.unshiftPhase( - new StatStageChangePhase( - (this.selfTarget ? pokemon : attacker).getBattlerIndex(), - this.selfTarget, - [this.stat], - this.stages, - ), + globalScene.phaseManager.unshiftNew( + "StatStageChangePhase", + (this.selfTarget ? pokemon : attacker).getBattlerIndex(), + this.selfTarget, + [this.stat], + this.stages, ); } } @@ -1129,13 +1133,12 @@ export class PostDefendHpGatedStatStageChangeAbAttr extends PostDefendAbAttr { _args: any[], ): void { if (!simulated) { - globalScene.phaseManager.unshiftPhase( - new StatStageChangePhase( - (this.selfTarget ? pokemon : attacker).getBattlerIndex(), - true, - this.stats, - this.stages, - ), + globalScene.phaseManager.unshiftNew( + "StatStageChangePhase", + (this.selfTarget ? pokemon : attacker).getBattlerIndex(), + true, + this.stats, + this.stages, ); } } @@ -1449,8 +1452,12 @@ export class PostDefendCritStatStageChangeAbAttr extends PostDefendAbAttr { _args: any[], ): void { if (!simulated) { - globalScene.phaseManager.unshiftPhase( - new StatStageChangePhase(pokemon.getBattlerIndex(), true, [this.stat], this.stages), + globalScene.phaseManager.unshiftNew( + "StatStageChangePhase", + pokemon.getBattlerIndex(), + true, + [this.stat], + this.stages, ); } } @@ -1765,8 +1772,12 @@ export class PostStatStageChangeStatStageChangeAbAttr extends PostStatStageChang _args: any[], ): void { if (!simulated) { - globalScene.phaseManager.unshiftPhase( - new StatStageChangePhase(pokemon.getBattlerIndex(), true, this.statsToChange, this.stages), + globalScene.phaseManager.unshiftNew( + "StatStageChangePhase", + pokemon.getBattlerIndex(), + true, + this.statsToChange, + this.stages, ); } } @@ -2927,9 +2938,7 @@ class PostVictoryStatStageChangeAbAttr extends PostVictoryAbAttr { override applyPostVictory(pokemon: Pokemon, _passive: boolean, simulated: boolean, _args: any[]): void { const stat = typeof this.stat === "function" ? this.stat(pokemon) : this.stat; if (!simulated) { - globalScene.phaseManager.unshiftPhase( - new StatStageChangePhase(pokemon.getBattlerIndex(), true, [stat], this.stages), - ); + globalScene.phaseManager.unshiftNew("StatStageChangePhase", pokemon.getBattlerIndex(), true, [stat], this.stages); } } } @@ -2995,9 +3004,7 @@ export class PostKnockOutStatStageChangeAbAttr extends PostKnockOutAbAttr { ): void { const stat = typeof this.stat === "function" ? this.stat(pokemon) : this.stat; if (!simulated) { - globalScene.phaseManager.unshiftPhase( - new StatStageChangePhase(pokemon.getBattlerIndex(), true, [stat], this.stages), - ); + globalScene.phaseManager.unshiftNew("StatStageChangePhase", pokemon.getBattlerIndex(), true, [stat], this.stages); } } } @@ -3111,8 +3118,12 @@ export class PostIntimidateStatStageChangeAbAttr extends AbAttr { _args: any[], ): void { if (!simulated) { - globalScene.phaseManager.pushPhase( - new StatStageChangePhase(pokemon.getBattlerIndex(), false, this.stats, this.stages), + globalScene.phaseManager.pushNew( + "StatStageChangePhase", + pokemon.getBattlerIndex(), + false, + this.stats, + this.stages, ); } cancelled.value = this.overwrites; @@ -3314,8 +3325,12 @@ export class PostSummonStatStageChangeAbAttr extends PostSummonAbAttr { if (this.selfTarget) { // we unshift the StatStageChangePhase to put it right after the showAbility and not at the end of the // phase list (which could be after CommandPhase for example) - globalScene.phaseManager.unshiftPhase( - new StatStageChangePhase(pokemon.getBattlerIndex(), true, this.stats, this.stages), + globalScene.phaseManager.unshiftNew( + "StatStageChangePhase", + pokemon.getBattlerIndex(), + true, + this.stats, + this.stages, ); } else { for (const opponent of pokemon.getOpponents()) { @@ -3329,8 +3344,12 @@ export class PostSummonStatStageChangeAbAttr extends PostSummonAbAttr { } } if (!cancelled.value) { - globalScene.phaseManager.unshiftPhase( - new StatStageChangePhase(opponent.getBattlerIndex(), false, this.stats, this.stages), + globalScene.phaseManager.unshiftNew( + "StatStageChangePhase", + opponent.getBattlerIndex(), + false, + this.stats, + this.stages, ); } } @@ -3356,17 +3375,16 @@ export class PostSummonAllyHealAbAttr extends PostSummonAbAttr { override applyPostSummon(pokemon: Pokemon, _passive: boolean, simulated: boolean, _args: any[]): void { const target = pokemon.getAlly(); if (!simulated && !isNullOrUndefined(target)) { - globalScene.phaseManager.unshiftPhase( - new PokemonHealPhase( - target.getBattlerIndex(), - toDmgValue(pokemon.getMaxHp() / this.healRatio), - i18next.t("abilityTriggers:postSummonAllyHeal", { - pokemonNameWithAffix: getPokemonNameWithAffix(target), - pokemonName: pokemon.name, - }), - true, - !this.showAnim, - ), + globalScene.phaseManager.unshiftNew( + "PokemonHealPhase", + target.getBattlerIndex(), + toDmgValue(pokemon.getMaxHp() / this.healRatio), + i18next.t("abilityTriggers:postSummonAllyHeal", { + pokemonNameWithAffix: getPokemonNameWithAffix(target), + pokemonName: pokemon.name, + }), + true, + !this.showAnim, ); } } @@ -3444,7 +3462,7 @@ export class DownloadAbAttr extends PostSummonAbAttr { } if (!simulated) { - globalScene.phaseManager.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), false, this.stats, 1)); + globalScene.phaseManager.unshiftNew("StatStageChangePhase", pokemon.getBattlerIndex(), false, this.stats, 1); } } } @@ -3725,8 +3743,11 @@ export class PostSummonTransformAbAttr extends PostSummonAbAttr { override applyPostSummon(pokemon: Pokemon, _passive: boolean, _simulated: boolean, _args: any[]): void { const target = this.getTarget(pokemon.getOpponents()); - globalScene.phaseManager.unshiftPhase( - new PokemonTransformPhase(pokemon.getBattlerIndex(), target.getBattlerIndex(), true), + globalScene.phaseManager.unshiftNew( + "PokemonTransformPhase", + pokemon.getBattlerIndex(), + target.getBattlerIndex(), + true, ); } } @@ -4109,8 +4130,17 @@ export class ReflectStatStageChangeAbAttr extends PreStatStageChangeAbAttr { const stages = args[1]; this.reflectedStat = stat; if (!simulated) { - globalScene.phaseManager.unshiftPhase( - new StatStageChangePhase(attacker.getBattlerIndex(), false, [stat], stages, true, false, true, null, true), + globalScene.phaseManager.unshiftNew( + "StatStageChangePhase", + attacker.getBattlerIndex(), + false, + [stat], + stages, + true, + false, + true, + null, + true, ); } cancelled.value = true; @@ -5211,16 +5241,15 @@ export class PostWeatherLapseHealAbAttr extends PostWeatherLapseAbAttr { ): void { const abilityName = (!passive ? pokemon.getAbility() : pokemon.getPassiveAbility()).name; if (!simulated) { - globalScene.phaseManager.unshiftPhase( - new PokemonHealPhase( - pokemon.getBattlerIndex(), - toDmgValue(pokemon.getMaxHp() / (16 / this.healFactor)), - i18next.t("abilityTriggers:postWeatherLapseHeal", { - pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), - abilityName, - }), - true, - ), + globalScene.phaseManager.unshiftNew( + "PokemonHealPhase", + pokemon.getBattlerIndex(), + toDmgValue(pokemon.getMaxHp() / (16 / this.healFactor)), + i18next.t("abilityTriggers:postWeatherLapseHeal", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + abilityName, + }), + true, ); } } @@ -5365,13 +5394,12 @@ export class PostTurnStatusHealAbAttr extends PostTurnAbAttr { override applyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, _args: any[]): void { if (!simulated) { const abilityName = (!passive ? pokemon.getAbility() : pokemon.getPassiveAbility()).name; - globalScene.phaseManager.unshiftPhase( - new PokemonHealPhase( - pokemon.getBattlerIndex(), - toDmgValue(pokemon.getMaxHp() / 8), - i18next.t("abilityTriggers:poisonHeal", { pokemonName: getPokemonNameWithAffix(pokemon), abilityName }), - true, - ), + globalScene.phaseManager.unshiftNew( + "PokemonHealPhase", + pokemon.getBattlerIndex(), + toDmgValue(pokemon.getMaxHp() / 8), + i18next.t("abilityTriggers:poisonHeal", { pokemonName: getPokemonNameWithAffix(pokemon), abilityName }), + true, ); } } @@ -5528,8 +5556,11 @@ export class RepeatBerryNextTurnAbAttr extends PostTurnAbAttr { _cancelled: BooleanHolder | null, _args: any[], ): void { - globalScene.phaseManager.unshiftPhase( - new CommonAnimPhase(pokemon.getBattlerIndex(), pokemon.getBattlerIndex(), CommonAnim.USE_ITEM), + globalScene.phaseManager.unshiftNew( + "CommonAnimPhase", + pokemon.getBattlerIndex(), + pokemon.getBattlerIndex(), + CommonAnim.USE_ITEM, ); // Re-apply effects of all berries previously scarfed. @@ -5592,15 +5623,11 @@ export class MoodyAbAttr extends PostTurnAbAttr { if (canRaise.length > 0) { const raisedStat = canRaise[pokemon.randBattleSeedInt(canRaise.length)]; canLower = canRaise.filter(s => s !== raisedStat); - globalScene.phaseManager.unshiftPhase( - new StatStageChangePhase(pokemon.getBattlerIndex(), true, [raisedStat], 2), - ); + globalScene.phaseManager.unshiftNew("StatStageChangePhase", pokemon.getBattlerIndex(), true, [raisedStat], 2); } if (canLower.length > 0) { const loweredStat = canLower[pokemon.randBattleSeedInt(canLower.length)]; - globalScene.phaseManager.unshiftPhase( - new StatStageChangePhase(pokemon.getBattlerIndex(), true, [loweredStat], -1), - ); + globalScene.phaseManager.unshiftNew("StatStageChangePhase", pokemon.getBattlerIndex(), true, [loweredStat], -1); } } } @@ -5616,7 +5643,7 @@ export class SpeedBoostAbAttr extends PostTurnAbAttr { } override applyPostTurn(pokemon: Pokemon, _passive: boolean, _simulated: boolean, _args: any[]): void { - globalScene.phaseManager.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, [Stat.SPD], 1)); + globalScene.phaseManager.unshiftNew("StatStageChangePhase", pokemon.getBattlerIndex(), true, [Stat.SPD], 1); } } @@ -5628,16 +5655,15 @@ export class PostTurnHealAbAttr extends PostTurnAbAttr { override applyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, _args: any[]): void { if (!simulated) { const abilityName = (!passive ? pokemon.getAbility() : pokemon.getPassiveAbility()).name; - globalScene.phaseManager.unshiftPhase( - new PokemonHealPhase( - pokemon.getBattlerIndex(), - toDmgValue(pokemon.getMaxHp() / 16), - i18next.t("abilityTriggers:postTurnHeal", { - pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), - abilityName, - }), - true, - ), + globalScene.phaseManager.unshiftNew( + "PokemonHealPhase", + pokemon.getBattlerIndex(), + toDmgValue(pokemon.getMaxHp() / 16), + i18next.t("abilityTriggers:postTurnHeal", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + abilityName, + }), + true, ); } } @@ -5860,10 +5886,10 @@ export class PostDancingMoveAbAttr extends PostMoveUsedAbAttr { // If the move is an AttackMove or a StatusMove the Dancer must replicate the move on the source of the Dance if (move.getMove() instanceof AttackMove || move.getMove() instanceof StatusMove) { const target = this.getTarget(dancer, source, targets); - phaseManager.createAndUnshift("MovePhase", dancer, target, move, true, true); + phaseManager.unshiftNew("MovePhase", dancer, target, move, true, true); } else if (move.getMove() instanceof SelfStatusMove) { // If the move is a SelfStatusMove (ie. Swords Dance) the Dancer should replicate it on itself - phaseManager.createAndUnshift("MovePhase", dancer, [dancer.getBattlerIndex()], move, true, true); + phaseManager.unshiftNew("MovePhase", dancer, [dancer.getBattlerIndex()], move, true, true); } } } @@ -5949,16 +5975,15 @@ export class StatStageChangeCopyAbAttr extends AbAttr { args: any[], ): void { if (!simulated) { - globalScene.phaseManager.unshiftPhase( - new StatStageChangePhase( - pokemon.getBattlerIndex(), - true, - args[0] as BattleStat[], - args[1] as number, - true, - false, - false, - ), + globalScene.phaseManager.unshiftNew( + "StatStageChangePhase", + pokemon.getBattlerIndex(), + true, + args[0] as BattleStat[], + args[1] as number, + true, + false, + false, ); } } @@ -6058,16 +6083,15 @@ export class HealFromBerryUseAbAttr extends AbAttr { } const { name: abilityName } = passive ? pokemon.getPassiveAbility() : pokemon.getAbility(); - globalScene.phaseManager.unshiftPhase( - new PokemonHealPhase( - pokemon.getBattlerIndex(), - toDmgValue(pokemon.getMaxHp() * this.healPercent), - i18next.t("abilityTriggers:healFromBerryUse", { - pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), - abilityName, - }), - true, - ), + globalScene.phaseManager.unshiftNew( + "PokemonHealPhase", + pokemon.getBattlerIndex(), + toDmgValue(pokemon.getMaxHp() * this.healPercent), + i18next.t("abilityTriggers:healFromBerryUse", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + abilityName, + }), + true, ); } } @@ -6502,8 +6526,12 @@ export class FlinchStatStageChangeAbAttr extends FlinchEffectAbAttr { _args: any[], ): void { if (!simulated) { - globalScene.phaseManager.unshiftPhase( - new StatStageChangePhase(pokemon.getBattlerIndex(), true, this.stats, this.stages), + globalScene.phaseManager.unshiftNew( + "StatStageChangePhase", + pokemon.getBattlerIndex(), + true, + this.stats, + this.stages, ); } } @@ -7241,9 +7269,13 @@ class ForceSwitchOutHelper { if (switchOutTarget.hp > 0) { switchOutTarget.leaveField(this.switchType === SwitchType.SWITCH); - globalScene.phaseManager.prependToPhase( - new SwitchPhase(this.switchType, switchOutTarget.getFieldIndex(), true, true), + globalScene.phaseManager.prependNewToPhase( "MoveEndPhase", + "SwitchPhase", + this.switchType, + switchOutTarget.getFieldIndex(), + true, + true, ); return true; } @@ -7260,9 +7292,14 @@ class ForceSwitchOutHelper { const summonIndex = globalScene.currentBattle.trainer ? globalScene.currentBattle.trainer.getNextSummonIndex((switchOutTarget as EnemyPokemon).trainerSlot) : 0; - globalScene.phaseManager.prependToPhase( - new SwitchSummonPhase(this.switchType, switchOutTarget.getFieldIndex(), summonIndex, false, false), + globalScene.phaseManager.prependNewToPhase( "MoveEndPhase", + "SwitchSummonPhase", + this.switchType, + switchOutTarget.getFieldIndex(), + summonIndex, + false, + false, ); return true; } @@ -7294,13 +7331,13 @@ class ForceSwitchOutHelper { globalScene.clearEnemyHeldItemModifiers(); if (switchOutTarget.hp) { - globalScene.phaseManager.createAndPush("BattleEndPhase", false); + globalScene.phaseManager.pushNew("BattleEndPhase", false); if (globalScene.gameMode.hasRandomBiomes || globalScene.isNewBiome()) { - globalScene.phaseManager.createAndPush("SelectBiomePhase"); + globalScene.phaseManager.pushNew("SelectBiomePhase"); } - globalScene.phaseManager.createAndPush("NewBattlePhase"); + globalScene.phaseManager.pushNew("NewBattlePhase"); } } } diff --git a/src/data/arena-tag.ts b/src/data/arena-tag.ts index 70fceb17c49..28b8c6acd41 100644 --- a/src/data/arena-tag.ts +++ b/src/data/arena-tag.ts @@ -26,10 +26,6 @@ import { AbilityId } from "#enums/ability-id"; import { ArenaTagType } from "#enums/arena-tag-type"; import { BattlerTagType } from "#enums/battler-tag-type"; import { MoveId } from "#enums/move-id"; -import { MoveEffectPhase } from "#app/phases/move-effect-phase"; -import { PokemonHealPhase } from "#app/phases/pokemon-heal-phase"; -import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase"; -import { CommonAnimPhase } from "#app/phases/common-anim-phase"; export enum ArenaTagSide { BOTH, @@ -568,9 +564,7 @@ class WishTag extends ArenaTag { const target = globalScene.getField()[this.battlerIndex]; if (target?.isActive(true)) { globalScene.phaseManager.queueMessage(this.triggerMessage); - globalScene.phaseManager.unshiftPhase( - new PokemonHealPhase(target.getBattlerIndex(), this.healHp, null, true, false), - ); + globalScene.phaseManager.unshiftNew("PokemonHealPhase", target.getBattlerIndex(), this.healHp, null, true, false); } } } @@ -893,8 +887,13 @@ export class DelayedAttackTag extends ArenaTag { const ret = super.lapse(arena); if (!ret) { - globalScene.phaseManager.unshiftPhase( - new MoveEffectPhase(this.sourceId!, [this.targetIndex], allMoves[this.sourceMove!], false, true), + globalScene.phaseManager.unshiftNew( + "MoveEffectPhase", + this.sourceId!, + [this.targetIndex], + allMoves[this.sourceMove!], + false, + true, ); // TODO: are those bangs correct? } @@ -1028,19 +1027,18 @@ class StickyWebTag extends ArenaTrapTag { }), ); const stages = new NumberHolder(-1); - globalScene.phaseManager.unshiftPhase( - new StatStageChangePhase( - pokemon.getBattlerIndex(), - false, - [Stat.SPD], - stages.value, - true, - false, - true, - null, - false, - true, - ), + globalScene.phaseManager.unshiftNew( + "StatStageChangePhase", + pokemon.getBattlerIndex(), + false, + [Stat.SPD], + stages.value, + true, + false, + true, + null, + false, + true, ); return true; } @@ -1138,26 +1136,26 @@ class TailwindTag extends ArenaTag { const source = globalScene.getPokemonById(this.sourceId!); //TODO: this bang is questionable! const party = (source?.isPlayer() ? globalScene.getPlayerField() : globalScene.getEnemyField()) ?? []; + const phaseManager = globalScene.phaseManager; for (const pokemon of party) { // Apply the CHARGED tag to party members with the WIND_POWER ability if (pokemon.hasAbility(AbilityId.WIND_POWER) && !pokemon.getTag(BattlerTagType.CHARGED)) { pokemon.addTag(BattlerTagType.CHARGED); - globalScene.phaseManager.queueMessage( + phaseManager.queueMessage( i18next.t("abilityTriggers:windPowerCharged", { pokemonName: getPokemonNameWithAffix(pokemon), moveName: this.getMoveName(), }), ); } + // Raise attack by one stage if party member has WIND_RIDER ability // TODO: Ability displays should be handled by the ability if (pokemon.hasAbility(AbilityId.WIND_RIDER)) { - globalScene.phaseManager.queueAbilityDisplay(pokemon, false, true); - globalScene.phaseManager.unshiftPhase( - new StatStageChangePhase(pokemon.getBattlerIndex(), true, [Stat.ATK], 1, true), - ); - globalScene.phaseManager.queueAbilityDisplay(pokemon, false, false); + phaseManager.queueAbilityDisplay(pokemon, false, true); + phaseManager.unshiftNew("StatStageChangePhase", pokemon.getBattlerIndex(), true, [Stat.ATK], 1, true); + phaseManager.queueAbilityDisplay(pokemon, false, false); } } } @@ -1319,8 +1317,11 @@ class FireGrassPledgeTag extends ArenaTag { }), ); // TODO: Replace this with a proper animation - globalScene.phaseManager.unshiftPhase( - new CommonAnimPhase(pokemon.getBattlerIndex(), pokemon.getBattlerIndex(), CommonAnim.MAGMA_STORM), + globalScene.phaseManager.unshiftNew( + "CommonAnimPhase", + pokemon.getBattlerIndex(), + pokemon.getBattlerIndex(), + CommonAnim.MAGMA_STORM, ); pokemon.damageAndUpdate(toDmgValue(pokemon.getMaxHp() / 8), { result: HitResult.INDIRECT }); }); diff --git a/src/data/battler-tags.ts b/src/data/battler-tags.ts index 61f24c2eb01..d4f62237446 100644 --- a/src/data/battler-tags.ts +++ b/src/data/battler-tags.ts @@ -27,12 +27,9 @@ import { PokemonType } from "#enums/pokemon-type"; import type Pokemon from "#app/field/pokemon"; import { HitResult, MoveResult } from "#app/field/pokemon"; import { getPokemonNameWithAffix } from "#app/messages"; -import { CommonAnimPhase } from "#app/phases/common-anim-phase"; import type { MoveEffectPhase } from "#app/phases/move-effect-phase"; import type { MovePhase } from "#app/phases/move-phase"; -import { PokemonHealPhase } from "#app/phases/pokemon-heal-phase"; import type { StatStageChangeCallback } from "#app/phases/stat-stage-change-phase"; -import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase"; import i18next from "#app/plugins/i18n"; import { BooleanHolder, getFrameMs, NumberHolder, toDmgValue } from "#app/utils/common"; import { AbilityId } from "#enums/ability-id"; @@ -719,9 +716,7 @@ export class ConfusedTag extends BattlerTag { onAdd(pokemon: Pokemon): void { super.onAdd(pokemon); - globalScene.phaseManager.unshiftPhase( - new CommonAnimPhase(pokemon.getBattlerIndex(), undefined, CommonAnim.CONFUSION), - ); + globalScene.phaseManager.unshiftNew("CommonAnimPhase", pokemon.getBattlerIndex(), undefined, CommonAnim.CONFUSION); globalScene.phaseManager.queueMessage( i18next.t("battlerTags:confusedOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), @@ -756,14 +751,14 @@ export class ConfusedTag extends BattlerTag { return false; } - globalScene.phaseManager.queueMessage( + const phaseManager = globalScene.phaseManager; + + phaseManager.queueMessage( i18next.t("battlerTags:confusedLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), }), ); - globalScene.phaseManager.unshiftPhase( - new CommonAnimPhase(pokemon.getBattlerIndex(), undefined, CommonAnim.CONFUSION), - ); + phaseManager.unshiftNew("CommonAnimPhase", pokemon.getBattlerIndex(), undefined, CommonAnim.CONFUSION); // 1/3 chance of hitting self with a 40 base power move if (pokemon.randBattleSeedInt(3) === 0 || Overrides.CONFUSION_ACTIVATION_OVERRIDE === true) { @@ -773,9 +768,9 @@ export class ConfusedTag extends BattlerTag { ((((2 * pokemon.level) / 5 + 2) * 40 * atk) / def / 50 + 2) * (pokemon.randBattleSeedIntRange(85, 100) / 100), ); // Intentionally don't increment rage fist's hitCount - globalScene.phaseManager.queueMessage(i18next.t("battlerTags:confusedLapseHurtItself")); + phaseManager.queueMessage(i18next.t("battlerTags:confusedLapseHurtItself")); pokemon.damageAndUpdate(damage, { result: HitResult.CONFUSION }); - (globalScene.phaseManager.getCurrentPhase() as MovePhase).cancel(); + (phaseManager.getCurrentPhase() as MovePhase).cancel(); } return true; @@ -881,24 +876,24 @@ export class InfatuatedTag extends BattlerTag { lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean { const ret = lapseType !== BattlerTagLapseType.CUSTOM || super.lapse(pokemon, lapseType); + const phaseManager = globalScene.phaseManager; + if (ret) { - globalScene.phaseManager.queueMessage( + phaseManager.queueMessage( i18next.t("battlerTags:infatuatedLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), sourcePokemonName: getPokemonNameWithAffix(globalScene.getPokemonById(this.sourceId!) ?? undefined), // TODO: is that bang correct? }), ); - globalScene.phaseManager.unshiftPhase( - new CommonAnimPhase(pokemon.getBattlerIndex(), undefined, CommonAnim.ATTRACT), - ); + phaseManager.unshiftNew("CommonAnimPhase", pokemon.getBattlerIndex(), undefined, CommonAnim.ATTRACT); if (pokemon.randBattleSeedInt(2)) { - globalScene.phaseManager.queueMessage( + phaseManager.queueMessage( i18next.t("battlerTags:infatuatedLapseImmobilize", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), }), ); - (globalScene.phaseManager.getCurrentPhase() as MovePhase).cancel(); + (phaseManager.getCurrentPhase() as MovePhase).cancel(); } } @@ -965,26 +960,28 @@ export class SeedTag extends BattlerTag { applyAbAttrs(BlockNonDirectDamageAbAttr, pokemon, cancelled); if (!cancelled.value) { - globalScene.phaseManager.unshiftPhase( - new CommonAnimPhase(source.getBattlerIndex(), pokemon.getBattlerIndex(), CommonAnim.LEECH_SEED), + globalScene.phaseManager.unshiftNew( + "CommonAnimPhase", + source.getBattlerIndex(), + pokemon.getBattlerIndex(), + CommonAnim.LEECH_SEED, ); const damage = pokemon.damageAndUpdate(toDmgValue(pokemon.getMaxHp() / 8), { result: HitResult.INDIRECT }); const reverseDrain = pokemon.hasAbilityWithAttr(ReverseDrainAbAttr, false); - globalScene.phaseManager.unshiftPhase( - new PokemonHealPhase( - source.getBattlerIndex(), - !reverseDrain ? damage : damage * -1, - !reverseDrain - ? i18next.t("battlerTags:seededLapse", { - pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), - }) - : i18next.t("battlerTags:seededLapseShed", { - pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), - }), - false, - true, - ), + globalScene.phaseManager.unshiftNew( + "PokemonHealPhase", + source.getBattlerIndex(), + !reverseDrain ? damage : damage * -1, + !reverseDrain + ? i18next.t("battlerTags:seededLapse", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }) + : i18next.t("battlerTags:seededLapseShed", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + false, + true, ); } } @@ -1039,9 +1036,9 @@ export class PowderTag extends BattlerTag { movePhase.fail(); movePhase.showMoveText(); - globalScene.phaseManager.unshiftPhase( - new CommonAnimPhase(pokemon.getBattlerIndex(), pokemon.getBattlerIndex(), CommonAnim.POWDER), - ); + const idx = pokemon.getBattlerIndex(); + + globalScene.phaseManager.unshiftNew("CommonAnimPhase", idx, idx, CommonAnim.POWDER); const cancelDamage = new BooleanHolder(false); applyAbAttrs(BlockNonDirectDamageAbAttr, pokemon, cancelDamage); @@ -1088,14 +1085,13 @@ export class NightmareTag extends BattlerTag { const ret = lapseType !== BattlerTagLapseType.CUSTOM || super.lapse(pokemon, lapseType); if (ret) { - globalScene.phaseManager.queueMessage( + const phaseManager = globalScene.phaseManager; + phaseManager.queueMessage( i18next.t("battlerTags:nightmareLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), }), ); - globalScene.phaseManager.unshiftPhase( - new CommonAnimPhase(pokemon.getBattlerIndex(), undefined, CommonAnim.CURSE), - ); // TODO: Update animation type + phaseManager.unshiftNew("CommonAnimPhase", pokemon.getBattlerIndex(), undefined, CommonAnim.CURSE); // TODO: Update animation type const cancelled = new BooleanHolder(false); applyAbAttrs(BlockNonDirectDamageAbAttr, pokemon, cancelled); @@ -1194,7 +1190,7 @@ export class EncoreTag extends MoveRestrictionBattlerTag { const lastMove = pokemon.getLastXMoves(1)[0]; globalScene.phaseManager.tryReplacePhase( m => m.is("MovePhase") && m.pokemon === pokemon, - globalScene.phaseManager.createPhase("MovePhase", pokemon, lastMove.targets ?? [], movesetMove), + globalScene.phaseManager.create("MovePhase", pokemon, lastMove.targets ?? [], movesetMove), ); } } @@ -1276,15 +1272,14 @@ export class IngrainTag extends TrappedTag { const ret = lapseType !== BattlerTagLapseType.CUSTOM || super.lapse(pokemon, lapseType); if (ret) { - globalScene.phaseManager.unshiftPhase( - new PokemonHealPhase( - pokemon.getBattlerIndex(), - toDmgValue(pokemon.getMaxHp() / 16), - i18next.t("battlerTags:ingrainLapse", { - pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), - }), - true, - ), + globalScene.phaseManager.unshiftNew( + "PokemonHealPhase", + pokemon.getBattlerIndex(), + toDmgValue(pokemon.getMaxHp() / 16), + i18next.t("battlerTags:ingrainLapse", { + pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), + }), + true, ); } @@ -1315,8 +1310,12 @@ export class OctolockTag extends TrappedTag { const shouldLapse = lapseType !== BattlerTagLapseType.CUSTOM || super.lapse(pokemon, lapseType); if (shouldLapse) { - globalScene.phaseManager.unshiftPhase( - new StatStageChangePhase(pokemon.getBattlerIndex(), false, [Stat.DEF, Stat.SPDEF], -1), + globalScene.phaseManager.unshiftNew( + "StatStageChangePhase", + pokemon.getBattlerIndex(), + false, + [Stat.DEF, Stat.SPDEF], + -1, ); return true; } @@ -1344,16 +1343,15 @@ export class AquaRingTag extends BattlerTag { const ret = lapseType !== BattlerTagLapseType.CUSTOM || super.lapse(pokemon, lapseType); if (ret) { - globalScene.phaseManager.unshiftPhase( - new PokemonHealPhase( - pokemon.getBattlerIndex(), - toDmgValue(pokemon.getMaxHp() / 16), - i18next.t("battlerTags:aquaRingLapse", { - moveName: this.getMoveName(), - pokemonName: getPokemonNameWithAffix(pokemon), - }), - true, - ), + globalScene.phaseManager.unshiftNew( + "PokemonHealPhase", + pokemon.getBattlerIndex(), + toDmgValue(pokemon.getMaxHp() / 16), + i18next.t("battlerTags:aquaRingLapse", { + moveName: this.getMoveName(), + pokemonName: getPokemonNameWithAffix(pokemon), + }), + true, ); } @@ -1445,13 +1443,14 @@ export abstract class DamagingTrapTag extends TrappedTag { const ret = super.lapse(pokemon, lapseType); if (ret) { - globalScene.phaseManager.queueMessage( + const phaseManager = globalScene.phaseManager; + phaseManager.queueMessage( i18next.t("battlerTags:damagingTrapLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), moveName: this.getMoveName(), }), ); - globalScene.phaseManager.unshiftPhase(new CommonAnimPhase(pokemon.getBattlerIndex(), undefined, this.commonAnim)); + phaseManager.unshiftNew("CommonAnimPhase", pokemon.getBattlerIndex(), undefined, this.commonAnim); const cancelled = new BooleanHolder(false); applyAbAttrs(BlockNonDirectDamageAbAttr, pokemon, cancelled); @@ -1764,8 +1763,12 @@ export class ContactStatStageChangeProtectedTag extends DamageProtectedTag { * @param user - The pokemon that is being attacked and has the tag */ override onContact(attacker: Pokemon, _user: Pokemon): void { - globalScene.phaseManager.unshiftPhase( - new StatStageChangePhase(attacker.getBattlerIndex(), false, [this.stat], this.levels), + globalScene.phaseManager.unshiftNew( + "StatStageChangePhase", + attacker.getBattlerIndex(), + false, + [this.stat], + this.levels, ); } } @@ -2281,8 +2284,11 @@ export class SaltCuredTag extends BattlerTag { const ret = lapseType !== BattlerTagLapseType.CUSTOM || super.lapse(pokemon, lapseType); if (ret) { - globalScene.phaseManager.unshiftPhase( - new CommonAnimPhase(pokemon.getBattlerIndex(), pokemon.getBattlerIndex(), CommonAnim.SALT_CURE), + globalScene.phaseManager.unshiftNew( + "CommonAnimPhase", + pokemon.getBattlerIndex(), + pokemon.getBattlerIndex(), + CommonAnim.SALT_CURE, ); const cancelled = new BooleanHolder(false); @@ -2332,8 +2338,11 @@ export class CursedTag extends BattlerTag { const ret = lapseType !== BattlerTagLapseType.CUSTOM || super.lapse(pokemon, lapseType); if (ret) { - globalScene.phaseManager.unshiftPhase( - new CommonAnimPhase(pokemon.getBattlerIndex(), pokemon.getBattlerIndex(), CommonAnim.SALT_CURE), + globalScene.phaseManager.unshiftNew( + "CommonAnimPhase", + pokemon.getBattlerIndex(), + pokemon.getBattlerIndex(), + CommonAnim.SALT_CURE, ); const cancelled = new BooleanHolder(false); @@ -2509,13 +2518,12 @@ export class CommandedTag extends BattlerTag { /** Caches the Tatsugiri's form key and sharply boosts the tagged Pokemon's stats */ override onAdd(pokemon: Pokemon): void { this._tatsugiriFormKey = this.getSourcePokemon()?.getFormKey() ?? "curly"; - globalScene.phaseManager.unshiftPhase( - new StatStageChangePhase( - pokemon.getBattlerIndex(), - true, - [Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.SPD], - 2, - ), + globalScene.phaseManager.unshiftNew( + "StatStageChangePhase", + pokemon.getBattlerIndex(), + true, + [Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.SPD], + 2, ); } @@ -2592,17 +2600,16 @@ export class StockpilingTag extends BattlerTag { ); // Attempt to increase DEF and SPDEF by one stage, keeping track of successful changes. - globalScene.phaseManager.unshiftPhase( - new StatStageChangePhase( - pokemon.getBattlerIndex(), - true, - [Stat.SPDEF, Stat.DEF], - 1, - true, - false, - true, - this.onStatStagesChanged, - ), + globalScene.phaseManager.unshiftNew( + "StatStageChangePhase", + pokemon.getBattlerIndex(), + true, + [Stat.SPDEF, Stat.DEF], + 1, + true, + false, + true, + this.onStatStagesChanged, ); } } @@ -2620,14 +2627,28 @@ export class StockpilingTag extends BattlerTag { const spDefChange = this.statChangeCounts[Stat.SPDEF]; if (defChange) { - globalScene.phaseManager.unshiftPhase( - new StatStageChangePhase(pokemon.getBattlerIndex(), true, [Stat.DEF], -defChange, true, false, true), + globalScene.phaseManager.unshiftNew( + "StatStageChangePhase", + pokemon.getBattlerIndex(), + true, + [Stat.DEF], + -defChange, + true, + false, + true, ); } if (spDefChange) { - globalScene.phaseManager.unshiftPhase( - new StatStageChangePhase(pokemon.getBattlerIndex(), true, [Stat.SPDEF], -spDefChange, true, false, true), + globalScene.phaseManager.unshiftNew( + "StatStageChangePhase", + pokemon.getBattlerIndex(), + true, + [Stat.SPDEF], + -spDefChange, + true, + false, + true, ); } } @@ -2667,9 +2688,7 @@ export class GulpMissileTag extends BattlerTag { } if (this.tagType === BattlerTagType.GULP_MISSILE_ARROKUDA) { - globalScene.phaseManager.unshiftPhase( - new StatStageChangePhase(attacker.getBattlerIndex(), false, [Stat.DEF], -1), - ); + globalScene.phaseManager.unshiftNew("StatStageChangePhase", attacker.getBattlerIndex(), false, [Stat.DEF], -1); } else { attacker.trySetStatus(StatusEffect.PARALYSIS, true, pokemon); } @@ -3290,8 +3309,15 @@ export class SyrupBombTag extends BattlerTag { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), }), ); - globalScene.phaseManager.unshiftPhase( - new StatStageChangePhase(pokemon.getBattlerIndex(), true, [Stat.SPD], -1, true, false, true), + globalScene.phaseManager.unshiftNew( + "StatStageChangePhase", + pokemon.getBattlerIndex(), + true, + [Stat.SPD], + -1, + true, + false, + true, ); return --this.turnCount > 0; } diff --git a/src/data/berry.ts b/src/data/berry.ts index defc9b85541..52ea1c44391 100644 --- a/src/data/berry.ts +++ b/src/data/berry.ts @@ -8,8 +8,6 @@ import i18next from "i18next"; import { BattlerTagType } from "#enums/battler-tag-type"; import { BerryType } from "#enums/berry-type"; import { Stat, type BattleStat } from "#app/enums/stat"; -import { PokemonHealPhase } from "#app/phases/pokemon-heal-phase"; -import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase"; import { globalScene } from "#app/global-scene"; export function getBerryName(berryType: BerryType): string { @@ -75,16 +73,15 @@ export function getBerryEffectFunc(berryType: BerryType): BerryEffectFunc { { const hpHealed = new NumberHolder(toDmgValue(consumer.getMaxHp() / 4)); applyAbAttrs(DoubleBerryEffectAbAttr, consumer, null, false, hpHealed); - globalScene.phaseManager.unshiftPhase( - new PokemonHealPhase( - consumer.getBattlerIndex(), - hpHealed.value, - i18next.t("battle:hpHealBerry", { - pokemonNameWithAffix: getPokemonNameWithAffix(consumer), - berryName: getBerryName(berryType), - }), - true, - ), + globalScene.phaseManager.unshiftNew( + "PokemonHealPhase", + consumer.getBattlerIndex(), + hpHealed.value, + i18next.t("battle:hpHealBerry", { + pokemonNameWithAffix: getPokemonNameWithAffix(consumer), + berryName: getBerryName(berryType), + }), + true, ); } break; @@ -109,8 +106,12 @@ export function getBerryEffectFunc(berryType: BerryType): BerryEffectFunc { const stat: BattleStat = berryType - BerryType.ENIGMA; const statStages = new NumberHolder(1); applyAbAttrs(DoubleBerryEffectAbAttr, consumer, null, false, statStages); - globalScene.phaseManager.unshiftPhase( - new StatStageChangePhase(consumer.getBattlerIndex(), true, [stat], statStages.value), + globalScene.phaseManager.unshiftNew( + "StatStageChangePhase", + consumer.getBattlerIndex(), + true, + [stat], + statStages.value, ); } break; @@ -126,8 +127,12 @@ export function getBerryEffectFunc(berryType: BerryType): BerryEffectFunc { const randStat = randSeedInt(Stat.SPD, Stat.ATK); const stages = new NumberHolder(2); applyAbAttrs(DoubleBerryEffectAbAttr, consumer, null, false, stages); - globalScene.phaseManager.unshiftPhase( - new StatStageChangePhase(consumer.getBattlerIndex(), true, [randStat], stages.value), + globalScene.phaseManager.unshiftNew( + "StatStageChangePhase", + consumer.getBattlerIndex(), + true, + [randStat], + stages.value, ); } break; diff --git a/src/data/moves/move.ts b/src/data/moves/move.ts index 0d6d2dbcdd8..b111d47be8e 100644 --- a/src/data/moves/move.ts +++ b/src/data/moves/move.ts @@ -1890,7 +1890,7 @@ export class HealAttr extends MoveEffectAttr { * This heals the target and shows the appropriate message. */ addHealPhase(target: Pokemon, healRatio: number) { - globalScene.phaseManager.createAndUnshift("PokemonHealPhase", target.getBattlerIndex(), + globalScene.phaseManager.unshiftNew("PokemonHealPhase", target.getBattlerIndex(), toDmgValue(target.getMaxHp() * healRatio), i18next.t("moveTriggers:healHp", { pokemonName: getPokemonNameWithAffix(target) }), true, !this.showAnim); } @@ -2233,7 +2233,7 @@ export class HitHealAttr extends MoveEffectAttr { message = ""; } } - globalScene.phaseManager.unshiftPhase(new PokemonHealPhase(user.getBattlerIndex(), healAmount, message, false, true)); + globalScene.phaseManager.unshiftNew("PokemonHealPhase", user.getBattlerIndex(), healAmount, message, false, true); return true; } @@ -3067,7 +3067,7 @@ export class DelayedAttackAttr extends OverrideMoveEffectAttr { if (!virtual) { overridden.value = true; - globalScene.phaseManager.unshiftPhase(new MoveAnimPhase(new MoveChargeAnim(this.chargeAnim, move.id, user))); + globalScene.phaseManager.unshiftNew("MoveAnimPhase", new MoveChargeAnim(this.chargeAnim, move.id, user)); globalScene.phaseManager.queueMessage(this.chargeText.replace("{TARGET}", getPokemonNameWithAffix(target)).replace("{USER}", getPokemonNameWithAffix(user))); user.pushMoveHistory({ move: move.id, targets: [ target.getBattlerIndex() ], result: MoveResult.OTHER }); const side = target.isPlayer() ? ArenaTagSide.PLAYER : ArenaTagSide.ENEMY; @@ -3207,7 +3207,7 @@ export class StatStageChangeAttr extends MoveEffectAttr { const moveChance = this.getMoveChance(user, target, move, this.selfTarget, true); if (moveChance < 0 || moveChance === 100 || user.randBattleSeedInt(100) < moveChance) { const stages = this.getLevels(user); - globalScene.phaseManager.unshiftPhase(new StatStageChangePhase((this.selfTarget ? user : target).getBattlerIndex(), this.selfTarget, this.stats, stages, this.showMessage)); + globalScene.phaseManager.unshiftNew("StatStageChangePhase", (this.selfTarget ? user : target).getBattlerIndex(), this.selfTarget, this.stats, stages, this.showMessage); return true; } @@ -3432,7 +3432,7 @@ export class AcupressureStatStageChangeAttr extends MoveEffectAttr { const randStats = BATTLE_STATS.filter((s) => target.getStatStage(s) < 6); if (randStats.length > 0) { const boostStat = [ randStats[user.randBattleSeedInt(randStats.length)] ]; - globalScene.phaseManager.unshiftPhase(new StatStageChangePhase(target.getBattlerIndex(), this.selfTarget, boostStat, 2)); + globalScene.phaseManager.unshiftNew("StatStageChangePhase", target.getBattlerIndex(), this.selfTarget, boostStat, 2); return true; } return false; @@ -3510,7 +3510,7 @@ export class OrderUpStatBoostAttr extends MoveEffectAttr { break; } - globalScene.phaseManager.unshiftPhase(new StatStageChangePhase(user.getBattlerIndex(), this.selfTarget, [ increasedStat ], 1)); + globalScene.phaseManager.unshiftNew("StatStageChangePhase", user.getBattlerIndex(), this.selfTarget, [ increasedStat ], 1); return true; } } @@ -4546,7 +4546,7 @@ export class SpectralThiefAttr extends StatChangeBeforeDmgCalcAttr { */ const availableToSteal = Math.min(statStageValueTarget, 6 - statStageValueUser); - globalScene.phaseManager.unshiftPhase(new StatStageChangePhase(user.getBattlerIndex(), this.selfTarget, [ s ], availableToSteal)); + globalScene.phaseManager.unshiftNew("StatStageChangePhase", user.getBattlerIndex(), this.selfTarget, [ s ], availableToSteal); target.setStatStage(s, statStageValueTarget - availableToSteal); } } @@ -5680,8 +5680,8 @@ export class CurseAttr extends MoveEffectAttr { target.addTag(BattlerTagType.CURSED, 0, move.id, user.id); return true; } else { - globalScene.phaseManager.unshiftPhase(new StatStageChangePhase(user.getBattlerIndex(), true, [ Stat.ATK, Stat.DEF ], 1)); - globalScene.phaseManager.unshiftPhase(new StatStageChangePhase(user.getBattlerIndex(), true, [ Stat.SPD ], -1)); + globalScene.phaseManager.unshiftNew("StatStageChangePhase", user.getBattlerIndex(), true, [ Stat.ATK, Stat.DEF ], 1); + globalScene.phaseManager.unshiftNew("StatStageChangePhase", user.getBattlerIndex(), true, [ Stat.SPD ], -1); return true; } } @@ -6154,7 +6154,7 @@ export class RevivalBlessingAttr extends MoveEffectAttr { override apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { // If user is player, checks if the user has fainted pokemon if (user.isPlayer()) { - globalScene.phaseManager.unshiftPhase(new RevivalBlessingPhase(user)); + globalScene.phaseManager.unshiftNew("RevivalBlessingPhase", user); return true; } else if (user.isEnemy() && user.hasTrainer() && globalScene.getEnemyParty().findIndex((p) => p.isFainted() && !p.isBoss()) > -1) { // If used by an enemy trainer with at least one fainted non-boss Pokemon, this @@ -6177,7 +6177,7 @@ export class RevivalBlessingAttr extends MoveEffectAttr { if (user.fieldPosition === FieldPosition.CENTER) { user.setFieldPosition(FieldPosition.LEFT); } - globalScene.phaseManager.unshiftPhase(new SwitchSummonPhase(SwitchType.SWITCH, allyPokemon.getFieldIndex(), slotIndex, false, false)); + globalScene.phaseManager.unshiftNew("SwitchSummonPhase", SwitchType.SWITCH, allyPokemon.getFieldIndex(), slotIndex, false, false); } } return true; @@ -6351,13 +6351,13 @@ export class ForceSwitchOutAttr extends MoveEffectAttr { globalScene.clearEnemyHeldItemModifiers(switchOutTarget); if (!allyPokemon?.isActive(true) && switchOutTarget.hp) { - globalScene.phaseManager.createAndPush("BattleEndPhase", false); + globalScene.phaseManager.pushNew("BattleEndPhase", false); if (globalScene.gameMode.hasRandomBiomes || globalScene.isNewBiome()) { - globalScene.phaseManager.createAndPush("SelectBiomePhase"); + globalScene.phaseManager.pushNew("SelectBiomePhase"); } - globalScene.phaseManager.createAndPush("NewBattlePhase"); + globalScene.phaseManager.pushNew("NewBattlePhase"); } } @@ -6733,8 +6733,8 @@ class CallMoveAttr extends OverrideMoveEffectAttr { ? moveTargets.targets : [ this.hasTarget ? target.getBattlerIndex() : moveTargets.targets[user.randBattleSeedInt(moveTargets.targets.length)] ]; // account for Mirror Move having a target already user.getMoveQueue().push({ move: move.id, targets: targets, virtual: true, ignorePP: true }); - globalScene.phaseManager.createAndUnshift("LoadMoveAnimPhase", move.id); - globalScene.phaseManager.createAndUnshift("MovePhase", user, targets, new PokemonMove(move.id, 0, 0, true), true, true); + globalScene.phaseManager.unshiftNew("LoadMoveAnimPhase", move.id); + globalScene.phaseManager.unshiftNew("MovePhase", user, targets, new PokemonMove(move.id, 0, 0, true), true, true); return true; } } @@ -6962,8 +6962,8 @@ export class NaturePowerAttr extends OverrideMoveEffectAttr { } user.getMoveQueue().push({ move: moveId, targets: [ target.getBattlerIndex() ], ignorePP: true }); - globalScene.phaseManager.createAndUnshift("LoadMoveAnimPhase", moveId); - globalScene.phaseManager.createAndUnshift("MovePhase", user, [ target.getBattlerIndex() ], new PokemonMove(moveId, 0, 0, true), true); + globalScene.phaseManager.unshiftNew("LoadMoveAnimPhase", moveId); + globalScene.phaseManager.unshiftNew("MovePhase", user, [ target.getBattlerIndex() ], new PokemonMove(moveId, 0, 0, true), true); return true; } } @@ -7050,7 +7050,7 @@ export class RepeatMoveAttr extends MoveEffectAttr { })); target.getMoveQueue().unshift({ move: lastMove.move, targets: moveTargets, ignorePP: false }); target.turnData.extraTurns++; - globalScene.phaseManager.appendToPhase(new MovePhase(target, moveTargets, movesetMove), "MoveEndPhase"); + globalScene.phaseManager.appendNewToPhase("MoveEndPhase", "MovePhase", target, moveTargets, movesetMove); return true; } @@ -7550,7 +7550,7 @@ export class TransformAttr extends MoveEffectAttr { return false; } - globalScene.phaseManager.unshiftPhase(new PokemonTransformPhase(user.getBattlerIndex(), target.getBattlerIndex())); + globalScene.phaseManager.unshiftNew("PokemonTransformPhase", user.getBattlerIndex(), target.getBattlerIndex()); globalScene.phaseManager.queueMessage(i18next.t("moveTriggers:transformedIntoTarget", { pokemonName: getPokemonNameWithAffix(user), targetName: getPokemonNameWithAffix(target) })); @@ -7852,7 +7852,7 @@ export class AfterYouAttr extends MoveEffectAttr { //Will find next acting phase of the targeted pokémon, delete it and queue it next on successful delete. const nextAttackPhase = globalScene.phaseManager.findPhase((phase) => phase.pokemon === target); if (nextAttackPhase && globalScene.phaseManager.tryRemovePhase((phase: MovePhase) => phase.pokemon === target)) { - globalScene.phaseManager.createAndPrependToPhase("MovePhase", "MovePhase", target, [ ...nextAttackPhase.targets ], nextAttackPhase.move); + globalScene.phaseManager.prependNewToPhase("MovePhase", "MovePhase", target, [ ...nextAttackPhase.targets ], nextAttackPhase.move); } return true; @@ -7889,7 +7889,7 @@ export class ForceLastAttr extends MoveEffectAttr { globalScene.phaseManager.phaseQueue.splice( globalScene.phaseManager.phaseQueue.indexOf(prependPhase), 0, - globalScene.phaseManager.createPhase("MovePhase", target, [ ...targetMovePhase.targets ], targetMovePhase.move, false, false, false, true) + globalScene.phaseManager.create("MovePhase", target, [ ...targetMovePhase.targets ], targetMovePhase.move, false, false, false, true) ); } } diff --git a/src/data/mystery-encounters/encounters/a-trainers-test-encounter.ts b/src/data/mystery-encounters/encounters/a-trainers-test-encounter.ts index 5f69090064f..11081892205 100644 --- a/src/data/mystery-encounters/encounters/a-trainers-test-encounter.ts +++ b/src/data/mystery-encounters/encounters/a-trainers-test-encounter.ts @@ -19,7 +19,6 @@ import i18next from "i18next"; import type { IEggOptions } from "#app/data/egg"; import { EggSourceType } from "#enums/egg-source-types"; import { EggTier } from "#enums/egg-type"; -import { PartyHealPhase } from "#app/phases/party-heal-phase"; import { ModifierTier } from "#app/modifier/modifier-tier"; import { modifierTypes } from "#app/modifier/modifier-type"; import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; @@ -182,7 +181,7 @@ export const ATrainersTestEncounter: MysteryEncounter = MysteryEncounterBuilder. async () => { const encounter = globalScene.currentBattle.mysteryEncounter!; // Full heal party - globalScene.phaseManager.unshiftPhase(new PartyHealPhase(true)); + globalScene.phaseManager.unshiftNew("PartyHealPhase", true); const eggOptions: IEggOptions = { pulled: false, diff --git a/src/data/mystery-encounters/encounters/an-offer-you-cant-refuse-encounter.ts b/src/data/mystery-encounters/encounters/an-offer-you-cant-refuse-encounter.ts index 87cd8f207c4..cdb98c56ed1 100644 --- a/src/data/mystery-encounters/encounters/an-offer-you-cant-refuse-encounter.ts +++ b/src/data/mystery-encounters/encounters/an-offer-you-cant-refuse-encounter.ts @@ -22,7 +22,6 @@ import { getPokemonSpecies } from "#app/data/pokemon-species"; import { speciesStarterCosts } from "#app/data/balance/starters"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; -import { ModifierRewardPhase } from "#app/phases/modifier-reward-phase"; import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; import i18next from "i18next"; @@ -137,7 +136,7 @@ export const AnOfferYouCantRefuseEncounter: MysteryEncounter = MysteryEncounterB }) .withOptionPhase(async () => { // Give the player a Shiny Charm - globalScene.phaseManager.unshiftPhase(new ModifierRewardPhase(modifierTypes.SHINY_CHARM)); + globalScene.phaseManager.unshiftNew("ModifierRewardPhase", modifierTypes.SHINY_CHARM); leaveEncounterWithoutBattle(true); }) .build(), diff --git a/src/data/mystery-encounters/encounters/dark-deal-encounter.ts b/src/data/mystery-encounters/encounters/dark-deal-encounter.ts index 1385e9c5a75..6474df3570e 100644 --- a/src/data/mystery-encounters/encounters/dark-deal-encounter.ts +++ b/src/data/mystery-encounters/encounters/dark-deal-encounter.ts @@ -16,7 +16,6 @@ import { } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; -import { ModifierRewardPhase } from "#app/phases/modifier-reward-phase"; import type { PokemonHeldItemModifier } from "#app/modifier/modifier"; import { PokemonFormChangeItemModifier } from "#app/modifier/modifier"; import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; @@ -165,7 +164,7 @@ export const DarkDealEncounter: MysteryEncounter = MysteryEncounterBuilder.withE .withOptionPhase(async () => { // Give the player 5 Rogue Balls const encounter = globalScene.currentBattle.mysteryEncounter!; - globalScene.phaseManager.unshiftPhase(new ModifierRewardPhase(modifierTypes.ROGUE_BALL)); + globalScene.phaseManager.unshiftNew("ModifierRewardPhase", modifierTypes.ROGUE_BALL); // Start encounter with random legendary (7-10 starter strength) that has level additive // If this is a mono-type challenge, always ensure the required type is filtered for diff --git a/src/data/mystery-encounters/encounters/delibirdy-encounter.ts b/src/data/mystery-encounters/encounters/delibirdy-encounter.ts index c321b5f9674..40893d93930 100644 --- a/src/data/mystery-encounters/encounters/delibirdy-encounter.ts +++ b/src/data/mystery-encounters/encounters/delibirdy-encounter.ts @@ -29,7 +29,6 @@ import { } from "#app/modifier/modifier"; import type { PokemonHeldItemModifierType } from "#app/modifier/modifier-type"; import { modifierTypes } from "#app/modifier/modifier-type"; -import { ModifierRewardPhase } from "#app/phases/modifier-reward-phase"; import i18next from "#app/plugins/i18n"; import type { OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler"; import { randSeedItem } from "#app/utils/common"; @@ -65,10 +64,10 @@ const doEventReward = () => { return !(existingCharm && existingCharm.getStackCount() >= existingCharm.getMaxStackCount()); }); if (candidates.length > 0) { - globalScene.phaseManager.unshiftPhase(new ModifierRewardPhase(modifierTypes[randSeedItem(candidates)])); + globalScene.phaseManager.unshiftNew("ModifierRewardPhase", modifierTypes[randSeedItem(candidates)]); } else { // At max stacks, give a Voucher instead - globalScene.phaseManager.unshiftPhase(new ModifierRewardPhase(modifierTypes.VOUCHER)); + globalScene.phaseManager.unshiftNew("ModifierRewardPhase", modifierTypes.VOUCHER); } } }; @@ -181,7 +180,7 @@ export const DelibirdyEncounter: MysteryEncounter = MysteryEncounterBuilder.with ); doEventReward(); } else { - globalScene.phaseManager.unshiftPhase(new ModifierRewardPhase(modifierTypes.AMULET_COIN)); + globalScene.phaseManager.unshiftNew("ModifierRewardPhase", modifierTypes.AMULET_COIN); doEventReward(); } @@ -266,7 +265,7 @@ export const DelibirdyEncounter: MysteryEncounter = MysteryEncounterBuilder.with ); doEventReward(); } else { - globalScene.phaseManager.unshiftPhase(new ModifierRewardPhase(modifierTypes.CANDY_JAR)); + globalScene.phaseManager.unshiftNew("ModifierRewardPhase", modifierTypes.CANDY_JAR); doEventReward(); } } else { @@ -288,7 +287,7 @@ export const DelibirdyEncounter: MysteryEncounter = MysteryEncounterBuilder.with ); doEventReward(); } else { - globalScene.phaseManager.unshiftPhase(new ModifierRewardPhase(modifierTypes.BERRY_POUCH)); + globalScene.phaseManager.unshiftNew("ModifierRewardPhase", modifierTypes.BERRY_POUCH); doEventReward(); } } @@ -372,7 +371,7 @@ export const DelibirdyEncounter: MysteryEncounter = MysteryEncounterBuilder.with ); doEventReward(); } else { - globalScene.phaseManager.unshiftPhase(new ModifierRewardPhase(modifierTypes.HEALING_CHARM)); + globalScene.phaseManager.unshiftNew("ModifierRewardPhase", modifierTypes.HEALING_CHARM); doEventReward(); } diff --git a/src/data/mystery-encounters/encounters/fun-and-games-encounter.ts b/src/data/mystery-encounters/encounters/fun-and-games-encounter.ts index 42bfe76d98e..a52641f857d 100644 --- a/src/data/mystery-encounters/encounters/fun-and-games-encounter.ts +++ b/src/data/mystery-encounters/encounters/fun-and-games-encounter.ts @@ -25,9 +25,7 @@ import { getPokemonNameWithAffix } from "#app/messages"; import { PlayerGender } from "#enums/player-gender"; import { getPokeballAtlasKey, getPokeballTintColor } from "#app/data/pokeball"; import { addPokeballOpenParticles } from "#app/field/anims"; -import { ShinySparklePhase } from "#app/phases/shiny-sparkle-phase"; import { SpeciesFormChangeActiveTrigger } from "#app/data/pokemon-forms"; -import { PostSummonPhase } from "#app/phases/post-summon-phase"; import { modifierTypes } from "#app/modifier/modifier-type"; import { Nature } from "#enums/nature"; import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; @@ -411,13 +409,13 @@ function summonPlayerPokemonAnimation(pokemon: PlayerPokemon): Promise { pokemon.resetSummonData(); globalScene.time.delayedCall(1000, () => { if (pokemon.isShiny()) { - globalScene.phaseManager.unshiftPhase(new ShinySparklePhase(pokemon.getBattlerIndex())); + globalScene.phaseManager.unshiftNew("ShinySparklePhase", pokemon.getBattlerIndex()); } pokemon.resetTurnData(); globalScene.triggerPokemonFormChange(pokemon, SpeciesFormChangeActiveTrigger, true); - globalScene.phaseManager.pushPhase(new PostSummonPhase(pokemon.getBattlerIndex())); + globalScene.phaseManager.pushNew("PostSummonPhase", pokemon.getBattlerIndex()); resolve(); }); }, diff --git a/src/data/mystery-encounters/encounters/mysterious-chest-encounter.ts b/src/data/mystery-encounters/encounters/mysterious-chest-encounter.ts index 42167d240f9..62029eb1847 100644 --- a/src/data/mystery-encounters/encounters/mysterious-chest-encounter.ts +++ b/src/data/mystery-encounters/encounters/mysterious-chest-encounter.ts @@ -17,7 +17,6 @@ import { import { getPokemonSpecies } from "#app/data/pokemon-species"; import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; import { ModifierTier } from "#app/modifier/modifier-tier"; -import { GameOverPhase } from "#app/phases/game-over-phase"; import { randSeedInt } from "#app/utils/common"; import { MoveId } from "#enums/move-id"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; @@ -190,7 +189,7 @@ export const MysteriousChestEncounter: MysteryEncounter = MysteryEncounterBuilde if (allowedPokemon.length === 0) { // If there are no longer any legal pokemon in the party, game over. globalScene.phaseManager.clearPhaseQueue(); - globalScene.phaseManager.unshiftPhase(new GameOverPhase()); + globalScene.phaseManager.unshiftNew("GameOverPhase"); } else { // Show which Pokemon was KOed, then start battle against Gimmighoul await transitionMysteryEncounterIntroVisuals(true, true, 500); diff --git a/src/data/mystery-encounters/encounters/safari-zone-encounter.ts b/src/data/mystery-encounters/encounters/safari-zone-encounter.ts index 54e15dcb102..d324e9f9b6c 100644 --- a/src/data/mystery-encounters/encounters/safari-zone-encounter.ts +++ b/src/data/mystery-encounters/encounters/safari-zone-encounter.ts @@ -29,8 +29,6 @@ import { getEncounterText, showEncounterText } from "#app/data/mystery-encounter import { getPokemonNameWithAffix } from "#app/messages"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; -import { ScanIvsPhase } from "#app/phases/scan-ivs-phase"; -import { SummonPhase } from "#app/phases/summon-phase"; import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; import { NON_LEGEND_PARADOX_POKEMON } from "#app/data/balance/special-species-groups"; @@ -325,7 +323,7 @@ async function summonSafariPokemon() { encounter.misc.pokemon = pokemon; encounter.misc.safariPokemonRemaining -= 1; - globalScene.phaseManager.unshiftPhase(new SummonPhase(0, false)); + globalScene.phaseManager.unshiftNew("SummonPhase", 0, false); encounter.setDialogueToken("pokemonName", getPokemonNameWithAffix(pokemon)); @@ -336,7 +334,7 @@ async function summonSafariPokemon() { const ivScannerModifier = globalScene.findModifier(m => m instanceof IvScannerModifier); if (ivScannerModifier) { - globalScene.phaseManager.pushPhase(new ScanIvsPhase(pokemon.getBattlerIndex())); + globalScene.phaseManager.pushNew("ScanIvsPhase", pokemon.getBattlerIndex()); } } diff --git a/src/data/mystery-encounters/encounters/slumbering-snorlax-encounter.ts b/src/data/mystery-encounters/encounters/slumbering-snorlax-encounter.ts index a0898f7cfec..bb1529e3695 100644 --- a/src/data/mystery-encounters/encounters/slumbering-snorlax-encounter.ts +++ b/src/data/mystery-encounters/encounters/slumbering-snorlax-encounter.ts @@ -26,7 +26,6 @@ import { AiType, PokemonMove } from "#app/field/pokemon"; import { getPokemonSpecies } from "#app/data/pokemon-species"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; -import { PartyHealPhase } from "#app/phases/party-heal-phase"; import { BerryType } from "#enums/berry-type"; import { Stat } from "#enums/stat"; import { CustomPokemonData } from "#app/data/custom-pokemon-data"; @@ -155,7 +154,7 @@ export const SlumberingSnorlaxEncounter: MysteryEncounter = MysteryEncounterBuil async () => { // Fall asleep waiting for Snorlax // Full heal party - globalScene.phaseManager.unshiftPhase(new PartyHealPhase(true)); + globalScene.phaseManager.unshiftNew("PartyHealPhase", true); queueEncounterMessage(`${namespace}:option.2.rest_result`); leaveEncounterWithoutBattle(); }, diff --git a/src/data/mystery-encounters/encounters/the-winstrate-challenge-encounter.ts b/src/data/mystery-encounters/encounters/the-winstrate-challenge-encounter.ts index 05e036e9189..4b17260098f 100644 --- a/src/data/mystery-encounters/encounters/the-winstrate-challenge-encounter.ts +++ b/src/data/mystery-encounters/encounters/the-winstrate-challenge-encounter.ts @@ -27,9 +27,6 @@ import { SpeciesFormChangeAbilityTrigger } from "#app/data/pokemon-forms"; import { applyPostBattleInitAbAttrs, PostBattleInitAbAttr } from "#app/data/abilities/ability"; import { showEncounterDialogue, showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; import { MysteryEncounterMode } from "#enums/mystery-encounter-mode"; -import { PartyHealPhase } from "#app/phases/party-heal-phase"; -import { ShowTrainerPhase } from "#app/phases/show-trainer-phase"; -import { ReturnPhase } from "#app/phases/return-phase"; import i18next from "i18next"; import { ModifierTier } from "#app/modifier/modifier-tier"; import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; @@ -143,7 +140,7 @@ export const TheWinstrateChallengeEncounter: MysteryEncounter = MysteryEncounter }, async () => { // Refuse the challenge, they full heal the party and give the player a Rarer Candy - globalScene.phaseManager.unshiftPhase(new PartyHealPhase(true)); + globalScene.phaseManager.unshiftNew("PartyHealPhase", true); setEncounterRewards({ guaranteedModifierTypeFuncs: [modifierTypes.RARER_CANDY], fillRemaining: false, @@ -209,7 +206,7 @@ function endTrainerBattleAndShowDialogue(): Promise { for (const pokemon of playerField) { pokemon.lapseTag(BattlerTagType.COMMANDED); } - playerField.forEach((_, p) => globalScene.phaseManager.unshiftPhase(new ReturnPhase(p))); + playerField.forEach((_, p) => globalScene.phaseManager.unshiftNew("ReturnPhase", p)); for (const pokemon of globalScene.getPlayerParty()) { // Only trigger form change when Eiscue is in Noice form @@ -227,7 +224,7 @@ function endTrainerBattleAndShowDialogue(): Promise { applyPostBattleInitAbAttrs(PostBattleInitAbAttr, pokemon); } - globalScene.phaseManager.unshiftPhase(new ShowTrainerPhase()); + globalScene.phaseManager.unshiftNew("ShowTrainerPhase"); // Hide the trainer and init next battle const trainer = globalScene.currentBattle.trainer; // Unassign previous trainer from battle so it isn't destroyed before animation completes diff --git a/src/data/mystery-encounters/utils/encounter-phase-utils.ts b/src/data/mystery-encounters/utils/encounter-phase-utils.ts index 03261d3fbce..b86cbaa18c9 100644 --- a/src/data/mystery-encounters/utils/encounter-phase-utils.ts +++ b/src/data/mystery-encounters/utils/encounter-phase-utils.ts @@ -20,7 +20,6 @@ import { modifierTypes, regenerateModifierPoolThresholds, } from "#app/modifier/modifier-type"; -import { MysteryEncounterBattlePhase } from "#app/phases/mystery-encounter-phases"; import type PokemonData from "#app/system/pokemon-data"; import type { OptionSelectConfig, OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler"; import type { PartyOption, PokemonSelectFilter } from "#app/ui/party-ui-handler"; @@ -46,9 +45,6 @@ import type { IEggOptions } from "#app/data/egg"; import { Egg } from "#app/data/egg"; import type { CustomPokemonData } from "#app/data/custom-pokemon-data"; import type HeldModifierConfig from "#app/@types/held-modifier-config"; -import { GameOverPhase } from "#app/phases/game-over-phase"; -import { SelectModifierPhase } from "#app/phases/select-modifier-phase"; -import { PartyExpPhase } from "#app/phases/party-exp-phase"; import type { Variant } from "#app/sprites/variant"; import { StatusEffect } from "#enums/status-effect"; import { globalScene } from "#app/global-scene"; @@ -419,7 +415,7 @@ export async function initBattleWithEnemyConfig(partyConfig: EnemyPartyConfig): console.log("Moveset:", moveset); }); - globalScene.phaseManager.pushPhase(new MysteryEncounterBattlePhase(partyConfig.disableSwitch)); + globalScene.phaseManager.pushNew("MysteryEncounterBattlePhase", partyConfig.disableSwitch); await Promise.all(loadEnemyAssets); battle.enemyParty.forEach((enemyPokemon_2, e_1) => { @@ -758,7 +754,7 @@ export function setEncounterRewards( } if (customShopRewards) { - globalScene.phaseManager.unshiftPhase(new SelectModifierPhase(0, undefined, customShopRewards)); + globalScene.phaseManager.unshiftNew("SelectModifierPhase", 0, undefined, customShopRewards); } else { globalScene.phaseManager.tryRemovePhase(p => p.is("MysteryEncounterRewardsPhase")); } @@ -798,7 +794,7 @@ export function setEncounterExp(participantId: number | number[], baseExpValue: const participantIds = Array.isArray(participantId) ? participantId : [participantId]; globalScene.currentBattle.mysteryEncounter!.doEncounterExp = () => { - globalScene.phaseManager.unshiftPhase(new PartyExpPhase(baseExpValue, useWaveIndex, new Set(participantIds))); + globalScene.phaseManager.unshiftNew("PartyExpPhase", baseExpValue, useWaveIndex, new Set(participantIds)); return true; }; @@ -820,7 +816,7 @@ export class OptionSelectSettings { * @param optionSelectSettings */ export function initSubsequentOptionSelect(optionSelectSettings: OptionSelectSettings) { - globalScene.phaseManager.createAndPush("MysteryEncounterPhase", optionSelectSettings); + globalScene.phaseManager.pushNew("MysteryEncounterPhase", optionSelectSettings); } /** @@ -849,7 +845,7 @@ export function handleMysteryEncounterVictory(addHealPhase = false, doNotContinu if (allowedPkm.length === 0) { globalScene.phaseManager.clearPhaseQueue(); - globalScene.phaseManager.unshiftPhase(new GameOverPhase()); + globalScene.phaseManager.unshiftNew("GameOverPhase"); return; } @@ -860,8 +856,8 @@ export function handleMysteryEncounterVictory(addHealPhase = false, doNotContinu return; } if (encounter.encounterMode === MysteryEncounterMode.NO_BATTLE) { - globalScene.phaseManager.createAndPush("MysteryEncounterRewardsPhase", addHealPhase); - globalScene.phaseManager.createAndPush("EggLapsePhase"); + globalScene.phaseManager.pushNew("MysteryEncounterRewardsPhase", addHealPhase); + globalScene.phaseManager.pushNew("EggLapsePhase"); } else if ( !globalScene .getEnemyParty() @@ -869,15 +865,15 @@ export function handleMysteryEncounterVictory(addHealPhase = false, doNotContinu encounter.encounterMode !== MysteryEncounterMode.TRAINER_BATTLE ? p.isOnField() : !p?.isFainted(true), ) ) { - globalScene.phaseManager.createAndPush("BattleEndPhase", true); + globalScene.phaseManager.pushNew("BattleEndPhase", true); if (encounter.encounterMode === MysteryEncounterMode.TRAINER_BATTLE) { - globalScene.phaseManager.createAndPush("TrainerVictoryPhase"); + globalScene.phaseManager.pushNew("TrainerVictoryPhase"); } if (globalScene.gameMode.isEndless || !globalScene.gameMode.isWaveFinal(globalScene.currentBattle.waveIndex)) { - globalScene.phaseManager.createAndPush("MysteryEncounterRewardsPhase", addHealPhase); + globalScene.phaseManager.pushNew("MysteryEncounterRewardsPhase", addHealPhase); if (!encounter.doContinueEncounter) { // Only lapse eggs once for multi-battle encounters - globalScene.phaseManager.createAndPush("EggLapsePhase"); + globalScene.phaseManager.pushNew("EggLapsePhase"); } } } @@ -892,7 +888,7 @@ export function handleMysteryEncounterBattleFailed(addHealPhase = false, doNotCo if (allowedPkm.length === 0) { globalScene.phaseManager.clearPhaseQueue(); - globalScene.phaseManager.unshiftPhase(new GameOverPhase()); + globalScene.phaseManager.unshiftNew("GameOverPhase"); return; } @@ -903,14 +899,14 @@ export function handleMysteryEncounterBattleFailed(addHealPhase = false, doNotCo return; } if (encounter.encounterMode !== MysteryEncounterMode.NO_BATTLE) { - globalScene.phaseManager.createAndPush("BattleEndPhase", false); + globalScene.phaseManager.pushNew("BattleEndPhase", false); } - globalScene.phaseManager.createAndPush("MysteryEncounterRewardsPhase", addHealPhase); + globalScene.phaseManager.pushNew("MysteryEncounterRewardsPhase", addHealPhase); if (!encounter.doContinueEncounter) { // Only lapse eggs once for multi-battle encounters - globalScene.phaseManager.createAndPush("EggLapsePhase"); + globalScene.phaseManager.pushNew("EggLapsePhase"); } } @@ -995,7 +991,7 @@ export function handleMysteryEncounterBattleStartEffects() { } else { source = globalScene.getEnemyField()[0]; } - globalScene.phaseManager.createAndPush( + globalScene.phaseManager.pushNew( "MovePhase", // @ts-expect-error: source is guaranteed to be defined source, @@ -1007,7 +1003,7 @@ export function handleMysteryEncounterBattleStartEffects() { }); // Pseudo turn end phase to reset flinch states, Endure, etc. - globalScene.phaseManager.createAndPush("MysteryEncounterBattleStartCleanupPhase"); + globalScene.phaseManager.pushNew("MysteryEncounterBattleStartCleanupPhase"); encounter.startOfBattleEffectsComplete = true; } diff --git a/src/data/mystery-encounters/utils/encounter-pokemon-utils.ts b/src/data/mystery-encounters/utils/encounter-pokemon-utils.ts index 757d8173820..e8a3db46cff 100644 --- a/src/data/mystery-encounters/utils/encounter-pokemon-utils.ts +++ b/src/data/mystery-encounters/utils/encounter-pokemon-utils.ts @@ -32,7 +32,6 @@ import type { PokemonHeldItemModifierType } from "#app/modifier/modifier-type"; import { modifierTypes } from "#app/modifier/modifier-type"; import { Gender } from "#app/data/gender"; import type { PermanentStat } from "#enums/stat"; -import { VictoryPhase } from "#app/phases/victory-phase"; import { SummaryUiMode } from "#app/ui/summary-ui-handler"; import { CustomPokemonData } from "#app/data/custom-pokemon-data"; import type { AbilityId } from "#enums/ability-id"; @@ -675,7 +674,7 @@ export async function catchPokemon( if (!globalScene.getEnemyParty().some(p => p.id === pokemon.id)) { globalScene.getEnemyParty().push(pokemon); } - globalScene.phaseManager.unshiftPhase(new VictoryPhase(pokemon.id, true)); + globalScene.phaseManager.unshiftNew("VictoryPhase", pokemon.id, true); globalScene.pokemonInfoContainer.hide(); if (pokeball) { removePb(pokeball); diff --git a/src/field/arena.ts b/src/field/arena.ts index 1c54382c89b..c5e94c3f2ef 100644 --- a/src/field/arena.ts +++ b/src/field/arena.ts @@ -297,7 +297,7 @@ export class Arena { */ trySetWeatherOverride(weather: WeatherType): boolean { this.weather = new Weather(weather, 0); - globalScene.phaseManager.unshiftPhase(new CommonAnimPhase(undefined, undefined, CommonAnim.SUNNY + (weather - 1))); + globalScene.phaseManager.unshiftNew("CommonAnimPhase", undefined, undefined, CommonAnim.SUNNY + (weather - 1)); globalScene.phaseManager.queueMessage(getWeatherStartMessage(weather)!); // TODO: is this bang correct? return true; } diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index 0a65ddcd3c5..f51f3858e17 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -231,7 +231,6 @@ import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { getPokemonNameWithAffix } from "#app/messages"; import { DamageAnimPhase } from "#app/phases/damage-anim-phase"; -import { FaintPhase } from "#app/phases/faint-phase"; import { LearnMovePhase } from "#app/phases/learn-move-phase"; import { ObtainStatusEffectPhase } from "#app/phases/obtain-status-effect-phase"; import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase"; @@ -255,7 +254,6 @@ import { doShinySparkleAnim } from "#app/field/anims"; import { MoveFlags } from "#enums/MoveFlags"; import { timedEventManager } from "#app/global-event-manager"; import { loadMoveAnimations } from "#app/sprites/pokemon-asset-loader"; -import { ResetStatusPhase } from "#app/phases/reset-status-phase"; export enum LearnMoveSituation { MISC, @@ -4012,7 +4010,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * Once the MoveEffectPhase is over (and calls it's .end() function, shiftPhase() will reset the PhaseQueueSplice via clearPhaseQueueSplice() ) */ globalScene.phaseManager.setPhaseQueueSplice(); - globalScene.phaseManager.unshiftPhase(new FaintPhase(this.getBattlerIndex(), preventEndure)); + globalScene.phaseManager.unshiftNew("FaintPhase", this.getBattlerIndex(), preventEndure); this.destroySubstitute(); this.lapseTag(BattlerTagType.COMMANDED); } @@ -4827,7 +4825,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } if (asPhase) { - globalScene.phaseManager.unshiftPhase(new ResetStatusPhase(this, confusion, reloadAssets)); + globalScene.phaseManager.unshiftNew("ResetStatusPhase", this, confusion, reloadAssets); } else { this.clearStatus(confusion, reloadAssets); } diff --git a/src/phase-manager.ts b/src/phase-manager.ts index bdb9d41a72c..edf830c38f5 100644 --- a/src/phase-manager.ts +++ b/src/phase-manager.ts @@ -518,10 +518,7 @@ export class PhaseManager { * @param args - The arguments to pass to the phase constructor. * @returns The requested phase instance */ - public createPhase( - phase: T, - ...args: ConstructorParameters - ): PhaseMap[T] { + public create(phase: T, ...args: ConstructorParameters): PhaseMap[T] { const PhaseClass = PHASES[phase]; if (!PhaseClass) { @@ -533,53 +530,50 @@ export class PhaseManager { } /** - * Create a new phase and immediately push it to the phase queue. Equivalent to calling {@linkcode createPhase} followed by {@linkcode pushPhase}. + * Create a new phase and immediately push it to the phase queue. Equivalent to calling {@linkcode create} followed by {@linkcode pushPhase}. * @param phase - The name of the phase to create * @param args - The arguments to pass to the phase constructor */ - public createAndPush(phase: T, ...args: ConstructorParameters): void { - this.pushPhase(this.createPhase(phase, ...args)); + public pushNew(phase: T, ...args: ConstructorParameters): void { + this.pushPhase(this.create(phase, ...args)); } /** - * Create a new phase and immediately unshift it to the phase queue. Equivalent to calling {@linkcode createPhase} followed by {@linkcode unshiftPhase}. + * Create a new phase and immediately unshift it to the phase queue. Equivalent to calling {@linkcode create} followed by {@linkcode unshiftPhase}. * @param phase - The name of the phase to create * @param args - The arguments to pass to the phase constructor */ - public createAndUnshift( - phase: T, - ...args: ConstructorParameters - ): void { - this.unshiftPhase(this.createPhase(phase, ...args)); + public unshiftNew(phase: T, ...args: ConstructorParameters): void { + this.unshiftPhase(this.create(phase, ...args)); } /** - * Create a new phase and immediately prepend it to the phase queue. Equivalent to calling {@linkcode createPhase} followed by {@linkcode prependToPhase}. + * Create a new phase and immediately prepend it to the phase queue. Equivalent to calling {@linkcode create} followed by {@linkcode prependToPhase}. * @param targetPhase - The phase to search for in phaseQueue * @param phase - The name of the phase to create * @param args - The arguments to pass to the phase constructor * @returns `true` if a `targetPhase` was found to prepend to */ - public createAndPrependToPhase( + public prependNewToPhase( targetPhase: PhaseString, phase: T, ...args: ConstructorParameters ): boolean { - return this.prependToPhase(this.createPhase(phase, ...args), targetPhase); + return this.prependToPhase(this.create(phase, ...args), targetPhase); } /** - * Create a new phase and immediately append it to the phase queue. Equivalent to calling {@linkcode createPhase} followed by {@linkcode appendToPhase}. + * Create a new phase and immediately append it to the phase queue. Equivalent to calling {@linkcode create} followed by {@linkcode appendToPhase}. * @param targetPhase - The phase to search for in phaseQueue * @param phase - The name of the phase to create * @param args - The arguments to pass to the phase constructor * @returns `true` if a `targetPhase` was found to append to */ - public createAndAppendToPhase( + public appendNewToPhase( targetPhase: PhaseString, phase: T, ...args: ConstructorParameters ): boolean { - return this.appendToPhase(this.createPhase(phase, ...args), targetPhase); + return this.appendToPhase(this.create(phase, ...args), targetPhase); } } diff --git a/src/phases/attempt-capture-phase.ts b/src/phases/attempt-capture-phase.ts index 09eeb6e0a19..4f3f54a7e5b 100644 --- a/src/phases/attempt-capture-phase.ts +++ b/src/phases/attempt-capture-phase.ts @@ -14,7 +14,6 @@ import type { EnemyPokemon } from "#app/field/pokemon"; import { getPokemonNameWithAffix } from "#app/messages"; import { PokemonHeldItemModifier } from "#app/modifier/modifier"; import { PokemonPhase } from "#app/phases/pokemon-phase"; -import { VictoryPhase } from "#app/phases/victory-phase"; import { achvs } from "#app/system/achv"; import type { PartyOption } from "#app/ui/party-ui-handler"; import { PartyUiMode } from "#app/ui/party-ui-handler"; @@ -257,7 +256,7 @@ export class AttemptCapturePhase extends PokemonPhase { null, () => { const end = () => { - globalScene.phaseManager.unshiftPhase(new VictoryPhase(this.battlerIndex)); + globalScene.phaseManager.unshiftNew("VictoryPhase", this.battlerIndex); globalScene.pokemonInfoContainer.hide(); this.removePb(); this.end(); diff --git a/src/phases/attempt-run-phase.ts b/src/phases/attempt-run-phase.ts index 12215acd34a..525be8c21ab 100644 --- a/src/phases/attempt-run-phase.ts +++ b/src/phases/attempt-run-phase.ts @@ -57,13 +57,13 @@ export class AttemptRunPhase extends PokemonPhase { enemyPokemon.trySetStatus(StatusEffect.FAINT); }); - globalScene.phaseManager.createAndPush("BattleEndPhase", false); + globalScene.phaseManager.pushNew("BattleEndPhase", false); if (globalScene.gameMode.hasRandomBiomes || globalScene.isNewBiome()) { - globalScene.phaseManager.createAndPush("SelectBiomePhase"); + globalScene.phaseManager.pushNew("SelectBiomePhase"); } - globalScene.phaseManager.createAndPush("NewBattlePhase"); + globalScene.phaseManager.pushNew("NewBattlePhase"); } else { playerPokemon.turnData.failedRunAway = true; globalScene.phaseManager.queueMessage(i18next.t("battle:runAwayCannotEscape"), null, true, 500); diff --git a/src/phases/battle-end-phase.ts b/src/phases/battle-end-phase.ts index 4e3543be03a..e169de58cb3 100644 --- a/src/phases/battle-end-phase.ts +++ b/src/phases/battle-end-phase.ts @@ -2,7 +2,6 @@ import { globalScene } from "#app/global-scene"; import { applyPostBattleAbAttrs, PostBattleAbAttr } from "#app/data/abilities/ability"; import { LapsingPersistentModifier, LapsingPokemonHeldItemModifier } from "#app/modifier/modifier"; import { BattlePhase } from "./battle-phase"; -import { GameOverPhase } from "./game-over-phase"; export class BattleEndPhase extends BattlePhase { public readonly phaseName = "BattleEndPhase"; @@ -56,7 +55,7 @@ export class BattleEndPhase extends BattlePhase { // Endless graceful end if (globalScene.gameMode.isEndless && globalScene.currentBattle.waveIndex >= 5850) { globalScene.phaseManager.clearPhaseQueue(); - globalScene.phaseManager.unshiftPhase(new GameOverPhase(true)); + globalScene.phaseManager.unshiftNew("GameOverPhase", true); } for (const pokemon of globalScene.getField()) { diff --git a/src/phases/check-status-effect-phase.ts b/src/phases/check-status-effect-phase.ts index ec15676ebcc..e4793fae076 100644 --- a/src/phases/check-status-effect-phase.ts +++ b/src/phases/check-status-effect-phase.ts @@ -1,4 +1,3 @@ -import { PostTurnStatusEffectPhase } from "#app/phases/post-turn-status-effect-phase"; import { Phase } from "#app/phase"; import type { BattlerIndex } from "#app/battle"; import { globalScene } from "#app/global-scene"; @@ -15,7 +14,7 @@ export class CheckStatusEffectPhase extends Phase { const field = globalScene.getField(); for (const o of this.order) { if (field[o].status?.isPostTurn()) { - globalScene.phaseManager.unshiftPhase(new PostTurnStatusEffectPhase(o)); + globalScene.phaseManager.unshiftNew("PostTurnStatusEffectPhase", o); } } this.end(); diff --git a/src/phases/check-switch-phase.ts b/src/phases/check-switch-phase.ts index 2299bf0c0a5..97f4092096f 100644 --- a/src/phases/check-switch-phase.ts +++ b/src/phases/check-switch-phase.ts @@ -5,8 +5,6 @@ import { getPokemonNameWithAffix } from "#app/messages"; import { UiMode } from "#enums/ui-mode"; import i18next from "i18next"; import { BattlePhase } from "./battle-phase"; -import { SummonMissingPhase } from "./summon-missing-phase"; -import { SwitchPhase } from "./switch-phase"; import { SwitchType } from "#enums/switch-type"; export class CheckSwitchPhase extends BattlePhase { @@ -35,7 +33,7 @@ export class CheckSwitchPhase extends BattlePhase { // ...if the checked Pokemon is somehow not on the field if (globalScene.field.getAll().indexOf(pokemon) === -1) { - globalScene.phaseManager.unshiftPhase(new SummonMissingPhase(this.fieldIndex)); + globalScene.phaseManager.unshiftNew("SummonMissingPhase", this.fieldIndex); return super.end(); } @@ -68,9 +66,7 @@ export class CheckSwitchPhase extends BattlePhase { UiMode.CONFIRM, () => { globalScene.ui.setMode(UiMode.MESSAGE); - globalScene.phaseManager.unshiftPhase( - new SwitchPhase(SwitchType.INITIAL_SWITCH, this.fieldIndex, false, true), - ); + globalScene.phaseManager.unshiftNew("SwitchPhase", SwitchType.INITIAL_SWITCH, this.fieldIndex, false, true); this.end(); }, () => { diff --git a/src/phases/command-phase.ts b/src/phases/command-phase.ts index 7a2e427ecce..afd9cb3bf93 100644 --- a/src/phases/command-phase.ts +++ b/src/phases/command-phase.ts @@ -18,7 +18,6 @@ import { Command } from "#app/ui/command-ui-handler"; import { UiMode } from "#enums/ui-mode"; import i18next from "i18next"; import { FieldPhase } from "./field-phase"; -import { SelectTargetPhase } from "./select-target-phase"; import { MysteryEncounterMode } from "#enums/mystery-encounter-mode"; import { isNullOrUndefined } from "#app/utils/common"; import { ArenaTagSide } from "#app/data/arena-tag"; @@ -192,7 +191,7 @@ export class CommandPhase extends FieldPhase { } console.log(moveTargets, getPokemonNameWithAffix(playerPokemon)); if (moveTargets.targets.length > 1 && moveTargets.multiple) { - globalScene.phaseManager.unshiftPhase(new SelectTargetPhase(this.fieldIndex)); + globalScene.phaseManager.unshiftNew("SelectTargetPhase", this.fieldIndex); } if (turnCommand.move && (moveTargets.targets.length <= 1 || moveTargets.multiple)) { turnCommand.move.targets = moveTargets.targets; @@ -203,7 +202,7 @@ export class CommandPhase extends FieldPhase { ) { turnCommand.move.targets = playerPokemon.getMoveQueue()[0].targets; } else { - globalScene.phaseManager.unshiftPhase(new SelectTargetPhase(this.fieldIndex)); + globalScene.phaseManager.unshiftNew("SelectTargetPhase", this.fieldIndex); } globalScene.currentBattle.preTurnCommands[this.fieldIndex] = preTurnCommand; globalScene.currentBattle.turnCommands[this.fieldIndex] = turnCommand; @@ -457,8 +456,8 @@ export class CommandPhase extends FieldPhase { cancel() { if (this.fieldIndex) { - globalScene.phaseManager.unshiftPhase(new CommandPhase(0)); - globalScene.phaseManager.unshiftPhase(new CommandPhase(1)); + globalScene.phaseManager.unshiftNew("CommandPhase", 0); + globalScene.phaseManager.unshiftNew("CommandPhase", 1); this.end(); } } diff --git a/src/phases/egg-lapse-phase.ts b/src/phases/egg-lapse-phase.ts index a19bf8f50e5..206bef1a33c 100644 --- a/src/phases/egg-lapse-phase.ts +++ b/src/phases/egg-lapse-phase.ts @@ -4,11 +4,9 @@ import { EGG_SEED } from "#app/data/egg"; import { Phase } from "#app/phase"; import i18next from "i18next"; import Overrides from "#app/overrides"; -import { EggHatchPhase } from "./egg-hatch-phase"; import { UiMode } from "#enums/ui-mode"; import { achvs } from "#app/system/achv"; import type { PlayerPokemon } from "#app/field/pokemon"; -import { EggSummaryPhase } from "./egg-summary-phase"; import { EggHatchData } from "#app/data/egg-hatch-data"; /** @@ -83,7 +81,7 @@ export class EggLapsePhase extends Phase { hatchEggsRegular(eggsToHatch: Egg[]) { let eggsToHatchCount: number = eggsToHatch.length; for (const egg of eggsToHatch) { - globalScene.phaseManager.unshiftPhase(new EggHatchPhase(this, egg, eggsToHatchCount)); + globalScene.phaseManager.unshiftNew("EggHatchPhase", this, egg, eggsToHatchCount); eggsToHatchCount--; } } @@ -99,7 +97,7 @@ export class EggLapsePhase extends Phase { } showSummary() { - globalScene.phaseManager.unshiftPhase(new EggSummaryPhase(this.eggHatchData)); + globalScene.phaseManager.unshiftNew("EggSummaryPhase", this.eggHatchData); this.end(); } diff --git a/src/phases/encounter-phase.ts b/src/phases/encounter-phase.ts index 9ba125551b7..597df34c83b 100644 --- a/src/phases/encounter-phase.ts +++ b/src/phases/encounter-phase.ts @@ -23,13 +23,7 @@ import { BoostBugSpawnModifier, IvScannerModifier, TurnHeldItemTransferModifier import { ModifierPoolType, regenerateModifierPoolThresholds } from "#app/modifier/modifier-type"; import Overrides from "#app/overrides"; import { BattlePhase } from "#app/phases/battle-phase"; -import { CheckSwitchPhase } from "#app/phases/check-switch-phase"; -import { GameOverPhase } from "#app/phases/game-over-phase"; -import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases"; import { PostSummonPhase } from "#app/phases/post-summon-phase"; -import { ScanIvsPhase } from "#app/phases/scan-ivs-phase"; -import { ShinySparklePhase } from "#app/phases/shiny-sparkle-phase"; -import { SummonPhase } from "#app/phases/summon-phase"; import { achvs } from "#app/system/achv"; import { handleTutorial, Tutorial } from "#app/tutorial"; import { UiMode } from "#enums/ui-mode"; @@ -66,7 +60,7 @@ export class EncounterPhase extends BattlePhase { // Failsafe if players somehow skip floor 200 in classic mode if (globalScene.gameMode.isClassic && globalScene.currentBattle.waveIndex > 200) { - globalScene.phaseManager.unshiftPhase(new GameOverPhase()); + globalScene.phaseManager.unshiftNew("GameOverPhase"); } const loadEnemyAssets: Promise[] = []; @@ -436,9 +430,9 @@ export class EncounterPhase extends BattlePhase { const doTrainerSummon = () => { this.hideEnemyTrainer(); const availablePartyMembers = globalScene.getEnemyParty().filter(p => !p.isFainted()).length; - globalScene.phaseManager.unshiftPhase(new SummonPhase(0, false)); + globalScene.phaseManager.unshiftNew("SummonPhase", 0, false); if (globalScene.currentBattle.double && availablePartyMembers > 1) { - globalScene.phaseManager.unshiftPhase(new SummonPhase(1, false)); + globalScene.phaseManager.unshiftNew("SummonPhase", 1, false); } this.end(); }; @@ -494,7 +488,7 @@ export class EncounterPhase extends BattlePhase { globalScene.ui.clearText(); globalScene.ui.getMessageHandler().hideNameText(); - globalScene.phaseManager.unshiftPhase(new MysteryEncounterPhase()); + globalScene.phaseManager.unshiftNew("MysteryEncounterPhase"); this.end(); }; @@ -552,7 +546,7 @@ export class EncounterPhase extends BattlePhase { enemyField.forEach((enemyPokemon, e) => { if (enemyPokemon.isShiny(true)) { - globalScene.phaseManager.unshiftPhase(new ShinySparklePhase(BattlerIndex.ENEMY + e)); + globalScene.phaseManager.unshiftNew("ShinySparklePhase", BattlerIndex.ENEMY + e); } /** This sets Eternatus' held item to be untransferrable, preventing it from being stolen */ if ( @@ -592,7 +586,7 @@ export class EncounterPhase extends BattlePhase { ); const ivScannerModifier = globalScene.findModifier(m => m instanceof IvScannerModifier); if (ivScannerModifier) { - enemyField.map(p => globalScene.phaseManager.pushPhase(new ScanIvsPhase(p.getBattlerIndex()))); + enemyField.map(p => globalScene.phaseManager.pushNew("ScanIvsPhase", p.getBattlerIndex())); } } @@ -600,21 +594,21 @@ export class EncounterPhase extends BattlePhase { const availablePartyMembers = globalScene.getPokemonAllowedInBattle(); if (!availablePartyMembers[0].isOnField()) { - globalScene.phaseManager.createAndPush("SummonPhase", 0); + globalScene.phaseManager.pushNew("SummonPhase", 0); } if (globalScene.currentBattle.double) { if (availablePartyMembers.length > 1) { - globalScene.phaseManager.createAndPush("ToggleDoublePositionPhase", true); + globalScene.phaseManager.pushNew("ToggleDoublePositionPhase", true); if (!availablePartyMembers[1].isOnField()) { - globalScene.phaseManager.createAndPush("SummonPhase", 1); + globalScene.phaseManager.pushNew("SummonPhase", 1); } } } else { if (availablePartyMembers.length > 1 && availablePartyMembers[1].isOnField()) { - globalScene.phaseManager.createAndPush("ReturnPhase", 1); + globalScene.phaseManager.pushNew("ReturnPhase", 1); } - globalScene.phaseManager.createAndPush("ToggleDoublePositionPhase", false); + globalScene.phaseManager.pushNew("ToggleDoublePositionPhase", false); } if ( @@ -623,9 +617,9 @@ export class EncounterPhase extends BattlePhase { ) { const minPartySize = globalScene.currentBattle.double ? 2 : 1; if (availablePartyMembers.length > minPartySize) { - globalScene.phaseManager.pushPhase(new CheckSwitchPhase(0, globalScene.currentBattle.double)); + globalScene.phaseManager.pushNew("CheckSwitchPhase", 0, globalScene.currentBattle.double); if (globalScene.currentBattle.double) { - globalScene.phaseManager.pushPhase(new CheckSwitchPhase(1, globalScene.currentBattle.double)); + globalScene.phaseManager.pushNew("CheckSwitchPhase", 1, globalScene.currentBattle.double); } } } diff --git a/src/phases/evolution-phase.ts b/src/phases/evolution-phase.ts index 937a7d31542..eaedb6d32b0 100644 --- a/src/phases/evolution-phase.ts +++ b/src/phases/evolution-phase.ts @@ -14,8 +14,6 @@ import { LearnMoveSituation } from "#app/field/pokemon"; import { getTypeRgb } from "#app/data/type"; import i18next from "i18next"; import { getPokemonNameWithAffix } from "#app/messages"; -import { LearnMovePhase } from "#app/phases/learn-move-phase"; -import { EndEvolutionPhase } from "#app/phases/end-evolution-phase"; import { EVOLVE_MOVE } from "#app/data/balance/pokemon-level-moves"; export class EvolutionPhase extends Phase { @@ -262,7 +260,7 @@ export class EvolutionPhase extends Phase { SoundFade.fadeOut(globalScene, this.evolutionBgm, 100); - globalScene.phaseManager.unshiftPhase(new EndEvolutionPhase()); + globalScene.phaseManager.unshiftNew("EndEvolutionPhase"); globalScene.ui.showText( i18next.t("menu:stoppedEvolving", { @@ -355,11 +353,13 @@ export class EvolutionPhase extends Phase { .getLevelMoves(this.lastLevel + 1, true, false, false, learnSituation) .filter(lm => lm[0] === EVOLVE_MOVE); for (const lm of levelMoves) { - globalScene.phaseManager.unshiftPhase( - new LearnMovePhase(globalScene.getPlayerParty().indexOf(this.pokemon), lm[1]), + globalScene.phaseManager.unshiftNew( + "LearnMovePhase", + globalScene.getPlayerParty().indexOf(this.pokemon), + lm[1], ); } - globalScene.phaseManager.unshiftPhase(new EndEvolutionPhase()); + globalScene.phaseManager.unshiftNew("EndEvolutionPhase"); globalScene.playSound("se/shine"); this.doSpray(); diff --git a/src/phases/exp-phase.ts b/src/phases/exp-phase.ts index 8084ae78221..74768e86186 100644 --- a/src/phases/exp-phase.ts +++ b/src/phases/exp-phase.ts @@ -4,7 +4,6 @@ import { ExpBoosterModifier } from "#app/modifier/modifier"; import i18next from "i18next"; import { NumberHolder } from "#app/utils/common"; import { PlayerPartyMemberPokemonPhase } from "./player-party-member-pokemon-phase"; -import { LevelUpPhase } from "./level-up-phase"; export class ExpPhase extends PlayerPartyMemberPokemonPhase { public readonly phaseName = "ExpPhase"; @@ -34,7 +33,7 @@ export class ExpPhase extends PlayerPartyMemberPokemonPhase { pokemon.addExp(exp.value); const newLevel = pokemon.level; if (newLevel > lastLevel) { - globalScene.phaseManager.unshiftPhase(new LevelUpPhase(this.partyMemberIndex, lastLevel, newLevel)); + globalScene.phaseManager.unshiftNew("LevelUpPhase", this.partyMemberIndex, lastLevel, newLevel); } pokemon.updateInfo().then(() => this.end()); }, diff --git a/src/phases/faint-phase.ts b/src/phases/faint-phase.ts index 41e21162dbf..38376af4356 100644 --- a/src/phases/faint-phase.ts +++ b/src/phases/faint-phase.ts @@ -24,13 +24,7 @@ import { getPokemonNameWithAffix } from "#app/messages"; import { PokemonInstantReviveModifier } from "#app/modifier/modifier"; import { SwitchType } from "#enums/switch-type"; import i18next from "i18next"; -import { DamageAnimPhase } from "./damage-anim-phase"; -import { GameOverPhase } from "./game-over-phase"; import { PokemonPhase } from "./pokemon-phase"; -import { SwitchPhase } from "./switch-phase"; -import { SwitchSummonPhase } from "./switch-summon-phase"; -import { ToggleDoublePositionPhase } from "./toggle-double-position-phase"; -import { VictoryPhase } from "./victory-phase"; import { isNullOrUndefined } from "#app/utils/common"; import { FRIENDSHIP_LOSS_FROM_FAINT } from "#app/data/balance/starters"; import { BattlerTagType } from "#enums/battler-tag-type"; @@ -166,7 +160,7 @@ export class FaintPhase extends PokemonPhase { const legalPlayerPartyPokemon = legalPlayerPokemon.filter(p => !p.isActive(true)); if (!legalPlayerPokemon.length) { /** If the player doesn't have any legal Pokemon, end the game */ - globalScene.phaseManager.unshiftPhase(new GameOverPhase()); + globalScene.phaseManager.unshiftNew("GameOverPhase"); } else if ( globalScene.currentBattle.double && legalPlayerPokemon.length === 1 && @@ -176,25 +170,23 @@ export class FaintPhase extends PokemonPhase { * If the player has exactly one Pokemon in total at this point in a double battle, and that Pokemon * is already on the field, unshift a phase that moves that Pokemon to center position. */ - globalScene.phaseManager.unshiftPhase(new ToggleDoublePositionPhase(true)); + globalScene.phaseManager.unshiftNew("ToggleDoublePositionPhase", true); } else if (legalPlayerPartyPokemon.length > 0) { /** * If previous conditions weren't met, and the player has at least 1 legal Pokemon off the field, * push a phase that prompts the player to summon a Pokemon from their party. */ - globalScene.phaseManager.pushPhase(new SwitchPhase(SwitchType.SWITCH, this.fieldIndex, true, false)); + globalScene.phaseManager.pushNew("SwitchPhase", SwitchType.SWITCH, this.fieldIndex, true, false); } } else { - globalScene.phaseManager.unshiftPhase(new VictoryPhase(this.battlerIndex)); + globalScene.phaseManager.unshiftNew("VictoryPhase", this.battlerIndex); if ([BattleType.TRAINER, BattleType.MYSTERY_ENCOUNTER].includes(globalScene.currentBattle.battleType)) { const hasReservePartyMember = !!globalScene .getEnemyParty() .filter(p => p.isActive() && !p.isOnField() && p.trainerSlot === (pokemon as EnemyPokemon).trainerSlot) .length; if (hasReservePartyMember) { - globalScene.phaseManager.pushPhase( - new SwitchSummonPhase(SwitchType.SWITCH, this.fieldIndex, -1, false, false), - ); + globalScene.phaseManager.pushNew("SwitchSummonPhase", SwitchType.SWITCH, this.fieldIndex, -1, false, false); } } } @@ -249,7 +241,7 @@ export class FaintPhase extends PokemonPhase { } else { // Final boss' HP threshold has been bypassed; cancel faint and force check for 2nd phase enemy.hp++; - globalScene.phaseManager.unshiftPhase(new DamageAnimPhase(enemy.getBattlerIndex(), 0, HitResult.INDIRECT)); + globalScene.phaseManager.unshiftNew("DamageAnimPhase", enemy.getBattlerIndex(), 0, HitResult.INDIRECT); this.end(); } return true; diff --git a/src/phases/form-change-phase.ts b/src/phases/form-change-phase.ts index c0d2a9a11eb..3813359d432 100644 --- a/src/phases/form-change-phase.ts +++ b/src/phases/form-change-phase.ts @@ -7,7 +7,6 @@ import type { PlayerPokemon } from "../field/pokemon"; import { UiMode } from "#enums/ui-mode"; import type PartyUiHandler from "../ui/party-ui-handler"; import { getPokemonNameWithAffix } from "../messages"; -import { EndEvolutionPhase } from "./end-evolution-phase"; import { EvolutionPhase } from "./evolution-phase"; import { BattlerTagType } from "#enums/battler-tag-type"; import { SpeciesFormKey } from "#enums/species-form-key"; @@ -100,7 +99,7 @@ export class FormChangePhase extends EvolutionPhase { globalScene.time.delayedCall(900, () => { this.pokemon.changeForm(this.formChange).then(() => { if (!this.modal) { - globalScene.phaseManager.unshiftPhase(new EndEvolutionPhase()); + globalScene.phaseManager.unshiftNew("EndEvolutionPhase"); } globalScene.playSound("se/shine"); diff --git a/src/phases/game-over-phase.ts b/src/phases/game-over-phase.ts index 87ad3114dca..f339f0abf76 100644 --- a/src/phases/game-over-phase.ts +++ b/src/phases/game-over-phase.ts @@ -9,11 +9,8 @@ import { trainerConfigs } from "#app/data/trainers/trainer-config"; import type Pokemon from "#app/field/pokemon"; import { modifierTypes } from "#app/modifier/modifier-type"; import { BattlePhase } from "#app/phases/battle-phase"; -import { CheckSwitchPhase } from "#app/phases/check-switch-phase"; import { EndCardPhase } from "#app/phases/end-card-phase"; -import { GameOverModifierRewardPhase } from "#app/phases/game-over-modifier-reward-phase"; import { RibbonModifierRewardPhase } from "#app/phases/ribbon-modifier-reward-phase"; -import { UnlockPhase } from "#app/phases/unlock-phase"; import { achvs, ChallengeAchv } from "#app/system/achv"; import { Unlockables } from "#app/system/unlockables"; import { UiMode } from "#enums/ui-mode"; @@ -28,7 +25,6 @@ import ChallengeData from "#app/system/challenge-data"; import TrainerData from "#app/system/trainer-data"; import ArenaData from "#app/system/arena-data"; import { pokerogueApi } from "#app/plugins/api/pokerogue-api"; -import { MessagePhase } from "./message-phase"; export class GameOverPhase extends BattlePhase { public readonly phaseName = "GameOverPhase"; @@ -83,21 +79,21 @@ export class GameOverPhase extends BattlePhase { globalScene.reset(); globalScene.phaseManager.clearPhaseQueue(); globalScene.gameData.loadSession(globalScene.sessionSlotId).then(() => { - globalScene.phaseManager.createAndPush("EncounterPhase", true); + globalScene.phaseManager.pushNew("EncounterPhase", true); const availablePartyMembers = globalScene.getPokemonAllowedInBattle().length; - globalScene.phaseManager.createAndPush("SummonPhase", 0); + globalScene.phaseManager.pushNew("SummonPhase", 0); if (globalScene.currentBattle.double && availablePartyMembers > 1) { - globalScene.phaseManager.createAndPush("SummonPhase", 1); + globalScene.phaseManager.pushNew("SummonPhase", 1); } if ( globalScene.currentBattle.waveIndex > 1 && globalScene.currentBattle.battleType !== BattleType.TRAINER ) { - globalScene.phaseManager.pushPhase(new CheckSwitchPhase(0, globalScene.currentBattle.double)); + globalScene.phaseManager.pushNew("CheckSwitchPhase", 0, globalScene.currentBattle.double); if (globalScene.currentBattle.double && availablePartyMembers > 1) { - globalScene.phaseManager.pushPhase(new CheckSwitchPhase(1, globalScene.currentBattle.double)); + globalScene.phaseManager.pushNew("CheckSwitchPhase", 1, globalScene.currentBattle.double); } } @@ -162,12 +158,12 @@ export class GameOverPhase extends BattlePhase { ); } if (!firstClear) { - globalScene.phaseManager.unshiftPhase(new GameOverModifierRewardPhase(modifierTypes.VOUCHER_PREMIUM)); + globalScene.phaseManager.unshiftNew("GameOverModifierRewardPhase", modifierTypes.VOUCHER_PREMIUM); } } this.getRunHistoryEntry().then(runHistoryEntry => { globalScene.gameData.saveRunHistory(runHistoryEntry, this.isVictory); - globalScene.phaseManager.createAndPush("PostGameOverPhase", endCardPhase); + globalScene.phaseManager.pushNew("PostGameOverPhase", endCardPhase); this.end(); }); }; @@ -231,7 +227,7 @@ export class GameOverPhase extends BattlePhase { .catch(_err => { globalScene.phaseManager.clearPhaseQueue(); globalScene.phaseManager.clearPhaseQueueSplice(); - globalScene.phaseManager.unshiftPhase(new MessagePhase(i18next.t("menu:serverCommunicationFailed"), 2500)); + globalScene.phaseManager.unshiftNew("MessagePhase", i18next.t("menu:serverCommunicationFailed"), 2500); // force the game to reload after 2 seconds. setTimeout(() => { window.location.reload(); @@ -250,22 +246,22 @@ export class GameOverPhase extends BattlePhase { handleUnlocks(): void { if (this.isVictory && globalScene.gameMode.isClassic) { if (!globalScene.gameData.unlocks[Unlockables.ENDLESS_MODE]) { - globalScene.phaseManager.unshiftPhase(new UnlockPhase(Unlockables.ENDLESS_MODE)); + globalScene.phaseManager.unshiftNew("UnlockPhase", Unlockables.ENDLESS_MODE); } if ( globalScene.getPlayerParty().filter(p => p.fusionSpecies).length && !globalScene.gameData.unlocks[Unlockables.SPLICED_ENDLESS_MODE] ) { - globalScene.phaseManager.unshiftPhase(new UnlockPhase(Unlockables.SPLICED_ENDLESS_MODE)); + globalScene.phaseManager.unshiftNew("UnlockPhase", Unlockables.SPLICED_ENDLESS_MODE); } if (!globalScene.gameData.unlocks[Unlockables.MINI_BLACK_HOLE]) { - globalScene.phaseManager.unshiftPhase(new UnlockPhase(Unlockables.MINI_BLACK_HOLE)); + globalScene.phaseManager.unshiftNew("UnlockPhase", Unlockables.MINI_BLACK_HOLE); } if ( !globalScene.gameData.unlocks[Unlockables.EVIOLITE] && globalScene.getPlayerParty().some(p => p.getSpeciesForm(true).speciesId in pokemonEvolutions) ) { - globalScene.phaseManager.unshiftPhase(new UnlockPhase(Unlockables.EVIOLITE)); + globalScene.phaseManager.unshiftNew("UnlockPhase", Unlockables.EVIOLITE); } } } diff --git a/src/phases/level-up-phase.ts b/src/phases/level-up-phase.ts index b3b82f13f42..c78a1798304 100644 --- a/src/phases/level-up-phase.ts +++ b/src/phases/level-up-phase.ts @@ -2,8 +2,6 @@ import { globalScene } from "#app/global-scene"; import { ExpNotification } from "#app/enums/exp-notification"; import type { PlayerPokemon } from "#app/field/pokemon"; import { getPokemonNameWithAffix } from "#app/messages"; -import { EvolutionPhase } from "#app/phases/evolution-phase"; -import { LearnMovePhase } from "#app/phases/learn-move-phase"; import { PlayerPartyMemberPokemonPhase } from "#app/phases/player-party-member-pokemon-phase"; import { LevelAchv } from "#app/system/achv"; import { NumberHolder } from "#app/utils/common"; @@ -66,14 +64,14 @@ export class LevelUpPhase extends PlayerPartyMemberPokemonPhase { // this feels like an unnecessary optimization const levelMoves = this.getPokemon().getLevelMoves(this.lastLevel + 1); for (const lm of levelMoves) { - globalScene.phaseManager.unshiftPhase(new LearnMovePhase(this.partyMemberIndex, lm[1])); + globalScene.phaseManager.unshiftNew("LearnMovePhase", this.partyMemberIndex, lm[1]); } } if (!this.pokemon.pauseEvolutions) { const evolution = this.pokemon.getEvolution(); if (evolution) { this.pokemon.breakIllusion(); - globalScene.phaseManager.unshiftPhase(new EvolutionPhase(this.pokemon, evolution, this.lastLevel)); + globalScene.phaseManager.unshiftNew("EvolutionPhase", this.pokemon, evolution, this.lastLevel); } } return super.end(); diff --git a/src/phases/login-phase.ts b/src/phases/login-phase.ts index 5e1728d4415..de426866baa 100644 --- a/src/phases/login-phase.ts +++ b/src/phases/login-phase.ts @@ -7,8 +7,6 @@ import { UiMode } from "#enums/ui-mode"; import i18next, { t } from "i18next"; import { sessionIdKey, executeIf } from "#app/utils/common"; import { getCookie, removeCookie } from "#app/utils/cookies"; -import { SelectGenderPhase } from "./select-gender-phase"; -import { UnavailablePhase } from "./unavailable-phase"; export class LoginPhase extends Phase { public readonly phaseName = "LoginPhase"; @@ -70,7 +68,7 @@ export class LoginPhase extends Phase { }); }, () => { - globalScene.phaseManager.unshiftPhase(new LoginPhase(false)); + globalScene.phaseManager.unshiftNew("LoginPhase", false); this.end(); }, ], @@ -94,7 +92,7 @@ export class LoginPhase extends Phase { removeCookie(sessionIdKey); globalScene.reset(true, true); } else { - globalScene.phaseManager.unshiftPhase(new UnavailablePhase()); + globalScene.phaseManager.unshiftNew("UnavailablePhase"); super.end(); } return null; @@ -114,7 +112,7 @@ export class LoginPhase extends Phase { globalScene.ui.setMode(UiMode.MESSAGE); if (!globalScene.gameData.gender) { - globalScene.phaseManager.unshiftPhase(new SelectGenderPhase()); + globalScene.phaseManager.unshiftNew("SelectGenderPhase"); } handleTutorial(Tutorial.Intro).then(() => super.end()); diff --git a/src/phases/move-charge-phase.ts b/src/phases/move-charge-phase.ts index add1ab2bb53..a481f4e37b8 100644 --- a/src/phases/move-charge-phase.ts +++ b/src/phases/move-charge-phase.ts @@ -63,7 +63,7 @@ export class MoveChargePhase extends PokemonPhase { // this MoveEndPhase will be duplicated by the queued MovePhase if not removed globalScene.phaseManager.tryRemovePhase(phase => phase.is("MoveEndPhase") && phase.getPokemon() === user); // queue a new MovePhase for this move's attack phase - globalScene.phaseManager.createAndUnshift("MovePhase", user, [this.targetIndex], this.move, false); + globalScene.phaseManager.unshiftNew("MovePhase", user, [this.targetIndex], this.move, false); } else { user.getMoveQueue().push({ move: move.id, targets: [this.targetIndex] }); } diff --git a/src/phases/move-effect-phase.ts b/src/phases/move-effect-phase.ts index 8d02b188444..c175ebab14f 100644 --- a/src/phases/move-effect-phase.ts +++ b/src/phases/move-effect-phase.ts @@ -74,7 +74,6 @@ import type { TypeDamageMultiplier } from "#app/data/type"; import { HitCheckResult } from "#enums/hit-check-result"; import type Move from "#app/data/moves/move"; import { isFieldTargeted } from "#app/data/moves/move-utils"; -import { FaintPhase } from "./faint-phase"; import { DamageAchv } from "#app/system/achv"; type HitCheckEntry = [HitCheckResult, TypeDamageMultiplier]; @@ -195,7 +194,7 @@ export class MoveEffectPhase extends PokemonPhase { } this.queuedPhases.push( - globalScene.phaseManager.createPhase( + globalScene.phaseManager.create( "MovePhase", target, newTargets, @@ -909,7 +908,7 @@ export class MoveEffectPhase extends PokemonPhase { // set splice index here, so future scene queues happen before FaintedPhase globalScene.phaseManager.setPhaseQueueSplice(); - globalScene.phaseManager.unshiftPhase(new FaintPhase(target.getBattlerIndex(), false, user)); + globalScene.phaseManager.unshiftNew("FaintPhase", target.getBattlerIndex(), false, user); target.destroySubstitute(); target.lapseTag(BattlerTagType.COMMANDED); diff --git a/src/phases/mystery-encounter-phases.ts b/src/phases/mystery-encounter-phases.ts index 4263ab74422..1f27db7ff64 100644 --- a/src/phases/mystery-encounter-phases.ts +++ b/src/phases/mystery-encounter-phases.ts @@ -3,13 +3,6 @@ import type { OptionPhaseCallback } from "#app/data/mystery-encounters/mystery-e import type MysteryEncounterOption from "#app/data/mystery-encounters/mystery-encounter-option"; import { SeenEncounterData } from "#app/data/mystery-encounters/mystery-encounter-save-data"; import { getEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; -import { CheckSwitchPhase } from "#app/phases/check-switch-phase"; -import { GameOverPhase } from "#app/phases/game-over-phase"; -import { ScanIvsPhase } from "#app/phases/scan-ivs-phase"; -import { SelectModifierPhase } from "#app/phases/select-modifier-phase"; -import { SummonPhase } from "#app/phases/summon-phase"; -import { SwitchPhase } from "#app/phases/switch-phase"; -import { ToggleDoublePositionPhase } from "#app/phases/toggle-double-position-phase"; import { BattleSpec } from "#enums/battle-spec"; import { BattlerTagType } from "#enums/battler-tag-type"; import { MysteryEncounterMode } from "#enums/mystery-encounter-mode"; @@ -121,7 +114,7 @@ export class MysteryEncounterPhase extends Phase { */ continueEncounter() { const endDialogueAndContinueEncounter = () => { - globalScene.phaseManager.createAndPush("MysteryEncounterOptionSelectedPhase"); + globalScene.phaseManager.pushNew("MysteryEncounterOptionSelectedPhase"); this.end(); }; @@ -253,7 +246,7 @@ export class MysteryEncounterBattleStartCleanupPhase extends Phase { // The total number of legal player Pokemon that aren't currently on the field const legalPlayerPartyPokemon = legalPlayerPokemon.filter(p => !p.isActive(true)); if (!legalPlayerPokemon.length) { - globalScene.phaseManager.unshiftPhase(new GameOverPhase()); + globalScene.phaseManager.unshiftNew("GameOverPhase"); return this.end(); } @@ -262,13 +255,13 @@ export class MysteryEncounterBattleStartCleanupPhase extends Phase { const playerField = globalScene.getPlayerField(); playerField.forEach((pokemon, i) => { if (!pokemon.isAllowedInBattle() && legalPlayerPartyPokemon.length > i) { - globalScene.phaseManager.unshiftPhase(new SwitchPhase(SwitchType.SWITCH, i, true, false)); + globalScene.phaseManager.unshiftNew("SwitchPhase", SwitchType.SWITCH, i, true, false); } }); // THEN, if is a double battle, and player only has 1 summoned pokemon, center pokemon on field if (globalScene.currentBattle.double && legalPlayerPokemon.length === 1 && legalPlayerPartyPokemon.length === 0) { - globalScene.phaseManager.unshiftPhase(new ToggleDoublePositionPhase(true)); + globalScene.phaseManager.unshiftNew("ToggleDoublePositionPhase", true); } this.end(); @@ -345,9 +338,9 @@ export class MysteryEncounterBattlePhase extends Phase { globalScene.playBgm(); } const availablePartyMembers = globalScene.getEnemyParty().filter(p => !p.isFainted()).length; - globalScene.phaseManager.unshiftPhase(new SummonPhase(0, false)); + globalScene.phaseManager.unshiftNew("SummonPhase", 0, false); if (globalScene.currentBattle.double && availablePartyMembers > 1) { - globalScene.phaseManager.unshiftPhase(new SummonPhase(1, false)); + globalScene.phaseManager.unshiftNew("SummonPhase", 1, false); } if (!globalScene.currentBattle.mysteryEncounter?.hideBattleIntroMessage) { @@ -365,9 +358,9 @@ export class MysteryEncounterBattlePhase extends Phase { const doTrainerSummon = () => { this.hideEnemyTrainer(); const availablePartyMembers = globalScene.getEnemyParty().filter(p => !p.isFainted()).length; - globalScene.phaseManager.unshiftPhase(new SummonPhase(0, false)); + globalScene.phaseManager.unshiftNew("SummonPhase", 0, false); if (globalScene.currentBattle.double && availablePartyMembers > 1) { - globalScene.phaseManager.unshiftPhase(new SummonPhase(1, false)); + globalScene.phaseManager.unshiftNew("SummonPhase", 1, false); } this.endBattleSetup(); }; @@ -423,37 +416,37 @@ export class MysteryEncounterBattlePhase extends Phase { if (encounterMode !== MysteryEncounterMode.TRAINER_BATTLE) { const ivScannerModifier = globalScene.findModifier(m => m instanceof IvScannerModifier); if (ivScannerModifier) { - enemyField.map(p => globalScene.phaseManager.pushPhase(new ScanIvsPhase(p.getBattlerIndex()))); + enemyField.map(p => globalScene.phaseManager.pushNew("ScanIvsPhase", p.getBattlerIndex())); } } const availablePartyMembers = globalScene.getPlayerParty().filter(p => p.isAllowedInBattle()); if (!availablePartyMembers[0].isOnField()) { - globalScene.phaseManager.createAndPush("SummonPhase", 0); + globalScene.phaseManager.pushNew("SummonPhase", 0); } if (globalScene.currentBattle.double) { if (availablePartyMembers.length > 1) { - globalScene.phaseManager.createAndPush("ToggleDoublePositionPhase", true); + globalScene.phaseManager.pushNew("ToggleDoublePositionPhase", true); if (!availablePartyMembers[1].isOnField()) { - globalScene.phaseManager.createAndPush("SummonPhase", 1); + globalScene.phaseManager.pushNew("SummonPhase", 1); } } } else { if (availablePartyMembers.length > 1 && availablePartyMembers[1].isOnField()) { globalScene.getPlayerField().forEach(pokemon => pokemon.lapseTag(BattlerTagType.COMMANDED)); - globalScene.phaseManager.createAndPush("ReturnPhase", 1); + globalScene.phaseManager.pushNew("ReturnPhase", 1); } - globalScene.phaseManager.createAndPush("ToggleDoublePositionPhase", false); + globalScene.phaseManager.pushNew("ToggleDoublePositionPhase", false); } if (encounterMode !== MysteryEncounterMode.TRAINER_BATTLE && !this.disableSwitch) { const minPartySize = globalScene.currentBattle.double ? 2 : 1; if (availablePartyMembers.length > minPartySize) { - globalScene.phaseManager.pushPhase(new CheckSwitchPhase(0, globalScene.currentBattle.double)); + globalScene.phaseManager.pushNew("CheckSwitchPhase", 0, globalScene.currentBattle.double); if (globalScene.currentBattle.double) { - globalScene.phaseManager.pushPhase(new CheckSwitchPhase(1, globalScene.currentBattle.double)); + globalScene.phaseManager.pushNew("CheckSwitchPhase", 1, globalScene.currentBattle.double); } } } @@ -560,15 +553,13 @@ export class MysteryEncounterRewardsPhase extends Phase { encounter.doEncounterRewards(); } else if (this.addHealPhase) { globalScene.phaseManager.tryRemovePhase(p => p.is("SelectModifierPhase")); - globalScene.phaseManager.unshiftPhase( - new SelectModifierPhase(0, undefined, { - fillRemaining: false, - rerollMultiplier: -1, - }), - ); + globalScene.phaseManager.unshiftNew("SelectModifierPhase", 0, undefined, { + fillRemaining: false, + rerollMultiplier: -1, + }); } - globalScene.phaseManager.createAndPush("PostMysteryEncounterPhase"); + globalScene.phaseManager.pushNew("PostMysteryEncounterPhase"); this.end(); } } @@ -615,10 +606,10 @@ export class PostMysteryEncounterPhase extends Phase { continueEncounter() { const endPhase = () => { if (globalScene.gameMode.hasRandomBiomes || globalScene.isNewBiome()) { - globalScene.phaseManager.createAndPush("SelectBiomePhase"); + globalScene.phaseManager.pushNew("SelectBiomePhase"); } - globalScene.phaseManager.createAndPush("NewBattlePhase"); + globalScene.phaseManager.pushNew("NewBattlePhase"); this.end(); }; diff --git a/src/phases/post-game-over-phase.ts b/src/phases/post-game-over-phase.ts index 37a3297cc52..8e19dcd5498 100644 --- a/src/phases/post-game-over-phase.ts +++ b/src/phases/post-game-over-phase.ts @@ -1,7 +1,6 @@ import { globalScene } from "#app/global-scene"; import { Phase } from "#app/phase"; import type { EndCardPhase } from "./end-card-phase"; -import { TitlePhase } from "./title-phase"; export class PostGameOverPhase extends Phase { public readonly phaseName = "PostGameOverPhase"; @@ -28,7 +27,7 @@ export class PostGameOverPhase extends Phase { return globalScene.reset(true); } globalScene.reset(); - globalScene.phaseManager.unshiftPhase(new TitlePhase()); + globalScene.phaseManager.unshiftNew("TitlePhase"); this.end(); }); }); diff --git a/src/phases/revival-blessing-phase.ts b/src/phases/revival-blessing-phase.ts index 2db73103a88..e3e69f7ef25 100644 --- a/src/phases/revival-blessing-phase.ts +++ b/src/phases/revival-blessing-phase.ts @@ -6,8 +6,6 @@ import { UiMode } from "#enums/ui-mode"; import i18next from "i18next"; import { toDmgValue, isNullOrUndefined } from "#app/utils/common"; import { BattlePhase } from "#app/phases/battle-phase"; -import { SwitchSummonPhase } from "#app/phases/switch-summon-phase"; -import { ToggleDoublePositionPhase } from "#app/phases/toggle-double-position-phase"; import type { PlayerPokemon } from "#app/field/pokemon"; /** @@ -51,16 +49,26 @@ export class RevivalBlessingPhase extends BattlePhase { ) { if (slotIndex <= 1) { // Revived ally pokemon - globalScene.phaseManager.unshiftPhase( - new SwitchSummonPhase(SwitchType.SWITCH, pokemon.getFieldIndex(), slotIndex, false, true), + globalScene.phaseManager.unshiftNew( + "SwitchSummonPhase", + SwitchType.SWITCH, + pokemon.getFieldIndex(), + slotIndex, + false, + true, ); - globalScene.phaseManager.unshiftPhase(new ToggleDoublePositionPhase(true)); + globalScene.phaseManager.unshiftNew("ToggleDoublePositionPhase", true); } else if (allyPokemon.isFainted()) { // Revived party pokemon, and ally pokemon is fainted - globalScene.phaseManager.unshiftPhase( - new SwitchSummonPhase(SwitchType.SWITCH, allyPokemon.getFieldIndex(), slotIndex, false, true), + globalScene.phaseManager.unshiftNew( + "SwitchSummonPhase", + SwitchType.SWITCH, + allyPokemon.getFieldIndex(), + slotIndex, + false, + true, ); - globalScene.phaseManager.unshiftPhase(new ToggleDoublePositionPhase(true)); + globalScene.phaseManager.unshiftNew("ToggleDoublePositionPhase", true); } } } diff --git a/src/phases/select-biome-phase.ts b/src/phases/select-biome-phase.ts index 633bf20d34c..e8b4946b6d1 100644 --- a/src/phases/select-biome-phase.ts +++ b/src/phases/select-biome-phase.ts @@ -6,8 +6,6 @@ import type { OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler" import { UiMode } from "#enums/ui-mode"; import { BattlePhase } from "./battle-phase"; import { randSeedInt } from "#app/utils/common"; -import { PartyHealPhase } from "./party-heal-phase"; -import { SwitchBiomePhase } from "./switch-biome-phase"; export class SelectBiomePhase extends BattlePhase { public readonly phaseName = "SelectBiomePhase"; @@ -22,9 +20,9 @@ export class SelectBiomePhase extends BattlePhase { const setNextBiome = (nextBiome: BiomeId) => { if (nextWaveIndex % 10 === 1) { globalScene.applyModifiers(MoneyInterestModifier, true); - globalScene.phaseManager.unshiftPhase(new PartyHealPhase(false)); + globalScene.phaseManager.unshiftNew("PartyHealPhase", false); } - globalScene.phaseManager.unshiftPhase(new SwitchBiomePhase(nextBiome)); + globalScene.phaseManager.unshiftNew("SwitchBiomePhase", nextBiome); this.end(); }; diff --git a/src/phases/select-modifier-phase.ts b/src/phases/select-modifier-phase.ts index 5ac3b9e6d76..4d790e70e1b 100644 --- a/src/phases/select-modifier-phase.ts +++ b/src/phases/select-modifier-phase.ts @@ -123,11 +123,10 @@ export class SelectModifierPhase extends BattlePhase { return false; } globalScene.reroll = true; - globalScene.phaseManager.unshiftPhase( - new SelectModifierPhase( - this.rerollCount + 1, - this.typeOptions.map(o => o.type?.tier).filter(t => t !== undefined) as ModifierTier[], - ), + globalScene.phaseManager.unshiftNew( + "SelectModifierPhase", + this.rerollCount + 1, + this.typeOptions.map(o => o.type?.tier).filter(t => t !== undefined) as ModifierTier[], ); globalScene.ui.clearText(); globalScene.ui.setMode(UiMode.MESSAGE).then(() => super.end()); @@ -419,7 +418,8 @@ export class SelectModifierPhase extends BattlePhase { } copy(): SelectModifierPhase { - return new SelectModifierPhase( + return globalScene.phaseManager.create( + "SelectModifierPhase", this.rerollCount, this.modifierTiers, { diff --git a/src/phases/select-starter-phase.ts b/src/phases/select-starter-phase.ts index 6315255b156..88d4fe06a9b 100644 --- a/src/phases/select-starter-phase.ts +++ b/src/phases/select-starter-phase.ts @@ -25,7 +25,7 @@ export class SelectStarterPhase extends Phase { globalScene.ui.setMode(UiMode.SAVE_SLOT, SaveSlotUiMode.SAVE, (slotId: number) => { if (slotId === -1) { globalScene.phaseManager.clearPhaseQueue(); - globalScene.phaseManager.createAndPush("TitlePhase"); + globalScene.phaseManager.pushNew("TitlePhase"); return this.end(); } globalScene.sessionSlotId = slotId; diff --git a/src/phases/select-target-phase.ts b/src/phases/select-target-phase.ts index 515f7ed98ca..fcbd3aeb679 100644 --- a/src/phases/select-target-phase.ts +++ b/src/phases/select-target-phase.ts @@ -2,7 +2,6 @@ import { globalScene } from "#app/global-scene"; import type { BattlerIndex } from "#app/battle"; import { Command } from "#app/ui/command-ui-handler"; import { UiMode } from "#enums/ui-mode"; -import { CommandPhase } from "./command-phase"; import { PokemonPhase } from "./pokemon-phase"; import i18next from "#app/plugins/i18n"; import { allMoves } from "#app/data/data-lists"; @@ -33,7 +32,7 @@ export class SelectTargetPhase extends PokemonPhase { } if (targets.length < 1) { globalScene.currentBattle.turnCommands[this.fieldIndex] = null; - globalScene.phaseManager.unshiftPhase(new CommandPhase(this.fieldIndex)); + globalScene.phaseManager.unshiftNew("CommandPhase", this.fieldIndex); } else { turnCommand!.targets = targets; //TODO: is the bang correct here? } diff --git a/src/phases/show-ability-phase.ts b/src/phases/show-ability-phase.ts index e4be6124784..af295b72622 100644 --- a/src/phases/show-ability-phase.ts +++ b/src/phases/show-ability-phase.ts @@ -2,7 +2,6 @@ import { globalScene } from "#app/global-scene"; import type { BattlerIndex } from "#app/battle"; import { PokemonPhase } from "./pokemon-phase"; import { getPokemonNameWithAffix } from "#app/messages"; -import { HideAbilityPhase } from "#app/phases/hide-ability-phase"; export class ShowAbilityPhase extends PokemonPhase { public readonly phaseName = "ShowAbilityPhase"; @@ -36,8 +35,8 @@ export class ShowAbilityPhase extends PokemonPhase { // If the bar is already out, hide it before showing the new one if (globalScene.abilityBar.isVisible()) { - globalScene.phaseManager.unshiftPhase(new HideAbilityPhase()); - globalScene.phaseManager.unshiftPhase(new ShowAbilityPhase(this.battlerIndex, this.passive)); + globalScene.phaseManager.unshiftNew("HideAbilityPhase"); + globalScene.phaseManager.unshiftNew("ShowAbilityPhase", this.battlerIndex, this.passive); return this.end(); } diff --git a/src/phases/show-party-exp-bar-phase.ts b/src/phases/show-party-exp-bar-phase.ts index 765bd498f66..4849526b639 100644 --- a/src/phases/show-party-exp-bar-phase.ts +++ b/src/phases/show-party-exp-bar-phase.ts @@ -3,8 +3,6 @@ import { ExpGainsSpeed } from "#app/enums/exp-gains-speed"; import { ExpNotification } from "#app/enums/exp-notification"; import { ExpBoosterModifier } from "#app/modifier/modifier"; import { NumberHolder } from "#app/utils/common"; -import { HidePartyExpBarPhase } from "./hide-party-exp-bar-phase"; -import { LevelUpPhase } from "./level-up-phase"; import { PlayerPartyMemberPokemonPhase } from "./player-party-member-pokemon-phase"; export class ShowPartyExpBarPhase extends PlayerPartyMemberPokemonPhase { @@ -29,9 +27,9 @@ export class ShowPartyExpBarPhase extends PlayerPartyMemberPokemonPhase { pokemon.addExp(exp.value); const newLevel = pokemon.level; if (newLevel > lastLevel) { - globalScene.phaseManager.unshiftPhase(new LevelUpPhase(this.partyMemberIndex, lastLevel, newLevel)); + globalScene.phaseManager.unshiftNew("LevelUpPhase", this.partyMemberIndex, lastLevel, newLevel); } - globalScene.phaseManager.unshiftPhase(new HidePartyExpBarPhase()); + globalScene.phaseManager.unshiftNew("HidePartyExpBarPhase"); pokemon.updateInfo(); if (globalScene.expParty === ExpNotification.SKIP) { diff --git a/src/phases/summon-phase.ts b/src/phases/summon-phase.ts index 15f42e76a5a..921466dfead 100644 --- a/src/phases/summon-phase.ts +++ b/src/phases/summon-phase.ts @@ -9,9 +9,6 @@ import { FieldPosition } from "#app/field/pokemon"; import { getPokemonNameWithAffix } from "#app/messages"; import i18next from "i18next"; import { PartyMemberPokemonPhase } from "./party-member-pokemon-phase"; -import { PostSummonPhase } from "./post-summon-phase"; -import { GameOverPhase } from "./game-over-phase"; -import { ShinySparklePhase } from "./shiny-sparkle-phase"; import { MysteryEncounterMode } from "#enums/mystery-encounter-mode"; import { applyPreSummonAbAttrs, PreSummonAbAttr } from "#app/data/abilities/ability"; import { globalScene } from "#app/global-scene"; @@ -58,7 +55,7 @@ export class SummonPhase extends PartyMemberPokemonPhase { console.error("Party Details:\n", party); console.error("All available Pokemon were fainted or illegal!"); globalScene.phaseManager.clearPhaseQueue(); - globalScene.phaseManager.unshiftPhase(new GameOverPhase()); + globalScene.phaseManager.unshiftNew("GameOverPhase"); this.end(); return; } @@ -275,7 +272,7 @@ export class SummonPhase extends PartyMemberPokemonPhase { const pokemon = this.getPokemon(); if (pokemon.isShiny(true)) { - globalScene.phaseManager.unshiftPhase(new ShinySparklePhase(pokemon.getBattlerIndex())); + globalScene.phaseManager.unshiftNew("ShinySparklePhase", pokemon.getBattlerIndex()); } pokemon.resetTurnData(); @@ -291,7 +288,7 @@ export class SummonPhase extends PartyMemberPokemonPhase { } queuePostSummon(): void { - globalScene.phaseManager.pushPhase(new PostSummonPhase(this.getPokemon().getBattlerIndex())); + globalScene.phaseManager.pushNew("PostSummonPhase", this.getPokemon().getBattlerIndex()); } end() { diff --git a/src/phases/switch-summon-phase.ts b/src/phases/switch-summon-phase.ts index de8b9f3a5d9..103af3db275 100644 --- a/src/phases/switch-summon-phase.ts +++ b/src/phases/switch-summon-phase.ts @@ -16,7 +16,6 @@ import { getPokemonNameWithAffix } from "#app/messages"; import { SwitchEffectTransferModifier } from "#app/modifier/modifier"; import { Command } from "#app/ui/command-ui-handler"; import i18next from "i18next"; -import { PostSummonPhase } from "./post-summon-phase"; import { SummonPhase } from "./summon-phase"; import { SubstituteTag } from "#app/data/battler-tags"; import { SwitchType } from "#enums/switch-type"; @@ -265,6 +264,6 @@ export class SwitchSummonPhase extends SummonPhase { } queuePostSummon(): void { - globalScene.phaseManager.unshiftPhase(new PostSummonPhase(this.getPokemon().getBattlerIndex())); + globalScene.phaseManager.unshiftNew("PostSummonPhase", this.getPokemon().getBattlerIndex()); } } diff --git a/src/phases/title-phase.ts b/src/phases/title-phase.ts index 8ba980c1e97..37ce294f237 100644 --- a/src/phases/title-phase.ts +++ b/src/phases/title-phase.ts @@ -20,9 +20,6 @@ import { SaveSlotUiMode } from "#app/ui/save-slot-select-ui-handler"; import { UiMode } from "#enums/ui-mode"; import { isLocal, isLocalServerConnected, isNullOrUndefined } from "#app/utils/common"; import i18next from "i18next"; -import { CheckSwitchPhase } from "./check-switch-phase"; -import { EncounterPhase } from "./encounter-phase"; -import { SummonPhase } from "./summon-phase"; import { globalScene } from "#app/global-scene"; import Overrides from "#app/overrides"; @@ -123,7 +120,7 @@ export class TitlePhase extends Phase { label: i18next.t("menu:cancel"), handler: () => { globalScene.phaseManager.clearPhaseQueue(); - globalScene.phaseManager.createAndPush("TitlePhase"); + globalScene.phaseManager.pushNew("TitlePhase"); super.end(); return true; }, @@ -198,7 +195,7 @@ export class TitlePhase extends Phase { globalScene.ui.setMode(UiMode.SAVE_SLOT, SaveSlotUiMode.SAVE, (slotId: number) => { globalScene.phaseManager.clearPhaseQueue(); if (slotId === -1) { - globalScene.phaseManager.createAndPush("TitlePhase"); + globalScene.phaseManager.pushNew("TitlePhase"); return super.end(); } globalScene.sessionSlotId = slotId; @@ -302,23 +299,23 @@ export class TitlePhase extends Phase { globalScene.arena.preloadBgm(); globalScene.gameMode = getGameMode(this.gameMode); if (this.gameMode === GameModes.CHALLENGE) { - globalScene.phaseManager.createAndPush("SelectChallengePhase"); + globalScene.phaseManager.pushNew("SelectChallengePhase"); } else { - globalScene.phaseManager.createAndPush("SelectStarterPhase"); + globalScene.phaseManager.pushNew("SelectStarterPhase"); } globalScene.newArena(globalScene.gameMode.getStartingBiome()); } else { globalScene.playBgm(); } - globalScene.phaseManager.pushPhase(new EncounterPhase(this.loaded)); + globalScene.phaseManager.pushNew("EncounterPhase", this.loaded); if (this.loaded) { const availablePartyMembers = globalScene.getPokemonAllowedInBattle().length; - globalScene.phaseManager.pushPhase(new SummonPhase(0, true, true)); + globalScene.phaseManager.pushNew("SummonPhase", 0, true, true); if (globalScene.currentBattle.double && availablePartyMembers > 1) { - globalScene.phaseManager.pushPhase(new SummonPhase(1, true, true)); + globalScene.phaseManager.pushNew("SummonPhase", 1, true, true); } if ( @@ -327,9 +324,9 @@ export class TitlePhase extends Phase { ) { const minPartySize = globalScene.currentBattle.double ? 2 : 1; if (availablePartyMembers > minPartySize) { - globalScene.phaseManager.pushPhase(new CheckSwitchPhase(0, globalScene.currentBattle.double)); + globalScene.phaseManager.pushNew("CheckSwitchPhase", 0, globalScene.currentBattle.double); if (globalScene.currentBattle.double) { - globalScene.phaseManager.pushPhase(new CheckSwitchPhase(1, globalScene.currentBattle.double)); + globalScene.phaseManager.pushNew("CheckSwitchPhase", 1, globalScene.currentBattle.double); } } } diff --git a/src/phases/trainer-victory-phase.ts b/src/phases/trainer-victory-phase.ts index 5b7b26d52fb..5d35dd5d375 100644 --- a/src/phases/trainer-victory-phase.ts +++ b/src/phases/trainer-victory-phase.ts @@ -5,8 +5,6 @@ import { vouchers } from "#app/system/voucher"; import i18next from "i18next"; import { randSeedItem } from "#app/utils/common"; import { BattlePhase } from "./battle-phase"; -import { ModifierRewardPhase } from "./modifier-reward-phase"; -import { MoneyRewardPhase } from "./money-reward-phase"; import { TrainerSlot } from "#enums/trainer-slot"; import { globalScene } from "#app/global-scene"; import { BiomeId } from "#enums/biome-id"; @@ -20,13 +18,11 @@ export class TrainerVictoryPhase extends BattlePhase { globalScene.playBgm(globalScene.currentBattle.trainer?.config.victoryBgm); - globalScene.phaseManager.unshiftPhase( - new MoneyRewardPhase(globalScene.currentBattle.trainer?.config.moneyMultiplier!), - ); // TODO: is this bang correct? + globalScene.phaseManager.unshiftNew("MoneyRewardPhase", globalScene.currentBattle.trainer?.config.moneyMultiplier!); // TODO: is this bang correct? const modifierRewardFuncs = globalScene.currentBattle.trainer?.config.modifierRewardFuncs!; // TODO: is this bang correct? for (const modifierRewardFunc of modifierRewardFuncs) { - globalScene.phaseManager.unshiftPhase(new ModifierRewardPhase(modifierRewardFunc)); + globalScene.phaseManager.unshiftNew("ModifierRewardPhase", modifierRewardFunc); } const trainerType = globalScene.currentBattle.trainer?.config.trainerType!; // TODO: is this bang correct? @@ -37,23 +33,21 @@ export class TrainerVictoryPhase extends BattlePhase { globalScene.currentBattle.trainer?.config.isBoss ) { if (timedEventManager.getUpgradeUnlockedVouchers()) { - globalScene.phaseManager.unshiftPhase( - new ModifierRewardPhase( - [ - modifierTypes.VOUCHER_PLUS, - modifierTypes.VOUCHER_PLUS, - modifierTypes.VOUCHER_PLUS, - modifierTypes.VOUCHER_PREMIUM, - ][vouchers[TrainerType[trainerType]].voucherType], - ), + globalScene.phaseManager.unshiftNew( + "ModifierRewardPhase", + [ + modifierTypes.VOUCHER_PLUS, + modifierTypes.VOUCHER_PLUS, + modifierTypes.VOUCHER_PLUS, + modifierTypes.VOUCHER_PREMIUM, + ][vouchers[TrainerType[trainerType]].voucherType], ); } else { - globalScene.phaseManager.unshiftPhase( - new ModifierRewardPhase( - [modifierTypes.VOUCHER, modifierTypes.VOUCHER, modifierTypes.VOUCHER_PLUS, modifierTypes.VOUCHER_PREMIUM][ - vouchers[TrainerType[trainerType]].voucherType - ], - ), + globalScene.phaseManager.unshiftNew( + "ModifierRewardPhase", + [modifierTypes.VOUCHER, modifierTypes.VOUCHER, modifierTypes.VOUCHER_PLUS, modifierTypes.VOUCHER_PREMIUM][ + vouchers[TrainerType[trainerType]].voucherType + ], ); } } diff --git a/src/phases/turn-init-phase.ts b/src/phases/turn-init-phase.ts index 4341b63bac4..aba6d2ac152 100644 --- a/src/phases/turn-init-phase.ts +++ b/src/phases/turn-init-phase.ts @@ -9,8 +9,6 @@ import i18next from "i18next"; import { CommandPhase } from "./command-phase"; import { EnemyCommandPhase } from "./enemy-command-phase"; import { FieldPhase } from "./field-phase"; -import { GameOverPhase } from "./game-over-phase"; -import { ToggleDoublePositionPhase } from "./toggle-double-position-phase"; import { globalScene } from "#app/global-scene"; export class TurnInitPhase extends FieldPhase { @@ -32,7 +30,7 @@ export class TurnInitPhase extends FieldPhase { if (!allowedPokemon.length) { // If there are no longer any legal pokemon in the party, game over. globalScene.phaseManager.clearPhaseQueue(); - globalScene.phaseManager.unshiftPhase(new GameOverPhase()); + globalScene.phaseManager.unshiftNew("GameOverPhase"); } else if ( allowedPokemon.length >= globalScene.currentBattle.getBattlerCount() || (globalScene.currentBattle.double && !allowedPokemon[0].isActive(true)) @@ -45,7 +43,7 @@ export class TurnInitPhase extends FieldPhase { p.leaveField(); } if (allowedPokemon.length === 1 && globalScene.currentBattle.double) { - globalScene.phaseManager.unshiftPhase(new ToggleDoublePositionPhase(true)); + globalScene.phaseManager.unshiftNew("ToggleDoublePositionPhase", true); } } }); @@ -74,7 +72,7 @@ export class TurnInitPhase extends FieldPhase { } }); - globalScene.phaseManager.createAndPush("TurnStartPhase"); + globalScene.phaseManager.pushNew("TurnStartPhase"); this.end(); } diff --git a/src/phases/turn-start-phase.ts b/src/phases/turn-start-phase.ts index e62d45e5ea7..f5b0d4caa1d 100644 --- a/src/phases/turn-start-phase.ts +++ b/src/phases/turn-start-phase.ts @@ -9,9 +9,7 @@ import { BypassSpeedChanceModifier } from "#app/modifier/modifier"; import { Command } from "#app/ui/command-ui-handler"; import { randSeedShuffle, BooleanHolder } from "#app/utils/common"; import { FieldPhase } from "./field-phase"; -import { MoveHeaderPhase } from "./move-header-phase"; import { SwitchSummonPhase } from "./switch-summon-phase"; -import { CheckStatusEffectPhase } from "#app/phases/check-status-effect-phase"; import { BattlerIndex } from "#app/battle"; import { TrickRoomTag } from "#app/data/arena-tag"; import { SwitchType } from "#enums/switch-type"; @@ -146,7 +144,7 @@ export class TurnStartPhase extends FieldPhase { switch (preTurnCommand?.command) { case Command.TERA: - globalScene.phaseManager.createAndPush("TeraPhase", pokemon); + globalScene.phaseManager.pushNew("TeraPhase", pokemon); } } @@ -172,18 +170,13 @@ export class TurnStartPhase extends FieldPhase { pokemon.getMoveset().find(m => m.moveId === queuedMove.move && m.ppUsed < m.getMovePp()) || new PokemonMove(queuedMove.move); if (move.getMove().hasAttr(MoveHeaderAttr)) { - phaseManager.unshiftPhase(new MoveHeaderPhase(pokemon, move)); + phaseManager.unshiftNew("MoveHeaderPhase", pokemon, move); } if (pokemon.isPlayer()) { if (turnCommand.cursor === -1) { - phaseManager.createAndPush( - "MovePhase", - pokemon, - turnCommand.targets || turnCommand.move!.targets, - move, - ); + phaseManager.pushNew("MovePhase", pokemon, turnCommand.targets || turnCommand.move!.targets, move); } else { - phaseManager.createAndPush( + phaseManager.pushNew( "MovePhase", pokemon, turnCommand.targets || turnCommand.move!.targets, // TODO: is the bang correct here? @@ -193,7 +186,7 @@ export class TurnStartPhase extends FieldPhase { ); } } else { - phaseManager.createAndPush( + phaseManager.pushNew( "MovePhase", pokemon, turnCommand.targets || turnCommand.move!.targets, @@ -205,7 +198,7 @@ export class TurnStartPhase extends FieldPhase { } break; case Command.BALL: - phaseManager.createAndUnshift("AttemptCapturePhase", turnCommand.targets![0] % 2, turnCommand.cursor!); //TODO: is the bang correct here? + phaseManager.unshiftNew("AttemptCapturePhase", turnCommand.targets![0] % 2, turnCommand.cursor!); //TODO: is the bang correct here? break; case Command.POKEMON: { @@ -237,19 +230,19 @@ export class TurnStartPhase extends FieldPhase { runningPokemon = hasRunAway !== undefined ? hasRunAway : fasterPokemon; } } - phaseManager.createAndUnshift("AttemptRunPhase", runningPokemon.getFieldIndex()); + phaseManager.unshiftNew("AttemptRunPhase", runningPokemon.getFieldIndex()); } break; } } - phaseManager.createAndPush("WeatherEffectPhase"); - phaseManager.createAndPush("BerryPhase"); + phaseManager.pushNew("WeatherEffectPhase"); + phaseManager.pushNew("BerryPhase"); /** Add a new phase to check who should be taking status damage */ - phaseManager.pushPhase(new CheckStatusEffectPhase(moveOrder)); + phaseManager.pushNew("CheckStatusEffectPhase", moveOrder); - phaseManager.createAndPush("TurnEndPhase"); + phaseManager.pushNew("TurnEndPhase"); /** * this.end() will call shiftPhase(), which dumps everything from PrependQueue (aka everything that is unshifted()) to the front diff --git a/src/phases/unavailable-phase.ts b/src/phases/unavailable-phase.ts index a6fc4a1be61..8b5bb5f7508 100644 --- a/src/phases/unavailable-phase.ts +++ b/src/phases/unavailable-phase.ts @@ -1,13 +1,12 @@ import { globalScene } from "#app/global-scene"; import { Phase } from "#app/phase"; import { UiMode } from "#enums/ui-mode"; -import { LoginPhase } from "./login-phase"; export class UnavailablePhase extends Phase { public readonly phaseName = "UnavailablePhase"; start(): void { globalScene.ui.setMode(UiMode.UNAVAILABLE, () => { - globalScene.phaseManager.unshiftPhase(new LoginPhase(true)); + globalScene.phaseManager.unshiftNew("LoginPhase", true); this.end(); }); } diff --git a/src/phases/victory-phase.ts b/src/phases/victory-phase.ts index 879587efb92..9d9784ef359 100644 --- a/src/phases/victory-phase.ts +++ b/src/phases/victory-phase.ts @@ -44,12 +44,12 @@ export class VictoryPhase extends PokemonPhase { .getEnemyParty() .find(p => (globalScene.currentBattle.battleType === BattleType.WILD ? p.isOnField() : !p?.isFainted(true))) ) { - globalScene.phaseManager.createAndPush("BattleEndPhase", true); + globalScene.phaseManager.pushNew("BattleEndPhase", true); if (globalScene.currentBattle.battleType === BattleType.TRAINER) { - globalScene.phaseManager.createAndPush("TrainerVictoryPhase"); + globalScene.phaseManager.pushNew("TrainerVictoryPhase"); } if (globalScene.gameMode.isEndless || !globalScene.gameMode.isWaveFinal(globalScene.currentBattle.waveIndex)) { - globalScene.phaseManager.createAndPush("EggLapsePhase"); + globalScene.phaseManager.pushNew("EggLapsePhase"); if (globalScene.gameMode.isClassic) { switch (globalScene.currentBattle.waveIndex) { case ClassicFixedBossWaves.RIVAL_1: @@ -57,11 +57,11 @@ export class VictoryPhase extends PokemonPhase { // Get event modifiers for this wave timedEventManager .getFixedBattleEventRewards(globalScene.currentBattle.waveIndex) - .map(r => globalScene.phaseManager.pushPhase(new ModifierRewardPhase(modifierTypes[r]))); + .map(r => globalScene.phaseManager.pushNew("ModifierRewardPhase", modifierTypes[r])); break; case ClassicFixedBossWaves.EVIL_BOSS_2: // Should get Lock Capsule on 165 before shop phase so it can be used in the rewards shop - globalScene.phaseManager.pushPhase(new ModifierRewardPhase(modifierTypes.LOCK_CAPSULE)); + globalScene.phaseManager.pushNew("ModifierRewardPhase", modifierTypes.LOCK_CAPSULE); break; } } @@ -70,17 +70,17 @@ export class VictoryPhase extends PokemonPhase { new SelectModifierPhase(undefined, undefined, this.getFixedBattleCustomModifiers()), ); } else if (globalScene.gameMode.isDaily) { - globalScene.phaseManager.pushPhase(new ModifierRewardPhase(modifierTypes.EXP_CHARM)); + globalScene.phaseManager.pushNew("ModifierRewardPhase", modifierTypes.EXP_CHARM); if ( globalScene.currentBattle.waveIndex > 10 && !globalScene.gameMode.isWaveFinal(globalScene.currentBattle.waveIndex) ) { - globalScene.phaseManager.pushPhase(new ModifierRewardPhase(modifierTypes.GOLDEN_POKEBALL)); + globalScene.phaseManager.pushNew("ModifierRewardPhase", modifierTypes.GOLDEN_POKEBALL); } } else { const superExpWave = !globalScene.gameMode.isEndless ? (globalScene.offsetGym ? 0 : 20) : 10; if (globalScene.gameMode.isEndless && globalScene.currentBattle.waveIndex === 10) { - globalScene.phaseManager.pushPhase(new ModifierRewardPhase(modifierTypes.EXP_SHARE)); + globalScene.phaseManager.pushNew("ModifierRewardPhase", modifierTypes.EXP_SHARE); } if ( globalScene.currentBattle.waveIndex <= 750 && @@ -95,7 +95,7 @@ export class VictoryPhase extends PokemonPhase { ); } if (globalScene.currentBattle.waveIndex <= 150 && !(globalScene.currentBattle.waveIndex % 50)) { - globalScene.phaseManager.pushPhase(new ModifierRewardPhase(modifierTypes.GOLDEN_POKEBALL)); + globalScene.phaseManager.pushNew("ModifierRewardPhase", modifierTypes.GOLDEN_POKEBALL); } if (globalScene.gameMode.isEndless && !(globalScene.currentBattle.waveIndex % 50)) { globalScene.phaseManager.pushPhase( @@ -105,20 +105,20 @@ export class VictoryPhase extends PokemonPhase { : modifierTypes.VOUCHER_PLUS, ), ); - globalScene.phaseManager.createAndPush("AddEnemyBuffModifierPhase"); + globalScene.phaseManager.pushNew("AddEnemyBuffModifierPhase"); } } if (globalScene.gameMode.hasRandomBiomes || globalScene.isNewBiome()) { - globalScene.phaseManager.createAndPush("SelectBiomePhase"); + globalScene.phaseManager.pushNew("SelectBiomePhase"); } - globalScene.phaseManager.createAndPush("NewBattlePhase"); + globalScene.phaseManager.pushNew("NewBattlePhase"); } else { globalScene.currentBattle.battleType = BattleType.CLEAR; globalScene.score += globalScene.gameMode.getClearScoreBonus(); globalScene.updateScoreText(); - globalScene.phaseManager.createAndPush("GameOverPhase", true); + globalScene.phaseManager.pushNew("GameOverPhase", true); } } diff --git a/src/system/game-data.ts b/src/system/game-data.ts index 9a24194b8e9..2949ecd51cf 100644 --- a/src/system/game-data.ts +++ b/src/system/game-data.ts @@ -49,7 +49,6 @@ import { SpeciesId } from "#enums/species-id"; import { applyChallenges, ChallengeType } from "#app/data/challenge"; import { WeatherType } from "#enums/weather-type"; import { TerrainType } from "#app/data/terrain"; -import { ReloadSessionPhase } from "#app/phases/reload-session-phase"; import { RUN_HISTORY_LIMIT } from "#app/ui/run-history-ui-handler"; import { applySessionVersionMigration, @@ -427,7 +426,7 @@ export class GameData { if (error) { if (error.startsWith("session out of date")) { globalScene.phaseManager.clearPhaseQueue(); - globalScene.phaseManager.unshiftPhase(new ReloadSessionPhase()); + globalScene.phaseManager.unshiftNew("ReloadSessionPhase"); } console.error(error); return resolve(false); @@ -747,7 +746,7 @@ export class GameData { if (systemData) { globalScene.phaseManager.clearPhaseQueue(); - globalScene.phaseManager.unshiftPhase(new ReloadSessionPhase(JSON.stringify(systemData))); + globalScene.phaseManager.unshiftNew("ReloadSessionPhase", JSON.stringify(systemData)); this.clearLocalData(); return false; } @@ -1249,7 +1248,7 @@ export class GameData { if (error) { if (error.startsWith("session out of date")) { globalScene.phaseManager.clearPhaseQueue(); - globalScene.phaseManager.unshiftPhase(new ReloadSessionPhase()); + globalScene.phaseManager.unshiftNew("ReloadSessionPhase"); } console.error(error); resolve(false); @@ -1321,7 +1320,7 @@ export class GameData { } else { if (jsonResponse?.error?.startsWith("session out of date")) { globalScene.phaseManager.clearPhaseQueue(); - globalScene.phaseManager.unshiftPhase(new ReloadSessionPhase()); + globalScene.phaseManager.unshiftNew("ReloadSessionPhase"); } console.error(jsonResponse); @@ -1459,7 +1458,7 @@ export class GameData { if (error) { if (error.startsWith("session out of date")) { globalScene.phaseManager.clearPhaseQueue(); - globalScene.phaseManager.unshiftPhase(new ReloadSessionPhase()); + globalScene.phaseManager.unshiftNew("ReloadSessionPhase"); } console.error(error); return resolve(false); diff --git a/src/ui/challenges-select-ui-handler.ts b/src/ui/challenges-select-ui-handler.ts index 3fb7795e435..b02bf4abaef 100644 --- a/src/ui/challenges-select-ui-handler.ts +++ b/src/ui/challenges-select-ui-handler.ts @@ -9,7 +9,6 @@ import { getLocalizedSpriteKey } from "#app/utils/common"; import { Challenges } from "#app/enums/challenges"; import BBCodeText from "phaser3-rex-plugins/plugins/bbcodetext"; import { Color, ShadowColor } from "#app/enums/color"; -import { SelectStarterPhase } from "#app/phases/select-starter-phase"; import { globalScene } from "#app/global-scene"; /** @@ -383,14 +382,14 @@ export default class GameChallengesUiHandler extends UiHandler { this.updateChallengeArrows(this.startCursor.visible); } else { globalScene.phaseManager.clearPhaseQueue(); - globalScene.phaseManager.createAndPush("TitlePhase"); + globalScene.phaseManager.pushNew("TitlePhase"); globalScene.phaseManager.getCurrentPhase()?.end(); } success = true; } else if (button === Button.SUBMIT || button === Button.ACTION) { if (this.hasSelectedChallenge) { if (this.startCursor.visible) { - globalScene.phaseManager.unshiftPhase(new SelectStarterPhase()); + globalScene.phaseManager.unshiftNew("SelectStarterPhase"); globalScene.phaseManager.getCurrentPhase()?.end(); } else { this.startCursor.setVisible(true); diff --git a/src/ui/starter-select-ui-handler.ts b/src/ui/starter-select-ui-handler.ts index 73246738453..47226de3354 100644 --- a/src/ui/starter-select-ui-handler.ts +++ b/src/ui/starter-select-ui-handler.ts @@ -4304,10 +4304,10 @@ export default class StarterSelectUiHandler extends MessageUiHandler { ui.setMode(UiMode.STARTER_SELECT); globalScene.phaseManager.clearPhaseQueue(); if (globalScene.gameMode.isChallenge) { - globalScene.phaseManager.createAndPush("SelectChallengePhase"); - globalScene.phaseManager.createAndPush("EncounterPhase"); + globalScene.phaseManager.pushNew("SelectChallengePhase"); + globalScene.phaseManager.pushNew("EncounterPhase"); } else { - globalScene.phaseManager.createAndPush("TitlePhase"); + globalScene.phaseManager.pushNew("TitlePhase"); } this.clearText(); globalScene.phaseManager.getCurrentPhase()?.end(); diff --git a/test/testUtils/gameManager.ts b/test/testUtils/gameManager.ts index e727ae892b0..437c8d9f083 100644 --- a/test/testUtils/gameManager.ts +++ b/test/testUtils/gameManager.ts @@ -105,8 +105,8 @@ export default class GameManager { // Must be run after phase interceptor has been initialized. - this.scene.phaseManager.createAndPush("LoginPhase"); - this.scene.phaseManager.createAndPush("TitlePhase"); + this.scene.phaseManager.pushNew("LoginPhase"); + this.scene.phaseManager.pushNew("TitlePhase"); this.scene.phaseManager.shiftPhase(); this.gameWrapper.scene = this.scene;