update tests, bug fix MEs, and sprite assets

public/images/mystery-encounters/global_trade_system.json

@@ -1,11 +1,11 @@
 {
 	"textures": [
 		{
-			"image": "girawitch.png",
+			"image": "global_trade_system.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 46,
+				"w": 77,
-				"h": 76
+				"h": 78
 			},
 			"scale": 1,
 			"frames": [
@@ -14,20 +14,20 @@
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 46,
+						"w": 77,
-						"h": 76
+						"h": 78
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 46,
+						"w": 77,
-						"h": 76
+						"h": 78
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 46,
+						"w": 77,
-						"h": 76
+						"h": 78
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:e68bbc186f511d505c53b2beec3c3741:7108795fc29d953a1d3729ad93d70936:1661aeeeb2f0e4561c644aff254770b3$"
+		"smartupdate": "$TexturePacker:SmartUpdate:8a51d7a17b3d8c32f0e5e4a0f15daeb4:6eba29c5345847f735d8b69a05fc49d1:98ad8b8b8d8c4865d7d23ec97b516594$"
 	}
 }

public/images/mystery-encounters/warehouse_crate.json

@@ -1,33 +1,33 @@
 {
 	"textures": [
 		{
-			"image": "gts_placeholder.png",
+			"image": "warehouse_crate.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 47,
+				"w": 71,
-				"h": 79
+				"h": 52
 			},
 			"scale": 1,
 			"frames": [
 				{
-					"filename": "0000.png",
+					"filename": "0001.png",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
 						"w": 80,
-						"h": 80
+						"h": 56
 					},
 					"spriteSourceSize": {
-						"x": 17,
+						"x": 5,
-						"y": 1,
+						"y": 4,
-						"w": 47,
+						"w": 71,
-						"h": 79
+						"h": 52
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 47,
+						"w": 71,
-						"h": 79
+						"h": 52
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:4e95cf5cd2b0329629c40dfe871e5ae0:cf1cd6aef867fcde2439177ebb561178:39ec800be807afcf5dd13b9cc59fc386$"
+		"smartupdate": "$TexturePacker:SmartUpdate:c8df5f0b35fb9c2a69b0e4aaa9fa9f91:f1d4643c26f2aed86ad77d354e669aaf:0c073e3c2048ea0779db9429e5e1d8bc$"
 	}
 }

public/images/mystery-encounters/weird_dream_woman.json

@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "weird_dream_woman.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 78,
+				"h": 87
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 80,
+						"h": 87
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 0,
+						"w": 78,
+						"h": 87
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 78,
+						"h": 87
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:d3cce87ee0e3a880d840bffe9373d5d4:7c776d33b75abad1fe36b14a5e5734af:56468b7a2883e66dadcd2af13ebd8010$"
+	}
+}

src/battle-scene.ts

@@ -1170,8 +1170,7 @@ export default class BattleScene extends SceneBase {
 
       // Check for mystery encounter
       // Can only occur in place of a standard (non-boss) wild battle, waves 10-180
-      const highestMysteryEncounterWave = this.gameMode.maxMysteryEncounterWave;
+      const [lowestMysteryEncounterWave, highestMysteryEncounterWave] = this.gameMode.getMysteryEncounterLegalWaves();
-      const lowestMysteryEncounterWave = this.gameMode.minMysteryEncounterWave;
       if (this.gameMode.hasMysteryEncounters && newBattleType === BattleType.WILD && !this.gameMode.isBoss(newWaveIndex) && newWaveIndex < highestMysteryEncounterWave && newWaveIndex > lowestMysteryEncounterWave) {
         const roll = Utils.randSeedInt(MYSTERY_ENCOUNTER_SPAWN_MAX_WEIGHT);
 
@@ -2923,6 +2922,7 @@ export default class BattleScene extends SceneBase {
           }
         }
 
+        console.log("shiftPhase from initFinalBossPhaseTwo");
         this.shiftPhase();
       });
       return;
