Merge branch 'beta' into internal-pokedex

public/images/pokemon/variant/3-gigantamax.json

@@ -4,6 +4,8 @@
 		"ffee52": "37d6de",
 		"debd29": "078a8f",
 		"833100": "002112",
+		"830009": "23033b",
+		"189d87": "c2247b",
 		"ff7b73": "712f8f",
 		"de4141": "3f1375",
 		"ffbdbd": "a266b0",
@@ -11,6 +13,7 @@
 		"107b6a": "9e1976",
 		"105241": "4f2800",
 		"83de7b": "a37707",
+		"2e5529": "38001c",
 		"5a9c39": "705207",
 		"20b49c": "de3592",
 		"fdfdfd": "fdfdfd",
@@ -21,14 +24,17 @@
 		"ffee52": "f75ea8",
 		"debd29": "a30a66",
 		"833100": "0b2e01",
+		"830009": "154205",
+		"189d87": "f17f05",
 		"ff7b73": "9db042",
 		"de4141": "3c8227",
 		"ffbdbd": "e7e385",
 		"101010": "101010",
 		"107b6a": "d44300",
-		"105241": "030129",
-		"83de7b": "433d99",
-		"5a9c39": "19164f",
+		"105241": "381601",
+		"83de7b": "80ced9",
+		"2e5519": "011c38",
+		"5a9c39": "446b94",
 		"20b49c": "fa8405",
 		"fdfdfd": "fdfdfd",
 		"5ad5c5": "faa405"

public/images/pokemon/variant/3.json

