Merge remote-tracking branch 'origin' into OverworldShuffle

version includes update of base rom
This commit is contained in:
2021-07-10 23:58:27 -07:00
9 changed files with 21 additions and 10 deletions

View File

@@ -7,7 +7,7 @@ try:
except ImportError:
raise Exception('Could not load sortedcontainers module')
__version__ = '0.1.6.5-u'
__version__ = '0.1.6.6-u'
def link_overworld(world, player):
# setup mandatory connections
@@ -21,14 +21,14 @@ def link_overworld(world, player):
if world.owSwap[player] != 'vanilla':
tile_groups = {}
for (name, groupType) in OWTileGroups.keys():
if world.mode[player] != 'standard' or name not in ['Castle', 'Links']:
if world.mode[player] != 'standard' or name not in ['Castle', 'Links', 'Central Bonk Rocks']:
if world.shuffle[player] in ['vanilla', 'simple', 'dungeonssimple']:
tile_groups[(name,)] = ([], [], [])
else:
tile_groups[(name, groupType)] = ([], [], [])
for (name, groupType) in OWTileGroups.keys():
if world.mode[player] != 'standard' or name not in ['Castle', 'Links']:
if world.mode[player] != 'standard' or name not in ['Castle', 'Links', 'Central Bonk Rocks']:
(owids, lw_regions, dw_regions) = OWTileGroups[(name, groupType,)]
if world.shuffle[player] in ['vanilla', 'simple', 'dungeonssimple']:
(exist_owids, exist_lw_regions, exist_dw_regions) = tile_groups[(name,)]