Combined grouping combinations of Parallel+NonCrossed and Vanilla+Crossed

OverworldShuffle.py

@@ -590,8 +590,7 @@ def reorganize_groups(world, groups, player):
                             new_grouping[(region, axis, terrain)] = (exist_forward_edges, exist_back_edges)
 
                         return list(new_grouping.values())
-    elif world.owShuffle[player] == 'parallel':
+    elif world.owShuffle[player] == 'parallel' and world.owCrossed[player]:
-        if world.owCrossed[player]:
         if world.owKeepSimilar[player]:
             if world.mode[player] == 'standard':
                 # tuple goes to (A,_,C,D,E,F)
@@ -672,7 +671,7 @@ def reorganize_groups(world, groups, player):
                         new_grouping[(axis, terrain, parallel)] = (exist_forward_edges, exist_back_edges)
 
                     return list(new_grouping.values())
-        else:
+    elif world.owShuffle[player] == 'parallel' or (world.owShuffle[player] == 'vanilla' and world.owCrossed[player]):
         if world.owKeepSimilar[player]:
             if world.mode[player] == 'standard':
                 # tuple stays (A,B,C,D,E,F)
@@ -738,87 +737,6 @@ def reorganize_groups(world, groups, player):
                         exist_back_edges.extend(back_edges)
                         new_grouping[(region, axis, terrain, parallel)] = (exist_forward_edges, exist_back_edges)
 
-                        return list(new_grouping.values())
-    elif world.owShuffle[player] == 'vanilla' and world.owCrossed[player]:
-        if world.owKeepSimilar[player]:
-            if world.mode[player] == 'standard':
-                # tuple goes to (A,B,C,D,_,F)
-                for grouping in (groups,):
-                    new_grouping = {}
-
-                    for group in grouping.keys():
-                        (std, region, axis, terrain, _, count) = group
-                        new_grouping[(std, region, axis, terrain, count)] = ([], [])
-                    
-                    for group in grouping.keys():
-                        (std, region, axis, terrain, _, count) = group
-                        (forward_edges, back_edges) = grouping[group]
-                        (exist_forward_edges, exist_back_edges) = new_grouping[(std, region, axis, terrain, count)]
-                        exist_forward_edges.extend(forward_edges)
-                        exist_back_edges.extend(back_edges)
-                        new_grouping[(std, region, axis, terrain, count)] = (exist_forward_edges, exist_back_edges)
-
-                    return list(new_grouping.values())
-            else:
-                # tuple goes to (_,B,C,D,_,F)
-                for grouping in (groups,):
-                    new_grouping = {}
-
-                    for group in grouping.keys():
-                        (_, region, axis, terrain, _, count) = group
-                        new_grouping[(region, axis, terrain, count)] = ([], [])
-                    
-                    for group in grouping.keys():
-                        (_, region, axis, terrain, _, count) = group
-                        (forward_edges, back_edges) = grouping[group]
-                        (exist_forward_edges, exist_back_edges) = new_grouping[(region, axis, terrain, count)]
-                        exist_forward_edges.extend(forward_edges)
-                        exist_back_edges.extend(back_edges)
-                        new_grouping[(region, axis, terrain, count)] = (exist_forward_edges, exist_back_edges)
-
-                    return list(new_grouping.values())
-        else:
-            if world.mode[player] == 'standard':
-                # tuple goes to (A,B,C,D,_,_)
-                for grouping in (groups,):
-                    new_grouping = {}
-
-                    for group in grouping.keys():
-                        (std, region, axis, terrain, _, _) = group
-                        new_grouping[(std, region, axis, terrain)] = ([], [])
-                    
-                    for group in grouping.keys():
-                        (std, region, axis, terrain, _, _) = group
-                        (forward_edges, back_edges) = grouping[group]
-                        forward_edges = [[i] for l in forward_edges for i in l]
-                        back_edges = [[i] for l in back_edges for i in l]
-                        
-                        (exist_forward_edges, exist_back_edges) = new_grouping[(std, region, axis, terrain)]
-                        exist_forward_edges.extend(forward_edges)
-                        exist_back_edges.extend(back_edges)
-                        new_grouping[(std, region, axis, terrain)] = (exist_forward_edges, exist_back_edges)
-
-                    return list(new_grouping.values())
-            else:
-                # tuple goes to (_,B,C,D,_,_)
-                for grouping in (groups,):
-                    new_grouping = {}
-
-                    for group in grouping.keys():
-                        (_, region, axis, terrain, _, _) = group
-                        new_grouping[(region, axis, terrain)] = ([], [])
-                    
-                    for group in grouping.keys():
-                        (_, region, axis, terrain, _, _) = group
-                        (forward_edges, back_edges) = grouping[group]
-                        forward_edges = [[i] for l in forward_edges for i in l]
-                        back_edges = [[i] for l in back_edges for i in l]
-                        
-                        (exist_forward_edges, exist_back_edges) = new_grouping[(region, axis, terrain)]
-                        exist_forward_edges.extend(forward_edges)
-                        exist_back_edges.extend(back_edges)
-                        new_grouping[(region, axis, terrain)] = (exist_forward_edges, exist_back_edges)
-
                     return list(new_grouping.values())
     else:
         raise NotImplementedError('Shuffling not supported yet')