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

Moving S&Q exits to OWR mandatory connections

Browse Source
This commit is contained in:
codemann8
2023-01-02 07:48:02 -06:00
parent 7fc3929280
commit 285038c871
2 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
EntranceShuffle.py
View File

@@ -39,7 +39,6 @@ def link_entrances(world, player):
if not world.is_tile_swapped(0x1b, player): if not world.is_tile_swapped(0x1b, player):
drop_connections.append(tuple(('Pyramid Hole', 'Pyramid'))) drop_connections.append(tuple(('Pyramid Hole', 'Pyramid')))
dropexit_connections.append(tuple(('Pyramid Entrance', 'Pyramid Exit'))) dropexit_connections.append(tuple(('Pyramid Entrance', 'Pyramid Exit')))
connect_simple(world, 'Other World S&Q', 'Pyramid Area', player)
else: else:
entrance_pool.remove('Pyramid Hole') entrance_pool.remove('Pyramid Hole')
entrance_pool.append('Inverted Pyramid Hole') entrance_pool.append('Inverted Pyramid Hole')
@@ -47,7 +46,6 @@ def link_entrances(world, player):
entrance_pool.append('Inverted Pyramid Entrance') entrance_pool.append('Inverted Pyramid Entrance')
drop_connections.append(tuple(('Inverted Pyramid Hole', 'Pyramid'))) drop_connections.append(tuple(('Inverted Pyramid Hole', 'Pyramid')))
dropexit_connections.append(tuple(('Inverted Pyramid Entrance', 'Pyramid Exit'))) dropexit_connections.append(tuple(('Inverted Pyramid Entrance', 'Pyramid Exit')))
connect_simple(world, 'Other World S&Q', 'Hyrule Castle Ledge', player)
unbias_some_entrances(Dungeon_Exits, Cave_Exits, Old_Man_House, Cave_Three_Exits) unbias_some_entrances(Dungeon_Exits, Cave_Exits, Old_Man_House, Cave_Three_Exits)
Cave_Exits.extend(Cave_Exits_Directional) Cave_Exits.extend(Cave_Exits_Directional)
@@ -56,16 +54,6 @@ def link_entrances(world, player):
for exitname, regionname in mandatory_connections: for exitname, regionname in mandatory_connections:
connect_simple(world, exitname, regionname, player) connect_simple(world, exitname, regionname, 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 invFlag:
connect_simple(world, 'Sanctuary S&Q', 'Sanctuary', player)
else:
connect_simple(world, 'Sanctuary S&Q', 'Dark Sanctuary Hint', player)
connect_simple(world, 'Tavern North', 'Tavern', player) connect_simple(world, 'Tavern North', 'Tavern', player)
suppress_spoiler = False suppress_spoiler = False
@@ -2040,11 +2028,8 @@ Exit_Pool_Base = ['Links House Exit',
'Pyramid'] 'Pyramid']
# these are connections that cannot be shuffled and always exist. # these are connections that cannot be shuffled and always exist.
# They link together separate parts of the world we need to divide into regions # They link together underworld regions
mandatory_connections = [('Old Man S&Q', 'Old Man House'), mandatory_connections = [('Lost Woods Hideout (top to bottom)', 'Lost Woods Hideout (bottom)'),
# UW Connections
('Lost Woods Hideout (top to bottom)', 'Lost Woods Hideout (bottom)'),
('Lumberjack Tree (top to bottom)', 'Lumberjack Tree (bottom)'), ('Lumberjack Tree (top to bottom)', 'Lumberjack Tree (bottom)'),
('Kakariko Well (top to bottom)', 'Kakariko Well (bottom)'), ('Kakariko Well (top to bottom)', 'Kakariko Well (bottom)'),
('Kakariko Well (top to back)', 'Kakariko Well (back)'), ('Kakariko Well (top to back)', 'Kakariko Well (back)'),

19
OverworldShuffle.py
View File

@@ -14,6 +14,21 @@ 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)
@@ -1202,7 +1217,9 @@ test_connections = [
] ]
# these are connections that cannot be shuffled and always exist. They link together separate parts of the world we need to divide into regions # these are connections that cannot be shuffled and always exist. They link together separate parts of the world we need to divide into regions
mandatory_connections = [# Intra-tile OW Connections mandatory_connections = [('Old Man S&Q', 'Old Man House'),
# Intra-tile OW Connections
('Lost Woods Bush (West)', 'Lost Woods East Area'), #pearl ('Lost Woods Bush (West)', 'Lost Woods East Area'), #pearl
('Lost Woods Bush (East)', 'Lost Woods West Area'), #pearl ('Lost Woods Bush (East)', 'Lost Woods West Area'), #pearl
('West Death Mountain Drop', 'West Death Mountain (Bottom)'), ('West Death Mountain Drop', 'West Death Mountain (Bottom)'),