From e2fe309a9382c388da1890a1b5c5dbd66cd03896 Mon Sep 17 00:00:00 2001 From: Michael Li Date: Sat, 9 Nov 2024 23:34:43 -0500 Subject: [PATCH] Add type `DoubleType` --- src/overrides.ts | 4 +++- src/test/utils/helpers/overridesHelper.ts | 7 ++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/overrides.ts b/src/overrides.ts index 2743fd4d025..c2e34015a86 100644 --- a/src/overrides.ts +++ b/src/overrides.ts @@ -58,7 +58,7 @@ class DefaultOverrides { * * If `"odd-doubles"`, follow the `"double"` rule on odd wave numbers, and follow the `"single"` rule on even wave numbers. */ - readonly BATTLE_TYPE_OVERRIDE: "double" | "single" | "even-doubles" | "odd-doubles" | null = null; + readonly BATTLE_TYPE_OVERRIDE: DoubleType | null = null; readonly STARTING_WAVE_OVERRIDE: number = 0; readonly STARTING_BIOME_OVERRIDE: Biome = Biome.TOWN; readonly ARENA_TINT_OVERRIDE: TimeOfDay | null = null; @@ -240,3 +240,5 @@ export default { ...defaultOverrides, ...overrides } satisfies InstanceType; + +export type DoubleType = "double" | "single" | "even-doubles" | "odd-doubles"; diff --git a/src/test/utils/helpers/overridesHelper.ts b/src/test/utils/helpers/overridesHelper.ts index 5e9aba7f77f..767c19a6544 100644 --- a/src/test/utils/helpers/overridesHelper.ts +++ b/src/test/utils/helpers/overridesHelper.ts @@ -4,7 +4,7 @@ import { Abilities } from "#app/enums/abilities"; import * as GameMode from "#app/game-mode"; import { GameModes, getGameMode } from "#app/game-mode"; import { ModifierOverride } from "#app/modifier/modifier-type"; -import Overrides from "#app/overrides"; +import Overrides, { DoubleType } from "#app/overrides"; import { Unlockables } from "#app/system/unlockables"; import { Biome } from "#enums/biome"; import { Moves } from "#enums/moves"; @@ -238,11 +238,12 @@ export class OverridesHelper extends GameManagerHelper { } /** - * Override the battle type (single or double) + * Override the battle type (e.g., single or double). + * @see {@linkcode Overrides.BATTLE_TYPE_OVERRIDE} * @param battleType battle type to set * @returns `this` */ - public battleType(battleType: "single" | "double" | "even-doubles" | "odd-doubles" | null): this { + public battleType(battleType: DoubleType): this { vi.spyOn(Overrides, "BATTLE_TYPE_OVERRIDE", "get").mockReturnValue(battleType); this.log(`Battle type set to ${battleType} only!`); return this;