monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pokemon Emerald: Clarify death link and start inventory descriptions (#4517)

This commit is contained in:
Bryce Wilson 2025-01-27 07:24:26 -08:00 committed by GitHub
parent 57a571cc11
commit c43233120a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
worlds/pokemon_emerald/__init__.py
View File

@ -22,7 +22,7 @@ from .locations import (PokemonEmeraldLocation, create_location_label_to_id_map,
set_free_fly, set_legendary_cave_entrances) set_free_fly, set_legendary_cave_entrances)
from .opponents import randomize_opponent_parties from .opponents import randomize_opponent_parties
from .options import (Goal, DarkCavesRequireFlash, HmRequirements, ItemPoolType, PokemonEmeraldOptions, from .options import (Goal, DarkCavesRequireFlash, HmRequirements, ItemPoolType, PokemonEmeraldOptions,
RandomizeWildPokemon, RandomizeBadges, RandomizeHms, NormanRequirement) RandomizeWildPokemon, RandomizeBadges, RandomizeHms, NormanRequirement, OPTION_GROUPS)
from .pokemon import (get_random_move, get_species_id_by_label, randomize_abilities, randomize_learnsets, from .pokemon import (get_random_move, get_species_id_by_label, randomize_abilities, randomize_learnsets,
randomize_legendary_encounters, randomize_misc_pokemon, randomize_starters, randomize_legendary_encounters, randomize_misc_pokemon, randomize_starters,
randomize_tm_hm_compatibility,randomize_types, randomize_wild_encounters) randomize_tm_hm_compatibility,randomize_types, randomize_wild_encounters)
@ -63,6 +63,7 @@ class PokemonEmeraldWebWorld(WebWorld):
) )
tutorials = [setup_en, setup_es, setup_sv] tutorials = [setup_en, setup_es, setup_sv]
option_groups = OPTION_GROUPS
class PokemonEmeraldSettings(settings.Group): class PokemonEmeraldSettings(settings.Group):

27
worlds/pokemon_emerald/options.py
View File

@ -4,7 +4,7 @@ Option definitions for Pokemon Emerald
from dataclasses import dataclass from dataclasses import dataclass
from Options import (Choice, DeathLink, DefaultOnToggle, OptionSet, NamedRange, Range, Toggle, FreeText, from Options import (Choice, DeathLink, DefaultOnToggle, OptionSet, NamedRange, Range, Toggle, FreeText,
PerGameCommonOptions) PerGameCommonOptions, OptionGroup, StartInventory)
from .data import data from .data import data
@ -803,6 +803,10 @@ class RandomizeFanfares(Toggle):
display_name = "Randomize Fanfares" display_name = "Randomize Fanfares"
class PokemonEmeraldDeathLink(DeathLink):
__doc__ = DeathLink.__doc__ + "\n\n In Pokemon Emerald, whiting out sends a death and receiving a death causes you to white out."
class WonderTrading(DefaultOnToggle): class WonderTrading(DefaultOnToggle):
""" """
Allows participation in wonder trading with other players in your current multiworld. Speak with the center receptionist on the second floor of any pokecenter. Allows participation in wonder trading with other players in your current multiworld. Speak with the center receptionist on the second floor of any pokecenter.
@ -828,6 +832,14 @@ class EasterEgg(FreeText):
default = "EMERALD SECRET" default = "EMERALD SECRET"
class PokemonEmeraldStartInventory(StartInventory):
"""
Start with these items.
They will be in your PC, which you can access from your home or a pokemon center.
"""
@dataclass @dataclass
class PokemonEmeraldOptions(PerGameCommonOptions): class PokemonEmeraldOptions(PerGameCommonOptions):
goal: Goal goal: Goal
@ -904,7 +916,18 @@ class PokemonEmeraldOptions(PerGameCommonOptions):
music: RandomizeMusic music: RandomizeMusic
fanfares: RandomizeFanfares fanfares: RandomizeFanfares
death_link: DeathLink death_link: PokemonEmeraldDeathLink
enable_wonder_trading: WonderTrading enable_wonder_trading: WonderTrading
easter_egg: EasterEgg easter_egg: EasterEgg
start_inventory: PokemonEmeraldStartInventory
OPTION_GROUPS = [
OptionGroup(
"Item & Location Options", [
PokemonEmeraldStartInventory,
], True,
),
]