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

fix(ER): Links house on Dm won't allow a cave to be used twice anymore

Browse Source
This commit is contained in:
aerinon
2023-11-15 13:25:13 -07:00
parent ae3215ff9a
commit 876e6e09d7
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
RELEASENOTES.md
View File

@@ -146,6 +146,7 @@ These are now independent of retro mode and have three options: None, Random, an
* Fixed logic issues: * Fixed logic issues:
* Self-locking key not allowed in Sanctuary in standard (typo fixed) * Self-locking key not allowed in Sanctuary in standard (typo fixed)
* More advanced bunny-walking logic in dungeons (multiple paths considered) * More advanced bunny-walking logic in dungeons (multiple paths considered)
* ER: Minor fix for Link's House on DM in Insanity (escape cave should not be re-used)
* Various enemy bans * Various enemy bans
* More Gibos near kiki and Old Man * More Gibos near kiki and Old Man
* Bumper obstacles * Bumper obstacles

8
source/overworld/EntranceShuffle2.py
View File

@@ -497,10 +497,14 @@ def do_links_house(entrances, exits, avail, cross_world):
entrances.remove(chosen_dm_escape) entrances.remove(chosen_dm_escape)
entrances.remove(chosen_landing) entrances.remove(chosen_landing)
else: else:
connect_entrance(chosen_dm_escape, chosen_cave.pop(0), avail) chosen_cave_first = chosen_cave.pop(0)
connect_entrance(chosen_dm_escape, chosen_cave_first, avail)
connect_exit(chosen_cave.pop(), chosen_landing, avail) connect_exit(chosen_cave.pop(), chosen_landing, avail)
entrances.remove(chosen_dm_escape) entrances.remove(chosen_dm_escape)
avail.decoupled_exits.remove(chosen_cave_first)
avail.decoupled_entrances.remove(chosen_landing) avail.decoupled_entrances.remove(chosen_landing)
# chosen cave has already been removed from exits
exits.add(chosen_cave_first) # this needs to be added back in
if len(chosen_cave): if len(chosen_cave):
exits.update([x for x in chosen_cave]) exits.update([x for x in chosen_cave])
exits.update([x for item in multi_exit_caves for x in item]) exits.update([x for item in multi_exit_caves for x in item])
@@ -1094,7 +1098,7 @@ def connect_entrance(entrancename, exit_name, avail):
def connect_exit(exit_name, entrancename, avail): def connect_exit(exit_name, entrancename, avail):
world, player = avail.world, avail. player world, player = avail.world, avail.player
entrance = world.get_entrance(entrancename, player) entrance = world.get_entrance(entrancename, player)
exit = world.get_entrance(exit_name, player) exit = world.get_entrance(exit_name, player)