From 3114c1743f3f3d165f81c410dac9fb1eff967918 Mon Sep 17 00:00:00 2001 From: Bertie690 Date: Fri, 1 Aug 2025 21:33:57 -0400 Subject: [PATCH] fixed syntax error 2.0 --- test/items/lock-capsule.test.ts | 24 +++++++++++++---------- test/phases/select-modifier-phase.test.ts | 4 ++-- test/test-utils/phase-interceptor.ts | 1 - 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/test/items/lock-capsule.test.ts b/test/items/lock-capsule.test.ts index 17ca8c28aa8..01552a4db37 100644 --- a/test/items/lock-capsule.test.ts +++ b/test/items/lock-capsule.test.ts @@ -1,7 +1,8 @@ import { AbilityId } from "#enums/ability-id"; import { ModifierTier } from "#enums/modifier-tier"; import { MoveId } from "#enums/move-id"; -import type { SelectModifierPhase } from "#phases/select-modifier-phase"; +import { UiMode } from "#enums/ui-mode"; +import { SelectModifierPhase } from "#phases/select-modifier-phase"; import { GameManager } from "#test/test-utils/game-manager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -33,17 +34,20 @@ describe("Items - Lock Capsule", () => { it("doesn't set the cost of common tier items to 0", async () => { await game.classicMode.startBattle(); - game.scene.phaseManager.clearAllPhases(); - game.scene.phaseManager.unshiftNew("SelectModifierPhase", 0, undefined, { - guaranteedModifierTiers: [ModifierTier.COMMON, ModifierTier.COMMON, ModifierTier.COMMON], - fillRemaining: false, + game.scene.phaseManager.overridePhase( + new SelectModifierPhase(0, undefined, { + guaranteedModifierTiers: [ModifierTier.COMMON, ModifierTier.COMMON, ModifierTier.COMMON], + fillRemaining: false, + }), + ); + + game.onNextPrompt("SelectModifierPhase", UiMode.MODIFIER_SELECT, () => { + const selectModifierPhase = game.scene.phaseManager.getCurrentPhase() as SelectModifierPhase; + const rerollCost = selectModifierPhase.getRerollCost(true); + expect(rerollCost).toBe(150); }); game.doSelectModifier(); - await game.phaseInterceptor.to("SelectModifierPhase", false); - - const selectModifierPhase = game.scene.phaseManager.getCurrentPhase() as SelectModifierPhase; - const rerollCost = selectModifierPhase.getRerollCost(true); - expect(rerollCost).toBe(150); + await game.phaseInterceptor.to("SelectModifierPhase"); }); }); diff --git a/test/phases/select-modifier-phase.test.ts b/test/phases/select-modifier-phase.test.ts index ae4cebb1866..b77e31e931f 100644 --- a/test/phases/select-modifier-phase.test.ts +++ b/test/phases/select-modifier-phase.test.ts @@ -241,7 +241,7 @@ describe("SelectModifierPhase", () => { const selectModifierPhase = new SelectModifierPhase(0, undefined, customModifiers); scene.phaseManager.unshiftPhase(selectModifierPhase); game.move.select(MoveId.SPLASH); - await game.phaseInterceptor.run(SelectModifierPhase); + await game.phaseInterceptor.to("SelectModifierPhase"); expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT); const modifierSelectHandler = scene.ui.handlers.find( @@ -265,7 +265,7 @@ describe("SelectModifierPhase", () => { const selectModifierPhase = new SelectModifierPhase(0, undefined, customModifiers); scene.phaseManager.unshiftPhase(selectModifierPhase); game.move.select(MoveId.SPLASH); - await game.phaseInterceptor.run(SelectModifierPhase); + await game.phaseInterceptor.to("SelectModifierPhase"); expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT); const modifierSelectHandler = scene.ui.handlers.find( diff --git a/test/test-utils/phase-interceptor.ts b/test/test-utils/phase-interceptor.ts index aa51f87d1b0..7a221256af5 100644 --- a/test/test-utils/phase-interceptor.ts +++ b/test/test-utils/phase-interceptor.ts @@ -61,7 +61,6 @@ export class PhaseInterceptor { * @param runTarget - Whether or not to run the target phase before resolving; default `true` * @returns A Promise that resolves once {@linkcode target} has been reached. * @todo remove `Constructor` from type signature in favor of phase strings - * @see {@linkcode toUIMode} Method for transitioning to a specific {@linkcode UiMode} * @remarks * This will not resolve for *any* reason until the target phase has been reached. * @example