@@ -1,6 +1,7 @@
 {
 	"1": {
 		"843100": "033b22",
+		"830009": "23033b",
 		"ff7b73": "712f8f",
 		"ffbdbd": "a266b0",
 		"debd29": "078a8f",
@@ -13,11 +14,13 @@
 		"5a9c3a": "b34952",
 		"84de7b": "ff745e",
 		"5ad6c5": "f062a4",
+		"2e5519": "38001c",
 		"21b59c": "de3592",
 		"ffffff": "ffffff"
 	},
 	"2": {
 		"843100": "420514",
+		"830009": "154205",
 		"ff7b73": "9db042",
 		"ffbdbd": "e7e385",
 		"debd29": "a30a66",
@@ -30,6 +33,7 @@
 		"5a9c3a": "446b94",
 		"84de7b": "80ced9",
 		"5ad6c5": "faa405",
+		"2e5519": "011c38",
 		"21b59c": "fa8405",
 		"ffffff": "ffffff"
 	}

public/images/pokemon/variant/_masterlist.json

@@ -835,7 +835,7 @@
 	"6713": [0, 1, 1],
 	"8901": [1, 1, 1],
 	"female": {
-		"3": [0, 2, 1],
+		"3": [0, 1, 1],
 		"19": [0, 1, 1],
 		"20": [0, 1, 1],
 		"25": [0, 1, 1],

public/images/pokemon/variant/back/3-gigantamax.json

@@ -1,6 +1,7 @@
 {
 	"1": {
 		"833100": "180136",
+		"830009": "23033b",
 		"bd6a31": "012729",
 		"ffee52": "37d6de",
 		"debd29": "078a8f",
@@ -8,15 +9,18 @@
 		"de4141": "3f1375",
 		"ff7b73": "712f8f",
 		"ffbdbd": "a266b0",
-		"5a9c39": "705207",
-		"105241": "4f2800",
-		"83de7b": "a37707",
+		"e8a3a3": "91579e",
+		"5a9c39": "b34952",
+		"105241": "190038",
+		"2e5519": "38001c",
+		"83de7b": "ff745e",
 		"107b6a": "b80479",
 		"20b49c": "de3592",
 		"fdfdfd": "fdfdfd"
 	},
 	"2": {
 		"833100": "0b2e01",
+		"830009": "154205",
 		"bd6a31": "420514",
 		"ffee52": "f75ea8",
 		"debd29": "a30a66",
@@ -24,9 +28,11 @@
 		"de4141": "3c8227",
 		"ff7b73": "9db042",
 		"ffbdbd": "e7e385",
-		"5a9c39": "19164f",
-		"105241": "030129",
-		"83de7b": "433d99",
+		"e8a3a3": "ced76f",
+		"5a9c39": "446b94",
+		"105241": "381601",
+		"2e5519": "011c38",
+		"83de7b": "80ced9",
 		"107b6a": "d15d04",
 		"20b49c": "fa8405",
 		"fdfdfd": "fdfdfd"

public/images/pokemon/variant/back/3.json

@@ -1,6 +1,7 @@
 {
 	"1": {
 		"843100": "033b22",
+		"830009": "23033b",
 		"ffbdbd": "a266b0",
 		"ff7b73": "712f8f",
 		"debd29": "078a8f",
@@ -11,6 +12,7 @@
 		"105242": "190038",
 		"107b6b": "c21f7e",
 		"5a9c3a": "b34952",
+		"2e5519": "38001c",
 		"5ad6c5": "f062a4",
 		"21b59c": "de3592",
 		"84de7b": "ff745e",
@@ -18,6 +20,7 @@
 	},
 	"2": {
 		"843100": "420514",
+		"830009": "154205",
 		"ffbdbd": "e7e385",
 		"ff7b73": "9db042",
 		"debd29": "a30a66",
@@ -25,7 +28,8 @@
 		"de4242": "3c8227",
 		"101010": "101010",
 		"ffef52": "f75ea8",
-		"105242": "001a33",
+		"105242": "381601",
+		"2e5519": "011c38",
 		"107b6b": "d15d04",
 		"5a9c3a": "446b94",
 		"5ad6c5": "faa405",

public/images/pokemon/variant/back/987.json

@@ -9,7 +9,7 @@
 		"de62a4": "ffc668",
 		"4a83a4": "387fa7",
 		"314a62": "244260",
-		"70bbb4": "f8d371",
+		"548e88": "2d60bb",
 		"a4295a": "cc762f"
 	},
 	"1": {
@@ -22,7 +22,7 @@
 		"de62a4": "ffdf90",
 		"4a83a4": "a1c8db",
 		"314a62": "7396b4",
-		"70bbb4": "70bbb4",
+		"548e88": "a9c0c6",
 		"a4295a": "e28c27"
 	},
 	"2": {
@@ -35,7 +35,7 @@
 		"de62a4": "e25038",
 		"4a83a4": "e6aa47",
 		"314a62": "b56f2a",
-		"70bbb4": "f8d371",
+		"548e88": "e0b544",
 		"a4295a": "a62a21"
 	}
 }

public/images/pokemon/variant/back/female/3.json

@@ -1,6 +1,7 @@
 {
 	"1": {
 		"843100": "033b22",
+		"830009": "23033b",
 		"ffbdbd": "a266b0",
 		"ffef52": "37d6de",
 		"debd29": "078a8f",
@@ -10,6 +11,7 @@
 		"101010": "101010",
 		"105242": "190038",
 		"107b6b": "9e1976",
+		"2e5519": "38001c",
 		"5a9c3a": "b34952",
 		"5ad6c5": "f062a4",
 		"21b59c": "de3592",
@@ -18,6 +20,7 @@
 	},
 	"2": {
 		"843100": "420514",
+		"830009": "154205",
 		"ffbdbd": "e7e385",
 		"ffef52": "f75ea8",
 		"debd29": "a30a66",
@@ -27,6 +30,7 @@
 		"101010": "101010",
 		"105242": "381601",
 		"107b6b": "d15d04",
+		"2e5519": "011c38",
 		"5a9c3a": "446b94",
 		"5ad6c5": "faa405",
 		"21b59c": "fa8405",

public/images/pokemon/variant/exp/back/987.json

@@ -8,7 +8,7 @@
 		"0f0f0f": "0f0f0f",
 		"314a62": "244260",
 		"621841": "71370f",
-		"70bbb4": "f8d371",
+		"548e88": "2d60bb",
 		"de62a4": "ffc668",
 		"a4295a": "cc762f"
 	},
@@ -21,7 +21,7 @@
 		"0f0f0f": "0f0f0f",
 		"314a62": "7396b4",
 		"621841": "7b3c08",
-		"70bbb4": "70bbb4",
+		"548e88": "a9c0c6",
 		"de62a4": "ffdf90",
 		"a4295a": "e28c27"
 	},
@@ -34,7 +34,7 @@
 		"0f0f0f": "0f0f0f",
 		"314a62": "b56f2a",
 		"621841": "5a0a05",
-		"70bbb4": "f8d371",
+		"548e88": "e0b544",
 		"de62a4": "e25038",
 		"a4295a": "a62a21"
 	}

public/images/pokemon/variant/female/3.json

@@ -1,19 +1,41 @@
 {
+	"1": {
+		"843100": "033b22",
+		"830009": "23033b",
+		"ffbdbd": "a266b0",
+		"ffef52": "37d6de",
+		"debd29": "078a8f",
+		"ff7b73": "712f8f",
+		"bd6b31": "168a69",
+		"de4242": "3f1375",
+		"101010": "101010",
+		"105242": "190038",
+		"107b6b": "9e1976",
+		"2e5519": "38001c",
+		"5a9c3a": "b34952",
+		"5ad6c5": "f062a4",
+		"21b59c": "de3592",
+		"84de7b": "ff745e",
+		"ffffff": "ffffff"
+	},
 	"2": {
 		"843100": "420514",
-		"ff7b73": "9db042",
+		"830009": "154205",
 		"ffbdbd": "e7e385",
 		"ffef52": "f75ea8",
 		"debd29": "a30a66",
+		"ff7b73": "9db042",
 		"bd6b31": "852a41",
 		"de4242": "3c8227",
 		"101010": "101010",
 		"105242": "381601",
-		"107b6b": "d44300",
+		"107b6b": "d15d04",
+		"2e5519": "011c38",
 		"5a9c3a": "446b94",
-		"84de7b": "80ced9",
 		"5ad6c5": "faa405",
 		"21b59c": "fa8405",
-		"ffffff": "ffffff"
+		"84de7b": "80ced9",
+		"ffffff": "ffffff",
+		"2f561a": "011b34"
 	}
 }

public/locales

@@ -1 +1 @@
-Subproject commit acad8499a4ca488a9871902de140f635235f309a
+Subproject commit e07ab625f2080afe36b61fad291b0ec5eff4000c

src/battle-scene.ts

@@ -112,7 +112,7 @@ import { ExpGainsSpeed } from "#enums/exp-gains-speed";
 import { BattlerTagType } from "#enums/battler-tag-type";
 import { FRIENDSHIP_GAIN_FROM_BATTLE } from "#app/data/balance/starters";
 import { StatusEffect } from "#enums/status-effect";
-import { globalScene, initGlobalScene } from "#app/global-scene";
+import { initGlobalScene } from "#app/global-scene";
 
 export const bypassLogin = import.meta.env.VITE_BYPASS_LOGIN === "1";
 
@@ -394,10 +394,10 @@ export default class BattleScene extends SceneBase {
       const originalRealInRange = Phaser.Math.RND.realInRange;
       Phaser.Math.RND.realInRange = function (min: number, max: number): number {
         const ret = originalRealInRange.apply(this, [ min, max ]);
-        const args = [ "RNG", ++globalScene.rngCounter, ret / (max - min), `min: ${min} / max: ${max}` ];
-        args.push(`seed: ${globalScene.rngSeedOverride || globalScene.waveSeed || globalScene.seed}`);
-        if (globalScene.rngOffset) {
-          args.push(`offset: ${globalScene.rngOffset}`);
+        const args = [ "RNG", ++this.rngCounter, ret / (max - min), `min: ${min} / max: ${max}` ];
+        args.push(`seed: ${this.rngSeedOverride || this.waveSeed || this.seed}`);
+        if (this.rngOffset) {
+          args.push(`offset: ${this.rngOffset}`);
         }
         console.log(...args);
         return ret;
@@ -410,7 +410,7 @@ export default class BattleScene extends SceneBase {
   }
 
   create() {
-    globalScene.scene.remove(LoadingScene.KEY);
+    this.scene.remove(LoadingScene.KEY);
     initGameSpeed.apply(this);
     this.inputController = new InputsController();
     this.uiInputs = new UiInputs(this.inputController);
@@ -2954,7 +2954,7 @@ export default class BattleScene extends SceneBase {
    */
   applyShuffledModifiers<T extends PersistentModifier>(modifierType: Constructor<T>, player: boolean = true, ...args: Parameters<T["apply"]>): T[] {
     let modifiers = (player ? this.modifiers : this.enemyModifiers).filter((m): m is T => m instanceof modifierType && m.shouldApply(...args));
-    globalScene.executeWithSeedOffset(() => {
+    this.executeWithSeedOffset(() => {
       const shuffleModifiers = mods => {
         if (mods.length < 1) {
           return mods;
@@ -2963,7 +2963,7 @@ export default class BattleScene extends SceneBase {
         return [ mods[rand], ...shuffleModifiers(mods.filter((_, i) => i !== rand)) ];
       };
       modifiers = shuffleModifiers(modifiers);
-    }, globalScene.currentBattle.turn << 4, globalScene.waveSeed);
+    }, this.currentBattle.turn << 4, this.waveSeed);
     return this.applyModifiersInternal(modifiers, player, args);
   }
 

src/data/custom-pokemon-data.ts

@@ -5,7 +5,8 @@ import type { Nature } from "#enums/nature";
 
 /**
  * Data that can customize a Pokemon in non-standard ways from its Species
- * Currently only used by Mystery Encounters and Mints.
+ * Used by Mystery Encounters and Mints
+ * Also used as a counter how often a Pokemon got hit until new arena encounter
  */
 export class CustomPokemonData {
   public spriteScale: number;
@@ -13,6 +14,8 @@ export class CustomPokemonData {
   public passive: Abilities | -1;
   public nature: Nature | -1;
   public types: Type[];
+  /** `hitsReceivedCount` aka `hitsRecCount` saves how often the pokemon got hit until a new arena encounter (used for Rage Fist) */
+  public hitsRecCount: number;
 
   constructor(data?: CustomPokemonData | Partial<CustomPokemonData>) {
     if (!isNullOrUndefined(data)) {
@@ -24,5 +27,10 @@ export class CustomPokemonData {
     this.passive = this.passive ?? -1;
     this.nature = this.nature ?? -1;
     this.types = this.types ?? [];
+    this.hitsRecCount = this.hitsRecCount ?? 0;
+  }
+
+  resetHitReceivedCount(): void {
+    this.hitsRecCount = 0;
   }
 }

src/data/move.ts

@@ -3993,12 +3993,32 @@ export class FriendshipPowerAttr extends VariablePowerAttr {
   }
 }
 
-export class HitCountPowerAttr extends VariablePowerAttr {
+/**
+ * This Attribute calculates the current power of {@linkcode Moves.RAGE_FIST}.
+ * The counter for power calculation does not reset on every wave but on every new arena encounter
+ */
+export class RageFistPowerAttr extends VariablePowerAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    (args[0] as Utils.NumberHolder).value += Math.min(user.battleData.hitCount, 6) * 50;
+    const { hitCount, prevHitCount } = user.battleData;
+    const basePower: Utils.NumberHolder = args[0];
+
+    this.updateHitReceivedCount(user, hitCount, prevHitCount);
+
+    basePower.value = 50 + (Math.min(user.customPokemonData.hitsRecCount, 6) * 50);
 
     return true;
   }
+
+  /**
+   * Updates the number of hits the Pokemon has taken in battle
+   * @param user Pokemon calling Rage Fist
+   * @param hitCount The number of received hits this battle
+   * @param previousHitCount The number of received hits this battle since last time Rage Fist was used
+   */
+  protected updateHitReceivedCount(user: Pokemon, hitCount: number, previousHitCount: number): void {
+    user.customPokemonData.hitsRecCount += (hitCount - previousHitCount);
+    user.battleData.prevHitCount = hitCount;
+  }
 }
 
 /**
@@ -10991,8 +11011,8 @@ export function initMoves() {
     new AttackMove(Moves.TWIN_BEAM, Type.PSYCHIC, MoveCategory.SPECIAL, 40, 100, 10, -1, 0, 9)
       .attr(MultiHitAttr, MultiHitType._2),
     new AttackMove(Moves.RAGE_FIST, Type.GHOST, MoveCategory.PHYSICAL, 50, 100, 10, -1, 0, 9)
-      .partial() // Counter resets every wave instead of on arena reset
-      .attr(HitCountPowerAttr)
+      .edgeCase() // Counter incorrectly increases on confusion self-hits
+      .attr(RageFistPowerAttr)
       .punchingMove(),
     new AttackMove(Moves.ARMOR_CANNON, Type.FIRE, MoveCategory.SPECIAL, 120, 100, 5, -1, 0, 9)
       .attr(StatStageChangeAttr, [ Stat.DEF, Stat.SPDEF ], -1, true),

src/field/pokemon.ts

@@ -3606,6 +3606,9 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     if (!this.canSetStatus(effect, asPhase, false, sourcePokemon)) {
       return false;
     }
+    if (this.isFainted() && effect !== StatusEffect.FAINT) {
+      return false;
+    }
 
     /**
      * If this Pokemon falls asleep or freezes in the middle of a multi-hit attack,
@@ -5282,7 +5285,10 @@ export class PokemonSummonData {
 }
 
 export class PokemonBattleData {
+  /** counts the hits the pokemon received */
   public hitCount: number = 0;
+  /** used for {@linkcode Moves.RAGE_FIST} in order to save hit Counts received before Rage Fist is applied */
+  public prevHitCount: number = 0;
   public endured: boolean = false;
   public berriesEaten: BerryType[] = [];
   public abilitiesApplied: Abilities[] = [];

src/overrides.ts

@@ -1,19 +1,20 @@
+/* eslint-disable @typescript-eslint/consistent-type-imports */
 import { type PokeballCounts } from "#app/battle-scene";
-import type { Gender } from "#app/data/gender";
-import type { Variant } from "#app/data/variant";
+import { Gender } from "#app/data/gender";
+import { Variant } from "#app/data/variant";
 import { type ModifierOverride } from "#app/modifier/modifier-type";
-import type { Unlockables } from "#app/system/unlockables";
+import { Unlockables } from "#app/system/unlockables";
 import { Abilities } from "#enums/abilities";
 import { Biome } from "#enums/biome";
-import type { EggTier } from "#enums/egg-type";
-import type { Moves } from "#enums/moves";
-import type { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
-import type { MysteryEncounterType } from "#enums/mystery-encounter-type";
+import { EggTier } from "#enums/egg-type";
+import { Moves } from "#enums/moves";
+import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
+import { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import { PokeballType } from "#enums/pokeball";
-import type { Species } from "#enums/species";
+import { Species } from "#enums/species";
 import { StatusEffect } from "#enums/status-effect";
-import type { TimeOfDay } from "#enums/time-of-day";
-import type { VariantTier } from "#enums/variant-tier";
+import { TimeOfDay } from "#enums/time-of-day";
+import { VariantTier } from "#enums/variant-tier";
 import { WeatherType } from "#enums/weather-type";
 
 /**

src/phases/encounter-phase.ts

@@ -104,6 +104,12 @@ export class EncounterPhase extends BattlePhase {
       }
       if (!this.loaded) {
         if (battle.battleType === BattleType.TRAINER) {
+          //resets hitRecCount during Trainer ecnounter
+          for (const pokemon of globalScene.getPlayerParty()) {
+            if (pokemon) {
+              pokemon.customPokemonData.resetHitReceivedCount();
+            }
+          }
           battle.enemyParty[e] = battle.trainer?.genPartyMember(e)!; // TODO:: is the bang correct here?
         } else {
           let enemySpecies = globalScene.randomSpecies(battle.waveIndex, level, true);

src/phases/new-biome-encounter-phase.ts

@@ -14,6 +14,7 @@ export class NewBiomeEncounterPhase extends NextEncounterPhase {
     for (const pokemon of globalScene.getPlayerParty()) {
       if (pokemon) {
         pokemon.resetBattleData();
+        pokemon.customPokemonData.resetHitReceivedCount();
       }
     }
 

src/system/achv.ts

@@ -292,7 +292,6 @@ export function getAchievementDescription(localizationKey: string): string {
 
 }
 
-
 export const achvs = {
   _10K_MONEY: new MoneyAchv("10K_MONEY", "", 10000, "nugget", 10),
   _100K_MONEY: new MoneyAchv("100K_MONEY", "", 100000, "big_nugget", 25).setSecret(true),
@@ -365,7 +364,7 @@ export const achvs = {
   FRESH_START: new ChallengeAchv("FRESH_START", "", "FRESH_START.description", "reviver_seed", 100, (c) => c instanceof FreshStartChallenge && c.value > 0 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)),
   INVERSE_BATTLE: new ChallengeAchv("INVERSE_BATTLE", "", "INVERSE_BATTLE.description", "inverse", 100, (c) => c instanceof InverseBattleChallenge && c.value > 0),
   FLIP_STATS: new ChallengeAchv("FLIP_STATS", "", "FLIP_STATS.description", "dubious_disc", 100, (c) => c instanceof FlipStatChallenge && c.value > 0),
-  FLIP_INVERSE: new ChallengeAchv("FLIP_INVERSE", "", "FLIP_INVERSE.description", "cracked_pot", 100, (c) => c instanceof FlipStatChallenge && c.value > 0 && globalScene.gameMode.challenges.every(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)).setSecret(),
+  FLIP_INVERSE: new ChallengeAchv("FLIP_INVERSE", "", "FLIP_INVERSE.description", "cracked_pot", 100, (c) => c instanceof FlipStatChallenge && c.value > 0 && globalScene.gameMode.challenges.some(c => c.id === Challenges.INVERSE_BATTLE && c.value > 0)).setSecret(),
   BREEDERS_IN_SPACE: new Achv("BREEDERS_IN_SPACE", "", "BREEDERS_IN_SPACE.description", "moon_stone", 50).setSecret(),
 };
 

src/test/data/status_effect.test.ts

@@ -400,4 +400,42 @@ describe("Status Effects", () => {
       expect(player.getLastXMoves(1)[0].result).toBe(MoveResult.SUCCESS);
     });
   });
+
+  describe("Behavior", () => {
+    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 ])
+        .ability(Abilities.BALL_FETCH)
+        .battleType("single")
+        .disableCrits()
+        .enemySpecies(Species.MAGIKARP)
+        .enemyAbility(Abilities.BALL_FETCH)
+        .enemyMoveset(Moves.NUZZLE)
+        .enemyLevel(2000);
+    });
+
+    it("should not inflict a 0 HP mon with a status", async () => {
+      await game.classicMode.startBattle([ Species.FEEBAS, Species.MILOTIC ]);
+
+      const player = game.scene.getPlayerPokemon()!;
+      player.hp = 0;
+
+      expect(player.trySetStatus(StatusEffect.BURN)).toBe(false);
+      expect(player.status?.effect).not.toBe(StatusEffect.BURN);
+    });
+  });
 });

src/test/moves/rage_fist.test.ts

@@ -0,0 +1,143 @@
+import { BattlerIndex } from "#app/battle";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import { allMoves } from "#app/data/move";
+import GameManager from "#test/utils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+
+describe("Moves - Rage Fist", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+  const move = allMoves[Moves.RAGE_FIST];
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .battleType("single")
+      .moveset([ Moves.RAGE_FIST, Moves.SPLASH, Moves.SUBSTITUTE ])
+      .startingLevel(100)
+      .enemyLevel(1)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyMoveset(Moves.DOUBLE_KICK);
+
+    vi.spyOn(move, "calculateBattlePower");
+  });
+
+  it("should have 100 more power if hit twice before calling Rage Fist", async () => {
+    game.override
+      .enemySpecies(Species.MAGIKARP);
+
+    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+
+    game.move.select(Moves.RAGE_FIST);
+    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.phaseInterceptor.to("TurnEndPhase");
+
+    expect(move.calculateBattlePower).toHaveLastReturnedWith(150);
+  });
+
+  it("should maintain its power during next battle if it is within the same arena encounter", async () => {
+    game.override
+      .enemySpecies(Species.MAGIKARP)
+      .startingWave(1);
+
+    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+
+    game.move.select(Moves.RAGE_FIST);
+    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.toNextWave();
+
+    game.move.select(Moves.RAGE_FIST);
+    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    expect(move.calculateBattlePower).toHaveLastReturnedWith(250);
+  });
+
+  it("should reset the hitRecCounter if we enter new trainer battle", async () => {
+    game.override
+      .enemySpecies(Species.MAGIKARP)
+      .startingWave(4);
+
+    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+
+    game.move.select(Moves.RAGE_FIST);
+    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.toNextWave();
+
+    game.move.select(Moves.RAGE_FIST);
+    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    expect(move.calculateBattlePower).toHaveLastReturnedWith(150);
+  });
+
+  it("should not increase the hitCounter if Substitute is hit", async () => {
+    game.override
+      .enemySpecies(Species.MAGIKARP)
+      .startingWave(4);
+
+    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+
+    game.move.select(Moves.SUBSTITUTE);
+    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.phaseInterceptor.to("MoveEffectPhase");
+
+    expect(game.scene.getPlayerPokemon()?.customPokemonData.hitsRecCount).toBe(0);
+  });
+
+  it("should reset the hitRecCounter if we enter new biome", async () => {
+    game.override
+      .enemySpecies(Species.MAGIKARP)
+      .startingWave(10);
+
+    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+
+    game.move.select(Moves.RAGE_FIST);
+    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.toNextTurn();
+
+    game.move.select(Moves.RAGE_FIST);
+    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    expect(move.calculateBattlePower).toHaveLastReturnedWith(150);
+  });
+
+  it("should not reset the hitRecCounter if switched out", async () => {
+    game.override
+      .enemySpecies(Species.MAGIKARP)
+      .startingWave(1)
+      .enemyMoveset(Moves.TACKLE);
+
+    await game.classicMode.startBattle([ Species.CHARIZARD, Species.BLASTOISE ]);
+
+    game.move.select(Moves.SPLASH);
+    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.toNextTurn();
+
+    game.doSwitchPokemon(1);
+    await game.toNextTurn();
+
+    game.doSwitchPokemon(1);
+    await game.toNextTurn();
+
+    game.move.select(Moves.RAGE_FIST);
+    await game.phaseInterceptor.to("MoveEndPhase");
+
+    expect(game.scene.getPlayerParty()[0].species.speciesId).toBe(Species.CHARIZARD);
+    expect(move.calculateBattlePower).toHaveLastReturnedWith(150);
+  });
+});

src/ui/dropdown.ts

@@ -8,7 +8,9 @@ export enum DropDownState {
     ON = 0,
     OFF = 1,
     EXCLUDE = 2,
-    UNLOCKABLE = 3
+    UNLOCKABLE = 3,
+    ONE = 4,
+    TWO = 5
 }
 
 export enum DropDownType {
@@ -28,7 +30,9 @@ export enum SortCriteria {
   COST = 1,
   CANDY = 2,
   IV = 3,
-  NAME = 4
+  NAME = 4,
+  CAUGHT = 5,
+  HATCHED = 6
 }
 
 export class DropDownLabel {
@@ -56,6 +60,8 @@ export class DropDownOption extends Phaser.GameObjects.Container {
   private offColor = 0x272727;
   private excludeColor = 0xff5555;
   private unlockableColor = 0xffff00;
+  private oneColor = 0x33bbff;
+  private twoColor = 0x33bbff;
 
   constructor(val: any, labels: DropDownLabel | DropDownLabel[]) {
     super(globalScene);
@@ -127,6 +133,12 @@ export class DropDownOption extends Phaser.GameObjects.Container {
       case DropDownState.UNLOCKABLE:
         this.toggle.setTint(this.unlockableColor);
         break;
+      case DropDownState.ONE:
+        this.toggle.setTint(this.oneColor);
+        break;
+      case DropDownState.TWO:
+        this.toggle.setTint(this.twoColor);
+        break;
     }
   }
 

src/ui/starter-select-ui-handler.ts

@@ -450,6 +450,8 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     const costReductionLabels = [
       new DropDownLabel(i18next.t("filterBar:costReduction"), undefined, DropDownState.OFF),
       new DropDownLabel(i18next.t("filterBar:costReductionUnlocked"), undefined, DropDownState.ON),
+      new DropDownLabel(i18next.t("filterBar:costReductionUnlockedOne"), undefined, DropDownState.ONE),
+      new DropDownLabel(i18next.t("filterBar:costReductionUnlockedTwo"), undefined, DropDownState.TWO),
       new DropDownLabel(i18next.t("filterBar:costReductionUnlockable"), undefined, DropDownState.UNLOCKABLE),
       new DropDownLabel(i18next.t("filterBar:costReductionLocked"), undefined, DropDownState.EXCLUDE),
     ];
@@ -500,7 +502,9 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
       new DropDownOption(SortCriteria.COST, new DropDownLabel(i18next.t("filterBar:sortByCost"))),
       new DropDownOption(SortCriteria.CANDY, new DropDownLabel(i18next.t("filterBar:sortByCandies"))),
       new DropDownOption(SortCriteria.IV, new DropDownLabel(i18next.t("filterBar:sortByIVs"))),
-      new DropDownOption(SortCriteria.NAME, new DropDownLabel(i18next.t("filterBar:sortByName")))
+      new DropDownOption(SortCriteria.NAME, new DropDownLabel(i18next.t("filterBar:sortByName"))),
+      new DropDownOption(SortCriteria.CAUGHT, new DropDownLabel(i18next.t("filterBar:sortByNumCaught"))),
+      new DropDownOption(SortCriteria.HATCHED, new DropDownLabel(i18next.t("filterBar:sortByNumHatched")))
     ];
     this.filterBar.addFilter(DropDownColumn.SORT, i18next.t("filterBar:sortFilter"), new DropDown(0, 0, sortOptions, this.updateStarters, DropDownType.SINGLE));
     this.filterBarContainer.add(this.filterBar);
@@ -2585,13 +2589,18 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
       });
 
       // Cost Reduction Filter
-      const isCostReduced = starterData.valueReduction > 0;
+      const isCostReducedByOne = starterData.valueReduction === 1;
+      const isCostReducedByTwo = starterData.valueReduction === 2;
       const isCostReductionUnlockable = this.isValueReductionAvailable(container.species.speciesId);
       const fitsCostReduction = this.filterBar.getVals(DropDownColumn.UNLOCKS).some(unlocks => {
         if (unlocks.val === "COST_REDUCTION" && unlocks.state === DropDownState.ON) {
-          return isCostReduced;
+          return isCostReducedByOne || isCostReducedByTwo;
+        } else if (unlocks.val === "COST_REDUCTION" && unlocks.state === DropDownState.ONE) {
+          return isCostReducedByOne;
+        } else if (unlocks.val === "COST_REDUCTION" && unlocks.state === DropDownState.TWO) {
+          return isCostReducedByTwo;
         } else if (unlocks.val === "COST_REDUCTION" && unlocks.state === DropDownState.EXCLUDE) {
-          return isStarterProgressable && !isCostReduced;
+          return isStarterProgressable && !(isCostReducedByOne || isCostReducedByTwo);
         } else if (unlocks.val === "COST_REDUCTION" && unlocks.state === DropDownState.UNLOCKABLE) {
           return isCostReductionUnlockable;
         } else if (unlocks.val === "COST_REDUCTION" && unlocks.state === DropDownState.OFF) {
@@ -2691,6 +2700,10 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
           return (avgIVsA - avgIVsB) * -sort.dir;
         case SortCriteria.NAME:
           return a.species.name.localeCompare(b.species.name) * -sort.dir;
+        case SortCriteria.CAUGHT:
+          return (globalScene.gameData.dexData[a.species.speciesId].caughtCount - globalScene.gameData.dexData[b.species.speciesId].caughtCount) * -sort.dir;
+        case SortCriteria.HATCHED:
+          return (globalScene.gameData.dexData[a.species.speciesId].hatchedCount - globalScene.gameData.dexData[b.species.speciesId].hatchedCount) * -sort.dir;
       }
       return 0;
     });

src/utils.ts

@@ -349,14 +349,14 @@ export class IntegerHolder extends NumberHolder {
   }
 }
 
-/** @deprecated Use {@linkcode NumberHolder}*/
-export class FixedInt extends IntegerHolder {
-  constructor(value: integer) {
-    super(value);
+export class FixedInt {
+  public readonly value: number;
+
+  constructor(value: number) {
+    this.value = value;
   }
 }
 
-/** @deprecated */
 export function fixedInt(value: integer): integer {
   return new FixedInt(value) as unknown as integer;
 }