Merge branch 'ME/mystery-encounters-beta' into ME/beta/translation-js…

…on-migration
AsdarDevelops · Aug 23, 2024 · ba3b5f5 · ba3b5f5
2 parents 5c040ae + 13e7f79
commit ba3b5f5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/data/mystery-encounters/encounters/teleporting-hijinks-encounter.ts b/src/data/mystery-encounters/encounters/teleporting-hijinks-encounter.ts
@@ -25,6 +25,7 @@ const namespace = "mysteryEncounter:teleportingHijinks";
 
 const MONEY_COST_MULTIPLIER = 2.5;
 const BIOME_CANDIDATES = [Biome.SPACE, Biome.FAIRY_CAVE, Biome.LABORATORY, Biome.ISLAND];
+const MACHINE_INTERFACING_TYPES = [Type.ELECTRIC, Type.FLYING];
 
 /**
  * Teleporting Hijinks encounter.
@@ -92,7 +93,7 @@ export const TeleportingHijinksEncounter: MysteryEncounter =
     .withOption(
       MysteryEncounterOptionBuilder
         .newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_SPECIAL)
-        .withPokemonTypeRequirement([Type.ELECTRIC, Type.STEEL], true, 1) // Must have Steel or Electric type
+        .withPokemonTypeRequirement(MACHINE_INTERFACING_TYPES, true, 1) // Must have Steel or Electric type
         .withDialogue({
           buttonLabel: `${namespace}.option.2.label`,
           buttonTooltip: `${namespace}.option.2.tooltip`,

diff --git a/src/locales/en/mystery-encounters/teleporting-hijinks-dialogue.json b/src/locales/en/mystery-encounters/teleporting-hijinks-dialogue.json
@@ -13,7 +13,7 @@
       "label": "A Pokémon Helps",
       "tooltip": "(-) {{option2PrimaryName}} Helps\n(+) {{option2PrimaryName}} gains EXP\n(?) Teleport to New Biome",
       "disabled_tooltip": "You need a Steel or Electric Type Pokémon to choose this",
-      "selected": "{{option2PrimaryName}} uses its typing and overloads the machine!\n        $The capsule opens, and you step inside..."
+      "selected": "{{option2PrimaryName}}'s Type allows it to bypass the machine's paywall!\n        $The capsule opens, and you step inside..."
     },
     "3": {
       "label": "Inspect the Machine",