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

Fixed issue with Whirlpool Shuffle not following Polar rules

Browse Source
This commit is contained in:
codemann8
2021-11-09 14:56:11 -06:00
parent 3f59e93bfd
commit 1df52df5a9
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OverworldShuffle.py
View File

@@ -197,16 +197,17 @@ def link_overworld(world, player):
else: else:
whirlpool_candidates = [[],[]] whirlpool_candidates = [[],[]]
for (from_owid, from_whirlpool, from_region), (to_owid, to_whirlpool, to_region) in default_whirlpool_connections: for (from_owid, from_whirlpool, from_region), (to_owid, to_whirlpool, to_region) in default_whirlpool_connections:
if world.owCrossed[player] != 'none': if world.owCrossed[player] == 'polar' and world.owMixed[player] and from_owid == 0x55:
whirlpool_candidates[0].append(tuple((from_owid, from_whirlpool, from_region))) # connect the 2 DW whirlpools in Polar Mixed
whirlpool_candidates[0].append(tuple((to_owid, to_whirlpool, to_region))) connect_simple(world, from_whirlpool, to_region, player)
connect_simple(world, to_whirlpool, from_region, player)
else: else:
if world.get_region(from_region, player).type == RegionType.LightWorld: if world.owCrossed[player] != 'none' or world.get_region(from_region, player).type == RegionType.LightWorld:
whirlpool_candidates[0].append(tuple((from_owid, from_whirlpool, from_region))) whirlpool_candidates[0].append(tuple((from_owid, from_whirlpool, from_region)))
else: else:
whirlpool_candidates[1].append(tuple((from_owid, from_whirlpool, from_region))) whirlpool_candidates[1].append(tuple((from_owid, from_whirlpool, from_region)))
if world.get_region(to_region, player).type == RegionType.LightWorld: if world.owCrossed[player] != 'none' or world.get_region(to_region, player).type == RegionType.LightWorld:
whirlpool_candidates[0].append(tuple((to_owid, to_whirlpool, to_region))) whirlpool_candidates[0].append(tuple((to_owid, to_whirlpool, to_region)))
else: else:
whirlpool_candidates[1].append(tuple((to_owid, to_whirlpool, to_region))) whirlpool_candidates[1].append(tuple((to_owid, to_whirlpool, to_region)))