From a5ceb2f61c19f720d43f0976774a65c3c10837f0 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Wed, 27 Oct 2021 22:33:15 -0500 Subject: [PATCH] Moving shuffling dropdowns to later in modes where HC isn't placed early This fixes unwanted cross-world scenarios --- EntranceShuffle.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/EntranceShuffle.py b/EntranceShuffle.py index 3fd0c278..83a7faea 100644 --- a/EntranceShuffle.py +++ b/EntranceShuffle.py @@ -329,9 +329,6 @@ def link_entrances(world, player): else: caves.append('Ganons Tower Exit') - # shuffle holes - scramble_holes(world, player) - # place dark sanc if invFlag: place_dark_sanc(world, sectors, player) @@ -371,6 +368,9 @@ def link_entrances(world, player): dw_entrances = [e for e in dw_entrances if e in entrance_pool] connect_caves(world, lw_entrances, dw_entrances, caves, player) + # shuffle holes + scramble_holes(world, player) + # place remaining doors connect_doors(world, list(entrance_pool), list(exit_pool), player) elif world.shuffle[player] == 'lite': @@ -467,9 +467,6 @@ def link_entrances(world, player): # shuffle dungeons skull_woods_shuffle(world, player) - # shuffle dropdowns - scramble_holes(world, player) - if world.mode[player] == 'standard': connect_two_way(world, 'Hyrule Castle Entrance (South)', 'Hyrule Castle Exit (South)', player) Dungeon_Exits.append(tuple(('Hyrule Castle Exit (West)', 'Hyrule Castle Exit (East)'))) @@ -509,6 +506,9 @@ def link_entrances(world, player): bomb_shop = bomb_shop_doors.pop() connect_entrance(world, bomb_shop, 'Big Bomb Shop', player) + # shuffle dropdowns + scramble_holes(world, player) + # place remaining doors connect_doors(world, list(entrance_pool), list(exit_pool), player) elif world.shuffle[player] == 'crossed':