Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OOT: add dungeon->boss/prize mapping into slotdata #4541

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
+53 −25
Open

OOT: add dungeon->boss/prize mapping into slotdata #4541

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6aba134
adds a mapping for dungeon->Boss and dungeon->Prize into slotdata for…
StripesOO7 Jan 12, 2025
526e287
fix style with suggested changes.
StripesOO7 Jan 12, 2025
7ea7e63
undo changes for alttp to split that into its own PR
StripesOO7 Jan 23, 2025
3858198
add check for race setting to slotdata. leave or collectible_flag_off…
StripesOO7 Jan 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 53 additions & 25 deletions worlds/oot/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1188,34 +1188,62 @@ def hint_type_players(hint_type: str) -> set:

def fill_slot_data(self):
self.collectible_flags_available.wait()

prizes = {}
bosses = {}
slot_data = {
'collectible_override_flags': self.collectible_override_flags,
'collectible_flag_offsets': self.collectible_flag_offsets
"collectible_override_flags": self.collectible_override_flags,
"collectible_flag_offsets": self.collectible_flag_offsets,
"prizes": prizes,
"bosses": bosses,
}
slot_data.update(self.options.as_dict(
"open_forest", "open_kakariko", "open_door_of_time", "zora_fountain", "gerudo_fortress",
"bridge", "bridge_stones", "bridge_medallions", "bridge_rewards", "bridge_tokens", "bridge_hearts",
"shuffle_ganon_bosskey", "ganon_bosskey_medallions", "ganon_bosskey_stones", "ganon_bosskey_rewards",
"ganon_bosskey_tokens", "ganon_bosskey_hearts", "trials",
"triforce_hunt", "triforce_goal", "extra_triforce_percentage",
"shopsanity", "shop_slots", "shopsanity_prices", "tokensanity",
"dungeon_shortcuts", "dungeon_shortcuts_list",
"mq_dungeons_mode", "mq_dungeons_list", "mq_dungeons_count",
"shuffle_interior_entrances", "shuffle_grotto_entrances", "shuffle_dungeon_entrances",
"shuffle_overworld_entrances", "shuffle_bosses", "key_rings", "key_rings_list", "enhance_map_compass",
"shuffle_mapcompass", "shuffle_smallkeys", "shuffle_hideoutkeys", "shuffle_bosskeys",
"logic_rules", "logic_no_night_tokens_without_suns_song", "logic_tricks",
"warp_songs", "shuffle_song_items","shuffle_medigoron_carpet_salesman", "shuffle_frog_song_rupees",
"shuffle_scrubs", "shuffle_child_trade", "shuffle_freestanding_items", "shuffle_pots", "shuffle_crates",
"shuffle_cows", "shuffle_beehives", "shuffle_kokiri_sword", "shuffle_ocarinas", "shuffle_gerudo_card",
"shuffle_beans", "starting_age", "bombchus_in_logic", "spawn_positions", "owl_drops",
"no_epona_race", "skip_some_minigame_phases", "complete_mask_quest", "free_scarecrow", "plant_beans",
"chicken_count", "big_poe_count", "fae_torch_count", "blue_fire_arrows",
"damage_multiplier", "deadly_bonks", "starting_tod", "junk_ice_traps",
"start_with_consumables", "adult_trade_start", "plando_connections"

if not self.multiworld.is_race:
for location in [
"Links Pocket",
"Queen Gohma",
"King Dodongo",
"Barinade",
"Phantom Ganon",
"Volvagia",
"Morpha",
"Bongo Bongo",
"Twinrova",
# 'Ganon',
]:
if location != "Links Pocket":
entrance = self.get_region(f"{location} Boss Room").entrances
entrance = entrance[0].name
dungeon = entrance[:str(entrance).index(" Boss Door")]
else:
dungeon = "Start"
prizes[self.get_location(location).item.name] = dungeon
bosses[dungeon] = location


slot_data.update(self.options.as_dict(
"open_forest", "open_kakariko", "open_door_of_time", "zora_fountain", "gerudo_fortress",
"bridge", "bridge_stones", "bridge_medallions", "bridge_rewards", "bridge_tokens", "bridge_hearts",
"shuffle_ganon_bosskey", "ganon_bosskey_medallions", "ganon_bosskey_stones", "ganon_bosskey_rewards",
"ganon_bosskey_tokens", "ganon_bosskey_hearts", "trials",
"triforce_hunt", "triforce_goal", "extra_triforce_percentage",
"shopsanity", "shop_slots", "shopsanity_prices", "tokensanity",
"dungeon_shortcuts", "dungeon_shortcuts_list",
"mq_dungeons_mode", "mq_dungeons_list", "mq_dungeons_count",
"shuffle_interior_entrances", "shuffle_grotto_entrances", "shuffle_dungeon_entrances",
"shuffle_overworld_entrances", "shuffle_bosses", "key_rings", "key_rings_list", "enhance_map_compass",
"shuffle_mapcompass", "shuffle_smallkeys", "shuffle_hideoutkeys", "shuffle_bosskeys",
"logic_rules", "logic_no_night_tokens_without_suns_song", "logic_tricks",
"warp_songs", "shuffle_song_items","shuffle_medigoron_carpet_salesman", "shuffle_frog_song_rupees",
"shuffle_scrubs", "shuffle_child_trade", "shuffle_freestanding_items", "shuffle_pots", "shuffle_crates",
"shuffle_cows", "shuffle_beehives", "shuffle_kokiri_sword", "shuffle_ocarinas", "shuffle_gerudo_card",
"shuffle_beans", "starting_age", "bombchus_in_logic", "spawn_positions", "owl_drops",
"no_epona_race", "skip_some_minigame_phases", "complete_mask_quest", "free_scarecrow", "plant_beans",
"chicken_count", "big_poe_count", "fae_torch_count", "blue_fire_arrows",
"damage_multiplier", "deadly_bonks", "starting_tod", "junk_ice_traps",
"start_with_consumables", "adult_trade_start", "plando_connections"
)
)
)

return slot_data


Expand Down
Loading