Hotfix 1.9.2 to Main

Hotfix 1.9.2 to Main

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "pokemon-rogue-battle",
-  "version": "1.9.1",
+  "version": "1.9.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "pokemon-rogue-battle",
-      "version": "1.9.1",
+      "version": "1.9.2",
       "hasInstallScript": true,
       "dependencies": {
         "@material/material-color-utilities": "^0.2.7",

package.json

@@ -1,7 +1,7 @@
 {
   "name": "pokemon-rogue-battle",
   "private": true,
-  "version": "1.9.1",
+  "version": "1.9.2",
   "type": "module",
   "scripts": {
     "start": "vite",

src/data/egg.ts

@@ -598,7 +598,7 @@ export class Egg {
   }
 
   private getEggTier(): EggTier {
-    return speciesEggTiers[this.species];
+    return speciesEggTiers[this.species] ?? EggTier.COMMON;
   }
 
   ////

src/field/pokemon.ts

@@ -186,6 +186,7 @@ import {
   applyAllyStatMultiplierAbAttrs,
   AllyStatMultiplierAbAttr,
   MoveAbilityBypassAbAttr,
+  PreSummonAbAttr,
 } from "#app/data/abilities/ability";
 import { allAbilities } from "#app/data/data-lists";
 import type PokemonData from "#app/system/pokemon-data";
@@ -2414,8 +2415,9 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     const suppressAbilitiesTag = arena.getTag(
       ArenaTagType.NEUTRALIZING_GAS,
     ) as SuppressAbilitiesTag;
+    const suppressOffField = ability.hasAttr(PreSummonAbAttr);
     if (
-      this.isOnField() &&
+      (this.isOnField() || suppressOffField) &&
       suppressAbilitiesTag &&
       !suppressAbilitiesTag.isBeingRemoved()
     ) {
@@ -7859,6 +7861,11 @@ export class PokemonSummonData {
         continue;
       }
 
+      if (key === "moveset") {
+        this.moveset = value.map((m: any) => PokemonMove.loadMove(m));
+        continue;
+      }
+
       if (key === "tags") {
         // load battler tags
         this.tags = value.map((t: BattlerTag) => loadBattlerTag(t));

src/modifier/modifier-type.ts

@@ -3640,7 +3640,7 @@ function getNewModifierTypeOption(
       }
       tier += upgradeCount;
     }
-  } else if (retryCount === 10 && tier) {
+  } else if (retryCount >= 100 && tier) {
     retryCount = 0;
     tier--;
   }

src/phases/select-biome-phase.ts

@@ -13,6 +13,8 @@ export class SelectBiomePhase extends BattlePhase {
   start() {
     super.start();
 
+    globalScene.resetSeed();
+
     const currentBiome = globalScene.arena.biomeType;
     const nextWaveIndex = globalScene.currentBattle.waveIndex + 1;
 

src/system/version_migration/versions/v1_9_0.ts

@@ -1,5 +1,4 @@
 import type { SessionSaveMigrator } from "#app/@types/SessionSaveMigrator";
-import { Status } from "#app/data/status-effect";
 import { PokemonMove } from "#app/field/pokemon";
 import type { SessionSaveData } from "#app/system/game-data";
 import type PokemonData from "#app/system/pokemon-data";

test/abilities/illusion.test.ts

@@ -65,7 +65,7 @@ describe("Abilities - Illusion", () => {
     expect(!!zorua.summonData.illusion).equals(false);
   });
 
-  it("break with neutralizing gas", async () => {
+  it("breaks with neutralizing gas", async () => {
     game.override.enemyAbility(Abilities.NEUTRALIZING_GAS);
     await game.classicMode.startBattle([Species.KOFFING]);
 
@@ -74,6 +74,20 @@ describe("Abilities - Illusion", () => {
     expect(!!zorua.summonData.illusion).equals(false);
   });
 
+  it("does not activate if neutralizing gas is active", async () => {
+    game.override
+      .enemyAbility(Abilities.NEUTRALIZING_GAS)
+      .ability(Abilities.ILLUSION)
+      .moveset(Moves.SPLASH)
+      .enemyMoveset(Moves.SPLASH);
+    await game.classicMode.startBattle([Species.MAGIKARP, Species.FEEBAS, Species.MAGIKARP]);
+
+    game.doSwitchPokemon(1);
+    await game.toNextTurn();
+
+    expect(game.scene.getPlayerPokemon()!.summonData.illusion).toBeFalsy();
+  });
+
   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.FEEBAS]);