Merge branch 'OverworldShuffleDev' into OverworldShuffle

BaseClasses.py

@@ -87,6 +87,7 @@ class World(object):
         self.owedges = []
         self._owedge_cache = {}
         self.owswaps = {}
+        self.owcrossededges = {}
         self.owwhirlpools = {}
         self.owflutespots = {}
         self.owsectors = {}
@@ -114,6 +115,7 @@ class World(object):
             set_player_attr('_region_cache', {})
             set_player_attr('player_names', [])
             set_player_attr('owswaps', [[],[],[]])
+            set_player_attr('owcrossededges', [])
             set_player_attr('owwhirlpools', [])
             set_player_attr('owsectors', None)
             set_player_attr('remote_items', False)
@@ -238,29 +240,16 @@ class World(object):
             raise RuntimeError('No such region %s for player %d' % (regionname, player))
 
     def get_owedge(self, edgename, player):
-        if isinstance(edgename, OWEdge):
-            return edgename
-        try:
-            return self._owedge_cache[(edgename, player)]
-        except KeyError:
-            for edge in self.owedges:
-                if edge.name == edgename and edge.player == player:
-                    self._owedge_cache[(edgename, player)] = edge
-                    return edge
+        edge = self.check_for_owedge(edgename, player)
+        if edge is None:
             raise RuntimeError('No such edge %s for player %d' % (edgename, player))
+        return edge
 
     def get_entrance(self, entrance, player):
-        if isinstance(entrance, Entrance):
-            return entrance
-        try:
-            return self._entrance_cache[(entrance, player)]
-        except KeyError:
-            for region in self.regions:
-                for exit in region.exits:
-                    if exit.name == entrance and exit.player == player:
-                        self._entrance_cache[(entrance, player)] = exit
-                        return exit
+        ent = self.check_for_entrance(entrance, player)
+        if ent is None:
             raise RuntimeError('No such entrance %s for player %d' % (entrance, player))
+        return ent
 
     def remove_entrance(self, entrance, player):
         if (entrance, player) in self._entrance_cache.keys():
@@ -294,16 +283,10 @@ class World(object):
         raise RuntimeError('No such dungeon %s for player %d' % (dungeonname, player))
 
     def get_door(self, doorname, player):
-        if isinstance(doorname, Door):
-            return doorname
-        try:
-            return self._door_cache[(doorname, player)]
-        except KeyError:
-            for door in self.doors:
-                if door.name == doorname and door.player == player:
-                    self._door_cache[(doorname, player)] = door
-                    return door
+        door = self.check_for_door(doorname, player)
+        if door is None:
             raise RuntimeError('No such door %s for player %d' % (doorname, player))
+        return door
 
     def get_portal(self, portal_name, player):
         if isinstance(portal_name, Portal):
@@ -317,18 +300,6 @@ class World(object):
                     return portal
             raise RuntimeError('No such portal %s for player %d' % (portal_name, player))
 
-    def check_for_owedge(self, edgename, player):
-        if isinstance(edgename, OWEdge):
-            return edgename
-        try:
-            return self._owedge_cache[(edgename, player)]
-        except KeyError:
-            for edge in self.owedges:
-                if edge.name == edgename and edge.player == player:
-                    self._owedge_cache[(edgename, player)] = edge
-                    return edge
-            return None
-    
     def is_tile_swapped(self, owid, player):
         return (self.mode[player] == 'inverted') != (owid in self.owswaps[player][0] and self.owMixed[player])
 
@@ -354,6 +325,28 @@ class World(object):
             else:
                 return False
 
+    def check_for_owedge(self, edgename, player):
+        if isinstance(edgename, OWEdge):
+            return edgename
+        try:
+            if edgename[-1] == '*':
+                edgename = edgename[:-1]
+                edge = self.check_for_owedge(edgename, player)
+                if self.is_tile_swapped(edge.owIndex, player):
+                    from OverworldShuffle import parallel_links
+                    if edgename in parallel_links.keys() or edgename in parallel_links.inverse.keys():
+                        edgename = parallel_links[edgename] if edgename in parallel_links.keys() else parallel_links.inverse[edgename][0]
+                        return self.check_for_owedge(edgename, player)
+                    else:
+                        raise Exception("Edge notated with * doesn't have a parallel edge: %s" & edgename)
+            return self._owedge_cache[(edgename, player)]
+        except KeyError:
+            for edge in self.owedges:
+                if edge.name == edgename and edge.player == player:
+                    self._owedge_cache[(edgename, player)] = edge
+                    return edge
+            return None
+    
     def check_for_door(self, doorname, player):
         if isinstance(doorname, Door):
             return doorname
@@ -2248,7 +2241,7 @@ class OWEdge(object):
         self.unknownX = 0x0
         self.unknownY = 0x0
 
-        if self.owIndex < 0x40 or self.owIndex >= 0x80:
+        if self.owIndex & 0x40 == 0:
             self.worldType = WorldType.Light
         else:
             self.worldType = WorldType.Dark
@@ -2289,6 +2282,12 @@ class OWEdge(object):
         self.specialID = special_id
         return self
 
+    def is_tile_swapped(self, world):
+        return world.is_tile_swapped(self.owIndex, self.player)
+
+    def is_lw(self, world):
+        return (self.worldType == WorldType.Light) != self.is_tile_swapped(world)
+
     def __eq__(self, other):
         return isinstance(other, self.__class__) and self.name == other.name
 
@@ -2784,6 +2783,7 @@ class Spoiler(object):
         self.world = world
         self.hashes = {}
         self.overworlds = {}
+        self.whirlpools = {}
         self.maps = {}
         self.entrances = {}
         self.doors = {}
@@ -2808,6 +2808,12 @@ class Spoiler(object):
         else:
             self.overworlds[(entrance, direction, player)] = OrderedDict([('player', player), ('entrance', entrance), ('exit', exit), ('direction', direction)])
 
+    def set_whirlpool(self, entrance, exit, direction, player):
+        if self.world.players == 1:
+            self.whirlpools[(entrance, direction, player)] = OrderedDict([('entrance', entrance), ('exit', exit), ('direction', direction)])
+        else:
+            self.whirlpools[(entrance, direction, player)] = OrderedDict([('player', player), ('entrance', entrance), ('exit', exit), ('direction', direction)])
+
     def set_map(self, type, text, data, player):
         if self.world.players == 1:
             self.maps[(type, player)] = OrderedDict([('type', type), ('text', text), ('data', data)])
@@ -3010,6 +3016,7 @@ class Spoiler(object):
         self.parse_data()
         out = OrderedDict()
         out['Overworld'] = list(self.overworlds.values())
+        out['Whirlpools'] = list(self.whirlpools.values())
         out['Maps'] = list(self.maps.values())
         out['Entrances'] = list(self.entrances.values())
         out['Doors'] = list(self.doors.values())
@@ -3181,46 +3188,50 @@ class Spoiler(object):
             for fairy, bottle in self.bottles.items():
                 outfile.write(f'{fairy}: {bottle}\n')
 
-            if self.overworlds or self.maps:
-                outfile.write('\n\nOverworld:\n\n')
-
+            if self.maps:
                 # flute shuffle
                 for player in range(1, self.world.players + 1):
                     if ('flute', player) in self.maps:
-                        outfile.write('Flute Spots:\n')
+                        outfile.write('\n\nFlute Spots:\n\n')
                         break
                 for player in range(1, self.world.players + 1):
                     if ('flute', player) in self.maps:
                         if self.world.players > 1:
                             outfile.write(str('(Player ' + str(player) + ')\n')) # player name
-                        outfile.write(self.maps[('flute', player)]['text'] + '\n\n')
+                        outfile.write(self.maps[('flute', player)]['text'])
                 
                 # overworld tile flips
                 for player in range(1, self.world.players + 1):
                     if ('swaps', player) in self.maps:
-                        outfile.write('OW Tile Flips:\n')
+                        outfile.write('\n\nOW Tile Flips:\n\n')
                         break
                 for player in range(1, self.world.players + 1):
                     if ('swaps', player) in self.maps:
                         if self.world.players > 1:
                             outfile.write(str('(Player ' + str(player) + ')\n')) # player name
-                        outfile.write(self.maps[('swaps', player)]['text'] + '\n\n')
+                        outfile.write(self.maps[('swaps', player)]['text'])
                 
                 # crossed groups
                 for player in range(1, self.world.players + 1):
                     if ('groups', player) in self.maps:
-                        outfile.write('OW Crossed Groups:\n')
+                        outfile.write('\n\nOW Crossed Groups:\n\n')
                         break
                 for player in range(1, self.world.players + 1):
                     if ('groups', player) in self.maps:
                         if self.world.players > 1:
                             outfile.write(str('(Player ' + str(player) + ')\n')) # player name
-                        outfile.write(self.maps[('groups', player)]['text'] + '\n\n')
+                        outfile.write(self.maps[('groups', player)]['text'])
             
             if self.overworlds:
+                outfile.write('\n\nOverworld Edges:\n\n')
                 # overworld transitions
                 outfile.write('\n'.join(['%s%s %s %s' % (f'{self.world.get_player_names(entry["player"])}: ' if self.world.players > 1 else '', self.world.fish.translate("meta","overworlds",entry['entrance']), '<=>' if entry['direction'] == 'both' else '<=' if entry['direction'] == 'exit' else '=>', self.world.fish.translate("meta","overworlds",entry['exit'])) for entry in self.overworlds.values()]))
             
+            if self.whirlpools:
+                outfile.write('\n\nWhirlpools:\n\n')
+                # whirlpools
+                outfile.write('\n'.join(['%s%s %s %s' % (f'{self.world.get_player_names(entry["player"])}: ' if self.world.players > 1 else '', self.world.fish.translate("meta","whirlpools",entry['entrance']), '<=>' if entry['direction'] == 'both' else '<=' if entry['direction'] == 'exit' else '=>', self.world.fish.translate("meta","whirlpools",entry['exit'])) for entry in self.whirlpools.values()]))
+            
             if self.entrances:
                 # entrances: To/From overworld; Checking w/ & w/out "Exit" and translating accordingly
                 outfile.write('\n\nEntrances:\n\n')
