diff --git a/src/@types/damage-result.ts b/src/@types/damage-result.ts new file mode 100644 index 00000000000..7086d843cf4 --- /dev/null +++ b/src/@types/damage-result.ts @@ -0,0 +1,10 @@ +import type { HitResult } from "#enums/hit-result"; + +export type DamageResult = + | HitResult.EFFECTIVE + | HitResult.SUPER_EFFECTIVE + | HitResult.NOT_VERY_EFFECTIVE + | HitResult.ONE_HIT_KO + | HitResult.CONFUSION + | HitResult.INDIRECT_KO + | HitResult.INDIRECT; diff --git a/src/field/damage-number-handler.ts b/src/field/damage-number-handler.ts index 3692e86ea7f..77d1b3c1757 100644 --- a/src/field/damage-number-handler.ts +++ b/src/field/damage-number-handler.ts @@ -1,5 +1,5 @@ import { TextStyle, addTextObject } from "../ui/text"; -import type { DamageResult } from "./pokemon"; +import type { DamageResult } from "#app/@types/damage-result"; import type Pokemon from "./pokemon"; import { HitResult } from "#enums/hit-result"; import * as Utils from "../utils"; diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index f5e6b5fe705..945fc60d908 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -272,6 +272,7 @@ import { DamageCalculationResult } from "#app/interfaces/damage-calculation-resu import { FieldPosition } from "#enums/field-position"; import { AttackMoveResult } from "#app/interfaces/attack-move-result"; import { HitResult } from "#enums/hit-result"; +import { DamageResult } from "#app/@types/damage-result"; export default abstract class Pokemon extends Phaser.GameObjects.Container { public id: number; @@ -7617,12 +7618,3 @@ export enum MoveResult { MISS, OTHER, } - -export type DamageResult = - | HitResult.EFFECTIVE - | HitResult.SUPER_EFFECTIVE - | HitResult.NOT_VERY_EFFECTIVE - | HitResult.ONE_HIT_KO - | HitResult.CONFUSION - | HitResult.INDIRECT_KO - | HitResult.INDIRECT; diff --git a/src/interfaces/attack-move-result.ts b/src/interfaces/attack-move-result.ts index dde3400ea41..f91d31a69ee 100644 --- a/src/interfaces/attack-move-result.ts +++ b/src/interfaces/attack-move-result.ts @@ -1,5 +1,5 @@ import type { BattlerIndex } from "#app/battle"; -import type { DamageResult } from "#app/field/pokemon"; +import type { DamageResult } from "#app/@types/damage-result"; import type { Moves } from "#enums/moves"; export interface AttackMoveResult { diff --git a/src/phases/damage-anim-phase.ts b/src/phases/damage-anim-phase.ts index 9cf93a3f97e..91b21376515 100644 --- a/src/phases/damage-anim-phase.ts +++ b/src/phases/damage-anim-phase.ts @@ -1,7 +1,7 @@ import { globalScene } from "#app/global-scene"; import type { BattlerIndex } from "#app/battle"; import { BattleSpec } from "#enums/battle-spec"; -import type { DamageResult } from "#app/field/pokemon"; +import type { DamageResult } from "#app/@types/damage-result"; import { HitResult } from "#enums/hit-result"; import { fixedInt } from "#app/utils"; import { PokemonPhase } from "#app/phases/pokemon-phase";