alttpr-gwaa-kiwi/alttpr-python
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Moving shuffling dropdowns to later in modes where HC isn't placed early

Browse Source 
This fixes unwanted cross-world scenarios
This commit is contained in:
codemann8
2021-10-27 22:33:15 -05:00
parent deb3015105
commit a5ceb2f61c
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
EntranceShuffle.py
View File

@@ -329,9 +329,6 @@ def link_entrances(world, player):
else: else:
caves.append('Ganons Tower Exit') caves.append('Ganons Tower Exit')
# shuffle holes
scramble_holes(world, player)
# place dark sanc # place dark sanc
if invFlag: if invFlag:
place_dark_sanc(world, sectors, player) 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] dw_entrances = [e for e in dw_entrances if e in entrance_pool]
connect_caves(world, lw_entrances, dw_entrances, caves, player) connect_caves(world, lw_entrances, dw_entrances, caves, player)
# shuffle holes
scramble_holes(world, player)
# place remaining doors # place remaining doors
connect_doors(world, list(entrance_pool), list(exit_pool), player) connect_doors(world, list(entrance_pool), list(exit_pool), player)
elif world.shuffle[player] == 'lite': elif world.shuffle[player] == 'lite':
@@ -467,9 +467,6 @@ def link_entrances(world, player):
# shuffle dungeons # shuffle dungeons
skull_woods_shuffle(world, player) skull_woods_shuffle(world, player)
# shuffle dropdowns
scramble_holes(world, player)
if world.mode[player] == 'standard': if world.mode[player] == 'standard':
connect_two_way(world, 'Hyrule Castle Entrance (South)', 'Hyrule Castle Exit (South)', player) 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)'))) 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() bomb_shop = bomb_shop_doors.pop()
connect_entrance(world, bomb_shop, 'Big Bomb Shop', player) connect_entrance(world, bomb_shop, 'Big Bomb Shop', player)
# shuffle dropdowns
scramble_holes(world, player)
# place remaining doors # place remaining doors
connect_doors(world, list(entrance_pool), list(exit_pool), player) connect_doors(world, list(entrance_pool), list(exit_pool), player)
elif world.shuffle[player] == 'crossed': elif world.shuffle[player] == 'crossed':