Merge 92d8c5289b into d6381deb2f

public/images/pokemon/variant/_exp_masterlist.json

@@ -132,6 +132,7 @@
     "763": [0, 1, 1],
     "767": [0, 1, 1],
     "768": [0, 1, 1],
+    "770": [0, 0, 0],
     "771": [0, 2, 2],
     "772": [0, 1, 1],
     "773-fighting": [0, 1, 1],

src/data/daily-run.ts

@@ -5,9 +5,10 @@ import type { PokemonSpeciesForm } from "#data/pokemon-species";
 import { PokemonSpecies } from "#data/pokemon-species";
 import { BiomeId } from "#enums/biome-id";
 import { PartyMemberStrength } from "#enums/party-member-strength";
-import { SpeciesId } from "#enums/species-id";
+import type { SpeciesId } from "#enums/species-id";
+import { PlayerPokemon } from "#field/pokemon";
 import type { Starter } from "#ui/starter-select-ui-handler";
-import { isNullOrUndefined, randSeedGauss, randSeedInt, randSeedItem } from "#utils/common";
+import { randSeedGauss, randSeedInt, randSeedItem } from "#utils/common";
 import { getEnumValues } from "#utils/enums";
 import { getPokemonSpecies, getPokemonSpeciesForm } from "#utils/pokemon-utils";
 
