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

Fixed Parallel+Crossed failing generation

Browse Source
This commit is contained in:
codemann8
2021-08-19 20:34:02 -05:00
parent bae81b58ce
commit b58a194956
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OverworldShuffle.py
View File

@@ -231,6 +231,7 @@ def link_overworld(world, player):
if f < len(forward_edge_sets): if f < len(forward_edge_sets):
forward_set = forward_edge_sets[f] forward_set = forward_edge_sets[f]
else: else:
forward_set = None
break break
f += 1 f += 1
while back_set[0] in connected_edges: while back_set[0] in connected_edges:
@@ -238,11 +239,17 @@ def link_overworld(world, player):
if b < len(back_edge_sets): if b < len(back_edge_sets):
back_set = back_edge_sets[b] back_set = back_edge_sets[b]
else: else:
back_set = None
break break
b += 1 b += 1
assert len(forward_set) == len(back_set) if forward_set is not None and back_set is not None:
for (forward_edge, back_edge) in zip(forward_set, back_set): assert len(forward_set) == len(back_set)
connect_two_way(world, forward_edge, back_edge, player, connected_edges) for (forward_edge, back_edge) in zip(forward_set, back_set):
connect_two_way(world, forward_edge, back_edge, player, connected_edges)
elif forward_set is not None:
logging.getLogger('').warning("Edge '%s' could not find a valid connection" % forward_set[0])
elif back_set is not None:
logging.getLogger('').warning("Edge '%s' could not find a valid connection" % back_set[0])
else: else:
# vanilla/crossed shuffle # vanilla/crossed shuffle
for (forward_edge_sets, back_edge_sets) in groups: for (forward_edge_sets, back_edge_sets) in groups: