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

Fix for Houlihan/Links House issue in ER

Browse Source
This commit is contained in:
codemann8
2021-10-05 22:01:14 -05:00
parent 7ea9d54ba3
commit cc9f41a2b7
1 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
EntranceShuffle.py
View File

@@ -70,12 +70,12 @@ def link_entrances(world, player):
if not invFlag: if not invFlag:
for entrancename, exitname in open_default_connections: for entrancename, exitname in open_default_connections:
connect_logical(world, entrancename, exitname, player, True)
ignore_pool = True ignore_pool = True
connect_logical(world, entrancename, exitname, player, exitname.endswith(' Exit'))
else: else:
for entrancename, exitname in inverted_default_connections: for entrancename, exitname in inverted_default_connections:
connect_logical(world, entrancename, exitname, player, True)
ignore_pool = True ignore_pool = True
connect_logical(world, entrancename, exitname, player, exitname.endswith(' Exit'))
# inverted entrance mods # inverted entrance mods
for owid in swapped_connections.keys(): for owid in swapped_connections.keys():
@@ -163,8 +163,7 @@ def link_entrances(world, player):
sanc_doors = [door for door in Inverted_Dark_Sanctuary_Doors if door in bomb_shop_doors] sanc_doors = [door for door in Inverted_Dark_Sanctuary_Doors if door in bomb_shop_doors]
sanc_door = random.choice(sanc_doors) sanc_door = random.choice(sanc_doors)
bomb_shop_doors.remove(sanc_door) bomb_shop_doors.remove(sanc_door)
connect_entrance(world, sanc_door, 'Dark Sanctuary Hint', player) connect_two_way(world, sanc_door, 'Dark Sanctuary Hint Exit', player)
world.get_entrance('Dark Sanctuary Hint Exit', player).connect(world.get_entrance(sanc_door, player).parent_region)
lw_dm_entrances = ['Paradox Cave (Bottom)', 'Paradox Cave (Middle)', 'Paradox Cave (Top)', 'Old Man House (Bottom)', lw_dm_entrances = ['Paradox Cave (Bottom)', 'Paradox Cave (Middle)', 'Paradox Cave (Top)', 'Old Man House (Bottom)',
'Fairy Ascension Cave (Bottom)', 'Fairy Ascension Cave (Top)', 'Spiral Cave (Bottom)', 'Old Man Cave (East)', 'Fairy Ascension Cave (Bottom)', 'Fairy Ascension Cave (Top)', 'Spiral Cave (Bottom)', 'Old Man Cave (East)',
@@ -262,8 +261,7 @@ def link_entrances(world, player):
sanc_doors = [door for door in Inverted_Dark_Sanctuary_Doors if door in dw_entrances] sanc_doors = [door for door in Inverted_Dark_Sanctuary_Doors if door in dw_entrances]
sanc_door = random.choice(sanc_doors) sanc_door = random.choice(sanc_doors)
dw_entrances.remove(sanc_door) dw_entrances.remove(sanc_door)
connect_entrance(world, sanc_door, 'Dark Sanctuary Hint', player) connect_two_way(world, sanc_door, 'Dark Sanctuary Hint Exit', player)
world.get_entrance('Dark Sanctuary Hint Exit', player).connect(world.get_entrance(sanc_door, player).parent_region)
# in restricted, the only mandatory exits are in dark world (lw in inverted) # in restricted, the only mandatory exits are in dark world (lw in inverted)
if not invFlag: if not invFlag:
@@ -423,8 +421,7 @@ def link_entrances(world, player):
sanc_doors = [door for door in Inverted_Dark_Sanctuary_Doors if door in dw_entrances] sanc_doors = [door for door in Inverted_Dark_Sanctuary_Doors if door in dw_entrances]
sanc_door = random.choice(sanc_doors) sanc_door = random.choice(sanc_doors)
dw_entrances.remove(sanc_door) dw_entrances.remove(sanc_door)
connect_entrance(world, sanc_door, 'Dark Sanctuary Hint', player) connect_two_way(world, sanc_door, 'Dark Sanctuary Hint Exit', player)
world.get_entrance('Dark Sanctuary Hint Exit', player).connect(world.get_entrance(sanc_door, player).parent_region)
# we randomize which world requirements we fulfill first so we get better dungeon distribution # we randomize which world requirements we fulfill first so we get better dungeon distribution
# we also places the Old Man House at this time to make sure he can be connected to the desert one way # we also places the Old Man House at this time to make sure he can be connected to the desert one way
@@ -602,8 +599,7 @@ def link_entrances(world, player):
sanc_doors = [door for door in Inverted_Dark_Sanctuary_Doors if door in entrances] sanc_doors = [door for door in Inverted_Dark_Sanctuary_Doors if door in entrances]
sanc_door = random.choice(sanc_doors) sanc_door = random.choice(sanc_doors)
entrances.remove(sanc_door) entrances.remove(sanc_door)
connect_entrance(world, sanc_door, 'Dark Sanctuary Hint', player) connect_two_way(world, sanc_door, 'Dark Sanctuary Hint Exit', player)
world.get_entrance('Dark Sanctuary Hint Exit', player).connect(world.get_entrance(sanc_door, player).parent_region)
#place must-exit caves #place must-exit caves
connect_mandatory_exits(world, entrances, caves, must_exits, player) connect_mandatory_exits(world, entrances, caves, must_exits, player)
@@ -783,8 +779,7 @@ def link_entrances(world, player):
sanc_door = random.choice(sanc_doors) sanc_door = random.choice(sanc_doors)
exit_pool.remove(sanc_door) exit_pool.remove(sanc_door)
doors.remove(sanc_door) doors.remove(sanc_door)
connect_entrance(world, sanc_door, 'Dark Sanctuary Hint', player) connect_two_way(world, sanc_door, 'Dark Sanctuary Hint Exit', player)
world.get_entrance('Dark Sanctuary Hint Exit', player).connect(world.get_entrance(sanc_door, player).parent_region)
# now let's deal with mandatory reachable stuff # now let's deal with mandatory reachable stuff
def extract_reachable_exit(cavelist): def extract_reachable_exit(cavelist):
@@ -2402,7 +2397,7 @@ Exit_Pool_Base = {'Links House Exit',
'Chest Game', 'Chest Game',
'Dark World Hammer Peg Cave', 'Dark World Hammer Peg Cave',
'Red Shield Shop', 'Red Shield Shop',
'Dark Sanctuary Hint', 'Dark Sanctuary Hint Exit',
'Fortune Teller (Dark)', 'Fortune Teller (Dark)',
'Archery Game', 'Archery Game',
'Mire Shed', 'Mire Shed',
@@ -2424,7 +2419,6 @@ Exit_Pool_Base = {'Links House Exit',
# 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 = [('Links House S&Q', 'Links House'), mandatory_connections = [('Links House S&Q', 'Links House'),
('Old Man S&Q', 'Old Man House'),
# UW Connections # UW Connections
('Lost Woods Hideout (top to bottom)', 'Lost Woods Hideout (bottom)'), ('Lost Woods Hideout (top to bottom)', 'Lost Woods Hideout (bottom)'),
@@ -2486,7 +2480,7 @@ default_connections = [('Lumberjack House', 'Lumberjack House'),
('Dark Lake Hylia Ledge Spike Cave', 'Dark Lake Hylia Ledge Spike Cave'), ('Dark Lake Hylia Ledge Spike Cave', 'Dark Lake Hylia Ledge Spike Cave'),
('Dark Lake Hylia Ledge Hint', 'Dark Lake Hylia Ledge Hint'), ('Dark Lake Hylia Ledge Hint', 'Dark Lake Hylia Ledge Hint'),
('Bonk Fairy (Dark)', 'Bonk Fairy (Dark)'), ('Bonk Fairy (Dark)', 'Bonk Fairy (Dark)'),
('Dark Sanctuary Hint', 'Dark Sanctuary Hint'), ('Dark Sanctuary Hint', 'Dark Sanctuary Hint Exit'),
('Fortune Teller (Dark)', 'Fortune Teller (Dark)'), ('Fortune Teller (Dark)', 'Fortune Teller (Dark)'),
('Archery Game', 'Archery Game'), ('Archery Game', 'Archery Game'),
('Dark Desert Hint', 'Dark Desert Hint'), ('Dark Desert Hint', 'Dark Desert Hint'),
@@ -2946,7 +2940,7 @@ exit_ids = {'Links House Exit': (0x01, 0x00),
'Chest Game': 0x47, 'Chest Game': 0x47,
'Dark World Hammer Peg Cave': 0x83, 'Dark World Hammer Peg Cave': 0x83,
'Red Shield Shop': 0x57, 'Red Shield Shop': 0x57,
'Dark Sanctuary Hint': 0x5A, 'Dark Sanctuary Hint Exit': 0x5A,
'Fortune Teller (Dark)': 0x66, 'Fortune Teller (Dark)': 0x66,
'Archery Game': 0x59, 'Archery Game': 0x59,
'Mire Shed': 0x5F, 'Mire Shed': 0x5F,