From 9d2b578556585d3a4dcb985122577f6e795f2494 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Sat, 16 Oct 2021 14:35:15 -0500 Subject: [PATCH] Removed HC bias when crossworld ER is used --- EntranceShuffle.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/EntranceShuffle.py b/EntranceShuffle.py index b1e0f0a6..dd879401 100644 --- a/EntranceShuffle.py +++ b/EntranceShuffle.py @@ -1224,16 +1224,17 @@ def full_shuffle_dungeons(world, Dungeon_Exits, player): hyrule_castle_exits = list([tuple(e for e in hyrule_castle_exits if e in exit_pool)]) hyrule_castle_exits.extend([e for e in dungeon_exits if isinstance(e, str)]) dungeon_exits = [e for e in dungeon_exits if not isinstance(e, str)] - if world.shuffle[player] == 'lite' or invFlag == (0x13 in world.owswaps[player][0] and world.owMixed[player]): - connect_mandatory_exits(world, lw_entrances, hyrule_castle_exits, lw_must_exit, player, False) - dungeon_exits.extend([e for e in hyrule_castle_exits if isinstance(e, str)]) - hyrule_castle_exits = [e for e in hyrule_castle_exits if not isinstance(e, str)] - connect_caves(world, lw_entrances, [], hyrule_castle_exits, player) - else: - connect_mandatory_exits(world, dw_entrances, hyrule_castle_exits, dw_must_exit, player, False) - dungeon_exits.extend([e for e in hyrule_castle_exits if isinstance(e, str)]) - hyrule_castle_exits = [e for e in hyrule_castle_exits if not isinstance(e, str)] - connect_caves(world, [], dw_entrances, hyrule_castle_exits, player) + if world.shuffle[player] != 'lite': + if invFlag == (0x13 in world.owswaps[player][0] and world.owMixed[player]): + connect_mandatory_exits(world, lw_entrances, hyrule_castle_exits, lw_must_exit, player, False) + dungeon_exits.extend([e for e in hyrule_castle_exits if isinstance(e, str)]) + hyrule_castle_exits = [e for e in hyrule_castle_exits if not isinstance(e, str)] + connect_caves(world, lw_entrances, [], hyrule_castle_exits, player) + else: + connect_mandatory_exits(world, dw_entrances, hyrule_castle_exits, dw_must_exit, player, False) + dungeon_exits.extend([e for e in hyrule_castle_exits if isinstance(e, str)]) + hyrule_castle_exits = [e for e in hyrule_castle_exits if not isinstance(e, str)] + connect_caves(world, [], dw_entrances, hyrule_castle_exits, player) # connect any remaining must-exit entrances dungeon_exits.extend(hyrule_castle_exits)