ShuriZma
/
pokerogue
mirror of https://github.com/pagefaultgames/pokerogue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ME/mystery-encounters-beta' into ME/beta/translation-json-migration

This commit is contained in:
flx-sta 2024-08-23 15:01:21 -07:00
parent 5c040aeb4d 13e7f79079
commit ba3b5f567e
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/data/mystery-encounters/encounters/teleporting-hijinks-encounter.ts
View File

@ -25,6 +25,7 @@ const namespace = "mysteryEncounter:teleportingHijinks";
const MONEY_COST_MULTIPLIER = 2.5; const MONEY_COST_MULTIPLIER = 2.5;
const BIOME_CANDIDATES = [Biome.SPACE, Biome.FAIRY_CAVE, Biome.LABORATORY, Biome.ISLAND]; const BIOME_CANDIDATES = [Biome.SPACE, Biome.FAIRY_CAVE, Biome.LABORATORY, Biome.ISLAND];
const MACHINE_INTERFACING_TYPES = [Type.ELECTRIC, Type.FLYING];
/** /**
* Teleporting Hijinks encounter. * Teleporting Hijinks encounter.
@ -92,7 +93,7 @@ export const TeleportingHijinksEncounter: MysteryEncounter =
.withOption( .withOption(
MysteryEncounterOptionBuilder MysteryEncounterOptionBuilder
.newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_SPECIAL) .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({ .withDialogue({
buttonLabel: `${namespace}.option.2.label`, buttonLabel: `${namespace}.option.2.label`,
buttonTooltip: `${namespace}.option.2.tooltip`, buttonTooltip: `${namespace}.option.2.tooltip`,

2
src/locales/en/mystery-encounters/teleporting-hijinks-dialogue.json
View File

@ -13,7 +13,7 @@
"label": "A Pokémon Helps", "label": "A Pokémon Helps",
"tooltip": "(-) {{option2PrimaryName}} Helps\n(+) {{option2PrimaryName}} gains EXP\n(?) Teleport to New Biome", "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", "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": { "3": {
"label": "Inspect the Machine", "label": "Inspect the Machine",