@@ -3451,7 +3462,7 @@ boss_mode = {"none": 0, "simple": 1, "full": 2, "chaos": 3, 'random': 3, 'unique
 
 # byte 11: OOOT WCCC (OWR layout, free terrain, whirlpools, OWR crossed)
 or_mode = {"vanilla": 0, "parallel": 1, "full": 2}
-orcrossed_mode = {"none": 0, "polar": 1, "grouped": 2, "limited": 3, "chaos": 4}
+orcrossed_mode = {"none": 0, "polar": 1, "grouped": 2, "unrestricted": 4}
 
 # byte 12: KMB? FF?? (keep similar, mixed/tile flip, bonk drops, flute spots)
 flutespot_mode = {"vanilla": 0, "balanced": 1, "random": 2}

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.3.3.0
+- Added Customizer support for all remaining OWR options
+- Added several OWR preset yamls (many ideas are thanks to Catobat)
+- Fixed issue with Mixed OWR + Flute Shuffle placing spots on large screens
+- Removed Limited Crossed OWR and renamed Chaos Crossed to Unrestricted Crossed
+
 ## 0.3.2.2
 - Added Customizer support for Flute Shuffle (thanks Catobat)
 - Fixed bad Old Man rescue possibility in Swapped ER

ItemList.py

@@ -543,7 +543,7 @@ def set_up_take_anys(world, player, skip_adjustments=False):
     else:
         if world.shopsanity[player] and not skip_adjustments:
             world.itempool.append(ItemFactory('Rupees (300)', player))
-        old_man_take_any.shop.add_inventory(0, 'Rupees (300)', 0, 0, create_location=world.shopsanity[player])
+        old_man_take_any.shop.add_inventory(0, 'Rupees (300)', 0, 0, create_location=True)
 
     take_any_type = ShopType.Shop if world.shopsanity[player] else ShopType.TakeAny
     for num in range(4):
@@ -558,7 +558,7 @@ def set_up_take_anys(world, player, skip_adjustments=False):
         take_any.shop = Shop(take_any, room_id, take_any_type, 0xE3, True, not world.shopsanity[player], 33 + num*2)
         world.shops[player].append(take_any.shop)
         take_any.shop.add_inventory(0, 'Blue Potion', 0, 0, create_location=world.shopsanity[player])
-        take_any.shop.add_inventory(1, 'Boss Heart Container', 0, 0, create_location=world.shopsanity[player])
+        take_any.shop.add_inventory(1, 'Boss Heart Container', 0, 0, create_location=True)
         if world.shopsanity[player] and not skip_adjustments:
             world.itempool.append(ItemFactory('Blue Potion', player))
             world.itempool.append(ItemFactory('Boss Heart Container', player))

OWEdges.py

@@ -332,8 +332,8 @@ def create_owedge(player, name, owIndex, direction, terrain, edge_id, owSlotInde
 
 
 OWEdgeGroups = {
-    #(IsStandard, World, EdgeAxis, Terrain, HasParallel, NumberInGroup)
-    (St, LW, Vt, Ld, PL, 1): (
+    #(IsStandard, World, EdgeAxis, Terrain, HasParallel, NumberInGroup, CustomizerGroup)
+    (St, LW, Vt, Ld, PL, 1, None): (
         [
             ['Hyrule Castle SW'],
             ['Hyrule Castle SE']
@@ -343,7 +343,7 @@ OWEdgeGroups = {
             ['Links House NE']
         ]
     ),
-    (St, LW, Hz, Ld, PL, 3): (
+    (St, LW, Hz, Ld, PL, 3, None): (
         [
             ['Central Bonk Rocks EN', 'Central Bonk Rocks EC', 'Central Bonk Rocks ES']
         ],
@@ -351,7 +351,7 @@ OWEdgeGroups = {
             ['Links House WN', 'Links House WC', 'Links House WS']
         ]
     ),
-    (Op, LW, Hz, Ld, PL, 1): (
+    (Op, LW, Hz, Ld, PL, 1, None): (
         [
             ['Lost Woods EN'],
             ['East Death Mountain EN'],
@@ -391,7 +391,7 @@ OWEdgeGroups = {
             ['East Death Mountain WS']
         ]
     ),
-    (Op, LW, Hz, Ld, NP, 1): (
+    (Op, LW, Hz, Ld, NP, 1, None): (
         [
             ['Forgotten Forest ES']
         ],
@@ -399,7 +399,7 @@ OWEdgeGroups = {
             ['Hyrule Castle WN']
         ]
     ),
-    (Op, LW, Vt, Ld, PL, 1): (
+    (Op, LW, Vt, Ld, PL, 1, None): (
         [
             ['Lumberjack SW'],
             ['Mountain Pass SE'],
@@ -439,7 +439,7 @@ OWEdgeGroups = {
             ['Octoballoon NE']
         ]
     ),
-    (Op, LW, Vt, Ld, NP, 1): (
+    (Op, LW, Vt, Ld, NP, 1, None): (
         [
             ['Master Sword Meadow SC'],
             ['Zoras Domain SW']
@@ -449,7 +449,7 @@ OWEdgeGroups = {
             ['Zora Waterfall NE']
         ]
     ),
-    (Op, LW, Hz, Ld, PL, 2): (
+    (Op, LW, Hz, Ld, PL, 2, None): (
         [
             ['Kakariko Fortune EN', 'Kakariko Fortune ES'],
             ['Kakariko Pond EN', 'Kakariko Pond ES'],
@@ -465,7 +465,7 @@ OWEdgeGroups = {
             ['Statues WN', 'Statues WS']
         ]
     ),
-    (Op, LW, Hz, Ld, NP, 2): (
+    (Op, LW, Hz, Ld, NP, 2, None): (
         [
             ['Desert EC', 'Desert ES']
         ],
@@ -473,7 +473,7 @@ OWEdgeGroups = {
             ['Desert Pass WC', 'Desert Pass WS']
         ]
     ),
-    (Op, LW, Vt, Ld, PL, 2): (
+    (Op, LW, Vt, Ld, PL, 2, None): (
         [
             ['Lost Woods SW', 'Lost Woods SC'],
             ['Lost Woods Pass SW', 'Lost Woods Pass SE'],
@@ -489,7 +489,7 @@ OWEdgeGroups = {
             ['Wooden Bridge NW', 'Wooden Bridge NE']
         ]
     ),
-    (Op, LW, Hz, Wr, PL, 1): (
+    (Op, LW, Hz, Wr, PL, 1, None): (
         [
             ['Potion Shop EN'],
             ['Lake Hylia EC'],
@@ -505,7 +505,7 @@ OWEdgeGroups = {
             ['Statues WC']
         ]
     ),
-    (Op, LW, Hz, Wr, NP, 1): (
+    (Op, LW, Hz, Wr, NP, 1, None): (
         [
             ['Hobo EC']
         ],
@@ -513,7 +513,7 @@ OWEdgeGroups = {
             ['Stone Bridge WC']
         ]
     ),
-    (Op, LW, Vt, Wr, PL, 1): (
+    (Op, LW, Vt, Wr, PL, 1, None): (
         [
             ['Tree Line SC'],
             ['Ice Cave SW'],
@@ -525,7 +525,7 @@ OWEdgeGroups = {
             ['Wooden Bridge NC']
         ]
     ),
-    (Op, DW, Hz, Ld, PL, 1): (
+    (Op, DW, Hz, Ld, PL, 1, None): (
         [
             ['Skull Woods EN'],
             ['East Dark Death Mountain EN'],
@@ -563,7 +563,7 @@ OWEdgeGroups = {
             ['East Dark Death Mountain WS']
         ]
     ),
-    (Op, DW, Vt, Ld, PL, 1): (
+    (Op, DW, Vt, Ld, PL, 1, None): (
         [
             ['Dark Lumberjack SW'],
             ['Bumper Cave SE'],
@@ -607,11 +607,11 @@ OWEdgeGroups = {
             ['Bomber Corner NE']
         ]
     ),
-    (Op, DW, Hz, Ld, NP, 1): (
+    (Op, DW, Hz, Ld, NP, 1, None): (
         [ ],
         [ ]
     ),
-    (Op, DW, Hz, Ld, PL, 2): (
+    (Op, DW, Hz, Ld, PL, 2, None): (
         [
             ['Dark Fortune EN', 'Dark Fortune ES'],
             ['Outcast Pond EN', 'Outcast Pond ES'],
@@ -627,11 +627,11 @@ OWEdgeGroups = {
             ['Hype Cave WN', 'Hype Cave WS']
         ]
     ),
-    (Op, DW, Vt, Ld, NP, 1): (
+    (Op, DW, Vt, Ld, NP, 1, None): (
         [ ],
         [ ]
     ),
-    (Op, DW, Hz, Ld, NP, 2): (
+    (Op, DW, Hz, Ld, NP, 2, None): (
         [
             ['Dig Game EC', 'Dig Game ES']
         ],
@@ -639,7 +639,7 @@ OWEdgeGroups = {
             ['Frog WC', 'Frog WS']
         ]
     ),
-    (Op, DW, Vt, Ld, PL, 2): (
+    (Op, DW, Vt, Ld, PL, 2, None): (
         [
             ['Skull Woods SW', 'Skull Woods SC'],
             ['Skull Woods Pass SW', 'Skull Woods Pass SE'],
@@ -655,7 +655,7 @@ OWEdgeGroups = {
             ['Broken Bridge NW', 'Broken Bridge NE']
         ]
     ),
-    (Op, DW, Hz, Ld, PL, 3): (
+    (Op, DW, Hz, Ld, PL, 3, None): (
         [
             ['Dark Bonk Rocks EN', 'Dark Bonk Rocks EC', 'Dark Bonk Rocks ES']
         ],
@@ -663,7 +663,7 @@ OWEdgeGroups = {
             ['Big Bomb Shop WN', 'Big Bomb Shop WC', 'Big Bomb Shop WS']
         ]
     ),
-    (Op, DW, Hz, Wr, PL, 1): (
+    (Op, DW, Hz, Wr, PL, 1, None): (
         [
             ['Dark Witch EN'],
             ['Ice Lake EC'],
@@ -679,11 +679,11 @@ OWEdgeGroups = {
             ['Hype Cave WC']
         ]
     ),
-    (Op, DW, Hz, Wr, NP, 1): (
+    (Op, DW, Hz, Wr, NP, 1, None): (
         [ ],
         [ ]
     ),
-    (Op, DW, Vt, Wr, PL, 1): (
+    (Op, DW, Vt, Wr, PL, 1, None): (
         [
             ['Dark Tree Line SC'],
             ['Shopping Mall SW'],
@@ -699,7 +699,7 @@ OWEdgeGroups = {
 
 OWEdgeGroupsTerrain = {
     #(IsStandard, World, EdgeAxis, Terrain, HasParallel, NumberInGroup)
-    (St, LW, Vt, None, PL, 1): (
+    (St, LW, Vt, None, PL, 1, None): (
         [
             ['Hyrule Castle SW'],
             ['Hyrule Castle SE']
@@ -709,7 +709,7 @@ OWEdgeGroupsTerrain = {
             ['Links House NE']
         ]
     ),
-    (St, LW, Hz, None, PL, 3): (
+    (St, LW, Hz, None, PL, 3, None): (
         [
             ['Central Bonk Rocks EN', 'Central Bonk Rocks EC', 'Central Bonk Rocks ES']
         ],
@@ -717,7 +717,7 @@ OWEdgeGroupsTerrain = {
             ['Links House WN', 'Links House WC', 'Links House WS']
         ]
     ),
-    (Op, LW, Hz, None, PL, 1): (
+    (Op, LW, Hz, None, PL, 1, None): (
         [
             ['Lost Woods EN'],
             ['East Death Mountain EN'],
@@ -751,7 +751,7 @@ OWEdgeGroupsTerrain = {
             ['East Death Mountain WS']
         ]
     ),
-    (Op, LW, Hz, None, NP, 1): (
+    (Op, LW, Hz, None, NP, 1, None): (
         [
             ['Forgotten Forest ES'],
             ['Hobo EC']
@@ -761,7 +761,7 @@ OWEdgeGroupsTerrain = {
             ['Stone Bridge WC']
         ]
     ),
-    (Op, LW, Vt, None, PL, 1): (
+    (Op, LW, Vt, None, PL, 1, None): (
         [
             ['Lumberjack SW'],
             ['Mountain Pass SE'],
@@ -797,7 +797,7 @@ OWEdgeGroupsTerrain = {
             ['South Pass NC']
         ]
     ),
-    (Op, LW, Vt, None, NP, 1): (
+    (Op, LW, Vt, None, NP, 1, None): (
         [
             ['Master Sword Meadow SC'],
             ['Zoras Domain SW']
@@ -807,7 +807,7 @@ OWEdgeGroupsTerrain = {
             ['Zora Waterfall NE']
         ]
     ),
-    (Op, LW, Hz, None, PL, 2): (
+    (Op, LW, Hz, None, PL, 2, None): (
         [
             ['Kakariko Fortune EN', 'Kakariko Fortune ES'],
             ['Kakariko Pond EN', 'Kakariko Pond ES'],
@@ -825,7 +825,7 @@ OWEdgeGroupsTerrain = {
             ['Tree Line WN', 'Tree Line WC']
         ]
     ),
-    (Op, LW, Hz, None, NP, 2): (
+    (Op, LW, Hz, None, NP, 2, None): (
         [
             ['Desert EC', 'Desert ES']
         ],
@@ -833,7 +833,7 @@ OWEdgeGroupsTerrain = {
             ['Desert Pass WC', 'Desert Pass WS']
         ]
     ),
-    (Op, LW, Vt, None, PL, 2): (
+    (Op, LW, Vt, None, PL, 2, None): (
         [
             ['Lost Woods SW', 'Lost Woods SC'],
             ['Lost Woods Pass SW', 'Lost Woods Pass SE'],
@@ -851,7 +851,7 @@ OWEdgeGroupsTerrain = {
             ['Octoballoon NW', 'Octoballoon NE']
         ]
     ),
-    (Op, LW, Hz, None, PL, 3): (
+    (Op, LW, Hz, None, PL, 3, None): (
         [
             ['River Bend EN', 'River Bend EC', 'River Bend ES'],
             ['C Whirlpool EN', 'C Whirlpool EC', 'C Whirlpool ES']
@@ -861,7 +861,7 @@ OWEdgeGroupsTerrain = {
             ['Statues WN', 'Statues WC', 'Statues WS']
         ]
     ),
-    (Op, LW, Vt, None, PL, 3): (
+    (Op, LW, Vt, None, PL, 3, None): (
         [
             ['River Bend SW', 'River Bend SC', 'River Bend SE']
         ],
@@ -869,7 +869,7 @@ OWEdgeGroupsTerrain = {
             ['Wooden Bridge NW', 'Wooden Bridge NC', 'Wooden Bridge NE']
         ]
     ),
-    (Op, DW, Hz, None, PL, 1): (
+    (Op, DW, Hz, None, PL, 1, None): (
         [
             ['Skull Woods EN'],
             ['East Dark Death Mountain EN'],
@@ -901,7 +901,7 @@ OWEdgeGroupsTerrain = {
             ['East Dark Death Mountain WS']
         ]
     ),
-    (Op, DW, Vt, None, PL, 1): (
+    (Op, DW, Vt, None, PL, 1, None): (
         [
             ['Dark Lumberjack SW'],
             ['Bumper Cave SE'],
@@ -941,11 +941,11 @@ OWEdgeGroupsTerrain = {
             ['Dark South Pass NC']
         ]
     ),
-    (Op, DW, Hz, None, NP, 1): (
+    (Op, DW, Hz, None, NP, 1, None): (
         [ ],
         [ ]
     ),
-    (Op, DW, Hz, None, PL, 2): (
+    (Op, DW, Hz, None, PL, 2, None): (
         [
             ['Dark Fortune EN', 'Dark Fortune ES'],
             ['Outcast Pond EN', 'Outcast Pond ES'],
@@ -963,11 +963,11 @@ OWEdgeGroupsTerrain = {
             ['Dark Tree Line WN', 'Dark Tree Line WC']
         ]
     ),
-    (Op, DW, Vt, None, NP, 1): (
+    (Op, DW, Vt, None, NP, 1, None): (
         [ ],
         [ ]
     ),
-    (Op, DW, Hz, None, NP, 2): (
+    (Op, DW, Hz, None, NP, 2, None): (
         [
             ['Dig Game EC', 'Dig Game ES']
         ],
@@ -975,7 +975,7 @@ OWEdgeGroupsTerrain = {
             ['Frog WC', 'Frog WS']
         ]
     ),
-    (Op, DW, Vt, None, PL, 2): (
+    (Op, DW, Vt, None, PL, 2, None): (
         [
             ['Skull Woods SW', 'Skull Woods SC'],
             ['Skull Woods Pass SW', 'Skull Woods Pass SE'],
@@ -993,7 +993,7 @@ OWEdgeGroupsTerrain = {
             ['Bomber Corner NW', 'Bomber Corner NE']
         ]
     ),
-    (Op, DW, Hz, None, PL, 3): (
+    (Op, DW, Hz, None, PL, 3, None): (
         [
             ['Dark Bonk Rocks EN', 'Dark Bonk Rocks EC', 'Dark Bonk Rocks ES'],
             ['Qirn Jump EN', 'Qirn Jump EC', 'Qirn Jump ES'],
@@ -1005,7 +1005,7 @@ OWEdgeGroupsTerrain = {
             ['Hype Cave WN', 'Hype Cave WC', 'Hype Cave WS']
         ]
     ),
-    (Op, DW, Vt, None, PL, 3): (
+    (Op, DW, Vt, None, PL, 3, None): (
         [
             ['Qirn Jump SW', 'Qirn Jump SC', 'Qirn Jump SE']
         ],

README.md

@@ -159,9 +159,9 @@ With OW Layout Shuffle, this allows land and water edges to be connected.
 
 This allows OW connections to be shuffled cross-world. There are 2 main methodologies of Crossed OWR: 
 
-- Grouped and Polar both are guaranteed to result in two separated planes of tiles, similar to that of vanilla. This means you cannot simply walk around and be able to visit all the tiles. To navigate to the other plane, you have the following methods: 1) Normal portals 2) Mirroring on DW tiles 3) Fluting to a tile that was previously unreachable
+- `Grouped` and `Polar` both are guaranteed to result in two separated planes of tiles, similar to that of vanilla. This means you cannot simply walk around and be able to visit all the tiles. To navigate to the other plane, you have the following methods: 1) Normal portals 2) Mirroring on DW tiles 3) Fluting to a tile that was previously unreachable
 
-- Limited and Chaos are not bound to follow a two-plane framework. This means that it could be possible to travel on foot to every tile without entering a normal portal.
+- `Unrestricted` is not bound to follow a two-plane framework. This means that it could be possible to travel on foot to every tile without entering a normal portal.
 
 See each option to get more details on the differences.
 
@@ -171,31 +171,23 @@ Transitions will remain same-world.
 
 ### Grouped
 
-This option shuffles connections cross-world in the same manner as Tile Flip (Mixed), the connections coming in and going out of a Tile Group (see `Terminology` section above) are crossed (ie. meaning it is impossible to take a different path to a tile and end up in the opposite world, unlike Limited and Chaos). This is considered the simplest way to play Crossed OWR.
+This option shuffles connections cross-world in the same manner as Tile Flip (Mixed), the connections coming in and going out of a Tile Group (see `Terminology` section above) are crossed (ie. meaning it is impossible to take a different path to a tile and end up in the opposite world, unlike `Unrestricted`). This is considered the simplest way to play Crossed OWR.
 
 ### Polar
 
 Only effective if Tile Flip (Mixed) is enabled. Polar follows the same principle as Grouped, except that it preserves the original/vanilla connections even when tiles are flipped/mixed. This results in a completely vanilla overworld, except that some tiles will transform Link to a Bunny. Even though these tiles give the appearance of your normal LW tile, due to how Tile Flip works, those LW tiles give DW properties (such as bunnying, ability to mirror, and prevents flute usage). This offers an interesting twist on Mixed where you have a pre-conditioned knowledge of the terrain you will encounter, but not necessarily be able to do what you need to do there, due to bunny state. (see `Tile Flip / Mixed` section for more details)
 
-### Limited
+### Unrestricted
 
-Every transition is independently a candidate to be chosen as a cross-world connection, however only 9 total transitions become crossed (to/from each world). This option abides by the `Keep Similar Edges Together` option and will guarantee same effect on all edges in a Similar Edge group if enabled. If a Similar Edge group is chosen from the pool of candidates, it only counts as one portal, not multiple.
+Every transition is independently a candidate to be chosen as a cross-world connection. This option abides by the `Keep Similar Edges Together` option and will guarantee same effect on all edges in a Similar Edge group if enabled. If a Similar Edge group is chosen from the pool of candidates, it only counts as one portal, not multiple. Each transition has an equal 50/50 chance of being a crossed connection.
 
-Note: Only parallel connections (a connection that also exists in the opposite world) are considered for cross-world connections, which means that the same connection in the opposite world will also connect cross-world.
-
-Note: If Whirlpool Shuffle is enabled, those connections can be cross-world but do not count towards the 9 transitions that are crossed.
-
-Motive: Why 9 connections? To imitate the effect of the 9 existing standard portals.
-
-### Chaos
-
-Same as Limited, except that there is no limit to the number of cross-world connections that are made. Each transition has an equal 50/50 chance of being a crossed connection.
+Note: If Whirlpool Shuffle is enabled, those connections can be cross-world.
 
 ## Keep Similar Edges Together (--ow_keepsimilar)
 
 This keeps similar edge transitions together. ie. The 2 west land edges of Potion Shop will be paired to another set of two similar edges, unless Free Terrain is also enabled, in which case these 2 edges together with the west water edge form a group of 3 similar edges. See `Terminology` section above for a more detailed explanation of Similar Edges.
 
-Note: This affects OW Layout Shuffle mostly, but also affects Limited and Chaos modes in Crossed OW.
+Note: This affects OW Layout Shuffle mostly, but also affects `Unrestricted` mode in Crossed OW.
 
 ## Tile Flip / Mixed Overworld (--ow_mixed)
 

Rom.py

@@ -740,7 +740,7 @@ def patch_rom(world, rom, player, team, enemized, is_mystery=False):
         elif world.owShuffle[player] == 'full':
             owMode = 2
 
-        if world.owKeepSimilar[player] and (world.owShuffle[player] != 'vanilla' or world.owCrossed[player] in ['limited', 'chaos']):
+        if world.owKeepSimilar[player] and (world.owShuffle[player] != 'vanilla' or world.owCrossed[player] == 'unrestricted'):
             owMode |= 0x0100
         if world.owCrossed[player] != 'none' and (world.owCrossed[player] != 'polar' or world.owMixed[player]):
             owMode |= 0x0200

TestSuiteStat.py

@@ -49,7 +49,7 @@ SETTINGS = {
     'ow_fluteshuffle': ['balanced'],
     'ow_keepsimilar': [True, False],
     'ow_mixed': [True, False],
-    'ow_crossed': ['none', 'polar', 'grouped', 'limited'],
+    'ow_crossed': ['none', 'polar', 'grouped', 'unrestricted'],
     'accessibility': [True],
     'difficulty': [False],
     'shufflepots': [False],

docs/Customizer.md

@@ -87,9 +87,62 @@ You may define an item, and a list of locations. The locations may be weighted i
 
 You may define an item and a list of locations that an item should not be placed at. This will apply to all items of that type. The logic is considered for this. If it is otherwise impossible, the item will be considered for the listed locations. This is important for small key layouts mostly, but it will try other locations first. 
 
+### ow-edges
+
+This must be defined by player. Each player number should be listed with the appropriate sections and each of these players MUST have either `ow_shuffle` or `ow_crossed` enabled in the `settings` section in order for any values here to take effect. This section has two primary subsections: `two-way` and `groups`.
+
+#### two-way
+
+`two-way` should be used for defining overworld edge transition connections. An asterisk `*` at the end of an edge name can be used on any parallel edge (an edge that exists in the same place in the opposite world), this will swap the defined edge with its parallel edge if the tile is flipped by Tile Flip.
+
+`Links House ES*: Stone Bridge WS*` The edge east of Links House will be vanilla, but if Links House screen gets flipped by Tile Flip, then Big Bomb Shop ES will connect to Stone Bridge.
+
+#### groups
+
+`groups` should be used for defining new pool divisions of overworld edge transitions. Each group must have some unique name with all the edges listed that are desired to exist in the pool. The name of a group can be anything as long as it is valid yaml syntax. These defined groups cannot break up edges that conflict with mode settings, like `Keep Similar Edges Together`. The asterisk `*` notation, described in the `ow-edges/two-way` section, can be used here.
+
+This example puts these 2 edges in their own pool, while the rest of the edges remain in their existing pools:
+```
+someDescription:
+  - Links House ES*
+  - Stone Bridge WS*
+```
+
+### ow-crossed
+
+This must be defined by player. Each player number should be listed with the appropriate sections and each of these players MUST have `ow_crossed` enabled in the `settings` section in order for any values here to take effect. This section has four primary subsections: `force_crossed`, `force_noncrossed`, `limit_crossed`, and `undefined_chance`. There are also 
+
+#### force_crossed / force_noncrossed
+
+`force_crossed` and `force_noncrossed` should be used to define specific overworld edge transitions you wish to be cross-world connected without needing to specify an exact destination. These sections are optional but must contain a list of edge names. The asterisk `*` notation, described in the `ow-edges/two-way` section, can be used here.
+
+#### limit_crossed
+
+`limit_crossed` should be used to limit how many overworld edge transitions end up connecting cross-world. This value can be set to any non-negative integer. A value of 0 means no edges will be cross-world, except for edges that are forced cross-world (either by the previous step or a result of some combination of OWR settings). This option only takes effect in `Unrestricted` Crossed setting.
+
+#### undefined_chance
+
+`undefined_chance` should be used to determine how to handle all the remaining overworld edge transitions that aren't explicitly defined in the earlier steps. This represents the percent chance an edge will be cross-world. This value can be set from 0 to 100 (default is 50). A value of 0 means there is a 0% chance it will be cross-world. This option only takes effect under two mode combinations:
+- 1: `Unrestricted` Crossed with a `Vanilla` OW Layout
+- 2: `Grouped` Crossed
+
+#### (Grouped specific options)
+
+All four options available in the `ow-tileflips` section below are also available for `Grouped`, but must be defined under the `ow-crossed` section. In addition to the previous `undefined_chance`, the three other subsections are: `force_flip`, `force_no_flip`, and `force_together`. For more information about these sections, see the `ow-tileflips` section below.
+
+### ow-whirlpools
+
+This must be defined by player. Each player number should be listed with the appropriate sections and each of these players MUST have `ow_whirlpool: true` in the `settings` section in order for any values here to take effect. This section has one primary subsection: `two-way`.
+
+#### two-way
+
+`two-way` should be used for defining whirlpool connections.
+
+`River Bend Whirlpool: Lake Hylia Whirlpool` The whirlpool west of Potion Shop will be connected to the whirlpool at Lake Hylia.
+
 ### ow-tileflips
 
-This must be defined by player. Each player number should be listed with the appropriate sections and each of these players MUST have `ow_mixed: true` in the `settings` section in order for any values here to take effect. This section has three primary subsections: `force_flip`, `force_no_flip`, and `undefined_chance`.
+This must be defined by player. Each player number should be listed with the appropriate sections and each of these players MUST have `ow_mixed: true` in the `settings` section in order for any values here to take effect. This section has four primary subsections: `force_flip`, `force_no_flip`, `force_together`, and `undefined_chance`.
 
 #### force_flip / force_no_flip
 
@@ -106,6 +159,17 @@ force_no_flip:
   - 0x13
 ```
 
+#### force_together
+
+`force_together` should be used for defining tiles you want to force to flip as a group. Each group must have some unique name with all the OW Screen IDs listed that are desired to be grouped together. The name of a group can be anything as long as it is valid yaml syntax.
+
+Here is an example which forces Links House and Sanctuary screens to flip together:
+```
+someGroup:
+  - 0x2c
+  - 0x13
+```
+
 #### undefined_chance
 
 `undefined_chance` should be used to determine how to handle all the remaining tiles that aren't explicitly defined in the earlier step. This represents the percent chance a tile will flip. This value can be set from 0 to 100 (default is 50). A value of 0 means there is a 0% chance it will be flipped.

docs/customizer_example.yaml

@@ -69,6 +69,36 @@ placements:
     Palace of Darkness - Big Chest: Hammer
     Capacity Upgrade - Left: Moon Pearl
     Turtle Rock - Pokey 2 Key Drop: Ice Rod
+ow-edges:
+  1:
+    two-way:
+      Kakariko Fortune ES*: Sanctuary WN*
+      Central Bonk Rocks EC: Potion Shop WN
+      Central Bonk Rocks ES: Potion Shop WC
+    groups:
+      someDescription:
+        - Tree Line SC*
+        - Lake Hylia NC*
+        - Dark Tree Line SC*
+        - Ice Lake NC*
+      1234:
+        - Lake Hylia EC*
+        - Octoballoon WC*
+        - Ice Lake EC*
+        - Bomber Corner WC*
+ow-crossed:
+  1:
+    force_crossed:
+      - Links House ES*
+      - Kakariko Fortune ES*
+    force_noncrossed:
+      - Links House NE
+    limit_crossed: 9 # emulates Limited Crossed
+    undefined_chance: 25
+ow-whirlpools:
+  1:
+    two-way:
+      River Bend Whirlpool: Lake Hylia Whirlpool
 ow-tileflips:
   1:
     force_flip:
@@ -76,6 +106,10 @@ ow-tileflips:
     force_no_flip:
       - 0x2c
       - 0x18
+    force_together:
+      someDescription:
+        - 0x16
+        - 0x2b
     undefined_chance: 50
 ow-flutespots:
   1:

docs/presets/Swapkeys.yaml

@@ -1,22 +0,0 @@
-meta:
-  branch: OWR
-  seed_name: Swapkeys
-  seed_notes: Crosskeys but Swapped ER
-settings:
-  1:
-    mode: open
-    logic: noglitches
-    goal: crystals
-    crystals_gt: "7"
-    crystals_ganon: "7"
-    accessibility: locations
-    mapshuffle: 1
-    compassshuffle: 1
-    keyshuffle: wild
-    bigkeyshuffle: 1
-    shuffle: swapped
-    shuffleganon: 1
-    shufflelinks: 0
-    shuffletavern: 1
-    experimental: 0
-    hints: 0

docs/presets/swapkeys.yml

@@ -1,17 +0,0 @@
-settings:
-  1:
-    description: Swapkeys
-    glitches_required: none
-    mode: open
-    goal: crystals
-    crystals_gt: "7"
-    crystals_ganon: "7"
-    weapons: randomized
-    accessibility: locations
-    entrance_shuffle: swapped
-    shufflelinks: off
-    shuffletavern: on
-    mapshuffle: on
-    compassshuffle: on
-    keyshuffle: wild
-    bigkeyshuffle: on

docs/vanilla_multi_lobbies.yaml

@@ -1,28 +0,0 @@
-doors:
-  1:
-    lobbies:
-      #Agahnims Tower: Tower Lobby S
-      Desert Back: Desert Back Lobby S
-      Desert East: Desert East Lobby S
-      Desert South: Desert Main Lobby S
-      Desert West: Desert West S
-      #Eastern: Eastern Lobby S
-      #Ganons Tower: GT Lobby S
-      #Hera: Hera Lobby S
-      Hyrule Castle East: Hyrule Castle East Lobby S
-      Hyrule Castle South: Hyrule Castle Lobby S
-      Hyrule Castle West: Hyrule Castle West Lobby S
-      #Ice: Ice Lobby SE
-      #Mire: Mire Lobby S
-      #Palace of Darkness: PoD Lobby S
-      #Sanctuary: Sanctuary S
-      #Skull 1: Skull 1 Lobby S
-      #Skull 2 East: Skull 2 East Lobby SW
-      #Skull 2 West: Skull 2 West Lobby S
-      #Skull 3: Skull 3 Lobby SW
-      #Swamp: Swamp Lobby S
-      #Thieves Town: Thieves Lobby S
-      Turtle Rock Chest: TR Big Chest Entrance SE
-      Turtle Rock Eye Bridge: TR Eye Bridge SW
-      Turtle Rock Lazy Eyes: TR Lazy Eyes SE
-      Turtle Rock Main: TR Main Lobby SE

mystery_example.yml

@@ -10,8 +10,7 @@
     none: 4
     polar: 1
     grouped: 1
-    limited: 1
-    chaos: 1
+    unrestricted: 1
   overworld_keepsimilar:
     on: 1
     off: 1

presets/world/owr_crossed-limited.yaml

@@ -0,0 +1,6 @@
+settings:
+  1:
+    ow_crossed: unrestricted
+ow-crossed:
+  1:
+    limit_crossed: 9

presets/world/owr_crossed-max.yaml

@@ -0,0 +1,7 @@
+settings:
+  1:
+    ow_crossed: unrestricted
+ow-crossed:
+  1:
+    limit_crossed: 9999
+    undefined_chance: 100

presets/world/owr_districtshuffle-full.yaml

@@ -0,0 +1,286 @@
+settings:
+  1:
+    ow_shuffle: full
+    ow_keepsimilar: false
+ow-edges:
+  1:
+    groups:
+      NorthwestHyrule:
+        - Lost Woods NW
+        - Master Sword Meadow SC
+        - Lost Woods EN*
+        - Lumberjack WN*
+        - Lost Woods SW*
+        - Lost Woods Pass NW*
+        - Lost Woods SC*
+        - Lost Woods Pass NE*
+        - Lost Woods SE*
+        - Kakariko Fortune NE*
+        - Lumberjack SW*
+        - Mountain Pass NW*
+        - Mountain Pass SE*
+        - Kakariko Pond NE*
+        - Kakariko Fortune EN*
+        - Kakariko Pond WN*
+        - Kakariko Fortune ES*
+        - Kakariko Pond WS*
+        - Kakariko Pond EN*
+        - Sanctuary WN*
+        - Kakariko Pond ES*
+        - Sanctuary WS*
+        - Kakariko Pond SW*
+        - Forgotten Forest NW*
+        - Kakariko Pond SE*
+        - Forgotten Forest NE*
+        - Sanctuary EC*
+        - Graveyard WC*
+        - Graveyard EC*
+        - River Bend WC*
+      DeathMountain:
+        - West Death Mountain EN*
+        - East Death Mountain WN*
+        - West Death Mountain ES*
+        - East Death Mountain WS*
+        - East Death Mountain EN*
+        - Death Mountain TR Pegs WN*
+      EasternHyrule:
+        - Zora Waterfall NE
+        - Zoras Domain SW
+        - Zora Waterfall SE*
+        - Zora Approach NE*
+        - River Bend EN*
+        - Potion Shop WN*
+        - River Bend EC*
+        - Potion Shop WC*
+        - River Bend ES*
+        - Potion Shop WS*
+        - River Bend SC*
+        - Wooden Bridge NC*
+        - River Bend SE*
+        - Wooden Bridge NE*
+        - Potion Shop EN*
+        - Zora Approach WN*
+        - Potion Shop EC*
+        - Zora Approach WC*
+        - Wooden Bridge SW*
+        - Sand Dunes NW*
+        - Eastern Palace SW*
+        - Tree Line NW*
+        - Eastern Palace SE*
+        - Eastern Nook NE*
+        - Sand Dunes SC*
+        - Stone Bridge NC*
+        - Stone Bridge EN*
+        - Tree Line WN*
+      Kakariko:
+        - Kakariko ES*
+        - Blacksmith WS*
+        - Kakariko SE*
+        - Kakariko Suburb NE*
+        - Maze Race ES*
+        - Kakariko Suburb WS*
+      CentralHyrule:
+        - Hyrule Castle SW*
+        - Central Bonk Rocks NW*
+        - Hyrule Castle SE*
+        - Links House NE*
+        - Flute Boy SW*
+        - Flute Boy Approach NW*
+        - Flute Boy SC*
+        - Flute Boy Approach NC*
+        - Central Bonk Rocks EN*
+        - Links House WN*
+        - Central Bonk Rocks EC*
+        - Links House WC*
+        - Central Bonk Rocks ES*
+        - Links House WS*
+        - Central Bonk Rocks SW*
+        - C Whirlpool NW*
+        - Links House SC*
+        - Statues NC*
+        - Flute Boy Approach EC*
+        - C Whirlpool WC*
+        - C Whirlpool EN*
+        - Statues WN*
+        - C Whirlpool EC*
+        - Statues WC*
+        - C Whirlpool ES*
+        - Statues WS*
+        - C Whirlpool SC*
+        - Dam NC*
+        - Statues SC*
+        - South Pass NC*
+        - Dam EC*
+        - South Pass WC*
+      LakeHylia:
+        - Stone Bridge WC
+        - Hobo EC
+        - Stone Bridge EC*
+        - Tree Line WC*
+        - Stone Bridge SC*
+        - Lake Hylia NW*
+        - Tree Line SC*
+        - Lake Hylia NC*
+        - Lake Hylia WS*
+        - South Pass ES*
+        - Lake Hylia EC*
+        - Octoballoon WC*
+        - Lake Hylia ES*
+        - Octoballoon WS*
+        - Ice Cave SW*
+        - Octoballoon NW*
+        - Ice Cave SE*
+        - Octoballoon NE*
+      Desert:
+        - Desert EC
+        - Desert Pass WC
+        - Desert ES
+        - Desert Pass WS
+      NorthwestDarkWorld:
+        - Skull Woods EN*
+        - Dark Lumberjack WN*
+        - Skull Woods SW*
+        - Skull Woods Pass NW*
+        - Skull Woods SC*
+        - Skull Woods Pass NE*
+        - Skull Woods SE*
+        - Dark Fortune NE*
+        - Dark Lumberjack SW*
+        - Bumper Cave NW*
+        - Bumper Cave SE*
+        - Outcast Pond NE*
+        - Skull Woods Pass SW*
+        - Village of Outcasts NW*
+        - Skull Woods Pass SE*
+        - Village of Outcasts NC*
+        - Dark Fortune EN*
+        - Outcast Pond WN*
+        - Dark Fortune ES*
+        - Outcast Pond WS*
+        - Dark Fortune SC*
+        - Village of Outcasts NE*
+        - Outcast Pond EN*
+        - Dark Chapel WN*
+        - Outcast Pond ES*
+        - Dark Chapel WS*
+        - Outcast Pond SW*
+        - Shield Shop NW*
+        - Outcast Pond SE*
+        - Shield Shop NE*
+        - Dark Chapel EC*
+        - Dark Graveyard WC*
+        - Dark Graveyard EC*
+        - Qirn Jump WC*
+        - Village of Outcasts ES*
+        - Hammer Pegs WS*
+      DarkDeathMountain:
+        - West Dark Death Mountain EN*
+        - East Dark Death Mountain WN*
+        - West Dark Death Mountain ES*
+        - East Dark Death Mountain WS*
+        - East Dark Death Mountain EN*
+        - Turtle Rock WN*
+      EastDarkWorld:
+        - Catfish SE*
+        - Catfish Approach NE*
+        - Dark Witch EN*
+        - Catfish Approach WN*
+        - Dark Witch EC*
+        - Catfish Approach WC*
+        - Qirn Jump EN*
+        - Dark Witch WN*
+        - Qirn Jump EC*
+        - Dark Witch WC*
+        - Qirn Jump ES*
+        - Dark Witch WS*
+        - Qirn Jump SC*
+        - Broken Bridge NC*
+        - Qirn Jump SE*
+        - Broken Bridge NE*
+        - Broken Bridge SW*
+        - Dark Dunes NW*
+        - Pyramid ES*
+        - Dark Dunes WN*
+        - Dark Dunes SC*
+        - Hammer Bridge NC*
+        - Palace of Darkness SW*
+        - Dark Tree Line NW*
+        - Palace of Darkness SE*
+        - Palace of Darkness Nook NE*
+        - Hammer Bridge EN*
+        - Dark Tree Line WN*
+      SouthDarkWorld:
+        - Dig Game EC
+        - Frog WC
+        - Dig Game ES*
+        - Frog WS*
+        - Frog ES*
+        - Stumpy WS*
+        - Stumpy SW*
+        - Stumpy Approach NW*
+        - Stumpy SC*
+        - Stumpy Approach NC*
+        - Dark Bonk Rocks EN*
+        - Big Bomb Shop WN*
+        - Dark Bonk Rocks EC*
+        - Big Bomb Shop WC*
+        - Dark Bonk Rocks ES*
+        - Big Bomb Shop WS*
+        - Dark Bonk Rocks SW*
+        - Dark C Whirlpool NW*
+        - Big Bomb Shop SC*
+        - Hype Cave NC*
+        - Big Bomb Shop ES*
+        - Hammer Bridge WS*
+        - Hammer Bridge EC*
+        - Dark Tree Line WC*
+        - Hammer Bridge SC*
+        - Ice Lake NW*
+        - Dark Tree Line SC*
+        - Ice Lake NC*
+        - Stumpy Approach EC*
+        - Dark C Whirlpool WC*
+        - Dark C Whirlpool EN*
+        - Hype Cave WN*
+        - Dark C Whirlpool EC*
+        - Hype Cave WC*
+        - Dark C Whirlpool ES*
+        - Hype Cave WS*
+        - Dark C Whirlpool SC*
+        - Swamp NC*
+        - Hype Cave SC*
+        - Dark South Pass NC*
+        - Ice Lake WS*
+        - Dark South Pass ES*
+        - Ice Lake EC*
+        - Bomber Corner WC*
+        - Ice Lake ES*
+        - Bomber Corner WS*
+        - Shopping Mall SW*
+        - Bomber Corner NW*
+        - Shopping Mall SE*
+        - Bomber Corner NE*
+        - Swamp Nook EC*
+        - Swamp WC*
+        - Swamp Nook ES*
+        - Swamp WS*
+        - Swamp EC*
+        - Dark South Pass WC*
+ow-tileflips:
+  1:
+    force_no_flips:
+      - 0x30
+      - 0x3a
+    force_together:
+      LostWoodsPedestal:
+        - 0x00
+        - 0x80
+      ZoraWaterfall:
+        - 0x0f
+        - 0x81
+      MazeRaceSuburb:
+        - 0x28
+        - 0x29
+      HyruleCastleWest:
+        - 0x1a
+        - 0x1b

presets/world/owr_districtshuffle-pangea.yaml

@@ -0,0 +1,151 @@
+settings:
+  1:
+    ow_shuffle: full
+    ow_keepsimilar: false
+ow-edges:
+  1:
+    two-way:
+      Lost Woods NW: Master Sword Meadow SC
+      Lost Woods EN*: Lumberjack WN*
+      Lost Woods SW*: Lost Woods Pass NW*
+      Lost Woods SC*: Lost Woods Pass NE*
+      Lost Woods SE*: Kakariko Fortune NE*
+      Lumberjack SW*: Mountain Pass NW*
+      Mountain Pass SE*: Kakariko Pond NE*
+      Kakariko Fortune EN*: Kakariko Pond WN*
+      Kakariko Fortune ES*: Kakariko Pond WS*
+      Kakariko Pond EN*: Sanctuary WN*
+      Kakariko Pond ES*: Sanctuary WS*
+      Kakariko Pond SW*: Forgotten Forest NW*
+      Kakariko Pond SE*: Forgotten Forest NE*
+      Sanctuary EC*: Graveyard WC*
+      Graveyard EC*: River Bend WC*
+
+      West Death Mountain EN*: East Death Mountain WN*
+      West Death Mountain ES*: East Death Mountain WS*
+      East Death Mountain EN*: Death Mountain TR Pegs WN*
+      
+      Zora Waterfall NE: Zoras Domain SW
+      Zora Waterfall SE*: Zora Approach NE*
+      River Bend EN*: Potion Shop WN*
+      River Bend EC*: Potion Shop WC*
+      River Bend ES*: Potion Shop WS*
+      River Bend SC*: Wooden Bridge NC*
+      River Bend SE*: Wooden Bridge NE*
+      Potion Shop EN*: Zora Approach WN*
+      Potion Shop EC*: Zora Approach WC*
+      Wooden Bridge SW*: Sand Dunes NW*
+      Eastern Palace SW*: Tree Line NW*
+      Eastern Palace SE*: Eastern Nook NE*
+      Sand Dunes SC*: Stone Bridge NC*
+      Stone Bridge EN*: Tree Line WN*
+      
+      Kakariko ES*: Blacksmith WS*
+      Kakariko SE*: Kakariko Suburb NE*
+      Maze Race ES*: Kakariko Suburb WS*
+
+      Hyrule Castle SW*: Central Bonk Rocks NW*
+      Hyrule Castle SE*: Links House NE*
+      Flute Boy SW*: Flute Boy Approach NW*
+      Flute Boy SC*: Flute Boy Approach NC*
+      Central Bonk Rocks EN*: Links House WN*
+      Central Bonk Rocks EC*: Links House WC*
+      Central Bonk Rocks ES*: Links House WS*
+      Central Bonk Rocks SW*: C Whirlpool NW*
+      Links House SC*: Statues NC*
+      Flute Boy Approach EC*: C Whirlpool WC*
+      C Whirlpool EN*: Statues WN*
+      C Whirlpool EC*: Statues WC*
+      C Whirlpool ES*: Statues WS*
+      C Whirlpool SC*: Dam NC*
+      Statues SC*: South Pass NC*
+      Dam EC*: South Pass WC*
+
+      Stone Bridge WC: Hobo EC
+      Stone Bridge EC*: Tree Line WC*
+      Stone Bridge SC*: Lake Hylia NW*
+      Tree Line SC*: Lake Hylia NC*
+      Lake Hylia WS*: South Pass ES*
+      Lake Hylia EC*: Octoballoon WC*
+      Lake Hylia ES*: Octoballoon WS*
+      Ice Cave SW*: Octoballoon NW*
+      Ice Cave SE*: Octoballoon NE*
+
+      Desert EC: Desert Pass WC
+      Desert ES: Desert Pass WS
+
+      Skull Woods EN*: Dark Lumberjack WN*
+      Skull Woods SW*: Skull Woods Pass NW*
+      Skull Woods SC*: Skull Woods Pass NE*
+      Skull Woods SE*: Dark Fortune NE*
+      Dark Lumberjack SW*: Bumper Cave NW*
+      Bumper Cave SE*: Outcast Pond NE*
+      Skull Woods Pass SW*: Village of Outcasts NW*
+      Skull Woods Pass SE*: Village of Outcasts NC*
+      Dark Fortune EN*: Outcast Pond WN*
+      Dark Fortune ES*: Outcast Pond WS*
+      Dark Fortune SC*: Village of Outcasts NE*
+      Outcast Pond EN*: Dark Chapel WN*
+      Outcast Pond ES*: Dark Chapel WS*
+      Outcast Pond SW*: Shield Shop NW*
+      Outcast Pond SE*: Shield Shop NE*
+      Dark Chapel EC*: Dark Graveyard WC*
+      Dark Graveyard EC*: Qirn Jump WC*
+      Village of Outcasts ES*: Hammer Pegs WS*
+      
+      West Dark Death Mountain EN*: East Dark Death Mountain WN*
+      West Dark Death Mountain ES*: East Dark Death Mountain WS*
+      East Dark Death Mountain EN*: Turtle Rock WN*
+
+      Catfish SE*: Catfish Approach NE*
+      Dark Witch EN*: Catfish Approach WN*
+      Dark Witch EC*: Catfish Approach WC*
+      Qirn Jump EN*: Dark Witch WN*
+      Qirn Jump EC*: Dark Witch WC*
+      Qirn Jump ES*: Dark Witch WS*
+      Qirn Jump SC*: Broken Bridge NC*
+      Qirn Jump SE*: Broken Bridge NE*
+      Broken Bridge SW*: Dark Dunes NW*
+      Pyramid ES*: Dark Dunes WN*
+      Dark Dunes SC*: Hammer Bridge NC*
+      Palace of Darkness SW*: Dark Tree Line NW*
+      Palace of Darkness SE*: Palace of Darkness Nook NE*
+      Hammer Bridge EN*: Dark Tree Line WN*
+
+      Dig Game EC: Frog WC
+      Dig Game ES*: Frog WS*
+      Frog ES*: Stumpy WS*
+      Stumpy SW*: Stumpy Approach NW*
+      Stumpy SC*: Stumpy Approach NC*
+      Dark Bonk Rocks EN*: Big Bomb Shop WN*
+      Dark Bonk Rocks EC*: Big Bomb Shop WC*
+      Dark Bonk Rocks ES*: Big Bomb Shop WS*
+      Dark Bonk Rocks SW*: Dark C Whirlpool NW*
+      Big Bomb Shop SC*: Hype Cave NC*
+      Big Bomb Shop ES*: Hammer Bridge WS*
+      Hammer Bridge EC*: Dark Tree Line WC*
+      Hammer Bridge SC*: Ice Lake NW*
+      Dark Tree Line SC*: Ice Lake NC*
+      Stumpy Approach EC*: Dark C Whirlpool WC*
+      Dark C Whirlpool EN*: Hype Cave WN*
+      Dark C Whirlpool EC*: Hype Cave WC*
+      Dark C Whirlpool ES*: Hype Cave WS*
+      Dark C Whirlpool SC*: Swamp NC*
+      Hype Cave SC*: Dark South Pass NC*
+      Ice Lake WS*: Dark South Pass ES*
+      Ice Lake EC*: Bomber Corner WC*
+      Ice Lake ES*: Bomber Corner WS*
+      Shopping Mall SW*: Bomber Corner NW*
+      Shopping Mall SE*: Bomber Corner NE*
+      Swamp Nook EC*: Swamp WC*
+      Swamp Nook ES*: Swamp WS*
+      Swamp EC*: Dark South Pass WC*
+ow-tileflips:
+  1:
+    force_no_flips:
+      - 0x30
+      - 0x3a
+    force_together:
+      HyruleCastleWest:
+        - 0x1a
+        - 0x1b

presets/world/owr_districtshuffle-vanillaborders.yaml

@@ -0,0 +1,300 @@
+settings:
+  1:
+    ow_shuffle: full
+    ow_keepsimilar: false
+ow-edges:
+  1:
+    two-way:
+      Lost Woods Pass SW*: Kakariko NW*
+      Lost Woods Pass SE*: Kakariko NC*
+      Kakariko Fortune SC*: Kakariko NE*
+      River Bend SW*: Wooden Bridge NW*
+      Forgotten Forest ES: Hyrule Castle WN
+      Hyrule Castle ES*: Sand Dunes WN*
+      Kakariko Suburb ES*: Flute Boy WS*
+      Links House ES*: Stone Bridge WS*
+      Tree Line SE*: Lake Hylia NE*
+      Desert Pass EC*: Dam WC*
+      Desert Pass ES*: Dam WS*
+      Qirn Jump SW*: Broken Bridge NW*
+      Village of Outcasts SE*: Frog NE*
+      Pyramid SW*: Dark Bonk Rocks NW*
+      Pyramid SE*: Big Bomb Shop NE*
+      Dark Tree Line SE*: Ice Lake NE*
+    groups:
+      NorthwestHyrule:
+        - Lost Woods NW
+        - Master Sword Meadow SC
+        - Lost Woods EN*
+        - Lumberjack WN*
+        - Lost Woods SW*
+        - Lost Woods Pass NW*
+        - Lost Woods SC*
+        - Lost Woods Pass NE*
+        - Lost Woods SE*
+        - Kakariko Fortune NE*
+        - Lumberjack SW*
+        - Mountain Pass NW*
+        - Mountain Pass SE*
+        - Kakariko Pond NE*
+        - Kakariko Fortune EN*
+        - Kakariko Pond WN*
+        - Kakariko Fortune ES*
+        - Kakariko Pond WS*
+        - Kakariko Pond EN*
+        - Sanctuary WN*
+        - Kakariko Pond ES*
+        - Sanctuary WS*
+        - Kakariko Pond SW*
+        - Forgotten Forest NW*
+        - Kakariko Pond SE*
+        - Forgotten Forest NE*
+        - Sanctuary EC*
+        - Graveyard WC*
+        - Graveyard EC*
+        - River Bend WC*
+      DeathMountain:
+        - West Death Mountain EN*
+        - East Death Mountain WN*
+        - West Death Mountain ES*
+        - East Death Mountain WS*
+        - East Death Mountain EN*
+        - Death Mountain TR Pegs WN*
+      EasternHyrule:
+        - Zora Waterfall NE
+        - Zoras Domain SW
+        - Zora Waterfall SE*
+        - Zora Approach NE*
+        - River Bend EN*
+        - Potion Shop WN*
+        - River Bend EC*
+        - Potion Shop WC*
+        - River Bend ES*
+        - Potion Shop WS*
+        - River Bend SC*
+        - Wooden Bridge NC*
+        - River Bend SE*
+        - Wooden Bridge NE*
+        - Potion Shop EN*
+        - Zora Approach WN*
+        - Potion Shop EC*
+        - Zora Approach WC*
+        - Wooden Bridge SW*
+        - Sand Dunes NW*
+        - Eastern Palace SW*
+        - Tree Line NW*
+        - Eastern Palace SE*
+        - Eastern Nook NE*
+        - Sand Dunes SC*
+        - Stone Bridge NC*
+        - Stone Bridge EN*
+        - Tree Line WN*
+      Kakariko:
+        - Kakariko ES*
+        - Blacksmith WS*
+        - Kakariko SE*
+        - Kakariko Suburb NE*
+        - Maze Race ES*
+        - Kakariko Suburb WS*
+      CentralHyrule:
+        - Hyrule Castle SW*
+        - Central Bonk Rocks NW*
+        - Hyrule Castle SE*
+        - Links House NE*
+        - Flute Boy SW*
+        - Flute Boy Approach NW*
+        - Flute Boy SC*
+        - Flute Boy Approach NC*
+        - Central Bonk Rocks EN*
+        - Links House WN*
+        - Central Bonk Rocks EC*
+        - Links House WC*
+        - Central Bonk Rocks ES*
+        - Links House WS*
+        - Central Bonk Rocks SW*
+        - C Whirlpool NW*
+        - Links House SC*
+        - Statues NC*
+        - Flute Boy Approach EC*
+        - C Whirlpool WC*
+        - C Whirlpool EN*
+        - Statues WN*
+        - C Whirlpool EC*
+        - Statues WC*
+        - C Whirlpool ES*
+        - Statues WS*
+        - C Whirlpool SC*
+        - Dam NC*
+        - Statues SC*
+        - South Pass NC*
+        - Dam EC*
+        - South Pass WC*
+      LakeHylia:
+        - Stone Bridge WC
+        - Hobo EC
+        - Stone Bridge EC*
+        - Tree Line WC*
+        - Stone Bridge SC*
+        - Lake Hylia NW*
+        - Tree Line SC*
+        - Lake Hylia NC*
+        - Lake Hylia WS*
+        - South Pass ES*
+        - Lake Hylia EC*
+        - Octoballoon WC*
+        - Lake Hylia ES*
+        - Octoballoon WS*
+        - Ice Cave SW*
+        - Octoballoon NW*
+        - Ice Cave SE*
+        - Octoballoon NE*
+      Desert:
+        - Desert EC
+        - Desert Pass WC
+        - Desert ES
+        - Desert Pass WS
+      NorthwestDarkWorld:
+        - Skull Woods EN*
+        - Dark Lumberjack WN*
+        - Skull Woods SW*
+        - Skull Woods Pass NW*
+        - Skull Woods SC*
+        - Skull Woods Pass NE*
+        - Skull Woods SE*
+        - Dark Fortune NE*
+        - Dark Lumberjack SW*
+        - Bumper Cave NW*
+        - Bumper Cave SE*
+        - Outcast Pond NE*
+        - Skull Woods Pass SW*
+        - Village of Outcasts NW*
+        - Skull Woods Pass SE*
+        - Village of Outcasts NC*
+        - Dark Fortune EN*
+        - Outcast Pond WN*
+        - Dark Fortune ES*
+        - Outcast Pond WS*
+        - Dark Fortune SC*
+        - Village of Outcasts NE*
+        - Outcast Pond EN*
+        - Dark Chapel WN*
+        - Outcast Pond ES*
+        - Dark Chapel WS*
+        - Outcast Pond SW*
+        - Shield Shop NW*
+        - Outcast Pond SE*
+        - Shield Shop NE*
+        - Dark Chapel EC*
+        - Dark Graveyard WC*
+        - Dark Graveyard EC*
+        - Qirn Jump WC*
+        - Village of Outcasts ES*
+        - Hammer Pegs WS*
+      DarkDeathMountain:
+        - West Dark Death Mountain EN*
+        - East Dark Death Mountain WN*
+        - West Dark Death Mountain ES*
+        - East Dark Death Mountain WS*
+        - East Dark Death Mountain EN*
+        - Turtle Rock WN*
+      EastDarkWorld:
+        - Catfish SE*
+        - Catfish Approach NE*
+        - Dark Witch EN*
+        - Catfish Approach WN*
+        - Dark Witch EC*
+        - Catfish Approach WC*
+        - Qirn Jump EN*
+        - Dark Witch WN*
+        - Qirn Jump EC*
+        - Dark Witch WC*
+        - Qirn Jump ES*
+        - Dark Witch WS*
+        - Qirn Jump SC*
+        - Broken Bridge NC*
+        - Qirn Jump SE*
+        - Broken Bridge NE*
+        - Broken Bridge SW*
+        - Dark Dunes NW*
+        - Pyramid ES*
+        - Dark Dunes WN*
+        - Dark Dunes SC*
+        - Hammer Bridge NC*
+        - Palace of Darkness SW*
+        - Dark Tree Line NW*
+        - Palace of Darkness SE*
+        - Palace of Darkness Nook NE*
+        - Hammer Bridge EN*
+        - Dark Tree Line WN*
+      SouthDarkWorld:
+        - Dig Game EC
+        - Frog WC
+        - Dig Game ES*
+        - Frog WS*
+        - Frog ES*
+        - Stumpy WS*
+        - Stumpy SW*
+        - Stumpy Approach NW*
+        - Stumpy SC*
+        - Stumpy Approach NC*
+        - Dark Bonk Rocks EN*
+        - Big Bomb Shop WN*
+        - Dark Bonk Rocks EC*
+        - Big Bomb Shop WC*
+        - Dark Bonk Rocks ES*
+        - Big Bomb Shop WS*
+        - Dark Bonk Rocks SW*
+        - Dark C Whirlpool NW*
+        - Big Bomb Shop SC*
+        - Hype Cave NC*
+        - Big Bomb Shop ES*
+        - Hammer Bridge WS*
+        - Hammer Bridge EC*
+        - Dark Tree Line WC*
+        - Hammer Bridge SC*
+        - Ice Lake NW*
+        - Dark Tree Line SC*
+        - Ice Lake NC*
+        - Stumpy Approach EC*
+        - Dark C Whirlpool WC*
+        - Dark C Whirlpool EN*
+        - Hype Cave WN*
+        - Dark C Whirlpool EC*
+        - Hype Cave WC*
+        - Dark C Whirlpool ES*
+        - Hype Cave WS*
+        - Dark C Whirlpool SC*
+        - Swamp NC*
+        - Hype Cave SC*
+        - Dark South Pass NC*
+        - Ice Lake WS*
+        - Dark South Pass ES*
+        - Ice Lake EC*
+        - Bomber Corner WC*
+        - Ice Lake ES*
+        - Bomber Corner WS*
+        - Shopping Mall SW*
+        - Bomber Corner NW*
+        - Shopping Mall SE*
+        - Bomber Corner NE*
+        - Swamp Nook EC*
+        - Swamp WC*
+        - Swamp Nook ES*
+        - Swamp WS*
+        - Swamp EC*
+        - Dark South Pass WC*
+ow-tileflips:
+  1:
+    force_no_flips:
+      - 0x30
+      - 0x3a
+    force_together:
+      LostWoodsPedestal:
+        - 0x00
+        - 0x80
+      ZoraWaterfall:
+        - 0x0f
+        - 0x81
+      MazeRaceSuburb:
+        - 0x28
+        - 0x29

presets/world/owr_quadrantshuffle-full.yaml

@@ -0,0 +1,298 @@
+ow-edges:
+  1:
+    groups:
+      northwest:
+      - Lost Woods NW
+      - Lost Woods EN
+      - Lost Woods SW
+      - Lost Woods SC
+      - Lost Woods SE
+      - Skull Woods EN
+      - Skull Woods SW
+      - Skull Woods SC
+      - Skull Woods SE
+      - Lumberjack WN
+      - Lumberjack SW
+      - Dark Lumberjack WN
+      - Dark Lumberjack SW
+      - Mountain Pass NW
+      - Mountain Pass SE
+      - Bumper Cave NW
+      - Bumper Cave SE
+      - Lost Woods Pass NW
+      - Lost Woods Pass NE
+      - Lost Woods Pass SW
+      - Lost Woods Pass SE
+      - Skull Woods Pass NW
+      - Skull Woods Pass NE
+      - Skull Woods Pass SW
+      - Skull Woods Pass SE
+      - Kakariko Fortune NE
+      - Kakariko Fortune EN
+      - Kakariko Fortune ES
+      - Kakariko Fortune SC
+      - Dark Fortune NE
+      - Dark Fortune EN
+      - Dark Fortune ES
+      - Dark Fortune SC
+      - Kakariko Pond NE
+      - Kakariko Pond WN
+      - Kakariko Pond WS
+      - Kakariko Pond EN
+      - Kakariko Pond ES
+      - Kakariko Pond SW
+      - Kakariko Pond SE
+      - Outcast Pond NE
+      - Outcast Pond WN
+      - Outcast Pond WS
+      - Outcast Pond EN
+      - Outcast Pond ES
+      - Outcast Pond SW
+      - Outcast Pond SE
+      - Sanctuary WN
+      - Sanctuary WS
+      - Kakariko NW
+      - Kakariko NC
+      - Kakariko NE
+      - Dark Chapel WN
+      - Dark Chapel WS
+      - Village of Outcasts NW
+      - Village of Outcasts NC
+      - Village of Outcasts NE
+      - Forgotten Forest NW
+      - Forgotten Forest NE
+      - Forgotten Forest ES
+      - Shield Shop NW
+      - Shield Shop NE
+      - Hyrule Castle WN
+      - Master Sword Meadow SC
+      northeast:
+      - West Death Mountain EN
+      - West Death Mountain ES
+      - West Dark Death Mountain EN
+      - West Dark Death Mountain ES
+      - East Death Mountain WN
+      - East Death Mountain WS
+      - East Death Mountain EN
+      - East Dark Death Mountain WN
+      - East Dark Death Mountain WS
+      - East Dark Death Mountain EN
+      - Death Mountain TR Pegs WN
+      - Turtle Rock WN
+      - Zora Waterfall NE
+      - Zora Waterfall SE
+      - Catfish SE
+      - Graveyard EC
+      - Dark Graveyard EC
+      - River Bend WC
+      - River Bend EN
+      - River Bend EC
+      - River Bend ES
+      - River Bend SW
+      - River Bend SC
+      - River Bend SE
+      - Qirn Jump WC
+      - Qirn Jump EN
+      - Qirn Jump EC
+      - Qirn Jump ES
+      - Qirn Jump SW
+      - Qirn Jump SC
+      - Qirn Jump SE
+      - Potion Shop WN
+      - Potion Shop WC
+      - Potion Shop WS
+      - Potion Shop EN
+      - Potion Shop EC
+      - Dark Witch WN
+      - Dark Witch WC
+      - Dark Witch WS
+      - Dark Witch EN
+      - Dark Witch EC
+      - Zora Approach NE
+      - Zora Approach WN
+      - Zora Approach WC
+      - Catfish Approach NE
+      - Catfish Approach WN
+      - Catfish Approach WC
+      - Wooden Bridge NW
+      - Wooden Bridge NC
+      - Wooden Bridge NE
+      - Broken Bridge NW
+      - Broken Bridge NC
+      - Broken Bridge NE
+      - Zoras Domain SW
+      southwest:
+      - Kakariko ES
+      - Kakariko SE
+      - Village of Outcasts ES
+      - Village of Outcasts SE
+      - Hyrule Castle SW
+      - Pyramid SW
+      - Blacksmith WS
+      - Hammer Pegs WS
+      - Maze Race ES
+      - Dig Game EC
+      - Dig Game ES
+      - Kakariko Suburb NE
+      - Kakariko Suburb WS
+      - Kakariko Suburb ES
+      - Frog NE
+      - Frog WC
+      - Frog WS
+      - Frog ES
+      - Flute Boy WS
+      - Flute Boy SW
+      - Flute Boy SC
+      - Stumpy WS
+      - Stumpy SW
+      - Stumpy SC
+      - Central Bonk Rocks NW
+      - Central Bonk Rocks SW
+      - Dark Bonk Rocks NW
+      - Dark Bonk Rocks SW
+      - Desert EC
+      - Desert ES
+      - Flute Boy Approach NW
+      - Flute Boy Approach NC
+      - Flute Boy Approach EC
+      - Stumpy Approach NW
+      - Stumpy Approach NC
+      - Stumpy Approach EC
+      - C Whirlpool NW
+      - C Whirlpool WC
+      - C Whirlpool SC
+      - Dark C Whirlpool NW
+      - Dark C Whirlpool WC
+      - Dark C Whirlpool SC
+      - Desert Pass WC
+      - Desert Pass WS
+      - Desert Pass EC
+      - Desert Pass ES
+      - Swamp Nook EC
+      - Swamp Nook ES
+      - Dam NC
+      - Dam WC
+      - Dam WS
+      - Swamp NC
+      - Swamp WC
+      - Swamp WS
+      southeast:
+      - Hyrule Castle ES
+      - Hyrule Castle SE
+      - Pyramid ES
+      - Pyramid SE
+      - Eastern Palace SW
+      - Eastern Palace SE
+      - Palace of Darkness SW
+      - Palace of Darkness SE
+      - Sand Dunes WN
+      - Sand Dunes SC
+      - Dark Dunes WN
+      - Dark Dunes SC
+      - Links House NE
+      - Links House SC
+      - Links House ES
+      - Big Bomb Shop NE
+      - Big Bomb Shop SC
+      - Big Bomb Shop ES
+      - Stone Bridge NC
+      - Stone Bridge WC
+      - Stone Bridge WS
+      - Stone Bridge EN
+      - Stone Bridge EC
+      - Stone Bridge SC
+      - Hammer Bridge NC
+      - Hammer Bridge WS
+      - Hammer Bridge EN
+      - Hammer Bridge EC
+      - Hammer Bridge SC
+      - Tree Line NW
+      - Tree Line WN
+      - Tree Line WC
+      - Tree Line SC
+      - Tree Line SE
+      - Dark Tree Line NW
+      - Dark Tree Line WN
+      - Dark Tree Line WC
+      - Dark Tree Line SC
+      - Dark Tree Line SE
+      - Eastern Nook NE
+      - Palace of Darkness Nook NE
+      - Statues NC
+      - Statues SC
+      - Hype Cave NC
+      - Hype Cave SC
+      - Lake Hylia NW
+      - Lake Hylia NC
+      - Lake Hylia NE
+      - Lake Hylia WS
+      - Lake Hylia EC
+      - Lake Hylia ES
+      - Ice Lake NW
+      - Ice Lake NC
+      - Ice Lake NE
+      - Ice Lake WS
+      - Ice Lake EC
+      - Ice Lake ES
+      - Ice Cave SW
+      - Ice Cave SE
+      - Shopping Mall SW
+      - Shopping Mall SE
+      - South Pass NC
+      - South Pass ES
+      - Dark South Pass NC
+      - Dark South Pass ES
+      - Octoballoon NW
+      - Octoballoon NE
+      - Octoballoon WC
+      - Octoballoon WS
+      - Bomber Corner NW
+      - Bomber Corner NE
+      - Bomber Corner WC
+      - Bomber Corner WS
+      - Hobo EC
+      borders:
+      - Zora Whirlpool
+      - Kakariko Pond Whirlpool
+      - Sanctuary EC
+      - Dark Chapel EC
+      - Graveyard WC
+      - Dark Graveyard WC
+      - River Bend Whirlpool
+      - Qirn Jump Whirlpool
+      - Wooden Bridge SW
+      - Broken Bridge SW
+      - Sand Dunes NW
+      - Dark Dunes NW
+      - Central Bonk Rocks EN
+      - Central Bonk Rocks EC
+      - Central Bonk Rocks ES
+      - Dark Bonk Rocks EN
+      - Dark Bonk Rocks EC
+      - Dark Bonk Rocks ES
+      - Links House WN
+      - Links House WC
+      - Links House WS
+      - Big Bomb Shop WN
+      - Big Bomb Shop WC
+      - Big Bomb Shop WS
+      - C Whirlpool EN
+      - C Whirlpool EC
+      - C Whirlpool ES
+      - C Whirlpool
+      - Dark C Whirlpool EN
+      - Dark C Whirlpool EC
+      - Dark C Whirlpool ES
+      - Statues WN
+      - Statues WC
+      - Statues WS
+      - Hype Cave WN
+      - Hype Cave WC
+      - Hype Cave WS
+      - Lake Hylia Whirlpool
+      - Dam EC
+      - Swamp EC
+      - South Pass WC
+      - Dark South Pass WC
+      - Octoballoon Whirlpool
+      - Bomber Corner Whirlpool

presets/world/owr_quadrantshuffle-vanillaborders.yaml

@@ -0,0 +1,275 @@
+settings:
+  1:
+    ow_whirlpool: false
+ow-edges:
+  1:
+    two-way:
+      Sanctuary EC*: Graveyard WC*
+      Dark Chapel EC*: Dark Graveyard WC*
+      Wooden Bridge SW*: Sand Dunes NW*
+      Broken Bridge SW*: Dark Dunes NW*
+      Central Bonk Rocks EN*: Links House WN*
+      Central Bonk Rocks EC*: Links House WC*
+      Central Bonk Rocks ES*: Links House WS*
+      Dark Bonk Rocks EN*: Big Bomb Shop WN*
+      Dark Bonk Rocks EC*: Big Bomb Shop WC*
+      Dark Bonk Rocks ES*: Big Bomb Shop WS*
+      C Whirlpool EN*: Statues WN*
+      C Whirlpool EC*: Statues WC*
+      C Whirlpool ES*: Statues WS*
+      Dark C Whirlpool EN*: Hype Cave WN*
+      Dark C Whirlpool EC*: Hype Cave WC*
+      Dark C Whirlpool ES*: Hype Cave WS*
+      Dam EC*: South Pass WC*
+      Swamp EC*: Dark South Pass WC*
+    groups:
+      northwest:
+      - Lost Woods NW
+      - Lost Woods EN
+      - Lost Woods SW
+      - Lost Woods SC
+      - Lost Woods SE
+      - Skull Woods EN
+      - Skull Woods SW
+      - Skull Woods SC
+      - Skull Woods SE
+      - Lumberjack WN
+      - Lumberjack SW
+      - Dark Lumberjack WN
+      - Dark Lumberjack SW
+      - Mountain Pass NW
+      - Mountain Pass SE
+      - Bumper Cave NW
+      - Bumper Cave SE
+      - Lost Woods Pass NW
+      - Lost Woods Pass NE
+      - Lost Woods Pass SW
+      - Lost Woods Pass SE
+      - Skull Woods Pass NW
+      - Skull Woods Pass NE
+      - Skull Woods Pass SW
+      - Skull Woods Pass SE
+      - Kakariko Fortune NE
+      - Kakariko Fortune EN
+      - Kakariko Fortune ES
+      - Kakariko Fortune SC
+      - Dark Fortune NE
+      - Dark Fortune EN
+      - Dark Fortune ES
+      - Dark Fortune SC
+      - Kakariko Pond NE
+      - Kakariko Pond WN
+      - Kakariko Pond WS
+      - Kakariko Pond EN
+      - Kakariko Pond ES
+      - Kakariko Pond SW
+      - Kakariko Pond SE
+      - Outcast Pond NE
+      - Outcast Pond WN
+      - Outcast Pond WS
+      - Outcast Pond EN
+      - Outcast Pond ES
+      - Outcast Pond SW
+      - Outcast Pond SE
+      - Sanctuary WN
+      - Sanctuary WS
+      - Kakariko NW
+      - Kakariko NC
+      - Kakariko NE
+      - Dark Chapel WN
+      - Dark Chapel WS
+      - Village of Outcasts NW
+      - Village of Outcasts NC
+      - Village of Outcasts NE
+      - Forgotten Forest NW
+      - Forgotten Forest NE
+      - Forgotten Forest ES
+      - Shield Shop NW
+      - Shield Shop NE
+      - Hyrule Castle WN
+      - Master Sword Meadow SC
+      northeast:
+      - West Death Mountain EN
+      - West Death Mountain ES
+      - West Dark Death Mountain EN
+      - West Dark Death Mountain ES
+      - East Death Mountain WN
+      - East Death Mountain WS
+      - East Death Mountain EN
+      - East Dark Death Mountain WN
+      - East Dark Death Mountain WS
+      - East Dark Death Mountain EN
+      - Death Mountain TR Pegs WN
+      - Turtle Rock WN
+      - Zora Waterfall NE
+      - Zora Waterfall SE
+      - Catfish SE
+      - Graveyard EC
+      - Dark Graveyard EC
+      - River Bend WC
+      - River Bend EN
+      - River Bend EC
+      - River Bend ES
+      - River Bend SW
+      - River Bend SC
+      - River Bend SE
+      - Qirn Jump WC
+      - Qirn Jump EN
+      - Qirn Jump EC
+      - Qirn Jump ES
+      - Qirn Jump SW
+      - Qirn Jump SC
+      - Qirn Jump SE
+      - Potion Shop WN
+      - Potion Shop WC
+      - Potion Shop WS
+      - Potion Shop EN
+      - Potion Shop EC
+      - Dark Witch WN
+      - Dark Witch WC
+      - Dark Witch WS
+      - Dark Witch EN
+      - Dark Witch EC
+      - Zora Approach NE
+      - Zora Approach WN
+      - Zora Approach WC
+      - Catfish Approach NE
+      - Catfish Approach WN
+      - Catfish Approach WC
+      - Wooden Bridge NW
+      - Wooden Bridge NC
+      - Wooden Bridge NE
+      - Broken Bridge NW
+      - Broken Bridge NC
+      - Broken Bridge NE
+      - Zoras Domain SW
+      southwest:
+      - Kakariko ES
+      - Kakariko SE
+      - Village of Outcasts ES
+      - Village of Outcasts SE
+      - Hyrule Castle SW
+      - Pyramid SW
+      - Blacksmith WS
+      - Hammer Pegs WS
+      - Maze Race ES
+      - Dig Game EC
+      - Dig Game ES
+      - Kakariko Suburb NE
+      - Kakariko Suburb WS
+      - Kakariko Suburb ES
+      - Frog NE
+      - Frog WC
+      - Frog WS
+      - Frog ES
+      - Flute Boy WS
+      - Flute Boy SW
+      - Flute Boy SC
+      - Stumpy WS
+      - Stumpy SW
+      - Stumpy SC
+      - Central Bonk Rocks NW
+      - Central Bonk Rocks SW
+      - Dark Bonk Rocks NW
+      - Dark Bonk Rocks SW
+      - Desert EC
+      - Desert ES
+      - Flute Boy Approach NW
+      - Flute Boy Approach NC
+      - Flute Boy Approach EC
+      - Stumpy Approach NW
+      - Stumpy Approach NC
+      - Stumpy Approach EC
+      - C Whirlpool NW
+      - C Whirlpool WC
+      - C Whirlpool SC
+      - Dark C Whirlpool NW
+      - Dark C Whirlpool WC
+      - Dark C Whirlpool SC
+      - Desert Pass WC
+      - Desert Pass WS
+      - Desert Pass EC
+      - Desert Pass ES
+      - Swamp Nook EC
+      - Swamp Nook ES
+      - Dam NC
+      - Dam WC
+      - Dam WS
+      - Swamp NC
+      - Swamp WC
+      - Swamp WS
+      southeast:
+      - Hyrule Castle ES
+      - Hyrule Castle SE
+      - Pyramid ES
+      - Pyramid SE
+      - Eastern Palace SW
+      - Eastern Palace SE
+      - Palace of Darkness SW
+      - Palace of Darkness SE
+      - Sand Dunes WN
+      - Sand Dunes SC
+      - Dark Dunes WN
+      - Dark Dunes SC
+      - Links House NE
+      - Links House SC
+      - Links House ES
+      - Big Bomb Shop NE
+      - Big Bomb Shop SC
+      - Big Bomb Shop ES
+      - Stone Bridge NC
+      - Stone Bridge WC
+      - Stone Bridge WS
+      - Stone Bridge EN
+      - Stone Bridge EC
+      - Stone Bridge SC
+      - Hammer Bridge NC
+      - Hammer Bridge WS
+      - Hammer Bridge EN
+      - Hammer Bridge EC
+      - Hammer Bridge SC
+      - Tree Line NW
+      - Tree Line WN
+      - Tree Line WC
+      - Tree Line SC
+      - Tree Line SE
+      - Dark Tree Line NW
+      - Dark Tree Line WN
+      - Dark Tree Line WC
+      - Dark Tree Line SC
+      - Dark Tree Line SE
+      - Eastern Nook NE
+      - Palace of Darkness Nook NE
+      - Statues NC
+      - Statues SC
+      - Hype Cave NC
+      - Hype Cave SC
+      - Lake Hylia NW
+      - Lake Hylia NC
+      - Lake Hylia NE
+      - Lake Hylia WS
+      - Lake Hylia EC
+      - Lake Hylia ES
+      - Ice Lake NW
+      - Ice Lake NC
+      - Ice Lake NE
+      - Ice Lake WS
+      - Ice Lake EC
+      - Ice Lake ES
+      - Ice Cave SW
+      - Ice Cave SE
+      - Shopping Mall SW
+      - Shopping Mall SE
+      - South Pass NC
+      - South Pass ES
+      - Dark South Pass NC
+      - Dark South Pass ES
+      - Octoballoon NW
+      - Octoballoon NE
+      - Octoballoon WC
+      - Octoballoon WS
+      - Bomber Corner NW
+      - Bomber Corner NE
+      - Bomber Corner WC
+      - Bomber Corner WS
+      - Hobo EC

presets/world/owr_shuffle-dark.yaml

@@ -0,0 +1,94 @@
+settings:
+  1:
+    ow_whirlpool: false
+ow-edges:
+  1:
+    two-way:
+      Lost Woods NW: Master Sword Meadow SC
+      Lost Woods EN*: Lumberjack WN*
+      Lost Woods SW*: Lost Woods Pass NW*
+      Lost Woods SC*: Lost Woods Pass NE*
+      Lost Woods SE*: Kakariko Fortune NE*
+      Lumberjack SW*: Mountain Pass NW*
+      West Death Mountain EN*: East Death Mountain WN*
+      West Death Mountain ES*: East Death Mountain WS*
+      East Death Mountain EN*: Death Mountain TR Pegs WN*
+      Mountain Pass SE*: Kakariko Pond NE*
+      Zora Waterfall NE*: Zoras Domain SW*
+      Zora Waterfall SE*: Zora Approach NE*
+      Lost Woods Pass SW*: Kakariko NW*
+      Lost Woods Pass SE*: Kakariko NC*
+      Kakariko Fortune EN*: Kakariko Pond WN*
+      Kakariko Fortune ES*: Kakariko Pond WS*
+      Kakariko Fortune SC*: Kakariko NE*
+      Kakariko Pond EN*: Sanctuary WN*
+      Kakariko Pond ES*: Sanctuary WS*
+      Kakariko Pond SW*: Forgotten Forest NW*
+      Kakariko Pond SE*: Forgotten Forest NE*
+      Sanctuary EC*: Graveyard WC*
+      Graveyard EC*: River Bend WC*
+      River Bend EN*: Potion Shop WN*
+      River Bend EC*: Potion Shop WC*
+      River Bend ES*: Potion Shop WS*
+      River Bend SW*: Wooden Bridge NW*
+      River Bend SC*: Wooden Bridge NC*
+      River Bend SE*: Wooden Bridge NE*
+      Potion Shop EN*: Zora Approach WN*
+      Potion Shop EC*: Zora Approach WC*
+      Kakariko ES*: Blacksmith WS*
+      Kakariko SE*: Kakariko Suburb NE*
+      Forgotten Forest ES: Hyrule Castle WN
+      Hyrule Castle ES*: Sand Dunes WN*
+      Hyrule Castle SW*: Central Bonk Rocks NW*
+      Hyrule Castle SE*: Links House NE*
+      Wooden Bridge SW*: Sand Dunes NW*
+      Eastern Palace SW*: Tree Line NW*
+      Eastern Palace SE*: Eastern Nook NE*
+      Sand Dunes SC*: Stone Bridge NC*
+      Maze Race ES*: Kakariko Suburb WS*
+      Kakariko Suburb ES*: Flute Boy WS*
+      Flute Boy SW*: Flute Boy Approach NW*
+      Flute Boy SC*: Flute Boy Approach NC*
+      Central Bonk Rocks EN*: Links House WN*
+      Central Bonk Rocks EC*: Links House WC*
+      Central Bonk Rocks ES*: Links House WS*
+      Central Bonk Rocks SW*: C Whirlpool NW*
+      Links House SC*: Statues NC*
+      Links House ES*: Stone Bridge WS*
+      Stone Bridge WC: Hobo EC
+      Stone Bridge EN*: Tree Line WN*
+      Stone Bridge EC*: Tree Line WC*
+      Stone Bridge SC*: Lake Hylia NW*
+      Tree Line SC*: Lake Hylia NC*
+      Tree Line SE*: Lake Hylia NE*
+      Desert EC: Desert Pass WC
+      Desert ES: Desert Pass WS
+      Flute Boy Approach EC*: C Whirlpool WC*
+      C Whirlpool EN*: Statues WN*
+      C Whirlpool EC*: Statues WC*
+      C Whirlpool ES*: Statues WS*
+      C Whirlpool SC*: Dam NC*
+      Statues SC*: South Pass NC*
+      Lake Hylia WS*: South Pass ES*
+      Lake Hylia EC*: Octoballoon WC*
+      Lake Hylia ES*: Octoballoon WS*
+      Ice Cave SW*: Octoballoon NW*
+      Ice Cave SE*: Octoballoon NE*
+      Desert Pass EC*: Dam WC*
+      Desert Pass ES*: Dam WS*
+      Dam EC*: South Pass WC*
+ow-whirlpools:
+  1:
+    two-way:
+      Zora Whirlpool: Lake Hylia Whirlpool
+      Kakariko Pond Whirlpool: Octoballoon Whirlpool
+      River Bend Whirlpool: C Whirlpool
+ow-tileflips:
+  1:
+    force_no_flip:
+      - 0x0f
+      - 0x12
+      - 0x15
+      - 0x33
+      - 0x35
+      - 0x3f

presets/world/owr_shuffle-horizontal.yaml

@@ -0,0 +1,76 @@
+ow-edges:
+  1:
+    two-way:
+      Lost Woods NW: Master Sword Meadow SC
+      Lost Woods SW*: Lost Woods Pass NW*
+      Lost Woods SC*: Lost Woods Pass NE*
+      Lost Woods SE*: Kakariko Fortune NE*
+      Skull Woods SW*: Skull Woods Pass NW*
+      Skull Woods SC*: Skull Woods Pass NE*
+      Skull Woods SE*: Dark Fortune NE*
+      Lumberjack SW*: Mountain Pass NW*
+      Dark Lumberjack SW*: Bumper Cave NW*
+      Mountain Pass SE*: Kakariko Pond NE*
+      Bumper Cave SE*: Outcast Pond NE*
+      Zora Waterfall NE: Zoras Domain SW
+      Zora Waterfall SE*: Zora Approach NE*
+      Catfish SE*: Catfish Approach NE*
+      Lost Woods Pass SW*: Kakariko NW*
+      Lost Woods Pass SE*: Kakariko NC*
+      Skull Woods Pass SW*: Village of Outcasts NW*
+      Skull Woods Pass SE*: Village of Outcasts NC*
+      Kakariko Fortune SC*: Kakariko NE*
+      Dark Fortune SC*: Village of Outcasts NE*
+      Kakariko Pond SW*: Forgotten Forest NW*
+      Kakariko Pond SE*: Forgotten Forest NE*
+      Outcast Pond SW*: Shield Shop NW*
+      Outcast Pond SE*: Shield Shop NE*
+      River Bend SW*: Wooden Bridge NW*
+      River Bend SC*: Wooden Bridge NC*
+      River Bend SE*: Wooden Bridge NE*
+      Qirn Jump SW*: Broken Bridge NW*
+      Qirn Jump SC*: Broken Bridge NC*
+      Qirn Jump SE*: Broken Bridge NE*
+      Kakariko SE*: Kakariko Suburb NE*
+      Village of Outcasts SE*: Frog NE*
+      Hyrule Castle SW*: Central Bonk Rocks NW*
+      Hyrule Castle SE*: Links House NE*
+      Pyramid SW*: Dark Bonk Rocks NW*
+      Pyramid SE*: Big Bomb Shop NE*
+      Wooden Bridge SW*: Sand Dunes NW*
+      Broken Bridge SW*: Dark Dunes NW*
+      Eastern Palace SW*: Tree Line NW*
+      Eastern Palace SE*: Eastern Nook NE*
+      Palace of Darkness SW*: Dark Tree Line NW*
+      Palace of Darkness SE*: Palace of Darkness Nook NE*
+      Sand Dunes SC*: Stone Bridge NC*
+      Dark Dunes SC*: Hammer Bridge NC*
+      Flute Boy SW*: Flute Boy Approach NW*
+      Flute Boy SC*: Flute Boy Approach NC*
+      Stumpy SW*: Stumpy Approach NW*
+      Stumpy SC*: Stumpy Approach NC*
+      Central Bonk Rocks SW*: C Whirlpool NW*
+      Dark Bonk Rocks SW*: Dark C Whirlpool NW*
+      Links House SC*: Statues NC*
+      Big Bomb Shop SC*: Hype Cave NC*
+      Stone Bridge SC*: Lake Hylia NW*
+      Hammer Bridge SC*: Ice Lake NW*
+      Tree Line SC*: Lake Hylia NC*
+      Tree Line SE*: Lake Hylia NE*
+      Dark Tree Line SC*: Ice Lake NC*
+      Dark Tree Line SE*: Ice Lake NE*
+      C Whirlpool SC*: Dam NC*
+      Dark C Whirlpool SC*: Swamp NC*
+      Statues SC*: South Pass NC*
+      Hype Cave SC*: Dark South Pass NC*
+      Ice Cave SW*: Octoballoon NW*
+      Ice Cave SE*: Octoballoon NE*
+      Shopping Mall SW*: Bomber Corner NW*
+      Shopping Mall SE*: Bomber Corner NE*
+
+ow-tileflips:
+  1:
+    force_together:
+      Hobo:
+        - 0x2d
+        - 0x80

presets/world/owr_shuffle-horizontalbycolumns.yaml

@@ -0,0 +1,233 @@
+ow-edges:
+  1:
+    two-way:
+      Lost Woods NW: Master Sword Meadow SC
+      Lost Woods SW*: Lost Woods Pass NW*
+      Lost Woods SC*: Lost Woods Pass NE*
+      Lost Woods SE*: Kakariko Fortune NE*
+      Skull Woods SW*: Skull Woods Pass NW*
+      Skull Woods SC*: Skull Woods Pass NE*
+      Skull Woods SE*: Dark Fortune NE*
+      Lumberjack SW*: Mountain Pass NW*
+      Dark Lumberjack SW*: Bumper Cave NW*
+      Mountain Pass SE*: Kakariko Pond NE*
+      Bumper Cave SE*: Outcast Pond NE*
+      Zora Waterfall NE: Zoras Domain SW
+      Zora Waterfall SE*: Zora Approach NE*
+      Catfish SE*: Catfish Approach NE*
+      Lost Woods Pass SW*: Kakariko NW*
+      Lost Woods Pass SE*: Kakariko NC*
+      Skull Woods Pass SW*: Village of Outcasts NW*
+      Skull Woods Pass SE*: Village of Outcasts NC*
+      Kakariko Fortune SC*: Kakariko NE*
+      Dark Fortune SC*: Village of Outcasts NE*
+      Kakariko Pond SW*: Forgotten Forest NW*
+      Kakariko Pond SE*: Forgotten Forest NE*
+      Outcast Pond SW*: Shield Shop NW*
+      Outcast Pond SE*: Shield Shop NE*
+      River Bend SW*: Wooden Bridge NW*
+      River Bend SC*: Wooden Bridge NC*
+      River Bend SE*: Wooden Bridge NE*
+      Qirn Jump SW*: Broken Bridge NW*
+      Qirn Jump SC*: Broken Bridge NC*
+      Qirn Jump SE*: Broken Bridge NE*
+      Kakariko SE*: Kakariko Suburb NE*
+      Village of Outcasts SE*: Frog NE*
+      Hyrule Castle SW*: Central Bonk Rocks NW*
+      Hyrule Castle SE*: Links House NE*
+      Pyramid SW*: Dark Bonk Rocks NW*
+      Pyramid SE*: Big Bomb Shop NE*
+      Wooden Bridge SW*: Sand Dunes NW*
+      Broken Bridge SW*: Dark Dunes NW*
+      Eastern Palace SW*: Tree Line NW*
+      Eastern Palace SE*: Eastern Nook NE*
+      Palace of Darkness SW*: Dark Tree Line NW*
+      Palace of Darkness SE*: Palace of Darkness Nook NE*
+      Sand Dunes SC*: Stone Bridge NC*
+      Dark Dunes SC*: Hammer Bridge NC*
+      Flute Boy SW*: Flute Boy Approach NW*
+      Flute Boy SC*: Flute Boy Approach NC*
+      Stumpy SW*: Stumpy Approach NW*
+      Stumpy SC*: Stumpy Approach NC*
+      Central Bonk Rocks SW*: C Whirlpool NW*
+      Dark Bonk Rocks SW*: Dark C Whirlpool NW*
+      Links House SC*: Statues NC*
+      Big Bomb Shop SC*: Hype Cave NC*
+      Stone Bridge SC*: Lake Hylia NW*
+      Hammer Bridge SC*: Ice Lake NW*
+      Tree Line SC*: Lake Hylia NC*
+      Tree Line SE*: Lake Hylia NE*
+      Dark Tree Line SC*: Ice Lake NC*
+      Dark Tree Line SE*: Ice Lake NE*
+      C Whirlpool SC*: Dam NC*
+      Dark C Whirlpool SC*: Swamp NC*
+      Statues SC*: South Pass NC*
+      Hype Cave SC*: Dark South Pass NC*
+      Ice Cave SW*: Octoballoon NW*
+      Ice Cave SE*: Octoballoon NE*
+      Shopping Mall SW*: Bomber Corner NW*
+      Shopping Mall SE*: Bomber Corner NE*
+    groups:
+      Column1:
+        - Maze Race ES
+        - Kakariko Suburb WS
+        - Dig Game EC
+        - Frog WC
+        - Dig Game ES
+        - Frog WS
+      Column2:
+        - Lost Woods EN
+        - Lumberjack WN
+        - Skull Woods EN
+        - Dark Lumberjack WN
+        - Kakariko Fortune EN
+        - Kakariko Pond WN
+        - Kakariko Fortune ES
+        - Kakariko Pond WS
+        - Dark Fortune EN
+        - Outcast Pond WN
+        - Dark Fortune ES
+        - Outcast Pond WS
+        - Kakariko ES
+        - Blacksmith WS
+        - Village of Outcasts ES
+        - Hammer Pegs WS
+        - Kakariko Suburb ES
+        - Flute Boy WS
+        - Frog ES
+        - Stumpy WS
+        - Desert EC
+        - Desert Pass WC
+        - Desert ES
+        - Desert Pass WS
+      Column3:
+        - Kakariko Pond EN
+        - Sanctuary WN
+        - Kakariko Pond ES
+        - Sanctuary WS
+        - Outcast Pond EN
+        - Dark Chapel WN
+        - Outcast Pond ES
+        - Dark Chapel WS
+        - Forgotten Forest ES
+        - Hyrule Castle WN
+        - Flute Boy Approach EC
+        - C Whirlpool WC
+        - Stumpy Approach EC
+        - Dark C Whirlpool WC
+        - Desert Pass EC
+        - Dam WC
+        - Desert Pass ES
+        - Dam WS
+        - Swamp Nook EC
+        - Swamp WC
+        - Swamp Nook ES
+        - Swamp WS
+      Column4:
+        - Sanctuary EC
+        - Graveyard WC
+        - Dark Chapel EC
+        - Dark Graveyard WC
+        - Central Bonk Rocks EN
+        - Links House WN
+        - Central Bonk Rocks EC
+        - Links House WC
+        - Central Bonk Rocks ES
+        - Links House WS
+        - Dark Bonk Rocks EN
+        - Big Bomb Shop WN
+        - Dark Bonk Rocks EC
+        - Big Bomb Shop WC
+        - Dark Bonk Rocks ES
+        - Big Bomb Shop WS
+        - C Whirlpool EN
+        - Statues WN
+        - C Whirlpool EC
+        - Statues WC
+        - C Whirlpool ES
+        - Statues WS
+        - Dark C Whirlpool EN
+        - Hype Cave WN
+        - Dark C Whirlpool EC
+        - Hype Cave WC
+        - Dark C Whirlpool ES
+        - Hype Cave WS
+        - Dam EC
+        - South Pass WC
+        - Swamp EC
+        - Dark South Pass WC
+      Column5:
+        - West Death Mountain EN
+        - East Death Mountain WN
+        - West Death Mountain ES
+        - East Death Mountain WS
+        - West Dark Death Mountain EN
+        - East Dark Death Mountain WN
+        - West Dark Death Mountain ES
+        - East Dark Death Mountain WS
+        - Graveyard EC
+        - River Bend WC
+        - Dark Graveyard EC
+        - Qirn Jump WC
+        - Hyrule Castle ES
+        - Sand Dunes WN
+        - Pyramid ES
+        - Dark Dunes WN
+        - Links House ES
+        - Stone Bridge WS
+        - Big Bomb Shop ES
+        - Hammer Bridge WS
+        - Lake Hylia WS
+        - South Pass ES
+        - Ice Lake WS
+        - Dark South Pass ES
+      Column6:
+        - River Bend EN
+        - Potion Shop WN
+        - River Bend EC
+        - Potion Shop WC
+        - River Bend ES
+        - Potion Shop WS
+        - Qirn Jump EN
+        - Dark Witch WN
+        - Qirn Jump EC
+        - Dark Witch WC
+        - Qirn Jump ES
+        - Dark Witch WS
+        - Stone Bridge EN
+        - Tree Line WN
+        - Stone Bridge EC
+        - Tree Line WC
+        - Hammer Bridge EN
+        - Dark Tree Line WN
+        - Hammer Bridge EC
+        - Dark Tree Line WC
+        - Stone Bridge WC
+        - Hobo EC
+      Column7:
+        - East Death Mountain EN
+        - Death Mountain TR Pegs WN
+        - East Dark Death Mountain EN
+        - Turtle Rock WN
+        - Potion Shop EN
+        - Zora Approach WN
+        - Potion Shop EC
+        - Zora Approach WC
+        - Dark Witch EN
+        - Catfish Approach WN
+        - Dark Witch EC
+        - Catfish Approach WC
+        - Lake Hylia EC
+        - Octoballoon WC
+        - Lake Hylia ES
+        - Octoballoon WS
+        - Ice Lake EC
+        - Bomber Corner WC
+        - Ice Lake ES
+        - Bomber Corner WS
+ow-tileflips:
+  1:
+    force_together:
+      Hobo:
+        - 0x2d
+        - 0x80

presets/world/owr_shuffle-largescreens.yaml

@@ -0,0 +1,210 @@
+settings:
+  1:
+    ow_whirlpool: false
+ow-edges:
+  1:
+    two-way:
+      Lumberjack SW*: Mountain Pass NW*
+      Dark Lumberjack SW*: Bumper Cave NW*
+      Mountain Pass SE*: Kakariko Pond NE*
+      Bumper Cave SE*: Outcast Pond NE*
+      Zora Waterfall SE*: Zora Approach NE*
+      Catfish SE*: Catfish Approach NE*
+      Kakariko Fortune EN*: Kakariko Pond WN*
+      Kakariko Fortune ES*: Kakariko Pond WS*
+      Dark Fortune EN*: Outcast Pond WN*
+      Dark Fortune ES*: Outcast Pond WS*
+      Kakariko Pond EN*: Sanctuary WN*
+      Kakariko Pond ES*: Sanctuary WS*
+      Kakariko Pond SW*: Forgotten Forest NW*
+      Kakariko Pond SE*: Forgotten Forest NE*
+      Outcast Pond EN*: Dark Chapel WN*
+      Outcast Pond ES*: Dark Chapel WS*
+      Outcast Pond SW*: Shield Shop NW*
+      Outcast Pond SE*: Shield Shop NE*
+      Sanctuary EC*: Graveyard WC*
+      Dark Chapel EC*: Dark Graveyard WC*
+      Graveyard EC*: River Bend WC*
+      Dark Graveyard EC*: Qirn Jump WC*
+      River Bend EN*: Potion Shop WN*
+      River Bend EC*: Potion Shop WC*
+      River Bend ES*: Potion Shop WS*
+      River Bend SW*: Wooden Bridge NW*
+      River Bend SC*: Wooden Bridge NC*
+      River Bend SE*: Wooden Bridge NE*
+      Qirn Jump EN*: Dark Witch WN*
+      Qirn Jump EC*: Dark Witch WC*
+      Qirn Jump ES*: Dark Witch WS*
+      Qirn Jump SW*: Broken Bridge NW*
+      Qirn Jump SC*: Broken Bridge NC*
+      Qirn Jump SE*: Broken Bridge NE*
+      Potion Shop EN*: Zora Approach WN*
+      Potion Shop EC*: Zora Approach WC*
+      Dark Witch EN*: Catfish Approach WN*
+      Dark Witch EC*: Catfish Approach WC*
+      Wooden Bridge SW*: Sand Dunes NW*
+      Broken Bridge SW*: Dark Dunes NW*
+      Sand Dunes SC*: Stone Bridge NC*
+      Dark Dunes SC*: Hammer Bridge NC*
+      Maze Race ES*: Kakariko Suburb WS*
+      Dig Game EC: Frog WC
+      Dig Game ES*: Frog WS*
+      Kakariko Suburb ES*: Flute Boy WS*
+      Frog ES*: Stumpy WS*
+      Flute Boy SW*: Flute Boy Approach NW*
+      Flute Boy SC*: Flute Boy Approach NC*
+      Stumpy SW*: Stumpy Approach NW*
+      Stumpy SC*: Stumpy Approach NC*
+      Central Bonk Rocks EN*: Links House WN*
+      Central Bonk Rocks EC*: Links House WC*
+      Central Bonk Rocks ES*: Links House WS*
+      Central Bonk Rocks SW*: C Whirlpool NW*
+      Dark Bonk Rocks EN*: Big Bomb Shop WN*
+      Dark Bonk Rocks EC*: Big Bomb Shop WC*
+      Dark Bonk Rocks ES*: Big Bomb Shop WS*
+      Dark Bonk Rocks SW*: Dark C Whirlpool NW*
+      Links House SC*: Statues NC*
+      Links House ES*: Stone Bridge WS*
+      Big Bomb Shop SC*: Hype Cave NC*
+      Big Bomb Shop ES*: Hammer Bridge WS*
+      Stone Bridge WC: Hobo EC
+      Stone Bridge EN*: Tree Line WN*
+      Stone Bridge EC*: Tree Line WC*
+      Hammer Bridge EN*: Dark Tree Line WN*
+      Hammer Bridge EC*: Dark Tree Line WC*
+      Flute Boy Approach EC*: C Whirlpool WC*
+      Stumpy Approach EC*: Dark C Whirlpool WC*
+      C Whirlpool EN*: Statues WN*
+      C Whirlpool EC*: Statues WC*
+      C Whirlpool ES*: Statues WS*
+      C Whirlpool SC*: Dam NC*
+      Dark C Whirlpool EN*: Hype Cave WN*
+      Dark C Whirlpool EC*: Hype Cave WC*
+      Dark C Whirlpool ES*: Hype Cave WS*
+      Dark C Whirlpool SC*: Swamp NC*
+      Statues SC*: South Pass NC*
+      Hype Cave SC*: Dark South Pass NC*
+      Ice Cave SW*: Octoballoon NW*
+      Ice Cave SE*: Octoballoon NE*
+      Shopping Mall SW*: Bomber Corner NW*
+      Shopping Mall SE*: Bomber Corner NE*
+      Desert Pass EC*: Dam WC*
+      Desert Pass ES*: Dam WS*
+      Swamp Nook EC*: Swamp WC*
+      Swamp Nook ES*: Swamp WS*
+      Dam EC*: South Pass WC*
+      Swamp EC*: Dark South Pass WC*
+    groups:
+      1:
+        - Lost Woods NW
+        - Master Sword Meadow SC
+        - Lost Woods EN
+        - Lumberjack WN
+        - Skull Woods EN
+        - Dark Lumberjack WN
+        - East Death Mountain EN
+        - Death Mountain TR Pegs WN
+        - East Dark Death Mountain EN
+        - Turtle Rock WN
+        - Lost Woods Pass SW
+        - Kakariko NW
+        - Lost Woods Pass SE
+        - Kakariko NC
+        - Skull Woods Pass SW
+        - Village of Outcasts NW
+        - Skull Woods Pass SE
+        - Village of Outcasts NC
+        - Kakariko Fortune SC
+        - Kakariko NE
+        - Dark Fortune SC
+        - Village of Outcasts NE
+        - Kakariko ES
+        - Blacksmith WS
+        - Village of Outcasts ES
+        - Hammer Pegs WS
+        - Hyrule Castle ES
+        - Sand Dunes WN
+        - Pyramid ES
+        - Dark Dunes WN
+        - Stone Bridge SC
+        - Lake Hylia NW
+        - Hammer Bridge SC
+        - Ice Lake NW
+        - Tree Line SC
+        - Lake Hylia NC
+        - Tree Line SE
+        - Lake Hylia NE
+        - Dark Tree Line SC
+        - Ice Lake NC
+        - Dark Tree Line SE
+        - Ice Lake NE
+        - Desert EC
+        - Desert Pass WC
+        - Desert ES
+        - Desert Pass WS
+        - Lake Hylia EC
+        - Octoballoon WC
+        - Lake Hylia ES
+        - Octoballoon WS
+        - Ice Lake EC
+        - Bomber Corner WC
+        - Ice Lake ES
+        - Bomber Corner WS
+      2:
+        - Lost Woods SW
+        - Lost Woods Pass NW
+        - Lost Woods SC
+        - Lost Woods Pass NE
+        - Lost Woods SE
+        - Kakariko Fortune NE
+        - Skull Woods SW
+        - Skull Woods Pass NW
+        - Skull Woods SC
+        - Skull Woods Pass NE
+        - Skull Woods SE
+        - Dark Fortune NE
+        - Zora Waterfall NE
+        - Zoras Domain SW
+        - Kakariko SE
+        - Kakariko Suburb NE
+        - Village of Outcasts SE
+        - Frog NE
+        - Forgotten Forest ES
+        - Hyrule Castle WN
+        - Hyrule Castle SW
+        - Central Bonk Rocks NW
+        - Hyrule Castle SE
+        - Links House NE
+        - Pyramid SW
+        - Dark Bonk Rocks NW
+        - Pyramid SE
+        - Big Bomb Shop NE
+        - Eastern Palace SW
+        - Tree Line NW
+        - Eastern Palace SE
+        - Eastern Nook NE
+        - Palace of Darkness SW
+        - Dark Tree Line NW
+        - Palace of Darkness SE
+        - Palace of Darkness Nook NE
+        - Lake Hylia WS
+        - South Pass ES
+        - Ice Lake WS
+        - Dark South Pass ES
+        - West Death Mountain EN
+        - East Death Mountain WN
+        - West Death Mountain ES
+        - East Death Mountain WS
+        - West Dark Death Mountain EN
+        - East Dark Death Mountain WN
+        - West Dark Death Mountain ES
+        - East Dark Death Mountain WS
+ow-tileflips:
+  1:
+    force_together:
+      1:
+        - 0x00
+        - 0x80
+      2:
+        - 0x0f
+        - 0x81

presets/world/owr_shuffle-light.yaml

@@ -0,0 +1,84 @@
+ow-edges:
+  1:
+    two-way:
+      Skull Woods EN*: Dark Lumberjack WN*
+      Skull Woods SW*: Skull Woods Pass NW*
+      Skull Woods SC*: Skull Woods Pass NE*
+      Skull Woods SE*: Dark Fortune NE*
+      Dark Lumberjack SW*: Bumper Cave NW*
+      West Dark Death Mountain EN*: East Dark Death Mountain WN*
+      West Dark Death Mountain ES*: East Dark Death Mountain WS*
+      East Dark Death Mountain EN*: Turtle Rock WN*
+      Bumper Cave SE*: Outcast Pond NE*
+      Catfish SE*: Catfish Approach NE*
+      Skull Woods Pass SW*: Village of Outcasts NW*
+      Skull Woods Pass SE*: Village of Outcasts NC*
+      Dark Fortune EN*: Outcast Pond WN*
+      Dark Fortune ES*: Outcast Pond WS*
+      Dark Fortune SC*: Village of Outcasts NE*
+      Outcast Pond EN*: Dark Chapel WN*
+      Outcast Pond ES*: Dark Chapel WS*
+      Outcast Pond SW*: Shield Shop NW*
+      Outcast Pond SE*: Shield Shop NE*
+      Dark Chapel EC*: Dark Graveyard WC*
+      Dark Graveyard EC*: Qirn Jump WC*
+      Qirn Jump EN*: Dark Witch WN*
+      Qirn Jump EC*: Dark Witch WC*
+      Qirn Jump ES*: Dark Witch WS*
+      Qirn Jump SW*: Broken Bridge NW*
+      Qirn Jump SC*: Broken Bridge NC*
+      Qirn Jump SE*: Broken Bridge NE*
+      Dark Witch EN*: Catfish Approach WN*
+      Dark Witch EC*: Catfish Approach WC*
+      Village of Outcasts ES*: Hammer Pegs WS*
+      Village of Outcasts SE*: Frog NE*
+      Pyramid ES*: Dark Dunes WN*
+      Pyramid SW*: Dark Bonk Rocks NW*
+      Pyramid SE*: Big Bomb Shop NE*
+      Broken Bridge SW*: Dark Dunes NW*
+      Palace of Darkness SW*: Dark Tree Line NW*
+      Palace of Darkness SE*: Palace of Darkness Nook NE*
+      Dark Dunes SC*: Hammer Bridge NC*
+      Dig Game EC: Frog WC
+      Dig Game ES*: Frog WS*
+      Frog ES*: Stumpy WS*
+      Stumpy SW*: Stumpy Approach NW*
+      Stumpy SC*: Stumpy Approach NC*
+      Dark Bonk Rocks EN*: Big Bomb Shop WN*
+      Dark Bonk Rocks EC*: Big Bomb Shop WC*
+      Dark Bonk Rocks ES*: Big Bomb Shop WS*
+      Dark Bonk Rocks SW*: Dark C Whirlpool NW*
+      Big Bomb Shop SC*: Hype Cave NC*
+      Big Bomb Shop ES*: Hammer Bridge WS*
+      Hammer Bridge EN*: Dark Tree Line WN*
+      Hammer Bridge EC*: Dark Tree Line WC*
+      Hammer Bridge SC*: Ice Lake NW*
+      Dark Tree Line SC*: Ice Lake NC*
+      Dark Tree Line SE*: Ice Lake NE*
+      Stumpy Approach EC*: Dark C Whirlpool WC*
+      Dark C Whirlpool EN*: Hype Cave WN*
+      Dark C Whirlpool EC*: Hype Cave WC*
+      Dark C Whirlpool ES*: Hype Cave WS*
+      Dark C Whirlpool SC*: Swamp NC*
+      Hype Cave SC*: Dark South Pass NC*
+      Ice Lake WS*: Dark South Pass ES*
+      Ice Lake EC*: Bomber Corner WC*
+      Ice Lake ES*: Bomber Corner WS*
+      Shopping Mall SW*: Bomber Corner NW*
+      Shopping Mall SE*: Bomber Corner NE*
+      Swamp Nook EC*: Swamp WC*
+      Swamp Nook ES*: Swamp WS*
+      Swamp EC*: Dark South Pass WC*
+ow-whirlpools:
+  1:
+    two-way:
+      Qirn Jump Whirlpool: Bomber Corner Whirlpool
+ow-tileflips:
+  1:
+    force_no_flip:
+      - 0x0f
+      - 0x12
+      - 0x15
+      - 0x33
+      - 0x35
+      - 0x3f

presets/world/owr_shuffle-separatemountain.yaml

@@ -0,0 +1,16 @@
+ow-edges:
+  1:
+    groups:
+      mountain:
+      - West Death Mountain EN
+      - West Death Mountain ES
+      - West Dark Death Mountain EN
+      - West Dark Death Mountain ES
+      - East Death Mountain WN
+      - East Death Mountain WS
+      - East Death Mountain EN
+      - East Dark Death Mountain WN
+      - East Dark Death Mountain WS
+      - East Dark Death Mountain EN
+      - Death Mountain TR Pegs WN
+      - Turtle Rock WN

presets/world/owr_shuffle-smallscreens.yaml

@@ -0,0 +1,58 @@
+ow-edges:
+  1:
+    two-way:
+      Lost Woods NW: Master Sword Meadow SC
+      Lost Woods EN*: Lumberjack WN*
+      Lost Woods SW*: Lost Woods Pass NW*
+      Lost Woods SC*: Lost Woods Pass NE*
+      Lost Woods SE*: Kakariko Fortune NE*
+      Skull Woods EN*: Dark Lumberjack WN*
+      Skull Woods SW*: Skull Woods Pass NW*
+      Skull Woods SC*: Skull Woods Pass NE*
+      Skull Woods SE*: Dark Fortune NE*
+      West Death Mountain EN*: East Death Mountain WN*
+      West Death Mountain ES*: East Death Mountain WS*
+      West Dark Death Mountain EN*: East Dark Death Mountain WN*
+      West Dark Death Mountain ES*: East Dark Death Mountain WS*
+      East Death Mountain EN*: Death Mountain TR Pegs WN*
+      East Dark Death Mountain EN*: Turtle Rock WN*
+      Zora Waterfall NE: Zoras Domain SW
+      Lost Woods Pass SW*: Kakariko NW*
+      Lost Woods Pass SE*: Kakariko NC*
+      Skull Woods Pass SW*: Village of Outcasts NW*
+      Skull Woods Pass SE*: Village of Outcasts NC*
+      Kakariko Fortune SC*: Kakariko NE*
+      Dark Fortune SC*: Village of Outcasts NE*
+      Kakariko ES*: Blacksmith WS*
+      Kakariko SE*: Kakariko Suburb NE*
+      Village of Outcasts ES*: Hammer Pegs WS*
+      Village of Outcasts SE*: Frog NE*
+      Forgotten Forest ES: Hyrule Castle WN
+      Hyrule Castle ES*: Sand Dunes WN*
+      Hyrule Castle SW*: Central Bonk Rocks NW*
+      Hyrule Castle SE*: Links House NE*
+      Pyramid ES*: Dark Dunes WN*
+      Pyramid SW*: Dark Bonk Rocks NW*
+      Pyramid SE*: Big Bomb Shop NE*
+      Eastern Palace SW*: Tree Line NW*
+      Eastern Palace SE*: Eastern Nook NE*
+      Palace of Darkness SW*: Dark Tree Line NW*
+      Palace of Darkness SE*: Palace of Darkness Nook NE*
+      Stone Bridge SC*: Lake Hylia NW*
+      Hammer Bridge SC*: Ice Lake NW*
+      Tree Line SC*: Lake Hylia NC*
+      Tree Line SE*: Lake Hylia NE*
+      Dark Tree Line SC*: Ice Lake NC*
+      Dark Tree Line SE*: Ice Lake NE*
+      Desert EC: Desert Pass WC
+      Desert ES: Desert Pass WS
+      Lake Hylia WS*: South Pass ES*
+      Lake Hylia EC*: Octoballoon WC*
+      Lake Hylia ES*: Octoballoon WS*
+      Ice Lake WS*: Dark South Pass ES*
+      Ice Lake EC*: Bomber Corner WC*
+      Ice Lake ES*: Bomber Corner WS*
+ow-whirlpools:
+  1:
+    two-way:
+      Zora Whirlpool: Lake Hylia Whirlpool

presets/world/owr_shuffle-vanillaloop.yaml

@@ -0,0 +1,41 @@
+ow-edges:
+  1:
+    two-way:
+      Lost Woods EN*: Lumberjack WN*
+      Lost Woods SW*: Lost Woods Pass NW*
+      Skull Woods EN*: Dark Lumberjack WN*
+      Skull Woods SW*: Skull Woods Pass NW*
+      Lumberjack SW*: Mountain Pass NW*
+      Dark Lumberjack SW*: Bumper Cave NW*
+      Mountain Pass SE*: Kakariko Pond NE*
+      Bumper Cave SE*: Outcast Pond NE*
+      Lost Woods Pass SW*: Kakariko NW*
+      Skull Woods Pass SW*: Village of Outcasts NW*
+      Kakariko Pond ES*: Sanctuary WS*
+      Outcast Pond ES*: Dark Chapel WS*
+      Sanctuary EC*: Graveyard WC*
+      Dark Chapel EC*: Dark Graveyard WC*
+      Graveyard EC*: River Bend WC*
+      Dark Graveyard EC*: Qirn Jump WC*
+      River Bend SW*: Wooden Bridge NW*
+      Qirn Jump SW*: Broken Bridge NW*
+      Kakariko SE*: Kakariko Suburb NE*
+      Village of Outcasts SE*: Frog NE*
+      Hyrule Castle SW*: Central Bonk Rocks NW*
+      Hyrule Castle SE*: Links House NE*
+      Pyramid SW*: Dark Bonk Rocks NW*
+      Pyramid SE*: Big Bomb Shop NE*
+      Wooden Bridge SW*: Sand Dunes NW*
+      Broken Bridge SW*: Dark Dunes NW*
+      Sand Dunes SC*: Stone Bridge NC*
+      Dark Dunes SC*: Hammer Bridge NC*
+      Kakariko Suburb ES*: Flute Boy WS*
+      Frog ES*: Stumpy WS*
+      Flute Boy SW*: Flute Boy Approach NW*
+      Stumpy SW*: Stumpy Approach NW*
+      Central Bonk Rocks SW*: C Whirlpool NW*
+      Dark Bonk Rocks SW*: Dark C Whirlpool NW*
+      Links House ES*: Stone Bridge WS*
+      Big Bomb Shop ES*: Hammer Bridge WS*
+      Flute Boy Approach EC*: C Whirlpool WC*
+      Stumpy Approach EC*: Dark C Whirlpool WC*

presets/world/owr_shuffle-vertical.yaml

@@ -0,0 +1,87 @@
+ow-edges:
+  1:
+    two-way:
+      Lost Woods EN*: Lumberjack WN*
+      Skull Woods EN*: Dark Lumberjack WN*
+      West Death Mountain EN*: East Death Mountain WN*
+      West Death Mountain ES*: East Death Mountain WS*
+      West Dark Death Mountain EN*: East Dark Death Mountain WN*
+      West Dark Death Mountain ES*: East Dark Death Mountain WS*
+      East Death Mountain EN*: Death Mountain TR Pegs WN*
+      East Dark Death Mountain EN*: Turtle Rock WN*
+      Kakariko Fortune EN*: Kakariko Pond WN*
+      Kakariko Fortune ES*: Kakariko Pond WS*
+      Dark Fortune EN*: Outcast Pond WN*
+      Dark Fortune ES*: Outcast Pond WS*
+      Kakariko Pond EN*: Sanctuary WN*
+      Kakariko Pond ES*: Sanctuary WS*
+      Outcast Pond EN*: Dark Chapel WN*
+      Outcast Pond ES*: Dark Chapel WS*
+      Sanctuary EC*: Graveyard WC*
+      Dark Chapel EC*: Dark Graveyard WC*
+      Graveyard EC*: River Bend WC*
+      Dark Graveyard EC*: Qirn Jump WC*
+      River Bend EN*: Potion Shop WN*
+      River Bend EC*: Potion Shop WC*
+      River Bend ES*: Potion Shop WS*
+      Qirn Jump EN*: Dark Witch WN*
+      Qirn Jump EC*: Dark Witch WC*
+      Qirn Jump ES*: Dark Witch WS*
+      Potion Shop EN*: Zora Approach WN*
+      Potion Shop EC*: Zora Approach WC*
+      Dark Witch EN*: Catfish Approach WN*
+      Dark Witch EC*: Catfish Approach WC*
+      Kakariko ES*: Blacksmith WS*
+      Village of Outcasts ES*: Hammer Pegs WS*
+      Forgotten Forest ES: Hyrule Castle WN
+      Hyrule Castle ES*: Sand Dunes WN*
+      Pyramid ES*: Dark Dunes WN*
+      Maze Race ES*: Kakariko Suburb WS*
+      Dig Game EC: Frog WC
+      Dig Game ES*: Frog WS*
+      Kakariko Suburb ES*: Flute Boy WS*
+      Frog ES*: Stumpy WS*
+      Central Bonk Rocks EN*: Links House WN*
+      Central Bonk Rocks EC*: Links House WC*
+      Central Bonk Rocks ES*: Links House WS*
+      Dark Bonk Rocks EN*: Big Bomb Shop WN*
+      Dark Bonk Rocks EC*: Big Bomb Shop WC*
+      Dark Bonk Rocks ES*: Big Bomb Shop WS*
+      Links House ES*: Stone Bridge WS*
+      Big Bomb Shop ES*: Hammer Bridge WS*
+      Stone Bridge WC: Hobo EC
+      Stone Bridge EN*: Tree Line WN*
+      Stone Bridge EC*: Tree Line WC*
+      Hammer Bridge EN*: Dark Tree Line WN*
+      Hammer Bridge EC*: Dark Tree Line WC*
+      Desert EC: Desert Pass WC
+      Desert ES: Desert Pass WS
+      Flute Boy Approach EC*: C Whirlpool WC*
+      Stumpy Approach EC*: Dark C Whirlpool WC*
+      C Whirlpool EN*: Statues WN*
+      C Whirlpool EC*: Statues WC*
+      C Whirlpool ES*: Statues WS*
+      Dark C Whirlpool EN*: Hype Cave WN*
+      Dark C Whirlpool EC*: Hype Cave WC*
+      Dark C Whirlpool ES*: Hype Cave WS*
+      Lake Hylia WS*: South Pass ES*
+      Lake Hylia EC*: Octoballoon WC*
+      Lake Hylia ES*: Octoballoon WS*
+      Ice Lake WS*: Dark South Pass ES*
+      Ice Lake EC*: Bomber Corner WC*
+      Ice Lake ES*: Bomber Corner WS*
+      Desert Pass EC*: Dam WC*
+      Desert Pass ES*: Dam WS*
+      Swamp Nook EC*: Swamp WC*
+      Swamp Nook ES*: Swamp WS*
+      Dam EC*: South Pass WC*
+      Swamp EC*: Dark South Pass WC*
+ow-tileflips:
+  1:
+    force_together:
+      1:
+        - 0x00
+        - 0x80
+      2:
+        - 0x0f
+        - 0x81

presets/world/owr_shuffle-verticalbyrows.yaml

@@ -0,0 +1,227 @@
+ow-edges:
+  1:
+    two-way:
+      Lost Woods EN*: Lumberjack WN*
+      Skull Woods EN*: Dark Lumberjack WN*
+      West Death Mountain EN*: East Death Mountain WN*
+      West Death Mountain ES*: East Death Mountain WS*
+      West Dark Death Mountain EN*: East Dark Death Mountain WN*
+      West Dark Death Mountain ES*: East Dark Death Mountain WS*
+      East Death Mountain EN*: Death Mountain TR Pegs WN*
+      East Dark Death Mountain EN*: Turtle Rock WN*
+      Kakariko Fortune EN*: Kakariko Pond WN*
+      Kakariko Fortune ES*: Kakariko Pond WS*
+      Dark Fortune EN*: Outcast Pond WN*
+      Dark Fortune ES*: Outcast Pond WS*
+      Kakariko Pond EN*: Sanctuary WN*
+      Kakariko Pond ES*: Sanctuary WS*
+      Outcast Pond EN*: Dark Chapel WN*
+      Outcast Pond ES*: Dark Chapel WS*
+      Sanctuary EC*: Graveyard WC*
+      Dark Chapel EC*: Dark Graveyard WC*
+      Graveyard EC*: River Bend WC*
+      Dark Graveyard EC*: Qirn Jump WC*
+      River Bend EN*: Potion Shop WN*
+      River Bend EC*: Potion Shop WC*
+      River Bend ES*: Potion Shop WS*
+      Qirn Jump EN*: Dark Witch WN*
+      Qirn Jump EC*: Dark Witch WC*
+      Qirn Jump ES*: Dark Witch WS*
+      Potion Shop EN*: Zora Approach WN*
+      Potion Shop EC*: Zora Approach WC*
+      Dark Witch EN*: Catfish Approach WN*
+      Dark Witch EC*: Catfish Approach WC*
+      Kakariko ES*: Blacksmith WS*
+      Village of Outcasts ES*: Hammer Pegs WS*
+      Forgotten Forest ES: Hyrule Castle WN
+      Hyrule Castle ES*: Sand Dunes WN*
+      Pyramid ES*: Dark Dunes WN*
+      Maze Race ES*: Kakariko Suburb WS*
+      Dig Game EC: Frog WC
+      Dig Game ES*: Frog WS*
+      Kakariko Suburb ES*: Flute Boy WS*
+      Frog ES*: Stumpy WS*
+      Central Bonk Rocks EN*: Links House WN*
+      Central Bonk Rocks EC*: Links House WC*
+      Central Bonk Rocks ES*: Links House WS*
+      Dark Bonk Rocks EN*: Big Bomb Shop WN*
+      Dark Bonk Rocks EC*: Big Bomb Shop WC*
+      Dark Bonk Rocks ES*: Big Bomb Shop WS*
+      Links House ES*: Stone Bridge WS*
+      Big Bomb Shop ES*: Hammer Bridge WS*
+      Stone Bridge WC: Hobo EC
+      Stone Bridge EN*: Tree Line WN*
+      Stone Bridge EC*: Tree Line WC*
+      Hammer Bridge EN*: Dark Tree Line WN*
+      Hammer Bridge EC*: Dark Tree Line WC*
+      Desert EC: Desert Pass WC
+      Desert ES: Desert Pass WS
+      Flute Boy Approach EC*: C Whirlpool WC*
+      Stumpy Approach EC*: Dark C Whirlpool WC*
+      C Whirlpool EN*: Statues WN*
+      C Whirlpool EC*: Statues WC*
+      C Whirlpool ES*: Statues WS*
+      Dark C Whirlpool EN*: Hype Cave WN*
+      Dark C Whirlpool EC*: Hype Cave WC*
+      Dark C Whirlpool ES*: Hype Cave WS*
+      Lake Hylia WS*: South Pass ES*
+      Lake Hylia EC*: Octoballoon WC*
+      Lake Hylia ES*: Octoballoon WS*
+      Ice Lake WS*: Dark South Pass ES*
+      Ice Lake EC*: Bomber Corner WC*
+      Ice Lake ES*: Bomber Corner WS*
+      Desert Pass EC*: Dam WC*
+      Desert Pass ES*: Dam WS*
+      Swamp Nook EC*: Swamp WC*
+      Swamp Nook ES*: Swamp WS*
+      Dam EC*: South Pass WC*
+      Swamp EC*: Dark South Pass WC*
+    groups:
+      Row1/Special:
+        - Lost Woods NW
+        - Master Sword Meadow SC
+        - Lumberjack SW
+        - Mountain Pass NW
+        - Dark Lumberjack SW
+        - Bumper Cave NW
+        - Zora Waterfall NE
+        - Zoras Domain SW
+      Row2:
+        - Lost Woods SW
+        - Lost Woods Pass NW
+        - Lost Woods SC
+        - Lost Woods Pass NE
+        - Lost Woods SE
+        - Kakariko Fortune NE
+        - Skull Woods SW
+        - Skull Woods Pass NW
+        - Skull Woods SC
+        - Skull Woods Pass NE
+        - Skull Woods SE
+        - Dark Fortune NE
+        - Mountain Pass SE
+        - Kakariko Pond NE
+        - Bumper Cave SE
+        - Outcast Pond NE
+        - Zora Waterfall SE
+        - Zora Approach NE
+        - Catfish SE
+        - Catfish Approach NE
+      Row3:
+        - Lost Woods Pass SW
+        - Kakariko NW
+        - Lost Woods Pass SE
+        - Kakariko NC
+        - Skull Woods Pass SW
+        - Village of Outcasts NW
+        - Skull Woods Pass SE
+        - Village of Outcasts NC
+        - Kakariko Fortune SC
+        - Kakariko NE
+        - Dark Fortune SC
+        - Village of Outcasts NE
+        - Kakariko Pond SW
+        - Forgotten Forest NW
+        - Kakariko Pond SE
+        - Forgotten Forest NE
+        - Outcast Pond SW
+        - Shield Shop NW
+        - Outcast Pond SE
+        - Shield Shop NE
+        - River Bend SW
+        - Wooden Bridge NW
+        - River Bend SC
+        - Wooden Bridge NC
+        - River Bend SE
+        - Wooden Bridge NE
+        - Qirn Jump SW
+        - Broken Bridge NW
+        - Qirn Jump SC
+        - Broken Bridge NC
+        - Qirn Jump SE
+        - Broken Bridge NE
+      Row4:
+        - Wooden Bridge SW
+        - Sand Dunes NW
+        - Broken Bridge SW
+        - Dark Dunes NW
+      Row5:
+        - Kakariko SE
+        - Kakariko Suburb NE
+        - Village of Outcasts SE
+        - Frog NE
+        - Hyrule Castle SW
+        - Central Bonk Rocks NW
+        - Hyrule Castle SE
+        - Links House NE
+        - Pyramid SW
+        - Dark Bonk Rocks NW
+        - Pyramid SE
+        - Big Bomb Shop NE
+        - Sand Dunes SC
+        - Stone Bridge NC
+        - Dark Dunes SC
+        - Hammer Bridge NC
+        - Eastern Palace SW
+        - Tree Line NW
+        - Eastern Palace SE
+        - Eastern Nook NE
+        - Palace of Darkness SW
+        - Dark Tree Line NW
+        - Palace of Darkness SE
+        - Palace of Darkness Nook NE
+      Row6:
+        - Flute Boy SW
+        - Flute Boy Approach NW
+        - Flute Boy SC
+        - Flute Boy Approach NC
+        - Stumpy SW
+        - Stumpy Approach NW
+        - Stumpy SC
+        - Stumpy Approach NC
+        - Central Bonk Rocks SW
+        - C Whirlpool NW
+        - Dark Bonk Rocks SW
+        - Dark C Whirlpool NW
+        - Links House SC
+        - Statues NC
+        - Big Bomb Shop SC
+        - Hype Cave NC
+        - Stone Bridge SC
+        - Lake Hylia NW
+        - Hammer Bridge SC
+        - Ice Lake NW
+        - Tree Line SC
+        - Lake Hylia NC
+        - Tree Line SE
+        - Lake Hylia NE
+        - Dark Tree Line SC
+        - Ice Lake NC
+        - Dark Tree Line SE
+        - Ice Lake NE
+      Row7:
+        - C Whirlpool SC
+        - Dam NC
+        - Dark C Whirlpool SC
+        - Swamp NC
+        - Statues SC
+        - South Pass NC
+        - Hype Cave SC
+        - Dark South Pass NC
+        - Ice Cave SW
+        - Octoballoon NW
+        - Ice Cave SE
+        - Octoballoon NE
+        - Shopping Mall SW
+        - Bomber Corner NW
+        - Shopping Mall SE
+        - Bomber Corner NE
+ow-tileflips:
+  1:
+    force_together:
+      1:
+        - 0x00
+        - 0x80
+      2:
+        - 0x0f
+        - 0x81

presets/world/owr_vanilla-mirroredsimilar.yaml

@@ -0,0 +1,148 @@
+settings:
+  1:
+    ow_shuffle: full
+    ow_terrain: true
+ow-edges:
+  1:
+    two-way:
+      Lost Woods NW: Master Sword Meadow SC
+      Lost Woods EN*: Lumberjack WN*
+      Lost Woods SW*: Lost Woods Pass NE*
+      Lost Woods SC*: Lost Woods Pass NW*
+      Lost Woods SE*: Kakariko Fortune NE*
+      Skull Woods EN*: Dark Lumberjack WN*
+      Skull Woods SW*: Skull Woods Pass NE*
+      Skull Woods SC*: Skull Woods Pass NW*
+      Skull Woods SE*: Dark Fortune NE*
+      Lumberjack SW*: Mountain Pass NW*
+      Dark Lumberjack SW*: Bumper Cave NW*
+      West Death Mountain EN*: East Death Mountain WN*
+      West Death Mountain ES*: East Death Mountain WS*
+      West Dark Death Mountain EN*: East Dark Death Mountain WN*
+      West Dark Death Mountain ES*: East Dark Death Mountain WS*
+      East Death Mountain EN*: Death Mountain TR Pegs WN*
+      East Dark Death Mountain EN*: Turtle Rock WN*
+      Mountain Pass SE*: Kakariko Pond NE*
+      Bumper Cave SE*: Outcast Pond NE*
+      Zora Waterfall NE: Zoras Domain SW
+      Zora Waterfall SE*: Zora Approach NE*
+      Catfish SE*: Catfish Approach NE*
+      Lost Woods Pass SW*: Kakariko NC*
+      Lost Woods Pass SE*: Kakariko NW*
+      Skull Woods Pass SW*: Village of Outcasts NC*
+      Skull Woods Pass SE*: Village of Outcasts NW*
+      Kakariko Fortune EN*: Kakariko Pond WS*
+      Kakariko Fortune ES*: Kakariko Pond WN*
+      Kakariko Fortune SC*: Kakariko NE*
+      Dark Fortune EN*: Outcast Pond WS*
+      Dark Fortune ES*: Outcast Pond WN*
+      Dark Fortune SC*: Village of Outcasts NE*
+      Kakariko Pond EN*: Sanctuary WS*
+      Kakariko Pond ES*: Sanctuary WN*
+      Kakariko Pond SW*: Forgotten Forest NE*
+      Kakariko Pond SE*: Forgotten Forest NW*
+      Outcast Pond EN*: Dark Chapel WS*
+      Outcast Pond ES*: Dark Chapel WN*
+      Outcast Pond SW*: Shield Shop NE*
+      Outcast Pond SE*: Shield Shop NW*
+      Sanctuary EC*: Graveyard WC*
+      Dark Chapel EC*: Dark Graveyard WC*
+      Graveyard EC*: River Bend WC*
+      Dark Graveyard EC*: Qirn Jump WC*
+      River Bend EN*: Potion Shop WS*
+      River Bend EC*: Potion Shop WC*
+      River Bend ES*: Potion Shop WN*
+      River Bend SW*: Wooden Bridge NE*
+      River Bend SC*: Wooden Bridge NC*
+      River Bend SE*: Wooden Bridge NW*
+      Qirn Jump EN*: Dark Witch WS*
+      Qirn Jump EC*: Dark Witch WC*
+      Qirn Jump ES*: Dark Witch WN*
+      Qirn Jump SW*: Broken Bridge NE*
+      Qirn Jump SC*: Broken Bridge NC*
+      Qirn Jump SE*: Broken Bridge NW*
+      Potion Shop EN*: Zora Approach WC*
+      Potion Shop EC*: Zora Approach WN*
+      Dark Witch EN*: Catfish Approach WC*
+      Dark Witch EC*: Catfish Approach WN*
+      Kakariko ES*: Blacksmith WS*
+      Kakariko SE*: Kakariko Suburb NE*
+      Village of Outcasts ES*: Hammer Pegs WS*
+      Village of Outcasts SE*: Frog NE*
+      Forgotten Forest ES: Hyrule Castle WN
+      Hyrule Castle ES*: Sand Dunes WN*
+      Hyrule Castle SW*: Central Bonk Rocks NW*
+      Hyrule Castle SE*: Links House NE*
+      Pyramid ES*: Dark Dunes WN*
+      Pyramid SW*: Dark Bonk Rocks NW*
+      Pyramid SE*: Big Bomb Shop NE*
+      Wooden Bridge SW*: Sand Dunes NW*
+      Broken Bridge SW*: Dark Dunes NW*
+      Eastern Palace SW*: Tree Line NW*
+      Eastern Palace SE*: Eastern Nook NE*
+      Palace of Darkness SW*: Dark Tree Line NW*
+      Palace of Darkness SE*: Palace of Darkness Nook NE*
+      Sand Dunes SC*: Stone Bridge NC*
+      Dark Dunes SC*: Hammer Bridge NC*
+      Maze Race ES*: Kakariko Suburb WS*
+      Dig Game EC: Frog WS
+      Dig Game ES*: Frog WC*
+      Kakariko Suburb ES*: Flute Boy WS*
+      Frog ES*: Stumpy WS*
+      Flute Boy SW*: Flute Boy Approach NC*
+      Flute Boy SC*: Flute Boy Approach NW*
+      Stumpy SW*: Stumpy Approach NC*
+      Stumpy SC*: Stumpy Approach NW*
+      Central Bonk Rocks EN*: Links House WS*
+      Central Bonk Rocks EC*: Links House WC*
+      Central Bonk Rocks ES*: Links House WN*
+      Central Bonk Rocks SW*: C Whirlpool NW*
+      Dark Bonk Rocks EN*: Big Bomb Shop WS*
+      Dark Bonk Rocks EC*: Big Bomb Shop WC*
+      Dark Bonk Rocks ES*: Big Bomb Shop WN*
+      Dark Bonk Rocks SW*: Dark C Whirlpool NW*
+      Links House SC*: Statues NC*
+      Links House ES*: Stone Bridge WS*
+      Big Bomb Shop SC*: Hype Cave NC*
+      Big Bomb Shop ES*: Hammer Bridge WS*
+      Stone Bridge WC: Hobo EC
+      Stone Bridge EN*: Tree Line WC*
+      Stone Bridge EC*: Tree Line WN*
+      Stone Bridge SC*: Lake Hylia NW*
+      Hammer Bridge EN*: Dark Tree Line WC*
+      Hammer Bridge EC*: Dark Tree Line WN*
+      Hammer Bridge SC*: Ice Lake NW*
+      Tree Line SC*: Lake Hylia NE*
+      Tree Line SE*: Lake Hylia NC*
+      Dark Tree Line SC*: Ice Lake NE*
+      Dark Tree Line SE*: Ice Lake NC*
+      Desert EC: Desert Pass WS
+      Desert ES: Desert Pass WC
+      Flute Boy Approach EC*: C Whirlpool WC*
+      Stumpy Approach EC*: Dark C Whirlpool WC*
+      C Whirlpool EN*: Statues WS*
+      C Whirlpool EC*: Statues WC*
+      C Whirlpool ES*: Statues WN*
+      C Whirlpool SC*: Dam NC*
+      Dark C Whirlpool EN*: Hype Cave WS*
+      Dark C Whirlpool EC*: Hype Cave WC*
+      Dark C Whirlpool ES*: Hype Cave WN*
+      Dark C Whirlpool SC*: Swamp NC*
+      Statues SC*: South Pass NC*
+      Hype Cave SC*: Dark South Pass NC*
+      Lake Hylia WS*: South Pass ES*
+      Lake Hylia EC*: Octoballoon WS*
+      Lake Hylia ES*: Octoballoon WC*
+      Ice Lake WS*: Dark South Pass ES*
+      Ice Lake EC*: Bomber Corner WS*
+      Ice Lake ES*: Bomber Corner WC*
+      Ice Cave SW*: Octoballoon NE*
+      Ice Cave SE*: Octoballoon NW*
+      Shopping Mall SW*: Bomber Corner NE*
+      Shopping Mall SE*: Bomber Corner NW*
+      Desert Pass EC*: Dam WS*
+      Desert Pass ES*: Dam WC*
+      Swamp Nook EC*: Swamp WS*
+      Swamp Nook ES*: Swamp WC*
+      Dam EC*: South Pass WC*
+      Swamp EC*: Dark South Pass WC

presets/world/owr_vanilla.yaml

@@ -0,0 +1,190 @@
+ow-edges:
+  1:
+    two-way:
+      Lumberjack SW*: Mountain Pass NW*
+      Dark Lumberjack SW*: Bumper Cave NW*
+      Mountain Pass SE*: Kakariko Pond NE*
+      Bumper Cave SE*: Outcast Pond NE*
+      Zora Waterfall SE*: Zora Approach NE*
+      Catfish SE*: Catfish Approach NE*
+      Kakariko Fortune EN*: Kakariko Pond WN*
+      Kakariko Fortune ES*: Kakariko Pond WS*
+      Dark Fortune EN*: Outcast Pond WN*
+      Dark Fortune ES*: Outcast Pond WS*
+      Kakariko Pond EN*: Sanctuary WN*
+      Kakariko Pond ES*: Sanctuary WS*
+      Kakariko Pond SW*: Forgotten Forest NW*
+      Kakariko Pond SE*: Forgotten Forest NE*
+      Outcast Pond EN*: Dark Chapel WN*
+      Outcast Pond ES*: Dark Chapel WS*
+      Outcast Pond SW*: Shield Shop NW*
+      Outcast Pond SE*: Shield Shop NE*
+      Sanctuary EC*: Graveyard WC*
+      Dark Chapel EC*: Dark Graveyard WC*
+      Graveyard EC*: River Bend WC*
+      Dark Graveyard EC*: Qirn Jump WC*
+      River Bend EN*: Potion Shop WN*
+      River Bend EC*: Potion Shop WC*
+      River Bend ES*: Potion Shop WS*
+      River Bend SW*: Wooden Bridge NW*
+      River Bend SC*: Wooden Bridge NC*
+      River Bend SE*: Wooden Bridge NE*
+      Qirn Jump EN*: Dark Witch WN*
+      Qirn Jump EC*: Dark Witch WC*
+      Qirn Jump ES*: Dark Witch WS*
+      Qirn Jump SW*: Broken Bridge NW*
+      Qirn Jump SC*: Broken Bridge NC*
+      Qirn Jump SE*: Broken Bridge NE*
+      Potion Shop EN*: Zora Approach WN*
+      Potion Shop EC*: Zora Approach WC*
+      Dark Witch EN*: Catfish Approach WN*
+      Dark Witch EC*: Catfish Approach WC*
+      Wooden Bridge SW*: Sand Dunes NW*
+      Broken Bridge SW*: Dark Dunes NW*
+      Sand Dunes SC*: Stone Bridge NC*
+      Dark Dunes SC*: Hammer Bridge NC*
+      Maze Race ES*: Kakariko Suburb WS*
+      Dig Game EC: Frog WC
+      Dig Game ES*: Frog WS*
+      Kakariko Suburb ES*: Flute Boy WS*
+      Frog ES*: Stumpy WS*
+      Flute Boy SW*: Flute Boy Approach NW*
+      Flute Boy SC*: Flute Boy Approach NC*
+      Stumpy SW*: Stumpy Approach NW*
+      Stumpy SC*: Stumpy Approach NC*
+      Central Bonk Rocks EN*: Links House WN*
+      Central Bonk Rocks EC*: Links House WC*
+      Central Bonk Rocks ES*: Links House WS*
+      Central Bonk Rocks SW*: C Whirlpool NW*
+      Dark Bonk Rocks EN*: Big Bomb Shop WN*
+      Dark Bonk Rocks EC*: Big Bomb Shop WC*
+      Dark Bonk Rocks ES*: Big Bomb Shop WS*
+      Dark Bonk Rocks SW*: Dark C Whirlpool NW*
+      Links House SC*: Statues NC*
+      Links House ES*: Stone Bridge WS*
+      Big Bomb Shop SC*: Hype Cave NC*
+      Big Bomb Shop ES*: Hammer Bridge WS*
+      Stone Bridge WC: Hobo EC
+      Stone Bridge EN*: Tree Line WN*
+      Stone Bridge EC*: Tree Line WC*
+      Hammer Bridge EN*: Dark Tree Line WN*
+      Hammer Bridge EC*: Dark Tree Line WC*
+      Flute Boy Approach EC*: C Whirlpool WC*
+      Stumpy Approach EC*: Dark C Whirlpool WC*
+      C Whirlpool EN*: Statues WN*
+      C Whirlpool EC*: Statues WC*
+      C Whirlpool ES*: Statues WS*
+      C Whirlpool SC*: Dam NC*
+      Dark C Whirlpool EN*: Hype Cave WN*
+      Dark C Whirlpool EC*: Hype Cave WC*
+      Dark C Whirlpool ES*: Hype Cave WS*
+      Dark C Whirlpool SC*: Swamp NC*
+      Statues SC*: South Pass NC*
+      Hype Cave SC*: Dark South Pass NC*
+      Ice Cave SW*: Octoballoon NW*
+      Ice Cave SE*: Octoballoon NE*
+      Shopping Mall SW*: Bomber Corner NW*
+      Shopping Mall SE*: Bomber Corner NE*
+      Desert Pass EC*: Dam WC*
+      Desert Pass ES*: Dam WS*
+      Swamp Nook EC*: Swamp WC*
+      Swamp Nook ES*: Swamp WS*
+      Dam EC*: South Pass WC*
+      Swamp EC*: Dark South Pass WC*
+      Lumberjack SW*: Mountain Pass NW*
+      Dark Lumberjack SW*: Bumper Cave NW*
+      Mountain Pass SE*: Kakariko Pond NE*
+      Bumper Cave SE*: Outcast Pond NE*
+      Zora Waterfall SE*: Zora Approach NE*
+      Catfish SE*: Catfish Approach NE*
+      Kakariko Fortune EN*: Kakariko Pond WN*
+      Kakariko Fortune ES*: Kakariko Pond WS*
+      Dark Fortune EN*: Outcast Pond WN*
+      Dark Fortune ES*: Outcast Pond WS*
+      Kakariko Pond EN*: Sanctuary WN*
+      Kakariko Pond ES*: Sanctuary WS*
+      Kakariko Pond SW*: Forgotten Forest NW*
+      Kakariko Pond SE*: Forgotten Forest NE*
+      Outcast Pond EN*: Dark Chapel WN*
+      Outcast Pond ES*: Dark Chapel WS*
+      Outcast Pond SW*: Shield Shop NW*
+      Outcast Pond SE*: Shield Shop NE*
+      Sanctuary EC*: Graveyard WC*
+      Dark Chapel EC*: Dark Graveyard WC*
+      Graveyard EC*: River Bend WC*
+      Dark Graveyard EC*: Qirn Jump WC*
+      River Bend EN*: Potion Shop WN*
+      River Bend EC*: Potion Shop WC*
+      River Bend ES*: Potion Shop WS*
+      River Bend SW*: Wooden Bridge NW*
+      River Bend SC*: Wooden Bridge NC*
+      River Bend SE*: Wooden Bridge NE*
+      Qirn Jump EN*: Dark Witch WN*
+      Qirn Jump EC*: Dark Witch WC*
+      Qirn Jump ES*: Dark Witch WS*
+      Qirn Jump SW*: Broken Bridge NW*
+      Qirn Jump SC*: Broken Bridge NC*
+      Qirn Jump SE*: Broken Bridge NE*
+      Potion Shop EN*: Zora Approach WN*
+      Potion Shop EC*: Zora Approach WC*
+      Dark Witch EN*: Catfish Approach WN*
+      Dark Witch EC*: Catfish Approach WC*
+      Wooden Bridge SW*: Sand Dunes NW*
+      Broken Bridge SW*: Dark Dunes NW*
+      Sand Dunes SC*: Stone Bridge NC*
+      Dark Dunes SC*: Hammer Bridge NC*
+      Maze Race ES*: Kakariko Suburb WS*
+      Dig Game EC: Frog WC
+      Dig Game ES*: Frog WS*
+      Kakariko Suburb ES*: Flute Boy WS*
+      Frog ES*: Stumpy WS*
+      Flute Boy SW*: Flute Boy Approach NW*
+      Flute Boy SC*: Flute Boy Approach NC*
+      Stumpy SW*: Stumpy Approach NW*
+      Stumpy SC*: Stumpy Approach NC*
+      Central Bonk Rocks EN*: Links House WN*
+      Central Bonk Rocks EC*: Links House WC*
+      Central Bonk Rocks ES*: Links House WS*
+      Central Bonk Rocks SW*: C Whirlpool NW*
+      Dark Bonk Rocks EN*: Big Bomb Shop WN*
+      Dark Bonk Rocks EC*: Big Bomb Shop WC*
+      Dark Bonk Rocks ES*: Big Bomb Shop WS*
+      Dark Bonk Rocks SW*: Dark C Whirlpool NW*
+      Links House SC*: Statues NC*
+      Links House ES*: Stone Bridge WS*
+      Big Bomb Shop SC*: Hype Cave NC*
+      Big Bomb Shop ES*: Hammer Bridge WS*
+      Stone Bridge WC: Hobo EC
+      Stone Bridge EN*: Tree Line WN*
+      Stone Bridge EC*: Tree Line WC*
+      Hammer Bridge EN*: Dark Tree Line WN*
+      Hammer Bridge EC*: Dark Tree Line WC*
+      Flute Boy Approach EC*: C Whirlpool WC*
+      Stumpy Approach EC*: Dark C Whirlpool WC*
+      C Whirlpool EN*: Statues WN*
+      C Whirlpool EC*: Statues WC*
+      C Whirlpool ES*: Statues WS*
+      C Whirlpool SC*: Dam NC*
+      Dark C Whirlpool EN*: Hype Cave WN*
+      Dark C Whirlpool EC*: Hype Cave WC*
+      Dark C Whirlpool ES*: Hype Cave WS*
+      Dark C Whirlpool SC*: Swamp NC*
+      Statues SC*: South Pass NC*
+      Hype Cave SC*: Dark South Pass NC*
+      Ice Cave SW*: Octoballoon NW*
+      Ice Cave SE*: Octoballoon NE*
+      Shopping Mall SW*: Bomber Corner NW*
+      Shopping Mall SE*: Bomber Corner NE*
+      Desert Pass EC*: Dam WC*
+      Desert Pass ES*: Dam WS*
+      Swamp Nook EC*: Swamp WC*
+      Swamp Nook ES*: Swamp WS*
+      Dam EC*: South Pass WC*
+      Swamp EC*: Dark South Pass WC*
+ow-whirlpools:
+  1:
+    two-way:
+      Zora Whirlpool: Lake Hylia Whirlpool
+      Kakariko Pond Whirlpool: Octoballoon Whirlpool
+      River Bend Whirlpool: C Whirlpool
+      Qirn Jump Whirlpool: Bomber Corner Whirlpool

resources/app/cli/args.json

@@ -174,8 +174,7 @@
       "none",
       "grouped",
       "polar",
-      "limited",
-      "chaos"
+      "unrestricted"
     ]
   },
   "ow_keepsimilar": {

resources/app/cli/lang/en.json

@@ -239,9 +239,7 @@
       "                walk around and access the other plane version by walking.",
       "Polar:          Only used when Tile Flip is enabled. This retains original",
       "                connections even when overworld tiles are flipped.",
-      "Limited:        Exactly nine transitions are randomly chosen as",
-      "                cross-world connections (to emulate the nine portals).",
-      "Chaos:          Every transition has a 50/50 chance to become a",
+      "Unrestricted:   Every transition has a 50/50 chance to become a",
       "                crossworld connection."
     ],
     "ow_keepsimilar": [
@@ -377,6 +375,7 @@
       "Random:         Take any caves can replace a random set of un-interesting caves. See documentation for full list",
       "Fixed:          Take any caves will replace certain location. See documentation for full list"
     ],
+    "collection_rate": [ "Display collection rate (default: %(default)s)" ],
     "pseudoboots": [ " Start with pseudo boots that allow dashing but no item checks (default: %(default)s)"],
     "bombbag": ["Start with 0 bomb capacity. Two capacity upgrades (+10) are added to the pool (default: %(default)s)" ],
     "startinventory": [ "Specifies a list of items that will be in your starting inventory (separated by commas). (default: %(default)s)" ],
@@ -427,7 +426,6 @@
     "reduce_flashing": [ "Reduce some in-game flashing (default: %(default)s)" ],
     "shuffle_sfx": [ "Shuffle sounds effects (default: %(default)s)" ],
     "msu_resume": [ "Enable MSU Resume (default: %(default)s)" ],
-    "collection_rate": [ "Display collection rate (default: %(default)s)" ],
     "create_rom": [ "Create an output rom file. (default: %(default)s)" ],
     "gui": [ "Launch the GUI. (default: %(default)s)" ],
     "jsonout": [

resources/app/gui/lang/en.json

@@ -147,8 +147,7 @@
     "randomizer.overworld.crossed.none": "None",
     "randomizer.overworld.crossed.grouped": "Grouped",
     "randomizer.overworld.crossed.polar": "Polar",
-    "randomizer.overworld.crossed.limited": "Limited",
-    "randomizer.overworld.crossed.chaos": "Chaos",
+    "randomizer.overworld.crossed.unrestricted": "Unrestricted",
 
     "randomizer.overworld.keepsimilar": "Keep Similar Edges Together",
     
@@ -192,7 +191,6 @@
     "randomizer.gameoptions.reduce_flashing": "Reduce Flashing",
     "randomizer.gameoptions.shuffle_sfx": "Shuffle Sound Effects",
     "randomizer.gameoptions.msu_resume": "MSU Resume",
-    "randomizer.gameoptions.collection_rate": "Display Collection Rate",
 
     "randomizer.gameoptions.heartcolor": "Heart Color",
     "randomizer.gameoptions.heartcolor.red": "Red",
@@ -250,6 +248,7 @@
     "randomizer.item.race": "Generate \"Race\" ROM",
     "randomizer.item.retro": "Retro mode",
     "randomizer.item.pseudoboots": "Pseudoboots",
+    "randomizer.item.collection_rate": "Display Collection Rate",
 
     "randomizer.item.worldstate": "World State",
     "randomizer.item.worldstate.standard": "Standard",

resources/app/gui/randomize/gameoptions/widgets.json

@@ -2,7 +2,6 @@
   "checkboxes":   {
     "nobgm":      { "type": "checkbox" },
     "msu_resume": { "type": "checkbox" },
-    "collection_rate": {"type":  "checkbox"},
     "quickswap":  { "type": "checkbox" },
     "reduce_flashing": { "type": "checkbox" },
     "shuffle_sfx": { "type": "checkbox" }

resources/app/gui/randomize/item/widgets.json

@@ -2,6 +2,7 @@
   "checkboxes": {
     "hints": { "type": "checkbox" },
     "pseudoboots": { "type": "checkbox" },
+    "collection_rate": {"type":  "checkbox"},
     "race": { "type": "checkbox" }
   },
   "leftItemFrame": {

resources/app/gui/randomize/overworld/widgets.json

@@ -17,8 +17,7 @@
         "none",
         "grouped",
         "polar",
-        "limited",
-        "chaos"
+        "unrestricted"
       ]
     },
     "mixed": {

source/classes/CustomSettings.py

@@ -79,6 +79,10 @@ class CustomSettings(object):
                 args.ow_shuffle[p] = get_setting(settings['ow_shuffle'], args.ow_shuffle[p])
                 args.ow_terrain[p] = get_setting(settings['ow_terrain'], args.ow_terrain[p])
                 args.ow_crossed[p] = get_setting(settings['ow_crossed'], args.ow_crossed[p])
+                if args.ow_crossed[p] == 'chaos':
+                    import logging
+                    logging.getLogger('').info("Crossed OWR option 'chaos' is deprecated. Use 'unrestricted' instead.")
+                    args.ow_crossed[p] = 'unrestricted'
                 args.ow_keepsimilar[p] = get_setting(settings['ow_keepsimilar'], args.ow_keepsimilar[p])
                 args.ow_mixed[p] = get_setting(settings['ow_mixed'], args.ow_mixed[p])
                 args.ow_whirlpool[p] = get_setting(settings['ow_whirlpool'], args.ow_whirlpool[p])
@@ -196,6 +200,21 @@ class CustomSettings(object):
             return self.file_source['advanced_placements']
         return None
 
+    def get_owedges(self):
+        if 'ow-edges' in self.file_source:
+            return self.file_source['ow-edges']
+        return None
+
+    def get_owcrossed(self):
+        if 'ow-crossed' in self.file_source:
+            return self.file_source['ow-crossed']
+        return None
+
+    def get_whirlpools(self):
+        if 'ow-whirlpools' in self.file_source:
+            return self.file_source['ow-whirlpools']
+        return None
+
     def get_owtileflips(self):
         if 'ow-tileflips' in self.file_source:
             return self.file_source['ow-tileflips']
@@ -355,21 +374,40 @@ class CustomSettings(object):
                     placements[location.player][location.name] = location.item.name
 
     def record_overworld(self, world):
+        self.world_rep['ow-edges'] = edges = {}
+        self.world_rep['ow-whirlpools'] = whirlpools = {}
         self.world_rep['ow-tileflips'] = flips = {}
-        for p in self.player_range:
-            if p in world.owswaps and len(world.owswaps[p][0]) > 0:
-                flips[p] = {}
-                flips[p]['force_flip'] = list(HexInt(f) for f in world.owswaps[p][0] if f < 0x40 or f >= 0x80)
-                flips[p]['force_flip'].sort()
-                flips[p]['undefined_chance'] = 0
         self.world_rep['ow-flutespots'] = flute = {}
         for p in self.player_range:
+            connections = edges[p] = {}
+            connections['two-way'] = {}
+            connections['one-way'] = {}
+            whirlconnects = whirlpools[p] = {}
+            whirlconnects['two-way'] = {}
+            whirlconnects['one-way'] = {}
+            # tile flips
+            if p in world.owswaps and len(world.owswaps[p][0]) > 0:
+                flips[p] = {}
+                flips[p]['force_flip'] = list(HexInt(f) for f in world.owswaps[p][0] if f & 0x40 == 0)
+                flips[p]['force_flip'].sort()
+                flips[p]['undefined_chance'] = 0
+            # flute spots
             flute[p] = {}
             if p in world.owflutespots:
                 flute[p]['force'] = list(HexInt(id) for id in sorted(world.owflutespots[p]))
             else:
                 flute[p]['force'] = list(HexInt(id) for id in sorted(default_flute_connections))
             flute[p]['forbid'] = []
+        for key, data in world.spoiler.overworlds.items():
+            player = data['player'] if 'player' in data else 1
+            connections = edges[player]
+            sub = 'two-way' if data['direction'] == 'both' else 'one-way'
+            connections[sub][data['entrance']] = data['exit']
+        for key, data in world.spoiler.whirlpools.items():
+            player = data['player'] if 'player' in data else 1
+            whirlconnects = whirlconnects[player]
+            sub = 'two-way' if data['direction'] == 'both' else 'one-way'
+            whirlconnects[sub][data['entrance']] = data['exit']
 
     def record_entrances(self, world):
         self.world_rep['entrances'] = entrances = {}

source/classes/constants.py

@@ -57,6 +57,7 @@ SETTINGSTOPROCESS = {
     "item": {
       "hints": "hints",
       "pseudoboots": "pseudoboots",
+      'collection_rate': 'collection_rate',
       "race": "race",
 
       "worldstate": "mode",
@@ -139,7 +140,6 @@ SETTINGSTOPROCESS = {
       "reduce_flashing": "reduce_flashing",
       "shuffle_sfx": "shuffle_sfx",
       'msu_resume': 'msu_resume',
-      'collection_rate': 'collection_rate',
     },
     "generation": {
       "bps": "bps",

source/tools/MysteryUtils.py

@@ -78,9 +78,9 @@ def roll_settings(weights):
     overworld_shuffle = get_choice('overworld_shuffle')
     ret.ow_shuffle = overworld_shuffle if overworld_shuffle != 'none' else 'vanilla'
     ret.ow_terrain = get_choice('overworld_terrain') == 'on'
-    valid_options = {'none', 'polar', 'grouped', 'limited', 'chaos'}
+    valid_options = {'none': 'none', 'polar': 'polar', 'grouped': 'polar', 'chaos': 'unrestricted', 'unrestricted': 'unrestricted'}
     ret.ow_crossed = get_choice('overworld_crossed')
-    ret.ow_crossed = ret.ow_crossed if ret.ow_crossed in valid_options else 'none'
+    ret.ow_crossed = valid_options[ret.ow_crossed] if ret.ow_crossed in valid_options else 'none'
     ret.ow_keepsimilar = get_choice('overworld_keepsimilar') == 'on'
     ret.ow_mixed = get_choice('overworld_swap') == 'on'
     ret.ow_whirlpool = get_choice('whirlpool_shuffle') == 'on'