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

Merge branch 'SwampFix' of https://github.com/Catobat/ALttPDoorRandomizer into Catobat-SwampFix

Browse Source
This commit is contained in:
aerinon
2021-07-09 10:50:05 -07:00
parent ffcc78f95c 2dd89197f3
commit 28dd7d0f3c
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
DoorShuffle.py
View File

@@ -20,6 +20,7 @@ from KeyDoorShuffle import analyze_dungeon, validate_vanilla_key_logic, build_ke
def link_doors(world, player): def link_doors(world, player):
orig_swamp_patch = world.swamp_patch_required[player]
attempt, valid = 1, False attempt, valid = 1, False
while not valid: while not valid:
try: try:
@@ -43,6 +44,7 @@ def link_doors(world, player):
reset_portals(world, player) reset_portals(world, player)
reset_rooms(world, player) reset_rooms(world, player)
world.get_door("Skull Pinball WS", player).no_exit() world.get_door("Skull Pinball WS", player).no_exit()
world.swamp_patch_required[player] = orig_swamp_patch
def link_doors_main(world, player): def link_doors_main(world, player):
@@ -467,8 +469,8 @@ def choose_portals(world, player):
world.get_room(0xd5, player).change(0, DoorKind.DungeonEntrance) world.get_room(0xd5, player).change(0, DoorKind.DungeonEntrance)
if not world.swamp_patch_required[player]: if not world.swamp_patch_required[player]:
swamp_region = world.get_entrance('Swamp Palace', player).connected_region swamp_portal = world.get_portal('Swamp', player)
if swamp_region.name != 'Swamp Lobby': if swamp_portal.door.name != 'Swamp Lobby S':
world.swamp_patch_required[player] = True world.swamp_patch_required[player] = True