@@ -3104,6 +3104,10 @@ export default class BattleScene extends SceneBase {
           if (encounterCandidate.encounterTier !== tier) { // Encounter is in tier
             return false;
           }
+          const disabledModes = encounterCandidate.disabledGameModes;
+          if (disabledModes && disabledModes.length > 0 && disabledModes.includes(this.gameMode.modeId)) { // Encounter is enabled for game mode
+            return false;
+          }
           if (!encounterCandidate.meetsRequirements!(this)) { // Meets encounter requirements
             return false;
           }

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

@@ -266,7 +266,7 @@ async function tryGiveBerry(scene: BattleScene, prioritizedPokemon?: PlayerPokem
 
     if (!heldBerriesOfType || heldBerriesOfType.getStackCount() < heldBerriesOfType.getMaxStackCount(scene)) {
       await applyModifierTypeToPlayerPokemon(scene, pokemon, berry);
-      break;
+      return;
     }
   }
 }

src/data/mystery-encounters/encounters/bug-type-superfan-encounter.ts

@@ -424,7 +424,7 @@ export const BugTypeSuperfanEncounter: MysteryEncounter =
         scene.updateModifiers(true, true);
 
         const bugNet = generateModifierTypeOption(scene, modifierTypes.MYSTERY_ENCOUNTER_GOLDEN_BUG_NET)!;
-        bugNet.type.tier = ModifierTier.MASTER;
+        bugNet.type.tier = ModifierTier.ROGUE;
 
         setEncounterRewards(scene, { guaranteedModifierTypeOptions: [bugNet], guaranteedModifierTypeFuncs: [modifierTypes.REVIVER_SEED], fillRemaining: false });
         leaveEncounterWithoutBattle(scene, true);

src/data/mystery-encounters/encounters/clowning-around-encounter.ts

@@ -29,6 +29,7 @@ import { Moves } from "#enums/moves";
 import { EncounterAnim, EncounterBattleAnim } from "#app/data/battle-anims";
 import { MoveCategory } from "#app/data/move";
 import { MysteryEncounterPokemonData } from "#app/data/mystery-encounters/mystery-encounter-pokemon-data";
+import { GameModes } from "#app/game-mode";
 
 /** the i18n namespace for the encounter */
 const namespace = "mysteryEncounter:clowningAround";
@@ -59,6 +60,7 @@ const RANDOM_ABILITY_POOL = [
 export const ClowningAroundEncounter: MysteryEncounter =
   MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.CLOWNING_AROUND)
     .withEncounterTier(MysteryEncounterTier.ULTRA)
+    .withDisabledGameModes(GameModes.CHALLENGE)
     .withSceneWaveRangeRequirement(80, 180)
     .withAnimations(EncounterAnim.SMOKESCREEN)
     .withAutoHideIntroVisuals(false)

src/data/mystery-encounters/encounters/global-trade-system-encounter.ts

@@ -19,7 +19,7 @@ import PokemonData from "#app/system/pokemon-data";
 import i18next from "i18next";
 import { Gender, getGenderSymbol } from "#app/data/gender";
 import { getNatureName } from "#app/data/nature";
