From 3cded722ffa85363a3c8fb98be4ec7f916f45540 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Tue, 19 Oct 2021 22:14:31 -0500 Subject: [PATCH] Allow Sanc/Grave to Tile Swap when Standard + Crossworld ER --- OverworldShuffle.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/OverworldShuffle.py b/OverworldShuffle.py index a8081daa..c9970ea9 100644 --- a/OverworldShuffle.py +++ b/OverworldShuffle.py @@ -427,14 +427,16 @@ def shuffle_tiles(world, groups, result_list, player): def reorganize_tile_groups(world, player): groups = {} for (name, groupType) in OWTileGroups.keys(): - if world.mode[player] != 'standard' or name not in ['Castle', 'Links', 'Central Bonk Rocks']: + if world.mode[player] != 'standard' or name not in ['Castle', 'Links', 'Central Bonk Rocks'] \ + or (world.mode[player] == 'standard' and world.shuffle[player] in ['lite', 'liteplus', 'crossed', 'insanity'] and name == 'Castle' and groupType == 'Entrance'): if world.shuffle[player] in ['vanilla', 'dungeonssimple', 'dungeonsfull', 'simple', 'restricted']: groups[(name,)] = ([], [], []) else: groups[(name, groupType)] = ([], [], []) for (name, groupType) in OWTileGroups.keys(): - if world.mode[player] != 'standard' or name not in ['Castle', 'Links', 'Central Bonk Rocks']: + if world.mode[player] != 'standard' or name not in ['Castle', 'Links', 'Central Bonk Rocks'] \ + or (world.mode[player] == 'standard' and world.shuffle[player] in ['lite', 'liteplus', 'crossed', 'insanity'] and name == 'Castle' and groupType == 'Entrance'): (lw_owids, dw_owids) = OWTileGroups[(name, groupType,)] if world.shuffle[player] in ['vanilla', 'dungeonssimple', 'dungeonsfull', 'simple', 'restricted']: (exist_owids, exist_lw_regions, exist_dw_regions) = groups[(name,)]