alttpr-gwaa-kiwi/alttpr-python
1
0
Fork 0
Code Issues Pull Requests 1 Releases Activity

Removed HC bias when crossworld ER is used

Browse Source
This commit is contained in:
codemann8
2021-10-16 14:35:15 -05:00
parent 6b7146867a
commit 9d2b578556
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
EntranceShuffle.py
View File

@@ -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 = 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)]) 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)] 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]): if world.shuffle[player] != 'lite':
connect_mandatory_exits(world, lw_entrances, hyrule_castle_exits, lw_must_exit, player, False) if invFlag == (0x13 in world.owswaps[player][0] and world.owMixed[player]):
dungeon_exits.extend([e for e in hyrule_castle_exits if isinstance(e, str)]) connect_mandatory_exits(world, lw_entrances, hyrule_castle_exits, lw_must_exit, player, False)
hyrule_castle_exits = [e for e in hyrule_castle_exits if not isinstance(e, str)] dungeon_exits.extend([e for e in hyrule_castle_exits if isinstance(e, str)])
connect_caves(world, lw_entrances, [], hyrule_castle_exits, player) hyrule_castle_exits = [e for e in hyrule_castle_exits if not isinstance(e, str)]
else: connect_caves(world, lw_entrances, [], hyrule_castle_exits, player)
connect_mandatory_exits(world, dw_entrances, hyrule_castle_exits, dw_must_exit, player, False) else:
dungeon_exits.extend([e for e in hyrule_castle_exits if isinstance(e, str)]) connect_mandatory_exits(world, dw_entrances, hyrule_castle_exits, dw_must_exit, player, False)
hyrule_castle_exits = [e for e in hyrule_castle_exits if not isinstance(e, str)] dungeon_exits.extend([e for e in hyrule_castle_exits if isinstance(e, str)])
connect_caves(world, [], dw_entrances, hyrule_castle_exits, player) 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 # connect any remaining must-exit entrances
dungeon_exits.extend(hyrule_castle_exits) dungeon_exits.extend(hyrule_castle_exits)