Some further merging

This commit is contained in:
codemann8
2022-03-27 23:31:52 -05:00
parent fd7d9f7121
commit dab40f1a98
2 changed files with 7 additions and 6 deletions

View File

@@ -131,7 +131,7 @@ def resolve_districts(world):
if not location.item and location.real:
district.locations.add(location.name)
for ext in region.exits:
if ext.connected_region not in visited:
if ext.connected_region is not None and ext.connected_region not in visited:
queue.appendleft(ext.connected_region)
elif region.type == RegionType.Dungeon and region.dungeon:
district.dungeons.add(region.dungeon.name)
@@ -150,10 +150,10 @@ def find_reachable_locations(state, player):
return check_set
inaccessible_regions_std = {'Desert Palace Lone Stairs', 'Bumper Cave Ledge', 'Skull Woods Forest (West)',
inaccessible_regions_std = {'Desert Palace Stairs', 'Bumper Cave Ledge', 'Skull Woods Forest (West)',
'Dark Death Mountain Ledge', 'Dark Death Mountain Isolated Ledge',
'Death Mountain Floating Island (Dark World)'}
'Dark Death Mountain Floating Island'}
inaccessible_regions_inv = {'Desert Palace Lone Stairs', 'Maze Race Ledge', 'Desert Ledge',
'Desert Palace Entrance (North) Spot', 'Hyrule Castle Ledge', 'Death Mountain Return Ledge'}
inaccessible_regions_inv = {'Desert Palace Stairs', 'Maze Race Ledge', 'Desert Ledge',
'Desert Palace Entrance (North) Spot', 'Hyrule Castle Ledge', 'Mountain Entry Ledge'}