Move fieldPosition to its own file

This commit is contained in:
Sirz Benjie 2025-04-10 21:44:39 -05:00
parent 6a26c5b4fa
commit 6383762eb2
No known key found for this signature in database
GPG Key ID: 4A524B4D196C759E
10 changed files with 30 additions and 26 deletions

View File

@ -12,16 +12,16 @@ import {
TypeBoostTag, TypeBoostTag,
} from "../battler-tags"; } from "../battler-tags";
import { getPokemonNameWithAffix } from "../../messages"; import { getPokemonNameWithAffix } from "../../messages";
import type { AttackMoveResult } from "../../field/pokemon"; import type { AttackMoveResult } from "#app/interfaces/attack-move-result";
import type { TurnMove } from "#app/interfaces/turn-move"; import type { TurnMove } from "#app/interfaces/turn-move";
import type Pokemon from "../../field/pokemon"; import type Pokemon from "../../field/pokemon";
import { import {
EnemyPokemon, EnemyPokemon,
FieldPosition,
HitResult, HitResult,
MoveResult, MoveResult,
PlayerPokemon, PlayerPokemon,
} from "../../field/pokemon"; } from "../../field/pokemon";
import { FieldPosition } from "#enums/field-position";
import { PokemonMove } from "./pokemon-move"; import { PokemonMove } from "./pokemon-move";
import { import {
getNonVolatileStatusEffects, getNonVolatileStatusEffects,

View File

@ -13,7 +13,7 @@ import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/myst
import { TrainerSlot } from "#enums/trainer-slot"; import { TrainerSlot } from "#enums/trainer-slot";
import type { PlayerPokemon } from "#app/field/pokemon"; import type { PlayerPokemon } from "#app/field/pokemon";
import type Pokemon from "#app/field/pokemon"; import type Pokemon from "#app/field/pokemon";
import { FieldPosition } from "#app/field/pokemon"; import { FieldPosition } from "#enums/field-position";
import { getPokemonSpecies } from "#app/data/pokemon-species"; import { getPokemonSpecies } from "#app/data/pokemon-species";
import { MoneyRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements"; import { MoneyRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements";
import { queueEncounterMessage, showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; import { queueEncounterMessage, showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";

View File

@ -10,7 +10,8 @@ import { showEncounterText } from "#app/data/mystery-encounters/utils/encounter-
import type { PlayerPokemon } from "#app/field/pokemon"; import type { PlayerPokemon } from "#app/field/pokemon";
import type { AiType } from "#enums/ai-type"; import type { AiType } from "#enums/ai-type";
import type Pokemon from "#app/field/pokemon"; import type Pokemon from "#app/field/pokemon";
import { EnemyPokemon, FieldPosition, PokemonSummonData } from "#app/field/pokemon"; import { EnemyPokemon, PokemonSummonData } from "#app/field/pokemon";
import { FieldPosition } from "#enums/field-position";
import { PokemonMove } from "#app/data/moves/pokemon-move"; import { PokemonMove } from "#app/data/moves/pokemon-move";
import type { CustomModifierSettings, ModifierType } from "#app/modifier/modifier-type"; import type { CustomModifierSettings, ModifierType } from "#app/modifier/modifier-type";
import { import {

View File

@ -0,0 +1,6 @@
export enum FieldPosition {
CENTER,
LEFT,
RIGHT
}

View File

@ -214,7 +214,7 @@ import {
SpeciesFormChangeActiveTrigger, SpeciesFormChangeActiveTrigger,
SpeciesFormChangeLapseTeraTrigger, SpeciesFormChangeLapseTeraTrigger,
SpeciesFormChangeMoveLearnedTrigger, SpeciesFormChangeMoveLearnedTrigger,
SpeciesFormChangePostMoveTrigger SpeciesFormChangePostMoveTrigger,
} from "#app/data/pokemon-forms"; } from "#app/data/pokemon-forms";
import { TerrainType } from "#app/data/terrain"; import { TerrainType } from "#app/data/terrain";
import type { TrainerSlot } from "#enums/trainer-slot"; import type { TrainerSlot } from "#enums/trainer-slot";
@ -264,12 +264,8 @@ import { TurnMove } from "#app/interfaces/turn-move";
import { AiType } from "#enums/ai-type"; import { AiType } from "#enums/ai-type";
import { PokemonMove } from "#app/data/moves/pokemon-move"; import { PokemonMove } from "#app/data/moves/pokemon-move";
import { DamageCalculationResult } from "#app/interfaces/damage-calculation-result"; import { DamageCalculationResult } from "#app/interfaces/damage-calculation-result";
import { FieldPosition } from "#enums/field-position";
export enum FieldPosition { import { AttackMoveResult } from "#app/interfaces/attack-move-result";
CENTER,
LEFT,
RIGHT,
}
export default abstract class Pokemon extends Phaser.GameObjects.Container { export default abstract class Pokemon extends Phaser.GameObjects.Container {
public id: number; public id: number;
@ -7775,15 +7771,6 @@ interface IllusionData {
level?: number level?: number
} }
export interface AttackMoveResult {
move: Moves;
result: DamageResult;
damage: number;
critical: boolean;
sourceId: number;
sourceBattlerIndex: BattlerIndex;
}
export class PokemonSummonData { export class PokemonSummonData {
/** [Atk, Def, SpAtk, SpDef, Spd, Acc, Eva] */ /** [Atk, Def, SpAtk, SpDef, Spd, Acc, Eva] */
public statStages: number[] = [0, 0, 0, 0, 0, 0, 0]; public statStages: number[] = [0, 0, 0, 0, 0, 0, 0];
@ -7888,5 +7875,3 @@ export type DamageResult =
| HitResult.CONFUSION | HitResult.CONFUSION
| HitResult.INDIRECT_KO | HitResult.INDIRECT_KO
| HitResult.INDIRECT; | HitResult.INDIRECT;

View File

@ -0,0 +1,12 @@
import type { BattlerIndex } from "#app/battle";
import type { DamageResult } from "#app/field/pokemon";
import type { Moves } from "#enums/moves";
export interface AttackMoveResult {
move: Moves;
result: DamageResult;
damage: number;
critical: boolean;
sourceId: number;
sourceBattlerIndex: BattlerIndex;
}

View File

@ -13,7 +13,7 @@ import { Moves } from "#app/enums/moves";
import { PokeballType } from "#enums/pokeball"; import { PokeballType } from "#enums/pokeball";
import type { PlayerPokemon } from "#app/field/pokemon"; import type { PlayerPokemon } from "#app/field/pokemon";
import type { TurnMove } from "#app/interfaces/turn-move"; import type { TurnMove } from "#app/interfaces/turn-move";
import { FieldPosition } from "#app/field/pokemon"; import { FieldPosition } from "#enums/field-position";
import { getPokemonNameWithAffix } from "#app/messages"; import { getPokemonNameWithAffix } from "#app/messages";
import { Command } from "#app/ui/command-ui-handler"; import { Command } from "#app/ui/command-ui-handler";
import { Mode } from "#app/ui/ui"; import { Mode } from "#app/ui/ui";

View File

@ -11,7 +11,7 @@ import { TrainerSlot } from "#enums/trainer-slot";
import { getRandomWeatherType } from "#app/data/weather"; import { getRandomWeatherType } from "#app/data/weather";
import { EncounterPhaseEvent } from "#app/events/battle-scene"; import { EncounterPhaseEvent } from "#app/events/battle-scene";
import type Pokemon from "#app/field/pokemon"; import type Pokemon from "#app/field/pokemon";
import { FieldPosition } from "#app/field/pokemon"; import { FieldPosition } from "#enums/field-position";
import { getPokemonNameWithAffix } from "#app/messages"; import { getPokemonNameWithAffix } from "#app/messages";
import { BoostBugSpawnModifier, IvScannerModifier, TurnHeldItemTransferModifier } from "#app/modifier/modifier"; import { BoostBugSpawnModifier, IvScannerModifier, TurnHeldItemTransferModifier } from "#app/modifier/modifier";
import { ModifierPoolType, regenerateModifierPoolThresholds } from "#app/modifier/modifier-type"; import { ModifierPoolType, regenerateModifierPoolThresholds } from "#app/modifier/modifier-type";

View File

@ -5,7 +5,7 @@ import { TrainerSlot } from "#enums/trainer-slot";
import { PlayerGender } from "#app/enums/player-gender"; import { PlayerGender } from "#app/enums/player-gender";
import { addPokeballOpenParticles } from "#app/field/anims"; import { addPokeballOpenParticles } from "#app/field/anims";
import type Pokemon from "#app/field/pokemon"; import type Pokemon from "#app/field/pokemon";
import { FieldPosition } from "#app/field/pokemon"; import { FieldPosition } from "#enums/field-position";
import { getPokemonNameWithAffix } from "#app/messages"; import { getPokemonNameWithAffix } from "#app/messages";
import i18next from "i18next"; import i18next from "i18next";
import { PartyMemberPokemonPhase } from "./party-member-pokemon-phase"; import { PartyMemberPokemonPhase } from "./party-member-pokemon-phase";

View File

@ -1,5 +1,5 @@
import { globalScene } from "#app/global-scene"; import { globalScene } from "#app/global-scene";
import { FieldPosition } from "#app/field/pokemon"; import { FieldPosition } from "#enums/field-position";
import { BattlePhase } from "./battle-phase"; import { BattlePhase } from "./battle-phase";
export class ToggleDoublePositionPhase extends BattlePhase { export class ToggleDoublePositionPhase extends BattlePhase {