From a48fe1f7a47cdfc7c17e37f2ec8723f41aad06ed Mon Sep 17 00:00:00 2001 From: ImperialSympathizer Date: Thu, 5 Sep 2024 15:58:19 -0400 Subject: [PATCH] latest ME bug fixes --- src/battle-scene.ts | 1 + .../encounters/mysterious-chest-encounter.ts | 6 +++--- .../en/mystery-encounters/dancing-lessons-dialogue.json | 2 +- src/overrides.ts | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/battle-scene.ts b/src/battle-scene.ts index 57d642bd3fd..15932f35061 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -3009,6 +3009,7 @@ export default class BattleScene extends SceneBase { // If absolutely no encounters are available, spawn 0th encounter if (availableEncounters.length === 0) { + console.log("No Mystery Encounters found, falling back to Mysterious Challengers."); return allMysteryEncounters[MysteryEncounterType.MYSTERIOUS_CHALLENGERS]; } encounter = availableEncounters[Utils.randSeedInt(availableEncounters.length)]; diff --git a/src/data/mystery-encounters/encounters/mysterious-chest-encounter.ts b/src/data/mystery-encounters/encounters/mysterious-chest-encounter.ts index 4c9f2b94dd6..d96cfbbdf99 100644 --- a/src/data/mystery-encounters/encounters/mysterious-chest-encounter.ts +++ b/src/data/mystery-encounters/encounters/mysterious-chest-encounter.ts @@ -90,7 +90,7 @@ export const MysteriousChestEncounter: MysteryEncounter = const encounter = scene.currentBattle.mysteryEncounter!; const roll = encounter.misc.roll; if (roll > 60) { - // Choose between 2 COMMON / 2 GREAT tier items (40%) + // Choose between 2 COMMON / 2 GREAT tier items (30%) setEncounterRewards(scene, { guaranteedModifierTiers: [ ModifierTier.COMMON, @@ -115,7 +115,7 @@ export const MysteriousChestEncounter: MysteryEncounter = queueEncounterMessage(scene, `${namespace}.option.1.good`); leaveEncounterWithoutBattle(scene); } else if (roll > 36) { - // Choose between 2 ROGUE tier items (4%) + // Choose between 2 ROGUE tier items (10%) setEncounterRewards(scene, { guaranteedModifierTiers: [ModifierTier.ROGUE, ModifierTier.ROGUE], }); @@ -123,7 +123,7 @@ export const MysteriousChestEncounter: MysteryEncounter = queueEncounterMessage(scene, `${namespace}.option.1.great`); leaveEncounterWithoutBattle(scene); } else if (roll > 35) { - // Choose 1 MASTER tier item (1%) + // Choose 1 MASTER tier item (5%) setEncounterRewards(scene, { guaranteedModifierTiers: [ModifierTier.MASTER], }); diff --git a/src/locales/en/mystery-encounters/dancing-lessons-dialogue.json b/src/locales/en/mystery-encounters/dancing-lessons-dialogue.json index 98f38aac62d..c024ef0c573 100644 --- a/src/locales/en/mystery-encounters/dancing-lessons-dialogue.json +++ b/src/locales/en/mystery-encounters/dancing-lessons-dialogue.json @@ -13,7 +13,7 @@ "2": { "label": "Learn Its Dance", "tooltip": "(+) Teach a Pokémon Revelation Dance", - "selected": "You watch the Oricorio closely as it performs its dance...$@s{level_up_fanfare}Your {{selectedPokemon}} wants to learn Revelation Dance!" + "selected": "You watch the Oricorio closely as it performs its dance...$@s{level_up_fanfare}Your {{selectedPokemon}} learned from the Oricorio!" }, "3": { "label": "Show It a Dance", diff --git a/src/overrides.ts b/src/overrides.ts index da778967803..709587e8481 100644 --- a/src/overrides.ts +++ b/src/overrides.ts @@ -141,9 +141,9 @@ class DefaultOverrides { // ------------------------- /** 1 to 256, set to null to ignore */ - readonly MYSTERY_ENCOUNTER_RATE_OVERRIDE: number | null = 256; + readonly MYSTERY_ENCOUNTER_RATE_OVERRIDE: number | null = null; readonly MYSTERY_ENCOUNTER_TIER_OVERRIDE: MysteryEncounterTier | null = null; - readonly MYSTERY_ENCOUNTER_OVERRIDE: MysteryEncounterType | null = MysteryEncounterType.CLOWNING_AROUND; + readonly MYSTERY_ENCOUNTER_OVERRIDE: MysteryEncounterType | null = null; // ------------------------- // MODIFIER / ITEM OVERRIDES