Merge branch 'pagefaultgames:beta' into candy-friendship-changes

src/data/ability.ts

@@ -4112,9 +4112,13 @@ export class PostBattleAbAttr extends AbAttr {
 }
 
 export class PostBattleLootAbAttr extends PostBattleAbAttr {
+  /**
+   * @param args - `[0]`: boolean for if the battle ended in a victory
+   * @returns `true` if successful
+   */
   applyPostBattle(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
     const postBattleLoot = pokemon.scene.currentBattle.postBattleLoot;
-    if (!simulated && postBattleLoot.length) {
+    if (!simulated && postBattleLoot.length && args[0]) {
       const randItem = Utils.randSeedItem(postBattleLoot);
       //@ts-ignore - TODO see below
       if (pokemon.scene.tryTransferHeldItemModifier(randItem, pokemon, true, 1, true, undefined, false)) { // TODO: fix. This is a promise!?
@@ -4575,14 +4579,15 @@ export class MoneyAbAttr extends PostBattleAbAttr {
   /**
    * @param pokemon {@linkcode Pokemon} that is the user of this ability.
    * @param passive N/A
-   * @param args N/A
-   * @returns true
+   * @param args - `[0]`: boolean for if the battle ended in a victory
+   * @returns `true` if successful
    */
   applyPostBattle(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
-    if (!simulated) {
+    if (!simulated && args[0]) {
       pokemon.scene.currentBattle.moneyScattered += pokemon.scene.getWaveMoneyAmount(0.2);
+      return true;
     }
-    return true;
+    return false;
   }
 }
 
@@ -4590,13 +4595,12 @@ export class MoneyAbAttr extends PostBattleAbAttr {
  * Applies a stat change after a Pokémon is summoned,
  * conditioned on the presence of a specific arena tag.
  *
- * @extends {PostSummonStatStageChangeAbAttr}
+ * @extends PostSummonStatStageChangeAbAttr
  */
 export class PostSummonStatStageChangeOnArenaAbAttr extends PostSummonStatStageChangeAbAttr {
   /**
    * The type of arena tag that conditions the stat change.
    * @private
-   * @type {ArenaTagType}
    */
   private tagType: ArenaTagType;
 
@@ -4972,7 +4976,7 @@ class ForceSwitchOutHelper {
         pokemon.scene.clearEnemyHeldItemModifiers();
 
         if (switchOutTarget.hp) {
-          pokemon.scene.pushPhase(new BattleEndPhase(pokemon.scene));
+          pokemon.scene.pushPhase(new BattleEndPhase(pokemon.scene, false));
           pokemon.scene.pushPhase(new NewBattlePhase(pokemon.scene));
         }
       }
@@ -5930,10 +5934,10 @@ export function initAbilities() {
       .attr(PostDefendStatStageChangeAbAttr, (target, user, move) => move.category !== MoveCategory.STATUS, Stat.DEF, 1),
     new Ability(Abilities.WIMP_OUT, 7)
       .attr(PostDamageForceSwitchAbAttr)
-      .edgeCase(), // Should not trigger when hurting itself in confusion
+      .edgeCase(), // Should not trigger when hurting itself in confusion, causes Fake Out to fail turn 1 and succeed turn 2 if pokemon is switched out before battle start via playing in Switch Mode
     new Ability(Abilities.EMERGENCY_EXIT, 7)
       .attr(PostDamageForceSwitchAbAttr)
-      .edgeCase(), // Should not trigger when hurting itself in confusion
+      .edgeCase(), // Should not trigger when hurting itself in confusion, causes Fake Out to fail turn 1 and succeed turn 2 if pokemon is switched out before battle start via playing in Switch Mode
     new Ability(Abilities.WATER_COMPACTION, 7)
       .attr(PostDefendStatStageChangeAbAttr, (target, user, move) => user.getMoveType(move) === Type.WATER && move.category !== MoveCategory.STATUS, Stat.DEF, 2),
     new Ability(Abilities.MERCILESS, 7)

src/data/move.ts

@@ -6082,7 +6082,7 @@ export class ForceSwitchOutAttr extends MoveEffectAttr {
         user.scene.clearEnemyHeldItemModifiers();
 
         if (switchOutTarget.hp) {
-          user.scene.pushPhase(new BattleEndPhase(user.scene));
+          user.scene.pushPhase(new BattleEndPhase(user.scene, false));
           user.scene.pushPhase(new NewBattlePhase(user.scene));
         }
       }

src/data/mystery-encounters/utils/encounter-phase-utils.ts

@@ -731,7 +731,7 @@ export function handleMysteryEncounterVictory(scene: BattleScene, addHealPhase:
     scene.pushPhase(new MysteryEncounterRewardsPhase(scene, addHealPhase));
     scene.pushPhase(new EggLapsePhase(scene));
   } else if (!scene.getEnemyParty().find(p => encounter.encounterMode !== MysteryEncounterMode.TRAINER_BATTLE ? p.isOnField() : !p?.isFainted(true))) {
-    scene.pushPhase(new BattleEndPhase(scene));
+    scene.pushPhase(new BattleEndPhase(scene, true));
     if (encounter.encounterMode === MysteryEncounterMode.TRAINER_BATTLE) {
       scene.pushPhase(new TrainerVictoryPhase(scene));
     }

src/field/arena.ts

@@ -707,7 +707,7 @@ export class Arena {
       case Biome.METROPOLIS:
         return 141.470;
       case Biome.FOREST:
-        return 4.294;
+        return 0.341;
       case Biome.SEA:
         return 0.024;
       case Biome.SWAMP:

src/phases/attempt-run-phase.ts

@@ -52,7 +52,7 @@ export class AttemptRunPhase extends PokemonPhase {
         enemyPokemon.trySetStatus(StatusEffect.FAINT);
       });
 
-      this.scene.pushPhase(new BattleEndPhase(this.scene));
+      this.scene.pushPhase(new BattleEndPhase(this.scene, false));
       this.scene.pushPhase(new NewBattlePhase(this.scene));
     } else {
       playerPokemon.turnData.failedRunAway = true;

src/phases/battle-end-phase.ts

@@ -8,7 +8,7 @@ export class BattleEndPhase extends BattlePhase {
   /** If true, will increment battles won */
   isVictory: boolean;
 
-  constructor(scene: BattleScene, isVictory: boolean = true) {
+  constructor(scene: BattleScene, isVictory: boolean) {
     super(scene);
 
     this.isVictory = isVictory;
@@ -17,16 +17,17 @@ export class BattleEndPhase extends BattlePhase {
   start() {
     super.start();
 
+    this.scene.gameData.gameStats.battles++;
+    if (this.scene.gameMode.isEndless && this.scene.currentBattle.waveIndex + 1 > this.scene.gameData.gameStats.highestEndlessWave) {
+      this.scene.gameData.gameStats.highestEndlessWave = this.scene.currentBattle.waveIndex + 1;
+    }
+
     if (this.isVictory) {
       this.scene.currentBattle.addBattleScore(this.scene);
 
-      this.scene.gameData.gameStats.battles++;
       if (this.scene.currentBattle.trainer) {
         this.scene.gameData.gameStats.trainersDefeated++;
       }
-      if (this.scene.gameMode.isEndless && this.scene.currentBattle.waveIndex + 1 > this.scene.gameData.gameStats.highestEndlessWave) {
-        this.scene.gameData.gameStats.highestEndlessWave = this.scene.currentBattle.waveIndex + 1;
-      }
     }
 
     // Endless graceful end
@@ -42,7 +43,7 @@ export class BattleEndPhase extends BattlePhase {
     }
 
     for (const pokemon of this.scene.getPokemonAllowedInBattle()) {
-      applyPostBattleAbAttrs(PostBattleAbAttr, pokemon);
+      applyPostBattleAbAttrs(PostBattleAbAttr, pokemon, false, this.isVictory);
     }
 
     if (this.scene.currentBattle.moneyScattered) {

src/phases/egg-lapse-phase.ts

@@ -34,7 +34,7 @@ export class EggLapsePhase extends Phase {
       if (eggsToHatchCount >= this.minEggsToSkip && this.scene.eggSkipPreference === 1) {
         this.scene.ui.showText(i18next.t("battle:eggHatching"), 0, () => {
           // show prompt for skip, blocking inputs for 1 second
-          this.scene.ui.showText(i18next.t("battle:eggSkipPrompt"), 0);
+          this.scene.ui.showText(i18next.t("battle:eggSkipPrompt", { eggsToHatch: eggsToHatchCount }), 0);
           this.scene.ui.setModeWithoutClear(Mode.CONFIRM, () => {
             this.hatchEggsSkipped(eggsToHatch);
             this.showSummary();

src/phases/switch-summon-phase.ts

@@ -1,5 +1,5 @@
 import BattleScene from "#app/battle-scene";
-import { applyPreSwitchOutAbAttrs, PreSwitchOutAbAttr } from "#app/data/ability";
+import { applyPreSwitchOutAbAttrs, PostDamageForceSwitchAbAttr, PreSwitchOutAbAttr } from "#app/data/ability";
 import { allMoves, ForceSwitchOutAttr } from "#app/data/move";
 import { getPokeballTintColor } from "#app/data/pokeball";
 import { SpeciesFormChangeActiveTrigger } from "#app/data/pokemon-forms";
@@ -166,10 +166,11 @@ export class SwitchSummonPhase extends SummonPhase {
 
     const currentCommand = pokemon.scene.currentBattle.turnCommands[this.fieldIndex]?.command;
     const lastPokemonIsForceSwitchedAndNotFainted = lastUsedMove?.hasAttr(ForceSwitchOutAttr) && !this.lastPokemon.isFainted();
+    const lastPokemonHasForceSwitchAbAttr = this.lastPokemon.hasAbilityWithAttr(PostDamageForceSwitchAbAttr) && !this.lastPokemon.isFainted();
 
     // Compensate for turn spent summoning
     // Or compensate for force switch move if switched out pokemon is not fainted
-    if (currentCommand === Command.POKEMON || lastPokemonIsForceSwitchedAndNotFainted) {
+    if (currentCommand === Command.POKEMON || lastPokemonIsForceSwitchedAndNotFainted || lastPokemonHasForceSwitchAbAttr) {
       pokemon.battleSummonData.turnCount--;
       pokemon.battleSummonData.waveTurnCount--;
     }

src/phases/victory-phase.ts

@@ -41,7 +41,7 @@ export class VictoryPhase extends PokemonPhase {
     }
 
     if (!this.scene.getEnemyParty().find(p => this.scene.currentBattle.battleType === BattleType.WILD ? p.isOnField() : !p?.isFainted(true))) {
-      this.scene.pushPhase(new BattleEndPhase(this.scene));
+      this.scene.pushPhase(new BattleEndPhase(this.scene, true));
       if (this.scene.currentBattle.battleType === BattleType.TRAINER) {
         this.scene.pushPhase(new TrainerVictoryPhase(this.scene));
       }

src/test/abilities/honey_gather.test.ts

@@ -0,0 +1,74 @@
+import type { CommandPhase } from "#app/phases/command-phase";
+import { Command } from "#app/ui/command-ui-handler";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import GameManager from "#test/utils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+
+describe("Abilities - Honey Gather", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .moveset([ Moves.SPLASH, Moves.ROAR, Moves.THUNDERBOLT ])
+      .startingLevel(100)
+      .ability(Abilities.HONEY_GATHER)
+      .passiveAbility(Abilities.RUN_AWAY)
+      .battleType("single")
+      .disableCrits()
+      .enemySpecies(Species.MAGIKARP)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyMoveset(Moves.SPLASH);
+  });
+
+  it("should give money when winning a battle", async () => {
+    await game.classicMode.startBattle([ Species.MILOTIC ]);
+    game.scene.money = 1000;
+
+    game.move.select(Moves.THUNDERBOLT);
+    await game.toNextWave();
+
+    expect(game.scene.money).toBeGreaterThan(1000);
+  });
+
+  it("should not give money when the enemy pokemon flees", async () => {
+    await game.classicMode.startBattle([ Species.MILOTIC ]);
+    game.scene.money = 1000;
+
+    game.move.select(Moves.ROAR);
+    await game.toNextTurn();
+
+    expect(game.scene.money).toBe(1000);
+    expect(game.scene.currentBattle.waveIndex).toBe(2);
+  });
+
+  it("should not give money when the player flees", async () => {
+    await game.classicMode.startBattle([ Species.MILOTIC ]);
+    game.scene.money = 1000;
+
+    // something weird is going on with the test framework, so this is required to prevent a crash
+    const enemy = game.scene.getEnemyPokemon()!;
+    vi.spyOn(enemy, "scene", "get").mockReturnValue(game.scene);
+
+    const commandPhase = game.scene.getCurrentPhase() as CommandPhase;
+    commandPhase.handleCommand(Command.RUN, 0);
+    await game.toNextTurn();
+
+    expect(game.scene.money).toBe(1000);
+    expect(game.scene.currentBattle.waveIndex).toBe(2);
+  });
+});

src/test/moves/shell_side_arm.test.ts

@@ -26,7 +26,7 @@ describe("Moves - Shell Side Arm", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .moveset([ Moves.SHELL_SIDE_ARM ])
+      .moveset([ Moves.SHELL_SIDE_ARM, Moves.SPLASH ])
       .battleType("single")
       .startingLevel(100)
       .enemyLevel(100)
@@ -69,6 +69,9 @@ describe("Moves - Shell Side Arm", () => {
 
     vi.spyOn(shellSideArmAttr, "apply");
 
+    game.move.select(Moves.SPLASH);
+    await game.toNextTurn();
+
     game.move.select(Moves.SHELL_SIDE_ARM);
     await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
     await game.phaseInterceptor.to("BerryPhase", false);