diff --git a/src/data/mystery-encounters/encounters/fight-or-flight-encounter.ts b/src/data/mystery-encounters/encounters/fight-or-flight-encounter.ts index ca181b8d67c..3ed7be334ff 100644 --- a/src/data/mystery-encounters/encounters/fight-or-flight-encounter.ts +++ b/src/data/mystery-encounters/encounters/fight-or-flight-encounter.ts @@ -48,7 +48,7 @@ export const FightOrFlightEncounter: IMysteryEncounter = .withIntroSpriteConfigs([]) // Set in onInit() .withIntroDialogue([ { - text: `${namespace}_intro_message`, + text: `${namespace}:intro`, }, ]) .withOnInit((scene: BattleScene) => { @@ -104,8 +104,10 @@ export const FightOrFlightEncounter: IMysteryEncounter = const primaryPokemon = encounter.options[1].primaryPokemon; if (primaryPokemon) { // Use primaryPokemon to execute the thievery + encounter.options[1].dialogue.buttonLabel = `${namespace}:option:2:label_special`; encounter.options[1].dialogue.buttonTooltip = `${namespace}:option:2:tooltip_special`; } else { + encounter.options[1].dialogue.buttonLabel = `${namespace}:option:2:label`; encounter.options[1].dialogue.buttonTooltip = `${namespace}:option:2:tooltip`; } diff --git a/src/data/mystery-encounters/encounters/mysterious-chest-encounter.ts b/src/data/mystery-encounters/encounters/mysterious-chest-encounter.ts index e8db89a6961..9c4377b22e5 100644 --- a/src/data/mystery-encounters/encounters/mysterious-chest-encounter.ts +++ b/src/data/mystery-encounters/encounters/mysterious-chest-encounter.ts @@ -34,7 +34,7 @@ export const MysteriousChestEncounter: IMysteryEncounter = ]) .withIntroDialogue([ { - text: "${namespace}:intro:message", + text: "${namespace}:intro", }, ]) .withTitle(`${namespace}:title`) diff --git a/src/data/mystery-encounters/encounters/the-strong-stuff-encounter.ts b/src/data/mystery-encounters/encounters/the-strong-stuff-encounter.ts index 7f0521b8263..05c34ba6973 100644 --- a/src/data/mystery-encounters/encounters/the-strong-stuff-encounter.ts +++ b/src/data/mystery-encounters/encounters/the-strong-stuff-encounter.ts @@ -20,7 +20,7 @@ import { BerryType } from "#enums/berry-type"; const namespace = "mysteryEncounter:theStrongStuff"; /** - * Pokemon Salesman encounter. + * The Strong Stuff encounter. * @see {@link https://github.com/AsdarDevelops/PokeRogue-Events/issues/54 | GitHub Issue #54} * @see For biome requirements check {@linkcode mysteryEncountersByBiome} */ diff --git a/src/locales/en/mystery-encounters/fight-or-flight-dialogue.ts b/src/locales/en/mystery-encounters/fight-or-flight-dialogue.ts index 2ef9d31a821..6d7f8ee5d61 100644 --- a/src/locales/en/mystery-encounters/fight-or-flight-dialogue.ts +++ b/src/locales/en/mystery-encounters/fight-or-flight-dialogue.ts @@ -10,7 +10,8 @@ export const fightOrFlightDialogue = { selected: "You approach the\nPokémon without fear.", }, 2: { - label: "{{option2PrimaryName}} can help", + label: "Steal the item", + label_special: "{{option2PrimaryName}} can help", tooltip: "@[SUMMARY_GREEN]{(35%) Steal Item}\n@[SUMMARY_BLUE]{(65%) Harder Battle}", tooltip_special: "(+) {{option2PrimaryName}} uses {{option2PrimaryMove}}", good_result: `.@d{32}.@d{32}.@d{32} diff --git a/src/locales/en/mystery-encounters/training-session-dialogue.ts b/src/locales/en/mystery-encounters/training-session-dialogue.ts index 12e84dd8d0d..4e2ce979935 100644 --- a/src/locales/en/mystery-encounters/training-session-dialogue.ts +++ b/src/locales/en/mystery-encounters/training-session-dialogue.ts @@ -19,7 +19,7 @@ export const trainingSessionDialogue = { }, 3: { label: "Heavy Training", - tooltip: "(-) Each of your Pokémon lose {{damagePercentage}}% of their total HP", + tooltip: "(-) Harsh Battle\n(+) Change Pokémon's Ability", select_prompt: "Select a new ability\nto train your Pokémon in.", finished: `{{selectedPokemon}} returns, feeling\nworn out but accomplished! $Its ability was changed to {{ability}}!`, diff --git a/src/overrides.ts b/src/overrides.ts index d16895b27fa..e19a5bf20dd 100644 --- a/src/overrides.ts +++ b/src/overrides.ts @@ -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 = 256; +export const MYSTERY_ENCOUNTER_RATE_OVERRIDE: number = null; export const MYSTERY_ENCOUNTER_TIER_OVERRIDE: MysteryEncounterTier = null; -export const MYSTERY_ENCOUNTER_OVERRIDE: MysteryEncounterType = MysteryEncounterType.THE_STRONG_STUFF; +export const MYSTERY_ENCOUNTER_OVERRIDE: MysteryEncounterType = null; /** * MODIFIER / ITEM OVERRIDES