Merge branch 'beta' into respect-server-error-on-clear

2025-07-06 16:32:16 +02:00 · 2025-04-29 23:50:04 -07:00 · 2025-04-29 23:50:04 -07:00 · ab36413500
commit ab36413500
parent dce90f10bf 84a2ce979f
17 changed files with 840 additions and 475 deletions
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@ -65,7 +65,7 @@ Do the reviewers need to do something special in order to test your changes?
 - [ ] The PR is self-contained and cannot be split into smaller PRs?
 - [ ] Have I provided a clear explanation of the changes?
 - [ ] Have I tested the changes manually?
- [ ] Are all unit tests still passing? (`npm run test`)
+- [ ] Are all unit tests still passing? (`npm run test:silent`)
  - [ ] Have I created new automated tests (`npm run create-test`) or updated existing tests related to the PR's changes?
 - [ ] Have I provided screenshots/videos of the changes (if applicable)?
  - [ ] Have I made sure that any UI change works for both UI themes (default and legacy)?
--- a/biome.jsonc
+++ b/biome.jsonc
@ -38,6 +38,9 @@
      "src/data/balance/tms.ts"
    ]
  },
+
+  // While it'd be nice to enable consistent sorting, enabling this causes issues due to circular import resolution order
+  // TODO: Remove if we ever get down to 0 circular imports
  "organizeImports": { "enabled": false },
  "linter": {
    "ignore": [
@ -55,13 +58,13 @@
      },
      "style": {
        "noVar": "error",
-        "useEnumInitializers": "off",
+        "useEnumInitializers": "off", // large enums like Moves/Species would make this cumbersome 
        "useBlockStatements": "error",
        "useConst": "error",
        "useImportType": "error",
-        "noNonNullAssertion": "off", // TODO: Turn this on ASAP and fix all non-null assertions
+        "noNonNullAssertion": "off", // TODO: Turn this on ASAP and fix all non-null assertions in non-test files
        "noParameterAssign": "off",
-        "useExponentiationOperator": "off",
+        "useExponentiationOperator": "off", // Too typo-prone and easy to mixup with standard multiplication (* vs **)
        "useDefaultParameterLast": "off", // TODO: Fix spots in the codebase where this flag would be triggered, and then enable
        "useSingleVarDeclarator": "off",
        "useNodejsImportProtocol": "off",
@ -70,17 +73,20 @@
      },
      "suspicious": {
        "noDoubleEquals": "error",
+        // While this would be a nice rule to enable, the current structure of the codebase makes this infeasible 
+        // due to being used for move/ability `args` params and save data-related code.
+        // This can likely be enabled for all non-utils files once these are eventually reworked, but until then we leave it off.  
        "noExplicitAny": "off",
        "noAssignInExpressions": "off",
        "noPrototypeBuiltins": "off",
-        "noFallthroughSwitchClause": "off",
-        "noImplicitAnyLet": "info", // TODO: Refactor and make this an error
-        "noRedeclare": "off", // TODO: Refactor and make this an error
+        "noFallthroughSwitchClause": "error", // Prevents accidental automatic fallthroughs in switch cases (use disable comment if needed)
+        "noImplicitAnyLet": "warn", // TODO: Refactor and make this an error
+        "noRedeclare": "info", // TODO: Refactor and make this an error
        "noGlobalIsNan": "off",
        "noAsyncPromiseExecutor": "warn" // TODO: Refactor and make this an error
      },
      "complexity": {
-        "noExcessiveCognitiveComplexity": "warn",
+        "noExcessiveCognitiveComplexity": "warn", // TODO: Refactor and make this an error
        "useLiteralKeys": "off",
        "noForEach": "off", // Foreach vs for of is not that simple.
        "noUselessSwitchCase": "off", // Explicit > Implicit
--- a/eslint.config.js
+++ b/eslint.config.js
@ -1,9 +1,10 @@
-import tseslint from "@typescript-eslint/eslint-plugin";
+/** @ts-check */
+import tseslint from "typescript-eslint";
 import stylisticTs from "@stylistic/eslint-plugin-ts";
 import parser from "@typescript-eslint/parser";
 import importX from "eslint-plugin-import-x";

-export default [
+export default tseslint.config(
  {
    name: "eslint-config",
    files: ["src/**/*.{ts,tsx,js,jsx}", "test/**/*.{ts,tsx,js,jsx}"],
@ -14,12 +15,11 @@ export default [
    plugins: {
      "import-x": importX,
      "@stylistic/ts": stylisticTs,
-      "@typescript-eslint": tseslint,
+      "@typescript-eslint": tseslint.plugin,
    },
    rules: {
-      "prefer-const": "error", // Enforces the use of `const` for variables that are never reassigned
      "no-undef": "off", // Disables the rule that disallows the use of undeclared variables (TypeScript handles this)
-      "no-extra-semi": ["error"], // Disallows unnecessary semicolons for TypeScript-specific syntax
+      "no-extra-semi": "error", // Disallows unnecessary semicolons for TypeScript-specific syntax
      "import-x/extensions": ["error", "never", { json: "always" }], // Enforces no extension for imports unless json
    },
  },
@ -33,11 +33,11 @@ export default [
      },
    },
    plugins: {
-      "@typescript-eslint": tseslint,
+      "@typescript-eslint": tseslint.plugin,
    },
    rules: {
      "@typescript-eslint/no-floating-promises": "error", // Require Promise-like statements to be handled appropriately. - https://typescript-eslint.io/rules/no-floating-promises/
      "@typescript-eslint/no-misused-promises": "error", // Disallow Promises in places not designed to handle them. - https://typescript-eslint.io/rules/no-misused-promises/
    },
  },
-];
+);
--- a/package.json
+++ b/package.json
@ -9,7 +9,7 @@
    "build": "vite build",
    "build:beta": "vite build --mode beta",
    "preview": "vite preview",
-    "test": "vitest run",
+    "test": "vitest run --no-isolate",
    "test:cov": "vitest run --coverage --no-isolate",
    "test:watch": "vitest watch --coverage --no-isolate",
    "test:silent": "vitest run --silent --no-isolate",
--- a/public/locales
+++ b/public/locales
@ -1 +1 @@
-Subproject commit 18c1963ef309612a5a7fef76f9879709a7202189
+Subproject commit e98f0eb9c2022bc78b53f0444424c636498e725a
--- a/src/data/balance/pokemon-level-moves.ts
+++ b/src/data/balance/pokemon-level-moves.ts
@ -19383,6 +19383,44 @@ export const pokemonFormLevelMoves: PokemonSpeciesFormLevelMoves = {
      [ 100, Moves.SEED_FLARE ],
    ]
  },
+  [Species.BASCULIN]: {
+    1: [
+      [ 1, Moves.TAIL_WHIP ],
+      [ 1, Moves.WATER_GUN ],
+      [ 4, Moves.TACKLE ],
+      [ 8, Moves.FLAIL ],
+      [ 12, Moves.AQUA_JET ],
+      [ 16, Moves.BITE ],
+      [ 20, Moves.SCARY_FACE ],
+      [ 24, Moves.HEADBUTT ],
+      [ 28, Moves.SOAK ],
+      [ 32, Moves.CRUNCH ],
+      [ 36, Moves.TAKE_DOWN ],
+      [ 40, Moves.FINAL_GAMBIT ],
+      [ 44, Moves.WAVE_CRASH ],
+      [ 48, Moves.THRASH ],
+      [ 52, Moves.DOUBLE_EDGE ],
+      [ 56, Moves.HEAD_SMASH ],
+    ],
+    2: [
+      [ 1, Moves.TAIL_WHIP ],
+      [ 1, Moves.WATER_GUN ],
+      [ 4, Moves.TACKLE ],
+      [ 8, Moves.FLAIL ],
+      [ 12, Moves.AQUA_JET ],
+      [ 16, Moves.BITE ],
+      [ 20, Moves.SCARY_FACE ],
+      [ 24, Moves.HEADBUTT ],
+      [ 28, Moves.SOAK ],
+      [ 32, Moves.CRUNCH ],
+      [ 36, Moves.TAKE_DOWN ],
+      [ 40, Moves.UPROAR ],
+      [ 44, Moves.WAVE_CRASH ],
+      [ 48, Moves.THRASH ],
+      [ 52, Moves.DOUBLE_EDGE ],
+      [ 56, Moves.HEAD_SMASH ],
+    ]
+  },
  [Species.KYUREM]: {
    1: [
      [ 1, Moves.DRAGON_BREATH ],
--- a/src/data/balance/signature-species.ts
+++ b/src/data/balance/signature-species.ts
@ -4,12 +4,19 @@ export type SignatureSpecies = {
  [key in string]: (Species | Species[])[];
 };

-/*
+/**
 * The signature species for each Gym Leader, Elite Four member, and Champion.
 * The key is the trainer type, and the value is an array of Species or Species arrays.
 * This is in a separate const so it can be accessed from other places and not just the trainerConfigs
+ * 
+ * @remarks
+ * The `Proxy` object allows us to define a handler that will intercept 
+ * the property access and return an empty array if the property does not exist in the object.
+ * 
+ * This means that accessing `signatureSpecies` will not throw an error if the property does not exist,
+ * but instead default to an empty array.
 */
-export const signatureSpecies: SignatureSpecies = {
+export const signatureSpecies: SignatureSpecies = new Proxy({
  // Gym Leaders- Kanto
  BROCK: [Species.ONIX, Species.GEODUDE, [Species.OMANYTE, Species.KABUTO], Species.AERODACTYL],
  MISTY: [Species.STARYU, Species.PSYDUCK, Species.WOOPER, Species.LAPRAS],
@ -92,71 +99,8 @@ export const signatureSpecies: SignatureSpecies = {
  RYME: [Species.TOXEL, Species.GREAVARD, Species.SHUPPET, Species.MIMIKYU], // Tera Ghost Toxel
  TULIP: [Species.FLABEBE, Species.FLITTLE, Species.RALTS, Species.GIRAFARIG], // Tera Psychic Flabebe
  GRUSHA: [Species.SWABLU, Species.CETODDLE, Species.SNOM, Species.CUBCHOO], // Tera Ice Swablu
-
-  // Elite Four- Kanto
-  LORELEI: [
-    Species.JYNX,
-    [Species.SLOWBRO, Species.GALAR_SLOWBRO],
-    Species.LAPRAS,
-    [Species.CLOYSTER, Species.ALOLA_SANDSLASH],
-  ],
-  BRUNO: [Species.MACHAMP, Species.HITMONCHAN, Species.HITMONLEE, [Species.GOLEM, Species.ALOLA_GOLEM]],
-  AGATHA: [Species.GENGAR, [Species.ARBOK, Species.WEEZING], Species.CROBAT, Species.ALOLA_MAROWAK],
-  LANCE: [Species.DRAGONITE, Species.GYARADOS, Species.AERODACTYL, Species.ALOLA_EXEGGUTOR],
-  // Elite Four- Johto (Bruno included)
-  WILL: [Species.XATU, Species.JYNX, [Species.SLOWBRO, Species.SLOWKING], Species.EXEGGUTOR],
-  KOGA: [[Species.MUK, Species.WEEZING], [Species.VENOMOTH, Species.ARIADOS], Species.CROBAT, Species.TENTACRUEL],
-  KAREN: [Species.UMBREON, Species.HONCHKROW, Species.HOUNDOOM, Species.WEAVILE],
-  // Elite Four- Hoenn
-  SIDNEY: [
-    [Species.SHIFTRY, Species.CACTURNE],
-    [Species.SHARPEDO, Species.CRAWDAUNT],
-    Species.ABSOL,
-    Species.MIGHTYENA,
-  ],
-  PHOEBE: [Species.SABLEYE, Species.DUSKNOIR, Species.BANETTE, [Species.DRIFBLIM, Species.MISMAGIUS]],
-  GLACIA: [Species.GLALIE, Species.WALREIN, Species.FROSLASS, Species.ABOMASNOW],
-  DRAKE: [Species.ALTARIA, Species.SALAMENCE, Species.FLYGON, Species.KINGDRA],
-  // Elite Four- Sinnoh
-  AARON: [[Species.SCIZOR, Species.KLEAVOR], Species.HERACROSS, [Species.VESPIQUEN, Species.YANMEGA], Species.DRAPION],
-  BERTHA: [Species.WHISCASH, Species.HIPPOWDON, Species.GLISCOR, Species.RHYPERIOR],
-  FLINT: [
-    [Species.RAPIDASH, Species.FLAREON],
-    Species.MAGMORTAR,
-    [Species.STEELIX, Species.LOPUNNY],
-    Species.INFERNAPE,
-  ], // Tera Fire Steelix or Lopunny
-  LUCIAN: [Species.MR_MIME, Species.GALLADE, Species.BRONZONG, [Species.ALAKAZAM, Species.ESPEON]],
-  // Elite Four- Unova
-  SHAUNTAL: [Species.COFAGRIGUS, Species.CHANDELURE, Species.GOLURK, Species.JELLICENT],
-  MARSHAL: [Species.CONKELDURR, Species.MIENSHAO, Species.THROH, Species.SAWK],
-  GRIMSLEY: [Species.LIEPARD, Species.KINGAMBIT, Species.SCRAFTY, Species.KROOKODILE],
-  CAITLIN: [Species.MUSHARNA, Species.GOTHITELLE, Species.SIGILYPH, Species.REUNICLUS],
-  // Elite Four- Kalos
-  MALVA: [Species.PYROAR, Species.TORKOAL, Species.CHANDELURE, Species.TALONFLAME],
-  SIEBOLD: [Species.CLAWITZER, Species.GYARADOS, Species.BARBARACLE, Species.STARMIE],
-  WIKSTROM: [Species.KLEFKI, Species.PROBOPASS, Species.SCIZOR, Species.AEGISLASH],
-  DRASNA: [Species.DRAGALGE, Species.DRUDDIGON, Species.ALTARIA, Species.NOIVERN],
-  // Elite Four- Alola
-  HALA: [Species.HARIYAMA, Species.BEWEAR, Species.CRABOMINABLE, [Species.POLIWRATH, Species.ANNIHILAPE]],
-  MOLAYNE: [Species.KLEFKI, Species.MAGNEZONE, Species.METAGROSS, Species.ALOLA_DUGTRIO],
-  OLIVIA: [Species.RELICANTH, Species.CARBINK, Species.ALOLA_GOLEM, Species.LYCANROC],
-  ACEROLA: [[Species.BANETTE, Species.DRIFBLIM], Species.MIMIKYU, Species.DHELMISE, Species.PALOSSAND],
-  KAHILI: [[Species.BRAVIARY, Species.MANDIBUZZ], Species.HAWLUCHA, Species.ORICORIO, Species.TOUCANNON],
-  // Elite Four- Galar
-  MARNIE_ELITE: [Species.MORPEKO, Species.LIEPARD, [Species.TOXICROAK, Species.SCRAFTY], Species.GRIMMSNARL],
-  NESSA_ELITE: [Species.GOLISOPOD, [Species.QUAGSIRE, Species.PELIPPER], Species.TOXAPEX, Species.DREDNAW],
-  BEA_ELITE: [Species.HAWLUCHA, [Species.GRAPPLOCT, Species.SIRFETCHD], Species.FALINKS, Species.MACHAMP],
-  ALLISTER_ELITE: [Species.DUSKNOIR, [Species.POLTEAGEIST, Species.RUNERIGUS], Species.CURSOLA, Species.GENGAR],
-  RAIHAN_ELITE: [Species.GOODRA, [Species.TORKOAL, Species.TURTONATOR], Species.FLYGON, Species.ARCHALUDON],
-  // Elite Four- Paldea
-  RIKA: [Species.CLODSIRE, [Species.DUGTRIO, Species.DONPHAN], Species.CAMERUPT, Species.WHISCASH], // Tera Ground Clodsire
-  POPPY: [Species.TINKATON, Species.BRONZONG, Species.CORVIKNIGHT, Species.COPPERAJAH], // Tera Steel Tinkaton
-  LARRY_ELITE: [Species.FLAMIGO, Species.STARAPTOR, [Species.ALTARIA, Species.TROPIUS], Species.ORICORIO], // Tera Flying Flamigo; random Oricorio
-  HASSEL: [Species.BAXCALIBUR, [Species.FLAPPLE, Species.APPLETUN], Species.DRAGALGE, Species.NOIVERN], // Tera Dragon Baxcalibur
-  // Elite Four- BBL
-  CRISPIN: [Species.BLAZIKEN, Species.MAGMORTAR, [Species.CAMERUPT, Species.TALONFLAME], Species.ROTOM], // Tera Fire Blaziken; Heat Rotom
-  AMARYS: [Species.METAGROSS, Species.SCIZOR, Species.EMPOLEON, Species.SKARMORY], // Tera Steel Metagross
-  LACEY: [Species.EXCADRILL, Species.PRIMARINA, [Species.WHIMSICOTT, Species.ALCREMIE], Species.GRANBULL], // Tera Fairy Excadrill
-  DRAYTON: [Species.ARCHALUDON, Species.DRAGONITE, Species.HAXORUS, Species.SCEPTILE], // Tera Dragon Archaludon
-};
+}, {
+  get(target, prop: string) {
+    return target[prop as keyof SignatureSpecies] ?? [];
+  }
+});
--- a/src/data/balance/tms.ts
+++ b/src/data/balance/tms.ts
@ -5724,7 +5724,6 @@ export const tmSpecies: TmSpecies = {
    Species.SCOLIPEDE,
    Species.WHIMSICOTT,
    Species.LILLIGANT,
-    Species.BASCULIN,
    Species.KROOKODILE,
    Species.DARMANITAN,
    Species.CRUSTLE,
@ -6023,6 +6022,11 @@ export const tmSpecies: TmSpecies = {
    Species.HISUI_DECIDUEYE,
    Species.PALDEA_TAUROS,
    Species.BLOODMOON_URSALUNA,
+    [
+      Species.BASCULIN,
+      "blue-striped",
+      "red-striped",
+    ]
  ],
  [Moves.LOW_KICK]: [
    Species.SANDSHREW,
@ -19335,7 +19339,6 @@ export const tmSpecies: TmSpecies = {
    Species.CONKELDURR,
    Species.THROH,
    Species.SAWK,
-    Species.BASCULIN,
    Species.DARMANITAN,
    Species.SCRAFTY,
    Species.ESCAVALIER,
@ -19449,6 +19452,11 @@ export const tmSpecies: TmSpecies = {
    Species.HISUI_BRAVIARY,
    Species.HISUI_DECIDUEYE,
    Species.PALDEA_TAUROS,
+    [
+      Species.BASCULIN,
+      "blue-striped",
+      "red-striped",
+    ],
  ],
  [Moves.SPITE]: [
    Species.EKANS,
@ -51341,7 +51349,6 @@ export const tmSpecies: TmSpecies = {
    Species.SCOLIPEDE,
    Species.WHIMSICOTT,
    Species.LILLIGANT,
-    Species.BASCULIN,
    Species.KROOKODILE,
    Species.DARMANITAN,
    Species.CRUSTLE,
@ -51655,6 +51662,11 @@ export const tmSpecies: TmSpecies = {
    Species.HISUI_DECIDUEYE,
    Species.PALDEA_TAUROS,
    Species.BLOODMOON_URSALUNA,
+    [
+      Species.BASCULIN,
+      "blue-striped",
+      "red-striped",
+    ],
  ],
  [Moves.NASTY_PLOT]: [
    Species.PIKACHU,
--- a/src/data/moves/move.ts
+++ b/src/data/moves/move.ts
@ -2463,7 +2463,7 @@ export class StatusEffectAttr extends MoveEffectAttr {
        return false;
      }
      if (((!pokemon.status || this.overrideStatus) || (pokemon.status.effect === this.effect && moveChance < 0))
-        && pokemon.trySetStatus(this.effect, true, user, this.turnsRemaining, null, this.overrideStatus)) {
+        && pokemon.trySetStatus(this.effect, true, user, this.turnsRemaining, null, this.overrideStatus, false)) {
        applyPostAttackAbAttrs(ConfusionOnStatusEffectAbAttr, user, target, move, null, false, this.effect);
        return true;
      }
@ -8618,7 +8618,9 @@ export function initMoves() {
      .condition((user, target, move) => !target.summonData?.illusion && !user.summonData?.illusion)
      // transforming from or into fusion pokemon causes various problems (such as crashes)
      .condition((user, target, move) => !target.getTag(BattlerTagType.SUBSTITUTE) && !user.fusionSpecies && !target.fusionSpecies)
-      .ignoresProtect(),
+      .ignoresProtect()
+      // Transforming should copy the target's rage fist hit count
+      .edgeCase(),
    new AttackMove(Moves.BUBBLE, PokemonType.WATER, MoveCategory.SPECIAL, 40, 100, 30, 10, 0, 1)
      .attr(StatStageChangeAttr, [ Stat.SPD ], -1)
      .target(MoveTarget.ALL_NEAR_ENEMIES),
--- a/src/data/pokemon-species.ts
+++ b/src/data/pokemon-species.ts
@ -488,6 +488,7 @@ export abstract class PokemonSpeciesForm {
          if (formSpriteKey.startsWith("behemoth")) {
            formSpriteKey = "crowned";
          }
+          // biome-ignore lint/suspicious/no-fallthrough: Falls through
        default:
          ret += `-${formSpriteKey}`;
          break;
--- a/src/data/trainers/trainer-config.ts
+++ b/src/data/trainers/trainer-config.ts
--- a/src/data/weather.ts
+++ b/src/data/weather.ts
@ -369,6 +369,7 @@ export function getRandomWeatherType(arena: Arena): WeatherType {
      if (hasSun) {
        weatherPool.push({ weatherType: WeatherType.SUNNY, weight: 2 });
      }
+      break;
    case Biome.VOLCANO:
      weatherPool = [
        {
--- a/src/field/pokemon.ts
+++ b/src/field/pokemon.ts
@ -5529,9 +5529,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
    sourcePokemon: Pokemon | null = null,
    turnsRemaining = 0,
    sourceText: string | null = null,
-    overrideStatus?: boolean
+    overrideStatus?: boolean,
+    quiet = true,
  ): boolean {
-    if (!this.canSetStatus(effect, false, overrideStatus, sourcePokemon)) {
+    if (!this.canSetStatus(effect, quiet, overrideStatus, sourcePokemon)) {
      return false;
    }
    if (this.isFainted() && effect !== StatusEffect.FAINT) {
--- a/src/system/settings/settings.ts
+++ b/src/system/settings/settings.ts
@ -804,6 +804,7 @@ export function setSetting(setting: string, value: number): boolean {
      break;
    case SettingKeys.Candy_Upgrade_Display:
      globalScene.candyUpgradeDisplay = value;
+      break;
    case SettingKeys.Money_Format:
      switch (Setting[index].options[value].value) {
        case "Normal":
--- a/src/ui-inputs.ts
+++ b/src/ui-inputs.ts
@ -176,11 +176,13 @@ export class UiInputs {
      return;
    }
    switch (globalScene.ui?.getMode()) {
-      case UiMode.MESSAGE:
+      case UiMode.MESSAGE: {
        const messageHandler = globalScene.ui.getHandler<MessageUiHandler>();
        if (!messageHandler.pendingPrompt || messageHandler.isTextAnimationInProgress()) {
          return;
        }
+        // biome-ignore lint/suspicious/noFallthroughSwitchClause: falls through to show menu overlay
+      }
      case UiMode.TITLE:
      case UiMode.COMMAND:
      case UiMode.MODIFIER_SELECT:
--- a/test/abilities/illusion.test.ts
+++ b/test/abilities/illusion.test.ts
@ -23,18 +23,18 @@ describe("Abilities - Illusion", () => {

  beforeEach(() => {
    game = new GameManager(phaserGame);
-    game.override.battleStyle("single");
-    game.override.enemySpecies(Species.ZORUA);
-    game.override.enemyAbility(Abilities.ILLUSION);
-    game.override.enemyMoveset(Moves.TACKLE);
-    game.override.enemyHeldItems([{ name: "WIDE_LENS", count: 3 }]);
-
-    game.override.moveset([Moves.WORRY_SEED, Moves.SOAK, Moves.TACKLE]);
-    game.override.startingHeldItems([{ name: "WIDE_LENS", count: 3 }]);
+    game.override
+      .battleStyle("single")
+      .enemySpecies(Species.ZORUA)
+      .enemyAbility(Abilities.ILLUSION)
+      .enemyMoveset(Moves.TACKLE)
+      .enemyHeldItems([{ name: "WIDE_LENS", count: 3 }])
+      .moveset([Moves.WORRY_SEED, Moves.SOAK, Moves.TACKLE])
+      .startingHeldItems([{ name: "WIDE_LENS", count: 3 }]);
  });

  it("creates illusion at the start", async () => {
-    await game.classicMode.startBattle([Species.ZOROARK, Species.AXEW]);
+    await game.classicMode.startBattle([Species.ZOROARK, Species.FEEBAS]);
    const zoroark = game.scene.getPlayerPokemon()!;
    const zorua = game.scene.getEnemyPokemon()!;

@ -43,7 +43,7 @@ describe("Abilities - Illusion", () => {
  });

  it("break after receiving damaging move", async () => {
-    await game.classicMode.startBattle([Species.AXEW]);
+    await game.classicMode.startBattle([Species.FEEBAS]);
    game.move.select(Moves.TACKLE);

    await game.phaseInterceptor.to("TurnEndPhase");
@ -55,7 +55,7 @@ describe("Abilities - Illusion", () => {
  });

  it("break after getting ability changed", async () => {
-    await game.classicMode.startBattle([Species.AXEW]);
+    await game.classicMode.startBattle([Species.FEEBAS]);
    game.move.select(Moves.WORRY_SEED);

    await game.phaseInterceptor.to("TurnEndPhase");
@ -76,7 +76,7 @@ describe("Abilities - Illusion", () => {

  it("causes enemy AI to consider the illusion's type instead of the actual type when considering move effectiveness", async () => {
    game.override.enemyMoveset([Moves.FLAMETHROWER, Moves.PSYCHIC, Moves.TACKLE]);
-    await game.classicMode.startBattle([Species.ZOROARK, Species.AXEW]);
+    await game.classicMode.startBattle([Species.ZOROARK, Species.FEEBAS]);

    const enemy = game.scene.getEnemyPokemon()!;
    const zoroark = game.scene.getPlayerPokemon()!;
--- a/tsconfig.json
+++ b/tsconfig.json
@ -7,7 +7,7 @@
    "esModuleInterop": true,
    "strictNullChecks": true,
    "sourceMap": false,
-    "strict": false,
+    "strict": false, // TODO: Enable this eventually
    "rootDir": ".",
    "baseUrl": "./src",
    "paths": {