add dialogue bug fixes

This commit is contained in:
ImperialSympathizer 2024-07-20 18:59:21 -04:00
parent f2b3a9ba4c
commit 4aee355314
6 changed files with 10 additions and 7 deletions

View File

@ -48,7 +48,7 @@ export const FightOrFlightEncounter: IMysteryEncounter =
.withIntroSpriteConfigs([]) // Set in onInit() .withIntroSpriteConfigs([]) // Set in onInit()
.withIntroDialogue([ .withIntroDialogue([
{ {
text: `${namespace}_intro_message`, text: `${namespace}:intro`,
}, },
]) ])
.withOnInit((scene: BattleScene) => { .withOnInit((scene: BattleScene) => {
@ -104,8 +104,10 @@ export const FightOrFlightEncounter: IMysteryEncounter =
const primaryPokemon = encounter.options[1].primaryPokemon; const primaryPokemon = encounter.options[1].primaryPokemon;
if (primaryPokemon) { if (primaryPokemon) {
// Use primaryPokemon to execute the thievery // 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`; encounter.options[1].dialogue.buttonTooltip = `${namespace}:option:2:tooltip_special`;
} else { } else {
encounter.options[1].dialogue.buttonLabel = `${namespace}:option:2:label`;
encounter.options[1].dialogue.buttonTooltip = `${namespace}:option:2:tooltip`; encounter.options[1].dialogue.buttonTooltip = `${namespace}:option:2:tooltip`;
} }

View File

@ -34,7 +34,7 @@ export const MysteriousChestEncounter: IMysteryEncounter =
]) ])
.withIntroDialogue([ .withIntroDialogue([
{ {
text: "${namespace}:intro:message", text: "${namespace}:intro",
}, },
]) ])
.withTitle(`${namespace}:title`) .withTitle(`${namespace}:title`)

View File

@ -20,7 +20,7 @@ import { BerryType } from "#enums/berry-type";
const namespace = "mysteryEncounter:theStrongStuff"; 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 {@link https://github.com/AsdarDevelops/PokeRogue-Events/issues/54 | GitHub Issue #54}
* @see For biome requirements check {@linkcode mysteryEncountersByBiome} * @see For biome requirements check {@linkcode mysteryEncountersByBiome}
*/ */

View File

@ -10,7 +10,8 @@ export const fightOrFlightDialogue = {
selected: "You approach the\nPokémon without fear.", selected: "You approach the\nPokémon without fear.",
}, },
2: { 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: "@[SUMMARY_GREEN]{(35%) Steal Item}\n@[SUMMARY_BLUE]{(65%) Harder Battle}",
tooltip_special: "(+) {{option2PrimaryName}} uses {{option2PrimaryMove}}", tooltip_special: "(+) {{option2PrimaryName}} uses {{option2PrimaryMove}}",
good_result: `.@d{32}.@d{32}.@d{32} good_result: `.@d{32}.@d{32}.@d{32}

View File

@ -19,7 +19,7 @@ export const trainingSessionDialogue = {
}, },
3: { 3: {
label: "Heavy Training", 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.", select_prompt: "Select a new ability\nto train your Pokémon in.",
finished: `{{selectedPokemon}} returns, feeling\nworn out but accomplished! finished: `{{selectedPokemon}} returns, feeling\nworn out but accomplished!
$Its ability was changed to {{ability}}!`, $Its ability was changed to {{ability}}!`,

View File

@ -117,9 +117,9 @@ export const EGG_GACHA_PULL_COUNT_OVERRIDE: number = 0;
*/ */
// 1 to 256, set to null to ignore // 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_TIER_OVERRIDE: MysteryEncounterTier = null;
export const MYSTERY_ENCOUNTER_OVERRIDE: MysteryEncounterType = MysteryEncounterType.THE_STRONG_STUFF; export const MYSTERY_ENCOUNTER_OVERRIDE: MysteryEncounterType = null;
/** /**
* MODIFIER / ITEM OVERRIDES * MODIFIER / ITEM OVERRIDES