From 3b9e917f14ef06b87195bc0ee52182113d1a46d5 Mon Sep 17 00:00:00 2001 From: NightKev <34855794+DayKev@users.noreply.github.com> Date: Wed, 30 Jul 2025 21:22:17 -0700 Subject: [PATCH] Minor nits --- src/data/moves/move.ts | 10 +++++----- src/field/arena.ts | 6 ++++-- src/phases/positional-tag-phase.ts | 5 +++-- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/data/moves/move.ts b/src/data/moves/move.ts index 6a8bb045cdd..04ccdffeb6b 100644 --- a/src/data/moves/move.ts +++ b/src/data/moves/move.ts @@ -3135,7 +3135,7 @@ export class OverrideMoveEffectAttr extends MoveAttr { * `[1]`: The {@linkcode MoveUseMode} dictating how this move was used. * @returns `true` if the move effect was successfully overridden. */ - override apply(_user: Pokemon, _target: Pokemon, _move: Move, _args: [overridden: BooleanHolder, useMode: MoveUseMode]): boolean { + public override apply(_user: Pokemon, _target: Pokemon, _move: Move, _args: [overridden: BooleanHolder, useMode: MoveUseMode]): boolean { return true; } } @@ -3171,7 +3171,7 @@ export class DelayedAttackAttr extends OverrideMoveEffectAttr { this.chargeText = chargeKey; } - override apply(user: Pokemon, target: Pokemon, move: Move, args: [overridden: BooleanHolder, useMode: MoveUseMode]): boolean { + public override apply(user: Pokemon, target: Pokemon, move: Move, args: [overridden: BooleanHolder, useMode: MoveUseMode]): boolean { const useMode = args[1]; if (useMode === MoveUseMode.DELAYED_ATTACK) { // don't trigger if already queueing an indirect attack @@ -3203,7 +3203,7 @@ export class DelayedAttackAttr extends OverrideMoveEffectAttr { return true; } - override getCondition(): MoveConditionFunc { + public override getCondition(): MoveConditionFunc { // Check the arena if another similar attack is active and affecting the same slot return (_user, target) => globalScene.arena.positionalTagManager.canAddTag(PositionalTagType.DELAYED_ATTACK, target.getBattlerIndex()) } @@ -3214,7 +3214,7 @@ export class DelayedAttackAttr extends OverrideMoveEffectAttr { * The tag whill heal */ export class WishAttr extends MoveEffectAttr { - override apply(user: Pokemon, target: Pokemon, _move: Move): boolean { + public override apply(user: Pokemon, target: Pokemon, _move: Move): boolean { globalScene.arena.positionalTagManager.addTag({ tagType: PositionalTagType.WISH, healHp: toDmgValue(user.getMaxHp() / 2), @@ -3225,7 +3225,7 @@ export class WishAttr extends MoveEffectAttr { return true; } - override getCondition(): MoveConditionFunc { + public override getCondition(): MoveConditionFunc { // Check the arena if another wish is active and affecting the same slot return (_user, target) => globalScene.arena.positionalTagManager.canAddTag(PositionalTagType.WISH, target.getBattlerIndex()) } diff --git a/src/field/arena.ts b/src/field/arena.ts index b43b6057f1d..484450cc5df 100644 --- a/src/field/arena.ts +++ b/src/field/arena.ts @@ -1,3 +1,7 @@ +// biome-ignore-start lint/correctness/noUnusedImports: TSDoc imports +import type { PositionalTag } from "#data/positional-tags/positional-tag"; +// biome-ignore-end lint/correctness/noUnusedImports: TSDoc imports + import { applyAbAttrs } from "#abilities/apply-ab-attrs"; import { globalScene } from "#app/global-scene"; import Overrides from "#app/overrides"; @@ -7,8 +11,6 @@ import type { ArenaTag } from "#data/arena-tag"; import { ArenaTrapTag, getArenaTag } from "#data/arena-tag"; import { SpeciesFormChangeRevertWeatherFormTrigger, SpeciesFormChangeWeatherTrigger } from "#data/form-change-triggers"; import type { PokemonSpecies } from "#data/pokemon-species"; -// biome-ignore lint/correctness/noUnusedImports: TSDoc -import type { PositionalTag } from "#data/positional-tags/positional-tag"; import { PositionalTagManager } from "#data/positional-tags/positional-tag-manager"; import { getTerrainClearMessage, getTerrainStartMessage, Terrain, TerrainType } from "#data/terrain"; import { diff --git a/src/phases/positional-tag-phase.ts b/src/phases/positional-tag-phase.ts index ee2a82efb22..dec572273c5 100644 --- a/src/phases/positional-tag-phase.ts +++ b/src/phases/positional-tag-phase.ts @@ -1,10 +1,11 @@ -import { globalScene } from "#app/global-scene"; -import { Phase } from "#app/phase"; // biome-ignore-start lint/correctness/noUnusedImports: TSDocs import type { PositionalTag } from "#data/positional-tags/positional-tag"; import type { TurnEndPhase } from "#phases/turn-end-phase"; // biome-ignore-end lint/correctness/noUnusedImports: TSDocs +import { globalScene } from "#app/global-scene"; +import { Phase } from "#app/phase"; + /** * Phase to trigger all pending post-turn {@linkcode PositionalTag}s. * Occurs before {@linkcode TurnEndPhase} to allow for proper electrify timing.