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

Fixed issue where S&Q points getting set before Mixed OWR

Browse Source
This commit is contained in:
codemann8
2023-02-25 20:16:27 -06:00
parent 4caee1cbec
commit c284b90f74
2 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
EntranceShuffle.py
View File

@@ -1402,8 +1402,7 @@ def place_blacksmith(world, links_house, player):
invFlag = world.mode[player] == 'inverted' invFlag = world.mode[player] == 'inverted'
assumed_inventory = list() assumed_inventory = list()
region = world.get_region('Frog Prison', player) if world.logic[player] in ['noglitches', 'minorglitches'] and (world.is_tile_swapped(0x29, player) == invFlag):
if world.logic[player] in ['noglitches', 'minorglitches'] and region.type == (RegionType.DarkWorld if not invFlag else RegionType.LightWorld):
assumed_inventory.append('Titans Mitts') assumed_inventory.append('Titans Mitts')
links_region = world.get_entrance(links_house, player).parent_region.name links_region = world.get_entrance(links_house, player).parent_region.name

30
OverworldShuffle.py
View File

@@ -14,21 +14,6 @@ version_branch = '-u'
__version__ = '%s%s' % (version_number, version_branch) __version__ = '%s%s' % (version_number, version_branch)
def link_overworld(world, player): def link_overworld(world, player):
if not world.is_bombshop_start(player):
connect_simple(world, 'Links House S&Q', 'Links House', player)
else:
connect_simple(world, 'Links House S&Q', 'Big Bomb Shop', player)
if not world.mode[player] == 'inverted':
connect_simple(world, 'Sanctuary S&Q', 'Sanctuary', player)
else:
connect_simple(world, 'Sanctuary S&Q', 'Dark Sanctuary Hint', player)
if not world.is_tile_swapped(0x1b, player):
connect_simple(world, 'Other World S&Q', 'Pyramid Area', player)
else:
connect_simple(world, 'Other World S&Q', 'Hyrule Castle Ledge', player)
# setup mandatory connections # setup mandatory connections
for exitname, regionname in mandatory_connections: for exitname, regionname in mandatory_connections:
connect_simple(world, exitname, regionname, player) connect_simple(world, exitname, regionname, player)
@@ -183,6 +168,21 @@ def link_overworld(world, player):
world.spoiler.set_map('swaps', text_output, world.owswaps[player][0], player) world.spoiler.set_map('swaps', text_output, world.owswaps[player][0], player)
# apply tile logical connections # apply tile logical connections
if not world.is_bombshop_start(player):
connect_simple(world, 'Links House S&Q', 'Links House', player)
else:
connect_simple(world, 'Links House S&Q', 'Big Bomb Shop', player)
if not world.mode[player] == 'inverted':
connect_simple(world, 'Sanctuary S&Q', 'Sanctuary', player)
else:
connect_simple(world, 'Sanctuary S&Q', 'Dark Sanctuary Hint', player)
if not world.is_tile_swapped(0x1b, player):
connect_simple(world, 'Other World S&Q', 'Pyramid Area', player)
else:
connect_simple(world, 'Other World S&Q', 'Hyrule Castle Ledge', player)
for owid in ow_connections.keys(): for owid in ow_connections.keys():
if not world.is_tile_swapped(owid, player): if not world.is_tile_swapped(owid, player):
for (exitname, regionname) in ow_connections[owid][0]: for (exitname, regionname) in ow_connections[owid][0]: