Merge branch 'beta' into move-name-top

docs/linting.md

@@ -1,40 +1,34 @@
-# ESLint
+# Biome
+
 ## Key Features
 
 1. **Automation**:
-   - A pre-commit hook has been added to automatically run ESLint on the added or modified files, ensuring code quality before commits.
+   - A pre-commit hook has been added to automatically run Biome on the added or modified files, ensuring code quality before commits.
 
 2. **Manual Usage**:
-   - If you prefer not to use the pre-commit hook, you can manually run ESLint to automatically fix issues using the command:
+   - If you prefer not to use the pre-commit hook, you can manually run biome to automatically fix issues using the command:
+
      ```sh
-     npx eslint --fix . or npm run eslint
+     npx @biomejs/biome --write
      ```
+
    - Running this command will lint all files in the repository.
 
 3. **GitHub Action**:
-   - A GitHub Action has been added to automatically run ESLint on every push and pull request, ensuring code quality in the CI/CD pipeline.
+   - A GitHub Action has been added to automatically run Biome on every push and pull request, ensuring code quality in the CI/CD pipeline.
 
-## Summary of ESLint Rules
+If you are getting linting errors from biome and want to see which files they are coming from, you can find that out by running biome in a way that is configured to only show the errors for that specific rule: ``npx @biomejs/biome lint --only=category/ruleName``
 
-1. **General Rules**:
+## Summary of Biome Rules
-   - **Equality**: Use `===` and `!==` instead of `==` and `!=` (`eqeqeq`).
-   - **Indentation**: Enforce 2-space indentation (`indent`).
-   - **Quotes**: Use doublequotes for strings (`quotes`).
-   - **Variable Declarations**: 
-     - Disallow `var`; use `let` or `const` (`no-var`).
-     - Prefer `const` for variables that are never reassigned (`prefer-const`).
-   - **Unused Variables**: Allow unused function parameters but enforce error for other unused variables (`@typescript-eslint/no-unused-vars`).
-   - **End of Line**: Ensure at least one newline at the end of files (`eol-last`).
-   - **Curly Braces**: Enforce the use of curly braces for all control statements (`curly`).
-   - **Brace Style**: Use one true brace style (`1tbs`) for TypeScript-specific syntax (`@typescript-eslint/brace-style`).
 