-import { getPokeballAtlasKey, getPokeballTintColor } from "#app/data/pokeball";
+import { getPokeballAtlasKey, getPokeballTintColor, PokeballType } from "#app/data/pokeball";
 import { getEncounterText, showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
 import { trainerNamePools } from "#app/data/trainer-names";
 
@@ -74,10 +74,13 @@ export const GlobalTradeSystemEncounter: MysteryEncounter =
     .withAutoHideIntroVisuals(false)
     .withIntroSpriteConfigs([
       {
-        spriteKey: "gts_placeholder",
+        spriteKey: "global_trade_system",
         fileRoot: "mystery-encounters",
-        hasShadow: false,
+        hasShadow: true,
-        disableAnimation: true
+        disableAnimation: true,
+        x: 3,
+        y: 5,
+        yShadow: 1
       }
     ])
     .withIntroDialogue([
@@ -92,11 +95,14 @@ export const GlobalTradeSystemEncounter: MysteryEncounter =
       const encounter = scene.currentBattle.mysteryEncounter!;
 
       // Load bgm
+      let bgmKey: string;
       if (scene.musicPreference === 0) {
-        scene.loadBgm("mystery_encounter_gen_5_gts", "mystery_encounter_gen_5_gts.mp3");
+        bgmKey = "mystery_encounter_gen_5_gts";
+        scene.loadBgm(bgmKey, `${bgmKey}.mp3`);
       } else {
         // Mixed option
-        scene.loadBgm("mystery_encounter_gen_6_gts", "mystery_encounter_gen_6_gts.mp3");
+        bgmKey = "mystery_encounter_gen_6_gts";
+        scene.loadBgm(bgmKey, `${bgmKey}.mp3`);
       }
 
       // Load possible trade options
@@ -104,7 +110,8 @@ export const GlobalTradeSystemEncounter: MysteryEncounter =
       // None of the trade options can be the same species
       const tradeOptionsMap: Map<number, EnemyPokemon[]> = getPokemonTradeOptions(scene);
       encounter.misc = {
-        tradeOptionsMap
+        tradeOptionsMap,
+        bgmKey
       };
 
       return true;
@@ -113,11 +120,7 @@ export const GlobalTradeSystemEncounter: MysteryEncounter =
       // Change the bgm
       scene.fadeOutBgm(1500, false);
       scene.time.delayedCall(1500, () => {
-        if (scene.musicPreference === 0) {
+        scene.playBgm(scene.currentBattle.mysteryEncounter!.misc.bgmKey);
-          scene.playBgm("mystery_encounter_gen_5_gts");
-        } else {
-          scene.playBgm("mystery_encounter_gen_6_gts");
-        }
       });
 
       return true;
@@ -147,17 +150,15 @@ export const GlobalTradeSystemEncounter: MysteryEncounter =
                   // Pokemon trade selected
                   encounter.setDialogueToken("tradedPokemon", pokemon.getNameToRender());
                   encounter.setDialogueToken("received", tradePokemon.getNameToRender());
-                  encounter.misc = {
+                  encounter.misc.tradedPokemon = pokemon;
-                    tradedPokemon: pokemon,
+                  encounter.misc.receivedPokemon = tradePokemon;
-                    receivedPokemon: tradePokemon,
-                  };
                   return true;
                 },
                 onHover: () => {
                   const formName = tradePokemon.species.forms?.[pokemon.formIndex]?.formName;
                   const line1 = i18next.t("pokemonInfoContainer:ability") + " " + tradePokemon.getAbility().name + (tradePokemon.getGender() !== Gender.GENDERLESS ? "     |     " + i18next.t("pokemonInfoContainer:gender") + " " + getGenderSymbol(tradePokemon.getGender()) : "");
                   const line2 = i18next.t("pokemonInfoContainer:nature") + " " + getNatureName(tradePokemon.getNature()) + (formName ? "     |     " + i18next.t("pokemonInfoContainer:form") + " " + formName : "");
-                  showEncounterText(scene, `${line1}\n${line2}`, 0);
+                  showEncounterText(scene, `${line1}\n${line2}`, 0, 0, false);
                 },
               };
               return option;
@@ -181,7 +182,8 @@ export const GlobalTradeSystemEncounter: MysteryEncounter =
 
           // Set data properly, then generate the new Pokemon's assets
           receivedPokemonData.passive = tradedPokemon.passive;
-          receivedPokemonData.pokeball = randSeedInt(5);
+          // Pokeball to Ultra ball, randomly
+          receivedPokemonData.pokeball = randInt(4) as PokeballType;
           const dataSource = new PokemonData(receivedPokemonData);
           const newPlayerPokemon = scene.addPlayerPokemon(receivedPokemonData.species, receivedPokemonData.level, dataSource.abilityIndex, dataSource.formIndex, dataSource.gender, dataSource.shiny, dataSource.variant, dataSource.ivs, dataSource.nature, dataSource);
           scene.getParty().push(newPlayerPokemon);
@@ -196,7 +198,7 @@ export const GlobalTradeSystemEncounter: MysteryEncounter =
           await showTradeBackground(scene);
           await doPokemonTradeSequence(scene, tradedPokemon, newPlayerPokemon);
           await showEncounterText(scene, `${namespace}.trade_received`, null, 0, true, 4000);
-          scene.playBgm("mystery_encounter_gts");
+          scene.playBgm(encounter.misc.bgmKey);
           await hideTradeBackground(scene);
           tradedPokemon.destroy();
 
@@ -241,10 +243,8 @@ export const GlobalTradeSystemEncounter: MysteryEncounter =
 
             encounter.setDialogueToken("tradedPokemon", pokemon.getNameToRender());
             encounter.setDialogueToken("received", tradePokemon.getNameToRender());
-            encounter.misc = {
+            encounter.misc.tradedPokemon = pokemon;
-              tradedPokemon: pokemon,
+            encounter.misc.receivedPokemon = tradePokemon;
-              receivedPokemon: tradePokemon,
-            };
           };
 
           return selectPokemonForOption(scene, onPokemonSelected);
