Merge branch 'beta' into true-force-switch

src/data/ability.ts

@@ -4951,9 +4951,10 @@ class ForceSwitchOutHelper {
       }
     /**
      * For wild Pokémon battles, the Pokémon will flee if the conditions are met (waveIndex and double battles).
+     * It will not flee if it is a Mystery Encounter with fleeing disabled (checked in `getSwitchOutCondition()`) or if it is a wave 10x wild boss
      */
     } else {
-      if (!pokemon.scene.currentBattle.waveIndex && pokemon.scene.currentBattle.waveIndex % 10 === 0) {
+      if (!pokemon.scene.currentBattle.waveIndex || pokemon.scene.currentBattle.waveIndex % 10 === 0) {
         return false;
       }
 

src/field/pokemon.ts

@@ -2622,6 +2622,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     const fixedDamage = new Utils.IntegerHolder(0);
     applyMoveAttrs(FixedDamageAttr, source, this, move, fixedDamage);
     if (fixedDamage.value) {
+      const multiLensMultiplier = new Utils.NumberHolder(1);
+      source.scene.applyModifiers(PokemonMultiHitModifier, source.isPlayer(), source, move.id, null, multiLensMultiplier);
+      fixedDamage.value = Utils.toDmgValue(fixedDamage.value * multiLensMultiplier.value);
+
       return {
         cancelled: false,
         result: HitResult.EFFECTIVE,
@@ -3097,10 +3101,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
   }
 
   lapseTag(tagType: BattlerTagType): boolean {
-    const tags = this.summonData?.tags;
-    if (isNullOrUndefined(tags)) {
+    if (!this.summonData) {
       return false;
     }
+    const tags = this.summonData.tags;
     const tag = tags.find(t => t.tagType === tagType);
     if (tag && !(tag.lapse(this, BattlerTagLapseType.CUSTOM))) {
       tag.onRemove(this);
@@ -3110,6 +3114,9 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
   }
 
   lapseTags(lapseType: BattlerTagLapseType): void {
+    if (!this.summonData) {
+      return;
+    }
     const tags = this.summonData.tags;
     tags.filter(t => lapseType === BattlerTagLapseType.FAINT || ((t.lapseTypes.some(lType => lType === lapseType)) && !(t.lapse(this, lapseType)))).forEach(t => {
       t.onRemove(this);
@@ -3118,6 +3125,9 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
   }
 
   removeTag(tagType: BattlerTagType): boolean {
+    if (!this.summonData) {
+      return false;
+    }
     const tags = this.summonData.tags;
     const tag = tags.find(t => t.tagType === tagType);
     if (tag) {

src/modifier/modifier.ts

@@ -2727,10 +2727,18 @@ export class PokemonMultiHitModifier extends PokemonHeldItemModifier {
    * Additional strikes beyond that are given a 0.25x damage multiplier
    */
   private applyDamageModifier(pokemon: Pokemon, damageMultiplier: NumberHolder): boolean {
-    damageMultiplier.value = (pokemon.turnData.hitsLeft === pokemon.turnData.hitCount)
-      ? (1 - (0.25 * this.getStackCount()))
-      : 0.25;
-    return true;
+    if (pokemon.turnData.hitsLeft === pokemon.turnData.hitCount) {
+      // Reduce first hit by 25% for each stack count
+      damageMultiplier.value *= 1 - 0.25 * this.getStackCount();
+      return true;
+    } else if (pokemon.turnData.hitCount - pokemon.turnData.hitsLeft !== this.getStackCount() + 1) {
+      // Deal 25% damage for each remaining Multi Lens hit
+      damageMultiplier.value *= 0.25;
+      return true;
+    } else {
+      // An extra hit not caused by Multi Lens -- assume it is Parental Bond
+      return false;
+    }
   }
 
   getMaxHeldItemCount(pokemon: Pokemon): number {

src/system/version_migration/version_converter.ts

@@ -129,7 +129,7 @@ class SessionVersionConverter extends VersionConverter {
 
     if (curMajor === 1) {
       if (curMinor === 0) {
-        if (curPatch <= 4) {
+        if (curPatch <= 5) {
           console.log("Applying v1.0.4 session data migration!");
           this.callMigrators(data, v1_0_4.sessionMigrators);
         }

src/system/version_migration/versions/v1_0_4.ts

@@ -1,6 +1,7 @@
 import { SettingKeys } from "#app/system/settings/settings";
 import { AbilityAttr, defaultStarterSpecies, DexAttr, SystemSaveData, SessionSaveData  } from "#app/system/game-data";
 import { allSpecies } from "#app/data/pokemon-species";
+import { CustomPokemonData } from "#app/data/custom-pokemon-data";
 import { isNullOrUndefined } from "#app/utils";
 
 export const systemMigrators = [
@@ -134,5 +135,28 @@ export const sessionMigrators = [
         m.className = "ResetNegativeStatStageModifier";
       }
     });
+  },
+  /**
+   *  Converts old Pokemon natureOverride and mysteryEncounterData
+   *  to use the new conjoined {@linkcode Pokemon.customPokemonData} structure instead.
+   *  @param data {@linkcode SessionSaveData}
+   */
+  function migrateCustomPokemonDataAndNatureOverrides(data: SessionSaveData) {
+    // Fix Pokemon nature overrides and custom data migration
+    data.party.forEach(pokemon => {
+      if (pokemon["mysteryEncounterPokemonData"]) {
+        pokemon.customPokemonData = new CustomPokemonData(pokemon["mysteryEncounterPokemonData"]);
+        pokemon["mysteryEncounterPokemonData"] = null;
+      }
+      if (pokemon["fusionMysteryEncounterPokemonData"]) {
+        pokemon.fusionCustomPokemonData = new CustomPokemonData(pokemon["fusionMysteryEncounterPokemonData"]);
+        pokemon["fusionMysteryEncounterPokemonData"] = null;
+      }
+      pokemon.customPokemonData = pokemon.customPokemonData ?? new CustomPokemonData();
+      if (!isNullOrUndefined(pokemon["natureOverride"]) && pokemon["natureOverride"] >= 0) {
+        pokemon.customPokemonData.nature = pokemon["natureOverride"];
+        pokemon["natureOverride"] = -1;
+      }
+    });
   }
 ] as const;

src/system/version_migration/versions/v1_1_0.ts

@@ -1,32 +1,5 @@
-import { SessionSaveData } from "../../game-data";
-import { CustomPokemonData } from "#app/data/custom-pokemon-data";
-
 export const systemMigrators = [] as const;
 
 export const settingsMigrators = [] as const;
 
-export const sessionMigrators = [
-  /**
-   *  Converts old Pokemon natureOverride and mysteryEncounterData
-   *  to use the new conjoined {@linkcode Pokemon.customPokemonData} structure instead.
-   *  @param data {@linkcode SessionSaveData}
-   */
-  function migrateCustomPokemonDataAndNatureOverrides(data: SessionSaveData) {
-    // Fix Pokemon nature overrides and custom data migration
-    data.party.forEach(pokemon => {
-      if (pokemon["mysteryEncounterPokemonData"]) {
-        pokemon.customPokemonData = new CustomPokemonData(pokemon["mysteryEncounterPokemonData"]);
-        pokemon["mysteryEncounterPokemonData"] = null;
-      }
-      if (pokemon["fusionMysteryEncounterPokemonData"]) {
-        pokemon.fusionCustomPokemonData = new CustomPokemonData(pokemon["fusionMysteryEncounterPokemonData"]);
-        pokemon["fusionMysteryEncounterPokemonData"] = null;
-      }
-      pokemon.customPokemonData = pokemon.customPokemonData ?? new CustomPokemonData();
-      if (pokemon["natureOverride"] && pokemon["natureOverride"] >= 0) {
-        pokemon.customPokemonData.nature = pokemon["natureOverride"];
-        pokemon["natureOverride"] = -1;
-      }
-    });
-  }
-] as const;
+export const sessionMigrators = [] as const;

src/test/abilities/parental_bond.test.ts

@@ -313,7 +313,7 @@ describe("Abilities - Parental Bond", () => {
 
       await game.phaseInterceptor.to("MoveEndPhase", false);
 
-      expect(enemyPokemon.hp).toBe(enemyStartingHp - 300);
+      expect(enemyPokemon.hp).toBe(enemyStartingHp - 200);
     }
   );
 

src/test/abilities/wimp_out.test.ts

@@ -613,4 +613,23 @@ describe("Abilities - Wimp Out", () => {
 
     confirmNoSwitch();
   });
+
+  it("should not activate on wave X0 bosses", async () => {
+    game.override.enemyAbility(Abilities.WIMP_OUT)
+      .startingLevel(5850)
+      .startingWave(10);
+    await game.classicMode.startBattle([ Species.GOLISOPOD ]);
+
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    // Use 2 turns of False Swipe due to opponent's health bar shield
+    game.move.select(Moves.FALSE_SWIPE);
+    await game.toNextTurn();
+    game.move.select(Moves.FALSE_SWIPE);
+    await game.toNextTurn();
+
+    const isVisible = enemyPokemon.visible;
+    const hasFled = enemyPokemon.switchOutStatus;
+    expect(isVisible && !hasFled).toBe(true);
+  });
 });

src/test/items/multi_lens.test.ts

@@ -32,8 +32,8 @@ describe("Items - Multi Lens", () => {
       .enemySpecies(Species.SNORLAX)
       .enemyAbility(Abilities.BALL_FETCH)
       .enemyMoveset(Moves.SPLASH)
-      .startingLevel(100)
-      .enemyLevel(100);
+      .startingLevel(99) // Check for proper rounding on Seismic Toss damage reduction
+      .enemyLevel(99);
   });
 
   it.each([
@@ -114,4 +114,25 @@ describe("Items - Multi Lens", () => {
 
     expect(magikarp.turnData.hitCount).toBe(2);
   });
+
+  it("should enhance fixed-damage moves while also applying damage reduction", async () => {
+    game.override.startingHeldItems([{ name: "MULTI_LENS", count: 1 }])
+      .moveset(Moves.SEISMIC_TOSS);
+
+    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+    const spy = vi.spyOn(enemyPokemon, "getAttackDamage");
+
+    game.move.select(Moves.SEISMIC_TOSS);
+    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+
+    await game.phaseInterceptor.to("MoveEndPhase");
+    const damageResults = spy.mock.results.map(result => result.value?.damage);
+
+    expect(damageResults).toHaveLength(2);
+    expect(damageResults[0]).toBe(Math.floor(playerPokemon.level * 0.75));
+    expect(damageResults[1]).toBe(Math.floor(playerPokemon.level * 0.25));
+  });
 });