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

Minor logical code restructure

Browse Source 
Mostly just indentation but GitHub textdiff sucks
This commit is contained in:
codemann8
2023-09-05 00:44:02 -05:00
parent 927588a3d8
commit 290fe9f3bd
1 changed files with 88 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OverworldShuffle.py
View File

@@ -233,7 +233,6 @@ def link_overworld(world, player):
world.owcrossededges[player].append(edge) world.owcrossededges[player].append(edge)
count_crossed = count_crossed + 1 count_crossed = count_crossed + 1
if world.owCrossed[player] == 'grouped' or (world.owShuffle[player] == 'vanilla' and world.owCrossed[player] == 'chaos') or limited_crossed > -1:
if world.owCrossed[player] == 'grouped': if world.owCrossed[player] == 'grouped':
# the idea is to XOR the new flips with the ones from Mixed so that non-parallel edges still work # the idea is to XOR the new flips with the ones from Mixed so that non-parallel edges still work
# Polar corresponds to Grouped with no flips in ow_crossed_tiles_mask # Polar corresponds to Grouped with no flips in ow_crossed_tiles_mask
@@ -258,7 +257,7 @@ def link_overworld(world, player):
s[0x30], s[0x35], s[0x30], s[0x35],
s[0x41], s[0x3a],s[0x3b],s[0x3c], s[0x3f]) s[0x41], s[0x3a],s[0x3b],s[0x3c], s[0x3f])
world.spoiler.set_map('groups', text_output, ow_crossed_tiles, player) world.spoiler.set_map('groups', text_output, ow_crossed_tiles, player)
else: elif limited_crossed > -1 or (world.owShuffle[player] == 'vanilla' and world.owCrossed[player] == 'chaos'):
crossed_candidates = list() crossed_candidates = list()
for group in trimmed_groups.keys(): for group in trimmed_groups.keys():
(mode, wrld, dir, terrain, parallel, count) = group (mode, wrld, dir, terrain, parallel, count) = group