@@ -264,7 +264,7 @@ export const GlobalTradeSystemEncounter: MysteryEncounter =
 
           // Set data properly, then generate the new Pokemon's assets
           receivedPokemonData.passive = tradedPokemon.passive;
-          receivedPokemonData.pokeball = randSeedInt(5);
+          receivedPokemonData.pokeball = randInt(4) as PokeballType;
           const dataSource = new PokemonData(receivedPokemonData);
           const newPlayerPokemon = scene.addPlayerPokemon(receivedPokemonData.species, receivedPokemonData.level, dataSource.abilityIndex, dataSource.formIndex, dataSource.gender, dataSource.shiny, dataSource.variant, dataSource.ivs, dataSource.nature, dataSource);
           scene.getParty().push(newPlayerPokemon);
@@ -279,7 +279,7 @@ export const GlobalTradeSystemEncounter: MysteryEncounter =
           await showTradeBackground(scene);
           await doPokemonTradeSequence(scene, tradedPokemon, newPlayerPokemon);
           await showEncounterText(scene, `${namespace}.trade_received`, null, 0, true, 4000);
-          scene.playBgm("mystery_encounter_gts");
+          scene.playBgm(scene.currentBattle.mysteryEncounter!.misc.bgmKey);
           await hideTradeBackground(scene);
           tradedPokemon.destroy();
 
@@ -309,9 +309,7 @@ export const GlobalTradeSystemEncounter: MysteryEncounter =
                 handler: () => {
                   // Pokemon and item selected
                   encounter.setDialogueToken("chosenItem", modifier.type.name);
-                  encounter.misc = {
+                  encounter.misc.chosenModifier = modifier;
-                    chosenModifier: modifier,
-                  };
                   return true;
                 },
               };

src/data/mystery-encounters/encounters/part-timer-encounter.ts

@@ -25,19 +25,19 @@ export const PartTimerEncounter: MysteryEncounter =
     .withEncounterTier(MysteryEncounterTier.COMMON)
     .withSceneWaveRangeRequirement(10, 180)
     .withIntroSpriteConfigs([
+      {
+        spriteKey: "warehouse_crate",
+        fileRoot: "mystery-encounters",
+        hasShadow: false,
+        y: 6,
+        x: 15
+      },
       {
         spriteKey: "worker_f",
         fileRoot: "trainer",
         hasShadow: true,
-        x: -20
+        x: -18,
-      },
+        y: 4
-      {
-        spriteKey: "training_gear",
-        fileRoot: "mystery-encounters",
-        hasShadow: true,
-        y: 6,
-        x: 20,
-        yShadow: -2
       }
     ])
     .withAutoHideIntroVisuals(false)

src/data/mystery-encounters/encounters/the-winstrate-challenge-encounter.ts

@@ -1,4 +1,4 @@
-import { EnemyPartyConfig, generateModifierType, initBattleWithEnemyConfig, leaveEncounterWithoutBattle, setEncounterRewards, transitionMysteryEncounterIntroVisuals, } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import { EnemyPartyConfig, generateModifierType, generateModifierTypeOption, initBattleWithEnemyConfig, leaveEncounterWithoutBattle, setEncounterRewards, transitionMysteryEncounterIntroVisuals, } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import { modifierTypes, PokemonHeldItemModifierType } from "#app/modifier/modifier-type";
 import { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import BattleScene from "#app/battle-scene";
@@ -21,6 +21,7 @@ import { PartyHealPhase } from "#app/phases/party-heal-phase";
 import { ShowTrainerPhase } from "#app/phases/show-trainer-phase";
 import { ReturnPhase } from "#app/phases/return-phase";
 import i18next from "i18next";
+import { ModifierTier } from "#app/modifier/modifier-tier";
 
 /** the i18n namespace for the encounter */
 const namespace = "mysteryEncounter:theWinstrateChallenge";
@@ -149,9 +150,12 @@ async function spawnNextTrainerOrEndEncounter(scene: BattleScene) {
     await showEncounterText(scene, i18next.t("battle:rewardGain", { modifierName: newModifier?.type.name }));
 
     await showEncounterDialogue(scene, `${namespace}.victory_2`, `${namespace}.speaker`);
-    setEncounterRewards(scene, { guaranteedModifierTypeFuncs: [modifierTypes.MYSTERY_ENCOUNTER_MACHO_BRACE], fillRemaining: false });
+    scene.ui.clearText(); // Clears "Winstrate" title from screen as rewards get animated in
+    const machoBrace = generateModifierTypeOption(scene, modifierTypes.MYSTERY_ENCOUNTER_MACHO_BRACE)!;
+    machoBrace.type.tier = ModifierTier.MASTER;
+    setEncounterRewards(scene, { guaranteedModifierTypeOptions: [machoBrace], fillRemaining: false });
     encounter.doContinueEncounter = undefined;
-    leaveEncounterWithoutBattle(scene, false, MysteryEncounterMode.TRAINER_BATTLE);
+    leaveEncounterWithoutBattle(scene, false, MysteryEncounterMode.NO_BATTLE);
   } else {
     await initBattleWithEnemyConfig(scene, nextConfig);
   }

src/data/mystery-encounters/encounters/training-session-encounter.ts

@@ -305,7 +305,7 @@ export const TrainingSessionEncounter: MysteryEncounter =
                     return true;
                   },
                   onHover: () => {
-                    showEncounterText(scene, ability.description, 0);
+                    showEncounterText(scene, ability.description, 0, 0, false);
                   },
                 };
                 optionSelectItems.push(option);

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

