mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-08-09 08:59:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Minor nits

Browse Source
This commit is contained in:
NightKev 2025-07-30 21:22:17 -07:00
parent 6bb2991c13
commit 3b9e917f14
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/data/moves/move.ts
View File

@ -3135,7 +3135,7 @@ export class OverrideMoveEffectAttr extends MoveAttr {
* `[1]`: The {@linkcode MoveUseMode} dictating how this move was used. * `[1]`: The {@linkcode MoveUseMode} dictating how this move was used.
* @returns `true` if the move effect was successfully overridden. * @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; return true;
} }
} }
@ -3171,7 +3171,7 @@ export class DelayedAttackAttr extends OverrideMoveEffectAttr {
this.chargeText = chargeKey; 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]; const useMode = args[1];
if (useMode === MoveUseMode.DELAYED_ATTACK) { if (useMode === MoveUseMode.DELAYED_ATTACK) {
// don't trigger if already queueing an indirect attack // don't trigger if already queueing an indirect attack
@ -3203,7 +3203,7 @@ export class DelayedAttackAttr extends OverrideMoveEffectAttr {
return true; return true;
} }
override getCondition(): MoveConditionFunc { public override getCondition(): MoveConditionFunc {
// Check the arena if another similar attack is active and affecting the same slot // 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()) 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 * The tag whill heal
*/ */
export class WishAttr extends MoveEffectAttr { 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<PositionalTagType.WISH>({ globalScene.arena.positionalTagManager.addTag<PositionalTagType.WISH>({
tagType: PositionalTagType.WISH, tagType: PositionalTagType.WISH,
healHp: toDmgValue(user.getMaxHp() / 2), healHp: toDmgValue(user.getMaxHp() / 2),
@ -3225,7 +3225,7 @@ export class WishAttr extends MoveEffectAttr {
return true; return true;
} }
override getCondition(): MoveConditionFunc { public override getCondition(): MoveConditionFunc {
// Check the arena if another wish is active and affecting the same slot // Check the arena if another wish is active and affecting the same slot
return (_user, target) => globalScene.arena.positionalTagManager.canAddTag(PositionalTagType.WISH, target.getBattlerIndex()) return (_user, target) => globalScene.arena.positionalTagManager.canAddTag(PositionalTagType.WISH, target.getBattlerIndex())
} }

6
src/field/arena.ts
View File

@ -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 { applyAbAttrs } from "#abilities/apply-ab-attrs";
import { globalScene } from "#app/global-scene"; import { globalScene } from "#app/global-scene";
import Overrides from "#app/overrides"; import Overrides from "#app/overrides";
@ -7,8 +11,6 @@ import type { ArenaTag } from "#data/arena-tag";
import { ArenaTrapTag, getArenaTag } from "#data/arena-tag"; import { ArenaTrapTag, getArenaTag } from "#data/arena-tag";
import { SpeciesFormChangeRevertWeatherFormTrigger, SpeciesFormChangeWeatherTrigger } from "#data/form-change-triggers"; import { SpeciesFormChangeRevertWeatherFormTrigger, SpeciesFormChangeWeatherTrigger } from "#data/form-change-triggers";
import type { PokemonSpecies } from "#data/pokemon-species"; 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 { PositionalTagManager } from "#data/positional-tags/positional-tag-manager";
import { getTerrainClearMessage, getTerrainStartMessage, Terrain, TerrainType } from "#data/terrain"; import { getTerrainClearMessage, getTerrainStartMessage, Terrain, TerrainType } from "#data/terrain";
import { import {

5
src/phases/positional-tag-phase.ts
View File

@ -1,10 +1,11 @@
import { globalScene } from "#app/global-scene";
import { Phase } from "#app/phase";
// biome-ignore-start lint/correctness/noUnusedImports: TSDocs // biome-ignore-start lint/correctness/noUnusedImports: TSDocs
import type { PositionalTag } from "#data/positional-tags/positional-tag"; import type { PositionalTag } from "#data/positional-tags/positional-tag";
import type { TurnEndPhase } from "#phases/turn-end-phase"; import type { TurnEndPhase } from "#phases/turn-end-phase";
// biome-ignore-end lint/correctness/noUnusedImports: TSDocs // 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. * Phase to trigger all pending post-turn {@linkcode PositionalTag}s.
* Occurs before {@linkcode TurnEndPhase} to allow for proper electrify timing. * Occurs before {@linkcode TurnEndPhase} to allow for proper electrify timing.