-2. **TypeScript-Specific Rules**:
+We use the [recommended ruleset](https://biomejs.dev/linter/rules/) for Biome, with some customizations to better suit our project's needs.
-   - **Semicolons**:
-     - Enforce semicolons for TypeScript-specific syntax (`@typescript-eslint/semi`).
-     - Disallow unnecessary semicolons (`@typescript-eslint/no-extra-semi`).
 
-## Benefits
+For a complete list of rules and their configurations, refer to the `biome.jsonc` file in the project root.
 
-- **Consistency**: Ensures consistent coding style across the project.
+Some things to consider:
-- **Code Quality**: Helps catch potential errors and improve overall code quality.
+
-- **Readability**: Makes the codebase easier to read and maintain.
+- We have disabled rules that prioritize style over performance, such as `useTemplate`
+- Some rules are currently marked as warnings (`warn`) to allow for gradual refactoring without blocking development. Do not write new code that triggers these warnings.
+- The linter is configured to ignore specific files and folders, such as large or complex files that are pending refactors, to improve performance and focus on actionable areas.
+
+Formatting is also handled by Biome. You should not have to worry about manually formatting your code.

package-lock.json

@@ -18,8 +18,8 @@
         "i18next-korean-postposition-processor": "^1.0.0",
         "json-stable-stringify": "^1.2.0",
         "jszip": "^3.10.1",
-        "phaser": "^3.70.0",
+        "phaser": "^3.88.2",
-        "phaser3-rex-plugins": "^1.80.14"
+        "phaser3-rex-plugins": "^1.80.15"
       },
       "devDependencies": {
         "@biomejs/biome": "1.9.4",
@@ -48,7 +48,7 @@
         "vitest-canvas-mock": "^0.3.3"
       },
       "engines": {
-        "node": ">=20.0.0"
+        "node": ">=22.0.0"
       }
     },
     "node_modules/@ampproject/remapping": {
@@ -6227,18 +6227,18 @@
       }
     },
     "node_modules/phaser": {
-      "version": "3.80.1",
+      "version": "3.88.2",
-      "resolved": "https://registry.npmjs.org/phaser/-/phaser-3.80.1.tgz",
+      "resolved": "https://registry.npmjs.org/phaser/-/phaser-3.88.2.tgz",
-      "integrity": "sha512-VQGAWoDOkEpAWYkI+PUADv5Ql+SM0xpLuAMBJHz9tBcOLqjJ2wd8bUhxJgOqclQlLTg97NmMd9MhS75w16x1Cw==",
+      "integrity": "sha512-UBgd2sAFuRJbF2xKaQ5jpMWB8oETncChLnymLGHcrnT53vaqiGrQWbUKUDBawKLm24sghjKo4Bf+/xfv8espZQ==",
       "license": "MIT",
       "dependencies": {
         "eventemitter3": "^5.0.1"
       }
     },
     "node_modules/phaser3-rex-plugins": {
-      "version": "1.80.14",
+      "version": "1.80.15",
-      "resolved": "https://registry.npmjs.org/phaser3-rex-plugins/-/phaser3-rex-plugins-1.80.14.tgz",
+      "resolved": "https://registry.npmjs.org/phaser3-rex-plugins/-/phaser3-rex-plugins-1.80.15.tgz",
-      "integrity": "sha512-eHi3VgryO9umNu6D1yQU5IS6tH4TyC2Y6RgJ495nNp37X2fdYnmYpBfgFg+YaumvtaoOvCkUVyi/YqWNPf2X2A==",
+      "integrity": "sha512-Ur973N1W5st6XEYBcJko8eTcEbdDHMM+m7VqvT3j/EJeJwYyJ3bVb33JJDsFgefk3A2iAz2itP/UY7CzxJOJVA==",
       "license": "MIT",
       "dependencies": {
         "dagre": "^0.8.5",

package.json

@@ -63,8 +63,8 @@
     "i18next-korean-postposition-processor": "^1.0.0",
     "json-stable-stringify": "^1.2.0",
     "jszip": "^3.10.1",
-    "phaser": "^3.70.0",
+    "phaser": "^3.88.2",
-    "phaser3-rex-plugins": "^1.80.14"
+    "phaser3-rex-plugins": "^1.80.15"
   },
   "engines": {
     "node": ">=22.0.0"

public/images/inputs/keyboard.json

@@ -516,8 +516,36 @@
     "trimmed": true,
     "spriteSourceSize": { "x": 0, "y": 0, "w": 28, "h": 11 },
     "sourceSize": { "w": 28, "h": 11 }
+   },
+   "BACK_SLASH.png": {
+    "frame": { "x": 147, "y": 66, "w": 12, "h": 11 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 12, "h": 11 },
+    "sourceSize": { "w": 12, "h": 11 }
+   },
+   "FORWARD_SLASH.png": {
+    "frame": { "x": 144, "y": 55, "w": 12, "h": 11 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 12, "h": 11 },
+    "sourceSize": { "w": 12, "h": 11 }
+   },
+   "COMMA.png": {
+    "frame": { "x": 144, "y": 44, "w": 12, "h": 11 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 12, "h": 11 },
+    "sourceSize": { "w": 12, "h": 11 }
+   },
+   "PERIOD.png": {
+    "frame": { "x": 143, "y": 22, "w": 11, "h": 11 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 11, "h": 11 },
+    "sourceSize": { "w": 11, "h": 11 }
    }
- },
+  },
  "meta": {
   "app": "https://www.aseprite.org/",
   "version": "1.3.7-dev",

public/locales

@@ -1 +1 @@
-Subproject commit e98f0eb9c2022bc78b53f0444424c636498e725a
+Subproject commit 18c1963ef309612a5a7fef76f9879709a7202189

src/battle-scene.ts

@@ -1394,9 +1394,9 @@ export default class BattleScene extends SceneBase {
     if (double === undefined && newWaveIndex > 1) {
       if (newBattleType === BattleType.WILD && !this.gameMode.isWaveFinal(newWaveIndex)) {
         newDouble = !randSeedInt(this.getDoubleBattleChance(newWaveIndex, playerField));
+      } else if (newBattleType === BattleType.TRAINER) {
+        newDouble = newTrainer?.variant === TrainerVariant.DOUBLE;
       }
-    } else if (double === undefined && newBattleType === BattleType.TRAINER) {
-      newDouble = newTrainer?.variant === TrainerVariant.DOUBLE;
     } else if (!battleConfig) {
       newDouble = !!double;
     }

src/battle.ts

@@ -31,29 +31,7 @@ import type { CustomModifierSettings } from "#app/modifier/modifier-type";
 import { ModifierTier } from "#app/modifier/modifier-tier";
 import type { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import { BattleType } from "#enums/battle-type";
-
+import { ClassicFixedBossWaves } from "#enums/fixed-boss-waves";
-export enum ClassicFixedBossWaves {
-  TOWN_YOUNGSTER = 5,
-  RIVAL_1 = 8,
-  RIVAL_2 = 25,
-  EVIL_GRUNT_1 = 35,
-  RIVAL_3 = 55,
-  EVIL_GRUNT_2 = 62,
-  EVIL_GRUNT_3 = 64,
-  EVIL_ADMIN_1 = 66,
-  RIVAL_4 = 95,
-  EVIL_GRUNT_4 = 112,
-  EVIL_ADMIN_2 = 114,
-  EVIL_BOSS_1 = 115,
-  RIVAL_5 = 145,
-  EVIL_BOSS_2 = 165,
-  ELITE_FOUR_1 = 182,
-  ELITE_FOUR_2 = 184,
-  ELITE_FOUR_3 = 186,
-  ELITE_FOUR_4 = 188,
-  CHAMPION = 190,
-  RIVAL_6 = 195,
-}
 
 export enum BattlerIndex {
   ATTACKER = -1,

src/configs/inputs/cfg_keyboard_qwerty.ts

@@ -31,6 +31,7 @@ const cfg_keyboard_qwerty = {
     KEY_X: Phaser.Input.Keyboard.KeyCodes.X,
     KEY_Y: Phaser.Input.Keyboard.KeyCodes.Y,
     KEY_Z: Phaser.Input.Keyboard.KeyCodes.Z,
+
     KEY_0: Phaser.Input.Keyboard.KeyCodes.ZERO,
     KEY_1: Phaser.Input.Keyboard.KeyCodes.ONE,
     KEY_2: Phaser.Input.Keyboard.KeyCodes.TWO,
@@ -41,11 +42,7 @@ const cfg_keyboard_qwerty = {
     KEY_7: Phaser.Input.Keyboard.KeyCodes.SEVEN,
     KEY_8: Phaser.Input.Keyboard.KeyCodes.EIGHT,
     KEY_9: Phaser.Input.Keyboard.KeyCodes.NINE,
-    KEY_CTRL: Phaser.Input.Keyboard.KeyCodes.CTRL,
+
-    KEY_DEL: Phaser.Input.Keyboard.KeyCodes.DELETE,
-    KEY_END: Phaser.Input.Keyboard.KeyCodes.END,
-    KEY_ENTER: Phaser.Input.Keyboard.KeyCodes.ENTER,
-    KEY_ESC: Phaser.Input.Keyboard.KeyCodes.ESC,
     KEY_F1: Phaser.Input.Keyboard.KeyCodes.F1,
     KEY_F2: Phaser.Input.Keyboard.KeyCodes.F2,
     KEY_F3: Phaser.Input.Keyboard.KeyCodes.F3,
@@ -58,24 +55,41 @@ const cfg_keyboard_qwerty = {
     KEY_F10: Phaser.Input.Keyboard.KeyCodes.F10,
     KEY_F11: Phaser.Input.Keyboard.KeyCodes.F11,
     KEY_F12: Phaser.Input.Keyboard.KeyCodes.F12,
-    KEY_HOME: Phaser.Input.Keyboard.KeyCodes.HOME,
+
-    KEY_INSERT: Phaser.Input.Keyboard.KeyCodes.INSERT,
     KEY_PAGE_DOWN: Phaser.Input.Keyboard.KeyCodes.PAGE_DOWN,
     KEY_PAGE_UP: Phaser.Input.Keyboard.KeyCodes.PAGE_UP,
+
+    KEY_CTRL: Phaser.Input.Keyboard.KeyCodes.CTRL,
+    KEY_DEL: Phaser.Input.Keyboard.KeyCodes.DELETE,
+    KEY_END: Phaser.Input.Keyboard.KeyCodes.END,
+    KEY_ENTER: Phaser.Input.Keyboard.KeyCodes.ENTER,
+    KEY_ESC: Phaser.Input.Keyboard.KeyCodes.ESC,
+    KEY_HOME: Phaser.Input.Keyboard.KeyCodes.HOME,
+    KEY_INSERT: Phaser.Input.Keyboard.KeyCodes.INSERT,
+
     KEY_PLUS: Phaser.Input.Keyboard.KeyCodes.NUMPAD_ADD, // Assuming numpad plus
     KEY_MINUS: Phaser.Input.Keyboard.KeyCodes.NUMPAD_SUBTRACT, // Assuming numpad minus
     KEY_QUOTATION: Phaser.Input.Keyboard.KeyCodes.QUOTES,
     KEY_SHIFT: Phaser.Input.Keyboard.KeyCodes.SHIFT,
+
     KEY_SPACE: Phaser.Input.Keyboard.KeyCodes.SPACE,
     KEY_TAB: Phaser.Input.Keyboard.KeyCodes.TAB,
     KEY_TILDE: Phaser.Input.Keyboard.KeyCodes.BACKTICK,
+
     KEY_ARROW_UP: Phaser.Input.Keyboard.KeyCodes.UP,
     KEY_ARROW_DOWN: Phaser.Input.Keyboard.KeyCodes.DOWN,
     KEY_ARROW_LEFT: Phaser.Input.Keyboard.KeyCodes.LEFT,
     KEY_ARROW_RIGHT: Phaser.Input.Keyboard.KeyCodes.RIGHT,
+
     KEY_LEFT_BRACKET: Phaser.Input.Keyboard.KeyCodes.OPEN_BRACKET,
     KEY_RIGHT_BRACKET: Phaser.Input.Keyboard.KeyCodes.CLOSED_BRACKET,
+
     KEY_SEMICOLON: Phaser.Input.Keyboard.KeyCodes.SEMICOLON,
+    KEY_COMMA: Phaser.Input.Keyboard.KeyCodes.COMMA,
+    KEY_PERIOD: Phaser.Input.Keyboard.KeyCodes.PERIOD,
+    KEY_BACK_SLASH: Phaser.Input.Keyboard.KeyCodes.BACK_SLASH,
+    KEY_FORWARD_SLASH: Phaser.Input.Keyboard.KeyCodes.FORWARD_SLASH,
+
     KEY_BACKSPACE: Phaser.Input.Keyboard.KeyCodes.BACKSPACE,
     KEY_ALT: Phaser.Input.Keyboard.KeyCodes.ALT,
   },
@@ -160,6 +174,10 @@ const cfg_keyboard_qwerty = {
     KEY_RIGHT_BRACKET: "RIGHT_BRACKET.png",
 
     KEY_SEMICOLON: "SEMICOLON.png",
+    KEY_COMMA: "COMMA.png",
+    KEY_PERIOD: "PERIOD.png",
+    KEY_BACK_SLASH: "BACK_SLASH.png",
+    KEY_FORWARD_SLASH: "FORWARD_SLASH.png",
 
     KEY_BACKSPACE: "BACK.png",
     KEY_ALT: "ALT.png",

src/data/abilities/ability.ts

@@ -7227,7 +7227,7 @@ export function initAbilities() {
     new Ability(Abilities.CURIOUS_MEDICINE, 8)
       .attr(PostSummonClearAllyStatStagesAbAttr),
     new Ability(Abilities.TRANSISTOR, 8)
-      .attr(MoveTypePowerBoostAbAttr, PokemonType.ELECTRIC),
+      .attr(MoveTypePowerBoostAbAttr, PokemonType.ELECTRIC, 1.3),
     new Ability(Abilities.DRAGONS_MAW, 8)
       .attr(MoveTypePowerBoostAbAttr, PokemonType.DRAGON),
     new Ability(Abilities.CHILLING_NEIGH, 8)
@@ -7412,4 +7412,4 @@ export function initAbilities() {
       .unreplaceable() // TODO is this true?
       .attr(ConfusionOnStatusEffectAbAttr, StatusEffect.POISON, StatusEffect.TOXIC)
   );
-}
+}

src/data/challenge.ts

@@ -8,7 +8,8 @@ import { speciesStarterCosts } from "#app/data/balance/starters";
 import type Pokemon from "#app/field/pokemon";
 import { PokemonMove } from "#app/field/pokemon";
 import type { FixedBattleConfig } from "#app/battle";
-import { ClassicFixedBossWaves, getRandomTrainerFunc } from "#app/battle";
+import { getRandomTrainerFunc } from "#app/battle";
+import { ClassicFixedBossWaves } from "#enums/fixed-boss-waves";
 import { BattleType } from "#enums/battle-type";
 import Trainer, { TrainerVariant } from "#app/field/trainer";
 import { PokemonType } from "#enums/pokemon-type";

src/data/moves/move.ts

@@ -2459,14 +2459,7 @@ export class StatusEffectAttr extends MoveEffectAttr {
     const statusCheck = moveChance < 0 || moveChance === 100 || user.randSeedInt(100) < moveChance;
     if (statusCheck) {
       const pokemon = this.selfTarget ? user : target;
-      if (pokemon.status && !this.overrideStatus) {
+      if (user !== target && move.category === MoveCategory.STATUS && !target.canSetStatus(this.effect, false, false, user, true)) {
-        return false;
-      }
-
-      if (user !== target && target.isSafeguarded(user)) {
-        if (move.category === MoveCategory.STATUS) {
-          globalScene.queueMessage(i18next.t("moveTriggers:safeguard", { targetName: getPokemonNameWithAffix(target) }));
-        }
         return false;
       }
       if (((!pokemon.status || this.overrideStatus) || (pokemon.status.effect === this.effect && moveChance < 0))
@@ -7672,20 +7665,6 @@ export class AverageStatsAttr extends MoveEffectAttr {
   }
 }
 
-export class DiscourageFrequentUseAttr extends MoveAttr {
-  getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): number {
-    const lastMoves = user.getLastXMoves(4);
-    console.log(lastMoves);
-    for (let m = 0; m < lastMoves.length; m++) {
-      if (lastMoves[m].move === move.id) {
-        return (4 - (m + 1)) * -10;
-      }
-    }
-
-    return 0;
-  }
-}
-
 export class MoneyAttr extends MoveEffectAttr {
   constructor() {
     super(true, {firstHitOnly: true });
@@ -10524,8 +10503,7 @@ export function initMoves() {
         } else {
           return 1;
         }
-      })
+      }),
-      .attr(DiscourageFrequentUseAttr),
 
     new AttackMove(Moves.SNIPE_SHOT, PokemonType.WATER, MoveCategory.SPECIAL, 80, 100, 15, -1, 0, 8)
       .attr(HighCritAttr)

src/data/trainers/TrainerPartyTemplate.ts

@@ -1,6 +1,8 @@
 import { startingWave } from "#app/starting-wave";
 import { globalScene } from "#app/global-scene";
 import { PartyMemberStrength } from "#enums/party-member-strength";
+import { GameModes } from "#app/game-mode";
+import { ClassicFixedBossWaves } from "#enums/fixed-boss-waves";
 
 export class TrainerPartyTemplate {
   public size: number;
@@ -222,19 +224,18 @@ export const trainerPartyTemplates = {
  */
 export function getEvilGruntPartyTemplate(): TrainerPartyTemplate {
   const waveIndex = globalScene.currentBattle?.waveIndex;
-  if (waveIndex < 40) {
+  switch (waveIndex) {
-    return trainerPartyTemplates.TWO_AVG;
+    case ClassicFixedBossWaves.EVIL_GRUNT_1:
+      return trainerPartyTemplates.TWO_AVG;
+    case ClassicFixedBossWaves.EVIL_GRUNT_2:
+      return trainerPartyTemplates.THREE_AVG;
+    case ClassicFixedBossWaves.EVIL_GRUNT_3:
+      return trainerPartyTemplates.TWO_AVG_ONE_STRONG;
+    case ClassicFixedBossWaves.EVIL_ADMIN_1:
+      return trainerPartyTemplates.GYM_LEADER_4; // 3avg 1 strong 1 stronger
+    default:
+      return trainerPartyTemplates.GYM_LEADER_5; // 3 avg 2 strong 1 stronger
   }
-  if (waveIndex < 63) {
-    return trainerPartyTemplates.THREE_AVG;
-  }
-  if (waveIndex < 65) {
-    return trainerPartyTemplates.TWO_AVG_ONE_STRONG;
-  }
-  if (waveIndex < 112) {
-    return trainerPartyTemplates.GYM_LEADER_4; // 3avg 1 strong 1 stronger
-  }
-  return trainerPartyTemplates.GYM_LEADER_5; // 3 avg 2 strong 1 stronger
 }
 
 export function getWavePartyTemplate(...templates: TrainerPartyTemplate[]) {
@@ -245,11 +246,36 @@ export function getWavePartyTemplate(...templates: TrainerPartyTemplate[]) {
 }
 
 export function getGymLeaderPartyTemplate() {
-  return getWavePartyTemplate(
+  const { currentBattle, gameMode } = globalScene;
-    trainerPartyTemplates.GYM_LEADER_1,
+  switch (gameMode.modeId) {
-    trainerPartyTemplates.GYM_LEADER_2,
+    case GameModes.DAILY:
-    trainerPartyTemplates.GYM_LEADER_3,
+      if (currentBattle?.waveIndex <= 20) {
-    trainerPartyTemplates.GYM_LEADER_4,
+        return trainerPartyTemplates.GYM_LEADER_2
-    trainerPartyTemplates.GYM_LEADER_5,
+      }
-  );
+      return trainerPartyTemplates.GYM_LEADER_3;
+    case GameModes.CHALLENGE: // In the future, there may be a ChallengeType to call here. For now, use classic's.
+    case GameModes.CLASSIC:
+      if (currentBattle?.waveIndex <= 20) {
+        return trainerPartyTemplates.GYM_LEADER_1; // 1 avg 1 strong
+      }
+      else if (currentBattle?.waveIndex <= 30) {
+        return trainerPartyTemplates.GYM_LEADER_2; // 1 avg 1 strong 1 stronger
+      }
+      else if (currentBattle?.waveIndex <= 60) { // 50 and 60
+        return trainerPartyTemplates.GYM_LEADER_3; // 2 avg 1 strong 1 stronger
+      }
+      else if (currentBattle?.waveIndex <= 90) { // 80 and 90
+        return trainerPartyTemplates.GYM_LEADER_4; // 3 avg 1 strong 1 stronger
+      }
+      // 110+
+      return trainerPartyTemplates.GYM_LEADER_5; // 3 avg 2 strong 1 stronger
+    default:
+      return getWavePartyTemplate(
+        trainerPartyTemplates.GYM_LEADER_1,
+        trainerPartyTemplates.GYM_LEADER_2,
+        trainerPartyTemplates.GYM_LEADER_3,
+        trainerPartyTemplates.GYM_LEADER_4,
+        trainerPartyTemplates.GYM_LEADER_5,
+      );
+  }
 }

src/enums/fixed-boss-waves.ts

@@ -0,0 +1,22 @@
+export enum ClassicFixedBossWaves {
+  TOWN_YOUNGSTER = 5,
+  RIVAL_1 = 8,
+  RIVAL_2 = 25,
+  EVIL_GRUNT_1 = 35,
+  RIVAL_3 = 55,
+  EVIL_GRUNT_2 = 62,
+  EVIL_GRUNT_3 = 64,
+  EVIL_ADMIN_1 = 66,
+  RIVAL_4 = 95,
+  EVIL_GRUNT_4 = 112,
+  EVIL_ADMIN_2 = 114,
+  EVIL_BOSS_1 = 115,
+  RIVAL_5 = 145,
+  EVIL_BOSS_2 = 165,
+  ELITE_FOUR_1 = 182,
+  ELITE_FOUR_2 = 184,
+  ELITE_FOUR_3 = 186,
+  ELITE_FOUR_4 = 188,
+  CHAMPION = 190,
+  RIVAL_6 = 195
+}

src/field/pokemon.ts

@@ -248,6 +248,7 @@ import { PLAYER_PARTY_MAX_SIZE } from "#app/constants";
 import { CustomPokemonData } from "#app/data/custom-pokemon-data";
 import { SwitchType } from "#enums/switch-type";
 import { SpeciesFormKey } from "#enums/species-form-key";
+import {getStatusEffectOverlapText } from "#app/data/status-effect";
 import {
   BASE_HIDDEN_ABILITY_CHANCE,
   BASE_SHINY_CHANCE,
@@ -5364,6 +5365,18 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     );
   }
 
+  queueImmuneMessage(quiet: boolean, effect?: StatusEffect): void {
+    if (!effect || quiet) {
+      return;
+    }
+    const message = effect && this.status?.effect === effect
+    ? getStatusEffectOverlapText(effect ?? StatusEffect.NONE, getPokemonNameWithAffix(this))
+    : i18next.t("abilityTriggers:moveImmunity", { 
+        pokemonNameWithAffix: getPokemonNameWithAffix(this),
+      });
+    globalScene.queueMessage(message);
+  }
+
   /**
    * Checks if a status effect can be applied to the Pokemon.
    *
@@ -5382,6 +5395,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
   ): boolean {
     if (effect !== StatusEffect.FAINT) {
       if (overrideStatus ? this.status?.effect === effect : this.status) {
+        this.queueImmuneMessage(quiet, effect);
         return false;
       }
       if (
@@ -5389,18 +5403,11 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
         !ignoreField &&
         globalScene.arena.terrain?.terrainType === TerrainType.MISTY
       ) {
+        this.queueImmuneMessage(quiet, effect);
         return false;
       }
     }
 
-    if (
-      sourcePokemon &&
-      sourcePokemon !== this &&
-      this.isSafeguarded(sourcePokemon)
-    ) {
-      return false;
-    }
-
     const types = this.getTypes(true, true);
 
     switch (effect) {
@@ -5429,17 +5436,19 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
             }
           }
 
-          return true;
+            return true;
         });
 
         if (this.isOfType(PokemonType.POISON) || this.isOfType(PokemonType.STEEL)) {
           if (poisonImmunity.includes(true)) {
+            this.queueImmuneMessage(quiet, effect);
             return false;
           }
         }
         break;
       case StatusEffect.PARALYSIS:
         if (this.isOfType(PokemonType.ELECTRIC)) {
+          this.queueImmuneMessage(quiet, effect);
           return false;
         }
         break;
@@ -5448,6 +5457,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
           this.isGrounded() &&
           globalScene.arena.terrain?.terrainType === TerrainType.ELECTRIC
         ) {
+          this.queueImmuneMessage(quiet, effect);
           return false;
         }
         break;
@@ -5460,11 +5470,13 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
               globalScene.arena.weather.weatherType,
             ))
         ) {
+          this.queueImmuneMessage(quiet, effect);
           return false;
         }
         break;
       case StatusEffect.BURN:
         if (this.isOfType(PokemonType.FIRE)) {
+          this.queueImmuneMessage(quiet, effect);
           return false;
         }
         break;
@@ -5499,6 +5511,19 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
       return false;
     }
 
+    if (
+      sourcePokemon &&
+      sourcePokemon !== this &&
+      this.isSafeguarded(sourcePokemon)
+    ) {
+      if(!quiet){ 
+        globalScene.queueMessage(
+          i18next.t("moveTriggers:safeguard", { targetName: getPokemonNameWithAffix(this) 
+        }));
+      }
+      return false;
+    }
+
     return true;
   }
 
@@ -5510,7 +5535,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     sourceText: string | null = null,
     overrideStatus?: boolean
   ): boolean {
-    if (!this.canSetStatus(effect, asPhase, overrideStatus, sourcePokemon)) {
+    if (!this.canSetStatus(effect, false, overrideStatus, sourcePokemon)) {
       return false;
     }
     if (this.isFainted() && effect !== StatusEffect.FAINT) {

src/main.ts

@@ -93,7 +93,7 @@ const startGame = async (manifest?: any) => {
     dom: {
       createContainer: true,
     },
-    pixelArt: true,
+    antialias: false,
     pipeline: [InvertPostFX] as unknown as Phaser.Types.Core.PipelineConfig,
     scene: [LoadingScene, BattleScene],
     version: version,

src/phases/victory-phase.ts

@@ -1,5 +1,5 @@
 import type { BattlerIndex } from "#app/battle";
-import { ClassicFixedBossWaves } from "#app/battle";
+import { ClassicFixedBossWaves } from "#enums/fixed-boss-waves";
 import { BattleType } from "#enums/battle-type";
 import type { CustomModifierSettings } from "#app/modifier/modifier-type";
 import { modifierTypes } from "#app/modifier/modifier-type";

src/ui/battle-info.ts

@@ -557,11 +557,11 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
         this.ownedIcon,
         this.championRibbon,
         this.statusIndicator,
-        this.levelContainer,
         this.statValuesContainer,
       ].map(e => (e.x += 48 * (boss ? -1 : 1)));
       this.hpBar.x += 38 * (boss ? -1 : 1);
       this.hpBar.y += 2 * (this.boss ? -1 : 1);
+      this.levelContainer.x += 2 * (boss ? -1 : 1);
       this.hpBar.setTexture(`overlay_hp${boss ? "_boss" : ""}`);
       this.box.setTexture(this.getTextureName());
       this.statsBox.setTexture(`${this.getTextureName()}_stats`);

test/moves/whirlwind.test.ts

@@ -163,6 +163,7 @@ describe("Moves - Whirlwind", () => {
 
   it("should not pull in the other trainer's pokemon in a partner trainer battle", async () => {
     game.override
+      .startingWave(2)
       .battleType(BattleType.TRAINER)
       .randomTrainer({
         trainerType: TrainerType.BREEDER,