@@ -53,16 +53,15 @@ export const UncommonBreedEncounter: MysteryEncounter =
       const species = scene.arena.randomSpecies(scene.currentBattle.waveIndex, level, 0, getPartyLuckValue(scene.getParty()), true);
       const pokemon = new EnemyPokemon(scene, species, level, TrainerSlot.NONE, true);
       const speciesRootForm = pokemon.species.getRootSpeciesId();
-      encounter.misc = {
-        pokemon
-      };
 
       // Pokemon will always have one of its egg moves in its moveset
       if (speciesEggMoves.hasOwnProperty(speciesRootForm)) {
         const eggMoves: Moves[] = speciesEggMoves[speciesRootForm];
         const eggMoveIndex = randSeedInt(4);
         const randomEggMove: Moves = eggMoves[eggMoveIndex];
-        encounter.misc.eggMove = randomEggMove;
+        encounter.misc = {
+          eggMove: randomEggMove
+        };
         if (pokemon.moveset.length < 4) {
           pokemon.moveset.push(new PokemonMove(randomEggMove));
         } else {
@@ -70,6 +69,8 @@ export const UncommonBreedEncounter: MysteryEncounter =
         }
       }
 
+      encounter.misc.pokemon = pokemon;
+
       const config: EnemyPartyConfig = {
         pokemonConfigs: [{
           level: level,
@@ -184,7 +185,7 @@ export const UncommonBreedEncounter: MysteryEncounter =
               berryItems.splice(index, 1);
             }
           }
-          scene.updateModifiers(true, true);
+          await scene.updateModifiers(true, true);
 
           // Pokemon joins the team, with 2 egg moves
           const encounter = scene.currentBattle.mysteryEncounter!;

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

@@ -20,6 +20,7 @@ import i18next from "#app/plugins/i18n";
 import { doPokemonTransformationSequence, TransformationScreenPosition } from "#app/data/mystery-encounters/utils/encounter-transformation-sequence";
 import { getLevelTotalExp } from "#app/data/exp";
 import { Stat } from "#enums/stat";
+import { GameModes } from "#app/game-mode";
 
 /** i18n namespace for encounter */
 const namespace = "mysteryEncounter:weirdDream";
@@ -94,13 +95,16 @@ const STANDARD_BST_TRANSFORM_BASE_VALUES = [40, 50];
 export const WeirdDreamEncounter: MysteryEncounter =
   MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.WEIRD_DREAM)
     .withEncounterTier(MysteryEncounterTier.ROGUE)
