From c8e04ff8b69ef8d8128e038f3a0da9ecea058dad Mon Sep 17 00:00:00 2001 From: codemann8 Date: Wed, 27 Oct 2021 01:20:56 -0500 Subject: [PATCH] Fixing some Lite ER to not be treated as cross-world --- BaseClasses.py | 2 +- OverworldShuffle.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/BaseClasses.py b/BaseClasses.py index dd4f4133..49310325 100644 --- a/BaseClasses.py +++ b/BaseClasses.py @@ -123,7 +123,7 @@ class World(object): set_player_attr('can_access_trock_front', None) set_player_attr('can_access_trock_big_chest', None) set_player_attr('can_access_trock_middle', None) - set_player_attr('fix_fake_world', logic[player] not in ['owglitches', 'nologic'] or shuffle[player] in ['lite', 'lean', 'crossed', 'insanity', 'madness_legacy']) + set_player_attr('fix_fake_world', logic[player] not in ['owglitches', 'nologic'] or shuffle[player] in ['lean', 'crossed', 'insanity', 'madness_legacy']) set_player_attr('mapshuffle', False) set_player_attr('compassshuffle', False) set_player_attr('keyshuffle', False) diff --git a/OverworldShuffle.py b/OverworldShuffle.py index 9ed24210..6f9cf404 100644 --- a/OverworldShuffle.py +++ b/OverworldShuffle.py @@ -477,7 +477,7 @@ def reorganize_tile_groups(world, player): groups = {} for (name, groupType, whirlpoolGroup) in OWTileGroups.keys(): 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', 'lean', 'crossed', 'insanity'] and name == 'Castle' and groupType == 'Entrance'): + or (world.mode[player] == 'standard' and world.shuffle[player] in ['lean', 'crossed', 'insanity'] and name == 'Castle' and groupType == 'Entrance'): if world.shuffle[player] in ['vanilla', 'dungeonssimple', 'dungeonsfull', 'simple', 'restricted']: if world.owWhirlpoolShuffle[player] or world.owCrossed[player] != 'none': groups[(name, whirlpoolGroup)] = ([], [], []) @@ -491,7 +491,7 @@ def reorganize_tile_groups(world, player): for (name, groupType, whirlpoolGroup) in OWTileGroups.keys(): 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', 'lean', 'crossed', 'insanity'] and name == 'Castle' and groupType == 'Entrance'): + or (world.mode[player] == 'standard' and world.shuffle[player] in ['lean', 'crossed', 'insanity'] and name == 'Castle' and groupType == 'Entrance'): (lw_owids, dw_owids) = OWTileGroups[(name, groupType, whirlpoolGroup)] if world.shuffle[player] in ['vanilla', 'dungeonssimple', 'dungeonsfull', 'simple', 'restricted']: if world.owWhirlpoolShuffle[player] or world.owCrossed[player] != 'none':