From 6a26c5b4fab7b7f3f3a275cdb3ed110b8c90fdc5 Mon Sep 17 00:00:00 2001 From: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com> Date: Thu, 10 Apr 2025 21:42:01 -0500 Subject: [PATCH] Move DamageCalculationResult interface to its own file --- src/field/pokemon.ts | 11 +---------- src/interfaces/damage-calculation-result.ts | 11 +++++++++++ test/moves/steamroller.test.ts | 2 +- 3 files changed, 13 insertions(+), 11 deletions(-) create mode 100644 src/interfaces/damage-calculation-result.ts diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index 59ca9868f8c..7ff5a3a5384 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -263,6 +263,7 @@ import { LearnMoveSituation } from "#enums/learn-move-situation"; import { TurnMove } from "#app/interfaces/turn-move"; import { AiType } from "#enums/ai-type"; import { PokemonMove } from "#app/data/moves/pokemon-move"; +import { DamageCalculationResult } from "#app/interfaces/damage-calculation-result"; export enum FieldPosition { CENTER, @@ -7888,14 +7889,4 @@ export type DamageResult = | HitResult.INDIRECT_KO | HitResult.INDIRECT; -/** Interface containing the results of a damage calculation for a given move */ -export interface DamageCalculationResult { - /** `true` if the move was cancelled (thus suppressing "No Effect" messages) */ - cancelled: boolean; - /** The effectiveness of the move */ - result: HitResult; - /** The damage dealt by the move */ - damage: number; -} - diff --git a/src/interfaces/damage-calculation-result.ts b/src/interfaces/damage-calculation-result.ts new file mode 100644 index 00000000000..eee2a3cb921 --- /dev/null +++ b/src/interfaces/damage-calculation-result.ts @@ -0,0 +1,11 @@ +import type { HitResult } from "#app/field/pokemon"; + +/** Interface containing the results of a damage calculation for a given move */ +export interface DamageCalculationResult { + /** `true` if the move was cancelled (thus suppressing "No Effect" messages) */ + cancelled: boolean; + /** The effectiveness of the move */ + result: HitResult; + /** The damage dealt by the move */ + damage: number; +} diff --git a/test/moves/steamroller.test.ts b/test/moves/steamroller.test.ts index b4c870ccc2d..a0e4c29cce5 100644 --- a/test/moves/steamroller.test.ts +++ b/test/moves/steamroller.test.ts @@ -1,7 +1,7 @@ import { BattlerIndex } from "#app/battle"; import { allMoves } from "#app/data/moves/all-moves"; import { BattlerTagType } from "#app/enums/battler-tag-type"; -import type { DamageCalculationResult } from "#app/field/pokemon"; +import type { DamageCalculationResult } from "#app/interfaces/damage-calculation-result"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species";