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

Simplified tile swap check code

Browse Source
This commit is contained in:
codemann8
2021-12-27 14:28:15 -06:00
parent 29d11abfcf
commit cf86aedb79
9 changed files with 108 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OverworldShuffle.py
View File

@@ -160,7 +160,7 @@ def link_overworld(world, player):
# apply tile logical connections
for owid in ow_connections.keys():
if (world.mode[player] == 'inverted') == (owid in world.owswaps[player][0] and world.owMixed[player]):
if not world.is_tile_swapped(owid, player):
for (exitname, regionname) in ow_connections[owid][0]:
connect_simple(world, exitname, regionname, player)
else:
@@ -343,7 +343,7 @@ def link_overworld(world, player):
for o in range(0, len(flute_destinations)):
owslot = flute_destinations[o]
regions = flute_data[owslot][0]
if (world.mode[player] == 'inverted') == (flute_data[owslot][1] in world.owswaps[player][0] and world.owMixed[player]):
if not world.is_tile_swapped(flute_data[owslot][1], player):
connect_simple(world, 'Flute Spot ' + str(o + 1), regions[0], player)
else:
connect_simple(world, 'Flute Spot ' + str(o + 1), regions[1], player)
@@ -365,7 +365,7 @@ def link_overworld(world, player):
new_ignored.add(exit.connected_region.name)
getIgnored(exit.connected_region.name, base_owid, OWTileRegions[exit.connected_region.name])
if (world.mode[player] == 'inverted') == (flute_data[owid][1] in world.owswaps[player][0] and world.owMixed[player]):
if not world.is_tile_swapped(flute_data[owid][1], player):
new_region = flute_data[owid][0][0]
else:
new_region = flute_data[owid][0][1]