add unit tests for Winstrate Challenge

AsdarDevelops · Aug 19, 2024 · 6481123 · 6481123
1 parent 8826183
commit 6481123
Show file tree

Hide file tree

Showing 8 changed files with 397 additions and 8 deletions.
diff --git a/src/data/mystery-encounters/encounters/a-trainers-test-encounter.ts b/src/data/mystery-encounters/encounters/a-trainers-test-encounter.ts
@@ -178,7 +178,7 @@ export const ATrainersTestEncounter: MysteryEncounter =
     )
     .withOutroDialogue([
       {
-        text: `${namespace}:outro`,
+        text: `${namespace}.outro`,
       },
     ])
     .build();
diff --git a/src/data/mystery-encounters/encounters/delibirdy-encounter.ts b/src/data/mystery-encounters/encounters/delibirdy-encounter.ts
@@ -169,7 +169,7 @@ export const DelibirdyEncounter: MysteryEncounter =
             // If pokemon meets primary pokemon reqs, it can be selected
             const meetsReqs = encounter.options[1].pokemonMeetsPrimaryRequirements(scene, pokemon);
             if (!meetsReqs) {
-              return getEncounterText(scene, `${namespace}:invalid_selection`);
+              return getEncounterText(scene, `${namespace}.invalid_selection`);
             }
 
             return null;

diff --git a/src/data/mystery-encounters/encounters/part-timer-encounter.ts b/src/data/mystery-encounters/encounters/part-timer-encounter.ts
@@ -115,7 +115,7 @@ export const PartTimerEncounter: MysteryEncounter =
         // Only Pokemon non-KOd pokemon can be selected
         const selectableFilter = (pokemon: Pokemon) => {
           if (!pokemon.isAllowedInBattle()) {
-            return getEncounterText(scene, `${namespace}:invalid_selection`);
+            return getEncounterText(scene, `${namespace}.invalid_selection`);
           }
 
           return null;
@@ -194,7 +194,7 @@ export const PartTimerEncounter: MysteryEncounter =
         // Only Pokemon non-KOd pokemon can be selected
         const selectableFilter = (pokemon: Pokemon) => {
           if (!pokemon.isAllowedInBattle()) {
-            return getEncounterText(scene, `${namespace}:invalid_selection`);
+            return getEncounterText(scene, `${namespace}.invalid_selection`);
           }
 
           return null;

diff --git a/src/data/mystery-encounters/encounters/shady-vitamin-dealer-encounter.ts b/src/data/mystery-encounters/encounters/shady-vitamin-dealer-encounter.ts
@@ -95,7 +95,7 @@ export const ShadyVitaminDealerEncounter: MysteryEncounter =
             // If pokemon meets primary pokemon reqs, it can be selected
             const meetsReqs = encounter.pokemonMeetsPrimaryRequirements(scene, pokemon);
             if (!meetsReqs) {
-              return getEncounterText(scene, `${namespace}:invalid_selection`);
+              return getEncounterText(scene, `${namespace}.invalid_selection`);
             }
 
             return null;

diff --git a/src/data/mystery-encounters/encounters/the-winstrate-challenge-encounter.ts b/src/data/mystery-encounters/encounters/the-winstrate-challenge-encounter.ts
@@ -118,7 +118,7 @@ export const TheWinstrateChallengeEncounter: MysteryEncounter =
         buttonTooltip: `${namespace}.option.2.tooltip`,
         selected: [
           {
-            speaker: `${namespace}:speaker`,
+            speaker: `${namespace}.speaker`,
             text: `${namespace}.option.2.selected`,
           },
         ],
@@ -137,7 +137,7 @@ async function spawnNextTrainerOrEndEncounter(scene: BattleScene) {
   const nextConfig = encounter.enemyPartyConfigs.pop();
   if (!nextConfig) {
     await transitionMysteryEncounterIntroVisuals(scene, false, false);
-    await showEncounterDialogue(scene, `${namespace}:victory`, `${namespace}:speaker`);
+    await showEncounterDialogue(scene, `${namespace}.victory`, `${namespace}.speaker`);
     setEncounterRewards(scene, { guaranteedModifierTypeFuncs: [modifierTypes.MYSTERY_ENCOUNTER_MACHO_BRACE], fillRemaining: false });
     encounter.doContinueEncounter = null;
     leaveEncounterWithoutBattle(scene);

diff --git a/src/data/mystery-encounters/utils/encounter-phase-utils.ts b/src/data/mystery-encounters/utils/encounter-phase-utils.ts
@@ -671,7 +671,10 @@ export function handleMysteryEncounterVictory(scene: BattleScene, addHealPhase:
       scene.pushPhase(new TrainerVictoryPhase(scene));
     }
     if (scene.gameMode.isEndless || !scene.gameMode.isWaveFinal(scene.currentBattle.waveIndex)) {
-      scene.pushPhase(new EggLapsePhase(scene));
+      if (!encounter.doContinueEncounter) {
+        // Only lapse eggs once for multi-battle encounters
+        scene.pushPhase(new EggLapsePhase(scene));
+      }
       scene.pushPhase(new MysteryEncounterRewardsPhase(scene, addHealPhase));
     }
   }