Move TurnMove interface to its own file

This commit is contained in:
Sirz Benjie 2025-04-10 21:30:15 -05:00
parent 7b748e8ee3
commit bf48cc0118
No known key found for this signature in database
GPG Key ID: 4A524B4D196C759E
9 changed files with 25 additions and 18 deletions

View File

@ -7,7 +7,8 @@ import { MoneyMultiplierModifier, PokemonHeldItemModifier } from "./modifier/mod
import type { PokeballType } from "#enums/pokeball";
import { trainerConfigs } from "#app/data/trainers/trainer-config";
import { SpeciesFormKey } from "#enums/species-form-key";
import type { EnemyPokemon, PlayerPokemon, TurnMove } from "#app/field/pokemon";
import type { EnemyPokemon, PlayerPokemon } from "#app/field/pokemon";
import type { TurnMove } from "./interfaces/turn-move";
import type Pokemon from "#app/field/pokemon";
import { ArenaTagType } from "#enums/arena-tag-type";
import { BattleSpec } from "#enums/battle-spec";

View File

@ -12,7 +12,8 @@ import {
TypeBoostTag,
} from "../battler-tags";
import { getPokemonNameWithAffix } from "../../messages";
import type { AttackMoveResult, TurnMove } from "../../field/pokemon";
import type { AttackMoveResult } from "../../field/pokemon";
import type { TurnMove } from "#app/interfaces/turn-move";
import type Pokemon from "../../field/pokemon";
import {
EnemyPokemon,

View File

@ -2,7 +2,7 @@ import Phaser from "phaser";
import type { AnySound } from "#app/battle-scene";
import type BattleScene from "#app/battle-scene";
import { globalScene } from "#app/global-scene";
import type { Variant, VariantSet } from "#app/sprites/variant";
import type { Variant } from "#app/sprites/variant";
import { populateVariantColors, variantColorCache } from "#app/sprites/variant";
import { variantData } from "#app/sprites/variant";
import BattleInfo, {
@ -96,7 +96,6 @@ import {
} from "#app/modifier/modifier";
import { PokeballType } from "#enums/pokeball";
import { Gender } from "#app/data/gender";
import { initMoveAnim, loadMoveAnimAssets } from "#app/data/battle-anims";
import { Status, getRandomStatus } from "#app/data/status-effect";
import type {
SpeciesFormEvolution,
@ -268,6 +267,7 @@ import { timedEventManager } from "#app/global-event-manager";
import { loadMoveAnimations } from "#app/sprites/pokemon-asset-loader";
import { ResetStatusPhase } from "#app/phases/reset-status-phase";
import { LearnMoveSituation } from "#enums/learn-move-situation";
import { TurnMove } from "#app/interfaces/turn-move";
export enum FieldPosition {
CENTER,
@ -7543,15 +7543,6 @@ export class EnemyPokemon extends Pokemon {
}
}
export interface TurnMove {
move: Moves;
targets: BattlerIndex[];
result?: MoveResult;
virtual?: boolean;
turn?: number;
ignorePP?: boolean;
}
export interface AttackMoveResult {
move: Moves;
result: DamageResult;

View File

@ -0,0 +1,12 @@
import type { BattlerIndex } from "#app/battle";
import type { MoveResult } from "#app/field/pokemon";
import type { Moves } from "#enums/moves";
export interface TurnMove {
move: Moves;
targets: BattlerIndex[];
result?: MoveResult;
virtual?: boolean;
turn?: number;
ignorePP?: boolean;
}

View File

@ -11,7 +11,8 @@ import { BattlerTagType } from "#app/enums/battler-tag-type";
import { Biome } from "#app/enums/biome";
import { Moves } from "#app/enums/moves";
import { PokeballType } from "#enums/pokeball";
import type { PlayerPokemon, TurnMove } from "#app/field/pokemon";
import type { PlayerPokemon } from "#app/field/pokemon";
import type { TurnMove } from "#app/interfaces/turn-move";
import { FieldPosition } from "#app/field/pokemon";
import { getPokemonNameWithAffix } from "#app/messages";
import { Command } from "#app/ui/command-ui-handler";

View File

@ -1,5 +1,6 @@
import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
import type { PokemonTurnData, TurnMove, PokemonMove } from "#app/field/pokemon";
import type { PokemonTurnData, PokemonMove } from "#app/field/pokemon";
import type { TurnMove } from "#app/interfaces/turn-move";
import type Pokemon from "#app/field/pokemon";
import { MoveResult } from "#app/field/pokemon";
import type BattleScene from "#app/battle-scene";

View File

@ -2,7 +2,7 @@ import { Stat } from "#enums/stat";
import { StockpilingTag } from "#app/data/battler-tags";
import { allMoves } from "#app/data/moves/all-moves";
import { BattlerTagType } from "#app/enums/battler-tag-type";
import type { TurnMove } from "#app/field/pokemon";
import type { TurnMove } from "#app/interfaces/turn-move";
import { MoveResult } from "#app/field/pokemon";
import GameManager from "#test/testUtils/gameManager";
import { Abilities } from "#enums/abilities";

View File

@ -1,6 +1,6 @@
import { Stat } from "#enums/stat";
import { StockpilingTag } from "#app/data/battler-tags";
import type { TurnMove } from "#app/field/pokemon";
import type { TurnMove } from "#app/interfaces/turn-move";
import { MoveResult } from "#app/field/pokemon";
import { CommandPhase } from "#app/phases/command-phase";
import { TurnInitPhase } from "#app/phases/turn-init-phase";

View File

@ -1,7 +1,7 @@
import { Stat } from "#enums/stat";
import { StockpilingTag } from "#app/data/battler-tags";
import { BattlerTagType } from "#app/enums/battler-tag-type";
import type { TurnMove } from "#app/field/pokemon";
import type { TurnMove } from "#app/interfaces/turn-move";
import { MoveResult } from "#app/field/pokemon";
import { MovePhase } from "#app/phases/move-phase";
import { TurnInitPhase } from "#app/phases/turn-init-phase";