Merge 2c3af4143c into 1ff2701964

src/data/mystery-encounters/encounters/a-trainers-test-encounter.ts

@@ -164,8 +164,8 @@ export const ATrainersTestEncounter: MysteryEncounter = MysteryEncounterBuilder.
       encounter.setDialogueToken("eggType", i18next.t(`${namespace}:eggTypes.epic`));
       setEncounterRewards(
         {
-          guaranteedModifierTypeFuncs: [modifierTypes.SACRED_ASH],
+          guaranteedModifierTypeFuncs: [modifierTypes.RELIC_GOLD],
-          guaranteedModifierTiers: [ModifierTier.ROGUE, ModifierTier.ULTRA],
+          guaranteedModifierTiers: [ModifierTier.ROGUE, ModifierTier.ROGUE],
           fillRemaining: true,
         },
         [eggOptions],

src/data/mystery-encounters/encounters/dark-deal-encounter.ts

@@ -26,12 +26,8 @@ const namespace = "mysteryEncounters/darkDeal";
 
 /** Exclude Ultra Beasts (inludes Cosmog/Solgaleo/Lunala/Necrozma), Paradox (includes Miraidon/Koraidon), Eternatus, and Mythicals */
 const excludedBosses = [
-  SpeciesId.NECROZMA,
-  SpeciesId.COSMOG,
-  SpeciesId.COSMOEM,
-  SpeciesId.SOLGALEO,
-  SpeciesId.LUNALA,
   SpeciesId.ETERNATUS,
+  /** UBs */
   SpeciesId.NIHILEGO,
   SpeciesId.BUZZWOLE,
   SpeciesId.PHEROMOSA,
@@ -43,6 +39,12 @@ const excludedBosses = [
   SpeciesId.NAGANADEL,
   SpeciesId.STAKATAKA,
   SpeciesId.BLACEPHALON,
+  SpeciesId.COSMOG,
+  SpeciesId.COSMOEM,
+  SpeciesId.SOLGALEO,
+  SpeciesId.LUNALA,
+  SpeciesId.NECROZMA,
+  /** Paradox */
   SpeciesId.GREAT_TUSK,
   SpeciesId.SCREAM_TAIL,
   SpeciesId.BRUTE_BONNET,
@@ -50,10 +52,10 @@ const excludedBosses = [
   SpeciesId.SLITHER_WING,
   SpeciesId.SANDY_SHOCKS,
   SpeciesId.ROARING_MOON,
-  SpeciesId.KORAIDON,
   SpeciesId.WALKING_WAKE,
   SpeciesId.GOUGING_FIRE,
   SpeciesId.RAGING_BOLT,
+  SpeciesId.KORAIDON,
   SpeciesId.IRON_TREADS,
   SpeciesId.IRON_BUNDLE,
   SpeciesId.IRON_HANDS,
@@ -61,22 +63,23 @@ const excludedBosses = [
   SpeciesId.IRON_MOTH,
   SpeciesId.IRON_THORNS,
   SpeciesId.IRON_VALIANT,
-  SpeciesId.MIRAIDON,
   SpeciesId.IRON_LEAVES,
   SpeciesId.IRON_BOULDER,
   SpeciesId.IRON_CROWN,
+  SpeciesId.MIRAIDON,
+  /** Mythical */
   SpeciesId.MEW,
   SpeciesId.CELEBI,
-  SpeciesId.DEOXYS,
   SpeciesId.JIRACHI,
-  SpeciesId.DARKRAI,
+  SpeciesId.DEOXYS,
   SpeciesId.PHIONE,
   SpeciesId.MANAPHY,
-  SpeciesId.ARCEUS,
+  SpeciesId.DARKRAI,
   SpeciesId.SHAYMIN,
+  SpeciesId.ARCEUS,
   SpeciesId.VICTINI,
-  SpeciesId.MELOETTA,
   SpeciesId.KELDEO,
+  SpeciesId.MELOETTA,
   SpeciesId.GENESECT,
   SpeciesId.DIANCIE,
   SpeciesId.HOOPA,
@@ -84,9 +87,9 @@ const excludedBosses = [
   SpeciesId.MAGEARNA,
   SpeciesId.MARSHADOW,
   SpeciesId.ZERAORA,
-  SpeciesId.ZARUDE,
   SpeciesId.MELTAN,
   SpeciesId.MELMETAL,
+  SpeciesId.ZARUDE,
   SpeciesId.PECHARUNT,
 ];
 

src/data/mystery-encounters/encounters/trash-to-treasure-encounter.ts

@@ -8,7 +8,6 @@ import {
   transitionMysteryEncounterIntroVisuals,
 } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import type { PokemonHeldItemModifierType } from "#app/modifier/modifier-type";
-import { modifierTypes } from "#app/data/data-lists";
 import { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import { globalScene } from "#app/global-scene";
 import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter";
@@ -22,6 +21,7 @@ import { applyModifierTypeToPlayerPokemon } from "#app/data/mystery-encounters/u
 import { showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
 import i18next from "#app/plugins/i18n";
 import { ModifierTier } from "#enums/modifier-tier";
+import { modifierTypes } from "#app/data/data-lists";
 import { getPokemonSpecies } from "#app/utils/pokemon-utils";
 import { MoveId } from "#enums/move-id";
 import { BattlerIndex } from "#enums/battler-index";
@@ -200,7 +200,8 @@ export const TrashToTreasureEncounter: MysteryEncounter = MysteryEncounterBuilde
         const encounter = globalScene.currentBattle.mysteryEncounter!;
 
         setEncounterRewards({
-          guaranteedModifierTiers: [ModifierTier.ROGUE, ModifierTier.ROGUE, ModifierTier.ULTRA, ModifierTier.GREAT],
+          guaranteedModifierTypeFuncs: [modifierTypes.LEFTOVERS],
+          guaranteedModifierTiers: [ModifierTier.ROGUE, ModifierTier.ULTRA, ModifierTier.GREAT],
           fillRemaining: true,
         });
         encounter.startOfBattleEffects.push(

src/data/mystery-encounters/encounters/weird-dream-encounter.ts

@@ -50,6 +50,7 @@ const namespace = "mysteryEncounters/weirdDream";
 
 /** Exclude Ultra Beasts, Paradox, Eternatus, and all legendary/mythical/trio pokemon that are below 570 BST */
 const EXCLUDED_TRANSFORMATION_SPECIES = [
+  SpeciesId.ARCEUS,
   SpeciesId.ETERNATUS,
   /** UBs */
   SpeciesId.NIHILEGO,
@@ -85,20 +86,19 @@ const EXCLUDED_TRANSFORMATION_SPECIES = [
   SpeciesId.IRON_BOULDER,
   SpeciesId.IRON_CROWN,
   /** These are banned so they don't appear in the < 570 BST pool */
+  SpeciesId.PHIONE,
+  SpeciesId.TYPE_NULL,
   SpeciesId.COSMOG,
+  SpeciesId.COSMOEM,
   SpeciesId.MELTAN,
   SpeciesId.KUBFU,
-  SpeciesId.COSMOEM,
-  SpeciesId.POIPOLE,
-  SpeciesId.TERAPAGOS,
-  SpeciesId.TYPE_NULL,
-  SpeciesId.CALYREX,
-  SpeciesId.NAGANADEL,
   SpeciesId.URSHIFU,
+  SpeciesId.CALYREX,
   SpeciesId.OGERPON,
   SpeciesId.OKIDOGI,
   SpeciesId.MUNKIDORI,
   SpeciesId.FEZANDIPITI,
+  SpeciesId.TERAPAGOS,
 ];
 
 const SUPER_LEGENDARY_BST_THRESHOLD = 600;
@@ -231,6 +231,7 @@ export const WeirdDreamEncounter: MysteryEncounter = MysteryEncounterBuilder.wit
             modifierTypes.MINT,
             modifierTypes.MINT,
             modifierTypes.MINT,
+            modifierTypes.MINT,
           ],
           fillRemaining: false,
         });

test/mystery-encounter/encounters/weird-dream-encounter.test.ts

@@ -147,12 +147,13 @@ describe("Weird Dream - Mystery Encounter", () => {
       const modifierSelectHandler = scene.ui.handlers.find(
         h => h instanceof ModifierSelectUiHandler,
       ) as ModifierSelectUiHandler;
-      expect(modifierSelectHandler.options.length).toEqual(5);
+      expect(modifierSelectHandler.options.length).toEqual(6);
       expect(modifierSelectHandler.options[0].modifierTypeOption.type.id).toEqual("MEMORY_MUSHROOM");
       expect(modifierSelectHandler.options[1].modifierTypeOption.type.id).toEqual("ROGUE_BALL");
       expect(modifierSelectHandler.options[2].modifierTypeOption.type.id).toEqual("MINT");
       expect(modifierSelectHandler.options[3].modifierTypeOption.type.id).toEqual("MINT");
-      expect(modifierSelectHandler.options[3].modifierTypeOption.type.id).toEqual("MINT");
+      expect(modifierSelectHandler.options[4].modifierTypeOption.type.id).toEqual("MINT");
+      expect(modifierSelectHandler.options[5].modifierTypeOption.type.id).toEqual("MINT");
     });
 
     it("should leave encounter without battle", async () => {