diff --git a/src/data/mystery-encounters/encounters/lost-at-sea-encounter.ts b/src/data/mystery-encounters/encounters/lost-at-sea-encounter.ts index e3e3ff5bc16..340bfdd4281 100644 --- a/src/data/mystery-encounters/encounters/lost-at-sea-encounter.ts +++ b/src/data/mystery-encounters/encounters/lost-at-sea-encounter.ts @@ -43,21 +43,12 @@ export const LostAtSeaEncounter: MysteryEncounter = MysteryEncounterBuilder.with ]) .withIntroDialogue([{ text: `${namepsace}:intro` }]) .withOnInit((scene: BattleScene) => { - // const allowedPokemon = scene.getParty().filter((p) => p.isAllowedInBattle()); const { mysteryEncounter } = scene.currentBattle; mysteryEncounter.setDialogueToken("damagePercentage", String(DAMAGE_PERCENTAGE)); mysteryEncounter.setDialogueToken("option1RequiredMove", Moves[OPTION_1_REQUIRED_MOVE]); mysteryEncounter.setDialogueToken("option2RequiredMove", Moves[OPTION_2_REQUIRED_MOVE]); - // check for water pokemon - // surfablePkm = findPokemonThatCanLearnMove(allowedPokemon, Type.WATER); - // mysteryEncounter.setDialogueToken("waterPkm", surfablePkm?.name ?? ""); - - // check for flying pokemon - // flyingPkm = findPokemonThatCanLearnMove(allowedPokemon, Type.FLYING); - // mysteryEncounter.setDialogueToken("flyingPkm", flyingPkm?.name ?? ""); - return true; }) .withTitle(`${namepsace}:title`) @@ -82,7 +73,7 @@ export const LostAtSeaEncounter: MysteryEncounter = MysteryEncounterBuilder.with }, ], }) - .withOptionPhase(async (scene: BattleScene) => handleGuidingOptionPhase(scene, surfablePkm)) + .withOptionPhase(async (scene: BattleScene) => handlePokemongGuidingYouPhase(scene, surfablePkm)) .build() ) .withOption( @@ -104,7 +95,7 @@ export const LostAtSeaEncounter: MysteryEncounter = MysteryEncounterBuilder.with }, ], }) - .withOptionPhase(async (scene: BattleScene) => handleGuidingOptionPhase(scene, flyingPkm)) + .withOptionPhase(async (scene: BattleScene) => handlePokemongGuidingYouPhase(scene, flyingPkm)) .build() ) .withSimpleOption( @@ -141,7 +132,7 @@ export const LostAtSeaEncounter: MysteryEncounter = MysteryEncounterBuilder.with * @param scene Battle scene * @param guidePokemon pokemon choosen as a guide */ -function handleGuidingOptionPhase(scene: BattleScene, guidePokemon: PlayerPokemon) { +function handlePokemongGuidingYouPhase(scene: BattleScene, guidePokemon: PlayerPokemon) { /** Base EXP value for guiding pokemon. Currently Lapras base-value */ const baseExpValue: number = 187; diff --git a/src/overrides.ts b/src/overrides.ts index 7a9262ab73a..e19a5bf20dd 100644 --- a/src/overrides.ts +++ b/src/overrides.ts @@ -34,8 +34,8 @@ export const SEED_OVERRIDE: string = ""; export const WEATHER_OVERRIDE: WeatherType = WeatherType.NONE; export const DOUBLE_BATTLE_OVERRIDE: boolean = false; export const SINGLE_BATTLE_OVERRIDE: boolean = false; -export const STARTING_WAVE_OVERRIDE: integer = 15; -export const STARTING_BIOME_OVERRIDE: Biome = Biome.SEA; +export const STARTING_WAVE_OVERRIDE: integer = 0; +export const STARTING_BIOME_OVERRIDE: Biome = Biome.TOWN; export const ARENA_TINT_OVERRIDE: TimeOfDay = null; // Multiplies XP gained by this value including 0. Set to null to ignore the override export const XP_MULTIPLIER_OVERRIDE: number = null; @@ -117,9 +117,9 @@ export const EGG_GACHA_PULL_COUNT_OVERRIDE: number = 0; */ // 1 to 256, set to null to ignore -export const MYSTERY_ENCOUNTER_RATE_OVERRIDE: number = 100000; +export const MYSTERY_ENCOUNTER_RATE_OVERRIDE: number = null; export const MYSTERY_ENCOUNTER_TIER_OVERRIDE: MysteryEncounterTier = null; -export const MYSTERY_ENCOUNTER_OVERRIDE: MysteryEncounterType = MysteryEncounterType.LOST_AT_SEA; +export const MYSTERY_ENCOUNTER_OVERRIDE: MysteryEncounterType = null; /** * MODIFIER / ITEM OVERRIDES