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

Jump to bottom

Fix boss keys being shuffled when they shouldn't be #2071

Merged
merged 2 commits into from
Aug 26, 2023
Merged

Fix boss keys being shuffled when they shouldn't be #2071

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3ebc7e
Only exclude remove and vanilla small keys from not placing boss keys
cjohnson57 Aug 13, 2023
f93605e
Also do not shuffle the BK on keysy since BKs are given to you anyway
cjohnson57 Aug 13, 2023
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
4 changes: 2 additions & 2 deletions ItemPool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@ def get_pool_core(world: World) -> tuple[list[str], dict[str, Item]]:
pending_junk_pool.append(f"Small Key ({dungeon})")
if world.settings.shuffle_bosskeys in ['any_dungeon', 'overworld', 'keysanity', 'regional']:
for dungeon in ['Forest Temple', 'Fire Temple', 'Water Temple', 'Shadow Temple', 'Spirit Temple']:
if not world.settings.keyring_give_bk or dungeon not in world.settings.key_rings or world.settings.shuffle_smallkeys not in ['any_dungeon', 'overworld', 'keysanity', 'regional']:
if not world.settings.keyring_give_bk or dungeon not in world.settings.key_rings or world.settings.shuffle_smallkeys == 'vanilla':
pending_junk_pool.append(f"Boss Key ({dungeon})")
if world.settings.shuffle_ganon_bosskey in ['any_dungeon', 'overworld', 'keysanity', 'regional']:
pending_junk_pool.append('Boss Key (Ganons Castle)')
Expand Down Expand Up @@ -760,7 +760,7 @@ def get_pool_core(world: World) -> tuple[list[str], dict[str, Item]]:

# Boss Key
if location.vanilla_item == dungeon.item_name("Boss Key"):
if (world.settings.shuffle_smallkeys in ['any_dungeon', 'overworld', 'keysanity', 'regional']
if (world.settings.shuffle_smallkeys != 'vanilla'
and dungeon.name in world.settings.key_rings and world.settings.keyring_give_bk
and dungeon.name in ['Forest Temple', 'Fire Temple', 'Water Temple', 'Shadow Temple', 'Spirit Temple']):
item = get_junk_item()[0]
Expand Down
2 changes: 0 additions & 2 deletions Plandomizer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1115,8 +1115,6 @@ def configure_effective_starting_items(self, worlds: list[World], world: World)
add_starting_item_with_ammo(items, loc.item.name)
# With small keysy, key rings, and key rings give boss key, but boss keysy
# is not on, boss keys are still required in the game to open boss doors.
# The boss key is also shuffled in the world, but may not be reachable as
# logic assumes the boss key was already obtained with the free keysy keyring.
for dungeon in world.dungeons:
if (dungeon.name in world.settings.key_rings and dungeon.name != 'Ganons Castle'
and dungeon.shuffle_smallkeys == 'remove' and dungeon.shuffle_bosskeys != 'remove'
Expand Down