+    .withDisabledGameModes(GameModes.CHALLENGE)
     .withSceneWaveRangeRequirement(10, 180)
     .withIntroSpriteConfigs([
       {
-        spriteKey: "girawitch",
+        spriteKey: "weird_dream_woman",
         fileRoot: "mystery-encounters",
-        hasShadow: false,
+        hasShadow: true,
-        y: 4
+        y: 11,
+        yShadow: 6,
+        x: 4
       },
     ])
     .withIntroDialogue([

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

@@ -14,6 +14,7 @@ import { EncounterAnim } from "#app/data/battle-anims";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
 import { MysteryEncounterMode } from "#enums/mystery-encounter-mode";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
+import { GameModes } from "#app/game-mode";
 
 export interface EncounterStartOfBattleEffect {
   sourcePokemon?: Pokemon;
@@ -36,6 +37,7 @@ export interface IMysteryEncounter {
   spriteConfigs: MysteryEncounterSpriteConfig[];
   encounterTier: MysteryEncounterTier;
   encounterAnimations?: EncounterAnim[];
+  disabledGameModes?: GameModes[];
   hideBattleIntroMessage: boolean;
   autoHideIntroVisuals: boolean;
   enterIntroVisualsFromRight: boolean;
@@ -85,6 +87,10 @@ export default class MysteryEncounter implements IMysteryEncounter {
    * Specify here so that assets are loaded on initialization of encounter
    */
   encounterAnimations?: EncounterAnim[];
+  /**
+   * If specified, defines any game modes where the MysteryEncounter should *NOT* spawn
+   */
+  disabledGameModes?: GameModes[];
   /**
    * If true, hides "A Wild X Appeared" etc. messages
    * Default true
@@ -630,6 +636,16 @@ export class MysteryEncounterBuilder implements Partial<IMysteryEncounter> {
     return Object.assign(this, { encounterAnimations: animations });
   }
 
+  /**
+   * Defines any game modes where the Mystery Encounter should *NOT* spawn
+   * @returns
+   * @param disabledGameModes
+   */
+  withDisabledGameModes(...disabledGameModes: GameModes[]): this & Required<Pick<IMysteryEncounter, "disabledGameModes">> {
+    const gameModes = Array.isArray(disabledGameModes) ? disabledGameModes : [disabledGameModes];
+    return Object.assign(this, { disabledGameModes: gameModes });
+  }
+
   /**
    * If true, encounter will continuously run through multiple battles/puzzles/etc. instead of going to next wave
    * MUST EVENTUALLY BE DISABLED TO CONTINUE TO NEXT WAVE

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

@@ -456,7 +456,7 @@ export function selectPokemonForOption(scene: BattleScene, onPokemonSelected: (p
                   return true;
                 },
                 onHover: () => {
-                  showEncounterText(scene, i18next.t("mysteryEncounterMessages:cancel_option"), 0);
+                  showEncounterText(scene, i18next.t("mysteryEncounterMessages:cancel_option"), 0, 0, false);
                 }
               });
 
@@ -570,7 +570,7 @@ export function selectOptionThenPokemon(scene: BattleScene, options: OptionSelec
         if (onHoverOverCancelOption) {
           onHoverOverCancelOption();
         }
-        scene.ui.showText(i18next.t("mysteryEncounterMessages:cancel_option"));
+        showEncounterText(scene, i18next.t("mysteryEncounterMessages:cancel_option"), 0, 0, false);
       }
     });
 

src/game-mode.ts

@@ -30,10 +30,12 @@ interface GameModeConfig {
   isSplicedOnly?: boolean;
   isChallenge?: boolean;
   hasMysteryEncounters?: boolean;
-  minMysteryEncounterWave?: number;
-  maxMysteryEncounterWave?: number;
 }
 
+// Describes min and max waves for MEs in specific game modes
+const CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES: [number, number] = [10, 180];
+const CHALLENGE_MODE_MYSTERY_ENCOUNTER_WAVES: [number, number] = [10, 180];
+
 export class GameMode implements GameModeConfig {
   public modeId: GameModes;
   public isClassic: boolean;
@@ -60,8 +62,6 @@ export class GameMode implements GameModeConfig {
       this.challenges = allChallenges.map(c => copyChallenge(c));
     }
     this.battleConfig = battleConfig || {};
-    this.minMysteryEncounterWave = this.minMysteryEncounterWave ?? 0;
-    this.maxMysteryEncounterWave = this.maxMysteryEncounterWave ?? 100000;
   }
 
   /**
@@ -325,6 +325,17 @@ export class GameMode implements GameModeConfig {
     }
   }
 
+  getMysteryEncounterLegalWaves(): [number, number] {
+    switch (this.modeId) {
+    default:
+      return [0, 0];
+    case GameModes.CLASSIC:
+      return CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES;
+    case GameModes.CHALLENGE:
+      return CHALLENGE_MODE_MYSTERY_ENCOUNTER_WAVES;
+    }
+  }
+
   static getModeName(modeId: GameModes): string {
     switch (modeId) {
     case GameModes.CLASSIC:
@@ -344,7 +355,7 @@ export class GameMode implements GameModeConfig {
 export function getGameMode(gameMode: GameModes): GameMode {
   switch (gameMode) {
   case GameModes.CLASSIC:
-    return new GameMode(GameModes.CLASSIC, { isClassic: true, hasTrainers: true, hasMysteryEncounters: true, maxMysteryEncounterWave: 180, minMysteryEncounterWave: 10 }, classicFixedBattles);
+    return new GameMode(GameModes.CLASSIC, { isClassic: true, hasTrainers: true, hasMysteryEncounters: true }, classicFixedBattles);
   case GameModes.ENDLESS:
     return new GameMode(GameModes.ENDLESS, { isEndless: true, hasShortBiomes: true, hasRandomBosses: true });
   case GameModes.SPLICED_ENDLESS:
@@ -352,6 +363,6 @@ export function getGameMode(gameMode: GameModes): GameMode {
   case GameModes.DAILY:
     return new GameMode(GameModes.DAILY, { isDaily: true, hasTrainers: true, hasNoShop: true });
   case GameModes.CHALLENGE:
-    return new GameMode(GameModes.CHALLENGE, { isClassic: true, hasTrainers: true, isChallenge: true }, classicFixedBattles);
+    return new GameMode(GameModes.CHALLENGE, { isClassic: true, hasTrainers: true, isChallenge: true, hasMysteryEncounters: true }, classicFixedBattles);
   }
 }

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

@@ -36,6 +36,7 @@ describe("Berries Abound - Mystery Encounter", () => {
     game = new GameManager(phaserGame);
     scene = game.scene;
     game.override.mysteryEncounterChance(100);
+    game.override.mysteryEncounterTier(MysteryEncounterTier.COMMON);
     game.override.startingWave(defaultWave);
     game.override.startingBiome(defaultBiome);
     game.override.disableTrainerWaves();
@@ -132,7 +133,7 @@ describe("Berries Abound - Mystery Encounter", () => {
       expect(enemyField[0].species.speciesId).toBe(speciesToSpawn);
     });
 
-    it("should reward the player with X berries based on wave", async () => {
+    it("should reward the player with X berries based on wave", { retry: 5 }, async () => {
       await game.runToMysteryEncounter(MysteryEncounterType.BERRIES_ABOUND, defaultParty);
 
       const numBerries = game.scene.currentBattle.mysteryEncounter!.misc.numBerries;

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

@@ -12,6 +12,7 @@ import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
 import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils";
 import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import { generateModifierType } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases";
 import { CommandPhase } from "#app/phases/command-phase";
 import { UncommonBreedEncounter } from "#app/data/mystery-encounters/encounters/uncommon-breed-encounter";
@@ -22,7 +23,6 @@ import { BerryType } from "#enums/berry-type";
 import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase";
 import { Stat } from "#enums/stat";
 import { BerryModifier } from "#app/modifier/modifier";
-import { generateModifierType } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import { modifierTypes } from "#app/modifier/modifier-type";
 
 const namespace = "mysteryEncounter:uncommonBreed";
@@ -43,6 +43,7 @@ describe("Uncommon Breed - Mystery Encounter", () => {
     game = new GameManager(phaserGame);
     scene = game.scene;
     game.override.mysteryEncounterChance(100);
+    game.override.mysteryEncounterTier(MysteryEncounterTier.COMMON);
     game.override.startingWave(defaultWave);
     game.override.startingBiome(defaultBiome);
     game.override.disableTrainerWaves();
@@ -166,12 +167,13 @@ describe("Uncommon Breed - Mystery Encounter", () => {
       });
     });
 
-    it("should NOT be selectable if the player doesn't have enough berries", async () => {
+    it("should NOT be selectable if the player doesn't have enough berries", { retry: 5 }, async () => {
       await game.runToMysteryEncounter(MysteryEncounterType.UNCOMMON_BREED, defaultParty);
       // Clear out any pesky mods that slipped through test spin-up
       scene.modifiers.forEach(mod => {
         scene.removeModifier(mod);
       });
+      await scene.updateModifiers(true);
       await game.phaseInterceptor.to(MysteryEncounterPhase, false);
 
       const encounterPhase = scene.getCurrentPhase();