Fix import issues with battle phase

This commit is contained in:
Flashfyre committed 2023-04-10 14:12:01 -04:00
1 parent 5b097b347b
commit 3723e25682
11 files changed
+1073 -1070

No files matched your search

+1 -1
View File
@@ -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";
-1059
View File
File diff suppressed because it is too large. Load diff
+1061
View File
File diff suppressed because it is too large. Load diff
+4 -3
View File
@@ -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<BattlePhase>;
private phaseQueuePrepend: Array<BattlePhase>;
private phaseQueue: BattlePhase[];
private phaseQueuePrepend: BattlePhase[];
private currentPhase: BattlePhase;
public field: Phaser.GameObjects.Container;
public fieldUI: Phaser.GameObjects.Container;
+2 -1
View File
@@ -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;
+1 -1
View File
@@ -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";
+1 -1
View File
@@ -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";
+1 -1
View File
@@ -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;
-1
View File
@@ -1,4 +1,3 @@
import { CommandPhase } from "../battle-phase";
import BattleScene from "../battle-scene";
import { addTextObject, TextStyle } from "../text";
import { toPokemonUpperCase } from "../utils";
+1 -1
View File
@@ -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;
+1 -1
View File
@@ -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";