From 0cbd32c18455a35d56d1b83c8b5c21c89a3436c2 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Sun, 17 Apr 2022 11:18:36 -0500 Subject: [PATCH] Allowing Sanc to swap in Mixed OW if ER or Open+CrossedDR or CrossedOW --- OverworldShuffle.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/OverworldShuffle.py b/OverworldShuffle.py index f2147fe4..26700d0b 100644 --- a/OverworldShuffle.py +++ b/OverworldShuffle.py @@ -559,9 +559,11 @@ def shuffle_tiles(world, groups, result_list, player): def reorganize_tile_groups(world, player): def can_shuffle_group(name, groupType): return name not in ['Castle', 'Links', 'Central Bonk Rocks'] \ - or world.mode[player] == 'inverted' \ - or (world.mode[player] == 'open' and (name in ['Links House', 'Central Bonk Rocks'] or world.doorShuffle[player] == 'crossed' or world.shuffle[player] not in ['vanilla', 'dungeonssimple', 'dungeonsfull'])) \ - or (world.shuffle[player] in ['lean', 'crossed', 'insanity'] and name == 'Castle' and groupType == 'Entrance') + or (world.mode[player] != 'standard' and (name != 'Castle' \ + or world.shuffle[player] not in ['vanilla', 'dungeonssimple', 'dungeonsfull'] \ + or (world.mode[player] == 'open' and world.doorShuffle[player] == 'crossed') \ + or world.owCrossed[player] in ['grouped', 'polar', 'chaos'])) \ + or (world.mode[player] == 'standard' and world.shuffle[player] in ['lean', 'crossed', 'insanity'] and name == 'Castle' and groupType == 'Entrance') groups = {} for (name, groupType, whirlpoolGroup) in OWTileGroups.keys():