[Hotfix] Fix off-by-one error for event encounters (#5022)

* Fix off-by-one error for event encounters

* Increment version to 1.4.1

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>

CREDITS.md

@@ -372,63 +372,67 @@ In addition to the lists below, please check [the PokéRogue wiki](https://wiki.
 - Lily
 - PigeonBar
 
-## Past Contributors
-- Fontbane
-- sodaMelon
-- schmidtc1
-- shayebeadling
+## Other Code Contributors
+- Admiral-Billy
+- allen925
+- arColm
+- Arxalc
+- AsdarDevelops
+- bennybroseph
+- Brain Frog
+- Corrade
+- Dakurei
 - DustinLin
-- lucfd
-- madibye
+- ElizaAlex
 - EmberCM
-- Mewtwo2387
+- EmoUsedHM01
+- EvasiveAce
+- Fontbane
+- francktrouillez
+- FredeX
+- geeilhan
+- Greenlamp
+- happinyz
 - hayuna
-- sirzento
-- ReneGV
-- mattrossdev
-- zacharied
-- NxKarim
-- td76099
-- Xiaphear
+- InfernoVulpix
 - j-diefenbach
 - jaimefd
-- EvasiveAce
-- EmoUsedHM01
-- francktrouillez
 - JakubHanko
-- FredeX
-- PigeonBar
-- prime-dialga
-- rnicar245
-- rationality6
-- Neverblade
-- Corrade
-- Admiral-Billy
-- okimin
-- Arxalc
-- PrabbyDD
 - JonStudders
 - karl-police
-- prateau
-- meepen
-- arColm
-- allen925
-- InfernoVulpix
-- snoozbuster
-- zaccie
-- happinyz
-- PyGaVS
+- lucfd
+- Lugiadrien
+- madibye
+- mattrossdev
 - mcmontag
-- ElizaAlex
-- AsdarDevelops
-- Vassiat
-- RedstonewolfX
-- Sam/Flashfyre (initial developer, started PokéRogue)
-- Greenlamp
-- bennybroseph
+- meepen
+- Mewtwo2387
+- muscode
+- Neverblade
+- NxKarim
+- okimin
 - OrangeRed
-- Dakurei
-- Brain Frog
+- PigeonBar
+- PrabbyDD
+- prateau
+- prime-dialga
+- PyGaVS
+- rationality6
+- RedstonewolfX
+- ReneGV
+- rnicar245
+- Sam aka Flashfyre (initial developer, started PokéRogue)
+- schmidtc1
+- shayebeadling
+- sirzento
+- snoozbuster
+- sodaMelon
+- td76099
+- Vassiat
+- Xiaphear
+- zaccie
+- zacharied
+- Zé Ricardo
 
 
 # 🌎 Translation
@@ -615,6 +619,6 @@ In addition to the lists below, please check [the PokéRogue wiki](https://wiki.
 - roi
 
 ## External Tools
-- Ydarissep (RogueDex)
+- Ydarissep (creator of the now defunct "Yda's Dex")
 - Admiral-Billy (Offline App - Desktop)
 - Red aka StonedModder (iOS App)

package-lock.json

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

package.json

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

public/locales

@@ -1 +1 @@
-Subproject commit 7ad20e64caa9367b444712f10036fa9bbe4837a5
+Subproject commit 6c6f0af398ae11f8d96c6ac064f171d927812c85

src/data/balance/pokemon-level-moves.ts

@@ -19464,7 +19464,6 @@ export const pokemonFormLevelMoves: PokemonSpeciesFormLevelMoves = {
   },
   [Species.GRENINJA]: {
     1: [
-      [ EVOLVE_MOVE, Moves.WATER_SHURIKEN ],
       [ EVOLVE_MOVE, Moves.WATER_SHURIKEN ],
       [ 1, Moves.POUND ],
       [ 1, Moves.GROWL ],
@@ -19475,6 +19474,7 @@ export const pokemonFormLevelMoves: PokemonSpeciesFormLevelMoves = {
       [ 1, Moves.SMACK_DOWN ], // Previous Stage Move
       [ 1, Moves.BOUNCE ], // Previous Stage Move
       [ 1, Moves.HAZE ],
+      [ 1, Moves.MAT_BLOCK ],
       [ 1, Moves.ROLE_PLAY ],
       [ 1, Moves.NIGHT_SLASH ],
       [ 10, Moves.LICK ],

src/data/balance/starters.ts

@@ -4,7 +4,7 @@ export const POKERUS_STARTER_COUNT = 5;
 
 // #region Friendship constants
 export const CLASSIC_CANDY_FRIENDSHIP_MULTIPLIER = 3;
-export const FRIENDSHIP_GAIN_FROM_BATTLE = 3;
+export const FRIENDSHIP_GAIN_FROM_BATTLE = 4;
 export const FRIENDSHIP_GAIN_FROM_RARE_CANDY = 6;
 export const FRIENDSHIP_LOSS_FROM_FAINT = 5;
 

src/data/balance/tms.ts

@@ -67148,6 +67148,7 @@ export const tmSpecies: TmSpecies = {
     Species.VELUZA,
     Species.DONDOZO,
     Species.TATSUGIRI,
+    Species.ANNIHILAPE,
     Species.CLODSIRE,
     Species.FARIGIRAF,
     Species.DUDUNSPARCE,

src/data/move.ts

@@ -1881,8 +1881,14 @@ export class FlameBurstAttr extends MoveEffectAttr {
 }
 
 export class SacrificialFullRestoreAttr extends SacrificialAttr {
-  constructor() {
+  protected restorePP: boolean;
+  protected moveMessage: string;
+
+  constructor(restorePP: boolean, moveMessage: string) {
     super();
+
+    this.restorePP = restorePP;
+    this.moveMessage = moveMessage;
   }
 
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
@@ -1893,8 +1899,19 @@ export class SacrificialFullRestoreAttr extends SacrificialAttr {
     // We don't know which party member will be chosen, so pick the highest max HP in the party
     const maxPartyMemberHp = user.scene.getPlayerParty().map(p => p.getMaxHp()).reduce((maxHp: integer, hp: integer) => Math.max(hp, maxHp), 0);
 
-    user.scene.pushPhase(new PokemonHealPhase(user.scene, user.getBattlerIndex(),
-      maxPartyMemberHp, i18next.t("moveTriggers:sacrificialFullRestore", { pokemonName: getPokemonNameWithAffix(user) }), true, false, false, true), true);
+    user.scene.pushPhase(
+      new PokemonHealPhase(
+        user.scene,
+        user.getBattlerIndex(),
+        maxPartyMemberHp,
+        i18next.t(this.moveMessage, { pokemonName: getPokemonNameWithAffix(user) }),
+        true,
+        false,
+        false,
+        true,
+        false,
+        this.restorePP),
+      true);
 
     return true;
   }
@@ -9002,7 +9019,7 @@ export function initMoves() {
       .attr(GyroBallPowerAttr)
       .ballBombMove(),
     new SelfStatusMove(Moves.HEALING_WISH, Type.PSYCHIC, -1, 10, -1, 0, 4)
-      .attr(SacrificialFullRestoreAttr)
+      .attr(SacrificialFullRestoreAttr, false, "moveTriggers:sacrificialFullRestore")
       .triageMove(),
     new AttackMove(Moves.BRINE, Type.WATER, MoveCategory.SPECIAL, 65, 100, 10, -1, 0, 4)
       .attr(MovePowerMultiplierAttr, (user, target, move) => target.getHpRatio() < 0.5 ? 2 : 1),
@@ -9279,10 +9296,9 @@ export function initMoves() {
     new AttackMove(Moves.SPACIAL_REND, Type.DRAGON, MoveCategory.SPECIAL, 100, 95, 5, -1, 0, 4)
       .attr(HighCritAttr),
     new SelfStatusMove(Moves.LUNAR_DANCE, Type.PSYCHIC, -1, 10, -1, 0, 4)
-      .attr(SacrificialAttrOnHit)
+      .attr(SacrificialFullRestoreAttr, true, "moveTriggers:lunarDanceRestore")
       .danceMove()
-      .triageMove()
-      .unimplemented(),
+      .triageMove(),
     new AttackMove(Moves.CRUSH_GRIP, Type.NORMAL, MoveCategory.PHYSICAL, -1, 100, 5, -1, 0, 4)
       .attr(OpponentHighHpPowerAttr, 120),
     new AttackMove(Moves.MAGMA_STORM, Type.FIRE, MoveCategory.SPECIAL, 100, 75, 5, -1, 0, 4)

src/data/mystery-encounters/encounters/berries-abound-encounter.ts

@@ -13,7 +13,7 @@ import {
   ModifierTypeOption, modifierTypes,
   regenerateModifierPoolThresholds,
 } from "#app/modifier/modifier-type";
-import { randSeedInt } from "#app/utils";
+import { randSeedInt, randSeedItem } from "#app/utils";
 import { BattlerTagType } from "#enums/battler-tag-type";
 import { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import BattleScene from "#app/battle-scene";
@@ -31,6 +31,7 @@ import { BerryType } from "#enums/berry-type";
 import { PERMANENT_STATS, Stat } from "#enums/stat";
 import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase";
 import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
+import PokemonSpecies, { getPokemonSpecies } from "#app/data/pokemon-species";
 
 /** the i18n namespace for the encounter */
 const namespace = "mysteryEncounters/berriesAbound";
@@ -58,7 +59,14 @@ export const BerriesAboundEncounter: MysteryEncounter =
 
       // Calculate boss mon
       const level = getEncounterPokemonLevelForWave(scene, STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER);
-      const bossSpecies = scene.arena.randomSpecies(scene.currentBattle.waveIndex, level, 0, getPartyLuckValue(scene.getPlayerParty()), true);
+      let bossSpecies: PokemonSpecies;
+      if (scene.eventManager.isEventActive() && scene.eventManager.activeEvent()?.uncommonBreedEncounters && randSeedInt(2) === 1) {
+        const eventEncounter = randSeedItem(scene.eventManager.activeEvent()!.uncommonBreedEncounters!);
+        const levelSpecies = getPokemonSpecies(eventEncounter.species).getWildSpeciesForLevel(level, eventEncounter.allowEvolution ?? false, true, scene.gameMode);
+        bossSpecies = getPokemonSpecies( levelSpecies );
+      } else {
+        bossSpecies = scene.arena.randomSpecies(scene.currentBattle.waveIndex, level, 0, getPartyLuckValue(scene.getPlayerParty()), true);
+      }
       const bossPokemon = new EnemyPokemon(scene, bossSpecies, level, TrainerSlot.NONE, true);
       encounter.setDialogueToken("enemyPokemon", getPokemonNameWithAffix(bossPokemon));
       const config: EnemyPartyConfig = {

src/data/mystery-encounters/encounters/delibirdy-encounter.ts

@@ -13,6 +13,7 @@ import { modifierTypes, PokemonHeldItemModifierType } from "#app/modifier/modifi
 import { ModifierRewardPhase } from "#app/phases/modifier-reward-phase";
 import i18next from "#app/plugins/i18n";
 import { OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler";
+import { randSeedItem } from "#app/utils";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
 import { MysteryEncounterType } from "#enums/mystery-encounter-type";
@@ -33,7 +34,24 @@ const OPTION_3_DISALLOWED_MODIFIERS = [
   "PokemonBaseStatTotalModifier"
 ];
 
-const DELIBIRDY_MONEY_PRICE_MULTIPLIER = 2;
+const DELIBIRDY_MONEY_PRICE_MULTIPLIER = 1.5;
+
+const doEventReward = (scene: BattleScene) => {
+  const event_buff = scene.eventManager.activeEvent()?.delibirdyBuff ?? [];
+  if (event_buff.length > 0) {
+    const candidates = event_buff.filter((c => {
+      const mtype = generateModifierType(scene, modifierTypes[c]);
+      const existingCharm = scene.findModifier(m => m.type.id === mtype?.id);
+      return !(existingCharm && existingCharm.getStackCount() >= existingCharm.getMaxStackCount(scene));
+    }));
+    if (candidates.length > 0) {
+      scene.unshiftPhase(new ModifierRewardPhase(scene, modifierTypes[randSeedItem(candidates)]));
+    } else {
+      // At max stacks, give a Voucher instead
+      scene.unshiftPhase(new ModifierRewardPhase(scene, modifierTypes.VOUCHER));
+    }
+  }
+};
 
 /**
  * Delibird-y encounter.
@@ -42,7 +60,8 @@ const DELIBIRDY_MONEY_PRICE_MULTIPLIER = 2;
  */
 export const DelibirdyEncounter: MysteryEncounter =
   MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.DELIBIRDY)
-    .withEncounterTier(MysteryEncounterTier.GREAT)
+    .withMaxAllowedEncounters(4)
+    .withEncounterTier(MysteryEncounterTier.COMMON) //Change back after event!
     .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES)
     .withSceneRequirement(new MoneyRequirement(0, DELIBIRDY_MONEY_PRICE_MULTIPLIER)) // Must have enough money for it to spawn at the very least
     .withPrimaryPokemonRequirement(
@@ -136,8 +155,10 @@ export const DelibirdyEncounter: MysteryEncounter =
             await applyModifierTypeToPlayerPokemon(scene, scene.getPlayerPokemon()!, shellBell);
             scene.playSound("item_fanfare");
             await showEncounterText(scene, i18next.t("battle:rewardGain", { modifierName: shellBell.name }), null, undefined, true);
+            doEventReward(scene);
           } else {
             scene.unshiftPhase(new ModifierRewardPhase(scene, modifierTypes.AMULET_COIN));
+            doEventReward(scene);
           }
 
           leaveEncounterWithoutBattle(scene, true);
@@ -211,8 +232,10 @@ export const DelibirdyEncounter: MysteryEncounter =
               await applyModifierTypeToPlayerPokemon(scene, scene.getPlayerPokemon()!, shellBell);
               scene.playSound("item_fanfare");
               await showEncounterText(scene, i18next.t("battle:rewardGain", { modifierName: shellBell.name }), null, undefined, true);
+              doEventReward(scene);
             } else {
               scene.unshiftPhase(new ModifierRewardPhase(scene, modifierTypes.CANDY_JAR));
+              doEventReward(scene);
             }
           } else {
             // Check if the player has max stacks of that Berry Pouch already
@@ -224,8 +247,10 @@ export const DelibirdyEncounter: MysteryEncounter =
               await applyModifierTypeToPlayerPokemon(scene, scene.getPlayerPokemon()!, shellBell);
               scene.playSound("item_fanfare");
               await showEncounterText(scene, i18next.t("battle:rewardGain", { modifierName: shellBell.name }), null, undefined, true);
+              doEventReward(scene);
             } else {
               scene.unshiftPhase(new ModifierRewardPhase(scene, modifierTypes.BERRY_POUCH));
+              doEventReward(scene);
             }
           }
 
@@ -300,8 +325,10 @@ export const DelibirdyEncounter: MysteryEncounter =
             await applyModifierTypeToPlayerPokemon(scene, scene.getPlayerParty()[0], shellBell);
             scene.playSound("item_fanfare");
             await showEncounterText(scene, i18next.t("battle:rewardGain", { modifierName: shellBell.name }), null, undefined, true);
+            doEventReward(scene);
           } else {
             scene.unshiftPhase(new ModifierRewardPhase(scene, modifierTypes.HEALING_CHARM));
+            doEventReward(scene);
           }
 
           chosenPokemon.loseHeldItem(modifier, false);

src/data/mystery-encounters/encounters/fight-or-flight-encounter.ts

@@ -26,9 +26,10 @@ import { getEncounterPokemonLevelForWave, getSpriteKeysFromPokemon, STANDARD_ENC
 import PokemonData from "#app/system/pokemon-data";
 import { BattlerTagType } from "#enums/battler-tag-type";
 import { queueEncounterMessage } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
-import { randSeedInt } from "#app/utils";
+import { randSeedInt, randSeedItem } from "#app/utils";
 import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase";
 import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
+import PokemonSpecies, { getPokemonSpecies } from "#app/data/pokemon-species";
 
 /** the i18n namespace for the encounter */
 const namespace = "mysteryEncounters/fightOrFlight";
@@ -56,7 +57,14 @@ export const FightOrFlightEncounter: MysteryEncounter =
 
       // Calculate boss mon
       const level = getEncounterPokemonLevelForWave(scene, STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER);
-      const bossSpecies = scene.arena.randomSpecies(scene.currentBattle.waveIndex, level, 0, getPartyLuckValue(scene.getPlayerParty()), true);
+      let bossSpecies: PokemonSpecies;
+      if (scene.eventManager.isEventActive() && scene.eventManager.activeEvent()?.uncommonBreedEncounters && randSeedInt(2) === 1) {
+        const eventEncounter = randSeedItem(scene.eventManager.activeEvent()!.uncommonBreedEncounters!);
+        const levelSpecies = getPokemonSpecies(eventEncounter.species).getWildSpeciesForLevel(level, eventEncounter.allowEvolution ?? false, true, scene.gameMode);
+        bossSpecies = getPokemonSpecies( levelSpecies );
+      } else {
+        bossSpecies = scene.arena.randomSpecies(scene.currentBattle.waveIndex, level, 0, getPartyLuckValue(scene.getPlayerParty()), true);
+      }
       const bossPokemon = new EnemyPokemon(scene, bossSpecies, level, TrainerSlot.NONE, true);
       encounter.setDialogueToken("enemyPokemon", bossPokemon.getNameToRender());
       const config: EnemyPartyConfig = {

src/data/mystery-encounters/encounters/uncommon-breed-encounter.ts

@@ -12,7 +12,7 @@ import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode
 import { TrainerSlot } from "#app/data/trainer-config";
 import { catchPokemon, getHighestLevelPlayerPokemon, getSpriteKeysFromPokemon } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
 import PokemonData from "#app/system/pokemon-data";
-import { isNullOrUndefined, randSeedInt } from "#app/utils";
+import { isNullOrUndefined, randSeedInt, randSeedItem } from "#app/utils";
 import { Moves } from "#enums/moves";
 import { BattlerIndex } from "#app/battle";
 import { SelfStatusMove } from "#app/data/move";
@@ -23,6 +23,7 @@ import { BerryModifier } from "#app/modifier/modifier";
 import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase";
 import { Stat } from "#enums/stat";
 import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
+import PokemonSpecies, { getPokemonSpecies } from "#app/data/pokemon-species";
 
 /** the i18n namespace for the encounter */
 const namespace = "mysteryEncounters/uncommonBreed";
@@ -51,7 +52,14 @@ export const UncommonBreedEncounter: MysteryEncounter =
       // Calculate boss mon
       // Level equal to 2 below highest party member
       const level = getHighestLevelPlayerPokemon(scene, false, true).level - 2;
-      const species = scene.arena.randomSpecies(scene.currentBattle.waveIndex, level, 0, getPartyLuckValue(scene.getPlayerParty()), true);
+      let species: PokemonSpecies;
+      if (scene.eventManager.isEventActive() && scene.eventManager.activeEvent()?.uncommonBreedEncounters && randSeedInt(2) === 1) {
+        const eventEncounter = randSeedItem(scene.eventManager.activeEvent()!.uncommonBreedEncounters!);
+        const levelSpecies = getPokemonSpecies(eventEncounter.species).getWildSpeciesForLevel(level, eventEncounter.allowEvolution ?? false, true, scene.gameMode);
+        species = getPokemonSpecies( levelSpecies );
+      } else {
+        species = scene.arena.randomSpecies(scene.currentBattle.waveIndex, level, 0, getPartyLuckValue(scene.getPlayerParty()), true);
+      }
       const pokemon = new EnemyPokemon(scene, species, level, TrainerSlot.NONE, true);
 
       // Pokemon will always have one of its egg moves in its moveset

src/data/mystery-encounters/mystery-encounters.ts

@@ -177,7 +177,7 @@ export const allMysteryEncounters: { [encounterType: number]: MysteryEncounter }
 const extremeBiomeEncounters: MysteryEncounterType[] = [];
 
 const nonExtremeBiomeEncounters: MysteryEncounterType[] = [
-  MysteryEncounterType.FIELD_TRIP,
+  // MysteryEncounterType.FIELD_TRIP, Disabled for holiday event
   MysteryEncounterType.DANCING_LESSONS, // Is also in BADLANDS, DESERT, VOLCANO, WASTELAND, ABYSS
 ];
 
@@ -185,14 +185,14 @@ const humanTransitableBiomeEncounters: MysteryEncounterType[] = [
   MysteryEncounterType.MYSTERIOUS_CHALLENGERS,
   MysteryEncounterType.SHADY_VITAMIN_DEALER,
   MysteryEncounterType.THE_POKEMON_SALESMAN,
-  MysteryEncounterType.AN_OFFER_YOU_CANT_REFUSE,
+  // MysteryEncounterType.AN_OFFER_YOU_CANT_REFUSE, Disabled for holiday event
   MysteryEncounterType.THE_WINSTRATE_CHALLENGE,
   MysteryEncounterType.THE_EXPERT_POKEMON_BREEDER
 ];
 
 const civilizationBiomeEncounters: MysteryEncounterType[] = [
-  MysteryEncounterType.DEPARTMENT_STORE_SALE,
-  MysteryEncounterType.PART_TIMER,
+  // MysteryEncounterType.DEPARTMENT_STORE_SALE, Disabled for holiday event
+  // MysteryEncounterType.PART_TIMER, Disabled for holiday event
   MysteryEncounterType.FUN_AND_GAMES,
   MysteryEncounterType.GLOBAL_TRADE_SYSTEM
 ];

src/data/trainer-config.ts

@@ -1170,6 +1170,9 @@ function getGymLeaderPartyTemplate(scene: BattleScene) {
 export function getRandomPartyMemberFunc(speciesPool: Species[], trainerSlot: TrainerSlot = TrainerSlot.TRAINER, ignoreEvolution: boolean = false, postProcess?: (enemyPokemon: EnemyPokemon) => void) {
   return (scene: BattleScene, level: number, strength: PartyMemberStrength) => {
     let species = Utils.randSeedItem(speciesPool);
+    if (scene.gameMode.isClassic && scene.currentBattle.waveIndex === 20) {
+      ignoreEvolution = true;
+    }
     if (!ignoreEvolution) {
       species = getPokemonSpecies(species).getTrainerSpeciesForLevel(level, true, strength, scene.currentBattle.waveIndex);
     }
@@ -1229,7 +1232,7 @@ export const signatureSpecies: SignatureSpecies = {
   GIOVANNI: [ Species.SANDILE, Species.MURKROW, Species.NIDORAN_M, Species.NIDORAN_F ],
   FALKNER: [ Species.PIDGEY, Species.HOOTHOOT, Species.DODUO ],
   BUGSY: [ Species.SCYTHER, Species.HERACROSS, Species.SHUCKLE, Species.PINSIR ],
-  WHITNEY: [ Species.GIRAFARIG, Species.MILTANK ],
+  WHITNEY: [ Species.JIGGLYPUFF, Species.MILTANK, Species.AIPOM, Species.GIRAFARIG ],
   MORTY: [ Species.GASTLY, Species.MISDREAVUS, Species.SABLEYE ],
   CHUCK: [ Species.POLIWRATH, Species.MANKEY ],
   JASMINE: [ Species.MAGNEMITE, Species.STEELIX ],
@@ -1239,7 +1242,7 @@ export const signatureSpecies: SignatureSpecies = {
   BRAWLY: [ Species.MACHOP, Species.MAKUHITA ],
   WATTSON: [ Species.MAGNEMITE, Species.VOLTORB, Species.ELECTRIKE ],
   FLANNERY: [ Species.SLUGMA, Species.TORKOAL, Species.NUMEL ],
-  NORMAN: [ Species.SLAKOTH, Species.SPINDA, Species.CHANSEY, Species.KANGASKHAN ],
+  NORMAN: [ Species.SLAKOTH, Species.SPINDA, Species.ZIGZAGOON, Species.KECLEON ],
   WINONA: [ Species.SWABLU, Species.WINGULL, Species.TROPIUS, Species.SKARMORY ],
   TATE: [ Species.SOLROCK, Species.NATU, Species.CHIMECHO, Species.GALLADE ],
   LIZA: [ Species.LUNATONE, Species.SPOINK, Species.BALTOY, Species.GARDEVOIR ],
@@ -1247,16 +1250,16 @@ export const signatureSpecies: SignatureSpecies = {
   ROARK: [ Species.CRANIDOS, Species.LARVITAR, Species.GEODUDE ],
   GARDENIA: [ Species.ROSELIA, Species.TANGELA, Species.TURTWIG ],
   MAYLENE: [ Species.LUCARIO, Species.MEDITITE, Species.CHIMCHAR ],
-  CRASHER_WAKE: [ Species.BUIZEL, Species.MAGIKARP, Species.PIPLUP ],
+  CRASHER_WAKE: [ Species.BUIZEL, Species.WOOPER, Species.PIPLUP, Species.MAGIKARP ],
   FANTINA: [ Species.MISDREAVUS, Species.DRIFLOON, Species.SPIRITOMB ],
   BYRON: [ Species.SHIELDON, Species.BRONZOR, Species.AGGRON ],
   CANDICE: [ Species.SNEASEL, Species.SNOVER, Species.SNORUNT ],
   VOLKNER: [ Species.SHINX, Species.CHINCHOU, Species.ROTOM ],
-  CILAN: [ Species.PANSAGE, Species.COTTONEE, Species.PETILIL ],
-  CHILI: [ Species.PANSEAR, Species.DARUMAKA, Species.HEATMOR ],
-  CRESS: [ Species.PANPOUR, Species.BASCULIN, Species.TYMPOLE ],
-  CHEREN: [ Species.LILLIPUP, Species.MINCCINO, Species.PATRAT ],
-  LENORA: [ Species.KANGASKHAN, Species.DEERLING, Species.AUDINO ],
+  CILAN: [ Species.PANSAGE, Species.FOONGUS, Species.PETILIL ],
+  CHILI: [ Species.PANSEAR, Species.DARUMAKA, Species.NUMEL ],
+  CRESS: [ Species.PANPOUR, Species.TYMPOLE, Species.SLOWPOKE ],
+  CHEREN: [ Species.LILLIPUP, Species.MINCCINO, Species.PIDOVE ],
+  LENORA: [ Species.PATRAT, Species.DEERLING, Species.AUDINO ],
   ROXIE: [ Species.VENIPEDE, Species.TRUBBISH, Species.SKORUPI ],
   BURGH: [ Species.SEWADDLE, Species.SHELMET, Species.KARRABLAST ],
   ELESA: [ Species.EMOLGA, Species.BLITZLE, Species.JOLTIK ],
@@ -1289,7 +1292,7 @@ export const signatureSpecies: SignatureSpecies = {
   BRASSIUS: [ Species.SMOLIV, Species.SHROOMISH, Species.ODDISH ],
   IONO: [ Species.TADBULB, Species.WATTREL, Species.VOLTORB ],
   KOFU: [ Species.VELUZA, Species.WIGLETT, Species.WINGULL ],
-  LARRY: [ Species.STARLY, Species.DUNSPARCE, Species.KOMALA ],
+  LARRY: [ Species.STARLY, Species.DUNSPARCE, Species.LECHONK, Species.KOMALA ],
   RYME: [ Species.GREAVARD, Species.SHUPPET, Species.MIMIKYU ],
   TULIP: [ Species.GIRAFARIG, Species.FLITTLE, Species.RALTS ],
   GRUSHA: [ Species.CETODDLE, Species.ALOLA_VULPIX, Species.CUBCHOO ],
@@ -1852,7 +1855,7 @@ export const trainerConfigs: TrainerConfigs = {
 
   [TrainerType.RIVAL]: new TrainerConfig((t = TrainerType.RIVAL)).setName("Finn").setHasGenders("Ivy").setHasCharSprite().setTitle("Rival").setStaticParty().setEncounterBgm(TrainerType.RIVAL).setBattleBgm("battle_rival").setMixedBattleBgm("battle_rival").setPartyTemplates(trainerPartyTemplates.RIVAL)
     .setModifierRewardFuncs(() => modifierTypes.SUPER_EXP_CHARM, () => modifierTypes.EXP_SHARE)
-    .setEventModifierRewardFuncs(() => modifierTypes.SHINY_CHARM, () => modifierTypes.ABILITY_CHARM)
+    .setEventModifierRewardFuncs(() => modifierTypes.SHINY_CHARM, () => modifierTypes.ABILITY_CHARM, () => modifierTypes.CATCHING_CHARM)
     .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE, Species.CHIKORITA, Species.CYNDAQUIL, Species.TOTODILE, Species.TREECKO, Species.TORCHIC, Species.MUDKIP, Species.TURTWIG, Species.CHIMCHAR, Species.PIPLUP, Species.SNIVY, Species.TEPIG, Species.OSHAWOTT, Species.CHESPIN, Species.FENNEKIN, Species.FROAKIE, Species.ROWLET, Species.LITTEN, Species.POPPLIO, Species.GROOKEY, Species.SCORBUNNY, Species.SOBBLE, Species.SPRIGATITO, Species.FUECOCO, Species.QUAXLY ], TrainerSlot.TRAINER, true,
       (p => p.abilityIndex = 0)))
     .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.PIDGEY, Species.HOOTHOOT, Species.TAILLOW, Species.STARLY, Species.PIDOVE, Species.FLETCHLING, Species.PIKIPEK, Species.ROOKIDEE, Species.WATTREL ], TrainerSlot.TRAINER, true)),

src/data/weather.ts

@@ -242,7 +242,7 @@ export function getTerrainBlockMessage(pokemon: Pokemon, terrainType: TerrainTyp
   return i18next.t("terrain:defaultBlockMessage", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), terrainName: getTerrainName(terrainType) });
 }
 
-interface WeatherPoolEntry {
+export interface WeatherPoolEntry {
   weatherType: WeatherType;
   weight: integer;
 }
@@ -373,6 +373,10 @@ export function getRandomWeatherType(arena: any /* Importing from arena causes a
       break;
   }
 
+  if (arena.biomeType === Biome.TOWN && arena.scene.eventManager.isEventActive() && arena.scene.eventManager.activeEvent()?.weather?.length > 0) {
+    arena.scene.eventManager.activeEvent().weather.map(w => weatherPool.push(w));
+  }
+
   if (weatherPool.length > 1) {
     let totalWeight = 0;
     weatherPool.forEach(w => totalWeight += w.weight);

src/loading-scene.ts

@@ -246,9 +246,9 @@ export class LoadingScene extends SceneBase {
     }
     const availableLangs = [ "en", "de", "it", "fr", "ja", "ko", "es-ES", "pt-BR", "zh-CN" ];
     if (lang && availableLangs.includes(lang)) {
-      this.loadImage("halloween2024-event-" + lang, "events");
+      this.loadImage("winter_holidays2024-event-" + lang, "events");
     } else {
-      this.loadImage("halloween2024-event-en", "events");
+      this.loadImage("winter_holidays2024-event-en", "events");
     }
 
     this.loadAtlas("statuses", "");

src/modifier/modifier-type.ts

@@ -1093,7 +1093,10 @@ class TmModifierTypeGenerator extends ModifierTypeGenerator {
       if (pregenArgs && (pregenArgs.length === 1) && (pregenArgs[0] in Moves)) {
         return new TmModifierType(pregenArgs[0] as Moves);
       }
-      const partyMemberCompatibleTms = party.map(p => (p as PlayerPokemon).compatibleTms.filter(tm => !p.moveset.find(m => m?.moveId === tm)));
+      const partyMemberCompatibleTms = party.map(p => {
+        const previousLevelMoves = p.getLearnableLevelMoves();
+        return (p as PlayerPokemon).compatibleTms.filter(tm => !p.moveset.find(m => m?.moveId === tm) && !previousLevelMoves.find(lm=>lm === tm));
+      });
       const tierUniqueCompatibleTms = partyMemberCompatibleTms.flat().filter(tm => tmPoolTiers[tm] === tier).filter(tm => !allMoves[tm].name.endsWith(" (N)")).filter((tm, i, array) => array.indexOf(tm) === i);
       if (!tierUniqueCompatibleTms.length) {
         return null;

src/phases/pokemon-heal-phase.ts

@@ -21,8 +21,9 @@ export class PokemonHealPhase extends CommonAnimPhase {
   private revive: boolean;
   private healStatus: boolean;
   private preventFullHeal: boolean;
+  private fullRestorePP: boolean;
 
-  constructor(scene: BattleScene, battlerIndex: BattlerIndex, hpHealed: integer, message: string | null, showFullHpMessage: boolean, skipAnim: boolean = false, revive: boolean = false, healStatus: boolean = false, preventFullHeal: boolean = false) {
+  constructor(scene: BattleScene, battlerIndex: BattlerIndex, hpHealed: integer, message: string | null, showFullHpMessage: boolean, skipAnim: boolean = false, revive: boolean = false, healStatus: boolean = false, preventFullHeal: boolean = false, fullRestorePP: boolean = false) {
     super(scene, battlerIndex, undefined, CommonAnim.HEALTH_UP);
 
     this.hpHealed = hpHealed;
@@ -32,6 +33,7 @@ export class PokemonHealPhase extends CommonAnimPhase {
     this.revive = revive;
     this.healStatus = healStatus;
     this.preventFullHeal = preventFullHeal;
+    this.fullRestorePP = fullRestorePP;
   }
 
   start() {
@@ -86,6 +88,13 @@ export class PokemonHealPhase extends CommonAnimPhase {
         lastStatusEffect = pokemon.status.effect;
         pokemon.resetStatus();
       }
+      if (this.fullRestorePP) {
+        for (const move of this.getPokemon().getMoveset()) {
+          if (move) {
+            move.ppUsed = 0;
+          }
+        }
+      }
       pokemon.updateInfo().then(() => super.end());
     } else if (this.healStatus && !this.revive && pokemon.status) {
       lastStatusEffect = pokemon.status.effect;

src/phases/trainer-victory-phase.ts

@@ -39,7 +39,7 @@ export class TrainerVictoryPhase extends BattlePhase {
     // Validate Voucher for boss trainers
     if (vouchers.hasOwnProperty(TrainerType[trainerType])) {
       if (!this.scene.validateVoucher(vouchers[TrainerType[trainerType]]) && this.scene.currentBattle.trainer?.config.isBoss) {
-        this.scene.unshiftPhase(new ModifierRewardPhase(this.scene, [ modifierTypes.VOUCHER, modifierTypes.VOUCHER, modifierTypes.VOUCHER_PLUS, modifierTypes.VOUCHER_PREMIUM ][vouchers[TrainerType[trainerType]].voucherType]));
+        this.scene.unshiftPhase(new ModifierRewardPhase(this.scene, [ modifierTypes.VOUCHER_PLUS, modifierTypes.VOUCHER_PLUS, modifierTypes.VOUCHER_PLUS, modifierTypes.VOUCHER_PREMIUM ][vouchers[TrainerType[trainerType]].voucherType]));
       }
     }
     // Breeders in Space achievement

src/test/moves/lunar_dance.test.ts

@@ -0,0 +1,77 @@
+import { StatusEffect } from "#app/enums/status-effect";
+import { CommandPhase } from "#app/phases/command-phase";
+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, it, expect } from "vitest";
+
+describe("Moves - Lunar Dance", () => {
+  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
+      .statusEffect(StatusEffect.BURN)
+      .battleType("double")
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyMoveset(Moves.SPLASH);
+  });
+
+  it("should full restore HP, PP and status of switched in pokemon, then fail second use because no remaining backup pokemon in party", async () => {
+    await game.classicMode.startBattle([ Species.BULBASAUR, Species.ODDISH, Species.RATTATA ]);
+
+    const [ bulbasaur, oddish, rattata ] = game.scene.getPlayerParty();
+    game.move.changeMoveset(bulbasaur, [ Moves.LUNAR_DANCE, Moves.SPLASH ]);
+    game.move.changeMoveset(oddish, [ Moves.LUNAR_DANCE, Moves.SPLASH ]);
+    game.move.changeMoveset(rattata, [ Moves.LUNAR_DANCE, Moves.SPLASH ]);
+
+    game.move.select(Moves.SPLASH, 0);
+    game.move.select(Moves.SPLASH, 1);
+    await game.phaseInterceptor.to(CommandPhase);
+    await game.toNextTurn();
+
+    // Bulbasaur should still be burned and have used a PP for splash and not at max hp
+    expect(bulbasaur.status?.effect).toBe(StatusEffect.BURN);
+    expect(bulbasaur.moveset[1]?.ppUsed).toBe(1);
+    expect(bulbasaur.hp).toBeLessThan(bulbasaur.getMaxHp());
+
+    // Switch out Bulbasaur for Rattata so we can swtich bulbasaur back in with lunar dance
+    game.doSwitchPokemon(2);
+    game.move.select(Moves.SPLASH, 1);
+    await game.phaseInterceptor.to(CommandPhase);
+    await game.toNextTurn();
+
+    game.move.select(Moves.SPLASH, 0);
+    game.move.select(Moves.LUNAR_DANCE);
+    game.doSelectPartyPokemon(2);
+    await game.phaseInterceptor.to("SwitchPhase", false);
+    await game.toNextTurn();
+
+    // Bulbasaur should NOT have any status and have full PP for splash and be at max hp
+    expect(bulbasaur.status?.effect).toBeUndefined();
+    expect(bulbasaur.moveset[1]?.ppUsed).toBe(0);
+    expect(bulbasaur.isFullHp()).toBe(true);
+
+    game.move.select(Moves.SPLASH, 0);
+    game.move.select(Moves.LUNAR_DANCE);
+    await game.phaseInterceptor.to(CommandPhase);
+    await game.toNextTurn();
+
+    // Using Lunar dance again should fail because nothing in party and rattata should be alive
+    expect(rattata.status?.effect).toBe(StatusEffect.BURN);
+    expect(rattata.hp).toBeLessThan(rattata.getMaxHp());
+  });
+});

src/test/mystery-encounter/encounters/delibirdy-encounter.test.ts

@@ -56,7 +56,7 @@ describe("Delibird-y - Mystery Encounter", () => {
     await game.runToMysteryEncounter(MysteryEncounterType.DELIBIRDY, defaultParty);
 
     expect(DelibirdyEncounter.encounterType).toBe(MysteryEncounterType.DELIBIRDY);
-    expect(DelibirdyEncounter.encounterTier).toBe(MysteryEncounterTier.GREAT);
+    expect(DelibirdyEncounter.encounterTier).toBe(MysteryEncounterTier.COMMON);
     expect(DelibirdyEncounter.dialogue).toBeDefined();
     expect(DelibirdyEncounter.dialogue.intro).toStrictEqual([{ text: `${namespace}:intro` }]);
     expect(DelibirdyEncounter.dialogue.outro).toStrictEqual([{ text: `${namespace}:outro` }]);

src/timed-event-manager.ts

@@ -2,6 +2,9 @@ import BattleScene from "#app/battle-scene";
 import { TextStyle, addTextObject } from "#app/ui/text";
 import { nil } from "#app/utils";
 import i18next from "i18next";
+import { Species } from "#enums/species";
+import { WeatherPoolEntry } from "#app/data/weather";
+import { WeatherType } from "#enums/weather-type";
 
 export enum EventType {
   SHINY,
@@ -16,6 +19,11 @@ interface EventBanner {
   availableLangs?: string[];
 }
 
+interface EventEncounter {
+  species: Species;
+  allowEvolution?: boolean;
+}
+
 interface TimedEvent extends EventBanner {
   name: string;
   eventType: EventType;
@@ -23,19 +31,46 @@ interface TimedEvent extends EventBanner {
   friendshipMultiplier?: number;
   startDate: Date;
   endDate: Date;
+  uncommonBreedEncounters?: EventEncounter[];
+  delibirdyBuff?: string[];
+  weather?: WeatherPoolEntry[];
 }
 
 const timedEvents: TimedEvent[] = [
   {
-    name: "Halloween Update",
+    name: "Winter Holiday Update",
     eventType: EventType.SHINY,
     shinyMultiplier: 2,
-    friendshipMultiplier: 2,
-    startDate: new Date(Date.UTC(2024, 9, 27, 0)),
-    endDate: new Date(Date.UTC(2024, 10, 4, 0)),
-    bannerKey: "halloween2024-event-",
+    friendshipMultiplier: 1,
+    startDate: new Date(Date.UTC(2024, 11, 21, 0)),
+    endDate: new Date(Date.UTC(2025, 0, 4, 0)),
+    bannerKey: "winter_holidays2024-event-",
     scale: 0.21,
-    availableLangs: [ "en", "de", "it", "fr", "ja", "ko", "es-ES", "pt-BR", "zh-CN" ]
+    availableLangs: [ "en", "de", "it", "fr", "ja", "ko", "es-ES", "pt-BR", "zh-CN" ],
+    uncommonBreedEncounters: [
+      { species: Species.GIMMIGHOUL },
+      { species: Species.DELIBIRD },
+      { species: Species.STANTLER, allowEvolution: true },
+      { species: Species.CYNDAQUIL, allowEvolution: true },
+      { species: Species.PIPLUP, allowEvolution: true },
+      { species: Species.CHESPIN, allowEvolution: true },
+      { species: Species.BALTOY, allowEvolution: true },
+      { species: Species.SNOVER, allowEvolution: true },
+      { species: Species.CHINGLING, allowEvolution: true },
+      { species: Species.LITWICK, allowEvolution: true },
+      { species: Species.CUBCHOO, allowEvolution: true },
+      { species: Species.SWIRLIX, allowEvolution: true },
+      { species: Species.AMAURA, allowEvolution: true },
+      { species: Species.MUDBRAY, allowEvolution: true },
+      { species: Species.ROLYCOLY, allowEvolution: true },
+      { species: Species.MILCERY, allowEvolution: true },
+      { species: Species.SMOLIV, allowEvolution: true },
+      { species: Species.ALOLA_VULPIX, allowEvolution: true },
+      { species: Species.GALAR_DARUMAKA, allowEvolution: true },
+      { species: Species.IRON_BUNDLE }
+    ],
+    delibirdyBuff: [ "CATCHING_CHARM", "SHINY_CHARM", "ABILITY_CHARM", "EXP_CHARM", "SUPER_EXP_CHARM", "HEALING_CHARM" ],
+    weather: [{ weatherType: WeatherType.SNOW, weight: 1 }]
   }
 ];
 
@@ -189,7 +224,7 @@ export class TimedEventDisplay extends Phaser.GameObjects.Container {
     const secs  = Math.round(diff % 6e4 / 1e3);
 
     // Return formatted string
-    return "Event Ends in : " + z(days) + "d " + z(hours) + "h " + z(mins) + "m " + z(secs) + "s";
+    return i18next.t("menu:eventTimer", { days: z(days), hours: z(hours), mins: z(mins), secs: z(secs) });
   }
 
   updateCountdown() {

src/ui/login-form-ui-handler.ts

@@ -81,7 +81,11 @@ export default class LoginFormUiHandler extends FormModalUiHandler {
   }
 
   override getModalTitle(_config?: ModalConfig): string {
-    return i18next.t("menu:login");
+    let key = "menu:login";
+    if (import.meta.env.VITE_SERVER_URL === "https://apibeta.pokerogue.net") {
+      key = "menu:loginBeta";
+    }
+    return i18next.t(key);
   }
 
   override getWidth(_config?: ModalConfig): number {

src/ui/party-ui-handler.ts

@@ -362,12 +362,12 @@ export default class PartyUiHandler extends MessageUiHandler {
             if (p !== this.transferCursor) { // this skips adding the able/not able labels on the pokemon doing the transfer
               if (matchingModifier) { // if matchingModifier exists then the item exists on the new pokemon
                 if (matchingModifier.getMaxStackCount(this.scene) === matchingModifier.stackCount) { // checks to see if the stack of items is at max stack; if so, set the description label to "Not able"
-                  ableToTransfer = "Not able";
+                  ableToTransfer = i18next.t("partyUiHandler:notAble");
                 } else { // if the pokemon isn't at max stack, make the label "Able"
-                  ableToTransfer = "Able";
+                  ableToTransfer = i18next.t("partyUiHandler:able");
                 }
               } else { // if matchingModifier doesn't exist, that means the pokemon doesn't have any of the item, and we need to show "Able"
-                ableToTransfer = "Able";
+                ableToTransfer = i18next.t("partyUiHandler:able");
               }
             } else { // this else relates to the transfer pokemon. We set the text to be blank so there's no "Able"/"Not able" text
               ableToTransfer = "";