@@ -31,9 +32,15 @@ export function getDailyRunStarters(seed: string): Starter[] {
     () => {
       const startingLevel = globalScene.gameMode.getStartingLevel();
 
-      const eventStarters = getDailyEventSeedStarters(seed);
+      if (/\d{18}$/.test(seed)) {
-      if (!isNullOrUndefined(eventStarters)) {
+        for (let s = 0; s < 3; s++) {
-        starters.push(...eventStarters);
+          const offset = 6 + s * 6;
+          const starterSpeciesForm = getPokemonSpeciesForm(
+            Number.parseInt(seed.slice(offset, offset + 4)) as SpeciesId,
+            Number.parseInt(seed.slice(offset + 4, offset + 6)),
+          );
+          starters.push(getDailyRunStarter(starterSpeciesForm, startingLevel));
+        }
         return;
       }
 
@@ -65,7 +72,18 @@ function getDailyRunStarter(starterSpeciesForm: PokemonSpeciesForm, startingLeve
   const starterSpecies =
     starterSpeciesForm instanceof PokemonSpecies ? starterSpeciesForm : getPokemonSpecies(starterSpeciesForm.speciesId);
   const formIndex = starterSpeciesForm instanceof PokemonSpecies ? undefined : starterSpeciesForm.formIndex;
-  const pokemon = globalScene.addPlayerPokemon(starterSpecies, startingLevel, undefined, formIndex);
+  const pokemon = new PlayerPokemon(
+    starterSpecies,
+    startingLevel,
+    undefined,
+    formIndex,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+  );
   const starter: Starter = {
     species: starterSpecies,
     dexAttr: pokemon.getDexAttr(),
@@ -127,11 +145,6 @@ const dailyBiomeWeights: BiomeWeights = {
 };
 
 export function getDailyStartingBiome(): BiomeId {
-  const eventBiome = getDailyEventSeedBiome(globalScene.seed);
-  if (!isNullOrUndefined(eventBiome)) {
-    return eventBiome;
-  }
-
   const biomes = getEnumValues(BiomeId).filter(b => b !== BiomeId.TOWN && b !== BiomeId.END);
 
   let totalWeight = 0;
@@ -156,126 +169,3 @@ export function getDailyStartingBiome(): BiomeId {
   // TODO: should this use `randSeedItem`?
   return biomes[randSeedInt(biomes.length)];
 }
-
-/**
- * If this is Daily Mode and the seed is longer than a default seed
- * then it has been modified and could contain a custom event seed. \
- * Default seeds are always exactly 24 characters.
- * @returns `true` if it is a Daily Event Seed.
- */
-export function isDailyEventSeed(seed: string): boolean {
-  return globalScene.gameMode.isDaily && seed.length > 24;
-}
-
-/**
- * Expects the seed to contain `/starters\d{18}/`
- * where the digits alternate between 4 digits for the species ID and 2 digits for the form index
- * (left padded with `0`s as necessary).
- * @returns An array of {@linkcode Starter}s, or `null` if no valid match.
- */
-export function getDailyEventSeedStarters(seed: string): Starter[] | null {
-  if (!isDailyEventSeed(seed)) {
-    return null;
-  }
-
-  const starters: Starter[] = [];
-  const match = /starters(\d{4})(\d{2})(\d{4})(\d{2})(\d{4})(\d{2})/g.exec(seed);
-
-  if (!match || match.length !== 7) {
-    return null;
-  }
-
-  for (let i = 1; i < match.length; i += 2) {
-    const speciesId = Number.parseInt(match[i]) as SpeciesId;
-    const formIndex = Number.parseInt(match[i + 1]);
-
-    if (!getEnumValues(SpeciesId).includes(speciesId)) {
-      console.warn("Invalid species ID used for custom daily run seed starter:", speciesId);
-      return null;
-    }
-
-    const starterForm = getPokemonSpeciesForm(speciesId, formIndex);
-    const startingLevel = globalScene.gameMode.getStartingLevel();
-    const starter = getDailyRunStarter(starterForm, startingLevel);
-    starters.push(starter);
-  }
-
-  return starters;
-}
-
-/**
- * Expects the seed to contain `/boss\d{4}\d{2}/`
- * where the first 4 digits are the species ID and the next 2 digits are the form index
- * (left padded with `0`s as necessary).
- * @returns A {@linkcode PokemonSpeciesForm} to be used for the boss, or `null` if no valid match.
- */
-export function getDailyEventSeedBoss(seed: string): PokemonSpeciesForm | null {
-  if (!isDailyEventSeed(seed)) {
-    return null;
-  }
-
-  const match = /boss(\d{4})(\d{2})/g.exec(seed);
-  if (!match || match.length !== 3) {
-    return null;
-  }
-
-  const speciesId = Number.parseInt(match[1]) as SpeciesId;
-  const formIndex = Number.parseInt(match[2]);
-
-  if (!getEnumValues(SpeciesId).includes(speciesId)) {
-    console.warn("Invalid species ID used for custom daily run seed boss:", speciesId);
-    return null;
-  }
-
-  const starterForm = getPokemonSpeciesForm(speciesId, formIndex);
-  return starterForm;
-}
-
-/**
- * Expects the seed to contain `/biome\d{2}/` where the 2 digits are a biome ID (left padded with `0` if necessary).
- * @returns The biome to use or `null` if no valid match.
- */
-export function getDailyEventSeedBiome(seed: string): BiomeId | null {
-  if (!isDailyEventSeed(seed)) {
-    return null;
-  }
-
-  const match = /biome(\d{2})/g.exec(seed);
-  if (!match || match.length !== 2) {
-    return null;
-  }
-
-  const startingBiome = Number.parseInt(match[1]) as BiomeId;
-
-  if (!getEnumValues(BiomeId).includes(startingBiome)) {
-    console.warn("Invalid biome ID used for custom daily run seed:", startingBiome);
-    return null;
-  }
-
-  return startingBiome;
-}
-
-/**
- * Expects the seed to contain `/luck\d{2}/` where the 2 digits are a number between `0` and `14`
- * (left padded with `0` if necessary).
- * @returns The custom luck value or `null` if no valid match.
- */
-export function getDailyEventSeedLuck(seed: string): number | null {
-  if (!isDailyEventSeed(seed)) {
-    return null;
-  }
-
-  const match = /luck(\d{2})/g.exec(seed);
-  if (!match || match.length !== 2) {
-    return null;
-  }
-
-  const luck = Number.parseInt(match[1]);
-
-  if (luck < 0 || luck > 14) {
-    console.warn("Invalid luck value used for custom daily run seed:", luck);
-    return null;
-  }
-
-  return luck;
-}

src/field/pokemon.ts

@@ -39,7 +39,6 @@ import {
   TrappedTag,
   TypeImmuneTag,
 } from "#data/battler-tags";
-import { getDailyEventSeedBoss } from "#data/daily-run";
 import { allAbilities, allMoves } from "#data/data-lists";
 import { getLevelTotalExp } from "#data/exp";
 import {
@@ -6273,11 +6272,6 @@ export class EnemyPokemon extends Pokemon {
       this.species.forms[Overrides.OPP_FORM_OVERRIDES[speciesId]]
     ) {
       this.formIndex = Overrides.OPP_FORM_OVERRIDES[speciesId];
-    } else if (globalScene.gameMode.isDaily && globalScene.gameMode.isWaveFinal(globalScene.currentBattle.waveIndex)) {
-      const eventBoss = getDailyEventSeedBoss(globalScene.seed);
-      if (!isNullOrUndefined(eventBoss)) {
-        this.formIndex = eventBoss.formIndex;
-      }
     }
 
     if (!dataSource) {

src/game-mode.ts

@@ -3,7 +3,7 @@ import { CHALLENGE_MODE_MYSTERY_ENCOUNTER_WAVES, CLASSIC_MODE_MYSTERY_ENCOUNTER_
 import { globalScene } from "#app/global-scene";
 import Overrides from "#app/overrides";
 import { allChallenges, type Challenge, copyChallenge } from "#data/challenge";
-import { getDailyEventSeedBoss, getDailyStartingBiome } from "#data/daily-run";
+import { getDailyStartingBiome } from "#data/daily-run";
 import { allSpecies } from "#data/data-lists";
 import type { PokemonSpecies } from "#data/pokemon-species";
 import { BiomeId } from "#enums/biome-id";
@@ -15,7 +15,6 @@ import type { Arena } from "#field/arena";
 import { classicFixedBattles, type FixedBattleConfigs } from "#trainers/fixed-battle-configs";
 import { applyChallenges } from "#utils/challenge-utils";
 import { BooleanHolder, isNullOrUndefined, randSeedInt, randSeedItem } from "#utils/common";
-import { getPokemonSpecies } from "#utils/pokemon-utils";
 import i18next from "i18next";
 
 interface GameModeConfig {
@@ -212,12 +211,6 @@ export class GameMode implements GameModeConfig {
 
   getOverrideSpecies(waveIndex: number): PokemonSpecies | null {
     if (this.isDaily && this.isWaveFinal(waveIndex)) {
-      const eventBoss = getDailyEventSeedBoss(globalScene.seed);
-      if (!isNullOrUndefined(eventBoss)) {
-        // Cannot set form index here, it will be overriden when adding it as enemy pokemon.
-        return getPokemonSpecies(eventBoss.speciesId);
-      }
-
       const allFinalBossSpecies = allSpecies.filter(
         s =>
           (s.subLegendary || s.legendary || s.mythical) &&

src/modifier/modifier-type.ts

@@ -6,7 +6,6 @@ import Overrides from "#app/overrides";
 import { EvolutionItem, pokemonEvolutions } from "#balance/pokemon-evolutions";
 import { tmPoolTiers, tmSpecies } from "#balance/tms";
 import { getBerryEffectDescription, getBerryName } from "#data/berry";
-import { getDailyEventSeedLuck } from "#data/daily-run";
 import { allMoves, modifierTypes } from "#data/data-lists";
 import { SpeciesFormChangeItemTrigger } from "#data/form-change-triggers";
 import { getNatureName, getNatureStatMultiplier } from "#data/nature";
@@ -2922,12 +2921,6 @@ export function getPartyLuckValue(party: Pokemon[]): number {
     const DailyLuck = new NumberHolder(0);
     globalScene.executeWithSeedOffset(
       () => {
-        const eventLuck = getDailyEventSeedLuck(globalScene.seed);
-        if (!isNullOrUndefined(eventLuck)) {
-          DailyLuck.value = eventLuck;
-          return;
-        }
-
         DailyLuck.value = randSeedInt(15); // Random number between 0 and 14
       },
       0,
@@ -2935,7 +2928,6 @@ export function getPartyLuckValue(party: Pokemon[]): number {
     );
     return DailyLuck.value;
   }
-
   const eventSpecies = timedEventManager.getEventLuckBoostedSpecies();
   const luck = Phaser.Math.Clamp(
     party