From 3723e2568256df09fb3e0c4679cc4e66f6f2cb2a Mon Sep 17 00:00:00 2001 From: Flashfyre Date: Mon, 10 Apr 2023 14:12:01 -0400 Subject: [PATCH] Fix import issues with battle phase --- src/auto-play.ts | 2 +- src/battle-phase.ts | 1059 --------------------------------- src/battle-phases.ts | 1061 ++++++++++++++++++++++++++++++++++ src/battle-scene.ts | 7 +- src/evolution-phase.ts | 3 +- src/modifier.ts | 2 +- src/move.ts | 2 +- src/pokemon.ts | 2 +- src/ui/command-ui-handler.ts | 1 - src/ui/fight-ui-handler.ts | 2 +- src/ui/party-ui-handler.ts | 2 +- 11 files changed, 1073 insertions(+), 1070 deletions(-) create mode 100644 src/battle-phases.ts diff --git a/src/auto-play.ts b/src/auto-play.ts index 68c91337f..cb86ee3be 100644 --- a/src/auto-play.ts +++ b/src/auto-play.ts @@ -1,4 +1,4 @@ -import { SelectModifierPhase } from "./battle-phase"; +import { SelectModifierPhase } from "./battle-phases"; import BattleScene from "./battle-scene"; import { ModifierTier, ModifierType, PokemonBaseStatBoosterModifierType, PokemonHpRestoreModifierType, PokemonReviveModifierType } from "./modifier"; import Pokemon, { AiType, EnemyPokemon, PlayerPokemon, PokemonMove } from "./pokemon"; diff --git a/src/battle-phase.ts b/src/battle-phase.ts index 7c76000cb..aa3d18832 100644 --- a/src/battle-phase.ts +++ b/src/battle-phase.ts @@ -1,18 +1,4 @@ import BattleScene from "./battle-scene"; -import { default as Pokemon, PlayerPokemon, EnemyPokemon, PokemonMove } from "./pokemon"; -import * as Utils from './utils'; -import { allMoves, MoveCategory, Moves } from "./move"; -import { Mode } from './ui/ui'; -import { Command } from "./ui/command-ui-handler"; -import { Stat } from "./pokemon-stat"; -import { ExpBoosterModifier, ExpShareModifier, ExtraModifierModifier, getModifierTypesForWave, ModifierType, PokemonModifierType, regenerateModifierPoolThresholds } from "./modifier"; -import PartyUiHandler, { PartyUiMode } from "./ui/party-ui-handler"; -import { doPokeballBounceAnim, getPokeballAtlasKey, getPokeballCatchMultiplier, getPokeballTintColor as getPokeballTintColor, PokeballType } from "./pokeball"; -import { MoveAnim, initAnim, loadMoveAnimAssets } from "./battle-anims"; -import { StatusEffect } from "./status-effect"; -import { SummaryUiMode } from "./ui/summary-ui-handler"; -import EvolutionSceneHandler from "./ui/evolution-scene-handler"; -import { EvolutionPhase } from "./evolution-phase"; export class BattlePhase { protected scene: BattleScene; @@ -28,1049 +14,4 @@ export class BattlePhase { end() { this.scene.shiftPhase(); } -} - -export class SelectStarterPhase extends BattlePhase { - constructor(scene: BattleScene) { - super(scene); - } - - start() { - super.start(); - - this.scene.ui.setMode(Mode.STARTER_SELECT); - } -} - -export class EncounterPhase extends BattlePhase { - constructor(scene: BattleScene) { - super(scene); - } - - start() { - super.start(); - - const battle = this.scene.currentBattle; - const enemySpecies = this.scene.arena.randomSpecies(1, battle.enemyLevel); - battle.enemyPokemon = new EnemyPokemon(this.scene, enemySpecies, battle.enemyLevel); - const enemyPokemon = this.scene.getEnemyPokemon(); - - console.log(enemyPokemon.species.name, enemyPokemon.species.speciesId, enemyPokemon.stats); - - enemyPokemon.loadAssets().then(() => { - this.scene.field.add(enemyPokemon); - if (this.scene.getPlayerPokemon().visible) - this.scene.field.moveBelow(enemyPokemon, this.scene.getPlayerPokemon()); - enemyPokemon.tint(0, 0.5); - - this.scene.ui.setMode(Mode.MESSAGE).then(() => this.doEncounter()); - }); - } - - doEncounter() { - const enemyPokemon = this.scene.getEnemyPokemon(); - this.scene.tweens.add({ - targets: [ this.scene.arenaEnemy, enemyPokemon, this.scene.arenaPlayer, this.scene.trainer ], - x: (_target, _key, value, targetIndex: integer) => targetIndex < 2 ? value + 300 : value - 300, - duration: 2000, - onComplete: () => { - enemyPokemon.untint(100, 'Sine.easeOut'); - enemyPokemon.cry(); - enemyPokemon.showInfo(); - this.scene.ui.showText(`A wild ${enemyPokemon.name} appeared!`, null, () => this.end(), 1500); - } - }); - } - - end() { - if (this.scene.getEnemyPokemon().shiny) - this.scene.unshiftPhase(new ShinySparklePhase(this.scene, false)); - // TODO: Remove - //this.scene.unshiftPhase(new SelectModifierPhase(this.scene)); - - super.end(); - } -} - -export class NextEncounterPhase extends EncounterPhase { - constructor(scene: BattleScene) { - super(scene); - } - - doEncounter(): void { - const enemyPokemon = this.scene.getEnemyPokemon(); - this.scene.tweens.add({ - targets: [ this.scene.arenaEnemy, this.scene.arenaNextEnemy, enemyPokemon ], - x: '+=300', - duration: 2000, - onComplete: () => { - this.scene.arenaEnemy.setX(this.scene.arenaNextEnemy.x); - this.scene.arenaNextEnemy.setX(this.scene.arenaNextEnemy.x - 300); - enemyPokemon.untint(100, 'Sine.easeOut'); - enemyPokemon.cry(); - enemyPokemon.showInfo(); - this.scene.ui.showText(`A wild ${enemyPokemon.name} appeared!`, null, () => this.end(), 1500); - } - }); - } - - end() { - if (this.scene.getEnemyPokemon().shiny) - this.scene.unshiftPhase(new ShinySparklePhase(this.scene, false)); - - this.scene.unshiftPhase(new CheckSwitchPhase(this.scene)); - - super.end(); - } -} - -export class NewBiomeEncounterPhase extends NextEncounterPhase { - constructor(scene: BattleScene) { - super(scene); - } - - doEncounter(): void { - const enemyPokemon = this.scene.getEnemyPokemon(); - this.scene.tweens.add({ - targets: [ this.scene.arenaEnemy, enemyPokemon ], - x: (_target, _key, value, targetIndex: integer) => targetIndex < 2 ? value + 300 : value - 300, - duration: 2000, - onComplete: () => { - enemyPokemon.untint(100, 'Sine.easeOut'); - enemyPokemon.cry(); - enemyPokemon.showInfo(); - this.scene.ui.showText(`A wild ${enemyPokemon.name} appeared!`, null, () => this.end(), 1500); - } - }); - } -} - -export class SwitchBiomePhase extends BattlePhase { - constructor(scene: BattleScene) { - super(scene); - } - - start() { - super.start(); - - this.scene.arena.fadeOutBgm(2000); - - this.scene.tweens.add({ - targets: this.scene.arenaEnemy, - x: '+=300', - duration: 2000, - onComplete: () => { - this.scene.arenaEnemy.setX(this.scene.arenaEnemy.x - 600); - - this.scene.newBiome(); - - const biomeKey = this.scene.arena.getBiomeKey(); - const bgTexture = `${biomeKey}_bg`; - const playerTexture = `${biomeKey}_a`; - const enemyTexture = `${biomeKey}_b`; - this.scene.arenaBgTransition.setTexture(bgTexture) - this.scene.arenaBgTransition.setAlpha(0); - this.scene.arenaBgTransition.setVisible(true); - this.scene.arenaPlayerTransition.setTexture(playerTexture) - this.scene.arenaPlayerTransition.setAlpha(0); - this.scene.arenaPlayerTransition.setVisible(true); - - this.scene.time.delayedCall(1000, () => this.scene.arena.playBgm()); - - this.scene.tweens.add({ - targets: [ this.scene.arenaBgTransition, this.scene.arenaPlayerTransition ], - duration: 1000, - delay: 1000, - ease: 'Sine.easeInOut', - alpha: 1, - onComplete: () => { - this.scene.arenaBg.setTexture(bgTexture); - this.scene.arenaPlayer.setTexture(playerTexture); - this.scene.arenaEnemy.setTexture(enemyTexture); - this.scene.arenaNextEnemy.setTexture(enemyTexture); - this.scene.arenaBgTransition.setVisible(false); - this.scene.arenaPlayerTransition.setVisible(false); - - this.end(); - } - }) - } - }); - } -} - -export class SummonPhase extends BattlePhase { - constructor(scene: BattleScene) { - super(scene); - } - - start() { - super.start(); - - this.preSummon(); - } - - preSummon(): void { - this.scene.ui.showText(`Go! ${this.scene.getPlayerPokemon().name}!`); - this.scene.trainer.play('trainer_m_pb'); - this.scene.tweens.add({ - targets: this.scene.trainer, - x: -36, - duration: 1000 - }); - this.scene.time.delayedCall(750, () => this.summon()); - } - - summon(): void { - const pokeball = this.scene.add.sprite(36, 80, 'pb', 'pb'); - pokeball.setVisible(false); - pokeball.setOrigin(0.5, 0.625); - this.scene.field.add(pokeball); - - const playerPokemon = this.scene.getPlayerPokemon(); - - pokeball.setVisible(true); - this.scene.tweens.add({ - targets: pokeball, - ease: 'Cubic.easeOut', - duration: 150, - x: 54, - y: 70, - onComplete: () => { - this.scene.tweens.add({ - targets: pokeball, - duration: 500, - angle: 1440, - x: 100, - y: 132, - ease: 'Cubic.easeIn', - onComplete: () => { - this.scene.sound.play('pb_rel'); - pokeball.destroy(); - this.scene.add.existing(playerPokemon); - this.scene.field.add(playerPokemon); - playerPokemon.showInfo(); - playerPokemon.playAnim(); - playerPokemon.setVisible(true); - playerPokemon.setScale(0.5); - playerPokemon.tint(getPokeballTintColor(playerPokemon.pokeball)); - playerPokemon.untint(250, 'Sine.easeIn'); - this.scene.tweens.add({ - targets: playerPokemon, - duration: 250, - ease: 'Sine.easeIn', - scale: 1, - onComplete: () => { - playerPokemon.cry(); - playerPokemon.getSprite().clearTint(); - playerPokemon.resetSummonData(); - this.scene.time.delayedCall(1000, () => this.end()); - } - }); - } - }); - } - }); - } - - end() { - if (this.scene.getPlayerPokemon().shiny) - this.scene.unshiftPhase(new ShinySparklePhase(this.scene, true)); - - super.end(); - } -} - -export class SwitchSummonPhase extends SummonPhase { - private slotIndex: integer; - private doReturn: boolean; - - constructor(scene: BattleScene, slotIndex: integer, doReturn: boolean) { - super(scene); - - this.slotIndex = slotIndex; - this.doReturn = doReturn; - } - - start() { - super.start(); - } - - preSummon(): void { - if (!this.doReturn) { - this.switchAndSummon(); - return; - } - - const playerPokemon = this.scene.getPlayerPokemon(); - - this.scene.ui.showText(`Come back, ${this.scene.getPlayerPokemon().name}!`); - this.scene.sound.play('pb_rel'); - playerPokemon.hideInfo(); - playerPokemon.tint(getPokeballTintColor(playerPokemon.pokeball), 1, 250, 'Sine.easeIn'); - this.scene.tweens.add({ - targets: playerPokemon, - duration: 250, - ease: 'Sine.easeIn', - scale: 0.5, - onComplete: () => { - playerPokemon.setVisible(false); - this.scene.field.remove(playerPokemon); - this.scene.time.delayedCall(750, () => this.switchAndSummon()); - } - }); - } - - switchAndSummon() { - const party = this.scene.getParty(); - const switchedPokemon = party[this.slotIndex]; - party[this.slotIndex] = this.scene.getPlayerPokemon(); - party[0] = switchedPokemon; - this.scene.ui.showText(`Go! ${switchedPokemon.name}!`); - this.summon(); - } -} - -export class CheckSwitchPhase extends BattlePhase { - constructor(scene: BattleScene) { - super(scene) - } - - start() { - super.start(); - - this.scene.ui.showText('Will you switch\nPOKéMON?', null, () => { - this.scene.ui.setMode(Mode.CONFIRM, () => { - this.scene.unshiftPhase(new SwitchPhase(this.scene, false, true)); - this.end(); - }, () => this.end()); - }); - } -} - -export class CommandPhase extends BattlePhase { - constructor(scene: BattleScene) { - super(scene) - } - - start() { - super.start(); - - this.scene.ui.setMode(Mode.COMMAND).then(() => { - this.scene.currentBattle.addParticipant(this.scene.getPlayerPokemon()); - - this.scene.getPlayerPokemon().resetTurnData(); - this.scene.getEnemyPokemon().resetTurnData(); - }); - } - - handleCommand(command: Command, cursor: integer): boolean{ - const playerPokemon = this.scene.getPlayerPokemon(); - const enemyPokemon = this.scene.getEnemyPokemon(); - let success: boolean; - let delayed: boolean; - - switch (command) { - case Command.FIGHT: - if (playerPokemon.trySelectMove(cursor)) { - const playerPhase = new PlayerMovePhase(this.scene, playerPokemon, playerPokemon.moveset[cursor]); - delayed = playerPokemon.stats[Stat.SPD] < enemyPokemon.stats[Stat.SPD] - || (playerPokemon.stats[Stat.SPD] === enemyPokemon.stats[Stat.SPD] && Utils.randInt(2) === 1) - this.scene.pushPhase(playerPhase); - success = true; - } - break; - case Command.BALL: - if (cursor < 4) { - this.scene.unshiftPhase(new AttemptCapturePhase(this.scene, cursor as PokeballType)); - success = true; - } - break; - case Command.POKEMON: - this.scene.unshiftPhase(new SwitchSummonPhase(this.scene, cursor, true)); - success = true; - break; - } - if (success) { - const enemyMove = enemyPokemon.getNextMove(); - const enemyPhase = new EnemyMovePhase(this.scene, enemyPokemon, enemyMove); - if (delayed) - this.scene.unshiftPhase(enemyPhase); - else - this.scene.pushPhase(enemyPhase); - this.end(); - } - - return success; - } - - end() { - this.scene.ui.setMode(Mode.MESSAGE).then(() => super.end()); - } -} - -export abstract class PokemonPhase extends BattlePhase { - protected player: boolean; - - constructor(scene: BattleScene, player: boolean) { - super(scene); - - this.player = player; - } - - getPokemon() { - return this.player ? this.scene.getPlayerPokemon() : this.scene.getEnemyPokemon(); - } -} - -export abstract class PartyMemberPokemonPhase extends PokemonPhase { - protected partyMemberIndex: integer; - - constructor(scene: BattleScene, partyMemberIndex: integer) { - super(scene, true); - - this.partyMemberIndex = partyMemberIndex; - } - - getPokemon() { - return this.scene.getParty()[this.partyMemberIndex]; - } -} - -abstract class MovePhase extends BattlePhase { - protected pokemon: Pokemon; - protected move: PokemonMove; - - constructor(scene: BattleScene, pokemon: Pokemon, move: PokemonMove) { - super(scene); - - this.pokemon = pokemon; - this.move = move; - } - - abstract getEffectPhase(): MoveEffectPhase; - - canMove(): boolean { - return !!this.pokemon.hp; - } - - start() { - super.start(); - - if (!this.canMove()) { - this.end(); - return; - } - if (!this.move) - console.log(this.pokemon.moveset); - this.scene.ui.showText(`${this.pokemon.name} used\n${this.move.getName()}!`, null, () => { - this.move.ppUsed++; - - if (this.move.getMove().category !== MoveCategory.STATUS) { - if (this.hitCheck()) - this.scene.unshiftPhase(this.getEffectPhase()); - else - this.scene.unshiftPhase(new MessagePhase(this.scene, `${this.pokemon instanceof EnemyPokemon ? 'Foe ' : ''}${this.pokemon.name}'s\nattack missed!`)); - } else - this.scene.unshiftPhase(this.getEffectPhase()); - this.end(); - }, 500); - } - - hitCheck(): boolean { - if (this.move.getMove().category !== MoveCategory.STATUS) { - const userAccuracyLevel = 0; - const targetEvasionLevel = 0; - const rand = Utils.randInt(100, 1); - let accuracyMultiplier = 1; - if (userAccuracyLevel !== targetEvasionLevel) { - accuracyMultiplier = userAccuracyLevel > targetEvasionLevel - ? (3 + Math.min(userAccuracyLevel - targetEvasionLevel, 6)) / 3 - : 3 / (3 + Math.min(targetEvasionLevel - userAccuracyLevel, 6)); - } - return rand <= this.move.getMove().accuracy * accuracyMultiplier; - } - return true; - } - -} - -export class PlayerMovePhase extends MovePhase { - constructor(scene: BattleScene, pokemon: PlayerPokemon, move: PokemonMove) { - super(scene, pokemon, move); - } - - getEffectPhase(): MoveEffectPhase { - return new PlayerMoveEffectPhase(this.scene, this.move); - } -} - -export class EnemyMovePhase extends MovePhase { - constructor(scene: BattleScene, pokemon: EnemyPokemon, move: PokemonMove) { - super(scene, pokemon, move); - } - - getEffectPhase(): MoveEffectPhase { - return new EnemyMoveEffectPhase(this.scene, this.move); - } -} - -abstract class MoveEffectPhase extends PokemonPhase { - protected move: PokemonMove; - - constructor(scene: BattleScene, player: boolean, move: PokemonMove) { - super(scene, player); - - this.move = move; - } - - start() { - super.start(); - - const user = this.getUserPokemon(); - const target = this.getTargetPokemon(); - - new MoveAnim(this.move.getMove().id as Moves, user, target).play(this.scene, () =>{ - this.getTargetPokemon().apply(this.getUserPokemon(), this.move, () => this.end()); - if (this.getUserPokemon().hp <= 0) { - this.scene.pushPhase(new FaintPhase(this.scene, this.player)); - this.getTargetPokemon().resetBattleSummonData(); - } - if (this.getTargetPokemon().hp <= 0) { - this.scene.pushPhase(new FaintPhase(this.scene, !this.player)); - this.getUserPokemon().resetBattleSummonData(); - } - }); - } - - abstract getUserPokemon(): Pokemon; - - abstract getTargetPokemon(): Pokemon; -} - -export class PlayerMoveEffectPhase extends MoveEffectPhase { - constructor(scene: BattleScene, move: PokemonMove) { - super(scene, true, move); - } - - getUserPokemon(): Pokemon { - return this.scene.getPlayerPokemon(); - } - - getTargetPokemon(): Pokemon { - /*if (this.move.getMove().category === MoveCategory.STATUS) - return this.getUserPokemon();*/ - return this.scene.getEnemyPokemon(); - } -} - -export class EnemyMoveEffectPhase extends MoveEffectPhase { - constructor(scene: BattleScene, move: PokemonMove) { - super(scene, false, move); - } - - getUserPokemon(): Pokemon { - return this.scene.getEnemyPokemon(); - } - - getTargetPokemon(): Pokemon { - /*if (this.move.getMove().category === MoveCategory.STATUS) - return this.getUserPokemon();*/ - return this.scene.getPlayerPokemon(); - } -} - -export class ObtainStatusEffectPhase extends PokemonPhase { - private statusEffect: StatusEffect; - - constructor(scene: BattleScene, player: boolean, statusEffect: StatusEffect) { - super(scene, player); - } - - start() { - const pokemon = this.getPokemon(); - if (pokemon.status === StatusEffect.NONE) { - pokemon.status = this.statusEffect; - // Show message and animation - this.end(); - } else - this.end(); - } -} - -export class MessagePhase extends BattlePhase { - private text: string; - private prompt: boolean; - - constructor(scene: BattleScene, text: string, prompt?: boolean) { - super(scene); - - this.text = text; - this.prompt = prompt; - } - - start() { - super.start(); - - this.scene.ui.showText(this.text, null, () => this.end(), this.prompt ? 0 : 1500, this.prompt); - } -} - -export class FaintPhase extends PokemonPhase { - constructor(scene: BattleScene, player: boolean) { - super(scene, player); - } - - start() { - super.start(); - - if (this.player) { - this.scene.unshiftPhase(new MessagePhase(this.scene, `${this.getPokemon().name} fainted!`, true)); - this.scene.unshiftPhase(new SwitchPhase(this.scene, true, false)); - } else { - this.scene.unshiftPhase(new MessagePhase(this.scene, `Foe ${this.getPokemon().name} fainted!`, true)); - this.scene.unshiftPhase(new VictoryPhase(this.scene)); - } - - const pokemon = this.getPokemon(); - pokemon.faintCry(() => { - pokemon.hideInfo(); - this.scene.sound.play('faint'); - this.scene.tweens.add({ - targets: pokemon, - duration: 500, - y: pokemon.y + 150, - ease: 'Sine.easeIn', - onComplete: () => { - pokemon.setVisible(false); - pokemon.y -= 150; - if (pokemon instanceof PlayerPokemon) - this.scene.currentBattle.removeFaintedParticipant(pokemon as PlayerPokemon); - this.scene.field.remove(pokemon); - this.end(); - } - }); - }); - } -} - -export class VictoryPhase extends PokemonPhase { - constructor(scene: BattleScene) { - super(scene, true); - } - - start() { - super.start(); - - const participantIds = this.scene.currentBattle.playerParticipantIds; - const party = this.scene.getParty(); - const expShareModifier = this.scene.getModifier(ExpShareModifier) as ExpShareModifier; - const expValue = this.scene.getEnemyPokemon().getExpValue(party[0]); - for (let pm = 0; pm < party.length; pm++) { - const pokemon = party[pm]; - if (!pokemon.hp) - continue; - const pId = pokemon.id; - const participated = participantIds.has(pId); - if (!participated && !expShareModifier) - continue; - if (pokemon.level < 100) { - let expMultiplier = 0; - if (participated) - expMultiplier += (1 / participantIds.size); - if (expShareModifier) - expMultiplier += expShareModifier.stackCount * 0.1; - console.log(pokemon.species.name, expMultiplier) - this.scene.unshiftPhase(new ExpPhase(this.scene, pm, expValue * expMultiplier)); - } - } - this.scene.unshiftPhase(new SelectModifierPhase(this.scene)); - this.scene.newBattle(); - - this.end(); - } -} - -export class SwitchPhase extends BattlePhase { - private isModal: boolean; - private doReturn: boolean; - - constructor(scene: BattleScene, isModal: boolean, doReturn: boolean) { - super(scene); - - this.isModal = isModal; - this.doReturn = doReturn; - } - - start() { - super.start(); - - this.scene.ui.setMode(Mode.PARTY, this.isModal ? PartyUiMode.FAINT_SWITCH : PartyUiMode.SWITCH, (slotIndex: integer) => { - if (slotIndex && slotIndex < 6) - this.scene.unshiftPhase(new SwitchSummonPhase(this.scene, slotIndex, this.doReturn)); - this.scene.ui.setMode(Mode.MESSAGE).then(() => super.end()); - }, PartyUiHandler.FilterNonFainted); - } -} - -export class ExpPhase extends PartyMemberPokemonPhase { - private expValue: number; - - constructor(scene: BattleScene, partyMemberIndex: integer, expValue: number) { - super(scene, partyMemberIndex); - - this.expValue = expValue; - } - - start() { - super.start(); - - const pokemon = this.getPokemon(); - let exp = new Utils.NumberHolder(this.expValue); - this.scene.applyModifiers(ExpBoosterModifier, exp); - exp.value = Math.floor(exp.value); - this.scene.ui.showText(`${pokemon.name} gained\n${exp.value} EXP. Points!`, null, () => { - const lastLevel = pokemon.level; - let newLevel: integer; - pokemon.addExp(exp.value); - newLevel = pokemon.level; - if (newLevel > lastLevel) - this.scene.unshiftPhase(new LevelUpPhase(this.scene, this.partyMemberIndex, lastLevel, newLevel)); - pokemon.updateInfo().then(() => this.end()); - }, null, true); - } - - -} - -export class LevelUpPhase extends PartyMemberPokemonPhase { - private lastLevel: integer; - private level: integer; - - constructor(scene: BattleScene, partyMemberIndex: integer, lastLevel: integer, level: integer) { - super(scene, partyMemberIndex); - - this.lastLevel = lastLevel; - this.level = level; - } - - start() { - super.start(); - - const pokemon = this.getPokemon(); - const prevStats = pokemon.stats.slice(0); - pokemon.calculateStats(); - pokemon.updateInfo(); - this.scene.pauseBgm(); - this.scene.sound.play('level_up_fanfare'); - this.scene.ui.showText(`${this.getPokemon().name} grew to\nLV. ${this.level}!`, null, () => this.scene.ui.getMessageHandler().promptLevelUpStats(prevStats, false, () => this.end()), null, true); - const levelMoves = this.getPokemon().getLevelMoves(this.lastLevel + 1); - for (let lm of levelMoves) - this.scene.unshiftPhase(new LearnMovePhase(this.scene, this.partyMemberIndex, lm)); - const evolution = pokemon.getEvolution(); - if (evolution) - this.scene.unshiftPhase(new EvolutionPhase(this.scene, this.partyMemberIndex, evolution, this.lastLevel)); - this.scene.time.delayedCall(1500, () => this.scene.resumeBgm()); - } -} - -export class LearnMovePhase extends PartyMemberPokemonPhase { - private moveId: Moves; - - constructor(scene: BattleScene, partyMemberIndex: integer, moveId: Moves) { - super(scene, partyMemberIndex); - - this.moveId = moveId; - } - - start() { - super.start(); - - const pokemon = this.getPokemon(); - const move = allMoves[this.moveId - 1]; - - const existingMoveIndex = pokemon.moveset.findIndex(m => m?.moveId === move.id); - - if (existingMoveIndex > -1) { - this.end(); - return; - } - - const emptyMoveIndex = pokemon.moveset.length < 4 - ? pokemon.moveset.length - : pokemon.moveset.findIndex(m => m === null); - - const messageMode = this.scene.ui.getHandler() instanceof EvolutionSceneHandler - ? Mode.EVOLUTION_SCENE - : Mode.MESSAGE; - - if (emptyMoveIndex > -1) { - pokemon.moveset[emptyMoveIndex] = new PokemonMove(this.moveId, 0, 0); - initAnim(this.moveId).then(() => { - loadMoveAnimAssets(this.scene, [ this.moveId ], true) - .then(() => { - this.scene.ui.setMode(messageMode).then(() => { - this.scene.pauseBgm(); - this.scene.sound.play('level_up_fanfare'); - this.scene.ui.showText(`${pokemon.name} learned\n${Utils.toPokemonUpperCase(move.name)}!`, null, () => this.end(), messageMode === Mode.EVOLUTION_SCENE ? 1000 : null, true); - this.scene.time.delayedCall(1500, () => this.scene.resumeBgm()); - }); - }); - }); - } else { - this.scene.ui.setMode(messageMode).then(() => { - this.scene.ui.showText(`${pokemon.name} wants to learn the\nmove ${move.name}.`, null, () => { - this.scene.ui.showText(`However, ${pokemon.name} already\nknows four moves.`, null, () => { - this.scene.ui.showText(`Should a move be deleted and\nreplaced with ${move.name}?`, null, () => { - const noHandler = () => { - this.scene.ui.setMode(messageMode).then(() => { - this.scene.ui.showText(`Stop trying to teach\n${move.name}?`, null, () => { - this.scene.ui.setModeWithoutClear(Mode.CONFIRM, () => { - this.scene.ui.setMode(messageMode); - this.scene.ui.showText(`${pokemon.name} did not learn the\nmove ${move.name}.`, null, () => this.end(), null, true); - }, () => { - this.scene.ui.setMode(messageMode); - this.scene.unshiftPhase(new LearnMovePhase(this.scene, this.partyMemberIndex, this.moveId)); - this.end(); - }); - }); - }); - }; - this.scene.ui.setModeWithoutClear(Mode.CONFIRM, () => { - this.scene.ui.setMode(messageMode); - this.scene.ui.showText('Which move should be forgotten?', null, () => { - this.scene.ui.setModeWithoutClear(Mode.SUMMARY, this.getPokemon(), SummaryUiMode.LEARN_MOVE, move, (moveIndex: integer) => { - if (moveIndex === 4) { - noHandler(); - return; - } - this.scene.ui.setMode(messageMode).then(() => { - this.scene.ui.showText('@d{32}1, @d{15}2, and@d{15}… @d{15}… @d{15}… @d{15}@s{pb_bounce_1}Poof!', null, () => { - this.scene.ui.showText(`${pokemon.name} forgot how to\nuse ${pokemon.moveset[moveIndex].getName()}.`, null, () => { - this.scene.ui.showText('And…', null, () => { - pokemon.moveset[moveIndex] = null; - this.scene.unshiftPhase(new LearnMovePhase(this.scene, this.partyMemberIndex, this.moveId)); - this.end(); - }, null, true); - }, null, true); - }, null, true); - }); - }); - }, null, true); - }, noHandler); - }); - }, null, true); - }, null, true); - }); - } - } -} - -export class AttemptCapturePhase extends BattlePhase { - private pokeballType: PokeballType; - private pokeball: Phaser.GameObjects.Sprite; - private originalY: number; - - constructor(scene: BattleScene, pokeballType: PokeballType) { - super(scene); - - this.pokeballType = pokeballType; - } - - start() { - super.start(); - - this.scene.pokeballCounts[this.pokeballType]--; - - const pokemon = this.scene.getEnemyPokemon(); - this.originalY = pokemon.y; - - const _3m = 3 * pokemon.getMaxHp(); - const _2h = 2 * pokemon.hp; - const catchRate = pokemon.species.catchRate; - const pokeballMultiplier = getPokeballCatchMultiplier(this.pokeballType); - const statusMultiplier = 1; - const x = Math.round((((_3m - _2h) * catchRate * pokeballMultiplier) / _3m) * statusMultiplier); - const y = Math.round(65536 / Math.sqrt(Math.sqrt(255 / x))); - - const pokeballAtlasKey = getPokeballAtlasKey(this.pokeballType); - this.pokeball = this.scene.add.sprite(16, 80, 'pb', pokeballAtlasKey); - this.pokeball.setOrigin(0.5, 0.625); - this.scene.field.add(this.pokeball); - - this.scene.sound.play('pb_throw'); - this.scene.time.delayedCall(300, () => { - this.scene.field.moveBelow(this.pokeball, pokemon); - }); - this.scene.tweens.add({ - targets: this.pokeball, - x: { value: 236, ease: 'Linear' }, - y: { value: 16, ease: 'Cubic.easeOut' }, - duration: 500, - onComplete: () => { - this.pokeball.setTexture('pb', `${pokeballAtlasKey}_opening`); - this.scene.time.delayedCall(17, () => this.pokeball.setTexture('pb', `${pokeballAtlasKey}_open`)); - this.scene.sound.play('pb_rel'); - pokemon.tint(getPokeballTintColor(this.pokeballType)); - this.scene.tweens.add({ - targets: pokemon, - duration: 250, - ease: 'Sine.easeIn', - scale: 0.25, - y: 20, - onComplete: () => { - this.pokeball.setTexture('pb', `${pokeballAtlasKey}_opening`); - pokemon.setVisible(false); - this.scene.sound.play('pb_catch'); - this.scene.time.delayedCall(17, () => this.pokeball.setTexture('pb', `${pokeballAtlasKey}`)); - - const doShake = this.pokeballType !== PokeballType.MASTER_BALL ? () => { - let shakeCount = 0; - const pbX = this.pokeball.x; - const shakeCounter = this.scene.tweens.addCounter({ - from: 0, - to: 1, - repeat: 4, - yoyo: true, - ease: 'Cubic.easeOut', - duration: 250, - repeatDelay: 500, - onUpdate: t => { - if (shakeCount && shakeCount < 4) { - const value = t.getValue(); - const directionMultiplier = shakeCount % 2 === 1 ? 1 : -1; - this.pokeball.setX(pbX + value * 4 * directionMultiplier); - this.pokeball.setAngle(value * 27.5 * directionMultiplier); - } - }, - onRepeat: () => { - if (shakeCount++ < 3) { - if (Utils.randInt(65536) < y) - this.scene.sound.play('pb_move'); - else { - shakeCounter.stop(); - this.release(shakeCount); - } - } else - this.scene.sound.play('pb_lock') - }, - onComplete: () => { - this.catch(); - } - }); - } : () => this.catch(); - - this.scene.time.delayedCall(250, () => doPokeballBounceAnim(this.scene, this.pokeball, 16, 72, 350, doShake)); - } - }); - } - }); - } - - release(shakeCount: integer) { - const pokemon = this.scene.getEnemyPokemon(); - - this.scene.sound.play('pb_rel'); - pokemon.setY(this.originalY); - pokemon.cry(); - pokemon.tint(getPokeballTintColor(this.pokeballType)); - pokemon.setVisible(true); - pokemon.untint(250, 'Sine.easeOut'); - - const pokeballAtlasKey = getPokeballAtlasKey(this.pokeballType); - this.pokeball.setTexture('pb', `${pokeballAtlasKey}_opening`); - this.scene.time.delayedCall(17, () => this.pokeball.setTexture('pb', `${pokeballAtlasKey}_open`)); - - this.scene.tweens.add({ - targets: pokemon, - duration: 250, - ease: 'Sine.easeOut', - scale: 1 - }); - - this.removePb(); - this.end(); - } - - catch() { - console.log(this, 'catch') - const pokemon = this.scene.getEnemyPokemon(); - this.scene.unshiftPhase(new VictoryPhase(this.scene)); - this.scene.ui.showText(`${pokemon.name} was caught!`, null, () => { - pokemon.hideInfo(); - const newPokemon = pokemon.addToParty(); - this.scene.field.remove(pokemon, true); - newPokemon.loadAssets().then(() => { - this.removePb(); - this.end(); - }); - }, 0, true); - } - - removePb() { - this.scene.tweens.add({ - targets: this.pokeball, - duration: 250, - delay: 250, - ease: 'Sine.easeIn', - alpha: 0, - onComplete: () => this.pokeball.destroy() - }); - } -} - -export class SelectModifierPhase extends BattlePhase { - constructor(scene: BattleScene) { - super(scene); - } - - start() { - super.start(); - - const party = this.scene.getParty(); - regenerateModifierPoolThresholds(party); - const modifierCount = new Utils.IntegerHolder(3); - this.scene.applyModifiers(ExtraModifierModifier, modifierCount); - const types: Array = getModifierTypesForWave(this.scene.currentBattle.waveIndex - 1, modifierCount.value, party); - - const modifierSelectCallback = (cursor: integer) => { - if (cursor < 0) { - this.scene.ui.setMode(Mode.MESSAGE); - super.end(); - return; - } - - const modifierType = types[cursor]; - if (modifierType instanceof PokemonModifierType) { - const pokemonModifierType = modifierType as PokemonModifierType; - this.scene.ui.setModeWithoutClear(Mode.PARTY, PartyUiMode.MODIFIER, (slotIndex: integer) => { - if (slotIndex < 6) { - this.scene.ui.setMode(Mode.MODIFIER_SELECT); - this.scene.addModifier(types[cursor].newModifier(party[slotIndex])).then(() => super.end()); - this.scene.ui.clearText(); - this.scene.ui.setMode(Mode.MESSAGE); - } else - this.scene.ui.setMode(Mode.MODIFIER_SELECT, types, modifierSelectCallback); - }, pokemonModifierType.selectFilter); - } else { - this.scene.addModifier(types[cursor].newModifier()).then(() => super.end()); - this.scene.ui.clearText(); - this.scene.ui.setMode(Mode.MESSAGE); - } - }; - this.scene.ui.setMode(Mode.MODIFIER_SELECT, types, modifierSelectCallback); - } -} - -export class ShinySparklePhase extends PokemonPhase { - constructor(scene: BattleScene, player: boolean) { - super(scene, player); - } - - start() { - super.start(); - - this.getPokemon().sparkle(); - this.scene.time.delayedCall(1000, () => this.end()); - } } \ No newline at end of file diff --git a/src/battle-phases.ts b/src/battle-phases.ts new file mode 100644 index 000000000..a33356526 --- /dev/null +++ b/src/battle-phases.ts @@ -0,0 +1,1061 @@ +import BattleScene from "./battle-scene"; +import { default as Pokemon, PlayerPokemon, EnemyPokemon, PokemonMove } from "./pokemon"; +import * as Utils from './utils'; +import { allMoves, MoveCategory, Moves } from "./move"; +import { Mode } from './ui/ui'; +import { Command } from "./ui/command-ui-handler"; +import { Stat } from "./pokemon-stat"; +import { ExpBoosterModifier, ExpShareModifier, ExtraModifierModifier, getModifierTypesForWave, ModifierType, PokemonModifierType, regenerateModifierPoolThresholds } from "./modifier"; +import PartyUiHandler, { PartyUiMode } from "./ui/party-ui-handler"; +import { doPokeballBounceAnim, getPokeballAtlasKey, getPokeballCatchMultiplier, getPokeballTintColor as getPokeballTintColor, PokeballType } from "./pokeball"; +import { MoveAnim, initAnim, loadMoveAnimAssets } from "./battle-anims"; +import { StatusEffect } from "./status-effect"; +import { SummaryUiMode } from "./ui/summary-ui-handler"; +import EvolutionSceneHandler from "./ui/evolution-scene-handler"; +import { EvolutionPhase } from "./evolution-phase"; +import { BattlePhase } from "./battle-phase"; + +export class SelectStarterPhase extends BattlePhase { + constructor(scene: BattleScene) { + super(scene); + } + + start() { + super.start(); + + this.scene.ui.setMode(Mode.STARTER_SELECT); + } +} + +export class EncounterPhase extends BattlePhase { + constructor(scene: BattleScene) { + super(scene); + } + + start() { + super.start(); + + const battle = this.scene.currentBattle; + const enemySpecies = this.scene.arena.randomSpecies(1, battle.enemyLevel); + battle.enemyPokemon = new EnemyPokemon(this.scene, enemySpecies, battle.enemyLevel); + const enemyPokemon = this.scene.getEnemyPokemon(); + + console.log(enemyPokemon.species.name, enemyPokemon.species.speciesId, enemyPokemon.stats); + + enemyPokemon.loadAssets().then(() => { + this.scene.field.add(enemyPokemon); + if (this.scene.getPlayerPokemon().visible) + this.scene.field.moveBelow(enemyPokemon, this.scene.getPlayerPokemon()); + enemyPokemon.tint(0, 0.5); + + this.scene.ui.setMode(Mode.MESSAGE).then(() => this.doEncounter()); + }); + } + + doEncounter() { + const enemyPokemon = this.scene.getEnemyPokemon(); + this.scene.tweens.add({ + targets: [ this.scene.arenaEnemy, enemyPokemon, this.scene.arenaPlayer, this.scene.trainer ], + x: (_target, _key, value, targetIndex: integer) => targetIndex < 2 ? value + 300 : value - 300, + duration: 2000, + onComplete: () => { + enemyPokemon.untint(100, 'Sine.easeOut'); + enemyPokemon.cry(); + enemyPokemon.showInfo(); + this.scene.ui.showText(`A wild ${enemyPokemon.name} appeared!`, null, () => this.end(), 1500); + } + }); + } + + end() { + if (this.scene.getEnemyPokemon().shiny) + this.scene.unshiftPhase(new ShinySparklePhase(this.scene, false)); + // TODO: Remove + //this.scene.unshiftPhase(new SelectModifierPhase(this.scene)); + + super.end(); + } +} + +export class NextEncounterPhase extends EncounterPhase { + constructor(scene: BattleScene) { + super(scene); + } + + doEncounter(): void { + const enemyPokemon = this.scene.getEnemyPokemon(); + this.scene.tweens.add({ + targets: [ this.scene.arenaEnemy, this.scene.arenaNextEnemy, enemyPokemon ], + x: '+=300', + duration: 2000, + onComplete: () => { + this.scene.arenaEnemy.setX(this.scene.arenaNextEnemy.x); + this.scene.arenaNextEnemy.setX(this.scene.arenaNextEnemy.x - 300); + enemyPokemon.untint(100, 'Sine.easeOut'); + enemyPokemon.cry(); + enemyPokemon.showInfo(); + this.scene.ui.showText(`A wild ${enemyPokemon.name} appeared!`, null, () => this.end(), 1500); + } + }); + } + + end() { + if (this.scene.getEnemyPokemon().shiny) + this.scene.unshiftPhase(new ShinySparklePhase(this.scene, false)); + + this.scene.unshiftPhase(new CheckSwitchPhase(this.scene)); + + super.end(); + } +} + +export class NewBiomeEncounterPhase extends NextEncounterPhase { + constructor(scene: BattleScene) { + super(scene); + } + + doEncounter(): void { + const enemyPokemon = this.scene.getEnemyPokemon(); + this.scene.tweens.add({ + targets: [ this.scene.arenaEnemy, enemyPokemon ], + x: (_target, _key, value, targetIndex: integer) => targetIndex < 2 ? value + 300 : value - 300, + duration: 2000, + onComplete: () => { + enemyPokemon.untint(100, 'Sine.easeOut'); + enemyPokemon.cry(); + enemyPokemon.showInfo(); + this.scene.ui.showText(`A wild ${enemyPokemon.name} appeared!`, null, () => this.end(), 1500); + } + }); + } +} + +export class SwitchBiomePhase extends BattlePhase { + constructor(scene: BattleScene) { + super(scene); + } + + start() { + super.start(); + + this.scene.arena.fadeOutBgm(2000); + + this.scene.tweens.add({ + targets: this.scene.arenaEnemy, + x: '+=300', + duration: 2000, + onComplete: () => { + this.scene.arenaEnemy.setX(this.scene.arenaEnemy.x - 600); + + this.scene.newBiome(); + + const biomeKey = this.scene.arena.getBiomeKey(); + const bgTexture = `${biomeKey}_bg`; + const playerTexture = `${biomeKey}_a`; + const enemyTexture = `${biomeKey}_b`; + this.scene.arenaBgTransition.setTexture(bgTexture) + this.scene.arenaBgTransition.setAlpha(0); + this.scene.arenaBgTransition.setVisible(true); + this.scene.arenaPlayerTransition.setTexture(playerTexture) + this.scene.arenaPlayerTransition.setAlpha(0); + this.scene.arenaPlayerTransition.setVisible(true); + + this.scene.time.delayedCall(1000, () => this.scene.arena.playBgm()); + + this.scene.tweens.add({ + targets: [ this.scene.arenaBgTransition, this.scene.arenaPlayerTransition ], + duration: 1000, + delay: 1000, + ease: 'Sine.easeInOut', + alpha: 1, + onComplete: () => { + this.scene.arenaBg.setTexture(bgTexture); + this.scene.arenaPlayer.setTexture(playerTexture); + this.scene.arenaEnemy.setTexture(enemyTexture); + this.scene.arenaNextEnemy.setTexture(enemyTexture); + this.scene.arenaBgTransition.setVisible(false); + this.scene.arenaPlayerTransition.setVisible(false); + + this.end(); + } + }) + } + }); + } +} + +export class SummonPhase extends BattlePhase { + constructor(scene: BattleScene) { + super(scene); + } + + start() { + super.start(); + + this.preSummon(); + } + + preSummon(): void { + this.scene.ui.showText(`Go! ${this.scene.getPlayerPokemon().name}!`); + this.scene.trainer.play('trainer_m_pb'); + this.scene.tweens.add({ + targets: this.scene.trainer, + x: -36, + duration: 1000 + }); + this.scene.time.delayedCall(750, () => this.summon()); + } + + summon(): void { + const pokeball = this.scene.add.sprite(36, 80, 'pb', 'pb'); + pokeball.setVisible(false); + pokeball.setOrigin(0.5, 0.625); + this.scene.field.add(pokeball); + + const playerPokemon = this.scene.getPlayerPokemon(); + + pokeball.setVisible(true); + this.scene.tweens.add({ + targets: pokeball, + ease: 'Cubic.easeOut', + duration: 150, + x: 54, + y: 70, + onComplete: () => { + this.scene.tweens.add({ + targets: pokeball, + duration: 500, + angle: 1440, + x: 100, + y: 132, + ease: 'Cubic.easeIn', + onComplete: () => { + this.scene.sound.play('pb_rel'); + pokeball.destroy(); + this.scene.add.existing(playerPokemon); + this.scene.field.add(playerPokemon); + playerPokemon.showInfo(); + playerPokemon.playAnim(); + playerPokemon.setVisible(true); + playerPokemon.setScale(0.5); + playerPokemon.tint(getPokeballTintColor(playerPokemon.pokeball)); + playerPokemon.untint(250, 'Sine.easeIn'); + this.scene.tweens.add({ + targets: playerPokemon, + duration: 250, + ease: 'Sine.easeIn', + scale: 1, + onComplete: () => { + playerPokemon.cry(); + playerPokemon.getSprite().clearTint(); + playerPokemon.resetSummonData(); + this.scene.time.delayedCall(1000, () => this.end()); + } + }); + } + }); + } + }); + } + + end() { + if (this.scene.getPlayerPokemon().shiny) + this.scene.unshiftPhase(new ShinySparklePhase(this.scene, true)); + + super.end(); + } +} + +export class SwitchSummonPhase extends SummonPhase { + private slotIndex: integer; + private doReturn: boolean; + + constructor(scene: BattleScene, slotIndex: integer, doReturn: boolean) { + super(scene); + + this.slotIndex = slotIndex; + this.doReturn = doReturn; + } + + start() { + super.start(); + } + + preSummon(): void { + if (!this.doReturn) { + this.switchAndSummon(); + return; + } + + const playerPokemon = this.scene.getPlayerPokemon(); + + this.scene.ui.showText(`Come back, ${this.scene.getPlayerPokemon().name}!`); + this.scene.sound.play('pb_rel'); + playerPokemon.hideInfo(); + playerPokemon.tint(getPokeballTintColor(playerPokemon.pokeball), 1, 250, 'Sine.easeIn'); + this.scene.tweens.add({ + targets: playerPokemon, + duration: 250, + ease: 'Sine.easeIn', + scale: 0.5, + onComplete: () => { + playerPokemon.setVisible(false); + this.scene.field.remove(playerPokemon); + this.scene.time.delayedCall(750, () => this.switchAndSummon()); + } + }); + } + + switchAndSummon() { + const party = this.scene.getParty(); + const switchedPokemon = party[this.slotIndex]; + party[this.slotIndex] = this.scene.getPlayerPokemon(); + party[0] = switchedPokemon; + this.scene.ui.showText(`Go! ${switchedPokemon.name}!`); + this.summon(); + } +} + +export class CheckSwitchPhase extends BattlePhase { + constructor(scene: BattleScene) { + super(scene) + } + + start() { + super.start(); + + this.scene.ui.showText('Will you switch\nPOKéMON?', null, () => { + this.scene.ui.setMode(Mode.CONFIRM, () => { + this.scene.unshiftPhase(new SwitchPhase(this.scene, false, true)); + this.end(); + }, () => this.end()); + }); + } +} + +export class CommandPhase extends BattlePhase { + constructor(scene: BattleScene) { + super(scene) + } + + start() { + super.start(); + + this.scene.ui.setMode(Mode.COMMAND).then(() => { + this.scene.currentBattle.addParticipant(this.scene.getPlayerPokemon()); + + this.scene.getPlayerPokemon().resetTurnData(); + this.scene.getEnemyPokemon().resetTurnData(); + }); + } + + handleCommand(command: Command, cursor: integer): boolean{ + const playerPokemon = this.scene.getPlayerPokemon(); + const enemyPokemon = this.scene.getEnemyPokemon(); + let success: boolean; + let delayed: boolean; + + switch (command) { + case Command.FIGHT: + if (playerPokemon.trySelectMove(cursor)) { + const playerPhase = new PlayerMovePhase(this.scene, playerPokemon, playerPokemon.moveset[cursor]); + delayed = playerPokemon.stats[Stat.SPD] < enemyPokemon.stats[Stat.SPD] + || (playerPokemon.stats[Stat.SPD] === enemyPokemon.stats[Stat.SPD] && Utils.randInt(2) === 1) + this.scene.pushPhase(playerPhase); + success = true; + } + break; + case Command.BALL: + if (cursor < 4) { + this.scene.unshiftPhase(new AttemptCapturePhase(this.scene, cursor as PokeballType)); + success = true; + } + break; + case Command.POKEMON: + this.scene.unshiftPhase(new SwitchSummonPhase(this.scene, cursor, true)); + success = true; + break; + } + if (success) { + const enemyMove = enemyPokemon.getNextMove(); + const enemyPhase = new EnemyMovePhase(this.scene, enemyPokemon, enemyMove); + if (delayed) + this.scene.unshiftPhase(enemyPhase); + else + this.scene.pushPhase(enemyPhase); + this.end(); + } + + return success; + } + + end() { + this.scene.ui.setMode(Mode.MESSAGE).then(() => super.end()); + } +} + +export abstract class PokemonPhase extends BattlePhase { + protected player: boolean; + + constructor(scene: BattleScene, player: boolean) { + super(scene); + + this.player = player; + } + + getPokemon() { + return this.player ? this.scene.getPlayerPokemon() : this.scene.getEnemyPokemon(); + } +} + +export abstract class PartyMemberPokemonPhase extends PokemonPhase { + protected partyMemberIndex: integer; + + constructor(scene: BattleScene, partyMemberIndex: integer) { + super(scene, true); + + this.partyMemberIndex = partyMemberIndex; + } + + getPokemon() { + return this.scene.getParty()[this.partyMemberIndex]; + } +} + +abstract class MovePhase extends BattlePhase { + protected pokemon: Pokemon; + protected move: PokemonMove; + + constructor(scene: BattleScene, pokemon: Pokemon, move: PokemonMove) { + super(scene); + + this.pokemon = pokemon; + this.move = move; + } + + abstract getEffectPhase(): MoveEffectPhase; + + canMove(): boolean { + return !!this.pokemon.hp; + } + + start() { + super.start(); + + if (!this.canMove()) { + this.end(); + return; + } + if (!this.move) + console.log(this.pokemon.moveset); + this.scene.ui.showText(`${this.pokemon.name} used\n${this.move.getName()}!`, null, () => { + this.move.ppUsed++; + + if (this.move.getMove().category !== MoveCategory.STATUS) { + if (this.hitCheck()) + this.scene.unshiftPhase(this.getEffectPhase()); + else + this.scene.unshiftPhase(new MessagePhase(this.scene, `${this.pokemon instanceof EnemyPokemon ? 'Foe ' : ''}${this.pokemon.name}'s\nattack missed!`)); + } else + this.scene.unshiftPhase(this.getEffectPhase()); + this.end(); + }, 500); + } + + hitCheck(): boolean { + if (this.move.getMove().category !== MoveCategory.STATUS) { + const userAccuracyLevel = 0; + const targetEvasionLevel = 0; + const rand = Utils.randInt(100, 1); + let accuracyMultiplier = 1; + if (userAccuracyLevel !== targetEvasionLevel) { + accuracyMultiplier = userAccuracyLevel > targetEvasionLevel + ? (3 + Math.min(userAccuracyLevel - targetEvasionLevel, 6)) / 3 + : 3 / (3 + Math.min(targetEvasionLevel - userAccuracyLevel, 6)); + } + return rand <= this.move.getMove().accuracy * accuracyMultiplier; + } + return true; + } + +} + +export class PlayerMovePhase extends MovePhase { + constructor(scene: BattleScene, pokemon: PlayerPokemon, move: PokemonMove) { + super(scene, pokemon, move); + } + + getEffectPhase(): MoveEffectPhase { + return new PlayerMoveEffectPhase(this.scene, this.move); + } +} + +export class EnemyMovePhase extends MovePhase { + constructor(scene: BattleScene, pokemon: EnemyPokemon, move: PokemonMove) { + super(scene, pokemon, move); + } + + getEffectPhase(): MoveEffectPhase { + return new EnemyMoveEffectPhase(this.scene, this.move); + } +} + +abstract class MoveEffectPhase extends PokemonPhase { + protected move: PokemonMove; + + constructor(scene: BattleScene, player: boolean, move: PokemonMove) { + super(scene, player); + + this.move = move; + } + + start() { + super.start(); + + const user = this.getUserPokemon(); + const target = this.getTargetPokemon(); + + new MoveAnim(this.move.getMove().id as Moves, user, target).play(this.scene, () =>{ + this.getTargetPokemon().apply(this.getUserPokemon(), this.move, () => this.end()); + if (this.getUserPokemon().hp <= 0) { + this.scene.pushPhase(new FaintPhase(this.scene, this.player)); + this.getTargetPokemon().resetBattleSummonData(); + } + if (this.getTargetPokemon().hp <= 0) { + this.scene.pushPhase(new FaintPhase(this.scene, !this.player)); + this.getUserPokemon().resetBattleSummonData(); + } + }); + } + + abstract getUserPokemon(): Pokemon; + + abstract getTargetPokemon(): Pokemon; +} + +export class PlayerMoveEffectPhase extends MoveEffectPhase { + constructor(scene: BattleScene, move: PokemonMove) { + super(scene, true, move); + } + + getUserPokemon(): Pokemon { + return this.scene.getPlayerPokemon(); + } + + getTargetPokemon(): Pokemon { + /*if (this.move.getMove().category === MoveCategory.STATUS) + return this.getUserPokemon();*/ + return this.scene.getEnemyPokemon(); + } +} + +export class EnemyMoveEffectPhase extends MoveEffectPhase { + constructor(scene: BattleScene, move: PokemonMove) { + super(scene, false, move); + } + + getUserPokemon(): Pokemon { + return this.scene.getEnemyPokemon(); + } + + getTargetPokemon(): Pokemon { + /*if (this.move.getMove().category === MoveCategory.STATUS) + return this.getUserPokemon();*/ + return this.scene.getPlayerPokemon(); + } +} + +export class ObtainStatusEffectPhase extends PokemonPhase { + private statusEffect: StatusEffect; + + constructor(scene: BattleScene, player: boolean, statusEffect: StatusEffect) { + super(scene, player); + } + + start() { + const pokemon = this.getPokemon(); + if (pokemon.status === StatusEffect.NONE) { + pokemon.status = this.statusEffect; + // Show message and animation + this.end(); + } else + this.end(); + } +} + +export class MessagePhase extends BattlePhase { + private text: string; + private prompt: boolean; + + constructor(scene: BattleScene, text: string, prompt?: boolean) { + super(scene); + + this.text = text; + this.prompt = prompt; + } + + start() { + super.start(); + + this.scene.ui.showText(this.text, null, () => this.end(), this.prompt ? 0 : 1500, this.prompt); + } +} + +export class FaintPhase extends PokemonPhase { + constructor(scene: BattleScene, player: boolean) { + super(scene, player); + } + + start() { + super.start(); + + if (this.player) { + this.scene.unshiftPhase(new MessagePhase(this.scene, `${this.getPokemon().name} fainted!`, true)); + this.scene.unshiftPhase(new SwitchPhase(this.scene, true, false)); + } else { + this.scene.unshiftPhase(new MessagePhase(this.scene, `Foe ${this.getPokemon().name} fainted!`, true)); + this.scene.unshiftPhase(new VictoryPhase(this.scene)); + } + + const pokemon = this.getPokemon(); + pokemon.faintCry(() => { + pokemon.hideInfo(); + this.scene.sound.play('faint'); + this.scene.tweens.add({ + targets: pokemon, + duration: 500, + y: pokemon.y + 150, + ease: 'Sine.easeIn', + onComplete: () => { + pokemon.setVisible(false); + pokemon.y -= 150; + if (pokemon instanceof PlayerPokemon) + this.scene.currentBattle.removeFaintedParticipant(pokemon as PlayerPokemon); + this.scene.field.remove(pokemon); + this.end(); + } + }); + }); + } +} + +export class VictoryPhase extends PokemonPhase { + constructor(scene: BattleScene) { + super(scene, true); + } + + start() { + super.start(); + + const participantIds = this.scene.currentBattle.playerParticipantIds; + const party = this.scene.getParty(); + const expShareModifier = this.scene.getModifier(ExpShareModifier) as ExpShareModifier; + const expValue = this.scene.getEnemyPokemon().getExpValue(party[0]); + for (let pm = 0; pm < party.length; pm++) { + const pokemon = party[pm]; + if (!pokemon.hp) + continue; + const pId = pokemon.id; + const participated = participantIds.has(pId); + if (!participated && !expShareModifier) + continue; + if (pokemon.level < 100) { + let expMultiplier = 0; + if (participated) + expMultiplier += (1 / participantIds.size); + if (expShareModifier) + expMultiplier += expShareModifier.stackCount * 0.1; + console.log(pokemon.species.name, expMultiplier) + this.scene.unshiftPhase(new ExpPhase(this.scene, pm, expValue * expMultiplier)); + } + } + this.scene.unshiftPhase(new SelectModifierPhase(this.scene)); + this.scene.newBattle(); + + this.end(); + } +} + +export class SwitchPhase extends BattlePhase { + private isModal: boolean; + private doReturn: boolean; + + constructor(scene: BattleScene, isModal: boolean, doReturn: boolean) { + super(scene); + + this.isModal = isModal; + this.doReturn = doReturn; + } + + start() { + super.start(); + + this.scene.ui.setMode(Mode.PARTY, this.isModal ? PartyUiMode.FAINT_SWITCH : PartyUiMode.SWITCH, (slotIndex: integer) => { + if (slotIndex && slotIndex < 6) + this.scene.unshiftPhase(new SwitchSummonPhase(this.scene, slotIndex, this.doReturn)); + this.scene.ui.setMode(Mode.MESSAGE).then(() => super.end()); + }, PartyUiHandler.FilterNonFainted); + } +} + +export class ExpPhase extends PartyMemberPokemonPhase { + private expValue: number; + + constructor(scene: BattleScene, partyMemberIndex: integer, expValue: number) { + super(scene, partyMemberIndex); + + this.expValue = expValue; + } + + start() { + super.start(); + + const pokemon = this.getPokemon(); + let exp = new Utils.NumberHolder(this.expValue); + this.scene.applyModifiers(ExpBoosterModifier, exp); + exp.value = Math.floor(exp.value); + this.scene.ui.showText(`${pokemon.name} gained\n${exp.value} EXP. Points!`, null, () => { + const lastLevel = pokemon.level; + let newLevel: integer; + pokemon.addExp(exp.value); + newLevel = pokemon.level; + if (newLevel > lastLevel) + this.scene.unshiftPhase(new LevelUpPhase(this.scene, this.partyMemberIndex, lastLevel, newLevel)); + pokemon.updateInfo().then(() => this.end()); + }, null, true); + } + + +} + +export class LevelUpPhase extends PartyMemberPokemonPhase { + private lastLevel: integer; + private level: integer; + + constructor(scene: BattleScene, partyMemberIndex: integer, lastLevel: integer, level: integer) { + super(scene, partyMemberIndex); + + this.lastLevel = lastLevel; + this.level = level; + } + + start() { + super.start(); + + const pokemon = this.getPokemon(); + const prevStats = pokemon.stats.slice(0); + pokemon.calculateStats(); + pokemon.updateInfo(); + this.scene.pauseBgm(); + this.scene.sound.play('level_up_fanfare'); + this.scene.ui.showText(`${this.getPokemon().name} grew to\nLV. ${this.level}!`, null, () => this.scene.ui.getMessageHandler().promptLevelUpStats(prevStats, false, () => this.end()), null, true); + const levelMoves = this.getPokemon().getLevelMoves(this.lastLevel + 1); + for (let lm of levelMoves) + this.scene.unshiftPhase(new LearnMovePhase(this.scene, this.partyMemberIndex, lm)); + const evolution = pokemon.getEvolution(); + if (evolution) + this.scene.unshiftPhase(new EvolutionPhase(this.scene, this.partyMemberIndex, evolution, this.lastLevel)); + this.scene.time.delayedCall(1500, () => this.scene.resumeBgm()); + } +} + +export class LearnMovePhase extends PartyMemberPokemonPhase { + private moveId: Moves; + + constructor(scene: BattleScene, partyMemberIndex: integer, moveId: Moves) { + super(scene, partyMemberIndex); + + this.moveId = moveId; + } + + start() { + super.start(); + + const pokemon = this.getPokemon(); + const move = allMoves[this.moveId - 1]; + + const existingMoveIndex = pokemon.moveset.findIndex(m => m?.moveId === move.id); + + if (existingMoveIndex > -1) { + this.end(); + return; + } + + const emptyMoveIndex = pokemon.moveset.length < 4 + ? pokemon.moveset.length + : pokemon.moveset.findIndex(m => m === null); + + const messageMode = this.scene.ui.getHandler() instanceof EvolutionSceneHandler + ? Mode.EVOLUTION_SCENE + : Mode.MESSAGE; + + if (emptyMoveIndex > -1) { + pokemon.moveset[emptyMoveIndex] = new PokemonMove(this.moveId, 0, 0); + initAnim(this.moveId).then(() => { + loadMoveAnimAssets(this.scene, [ this.moveId ], true) + .then(() => { + this.scene.ui.setMode(messageMode).then(() => { + this.scene.pauseBgm(); + this.scene.sound.play('level_up_fanfare'); + this.scene.ui.showText(`${pokemon.name} learned\n${Utils.toPokemonUpperCase(move.name)}!`, null, () => this.end(), messageMode === Mode.EVOLUTION_SCENE ? 1000 : null, true); + this.scene.time.delayedCall(1500, () => this.scene.resumeBgm()); + }); + }); + }); + } else { + this.scene.ui.setMode(messageMode).then(() => { + this.scene.ui.showText(`${pokemon.name} wants to learn the\nmove ${move.name}.`, null, () => { + this.scene.ui.showText(`However, ${pokemon.name} already\nknows four moves.`, null, () => { + this.scene.ui.showText(`Should a move be deleted and\nreplaced with ${move.name}?`, null, () => { + const noHandler = () => { + this.scene.ui.setMode(messageMode).then(() => { + this.scene.ui.showText(`Stop trying to teach\n${move.name}?`, null, () => { + this.scene.ui.setModeWithoutClear(Mode.CONFIRM, () => { + this.scene.ui.setMode(messageMode); + this.scene.ui.showText(`${pokemon.name} did not learn the\nmove ${move.name}.`, null, () => this.end(), null, true); + }, () => { + this.scene.ui.setMode(messageMode); + this.scene.unshiftPhase(new LearnMovePhase(this.scene, this.partyMemberIndex, this.moveId)); + this.end(); + }); + }); + }); + }; + this.scene.ui.setModeWithoutClear(Mode.CONFIRM, () => { + this.scene.ui.setMode(messageMode); + this.scene.ui.showText('Which move should be forgotten?', null, () => { + this.scene.ui.setModeWithoutClear(Mode.SUMMARY, this.getPokemon(), SummaryUiMode.LEARN_MOVE, move, (moveIndex: integer) => { + if (moveIndex === 4) { + noHandler(); + return; + } + this.scene.ui.setMode(messageMode).then(() => { + this.scene.ui.showText('@d{32}1, @d{15}2, and@d{15}… @d{15}… @d{15}… @d{15}@s{pb_bounce_1}Poof!', null, () => { + this.scene.ui.showText(`${pokemon.name} forgot how to\nuse ${pokemon.moveset[moveIndex].getName()}.`, null, () => { + this.scene.ui.showText('And…', null, () => { + pokemon.moveset[moveIndex] = null; + this.scene.unshiftPhase(new LearnMovePhase(this.scene, this.partyMemberIndex, this.moveId)); + this.end(); + }, null, true); + }, null, true); + }, null, true); + }); + }); + }, null, true); + }, noHandler); + }); + }, null, true); + }, null, true); + }); + } + } +} + +export class AttemptCapturePhase extends BattlePhase { + private pokeballType: PokeballType; + private pokeball: Phaser.GameObjects.Sprite; + private originalY: number; + + constructor(scene: BattleScene, pokeballType: PokeballType) { + super(scene); + + this.pokeballType = pokeballType; + } + + start() { + super.start(); + + this.scene.pokeballCounts[this.pokeballType]--; + + const pokemon = this.scene.getEnemyPokemon(); + this.originalY = pokemon.y; + + const _3m = 3 * pokemon.getMaxHp(); + const _2h = 2 * pokemon.hp; + const catchRate = pokemon.species.catchRate; + const pokeballMultiplier = getPokeballCatchMultiplier(this.pokeballType); + const statusMultiplier = 1; + const x = Math.round((((_3m - _2h) * catchRate * pokeballMultiplier) / _3m) * statusMultiplier); + const y = Math.round(65536 / Math.sqrt(Math.sqrt(255 / x))); + + const pokeballAtlasKey = getPokeballAtlasKey(this.pokeballType); + this.pokeball = this.scene.add.sprite(16, 80, 'pb', pokeballAtlasKey); + this.pokeball.setOrigin(0.5, 0.625); + this.scene.field.add(this.pokeball); + + this.scene.sound.play('pb_throw'); + this.scene.time.delayedCall(300, () => { + this.scene.field.moveBelow(this.pokeball, pokemon); + }); + this.scene.tweens.add({ + targets: this.pokeball, + x: { value: 236, ease: 'Linear' }, + y: { value: 16, ease: 'Cubic.easeOut' }, + duration: 500, + onComplete: () => { + this.pokeball.setTexture('pb', `${pokeballAtlasKey}_opening`); + this.scene.time.delayedCall(17, () => this.pokeball.setTexture('pb', `${pokeballAtlasKey}_open`)); + this.scene.sound.play('pb_rel'); + pokemon.tint(getPokeballTintColor(this.pokeballType)); + this.scene.tweens.add({ + targets: pokemon, + duration: 250, + ease: 'Sine.easeIn', + scale: 0.25, + y: 20, + onComplete: () => { + this.pokeball.setTexture('pb', `${pokeballAtlasKey}_opening`); + pokemon.setVisible(false); + this.scene.sound.play('pb_catch'); + this.scene.time.delayedCall(17, () => this.pokeball.setTexture('pb', `${pokeballAtlasKey}`)); + + const doShake = this.pokeballType !== PokeballType.MASTER_BALL ? () => { + let shakeCount = 0; + const pbX = this.pokeball.x; + const shakeCounter = this.scene.tweens.addCounter({ + from: 0, + to: 1, + repeat: 4, + yoyo: true, + ease: 'Cubic.easeOut', + duration: 250, + repeatDelay: 500, + onUpdate: t => { + if (shakeCount && shakeCount < 4) { + const value = t.getValue(); + const directionMultiplier = shakeCount % 2 === 1 ? 1 : -1; + this.pokeball.setX(pbX + value * 4 * directionMultiplier); + this.pokeball.setAngle(value * 27.5 * directionMultiplier); + } + }, + onRepeat: () => { + if (shakeCount++ < 3) { + if (Utils.randInt(65536) < y) + this.scene.sound.play('pb_move'); + else { + shakeCounter.stop(); + this.release(shakeCount); + } + } else + this.scene.sound.play('pb_lock') + }, + onComplete: () => { + this.catch(); + } + }); + } : () => this.catch(); + + this.scene.time.delayedCall(250, () => doPokeballBounceAnim(this.scene, this.pokeball, 16, 72, 350, doShake)); + } + }); + } + }); + } + + release(shakeCount: integer) { + const pokemon = this.scene.getEnemyPokemon(); + + this.scene.sound.play('pb_rel'); + pokemon.setY(this.originalY); + pokemon.cry(); + pokemon.tint(getPokeballTintColor(this.pokeballType)); + pokemon.setVisible(true); + pokemon.untint(250, 'Sine.easeOut'); + + const pokeballAtlasKey = getPokeballAtlasKey(this.pokeballType); + this.pokeball.setTexture('pb', `${pokeballAtlasKey}_opening`); + this.scene.time.delayedCall(17, () => this.pokeball.setTexture('pb', `${pokeballAtlasKey}_open`)); + + this.scene.tweens.add({ + targets: pokemon, + duration: 250, + ease: 'Sine.easeOut', + scale: 1 + }); + + this.removePb(); + this.end(); + } + + catch() { + console.log(this, 'catch') + const pokemon = this.scene.getEnemyPokemon(); + this.scene.unshiftPhase(new VictoryPhase(this.scene)); + this.scene.ui.showText(`${pokemon.name} was caught!`, null, () => { + pokemon.hideInfo(); + const newPokemon = pokemon.addToParty(); + this.scene.field.remove(pokemon, true); + newPokemon.loadAssets().then(() => { + this.removePb(); + this.end(); + }); + }, 0, true); + } + + removePb() { + this.scene.tweens.add({ + targets: this.pokeball, + duration: 250, + delay: 250, + ease: 'Sine.easeIn', + alpha: 0, + onComplete: () => this.pokeball.destroy() + }); + } +} + +export class SelectModifierPhase extends BattlePhase { + constructor(scene: BattleScene) { + super(scene); + } + + start() { + super.start(); + + const party = this.scene.getParty(); + regenerateModifierPoolThresholds(party); + const modifierCount = new Utils.IntegerHolder(3); + this.scene.applyModifiers(ExtraModifierModifier, modifierCount); + const types: Array = getModifierTypesForWave(this.scene.currentBattle.waveIndex - 1, modifierCount.value, party); + + const modifierSelectCallback = (cursor: integer) => { + if (cursor < 0) { + this.scene.ui.setMode(Mode.MESSAGE); + super.end(); + return; + } + + const modifierType = types[cursor]; + if (modifierType instanceof PokemonModifierType) { + const pokemonModifierType = modifierType as PokemonModifierType; + this.scene.ui.setModeWithoutClear(Mode.PARTY, PartyUiMode.MODIFIER, (slotIndex: integer) => { + if (slotIndex < 6) { + this.scene.ui.setMode(Mode.MODIFIER_SELECT); + this.scene.addModifier(types[cursor].newModifier(party[slotIndex])).then(() => super.end()); + this.scene.ui.clearText(); + this.scene.ui.setMode(Mode.MESSAGE); + } else + this.scene.ui.setMode(Mode.MODIFIER_SELECT, types, modifierSelectCallback); + }, pokemonModifierType.selectFilter); + } else { + this.scene.addModifier(types[cursor].newModifier()).then(() => super.end()); + this.scene.ui.clearText(); + this.scene.ui.setMode(Mode.MESSAGE); + } + }; + this.scene.ui.setMode(Mode.MODIFIER_SELECT, types, modifierSelectCallback); + } +} + +export class ShinySparklePhase extends PokemonPhase { + constructor(scene: BattleScene, player: boolean) { + super(scene, player); + } + + start() { + super.start(); + + this.getPokemon().sparkle(); + this.scene.time.delayedCall(1000, () => this.end()); + } +} \ No newline at end of file diff --git a/src/battle-scene.ts b/src/battle-scene.ts index 750230536..f792a1d31 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -1,7 +1,7 @@ import Phaser from 'phaser'; import { Biome, BiomeArena } from './biome'; import UI from './ui/ui'; -import { BattlePhase, EncounterPhase, SummonPhase, CommandPhase, NextEncounterPhase, SwitchBiomePhase, NewBiomeEncounterPhase, EvolutionPhase } from './battle-phase'; +import { EncounterPhase, SummonPhase, CommandPhase, NextEncounterPhase, SwitchBiomePhase, NewBiomeEncounterPhase } from './battle-phases'; import { PlayerPokemon, EnemyPokemon } from './pokemon'; import PokemonSpecies, { allSpecies, getPokemonSpecies } from './pokemon-species'; import * as Utils from './utils'; @@ -11,6 +11,7 @@ import { Species } from './species'; import { initAutoPlay } from './auto-play'; import { Battle } from './battle'; import { populateAnims } from './battle-anims'; +import { BattlePhase } from './battle-phase'; const enableAuto = true; @@ -18,8 +19,8 @@ export default class BattleScene extends Phaser.Scene { public auto: boolean; public autoSpeed: integer = 1; - private phaseQueue: Array; - private phaseQueuePrepend: Array; + private phaseQueue: BattlePhase[]; + private phaseQueuePrepend: BattlePhase[]; private currentPhase: BattlePhase; public field: Phaser.GameObjects.Container; public fieldUI: Phaser.GameObjects.Container; diff --git a/src/evolution-phase.ts b/src/evolution-phase.ts index cc58f2fc7..9b072f147 100644 --- a/src/evolution-phase.ts +++ b/src/evolution-phase.ts @@ -1,10 +1,11 @@ import SoundFade from "phaser3-rex-plugins/plugins/soundfade"; -import { BattlePhase, LearnMovePhase } from "./battle-phase"; +import { BattlePhase } from "./battle-phase"; import BattleScene from "./battle-scene"; import { SpeciesEvolution } from "./pokemon-evolutions"; import EvolutionSceneHandler from "./ui/evolution-scene-handler"; import * as Utils from "./utils"; import { Mode } from "./ui/ui"; +import { LearnMovePhase } from "./battle-phases"; export class EvolutionPhase extends BattlePhase { private partyMemberIndex: integer; diff --git a/src/modifier.ts b/src/modifier.ts index 4456f9ed1..e59070c9f 100644 --- a/src/modifier.ts +++ b/src/modifier.ts @@ -1,4 +1,4 @@ -import { LearnMovePhase, LevelUpPhase } from "./battle-phase"; +import { LearnMovePhase, LevelUpPhase } from "./battle-phases"; import BattleScene from "./battle-scene"; import { getLevelTotalExp } from "./exp"; import { allMoves, Moves } from "./move"; diff --git a/src/move.ts b/src/move.ts index c3a0c69a7..4b8d3c2be 100644 --- a/src/move.ts +++ b/src/move.ts @@ -1,4 +1,4 @@ -import { MessagePhase, ObtainStatusEffectPhase } from "./battle-phase"; +import { MessagePhase, ObtainStatusEffectPhase } from "./battle-phases"; import BattleScene from "./battle-scene"; import Pokemon, { PlayerPokemon } from "./pokemon"; import { Stat } from "./pokemon-stat"; diff --git a/src/pokemon.ts b/src/pokemon.ts index 75401412c..17c421a9b 100644 --- a/src/pokemon.ts +++ b/src/pokemon.ts @@ -1,7 +1,6 @@ import Phaser from 'phaser'; import BattleScene from './battle-scene'; import BattleInfo, { PlayerBattleInfo, EnemyBattleInfo } from './battle-info'; -import { MessagePhase } from './battle-phase'; import { default as Move, allMoves, MoveCategory, Moves } from './move'; import { pokemonLevelMoves } from './pokemon-level-moves'; import { default as PokemonSpecies, getPokemonSpecies } from './pokemon-species'; @@ -16,6 +15,7 @@ import { initAnim, loadMoveAnimAssets } from './battle-anims'; import { StatusEffect } from './status-effect'; import { tmSpecies } from './tms'; import { pokemonEvolutions, SpeciesEvolution, SpeciesEvolutionCondition } from './pokemon-evolutions'; +import { MessagePhase } from './battle-phases'; export default abstract class Pokemon extends Phaser.GameObjects.Container { public id: integer; diff --git a/src/ui/command-ui-handler.ts b/src/ui/command-ui-handler.ts index e507d374e..77e46555a 100644 --- a/src/ui/command-ui-handler.ts +++ b/src/ui/command-ui-handler.ts @@ -1,4 +1,3 @@ -import { CommandPhase } from "../battle-phase"; import BattleScene from "../battle-scene"; import { addTextObject, TextStyle } from "../text"; import { toPokemonUpperCase } from "../utils"; diff --git a/src/ui/fight-ui-handler.ts b/src/ui/fight-ui-handler.ts index 00491d05b..6555bcd68 100644 --- a/src/ui/fight-ui-handler.ts +++ b/src/ui/fight-ui-handler.ts @@ -1,4 +1,3 @@ -import { CommandPhase } from "../battle-phase"; import BattleScene from "../battle-scene"; import { addTextObject, TextStyle } from "../text"; import { Type } from "../type"; @@ -6,6 +5,7 @@ import { Command } from "./command-ui-handler"; import { Mode } from "./ui"; import UiHandler from "./uiHandler"; import * as Utils from "../utils"; +import { CommandPhase } from "../battle-phases"; export default class FightUiHandler extends UiHandler { private movesContainer: Phaser.GameObjects.Container; diff --git a/src/ui/party-ui-handler.ts b/src/ui/party-ui-handler.ts index 7e9d358e9..27d1876f0 100644 --- a/src/ui/party-ui-handler.ts +++ b/src/ui/party-ui-handler.ts @@ -1,4 +1,4 @@ -import { CommandPhase } from "../battle-phase"; +import { CommandPhase } from "../battle-phases"; import BattleScene from "../battle-scene"; import { PlayerPokemon } from "../pokemon"; import { addTextObject, TextStyle } from "../text";