diff --git a/src/data/abilities/ability-class.ts b/src/data/abilities/ability-class.ts index 387c5fb328b..215512571c1 100644 --- a/src/data/abilities/ability-class.ts +++ b/src/data/abilities/ability-class.ts @@ -12,6 +12,7 @@ export class Ability implements Localizable { public name: string; public description: string; public generation: number; + public postSummonPriority: number; public isBypassFaint: boolean; public isIgnorable: boolean; public isSuppressable = true; @@ -20,11 +21,12 @@ export class Ability implements Localizable { public attrs: AbAttr[]; public conditions: AbAttrCondition[]; - constructor(id: Abilities, generation: number) { + constructor(id: Abilities, generation: number, postSummonPriority = 0) { this.id = id; this.nameAppend = ""; this.generation = generation; + this.postSummonPriority = postSummonPriority; this.attrs = []; this.conditions = []; diff --git a/src/data/phase-priority-queue.ts b/src/data/phase-priority-queue.ts index dfdd60c75f6..2248fa2b05c 100644 --- a/src/data/phase-priority-queue.ts +++ b/src/data/phase-priority-queue.ts @@ -4,7 +4,7 @@ import { ActivatePriorityQueuePhase } from "#app/phases/activate-priority-queue- import type { PostSummonPhase } from "#app/phases/post-summon-phase"; import { PostSummonActivateAbilityPhase } from "#app/phases/post-summon-activate-ability-phase"; import { Stat } from "#enums/stat"; -import { BooleanHolder } from "#app/utils"; +import { BooleanHolder } from "#app/utils/common"; import { TrickRoomTag } from "#app/data/arena-tag"; import { DynamicPhaseType } from "#enums/dynamic-phase-type"; diff --git a/src/phases/post-summon-activate-ability-phase.ts b/src/phases/post-summon-activate-ability-phase.ts index dcf99829baf..1f41175640c 100644 --- a/src/phases/post-summon-activate-ability-phase.ts +++ b/src/phases/post-summon-activate-ability-phase.ts @@ -1,5 +1,5 @@ import type { BattlerIndex } from "#app/battle"; -import { applyPostSummonAbAttrs, PostSummonAbAttr } from "#app/data/ability"; +import { applyPostSummonAbAttrs, PostSummonAbAttr } from "#app/data/abilities/ability"; import { PostSummonPhase } from "#app/phases/post-summon-phase"; /** diff --git a/test/abilities/ability_activation_order.test.ts b/test/abilities/ability_activation_order.test.ts index a6fba65bec3..22704d65b88 100644 --- a/test/abilities/ability_activation_order.test.ts +++ b/test/abilities/ability_activation_order.test.ts @@ -1,4 +1,3 @@ -import { PreventBerryUseAbAttr, TerrainEventTypeChangeAbAttr } from "#app/data/ability"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; @@ -6,7 +5,7 @@ import { Stat } from "#enums/stat"; import { WeatherType } from "#enums/weather-type"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; describe("Ability Activation Order", () => { let phaserGame: Phaser.Game; @@ -27,7 +26,7 @@ describe("Ability Activation Order", () => { game.override .moveset([Moves.SPLASH]) .ability(Abilities.BALL_FETCH) - .battleType("single") + .battleStyle("single") .disableCrits() .enemySpecies(Species.MAGIKARP) .enemyAbility(Abilities.BALL_FETCH)