diff --git a/DoorShuffle.py b/DoorShuffle.py index 2a072f92..7d72a1b2 100644 --- a/DoorShuffle.py +++ b/DoorShuffle.py @@ -144,7 +144,7 @@ def create_door_spoiler(world, player): world.spoiler.set_door(door_a.name, door_b.name, 'entrance', player, builder.name) else: logger.warning('This is a bug during door spoiler') - else: + elif not isinstance(door_b, Region): logger.warning('Door not connected: %s', door_a.name) if connect and connect.type == RegionType.Dungeon and connect not in visited: visited.add(connect) @@ -1071,6 +1071,8 @@ def check_entrance_fixes(world, player): portal = test_portal break world.force_fix[player][key] = portal + elif dungeon.name in ['Hyrule Castle', 'Desert Palace', 'Skull Woods', 'Turtle Rock']: + world.force_fix[player][key] = portal def palette_assignment(world, player): @@ -1543,12 +1545,12 @@ def reassign_key_doors(builder, world, player): else: room.delete(d.doorListPos) d.smallKey = False - elif d.type is DoorType.Interior and d not in flat_proposal and d.dest not in flat_proposal: + elif d.type is DoorType.Interior and d not in flat_proposal and d.dest not in flat_proposal and not d.entranceFlag: world.get_room(d.roomIndex, player).change(d.doorListPos, DoorKind.Normal) d.smallKey = False d.dest.smallKey = False queue.remove(d.dest) - elif d.type is DoorType.Normal and d not in flat_proposal: + elif d.type is DoorType.Normal and d not in flat_proposal and not d.entranceFlag: world.get_room(d.roomIndex, player).change(d.doorListPos, DoorKind.Normal) d.smallKey = False for dp in world.paired_doors[player]: diff --git a/Main.py b/Main.py index 59c61e7e..c102c509 100644 --- a/Main.py +++ b/Main.py @@ -24,7 +24,7 @@ from Fill import distribute_items_cutoff, distribute_items_staleness, distribute from ItemList import generate_itempool, difficulties, fill_prizes, fill_specific_items from Utils import output_path, parse_player_names -__version__ = '0.2.0.13u' +__version__ = '0.2.0.14u' class EnemizerError(RuntimeError): pass diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 13e3f358..79193063 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -80,6 +80,9 @@ Redesign of Keysanity Menu complete for crossed dungeon and moved out of experim # Bug Fixes +* 2.0.14u + * Removal of key doors no longer messes up certain lobbies + * Fixed ER entrances when Desert Back is a connector * 2.0.13u * Minor portal re-work for certain logic and spoiler information * Repaired certain exits wrongly affected by Sanctuary placement (ER crossed + intensity 3)