Merge branch 'master' into Dev-owg

AdjusterMain.py

@@ -7,7 +7,7 @@ from Rom import LocalRom, Sprite, apply_rom_settings
 
 
 def adjust(args):
-    start = time.clock()
+    start = time.perf_counter()
     logger = logging.getLogger('')
     logger.info('Patching ROM.')
 
@@ -31,6 +31,6 @@ def adjust(args):
     rom.write_to_file(output_path('%s.sfc' % outfilebase))
 
     logger.info('Done. Enjoy.')
-    logger.debug('Total Time: %s', time.clock() - start)
+    logger.debug('Total Time: %s', time.perf_counter() - start)
 
     return args

BaseClasses.py

@@ -3,6 +3,8 @@ from enum import Enum, unique
 import logging
 import json
 from collections import OrderedDict
+
+from EntranceShuffle import door_addresses
 from _vendor.collections_extended import bag
 from Utils import int16_as_bytes
 
@@ -417,9 +419,9 @@ class CollectionState(object):
 
     def can_extend_magic(self, player, smallmagic=16, fullrefill=False): #This reflects the total magic Link has, not the total extra he has.
         basemagic = 8
-        if self.has('Quarter Magic', player):
+        if self.has('Magic Upgrade (1/4)', player):
             basemagic = 32
-        elif self.has('Half Magic', player):
+        elif self.has('Magic Upgrade (1/2)', player):
             basemagic = 16
         if self.can_buy_unlimited('Green Potion', player) or self.can_buy_unlimited('Blue Potion', player):
             if self.world.difficulty_adjustments == 'hard' and not fullrefill:
@@ -436,13 +438,12 @@ class CollectionState(object):
                 or (self.has('Cane of Byrna', player) and (enemies < 6 or self.can_extend_magic(player)))
                 or self.can_shoot_arrows(player)
                 or self.has('Fire Rod', player)
-               )
+                or (self.has('Bombs (10)', player) and enemies < 6))
 
     def can_shoot_arrows(self, player):
         if self.world.retro:
-            #TODO: need to decide how we want to handle wooden arrows  longer-term (a can-buy-a check, or via dynamic shop location)
-            #FIXME: Should do something about hard+ ganon only silvers. For the moment, i believe they effective grant wooden, so we are safe
-            return self.has('Bow', player) and (self.has('Silver Arrows', player) or self.can_buy_unlimited('Single Arrow', player))
+            #TODO: Progressive and Non-Progressive silvers work differently (progressive is not usable until the shop arrow is bought)
+            return self.has('Bow', player) and self.can_buy_unlimited('Single Arrow', player)
         return self.has('Bow', player)
 
     def can_get_good_bee(self, player):
@@ -916,8 +917,8 @@ class Shop(object):
         # [id][roomID-low][roomID-high][doorID][zero][shop_config][shopkeeper_config][sram_index]
         entrances = self.region.entrances
         config = self.item_count
-        if len(entrances) == 1 and entrances[0].addresses:
-            door_id = entrances[0].addresses+1
+        if len(entrances) == 1 and entrances[0].name in door_addresses:
+            door_id = door_addresses[entrances[0].name][0]+1
         else:
             door_id = 0
             config |= 0x40 # ignore door id

Bosses.py

@@ -1,5 +1,5 @@
 import logging
-import random
+import RaceRandom as random
 
 from BaseClasses import Boss
 from Fill import FillError
@@ -18,6 +18,7 @@ def ArmosKnightsDefeatRule(state, player):
     # Magic amounts are probably a bit overkill
     return (
         state.has_blunt_weapon(player) or
+        state.can_shoot_arrows(player) or
         (state.has('Cane of Somaria', player) and state.can_extend_magic(player, 10)) or
         (state.has('Cane of Byrna', player) and state.can_extend_magic(player, 16)) or
         (state.has('Ice Rod', player) and state.can_extend_magic(player, 32)) or
@@ -26,18 +27,20 @@ def ArmosKnightsDefeatRule(state, player):
         state.has('Red Boomerang', player))
 
 def LanmolasDefeatRule(state, player):
-    # TODO: Allow the canes here?
     return (
         state.has_blunt_weapon(player) or
         state.has('Fire Rod', player) or
         state.has('Ice Rod', player) or
+        state.has('Cane of Somaria', player) or
+        state.has('Cane of Byrna', player) or
         state.can_shoot_arrows(player))
 
 def MoldormDefeatRule(state, player):
     return state.has_blunt_weapon(player)
 
 def HelmasaurKingDefeatRule(state, player):
-    return state.has_blunt_weapon(player) or state.can_shoot_arrows(player)
+    # TODO: technically possible with the hammer
+    return state.has_sword(player) or state.can_shoot_arrows(player)
 
 def ArrghusDefeatRule(state, player):
     if not state.has('Hookshot', player):
@@ -95,7 +98,9 @@ def VitreousDefeatRule(state, player):
 def TrinexxDefeatRule(state, player):
     if not (state.has('Fire Rod', player) and state.has('Ice Rod', player)):
         return False
-    return state.has('Hammer', player) or state.has_beam_sword(player) or (state.has_sword(player) and state.can_extend_magic(player, 32))
+    return state.has('Hammer', player) or state.has('Tempered Sword', player) or state.has('Golden Sword', player) or \
+            (state.has('Master Sword', player) and state.can_extend_magic(player, 16)) or \
+            (state.has_sword(player) and state.can_extend_magic(player, 32))
 
 def AgahnimDefeatRule(state, player):
     return state.has_sword(player) or state.has('Hammer', player) or state.has('Bug Catching Net', player)

Dungeons.py

@@ -1,4 +1,4 @@
-import random
+import RaceRandom as random
 
 from BaseClasses import Dungeon
 from Bosses import BossFactory

EntranceRandomizer.py

@@ -2,7 +2,7 @@
 import argparse
 import os
 import logging
-import random
+import RaceRandom as random
 import textwrap
 import sys
 
@@ -257,6 +257,7 @@ def start():
     parser.add_argument('--shufflepalette', default=False, action='store_true')
     parser.add_argument('--shufflepots', default=False, action='store_true')
     parser.add_argument('--multi', default=1, type=lambda value: min(max(int(value), 1), 255))
+    parser.add_argument('--securerandom', default=False, action='store_true')
 
     parser.add_argument('--outputpath')
     args = parser.parse_args()

EntranceShuffle.py

@@ -1,6 +1,7 @@
-import random
+import RaceRandom as random
 
 # ToDo: With shuffle_ganon option, prevent gtower from linking to an exit only location through a 2 entrance cave.
+from collections import defaultdict
 
 
 def link_entrances(world, player):
@@ -1103,11 +1104,9 @@ def link_inverted_entrances(world, player):
         # randomize which desert ledge door is a must-exit
         if random.randint(0, 1) == 0:
             lw_dungeon_entrances_must_exit.append('Desert Palace Entrance (North)')
-            dp_must_exit = 'Desert Palace Entrance (North)'
             lw_entrances.append('Desert Palace Entrance (West)')
         else:
             lw_dungeon_entrances_must_exit.append('Desert Palace Entrance (West)')
-            dp_must_exit = 'Desert Palace Entrance (West)'
             lw_entrances.append('Desert Palace Entrance (North)')
         
         dungeon_exits.append(('Hyrule Castle Exit (South)', 'Hyrule Castle Exit (West)', 'Hyrule Castle Exit (East)'))
@@ -1144,12 +1143,9 @@ def link_inverted_entrances(world, player):
         connect_two_way(world, aga_door, 'Inverted Agahnims Tower Exit', player)
         dungeon_exits.remove('Inverted Agahnims Tower Exit')
 
-        all_dungeon_entrances = dw_entrances + lw_entrances 
-        connect_mandatory_exits(world, all_dungeon_entrances, dungeon_exits, lw_dungeon_entrances_must_exit, player, dp_must_exit)
+        connect_mandatory_exits(world, lw_entrances, dungeon_exits, lw_dungeon_entrances_must_exit, player)
 
-        remaining_dw_entrances = [i for i in all_dungeon_entrances if i in dw_entrances]
-        remaining_lw_entrances = [i for i in all_dungeon_entrances if i in lw_entrances]
-        connect_caves(world, remaining_lw_entrances, remaining_dw_entrances, dungeon_exits, player)
+        connect_caves(world, lw_entrances, dw_entrances, dungeon_exits, player)
 
     elif world.shuffle == 'simple':
         simple_shuffle_dungeons(world, player)
@@ -1253,7 +1249,7 @@ def link_inverted_entrances(world, player):
         caves = list(Cave_Exits + Cave_Three_Exits + Old_Man_House)
         single_doors = list(Single_Cave_Doors)
         bomb_shop_doors = list(Inverted_Bomb_Shop_Single_Cave_Doors + Inverted_Bomb_Shop_Multi_Cave_Doors)
-        blacksmith_doors = list(Inverted_Blacksmith_Single_Cave_Doors + Blacksmith_Multi_Cave_Doors)
+        blacksmith_doors = list(Inverted_Blacksmith_Single_Cave_Doors + Inverted_Blacksmith_Multi_Cave_Doors)
         door_targets = list(Inverted_Single_Cave_Targets)
 
         # place links house
@@ -1335,18 +1331,16 @@ def link_inverted_entrances(world, player):
         old_man_entrances = list(Inverted_Old_Man_Entrances + Old_Man_Entrances + ['Inverted Agahnims Tower', 'Tower of Hera'])
         caves = list(Cave_Exits + Dungeon_Exits + Cave_Three_Exits)  # don't need to consider three exit caves, have one exit caves to avoid parity issues
         bomb_shop_doors = list(Inverted_Bomb_Shop_Single_Cave_Doors + Inverted_Bomb_Shop_Multi_Cave_Doors)
-        blacksmith_doors = list(Inverted_Blacksmith_Single_Cave_Doors + Blacksmith_Multi_Cave_Doors)
+        blacksmith_doors = list(Inverted_Blacksmith_Single_Cave_Doors + Inverted_Blacksmith_Multi_Cave_Doors)
         door_targets = list(Inverted_Single_Cave_Targets)
         old_man_house = list(Old_Man_House)
 
         # randomize which desert ledge door is a must-exit
         if random.randint(0, 1) == 0:
             lw_must_exits.append('Desert Palace Entrance (North)')
-            dp_must_exit = 'Desert Palace Entrance (North)'
             lw_entrances.append('Desert Palace Entrance (West)')
         else:
             lw_must_exits.append('Desert Palace Entrance (West)')
-            dp_must_exit = 'Desert Palace Entrance (West)'
             lw_entrances.append('Desert Palace Entrance (North)')
 
         # tavern back door cannot be shuffled yet
@@ -1408,7 +1402,7 @@ def link_inverted_entrances(world, player):
         # no dw must exits in inverted, but we randomize whether cave is in light or dark world
         if random.randint(0, 1) == 0:
             caves += old_man_house
-            connect_mandatory_exits(world, lw_entrances, caves, lw_must_exits, player, dp_must_exit)
+            connect_mandatory_exits(world, lw_entrances, caves, lw_must_exits, player)
             try:
                 caves.remove(old_man_house[0])
             except ValueError: 
@@ -1417,7 +1411,7 @@ def link_inverted_entrances(world, player):
                 connect_caves(world, lw_entrances, [], old_man_house, player)                
         else:
             connect_caves(world, dw_entrances, [], old_man_house, player)
-            connect_mandatory_exits(world, lw_entrances, caves, lw_must_exits, player, dp_must_exit)
+            connect_mandatory_exits(world, lw_entrances, caves, lw_must_exits, player)
 
         # place old man, has limited options
         # exit has to come from specific set of doors, the entrance is free to move about
@@ -1486,17 +1480,15 @@ def link_inverted_entrances(world, player):
         old_man_entrances = list(Inverted_Old_Man_Entrances + Old_Man_Entrances + ['Inverted Agahnims Tower', 'Tower of Hera'])
         caves = list(Cave_Exits + Dungeon_Exits + Cave_Three_Exits + Old_Man_House)  # don't need to consider three exit caves, have one exit caves to avoid parity issues
         bomb_shop_doors = list(Inverted_Bomb_Shop_Single_Cave_Doors + Inverted_Bomb_Shop_Multi_Cave_Doors)
-        blacksmith_doors = list(Inverted_Blacksmith_Single_Cave_Doors + Blacksmith_Multi_Cave_Doors)
+        blacksmith_doors = list(Inverted_Blacksmith_Single_Cave_Doors + Inverted_Blacksmith_Multi_Cave_Doors)
         door_targets = list(Inverted_Single_Cave_Targets)
 
         # randomize which desert ledge door is a must-exit
         if random.randint(0, 1) == 0:
             must_exits.append('Desert Palace Entrance (North)')
-            dp_must_exit = 'Desert Palace Entrance (North)'
             entrances.append('Desert Palace Entrance (West)')
         else:
             must_exits.append('Desert Palace Entrance (West)')
-            dp_must_exit = 'Desert Palace Entrance (West)'
             entrances.append('Desert Palace Entrance (North)')
 
         caves.append(tuple(random.sample(['Hyrule Castle Exit (South)', 'Hyrule Castle Exit (West)', 'Hyrule Castle Exit (East)'],3)))
@@ -1546,7 +1538,7 @@ def link_inverted_entrances(world, player):
 
         
         #place must-exit caves 
-        connect_mandatory_exits(world, entrances, caves, must_exits, player, dp_must_exit)
+        connect_mandatory_exits(world, entrances, caves, must_exits, player)
 
 
         # place old man, has limited options
@@ -1609,8 +1601,8 @@ def link_inverted_entrances(world, player):
         # and rentering to find bomb shop. However appended list here is all those that we currently have
         # bomb shop logic for.
         # Specifically we could potentially add: 'Dark Death Mountain Ledge (East)' and doors associated with pits
-        bomb_shop_doors = list(Inverted_Bomb_Shop_Single_Cave_Doors + Inverted_Bomb_Shop_Multi_Cave_Doors + ['Desert Palace Entrance (East)', 'Turtle Rock Isolated Ledge Entrance', 'Bumper Cave (Top)', 'Hookshot Cave Back Entrance'])
-        blacksmith_doors = list(Inverted_Blacksmith_Single_Cave_Doors + Blacksmith_Multi_Cave_Doors)
+        bomb_shop_doors = list(Inverted_Bomb_Shop_Single_Cave_Doors + Inverted_Bomb_Shop_Multi_Cave_Doors + ['Turtle Rock Isolated Ledge Entrance', 'Hookshot Cave Back Entrance'])
+        blacksmith_doors = list(Inverted_Blacksmith_Single_Cave_Doors + Inverted_Blacksmith_Multi_Cave_Doors)
         door_targets = list(Inverted_Single_Cave_Targets)
 
         random.shuffle(doors)
@@ -1909,17 +1901,33 @@ def connect_random(world, exitlist, targetlist, player, two_way=False):
             connect_entrance(world, exit, target, player)
 
 
-def connect_mandatory_exits(world, entrances, caves, must_be_exits, player, dp_must_exit=None):
+def connect_mandatory_exits(world, entrances, caves, must_be_exits, player):
     """This works inplace"""
     random.shuffle(entrances)
     random.shuffle(caves)
+    # Keeps track of entrances that cannot be used to access each exit / cave
+    if world.mode == 'inverted':
+        invalid_connections = Inverted_Must_Exit_Invalid_Connections.copy()
+    else:
+        invalid_connections = Must_Exit_Invalid_Connections.copy()
+    invalid_cave_connections = defaultdict(set)
+
+    # Handle inverted Aga Tower - if it depends on connections, then so does Hyrule Castle Ledge
+    if world.mode == 'inverted':
+        for entrance in invalid_connections:
+            if world.get_entrance(entrance, player).connected_region == world.get_region('Inverted Agahnims Tower', player):
+                for exit in invalid_connections[entrance]:
+                    invalid_connections[exit] = invalid_connections[exit].union({'Inverted Ganons Tower', 'Hyrule Castle Entrance (West)', 'Hyrule Castle Entrance (East)'})
+                break
+
     used_caves = []
+    required_entrances = 0  # Number of entrances reserved for used_caves
     while must_be_exits:
         exit = must_be_exits.pop()
         # find multi exit cave
         cave = None
         for candidate in caves:
-            if not isinstance(candidate, str):
+            if not isinstance(candidate, str) and (candidate in used_caves or len(candidate) < len(entrances) - required_entrances - 1):
                 cave = candidate
                 break
 
@@ -1929,29 +1937,46 @@ def connect_mandatory_exits(world, entrances, caves, must_be_exits, player, dp_m
         # all caves are sorted so that the last exit is always reachable
         connect_two_way(world, exit, cave[-1], player)
         if len(cave) == 2:
-            entrance = entrances.pop()
-            # ToDo Better solution, this is a hot fix. Do not connect both sides of trock/desert ledge only to each other
-            if world.mode != 'inverted' and entrance == 'Dark Death Mountain Ledge (West)':
-                new_entrance = entrances.pop()
-                entrances.append(entrance)
-                entrance = new_entrance
-            if world.mode == 'inverted' and entrance == dp_must_exit:
-                new_entrance = entrances.pop()
-                entrances.append(entrance)
-                entrance = new_entrance
+            entrance = next(e for e in entrances[::-1] if e not in invalid_connections[exit] and e not in invalid_cave_connections[tuple(cave)])
+            entrances.remove(entrance)
             connect_two_way(world, entrance, cave[0], player)
+            if cave in used_caves:
+                required_entrances -= 2
+                used_caves.remove(cave)
+            if entrance in invalid_connections:
+                for exit2 in invalid_connections[entrance]:
+                    invalid_connections[exit2] = invalid_connections[exit2].union(invalid_connections[exit]).union(invalid_cave_connections[tuple(cave)])
         elif cave[-1] == 'Spectacle Rock Cave Exit': #Spectacle rock only has one exit
-            for exit in cave[:-1]:
-                connect_two_way(world,entrances.pop(),exit, player)
+            cave_entrances = []
+            for cave_exit in cave[:-1]:
+                entrance = next(e for e in entrances[::-1] if e not in invalid_connections[exit])
+                cave_entrances.append(entrance)
+                entrances.remove(entrance)
+                connect_two_way(world,entrance,cave_exit, player)
+                if entrance not in invalid_connections:
+                    invalid_connections[exit] = set()
+            if all(entrance in invalid_connections for entrance in cave_entrances):
+                new_invalid_connections = invalid_connections[cave_entrances[0]].intersection(invalid_connections[cave_entrances[1]])
+                for exit2 in new_invalid_connections:
+                    invalid_connections[exit2] = invalid_connections[exit2].union(invalid_connections[exit])
         else:#save for later so we can connect to multiple exits
+            if cave in used_caves:
+                required_entrances -= 1
+                used_caves.remove(cave)
+            else:
+                required_entrances += len(cave)-1
             caves.append(cave[0:-1])
             random.shuffle(caves)
             used_caves.append(cave[0:-1])
+            invalid_cave_connections[tuple(cave[0:-1])] = invalid_cave_connections[tuple(cave)].union(invalid_connections[exit])
         caves.remove(cave)
     for cave in used_caves:
         if cave in caves: #check if we placed multiple entrances from this 3 or 4 exit 
-            for exit in cave:
-                connect_two_way(world, entrances.pop(), exit, player)
+            for cave_exit in cave:
+                entrance = next(e for e in entrances[::-1] if e not in invalid_cave_connections[tuple(cave)])
+                invalid_cave_connections[tuple(cave)] = set()
+                entrances.remove(entrance)
+                connect_two_way(world, entrance, cave_exit, player)
             caves.remove(cave)
 
 
@@ -2632,8 +2657,6 @@ Inverted_Bomb_Shop_Multi_Cave_Doors = ['Hyrule Castle Entrance (South)',
                                        'Death Mountain Return Cave (East)',
                                        'Death Mountain Return Cave (West)',
                                        'Spectacle Rock Cave Peak',
-                                       'Spectacle Rock Cave',
-                                       'Spectacle Rock Cave (Bottom)',
                                        'Paradox Cave (Bottom)',
                                        'Paradox Cave (Middle)',
                                        'Paradox Cave (Top)',
@@ -2648,7 +2671,7 @@ Inverted_Bomb_Shop_Multi_Cave_Doors = ['Hyrule Castle Entrance (South)',
                                        'Desert Palace Entrance (West)',
                                        'Desert Palace Entrance (North)']
 
-Inverted_Blacksmith_Multi_Cave_Doors = []  # same as non-inverted
+Inverted_Blacksmith_Multi_Cave_Doors = Blacksmith_Multi_Cave_Doors  # same as non-inverted
 
 Inverted_LW_Single_Cave_Doors = LW_Single_Cave_Doors + ['Inverted Big Bomb Shop']
 
@@ -2840,6 +2863,27 @@ Isolated_LH_Doors = ['Kings Grave',
                      'Dark World Hammer Peg Cave',
                      'Turtle Rock Isolated Ledge Entrance']
 
+# Entrances that cannot be used to access a must_exit entrance - symmetrical to allow reverse lookups
+Must_Exit_Invalid_Connections = defaultdict(set, {
+    'Dark Death Mountain Ledge (East)': {'Dark Death Mountain Ledge (West)', 'Mimic Cave'},
+    'Dark Death Mountain Ledge (West)': {'Dark Death Mountain Ledge (East)', 'Mimic Cave'},
+    'Mimic Cave': {'Dark Death Mountain Ledge (West)', 'Dark Death Mountain Ledge (East)'},
+    'Bumper Cave (Top)': {'Death Mountain Return Cave (West)'},
+    'Death Mountain Return Cave (West)': {'Bumper Cave (Top)'},
+    'Skull Woods Second Section Door (West)': {'Skull Woods Final Section'},
+    'Skull Woods Final Section': {'Skull Woods Second Section Door (West)'},
+})
+Inverted_Must_Exit_Invalid_Connections = defaultdict(set, {
+    'Bumper Cave (Top)': {'Death Mountain Return Cave (West)'},
+    'Death Mountain Return Cave (West)': {'Bumper Cave (Top)'},
+    'Desert Palace Entrance (North)': {'Desert Palace Entrance (West)'},
+    'Desert Palace Entrance (West)': {'Desert Palace Entrance (North)'},
+    'Inverted Ganons Tower': {'Hyrule Castle Entrance (West)', 'Hyrule Castle Entrance (East)'},
+    'Hyrule Castle Entrance (West)': {'Hyrule Castle Entrance (East)', 'Inverted Ganons Tower'},
+    'Hyrule Castle Entrance (East)': {'Hyrule Castle Entrance (West)', 'Inverted Ganons Tower'},
+})
+
+
 # these are connections that cannot be shuffled and always exist. They link together separate parts of the world we need to divide into regions
 mandatory_connections = [('Lake Hylia Central Island Pier', 'Lake Hylia Central Island'),
                          ('Lake Hylia Central Island Teleporter', 'Dark Lake Hylia Central Island'),
@@ -3058,6 +3102,9 @@ mandatory_connections = [('Lake Hylia Central Island Pier', 'Lake Hylia Central
                         ]
 
 inverted_mandatory_connections = [('Lake Hylia Central Island Pier', 'Lake Hylia Central Island'),
+                                  ('Lake Hylia Island Pier', 'Lake Hylia Island'),
+                                  ('Lake Hylia Warp', 'Northeast Light World'),
+                                  ('Northeast Light World Warp', 'Light World'),
                                   ('Zoras River', 'Zoras River'), 
                                   ('Graveyard Ledge Clip Spot', 'Kings Grave Area'),
                                   ('Kings Grave Outer Rocks', 'Kings Grave Area'),
@@ -3305,7 +3352,7 @@ default_connections = [('Waterfall of Wishing', 'Waterfall of Wishing'),
                        ('Lumberjack House', 'Lumberjack House'),
                        ("Hyrule Castle Secret Entrance Drop", "Hyrule Castle Secret Entrance"),
                        ("Hyrule Castle Secret Entrance Stairs", "Hyrule Castle Secret Entrance"),
-                       ("Hyrule Castle Secret Entrance Exit", "Light World"),
+                       ("Hyrule Castle Secret Entrance Exit", "Hyrule Castle Courtyard"),
                        ('Bonk Fairy (Light)', 'Bonk Fairy (Light)'),
                        ('Lake Hylia Fairy', 'Lake Hylia Healer Fairy'),
                        ('Lake Hylia Fortune Teller', 'Lake Hylia Fortune Teller'),
@@ -3616,7 +3663,7 @@ default_dungeon_connections = [('Desert Palace Entrance (South)', 'Desert Palace
                                ('Hyrule Castle Entrance (South)', 'Hyrule Castle'),
                                ('Hyrule Castle Entrance (West)', 'Hyrule Castle'),
                                ('Hyrule Castle Entrance (East)', 'Hyrule Castle'),
-                               ('Hyrule Castle Exit (South)', 'Light World'),
+                               ('Hyrule Castle Exit (South)', 'Hyrule Castle Courtyard'),
                                ('Hyrule Castle Exit (West)', 'Hyrule Castle Ledge'),
                                ('Hyrule Castle Exit (East)', 'Hyrule Castle Ledge'),
                                ('Agahnims Tower', 'Agahnims Tower'),

Fill.py

@@ -1,4 +1,4 @@
-import random
+import RaceRandom as random
 import logging
 
 from BaseClasses import CollectionState

Gui.py

@@ -2,7 +2,7 @@
 from argparse import Namespace
 from glob import glob
 import json
-import random
+import RaceRandom as random
 import os
 import shutil
 from tkinter import Checkbutton, OptionMenu, Toplevel, LabelFrame, PhotoImage, Tk, LEFT, RIGHT, BOTTOM, TOP, StringVar, IntVar, Frame, Label, W, E, X, BOTH, Entry, Spinbox, Button, filedialog, messagebox, ttk
@@ -90,6 +90,34 @@ def guiMain(args=None):
 
     fileDialogFrame = Frame(rightHalfFrame)
 
+    heartbeepFrame = Frame(fileDialogFrame)
+    heartbeepVar = StringVar()
+    heartbeepVar.set('normal')
+    heartbeepOptionMenu = OptionMenu(heartbeepFrame, heartbeepVar, 'double', 'normal', 'half', 'quarter', 'off')
+    heartbeepOptionMenu.pack(side=RIGHT)
+    heartbeepLabel = Label(heartbeepFrame, text='Heartbeep sound rate')
+    heartbeepLabel.pack(side=LEFT, padx=(0,52))
+
+    heartcolorFrame = Frame(fileDialogFrame)
+    heartcolorVar = StringVar()
+    heartcolorVar.set('red')
+    heartcolorOptionMenu = OptionMenu(heartcolorFrame, heartcolorVar, 'red', 'blue', 'green', 'yellow', 'random')
+    heartcolorOptionMenu.pack(side=RIGHT)
+    heartcolorLabel = Label(heartcolorFrame, text='Heart color')
+    heartcolorLabel.pack(side=LEFT, padx=(0,127))
+
+    fastMenuFrame = Frame(fileDialogFrame)
+    fastMenuVar = StringVar()
+    fastMenuVar.set('normal')
+    fastMenuOptionMenu = OptionMenu(fastMenuFrame, fastMenuVar, 'normal', 'instant', 'double', 'triple', 'quadruple', 'half')
+    fastMenuOptionMenu.pack(side=RIGHT)
+    fastMenuLabel = Label(fastMenuFrame, text='Menu speed')
+    fastMenuLabel.pack(side=LEFT, padx=(0,100))
+
+    heartbeepFrame.pack(expand=True, anchor=E)
+    heartcolorFrame.pack(expand=True, anchor=E)
+    fastMenuFrame.pack(expand=True, anchor=E)
+
     romDialogFrame = Frame(fileDialogFrame)
     baseRomLabel = Label(romDialogFrame, text='Base Rom')
     romVar = StringVar()
@@ -144,7 +172,7 @@ def guiMain(args=None):
     modeVar.set('open')
     modeOptionMenu = OptionMenu(modeFrame, modeVar, 'standard', 'open', 'inverted')
     modeOptionMenu.pack(side=RIGHT)
-    modeLabel = Label(modeFrame, text='Game Mode')
+    modeLabel = Label(modeFrame, text='Game mode')
     modeLabel.pack(side=LEFT)
 
     logicFrame = Frame(drowDownFrame)
@@ -163,14 +191,46 @@ def guiMain(args=None):
     goalLabel = Label(goalFrame, text='Game goal')
     goalLabel.pack(side=LEFT)
 
+    crystalsGTFrame = Frame(drowDownFrame)
+    crystalsGTVar = StringVar()
+    crystalsGTVar.set('7')
+    crystalsGTOptionMenu = OptionMenu(crystalsGTFrame, crystalsGTVar, '0', '1', '2', '3', '4', '5', '6', '7', 'random')
+    crystalsGTOptionMenu.pack(side=RIGHT)
+    crystalsGTLabel = Label(crystalsGTFrame, text='Crystals to open Ganon\'s Tower')
+    crystalsGTLabel.pack(side=LEFT)
+
+    crystalsGanonFrame = Frame(drowDownFrame)
+    crystalsGanonVar = StringVar()
+    crystalsGanonVar.set('7')
+    crystalsGanonOptionMenu = OptionMenu(crystalsGanonFrame, crystalsGanonVar, '0', '1', '2', '3', '4', '5', '6', '7', 'random')
+    crystalsGanonOptionMenu.pack(side=RIGHT)
+    crystalsGanonLabel = Label(crystalsGanonFrame, text='Crystals to fight Ganon')
+    crystalsGanonLabel.pack(side=LEFT)
+
+    swordFrame = Frame(drowDownFrame)
+    swordVar = StringVar()
+    swordVar.set('random')
+    swordOptionMenu = OptionMenu(swordFrame, swordVar, 'random', 'assured', 'swordless', 'vanilla')
+    swordOptionMenu.pack(side=RIGHT)
+    swordLabel = Label(swordFrame, text='Sword availability')
+    swordLabel.pack(side=LEFT)
+
     difficultyFrame = Frame(drowDownFrame)
     difficultyVar = StringVar()
     difficultyVar.set('normal')
     difficultyOptionMenu = OptionMenu(difficultyFrame, difficultyVar, 'normal', 'hard', 'expert')
     difficultyOptionMenu.pack(side=RIGHT)
-    difficultyLabel = Label(difficultyFrame, text='Game difficulty')
+    difficultyLabel = Label(difficultyFrame, text='Difficulty: item pool')
     difficultyLabel.pack(side=LEFT)
 
+    itemfunctionFrame = Frame(drowDownFrame)
+    itemfunctionVar = StringVar()
+    itemfunctionVar.set('normal')
+    itemfunctionOptionMenu = OptionMenu(itemfunctionFrame, itemfunctionVar, 'normal', 'hard', 'expert')
+    itemfunctionOptionMenu.pack(side=RIGHT)
+    itemfunctionLabel = Label(itemfunctionFrame, text='Difficulty: item functionality')
+    itemfunctionLabel.pack(side=LEFT)
+
     timerFrame = Frame(drowDownFrame)
     timerVar = StringVar()
     timerVar.set('none')
@@ -187,6 +247,14 @@ def guiMain(args=None):
     progressiveLabel = Label(progressiveFrame, text='Progressive equipment')
     progressiveLabel.pack(side=LEFT)
 
+    accessibilityFrame = Frame(drowDownFrame)
+    accessibilityVar = StringVar()
+    accessibilityVar.set('items')
+    accessibilityOptionMenu = OptionMenu(accessibilityFrame, accessibilityVar, 'items', 'locations', 'none')
+    accessibilityOptionMenu.pack(side=RIGHT)
+    accessibilityLabel = Label(accessibilityFrame, text='Item accessibility')
+    accessibilityLabel.pack(side=LEFT)
+
     algorithmFrame = Frame(drowDownFrame)
     algorithmVar = StringVar()
     algorithmVar.set('balanced')
@@ -203,41 +271,19 @@ def guiMain(args=None):
     shuffleLabel = Label(shuffleFrame, text='Entrance shuffle algorithm')
     shuffleLabel.pack(side=LEFT)
 
-    heartbeepFrame = Frame(drowDownFrame)
-    heartbeepVar = StringVar()
-    heartbeepVar.set('normal')
-    heartbeepOptionMenu = OptionMenu(heartbeepFrame, heartbeepVar, 'double', 'normal', 'half', 'quarter', 'off')
-    heartbeepOptionMenu.pack(side=RIGHT)
-    heartbeepLabel = Label(heartbeepFrame, text='Heartbeep sound rate')
-    heartbeepLabel.pack(side=LEFT)
-
-    heartcolorFrame = Frame(drowDownFrame)
-    heartcolorVar = StringVar()
-    heartcolorVar.set('red')
-    heartcolorOptionMenu = OptionMenu(heartcolorFrame, heartcolorVar, 'red', 'blue', 'green', 'yellow', 'random')
-    heartcolorOptionMenu.pack(side=RIGHT)
-    heartcolorLabel = Label(heartcolorFrame, text='Heart color')
-    heartcolorLabel.pack(side=LEFT)
-
-    fastMenuFrame = Frame(drowDownFrame)
-    fastMenuVar = StringVar()
-    fastMenuVar.set('normal')
-    fastMenuOptionMenu = OptionMenu(fastMenuFrame, fastMenuVar, 'normal', 'instant', 'double', 'triple', 'quadruple', 'half')
-    fastMenuOptionMenu.pack(side=RIGHT)
-    fastMenuLabel = Label(fastMenuFrame, text='Menu speed')
-    fastMenuLabel.pack(side=LEFT)
-
     modeFrame.pack(expand=True, anchor=E)
     logicFrame.pack(expand=True, anchor=E)
     goalFrame.pack(expand=True, anchor=E)
+    crystalsGTFrame.pack(expand=True, anchor=E)
+    crystalsGanonFrame.pack(expand=True, anchor=E)
+    swordFrame.pack(expand=True, anchor=E)
     difficultyFrame.pack(expand=True, anchor=E)
+    itemfunctionFrame.pack(expand=True, anchor=E)
     timerFrame.pack(expand=True, anchor=E)
     progressiveFrame.pack(expand=True, anchor=E)
+    accessibilityFrame.pack(expand=True, anchor=E)
     algorithmFrame.pack(expand=True, anchor=E)
     shuffleFrame.pack(expand=True, anchor=E)
-    heartbeepFrame.pack(expand=True, anchor=E)
-    heartcolorFrame.pack(expand=True, anchor=E)
-    fastMenuFrame.pack(expand=True, anchor=E)
 
     enemizerFrame = LabelFrame(randomizerWindow, text="Enemizer", padx=5, pady=5)
     enemizerFrame.columnconfigure(0, weight=1)
@@ -315,9 +361,14 @@ def guiMain(args=None):
         guiargs.mode = modeVar.get()
         guiargs.logic = logicVar.get()
         guiargs.goal = goalVar.get()
+        guiargs.crystals_gt = crystalsGTVar.get()
+        guiargs.crystals_ganon = crystalsGanonVar.get()
+        guiargs.swords = swordVar.get()
         guiargs.difficulty = difficultyVar.get()
+        guiargs.item_functionality = itemfunctionVar.get()
         guiargs.timer = timerVar.get()
         guiargs.progressive = progressiveVar.get()
+        guiargs.accessibility = accessibilityVar.get()
         guiargs.algorithm = algorithmVar.get()
         guiargs.shuffle = shuffleVar.get()
         guiargs.heartbeep = heartbeepVar.get()
@@ -1074,10 +1125,15 @@ def guiMain(args=None):
         if args.seed:
             seedVar.set(str(args.seed))
         modeVar.set(args.mode)
+        swordVar.set(args.swords)
         difficultyVar.set(args.difficulty)
+        itemfunctionVar.set(args.item_functionality)
         timerVar.set(args.timer)
         progressiveVar.set(args.progressive)
+        accessibilityVar.set(args.accessibility)
         goalVar.set(args.goal)
+        crystalsGTVar.set(args.crystals_gt)
+        crystalsGanonVar.set(args.crystals_ganon)
         algorithmVar.set(args.algorithm)
         shuffleVar.set(args.shuffle)
         heartbeepVar.set(args.heartbeep)

InvertedRegions.py

@@ -9,7 +9,7 @@ def create_inverted_regions(world, player):
                          ["Blinds Hideout", "Hyrule Castle Secret Entrance Drop", 'Kings Grave Outer Rocks', 'Dam',
                           'Inverted Big Bomb Shop', 'Tavern North', 'Chicken House', 'Aginahs Cave', 'Sahasrahlas Hut', 'Kakariko Well Drop', 'Kakariko Well Cave',
                           'Blacksmiths Hut', 'Bat Cave Drop Ledge', 'Bat Cave Cave', 'Sick Kids House', 'Hobo Bridge', 'Lost Woods Hideout Drop', 'Lost Woods Hideout Stump',
-                          'Lumberjack Tree Tree', 'Lumberjack Tree Cave', 'Mini Moldorm Cave', 'Ice Rod Cave', 'Lake Hylia Central Island Pier',
+                          'Lumberjack Tree Tree', 'Lumberjack Tree Cave', 'Mini Moldorm Cave', 'Ice Rod Cave', 'Lake Hylia Central Island Pier', 'Lake Hylia Island Pier', 'Lake Hylia Warp',
                           'Bonk Rock Cave', 'Library', 'Two Brothers House (East)', 'Desert Palace Stairs', 'Eastern Palace', 'Master Sword Meadow',
                           'Sanctuary', 'Sanctuary Grave', 'Death Mountain Entrance Rock', 'Light World River Drop',
                           'Elder House (East)', 'Elder House (West)', 'North Fairy Cave', 'North Fairy Cave Drop', 'Lost Woods Gamble', 'Snitch Lady (East)', 'Snitch Lady (West)', 'Tavern (Front)',
@@ -29,7 +29,7 @@ def create_inverted_regions(world, player):
                                                                         "Blind\'s Hideout - Right",
                                                                         "Blind\'s Hideout - Far Left",
                                                                         "Blind\'s Hideout - Far Right"]),
-        create_lw_region(player, 'Northeast Light World', None, ['Zoras River', 'Waterfall of Wishing', 'Potion Shop Outer Rock', 'Catfish Mirror Spot']),
+        create_lw_region(player, 'Northeast Light World', None, ['Zoras River', 'Waterfall of Wishing', 'Potion Shop Outer Rock', 'Northeast Dark World Mirror Spot', 'Northeast Light World Warp']),
         create_lw_region(player, 'Potion Shop Area', None, ['Potion Shop', 'Potion Shop Inner Bushes', 'Potion Shop Inner Rock', 'Potion Shop Mirror Spot', 'Potion Shop River Drop']),
         create_lw_region(player, 'Graveyard Cave Area', None, ['Graveyard Cave', 'Graveyard Cave Inner Bushes', 'Graveyard Cave Mirror Spot']),
         create_lw_region(player, 'River', None, ['Light World Pier', 'Potion Shop Pier']),
@@ -322,7 +322,8 @@ def create_inverted_regions(world, player):
     region.shop = shop
     world.shops.append(shop)
     shop.add_inventory(0, 'Bomb Upgrade (+5)', 100, 7)
-    shop.add_inventory(1, 'Arrow Upgrade (+5)', 100, 7)
+    if not world.retro:
+        shop.add_inventory(1, 'Arrow Upgrade (+5)', 100, 7)
     world.intialize_regions()
 
 def create_lw_region(player, name, locations=None, exits=None):

ItemList.py

@@ -1,6 +1,6 @@
 from collections import namedtuple
 import logging
-import random
+import RaceRandom as random
 
 from BaseClasses import Region, RegionType, Shop, ShopType, Location
 from Bosses import place_bosses
@@ -228,7 +228,7 @@ take_any_locations = [
     'Bonk Fairy (Dark)', 'Lake Hylia Healer Fairy', 'Swamp Healer Fairy', 'Desert Healer Fairy',
     'Dark Lake Hylia Healer Fairy', 'Dark Lake Hylia Ledge Healer Fairy', 'Dark Desert Healer Fairy',
     'Dark Death Mountain Healer Fairy', 'Long Fairy Cave', 'Good Bee Cave', '20 Rupee Cave',
-    'Kakariko Gamble Game', 'Capacity Upgrade', '50 Rupee Cave', 'Lost Woods Gamble', 'Hookshot Fairy',
+    'Kakariko Gamble Game', '50 Rupee Cave', 'Lost Woods Gamble', 'Hookshot Fairy',
     'Palace of Darkness Hint', 'East Dark World Hint', 'Archery Game', 'Dark Lake Hylia Ledge Hint',
     'Dark Lake Hylia Ledge Spike Cave', 'Fortune Teller (Dark)', 'Dark Sanctuary Hint', 'Dark Desert Hint']
 
@@ -337,7 +337,7 @@ def set_up_shops(world, player):
 
     # Randomized changes to Shops
     if world.retro:
-        for shop in random.sample([s for s in world.shops if s.replaceable and s.region.player == player], 5):
+        for shop in random.sample([s for s in world.shops if s.replaceable and s.type == ShopType.Shop and s.region.player == player], 5):
             shop.active = True
             shop.add_inventory(0, 'Single Arrow', 80)
             shop.add_inventory(1, 'Small Key (Universal)', 100)

Main.py

@@ -4,7 +4,7 @@ from itertools import zip_longest
 import json
 import logging
 import os
-import random
+import RaceRandom as random
 import time
 
 from BaseClasses import World, CollectionState, Item, Region, Location, Shop
@@ -21,7 +21,10 @@ from Utils import output_path
 __version__ = '0.6.3-pre'
 
 def main(args, seed=None):
-    start = time.process_time()
+    start = time.perf_counter()
+
+    if args.securerandom:
+        random.use_secure()
 
     # initialize the world
     world = World(args.multi, args.shuffle, args.logic, args.mode, args.swords, args.difficulty, args.item_functionality, args.timer, args.progressive, args.goal, args.algorithm, not args.nodungeonitems, args.accessibility, args.shuffleganon, args.quickswap, args.fastmenu, args.disablemusic, args.keysanity, args.retro, args.custom, args.customitemarray, args.shufflebosses, args.hints)
@@ -33,6 +36,9 @@ def main(args, seed=None):
         world.seed = int(seed)
     random.seed(world.seed)
 
+    if args.securerandom:
+        world.seed = None
+
     world.crystals_needed_for_ganon = random.randint(0, 7) if args.crystals_ganon == 'random' else int(args.crystals_ganon)
     world.crystals_needed_for_gt = random.randint(0, 7) if args.crystals_gt == 'random' else int(args.crystals_gt)
 
@@ -172,7 +178,7 @@ def main(args, seed=None):
         world.spoiler.to_file(output_path('%s_Spoiler.txt' % outfilebase))
 
     logger.info('Done. Enjoy.')
-    logger.debug('Total Time: %s', time.process_time() - start)
+    logger.debug('Total Time: %s', time.perf_counter() - start)
 
     return world
 

Plando.py

@@ -3,7 +3,7 @@ import argparse
 import hashlib
 import logging
 import os
-import random
+import RaceRandom as random
 import time
 import sys
 
@@ -20,7 +20,7 @@ from Main import create_playthrough
 __version__ = '0.2-dev'
 
 def main(args):
-    start_time = time.clock()
+    start_time = time.perf_counter()
 
     # initialize the world
     world = World(1, 'vanilla', 'noglitches', 'standard', 'normal', 'none', 'on', 'ganon', 'freshness', False, False, False, args.quickswap, args.fastmenu, args.disablemusic, False, False, False, None, 'none', False)
@@ -89,7 +89,7 @@ def main(args):
         world.spoiler.to_file('%s_Spoiler.txt' % outfilebase)
 
     logger.info('Done. Enjoy.')
-    logger.debug('Total Time: %s', time.clock() - start_time)
+    logger.debug('Total Time: %s', time.perf_counter() - start_time)
 
     return world
 

RaceRandom.py

@@ -0,0 +1,44 @@
+import random as _random
+from functools import update_wrapper
+
+__all__ = ["use_secure"]
+
+_prng_inst = _random.Random()
+_cprng_inst = _random.SystemRandom()
+
+_mode = "prng"
+
+def use_secure(secure=True):
+    # pylint: disable=global-statement
+    global _mode
+    _mode = "cprng" if secure else "prng"
+
+def _wrap(name):
+    def somefunc(*args, **kwargs):
+        return getattr(_cprng_inst if _mode == "cprng" else _prng_inst, name)(*args, **kwargs)
+    update_wrapper(somefunc, getattr(_prng_inst, name))
+
+    return somefunc
+
+# These are for intellisense purposes only, and will be overwritten below
+choice = _prng_inst.choice
+gauss = _prng_inst.gauss
+getrandbits = _prng_inst.getrandbits
+randint = _prng_inst.randint
+random = _prng_inst.random
+randrange = _prng_inst.randrange
+sample = _prng_inst.sample
+seed = _prng_inst.seed
+shuffle = _prng_inst.shuffle
+uniform = _prng_inst.uniform
+
+for func_name in dir(_random):
+    if not callable(getattr(_random, func_name)):
+        continue
+    if not callable(getattr(_prng_inst, func_name, None)):
+        continue
+    if func_name.startswith('_'):
+        continue
+
+    globals()[func_name] = _wrap(func_name)
+    __all__.append(func_name)

Regions.py

@@ -311,7 +311,8 @@ def create_regions(world, player):
     region.shop = shop
     world.shops.append(shop)
     shop.add_inventory(0, 'Bomb Upgrade (+5)', 100, 7)
-    shop.add_inventory(1, 'Arrow Upgrade (+5)', 100, 7)
+    if not world.retro:
+        shop.add_inventory(1, 'Arrow Upgrade (+5)', 100, 7)
     world.intialize_regions()
 
 def create_lw_region(player, name, locations=None, exits=None):

Rom.py

@@ -3,7 +3,7 @@ import json
 import hashlib
 import logging
 import os
-import random
+import RaceRandom as random
 import struct
 import subprocess
 
@@ -18,7 +18,7 @@ from EntranceShuffle import door_addresses
 
 
 JAP10HASH = '03a63945398191337e896e5771f77173'
-RANDOMIZERBASEHASH = '1907d4caccffe60fc69940cfa11b2dab'
+RANDOMIZERBASEHASH = 'ac23ab12e7c442515d51370642772c3b'
 
 
 class JsonRom(object):
@@ -662,8 +662,10 @@ def patch_rom(world, player, rom):
                     [difficulty.progressive_sword_limit, overflow_replacement,
                      difficulty.progressive_shield_limit, overflow_replacement,
                      difficulty.progressive_armor_limit, overflow_replacement,
-                     difficulty.progressive_bottle_limit, overflow_replacement,
-                     difficulty.progressive_bow_limit, overflow_replacement])
+                     difficulty.progressive_bottle_limit, overflow_replacement])
+    
+    #Work around for json patch ordering issues - write bow limit separately so that it is replaced in the patch
+    rom.write_bytes(0x180098, [difficulty.progressive_bow_limit, overflow_replacement])
     
     if difficulty.progressive_bow_limit < 2 and world.swords == 'swordless':
         rom.write_bytes(0x180098, [2, overflow_replacement])
@@ -915,7 +917,16 @@ def patch_rom(world, player, rom):
     rom.write_byte(0x18005F, world.crystals_needed_for_ganon)
     rom.write_byte(0x18008A, 0x01 if world.mode == "standard" else 0x00) # block HC upstairs doors in rain state in standard mode
 
-    rom.write_byte(0x18016A, 0x01 if world.keysanity else 0x00)  # free roaming item text boxes
+     # Bitfield - enable text box to show with free roaming items
+     #
+     # ---o bmcs
+     # o - enabled for outside dungeon items
+     # b - enabled for inside big keys
+     # m - enabled for inside maps
+     # c - enabled for inside compasses
+     # s - enabled for inside small keys
+    rom.write_byte(0x18016A, 0xFF if world.keysanity else 0x00)
+    
     rom.write_byte(0x18003B, 0x01 if world.keysanity else 0x00)  # maps showing crystals on overworld
 
     # compasses showing dungeon count
@@ -926,6 +937,14 @@ def patch_rom(world, player, rom):
     else:
         rom.write_byte(0x18003C, 0x00)
 
+     # Bitfield - enable free items to show up in menu
+     #
+     # ----dcba
+     # d - Compass
+     # c - Map
+     # b - Big Key
+     # a - Small Key
+     #
     rom.write_byte(0x180045, 0xFF if world.keysanity else 0x00)  # free roaming items in menu
 
     # Map reveals
@@ -1005,7 +1024,7 @@ def patch_rom(world, player, rom):
     rom.write_bytes(0x02F539, [0xEA, 0xEA, 0xEA, 0xEA, 0xEA] if world.powder_patch_required[player] else [0xAD, 0xBF, 0x0A, 0xF0, 0x4F])
 
     # allow smith into multi-entrance caves in appropriate shuffles
-    if world.shuffle in ['restricted', 'full', 'crossed', 'insanity']:
+    if world.shuffle in ['restricted', 'full', 'crossed', 'insanity'] or (world.shuffle == 'simple' and world.mode == 'inverted'):
         rom.write_byte(0x18004C, 0x01)
 
     # set correct flag for hera basement item
@@ -1030,7 +1049,7 @@ def patch_rom(world, player, rom):
     # set rom name
     # 21 bytes
     from Main import __version__
-    rom.name = bytearray('ER_{0}_{1:09}\0'.format(__version__[0:7],world.seed), 'utf8')
+    rom.name = bytearray('ER_{0}_{1}\0'.format(__version__[0:7], world.seed), 'utf8')
     assert len(rom.name) <= 21
     rom.write_bytes(0x7FC0, rom.name)
 
@@ -1288,18 +1307,15 @@ def write_strings(rom, world, player):
 
     prog_bow_locs = world.find_items('Progressive Bow', player)
     distinguished_prog_bow_loc = next((location for location in prog_bow_locs if location.item.code == 0x65), None)
+    progressive_silvers = world.difficulty_requirements.progressive_bow_limit >= 2 or world.swords == 'swordless'
     if distinguished_prog_bow_loc:
         prog_bow_locs.remove(distinguished_prog_bow_loc)
-        silverarrow_hint = (' %s?' % hint_text(distinguished_prog_bow_loc).replace('Ganon\'s', 'my'))
-        tt['ganon_phase_3_no_silvers_alt'] = 'Did you find the silver arrows%s' % silverarrow_hint
-
-    if any(prog_bow_locs):
-        silverarrow_hint = (' %s?' % hint_text(random.choice(prog_bow_locs)).replace('Ganon\'s', 'my'))
+        silverarrow_hint = (' %s?' % hint_text(distinguished_prog_bow_loc).replace('Ganon\'s', 'my')) if progressive_silvers else '?\nI think not!'
         tt['ganon_phase_3_no_silvers'] = 'Did you find the silver arrows%s' % silverarrow_hint
 
-
-    silverarrow_hint = (' %s?' % hint_text(silverarrows[0]).replace('Ganon\'s', 'my')) if silverarrows else '?\nI think not!'
-
+    if any(prog_bow_locs):
+        silverarrow_hint = (' %s?' % hint_text(random.choice(prog_bow_locs)).replace('Ganon\'s', 'my')) if progressive_silvers else '?\nI think not!'
+        tt['ganon_phase_3_no_silvers_alt'] = 'Did you find the silver arrows%s' % silverarrow_hint
 
     crystal5 = world.find_items('Crystal 5', player)[0]
     crystal6 = world.find_items('Crystal 6', player)[0]

Rules.py

@@ -188,7 +188,8 @@ def global_rules(world, player):
     set_rule(world.get_entrance('Agahnims Tower', player), lambda state: state.has('Cape', player) or state.has_beam_sword(player) or state.has('Beat Agahnim 1', player))  # barrier gets removed after killing agahnim, relevant for entrance shuffle
     set_rule(world.get_entrance('Agahnim 1', player), lambda state: state.has_sword(player) and state.has_key('Small Key (Agahnims Tower)', player, 2))
     set_defeat_dungeon_boss_rule(world.get_location('Agahnim 1', player))
-    set_rule(world.get_location('Castle Tower - Dark Maze', player), lambda state: state.has_key('Small Key (Agahnims Tower)', player))
+    set_rule(world.get_location('Castle Tower - Room 03', player), lambda state: state.can_kill_most_things(player, 8))
+    set_rule(world.get_location('Castle Tower - Dark Maze', player), lambda state: state.can_kill_most_things(player, 8) and state.has_key('Small Key (Agahnims Tower)', player))
     set_rule(world.get_entrance('Top of Pyramid', player), lambda state: state.has('Beat Agahnim 1', player))
     set_rule(world.get_entrance('Old Man Cave Exit (West)', player), lambda state: False)  # drop cannot be climbed up
     set_rule(world.get_entrance('Broken Bridge (West)', player), lambda state: state.has('Hookshot', player))
@@ -294,6 +295,10 @@ def global_rules(world, player):
     for location in ['Desert Palace - Boss', 'Desert Palace - Big Key Chest', 'Desert Palace - Compass Chest']:
         forbid_item(world.get_location(location, player), 'Small Key (Desert Palace)', player)
 
+    # logic patch to prevent placing a crystal in Desert that's required to reach the required keys
+    if not world.keysanity:
+        add_rule(world.get_location('Desert Palace - Prize', player), lambda state: state.world.get_region('Desert Palace Main (Outer)', 1).can_reach(state))
+
     set_rule(world.get_entrance('Tower of Hera Small Key Door', player), lambda state: state.has_key('Small Key (Tower of Hera)', player) or item_name(state, 'Tower of Hera - Big Key Chest', player) == ('Small Key (Tower of Hera)', player))
     set_rule(world.get_entrance('Tower of Hera Big Key Door', player), lambda state: state.has('Big Key (Tower of Hera)', player))
     set_rule(world.get_location('Tower of Hera - Big Chest', player), lambda state: state.has('Big Key (Tower of Hera)', player))
@@ -365,8 +370,7 @@ def global_rules(world, player):
     # you can squander the free small key from the pot by opening the south door to the north west switch room, locking you out of accessing a color switch ...
     # big key gives backdoor access to that from the teleporter in the north west
     set_rule(world.get_location('Misery Mire - Map Chest', player), lambda state: state.has_key('Small Key (Misery Mire)', player, 1) or state.has('Big Key (Misery Mire)', player))
-    # in addition, you can open the door to the map room before getting access to a color switch, so this is locked behing 2 small keys or the big key...
-    set_rule(world.get_location('Misery Mire - Main Lobby', player), lambda state: state.has_key('Small Key (Misery Mire)', player, 2) or state.has_key('Big Key (Misery Mire)', player))
+    set_rule(world.get_location('Misery Mire - Main Lobby', player), lambda state: state.has_key('Small Key (Misery Mire)', player, 1) or state.has_key('Big Key (Misery Mire)', player))
     # we can place a small key in the West wing iff it also contains/blocks the Big Key, as we cannot reach and softlock with the basement key door yet
     set_rule(world.get_entrance('Misery Mire (West)', player), lambda state: state.has_key('Small Key (Misery Mire)', player, 2) if ((item_name(state, 'Misery Mire - Compass Chest', player) in [('Big Key (Misery Mire)', player)]) or
                                                                                                                  (item_name(state, 'Misery Mire - Big Key Chest', player) in [('Big Key (Misery Mire)', player)])) else state.has_key('Small Key (Misery Mire)', player, 3))
@@ -433,14 +437,14 @@ def global_rules(world, player):
     else:
         forbid_item(world.get_location('Ganons Tower - Map Chest', player), 'Small Key (Ganons Tower)', player)
 
-    # It is possible to need more than 2 keys to get through this entance if you spend keys elsewhere. We reflect this in the chest requirements.
+    # It is possible to need more than 2 keys to get through this entrance if you spend keys elsewhere. We reflect this in the chest requirements.
     # However we need to leave these at the lower values to derive that with 3 keys it is always possible to reach Bob and Ice Armos.
     set_rule(world.get_entrance('Ganons Tower (Double Switch Room)', player), lambda state: state.has_key('Small Key (Ganons Tower)', player, 2))
     # It is possible to need more than 3 keys ....
     set_rule(world.get_entrance('Ganons Tower (Firesnake Room)', player), lambda state: state.has_key('Small Key (Ganons Tower)', player, 3))
 
     #The actual requirements for these rooms to avoid key-lock
-    set_rule(world.get_location('Ganons Tower - Firesnake Room', player), lambda state: state.has_key('Small Key (Ganons Tower)', player, 3) or (item_in_locations(state, 'Big Key (Ganons Tower)', player, zip(randomizer_room_chests, [player] * len(randomizer_room_chests))) and state.has_key('Small Key (Ganons Tower)', player, 2)))
+    set_rule(world.get_location('Ganons Tower - Firesnake Room', player), lambda state: state.has_key('Small Key (Ganons Tower)', player, 3) or ((item_in_locations(state, 'Big Key (Ganons Tower)', player, zip(randomizer_room_chests, [player] * len(randomizer_room_chests))) or item_in_locations(state, 'Small Key (Ganons Tower)', player, [('Ganons Tower - Firesnake Room', player)])) and state.has_key('Small Key (Ganons Tower)', player, 2)))
     for location in randomizer_room_chests:
         set_rule(world.get_location(location, player), lambda state: state.has_key('Small Key (Ganons Tower)', player, 4) or (item_in_locations(state, 'Big Key (Ganons Tower)', player, zip(randomizer_room_chests, [player] * len(randomizer_room_chests))) and state.has_key('Small Key (Ganons Tower)', player, 3)))
 
@@ -488,11 +492,11 @@ def inverted_rules(world, player):
     world.get_region('Inverted Links House', player).entrances[0].can_reach = lambda state: True
     world.get_region('Inverted Dark Sanctuary', player).entrances[0].parent_region.can_reach_private = lambda state: True
 
-    old_rule = world.get_region('Old Man House', player).can_reach_private
-    world.get_region('Old Man House', player).can_reach_private = lambda state: state.can_reach('Old Man', 'Location', player) or old_rule(state)
+    old_rule_old_man = world.get_region('Old Man House', player).can_reach_private
+    world.get_region('Old Man House', player).can_reach_private = lambda state: state.can_reach('Old Man', 'Location', player) or old_rule_old_man(state)
 
-    old_rule = world.get_region('Hyrule Castle Ledge', player).can_reach_private
-    world.get_region('Hyrule Castle Ledge', player).can_reach_private = lambda state: (state.has_Mirror(player) and state.has('Beat Agahnim 1', player) and state.can_reach_light_world(player)) or old_rule(state)
+    old_rule_castle_ledge = world.get_region('Hyrule Castle Ledge', player).can_reach_private
+    world.get_region('Hyrule Castle Ledge', player).can_reach_private = lambda state: (state.has_Mirror(player) and state.has('Beat Agahnim 1', player) and state.can_reach_light_world(player)) or old_rule_castle_ledge(state)
 
     # overworld requirements 
     set_rule(world.get_location('Maze Race', player), lambda state: state.has_Pearl(player))
@@ -535,7 +539,7 @@ def inverted_rules(world, player):
 
     set_rule(world.get_location('Zora\'s Ledge', player), lambda state: state.has('Flippers', player) and state.has_Pearl(player))
     set_rule(world.get_entrance('Waterfall of Wishing', player), lambda state: state.has('Flippers', player) and state.has_Pearl(player))  # can be fake flippered into, but is in weird state inside that might prevent you from doing things. Can be improved in future Todo
-    set_rule(world.get_location('Frog', player), lambda state: state.can_lift_heavy_rocks(player) or (state.can_reach('Light World', 'Region', player) and state.has_Mirror(player)))
+    set_rule(world.get_location('Frog', player), lambda state: state.can_lift_heavy_rocks(player) and (state.has_Pearl(player) or state.has('Beat Agahnim 1', player)) or (state.can_reach('Light World', 'Region', player) and state.has_Mirror(player))) # Need LW access using Mirror or Portal
     set_rule(world.get_location('Missing Smith', player), lambda state: state.has('Get Frog', player) and state.can_reach('Blacksmiths Hut', 'Region', player)) # Can't S&Q with smith
     set_rule(world.get_location('Blacksmith', player), lambda state: state.has('Return Smith', player))
     set_rule(world.get_location('Magic Bat', player), lambda state: state.has('Magic Powder', player) and state.has_Pearl(player))
@@ -678,6 +682,10 @@ def inverted_rules(world, player):
     for location in ['Desert Palace - Boss', 'Desert Palace - Big Key Chest', 'Desert Palace - Compass Chest']:
         forbid_item(world.get_location(location, player), 'Small Key (Desert Palace)', player)
 
+    # logic patch to prevent placing a crystal in Desert that's required to reach the required keys
+    if not world.keysanity:
+        add_rule(world.get_location('Desert Palace - Prize', player), lambda state: state.world.get_region('Desert Palace Main (Outer)', 1).can_reach(state))
+
     set_rule(world.get_entrance('Tower of Hera Small Key Door', player), lambda state: state.has_key('Small Key (Tower of Hera)', player) or item_name(state, 'Tower of Hera - Big Key Chest', player) == ('Small Key (Tower of Hera)', player))
     set_rule(world.get_entrance('Tower of Hera Big Key Door', player), lambda state: state.has('Big Key (Tower of Hera)', player))
     set_rule(world.get_location('Tower of Hera - Big Chest', player), lambda state: state.has('Big Key (Tower of Hera)', player))
@@ -886,6 +894,9 @@ def no_glitches_rules(world, player):
         set_rule(world.get_entrance('Bat Cave Drop Ledge', player), lambda state: state.has('Hammer', player))
         set_rule(world.get_entrance('Zoras River', player), lambda state: state.has_Pearl(player) and (state.has('Flippers', player) or state.can_lift_rocks(player)))
         set_rule(world.get_entrance('Lake Hylia Central Island Pier', player), lambda state: state.has_Pearl(player) and state.has('Flippers', player))  # can be fake flippered to
+        set_rule(world.get_entrance('Lake Hylia Island Pier', player), lambda state: state.has_Pearl(player) and state.has('Flippers', player))  # can be fake flippered to
+        set_rule(world.get_entrance('Lake Hylia Warp', player), lambda state: state.has_Pearl(player) and state.has('Flippers', player))  # can be fake flippered to
+        set_rule(world.get_entrance('Northeast Light World Warp', player), lambda state: state.has_Pearl(player) and state.has('Flippers', player))  # can be fake flippered to
         set_rule(world.get_entrance('Hobo Bridge', player), lambda state: state.has_Pearl(player) and state.has('Flippers', player))
         set_rule(world.get_entrance('Dark Lake Hylia Drop (East)', player), lambda state: state.has('Flippers', player))
         set_rule(world.get_entrance('Dark Lake Hylia Teleporter', player), lambda state: state.has('Flippers', player) and (state.has('Hammer', player) or state.can_lift_rocks(player)))
@@ -1385,6 +1396,7 @@ def set_big_bomb_rules(world, player):
         # -> (M and Mitts) or ((Mitts or Flute or (M and P and West Dark World access)) and BR)
         add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: (state.can_lift_heavy_rocks(player) and state.has_Mirror(player)) or ((state.can_lift_heavy_rocks(player) or state.has('Ocarina', player) or (state.can_reach('West Dark World', 'Region', player) and state.has_Pearl(player) and state.has_Mirror(player))) and basic_routes(state)))
 
+
 def set_inverted_big_bomb_rules(world, player):
     bombshop_entrance = world.get_region('Inverted Big Bomb Shop', player).entrances[0]
     Normal_LW_entrances = ['Blinds Hideout',
@@ -1402,9 +1414,7 @@ def set_inverted_big_bomb_rules(world, player):
                            'Fortune Teller (Light)',
                            'Snitch Lady (East)',
                            'Snitch Lady (West)',
-                           'Bush Covered House',
                            'Tavern (Front)',
-                           'Light World Bomb Hut',
                            'Kakariko Shop',
                            'Mini Moldorm Cave',
                            'Long Fairy Cave',
@@ -1415,7 +1425,6 @@ def set_inverted_big_bomb_rules(world, player):
                            'Bonk Rock Cave',
                            'Library',
                            'Potion Shop',
-                           'Waterfall of Wishing',
                            'Dam',
                            'Lumberjack House',
                            'Lake Hylia Fortune Teller',
@@ -1431,22 +1440,42 @@ def set_inverted_big_bomb_rules(world, player):
                            'Two Brothers House (East)',
                            'Sanctuary',
                            'Hyrule Castle Entrance (South)',
-                           'Hyrule Castle Secret Entrance Stairs']
-    LW_walkable_entrances = ['Dark Lake Hylia Ledge Fairy',
-                             'Dark Lake Hylia Ledge Spike Cave',
-                             'Dark Lake Hylia Ledge Hint',
-                             'Mire Shed',
-                             'Dark Desert Hint',
-                             'Dark Desert Fairy',
-                             'Misery Mire']
+                           'Hyrule Castle Secret Entrance Stairs',
+                           'Hyrule Castle Entrance (West)',
+                           'Hyrule Castle Entrance (East)',
+                           'Inverted Ganons Tower',
+                           'Cave 45',
+                           'Checkerboard Cave',
+                           'Inverted Big Bomb Shop']
+    Isolated_LW_entrances = ['Old Man Cave (East)',
+                             'Old Man House (Bottom)',
+                             'Old Man House (Top)',
+                             'Death Mountain Return Cave (East)',
+                             'Spectacle Rock Cave Peak',
+                             'Tower of Hera',
+                             'Death Mountain Return Cave (West)',
+                             'Paradox Cave (Top)',
+                             'Fairy Ascension Cave (Top)',
+                             'Spiral Cave',
+                             'Paradox Cave (Bottom)',
+                             'Paradox Cave (Middle)',
+                             'Hookshot Fairy',
+                             'Spiral Cave (Bottom)',
+                             'Mimic Cave',
+                             'Fairy Ascension Cave (Bottom)',
+                             'Desert Palace Entrance (West)',
+                             'Desert Palace Entrance (North)',
+                             'Desert Palace Entrance (South)']
+    Eastern_DW_entrances = ['Palace of Darkness',
+                            'Palace of Darkness Hint',
+                            'Dark Lake Hylia Fairy',
+                            'East Dark World Hint']
     Northern_DW_entrances = ['Brewery',
                              'C-Shaped House',
                              'Chest Game',
                              'Dark World Hammer Peg Cave',
-                             'Red Shield Shop',
-                             'Dark Sanctuary Hint',
+                             'Inverted Dark Sanctuary',
                              'Fortune Teller (Dark)',
-                             'Dark World Shop',
                              'Dark World Lumberjack Shop',
                              'Thieves Town',
                              'Skull Woods First Section Door',
@@ -1454,16 +1483,14 @@ def set_inverted_big_bomb_rules(world, player):
     Southern_DW_entrances = ['Hype Cave',
                              'Bonk Fairy (Dark)',
                              'Archery Game',
-                             'Inverted Big Bomb Shop',
+                             'Inverted Links House',
                              'Dark Lake Hylia Shop',
                              'Swamp Palace']
     Isolated_DW_entrances = ['Spike Cave',
                              'Cave Shop (Dark Death Mountain)',
                              'Dark Death Mountain Fairy',
-                             'Mimic Cave',
                              'Skull Woods Second Section Door (West)',
                              'Skull Woods Final Section',
-                             'Ice Palace',
                              'Turtle Rock',
                              'Dark Death Mountain Ledge (West)',
                              'Dark Death Mountain Ledge (East)',
@@ -1474,42 +1501,23 @@ def set_inverted_big_bomb_rules(world, player):
                              'Turtle Rock Isolated Ledge Entrance',
                              'Hookshot Cave Back Entrance',
                              'Inverted Agahnims Tower']
-    Isolated_LW_entrances = ['Capacity Upgrade',
-                             'Tower of Hera',
-                             'Death Mountain Return Cave (West)',
-                             'Paradox Cave (Top)',
-                             'Fairy Ascension Cave (Top)',
-                             'Spiral Cave',
-                             'Desert Palace Entrance (East)']
-    West_LW_DM_entrances = ['Old Man Cave (East)',
-                            'Old Man House (Bottom)',
-                            'Old Man House (Top)',
-                            'Death Mountain Return Cave (East)',
-                            'Spectacle Rock Cave Peak',
-                            'Spectacle Rock Cave',
-                            'Spectacle Rock Cave (Bottom)']
-    East_LW_DM_entrances = ['Paradox Cave (Bottom)',
-                            'Paradox Cave (Middle)',
-                            'Hookshot Fairy',
-                            'Spiral Cave (Bottom)']
-    Mirror_from_SDW_entrances = ['Two Brothers House (West)',
-                                 'Cave 45']
-    Castle_ledge_entrances = ['Hyrule Castle Entrance (West)',
-                              'Hyrule Castle Entrance (East)',
-                              'Inverted Ganons Tower']
-    Desert_mirrorable_ledge_entrances = ['Desert Palace Entrance (West)',
-                                         'Desert Palace Entrance (North)',
-                                         'Desert Palace Entrance (South)',
-                                         'Checkerboard Cave',]
-    Desert_ledge_entrances = ['Desert Palace Entrance (West)',
-                              'Desert Palace Entrance (North)',
-                              'Desert Palace Entrance (South)']
+    LW_walkable_entrances = ['Dark Lake Hylia Ledge Fairy',
+                             'Dark Lake Hylia Ledge Spike Cave',
+                             'Dark Lake Hylia Ledge Hint',
+                             'Mire Shed',
+                             'Dark Desert Hint',
+                             'Dark Desert Fairy',
+                             'Misery Mire',
+                             'Red Shield Shop']
+    LW_bush_entrances = ['Bush Covered House',
+                         'Light World Bomb Hut',
+                         'Graveyard Cave']
+    LW_inaccessible_entrances = ['Desert Palace Entrance (East)',
+                                 'Spectacle Rock Cave',
+                                 'Spectacle Rock Cave (Bottom)']
 
-    set_rule(world.get_entrance('Pyramid Fairy', player), lambda state: state.can_reach('East Dark World', 'Region', player) and state.can_reach('Inverted Big Bomb Shop', 'Region', player) and state.has('Crystal 5', player) and state.has('Crystal 6', player))
-
-    #crossing peg bridge starting from the southern dark world
-    def cross_peg_bridge(state):
-        return state.has('Hammer', player)
+    set_rule(world.get_entrance('Pyramid Fairy', player),
+             lambda state: state.can_reach('East Dark World', 'Region', player) and state.can_reach('Inverted Big Bomb Shop', 'Region', player) and state.has('Crystal 5', player) and state.has('Crystal 6', player))
 
     # Key for below abbreviations:
     # P = pearl
@@ -1517,42 +1525,66 @@ def set_inverted_big_bomb_rules(world, player):
     # H = hammer
     # M = Mirror
     # G = Glove
-    if bombshop_entrance.name in Normal_LW_entrances:
+    if bombshop_entrance.name in Eastern_DW_entrances:
+        # Just walk to the pyramid
+        pass
+    elif bombshop_entrance.name in Normal_LW_entrances:
+        # Just walk to the castle and mirror.
         add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: state.has_Mirror(player))
-    elif bombshop_entrance.name in LW_walkable_entrances:
-        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: state.can_flute(player))
-    elif bombshop_entrance.name in Northern_DW_entrances:
-        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: state.can_flute or (state.can_lift_heavy_rocks(player) and (cross_peg_bridge(state) or (state.has_Mirror(player) and state.has('Beat Agahnim 1', player)))))
-    elif bombshop_entrance.name == 'Bumper Cave (Bottom)':
-        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: state.can_flute or (state.can_lift_heavy_rocks(player) and (cross_peg_bridge(state) or state.has_Mirror(player) and state.has('Beat Agahnim 1', player))))
-    elif bombshop_entrance.name in Southern_DW_entrances:
-        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: cross_peg_bridge(state) or state.can_flute(player) or (state.has_Mirror(player) and state.has('Beat Agahnim 1', player)))
-    elif bombshop_entrance.name in Isolated_DW_entrances:
-        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: state.can_flute(player))
     elif bombshop_entrance.name in Isolated_LW_entrances:
+        # For these entrances, you cannot walk to the castle/pyramid and thus must use Mirror and then Flute.
         add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: state.can_flute(player) and state.has_Mirror(player))
-    elif bombshop_entrance.name in West_LW_DM_entrances:
-        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: state.can_flute(player) and state.has_Mirror(player))
-    elif bombshop_entrance.name in East_LW_DM_entrances:
-        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: state.can_flute(player) and state.has_Mirror(player))
-    elif bombshop_entrance.name == 'Fairy Ascension Cave (Bottom)':
-        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: state.can_flute(player) and state.has_Mirror(player))
-    elif bombshop_entrance.name in Castle_ledge_entrances:
-        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: state.has_Mirror(player))
-    elif bombshop_entrance.name in Desert_ledge_entrances:
-        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: state.has_Mirror(player) and state.can_flute(player))
-    elif bombshop_entrance.name == 'Checkerboard Cave':
-        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: state.has_Mirror(player))
+    elif bombshop_entrance.name in Northern_DW_entrances:
+        # You can just fly with the Flute, you can take a long walk with Mitts and Hammer,
+        # or you can leave a Mirror portal nearby and then walk to the castle to Mirror again.
+        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: state.can_flute or (state.can_lift_heavy_rocks(player) and state.has('Hammer', player)) or (state.has_Mirror(player) and state.can_reach('Light World', 'Region', player)))
+    elif bombshop_entrance.name in Southern_DW_entrances:
+        # This is the same as north DW without the Mitts rock present.
+        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: state.has('Hammer', player) or state.can_flute(player) or (state.has_Mirror(player) and state.can_reach('Light World', 'Region', player)))
+    elif bombshop_entrance.name in Isolated_DW_entrances:
+        # There's just no way to escape these places with the bomb and no Flute.
+        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: state.can_flute(player))
+    elif bombshop_entrance.name in LW_walkable_entrances:
+        # You can fly with the flute, or leave a mirror portal and walk through the light world
+        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: state.can_flute(player) or (state.has_Mirror(player) and state.can_reach('Light World', 'Region', player)))
+    elif bombshop_entrance.name in LW_bush_entrances:
+        # These entrances are behind bushes in LW so you need either Pearl or the tools to solve NDW bomb shop locations.
+        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: state.has_Mirror(player) and (state.can_flute(player) or state.has_Pearl(player) or (state.can_lift_heavy_rocks(player) and state.has('Hammer', player))))
+    elif bombshop_entrance.name == 'Dark World Shop':
+        # This is mostly the same as NDW but the Mirror path requires the Pearl, or using the Hammer
+        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: state.can_flute or (state.can_lift_heavy_rocks(player) and state.has('Hammer', player)) or (state.has_Mirror(player) and state.can_reach('Light World', 'Region', player) and (state.has_Pearl(player) or state.has('Hammer', player))))
+    elif bombshop_entrance.name == 'Bumper Cave (Bottom)':
+        # This is mostly the same as NDW but the Mirror path requires being able to lift a rock.
+        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: state.can_flute or (state.can_lift_heavy_rocks(player) and state.has('Hammer', player)) or (state.has_Mirror(player) and state.can_lift_rocks(player) and state.can_reach('Light World', 'Region', player)))
     elif bombshop_entrance.name == 'Old Man Cave (West)':
-        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: state.has_Mirror(player) and ((state.can_lift_rocks(player) and cross_peg_bridge(state)) or state.can_flute(player)))
-    elif bombshop_entrance.name == 'Graveyard Cave':
-        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: state.has_Mirror(player))
-    elif bombshop_entrance.name in Mirror_from_SDW_entrances:
-        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: state.has_Mirror(player) and (state.can_flute(player) or cross_peg_bridge(state)))
+        # The three paths back are Mirror and DW walk, Mirror and Flute, or LW walk and then Mirror.
+        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: state.has_Mirror(player) and ((state.can_lift_heavy_rocks(player) and state.has('Hammer', player)) or (state.can_lift_rocks(player) and state.has_Pearl(player)) or state.can_flute(player)))
     elif bombshop_entrance.name == 'Dark World Potion Shop':
+        # You either need to Flute to 5 or cross the rock/hammer choice pass to the south.
         add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: state.can_flute(player) or state.has('Hammer', player) or state.can_lift_rocks(player))
     elif bombshop_entrance.name == 'Kings Grave':
-        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: state.can_lift_heavy_rocks(player) and state.has_Mirror(player))
+        # Either lift the rock and walk to the castle to Mirror or Mirror immediately and Flute.
+        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: (state.can_flute(player) or (state.has_Pearl(player) and state.can_lift_heavy_rocks(player))) and state.has_Mirror(player))
+    elif bombshop_entrance.name == 'Two Brothers House (West)':
+        # First you must Mirror. Then you can either Flute, cross the peg bridge, or use the Agah 1 portal to Mirror again.
+        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: (state.can_flute(player) or state.has('Hammer', player) or state.has('Beat Agahnim 1', player)) and state.has_Mirror(player))
+    elif bombshop_entrance.name == 'Waterfall of Wishing':
+        # You absolutely must be able to swim to return it from here.
+        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: state.has('Flippers', player) and state.has_Pearl(player) and state.has_Mirror(player))
+    elif bombshop_entrance.name == 'Ice Palace':
+        # You can swim to the dock or use the Flute to get off the island.
+        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: state.has('Flippers', player) or state.can_flute(player))
+    elif bombshop_entrance.name == 'Capacity Upgrade':
+        # You must Mirror but then can use either Ice Palace return path.
+        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: (state.has('Flippers', player) or state.can_flute(player)) and state.has_Mirror(player))
+    elif bombshop_entrance.name in LW_inaccessible_entrances:
+        # You can't get to the pyramid from these entrances without bomb duping.
+        raise Exception('No valid path to open Pyramid Fairy. (Could not route from %s)' % bombshop_entrance.name)
+    elif bombshop_entrance.name == 'Pyramid Fairy':
+        # Self locking.  The shuffles don't put the bomb shop here, but doesn't lock anything important.
+        set_rule(world.get_entrance('Pyramid Fairy', player), lambda state: False)
+    else:
+        raise Exception('No logic found for routing from %s to the pyramid.' % bombshop_entrance.name)
 
 
 def set_bunny_rules(world, player):

test/TestDeathMountain.py

@@ -0,0 +1,53 @@
+from BaseClasses import World
+from Dungeons import create_dungeons
+from EntranceShuffle import link_entrances
+from ItemList import difficulties
+from Regions import create_regions
+from Rules import set_rules
+from test.TestVanilla import TestVanilla
+
+
+class TestDeathMountain(TestVanilla):
+    def setUp(self):
+        self.world = World(1, 'vanilla', 'noglitches', 'open', 'random', 'normal', 'normal', 'none', 'on', 'ganon', 'balanced',
+                      True, False, False, False, False, False, False, False, False, None,
+                      'none', False)
+        self.world.difficulty_requirements = difficulties['normal']
+        create_regions(self.world, 1)
+        create_dungeons(self.world, 1)
+        link_entrances(self.world, 1)
+        set_rules(self.world, 1)
+
+    def testWestDeathMountain(self):
+        self.run_tests([
+            ["Ether Tablet", False, []],
+            ["Ether Tablet", False, [], ['Progressive Glove', 'Ocarina']],
+            ["Ether Tablet", False, [], ['Lamp', 'Ocarina']],
+            ["Ether Tablet", False, [], ['Magic Mirror', 'Hookshot']],
+            ["Ether Tablet", False, [], ['Magic Mirror', 'Hammer']],
+            ["Ether Tablet", False, ['Progressive Sword'], ['Progressive Sword']],
+            ["Ether Tablet", False, [], ['Book of Mudora']],
+            ["Ether Tablet", True, ['Ocarina', 'Magic Mirror', 'Book of Mudora', 'Progressive Sword', 'Progressive Sword']],
+            ["Ether Tablet", True, ['Progressive Glove', 'Lamp', 'Magic Mirror', 'Book of Mudora', 'Progressive Sword', 'Progressive Sword']],
+            ["Ether Tablet", True, ['Ocarina', 'Hammer', 'Hookshot', 'Book of Mudora', 'Progressive Sword', 'Progressive Sword']],
+            ["Ether Tablet", True, ['Progressive Glove', 'Lamp', 'Hammer', 'Hookshot', 'Book of Mudora', 'Progressive Sword', 'Progressive Sword']],
+
+            ["Old Man", False, []],
+            ["Old Man", False, [], ['Progressive Glove', 'Ocarina']],
+            ["Old Man", False, [], ['Lamp']],
+            ["Old Man", True, ['Ocarina', 'Lamp']],
+            ["Old Man", True, ['Progressive Glove', 'Lamp']],
+
+            ["Spectacle Rock Cave", False, []],
+            ["Spectacle Rock Cave", False, [], ['Progressive Glove', 'Ocarina']],
+            ["Spectacle Rock Cave", False, [], ['Lamp', 'Ocarina']],
+            ["Spectacle Rock Cave", True, ['Ocarina']],
+            ["Spectacle Rock Cave", True, ['Progressive Glove', 'Lamp']],
+
+            ["Spectacle Rock", False, []],
+            ["Spectacle Rock", False, [], ['Progressive Glove', 'Ocarina']],
+            ["Spectacle Rock", False, [], ['Lamp', 'Ocarina']],
+            ["Spectacle Rock", False, [], ['Magic Mirror']],
+            ["Spectacle Rock", True, ['Ocarina', 'Magic Mirror']],
+            ["Spectacle Rock", True, ['Progressive Glove', 'Lamp', 'Magic Mirror']],
+        ])

test/TestVanilla.py

@@ -0,0 +1,41 @@
+import unittest
+
+from BaseClasses import World, CollectionState
+from Dungeons import create_dungeons, get_dungeon_item_pool
+from EntranceShuffle import link_entrances
+from InvertedRegions import mark_dark_world_regions
+from ItemList import difficulties
+from Items import ItemFactory
+from Regions import create_regions
+from Rules import set_rules
+
+
+class TestVanilla(unittest.TestCase):
+    def setUp(self):
+        self.world = World(1, 'vanilla', 'noglitches', 'open', 'random', 'normal', 'normal', 'none', 'on', 'ganon', 'balanced',
+                           True, False, False, False, False, False, False, False, False, None,
+                           'none', False)
+        self.world.difficulty_requirements = difficulties['normal']
+        create_regions(self.world, 1)
+        create_dungeons(self.world, 1)
+        link_entrances(self.world, 1)
+        mark_dark_world_regions(self.world)
+        set_rules(self.world, 1)
+
+    def run_tests(self, access_pool):
+        for location, access, *item_pool in access_pool:
+            items = item_pool[0]
+            all_except = item_pool[1] if len(item_pool) > 1 else None
+            with self.subTest(location=location, access=access, items=items, all_except=all_except):
+                if all_except and len(all_except) > 0:
+                    items = self.world.itempool[:]
+                    items = [item for item in items if item.name not in all_except and not ("Bottle" in item.name and "AnyBottle" in all_except)]
+                    items.extend(ItemFactory(item_pool[0], 1))
+                else:
+                    items = ItemFactory(items, 1)
+                state = CollectionState(self.world)
+                for item in items:
+                    item.advancement = True
+                    state.collect(item)
+
+                self.assertEqual(self.world.get_location(location, 1).can_reach(state), access)

test/dungeons/TestAgahnimsTower.py

@@ -0,0 +1,24 @@
+from test.dungeons.TestDungeon import TestDungeon
+
+
+class TestAgahnimsTower(TestDungeon):
+
+    def testTower(self):
+        self.starting_regions = ['Agahnims Tower']
+        self.run_tests([
+            ["Castle Tower - Room 03", False, []],
+            ["Castle Tower - Room 03", False, [], ['Progressive Sword', 'Hammer', 'Progressive Bow', 'Fire Rod', 'Ice Rod', 'Cane of Somaria', 'Cane of Byrna']],
+            ["Castle Tower - Room 03", True, ['Progressive Sword']],
+
+            ["Castle Tower - Dark Maze", False, []],
+            ["Castle Tower - Dark Maze", False, [], ['Small Key (Agahnims Tower)']],
+            ["Castle Tower - Dark Maze", False, [], ['Lamp']],
+            ["Castle Tower - Dark Maze", False, [], ['Progressive Sword', 'Hammer', 'Progressive Bow', 'Fire Rod', 'Ice Rod', 'Cane of Somaria', 'Cane of Byrna']],
+            ["Castle Tower - Dark Maze", True, ['Progressive Sword', 'Small Key (Agahnims Tower)', 'Lamp']],
+
+            ["Agahnim 1", False, []],
+            ["Agahnim 1", False, ['Small Key (Agahnims Tower)'], ['Small Key (Agahnims Tower)']],
+            ["Agahnim 1", False, [], ['Progressive Sword']],
+            ["Agahnim 1", False, [], ['Lamp']],
+            ["Agahnim 1", True, ['Small Key (Agahnims Tower)', 'Small Key (Agahnims Tower)', 'Lamp', 'Progressive Sword']],
+        ])

test/dungeons/TestDarkPalace.py

@@ -0,0 +1,80 @@
+from test.dungeons.TestDungeon import TestDungeon
+
+
+class TestDarkPalace(TestDungeon):
+
+    def testDarkPalace(self):
+        self.starting_regions = ['Palace of Darkness (Entrance)']
+        key = 'Small Key (Palace of Darkness)'
+        self.run_tests([
+            ["Palace of Darkness - Shooter Room", True, []],
+
+            ["Palace of Darkness - The Arena - Ledge", False, []],
+            ["Palace of Darkness - The Arena - Ledge", False, [], ['Progressive Bow']],
+            ["Palace of Darkness - The Arena - Ledge", True, ['Progressive Bow']],
+
+            ["Palace of Darkness - Map Chest", False, []],
+            ["Palace of Darkness - Map Chest", False, [], ['Progressive Bow']],
+            ["Palace of Darkness - Map Chest", True, ['Progressive Bow']],
+
+            #Lower requirement for self-locking key
+            #No lower requirement when bow/hammer is out of logic
+            ["Palace of Darkness - Big Key Chest", False, []],
+            ["Palace of Darkness - Big Key Chest", False, [key]*5, [key]],
+            ["Palace of Darkness - Big Key Chest", True, [key]*6],
+
+            ["Palace of Darkness - The Arena - Bridge", False, []],
+            ["Palace of Darkness - The Arena - Bridge", False, [], [key, 'Progressive Bow']],
+            ["Palace of Darkness - The Arena - Bridge", False, [], [key, 'Hammer']],
+            ["Palace of Darkness - The Arena - Bridge", True, [key]],
+            ["Palace of Darkness - The Arena - Bridge", True, ['Progressive Bow', 'Hammer']],
+
+            ["Palace of Darkness - Stalfos Basement", False, []],
+            ["Palace of Darkness - Stalfos Basement", False, [], [key, 'Progressive Bow']],
+            ["Palace of Darkness - Stalfos Basement", False, [], [key, 'Hammer']],
+            ["Palace of Darkness - Stalfos Basement", True, [key]],
+            ["Palace of Darkness - Stalfos Basement", True, ['Progressive Bow', 'Hammer']],
+
+            ["Palace of Darkness - Compass Chest", False, []],
+            ["Palace of Darkness - Compass Chest", False, [key]*3, [key]],
+            ["Palace of Darkness - Compass Chest", True, [key]*4],
+
+            #@todo: Advanced?
+            ["Palace of Darkness - Dark Basement - Left", False, []],
+            ["Palace of Darkness - Dark Basement - Left", False, [], ['Lamp']],
+            ["Palace of Darkness - Dark Basement - Left", False, [key]*3, [key]],
+            ["Palace of Darkness - Dark Basement - Left", True, ['Lamp'] + [key]*4],
+
+            ["Palace of Darkness - Dark Basement - Right", False, []],
+            ["Palace of Darkness - Dark Basement - Right", False, [], ['Lamp']],
+            ["Palace of Darkness - Dark Basement - Right", False, [key] * 3, [key]],
+            ["Palace of Darkness - Dark Basement - Right", True, ['Lamp'] + [key] * 4],
+
+            ["Palace of Darkness - Harmless Hellway", False, []],
+            ["Palace of Darkness - Harmless Hellway", False, [key]*5, [key]],
+            ["Palace of Darkness - Harmless Hellway", True, [key]*6],
+
+            ["Palace of Darkness - Dark Maze - Top", False, []],
+            ["Palace of Darkness - Dark Maze - Top", False, [], ['Lamp']],
+            ["Palace of Darkness - Dark Maze - Top", False, [key]*5, [key]],
+            ["Palace of Darkness - Dark Maze - Top", True, ['Lamp'] + [key]*6],
+
+            ["Palace of Darkness - Dark Maze - Bottom", False, []],
+            ["Palace of Darkness - Dark Maze - Bottom", False, [], ['Lamp']],
+            ["Palace of Darkness - Dark Maze - Bottom", False, [key]*5, [key]],
+            ["Palace of Darkness - Dark Maze - Bottom", True, ['Lamp'] + [key]*6],
+
+            ["Palace of Darkness - Big Chest", False, []],
+            ["Palace of Darkness - Big Chest", False, [], ['Lamp']],
+            ["Palace of Darkness - Big Chest", False, [], ['Big Key (Palace of Darkness)']],
+            ["Palace of Darkness - Big Chest", False, [key]*5, [key]],
+            ["Palace of Darkness - Big Chest", True, ['Lamp', 'Big Key (Palace of Darkness)'] + [key]*6],
+
+            ["Palace of Darkness - Boss", False, []],
+            ["Palace of Darkness - Boss", False, [], ['Lamp']],
+            ["Palace of Darkness - Boss", False, [], ['Hammer']],
+            ["Palace of Darkness - Boss", False, [], ['Progressive Bow']],
+            ["Palace of Darkness - Boss", False, [], ['Big Key (Palace of Darkness)']],
+            ["Palace of Darkness - Boss", False, [key]*5, [key]],
+            ["Palace of Darkness - Boss", True, ['Lamp', 'Hammer', 'Progressive Bow', 'Big Key (Palace of Darkness)'] + [key]*6],
+        ])

test/dungeons/TestDesertPalace.py

@@ -0,0 +1,39 @@
+from test.dungeons.TestDungeon import TestDungeon
+
+
+class TestDesertPalace(TestDungeon):
+
+    def testDesertPalace(self):
+        self.starting_regions = ['Desert Palace North', 'Desert Palace Main (Inner)', 'Desert Palace Main (Outer)']
+        self.run_tests([
+            ["Desert Palace - Map Chest", True, []],
+
+            ["Desert Palace - Big Chest", False, []],
+            ["Desert Palace - Big Chest", False, [], ['Big Key (Desert Palace)']],
+            ["Desert Palace - Big Chest", True, ['Big Key (Desert Palace)']],
+
+            ["Desert Palace - Torch", False, []],
+            ["Desert Palace - Torch", False, [], ['Pegasus Boots']],
+            ["Desert Palace - Torch", True, ['Pegasus Boots']],
+
+            ["Desert Palace - Compass Chest", False, []],
+            ["Desert Palace - Compass Chest", False, [], ['Small Key (Desert Palace)']],
+            ["Desert Palace - Compass Chest", True, ['Small Key (Desert Palace)']],
+
+            #@todo: Require a real weapon for enemizer?
+            ["Desert Palace - Big Key Chest", False, []],
+            ["Desert Palace - Big Key Chest", False, [], ['Small Key (Desert Palace)']],
+            ["Desert Palace - Big Key Chest", True, ['Small Key (Desert Palace)']],
+
+            ["Desert Palace - Boss", False, []],
+            ["Desert Palace - Boss", False, [], ['Small Key (Desert Palace)']],
+            ["Desert Palace - Boss", False, [], ['Big Key (Desert Palace)']],
+            ["Desert Palace - Boss", False, [], ['Lamp', 'Fire Rod']],
+            ["Desert Palace - Boss", False, [], ['Progressive Sword', 'Hammer', 'Fire Rod', 'Ice Rod', 'Progressive Bow', 'Cane of Somaria', 'Cane of Byrna']],
+            ["Desert Palace - Boss", True, ['Small Key (Desert Palace)', 'Big Key (Desert Palace)', 'Fire Rod']],
+            ["Desert Palace - Boss", True, ['Small Key (Desert Palace)', 'Big Key (Desert Palace)', 'Lamp', 'Progressive Sword']],
+            ["Desert Palace - Boss", True, ['Small Key (Desert Palace)', 'Big Key (Desert Palace)', 'Lamp', 'Hammer']],
+            ["Desert Palace - Boss", True, ['Small Key (Desert Palace)', 'Big Key (Desert Palace)', 'Lamp', 'Ice Rod']],
+            ["Desert Palace - Boss", True, ['Small Key (Desert Palace)', 'Big Key (Desert Palace)', 'Lamp', 'Cane of Somaria']],
+            ["Desert Palace - Boss", True, ['Small Key (Desert Palace)', 'Big Key (Desert Palace)', 'Lamp', 'Cane of Byrna']],
+        ])

test/dungeons/TestDungeon.py

@@ -0,0 +1,49 @@
+import unittest
+
+from BaseClasses import World, CollectionState
+from Dungeons import create_dungeons, get_dungeon_item_pool
+from EntranceShuffle import mandatory_connections, connect_simple
+from ItemList import difficulties, generate_itempool
+from Items import ItemFactory
+from Regions import create_regions
+from Rules import set_rules
+
+
+class TestDungeon(unittest.TestCase):
+    def setUp(self):
+        self.world = World(1, 'vanilla', 'noglitches', 'open', 'random', 'normal', 'normal', 'none', 'on', 'ganon', 'balanced',
+                           True, False, False, False, False, False, False, False, False, None,
+                           'none', False)
+        self.starting_regions = []
+        self.world.difficulty_requirements = difficulties['normal']
+        create_regions(self.world, 1)
+        create_dungeons(self.world, 1)
+        for exitname, regionname in mandatory_connections:
+            connect_simple(self.world, exitname, regionname, 1)
+        connect_simple(self.world, self.world.get_entrance('Big Bomb Shop', 1), self.world.get_region('Big Bomb Shop', 1), 1)
+        self.world.swamp_patch_required[1] = True
+        set_rules(self.world, 1)
+        generate_itempool(self.world, 1)
+        self.world.itempool.extend(get_dungeon_item_pool(self.world))
+        self.world.itempool.extend(ItemFactory(['Green Pendant', 'Red Pendant', 'Blue Pendant', 'Beat Agahnim 1', 'Beat Agahnim 2', 'Crystal 1', 'Crystal 2', 'Crystal 3', 'Crystal 4', 'Crystal 5', 'Crystal 6', 'Crystal 7'], 1))
+
+    def run_tests(self, access_pool):
+        for region in self.starting_regions:
+            self.world.get_region(region, 1).can_reach_private = lambda _: True
+
+        for location, access, *item_pool in access_pool:
+            items = item_pool[0]
+            all_except = item_pool[1] if len(item_pool) > 1 else None
+            with self.subTest(location=location, access=access, items=items, all_except=all_except):
+                if all_except and len(all_except) > 0:
+                    items = self.world.itempool[:]
+                    items = [item for item in items if item.name not in all_except and not ("Bottle" in item.name and "AnyBottle" in all_except)]
+                    items.extend(ItemFactory(item_pool[0], 1))
+                else:
+                    items = ItemFactory(items, 1)
+                state = CollectionState(self.world)
+                for item in items:
+                    item.advancement = True
+                    state.collect(item)
+
+                self.assertEqual(self.world.get_location(location, 1).can_reach(state), access)

test/dungeons/TestEasternPalace.py

@@ -0,0 +1,29 @@
+from test.dungeons.TestDungeon import TestDungeon
+
+
+class TestEasternPalace(TestDungeon):
+
+    def testEastern(self):
+        self.starting_regions = ["Eastern Palace"]
+        self.run_tests([
+                ["Eastern Palace - Compass Chest", True, []],
+
+                ["Eastern Palace - Cannonball Chest", True, []],
+
+                ["Eastern Palace - Big Chest", False, []],
+                ["Eastern Palace - Big Chest", False, [], ['Big Key (Eastern Palace)']],
+                ["Eastern Palace - Big Chest", True, ['Big Key (Eastern Palace)']],
+
+                ["Eastern Palace - Map Chest", True, []],
+
+                ["Eastern Palace - Big Key Chest", False, []],
+                ["Eastern Palace - Big Key Chest", False, [], ['Lamp']],
+                ["Eastern Palace - Big Key Chest", True, ['Lamp']],
+
+                #@todo: Advanced?
+                ["Eastern Palace - Boss", False, []],
+                ["Eastern Palace - Boss", False, [], ['Lamp']],
+                ["Eastern Palace - Boss", False, [], ['Progressive Bow']],
+                ["Eastern Palace - Boss", False, [], ['Big Key (Eastern Palace)']],
+                ["Eastern Palace - Boss", True, ['Lamp', 'Progressive Bow', 'Big Key (Eastern Palace)']]
+            ])

test/dungeons/TestGanonsTower.py

@@ -0,0 +1,144 @@
+from test.dungeons.TestDungeon import TestDungeon
+
+
+class TestGanonsTower(TestDungeon):
+
+    def testGanonsTower(self):
+        self.starting_regions = ['Ganons Tower (Entrance)']
+        self.run_tests([
+            ["Ganons Tower - Bob's Torch", False, []],
+            ["Ganons Tower - Bob's Torch", False, [], ['Pegasus Boots']],
+            ["Ganons Tower - Bob's Torch", True, ['Pegasus Boots']],
+
+            ["Ganons Tower - DMs Room - Top Left", False, []],
+            ["Ganons Tower - DMs Room - Top Left", False, [], ['Hammer']],
+            ["Ganons Tower - DMs Room - Top Left", False, [], ['Hookshot']],
+            ["Ganons Tower - DMs Room - Top Left", True, ['Hookshot', 'Hammer']],
+
+            ["Ganons Tower - DMs Room - Top Right", False, []],
+            ["Ganons Tower - DMs Room - Top Right", False, [], ['Hammer']],
+            ["Ganons Tower - DMs Room - Top Right", False, [], ['Hookshot']],
+            ["Ganons Tower - DMs Room - Top Right", True, ['Hookshot', 'Hammer']],
+
+            ["Ganons Tower - DMs Room - Bottom Left", False, []],
+            ["Ganons Tower - DMs Room - Bottom Left", False, [], ['Hammer']],
+            ["Ganons Tower - DMs Room - Bottom Left", False, [], ['Hookshot']],
+            ["Ganons Tower - DMs Room - Bottom Left", True, ['Hookshot', 'Hammer']],
+
+            ["Ganons Tower - DMs Room - Bottom Right", False, []],
+            ["Ganons Tower - DMs Room - Bottom Right", False, [], ['Hammer']],
+            ["Ganons Tower - DMs Room - Bottom Right", False, [], ['Hookshot']],
+            ["Ganons Tower - DMs Room - Bottom Right", True, ['Hookshot', 'Hammer']],
+
+            ["Ganons Tower - Randomizer Room - Top Left", False, []],
+            ["Ganons Tower - Randomizer Room - Top Left", False, [], ['Hammer']],
+            ["Ganons Tower - Randomizer Room - Top Left", False, [], ['Hookshot']],
+            ["Ganons Tower - Randomizer Room - Top Left", True, ['Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Hookshot', 'Hammer']],
+
+            ["Ganons Tower - Randomizer Room - Top Right", False, []],
+            ["Ganons Tower - Randomizer Room - Top Right", False, [], ['Hammer']],
+            ["Ganons Tower - Randomizer Room - Top Right", False, [], ['Hookshot']],
+            ["Ganons Tower - Randomizer Room - Top Right", True, ['Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Hookshot', 'Hammer']],
+
+            ["Ganons Tower - Randomizer Room - Bottom Left", False, []],
+            ["Ganons Tower - Randomizer Room - Bottom Left", False, [], ['Hammer']],
+            ["Ganons Tower - Randomizer Room - Bottom Left", False, [], ['Hookshot']],
+            ["Ganons Tower - Randomizer Room - Bottom Left", True, ['Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Hookshot', 'Hammer']],
+
+            ["Ganons Tower - Randomizer Room - Bottom Right", False, []],
+            ["Ganons Tower - Randomizer Room - Bottom Right", False, [], ['Hammer']],
+            ["Ganons Tower - Randomizer Room - Bottom Right", False, [], ['Hookshot']],
+            ["Ganons Tower - Randomizer Room - Bottom Right", True, ['Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Hookshot', 'Hammer']],
+
+            ["Ganons Tower - Firesnake Room", False, []],
+            ["Ganons Tower - Firesnake Room", False, [], ['Hammer']],
+            ["Ganons Tower - Firesnake Room", False, [], ['Hookshot']],
+            ["Ganons Tower - Firesnake Room", True, ['Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Hookshot', 'Hammer']],
+
+            ["Ganons Tower - Map Chest", False, []],
+            ["Ganons Tower - Map Chest", False, [], ['Hammer']],
+            ["Ganons Tower - Map Chest", False, [], ['Hookshot', 'Pegasus Boots']],
+            ["Ganons Tower - Map Chest", True, ['Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Hookshot', 'Hammer']],
+            ["Ganons Tower - Map Chest", True, ['Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Hammer', 'Pegasus Boots']],
+
+            ["Ganons Tower - Big Chest", False, []],
+            ["Ganons Tower - Big Chest", False, [], ['Big Key (Ganons Tower)']],
+            ["Ganons Tower - Big Chest", True, ['Big Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Cane of Somaria', 'Fire Rod']],
+            ["Ganons Tower - Big Chest", True, ['Big Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Hookshot', 'Hammer']],
+
+            ["Ganons Tower - Hope Room - Left", True, []],
+
+            ["Ganons Tower - Hope Room - Right", True, []],
+
+            ["Ganons Tower - Bob's Chest", False, []],
+            ["Ganons Tower - Bob's Chest", True, ['Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Cane of Somaria', 'Fire Rod']],
+            ["Ganons Tower - Bob's Chest", True, ['Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Hookshot', 'Hammer']],
+
+            ["Ganons Tower - Tile Room", False, []],
+            ["Ganons Tower - Tile Room", False, [], ['Cane of Somaria']],
+            ["Ganons Tower - Tile Room", True, ['Cane of Somaria']],
+
+            ["Ganons Tower - Compass Room - Top Left", False, []],
+            ["Ganons Tower - Compass Room - Top Left", False, [], ['Cane of Somaria']],
+            ["Ganons Tower - Compass Room - Top Left", False, [], ['Fire Rod']],
+            ["Ganons Tower - Compass Room - Top Left", True, ['Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Fire Rod', 'Cane of Somaria']],
+
+            ["Ganons Tower - Compass Room - Top Right", False, []],
+            ["Ganons Tower - Compass Room - Top Right", False, [], ['Cane of Somaria']],
+            ["Ganons Tower - Compass Room - Top Right", False, [], ['Fire Rod']],
+            ["Ganons Tower - Compass Room - Top Right", True, ['Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Fire Rod', 'Cane of Somaria']],
+
+            ["Ganons Tower - Compass Room - Bottom Left", False, []],
+            ["Ganons Tower - Compass Room - Bottom Left", False, [], ['Cane of Somaria']],
+            ["Ganons Tower - Compass Room - Bottom Left", False, [], ['Fire Rod']],
+            ["Ganons Tower - Compass Room - Bottom Left", True, ['Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Fire Rod', 'Cane of Somaria']],
+
+            ["Ganons Tower - Compass Room - Bottom Right", False, []],
+            ["Ganons Tower - Compass Room - Bottom Right", False, [], ['Cane of Somaria']],
+            ["Ganons Tower - Compass Room - Bottom Right", False, [], ['Fire Rod']],
+            ["Ganons Tower - Compass Room - Bottom Right", True, ['Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Fire Rod', 'Cane of Somaria']],
+
+            ["Ganons Tower - Big Key Chest", False, []],
+            ["Ganons Tower - Big Key Chest", True, ['Progressive Bow', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Cane of Somaria', 'Fire Rod']],
+            ["Ganons Tower - Big Key Chest", True, ['Progressive Bow', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Hookshot', 'Hammer']],
+
+            ["Ganons Tower - Big Key Room - Left", False, []],
+            ["Ganons Tower - Big Key Room - Left", True, ['Progressive Bow', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Cane of Somaria', 'Fire Rod']],
+            ["Ganons Tower - Big Key Room - Left", True, ['Progressive Bow', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Hookshot', 'Hammer']],
+
+            ["Ganons Tower - Big Key Room - Right", False, []],
+            ["Ganons Tower - Big Key Room - Right", True, ['Progressive Bow', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Cane of Somaria', 'Fire Rod']],
+            ["Ganons Tower - Big Key Room - Right", True, ['Progressive Bow', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Hookshot', 'Hammer']],
+
+            ["Ganons Tower - Mini Helmasaur Room - Left", False, []],
+            ["Ganons Tower - Mini Helmasaur Room - Left", False, [], ['Progressive Bow']],
+            ["Ganons Tower - Mini Helmasaur Room - Left", False, [], ['Big Key (Ganons Tower)']],
+            ["Ganons Tower - Mini Helmasaur Room - Left", False, [], ['Lamp', 'Fire Rod']],
+            ["Ganons Tower - Mini Helmasaur Room - Left", True, ['Progressive Bow', 'Big Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Lamp']],
+            ["Ganons Tower - Mini Helmasaur Room - Left", True, ['Progressive Bow', 'Big Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Fire Rod']],
+
+            ["Ganons Tower - Mini Helmasaur Room - Right", False, []],
+            ["Ganons Tower - Mini Helmasaur Room - Right", False, [], ['Progressive Bow']],
+            ["Ganons Tower - Mini Helmasaur Room - Right", False, [], ['Big Key (Ganons Tower)']],
+            ["Ganons Tower - Mini Helmasaur Room - Right", False, [], ['Lamp', 'Fire Rod']],
+            ["Ganons Tower - Mini Helmasaur Room - Right", True, ['Progressive Bow', 'Big Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Lamp']],
+            ["Ganons Tower - Mini Helmasaur Room - Right", True, ['Progressive Bow', 'Big Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Fire Rod']],
+
+            ["Ganons Tower - Pre-Moldorm Chest", False, []],
+            ["Ganons Tower - Pre-Moldorm Chest", False, [], ['Progressive Bow']],
+            ["Ganons Tower - Pre-Moldorm Chest", False, [], ['Big Key (Ganons Tower)']],
+            ["Ganons Tower - Pre-Moldorm Chest", False, [], ['Lamp', 'Fire Rod']],
+            ["Ganons Tower - Pre-Moldorm Chest", True, ['Progressive Bow', 'Big Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Lamp']],
+            ["Ganons Tower - Pre-Moldorm Chest", True, ['Progressive Bow', 'Big Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Fire Rod']],
+
+            ["Ganons Tower - Validation Chest", False, []],
+            ["Ganons Tower - Validation Chest", False, [], ['Hookshot']],
+            ["Ganons Tower - Validation Chest", False, [], ['Progressive Bow']],
+            ["Ganons Tower - Validation Chest", False, [], ['Big Key (Ganons Tower)']],
+            ["Ganons Tower - Validation Chest", False, [], ['Lamp', 'Fire Rod']],
+            ["Ganons Tower - Validation Chest", False, [], ['Progressive Sword', 'Hammer']],
+            ["Ganons Tower - Validation Chest", True, ['Progressive Bow', 'Big Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Lamp', 'Hookshot', 'Progressive Sword']],
+            ["Ganons Tower - Validation Chest", True, ['Progressive Bow', 'Big Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Fire Rod', 'Hookshot', 'Progressive Sword']],
+            ["Ganons Tower - Validation Chest", True, ['Progressive Bow', 'Big Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Lamp', 'Hookshot', 'Hammer']],
+            ["Ganons Tower - Validation Chest", True, ['Progressive Bow', 'Big Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Fire Rod', 'Hookshot', 'Hammer']],
+        ])

test/dungeons/TestIcePalace.py

@@ -0,0 +1,79 @@
+from test.dungeons.TestDungeon import TestDungeon
+
+
+class TestIcePalace(TestDungeon):
+
+    def testIcePalace(self):
+        self.starting_regions = ['Ice Palace (Entrance)']
+        self.run_tests([
+            ["Ice Palace - Big Key Chest", False, []],
+            ["Ice Palace - Big Key Chest", False, [], ['Hammer']],
+            ["Ice Palace - Big Key Chest", False, [], ['Progressive Glove']],
+            ["Ice Palace - Big Key Chest", False, [], ['Fire Rod', 'Bombos']],
+            ["Ice Palace - Big Key Chest", False, [], ['Fire Rod', 'Progressive Sword']],
+            ["Ice Palace - Big Key Chest", True, ['Progressive Glove', 'Fire Rod', 'Hammer', 'Hookshot', 'Small Key (Ice Palace)']],
+            ["Ice Palace - Big Key Chest", True, ['Progressive Glove', 'Bombos', 'Progressive Sword', 'Hammer', 'Hookshot', 'Small Key (Ice Palace)']],
+            #@todo: Change from item randomizer - Right side key door is only in logic if big key is in there
+            #["Ice Palace - Big Key Chest", True, ['Progressive Glove', 'Cane of Byrna', 'Fire Rod', 'Hammer', 'Small Key (Ice Palace)', 'Small Key (Ice Palace)']],
+            #["Ice Palace - Big Key Chest", True, ['Progressive Glove', 'Cane of Byrna', 'Bombos', 'Progressive Sword', 'Hammer', 'Small Key (Ice Palace)', 'Small Key (Ice Palace)']],
+            #["Ice Palace - Big Key Chest", True, ['Progressive Glove', 'Cape', 'Fire Rod', 'Hammer', 'Small Key (Ice Palace)', 'Small Key (Ice Palace)']],
+            #["Ice Palace - Big Key Chest", True, ['Progressive Glove', 'Cape', 'Bombos', 'Progressive Sword', 'Hammer', 'Small Key (Ice Palace)', 'Small Key (Ice Palace)']],
+
+            ["Ice Palace - Compass Chest", False, []],
+            ["Ice Palace - Compass Chest", False, [], ['Fire Rod', 'Bombos']],
+            ["Ice Palace - Compass Chest", False, [], ['Fire Rod', 'Progressive Sword']],
+            ["Ice Palace - Compass Chest", True, ['Fire Rod']],
+            ["Ice Palace - Compass Chest", True, ['Bombos', 'Progressive Sword']],
+
+            ["Ice Palace - Map Chest", False, []],
+            ["Ice Palace - Map Chest", False, [], ['Hammer']],
+            ["Ice Palace - Map Chest", False, [], ['Progressive Glove']],
+            ["Ice Palace - Map Chest", False, [], ['Fire Rod', 'Bombos']],
+            ["Ice Palace - Map Chest", False, [], ['Fire Rod', 'Progressive Sword']],
+            ["Ice Palace - Map Chest", True, ['Progressive Glove', 'Fire Rod', 'Hammer', 'Hookshot', 'Small Key (Ice Palace)']],
+            ["Ice Palace - Map Chest", True, ['Progressive Glove', 'Bombos', 'Progressive Sword', 'Hammer', 'Hookshot', 'Small Key (Ice Palace)']],
+            #["Ice Palace - Map Chest", True, ['Progressive Glove', 'Cane of Byrna', 'Fire Rod', 'Hammer', 'Small Key (Ice Palace)', 'Small Key (Ice Palace)']],
+            #["Ice Palace - Map Chest", True, ['Progressive Glove', 'Cane of Byrna', 'Bombos', 'Progressive Sword', 'Hammer', 'Small Key (Ice Palace)', 'Small Key (Ice Palace)']],
+            #["Ice Palace - Map Chest", True, ['Progressive Glove', 'Cape', 'Fire Rod', 'Hammer', 'Small Key (Ice Palace)', 'Small Key (Ice Palace)']],
+            #["Ice Palace - Map Chest", True, ['Progressive Glove', 'Cape', 'Bombos', 'Progressive Sword', 'Hammer', 'Small Key (Ice Palace)', 'Small Key (Ice Palace)']],
+
+            ["Ice Palace - Spike Room", False, []],
+            ["Ice Palace - Spike Room", False, [], ['Fire Rod', 'Bombos']],
+            ["Ice Palace - Spike Room", False, [], ['Fire Rod', 'Progressive Sword']],
+            ["Ice Palace - Spike Room", True, ['Fire Rod', 'Hookshot', 'Small Key (Ice Palace)']],
+            ["Ice Palace - Spike Room", True, ['Bombos', 'Progressive Sword', 'Hookshot', 'Small Key (Ice Palace)']],
+            #["Ice Palace - Spike Room", True, ['Cape', 'Fire Rod', 'Small Key (Ice Palace)', 'Small Key (Ice Palace)']],
+            #["Ice Palace - Spike Room", True, ['Cape', 'Bombos', 'Progressive Sword', 'Small Key (Ice Palace)', 'Small Key (Ice Palace)']],
+            #["Ice Palace - Spike Room", True, ['Cane of Byrna', 'Fire Rod', 'Small Key (Ice Palace)', 'Small Key (Ice Palace)']],
+            #["Ice Palace - Spike Room", True, ['Cane of Byrna', 'Bombos', 'Progressive Sword', 'Small Key (Ice Palace)', 'Small Key (Ice Palace)']],
+
+            ["Ice Palace - Freezor Chest", False, []],
+            ["Ice Palace - Freezor Chest", False, [], ['Fire Rod', 'Bombos']],
+            ["Ice Palace - Freezor Chest", False, [], ['Fire Rod', 'Progressive Sword']],
+            ["Ice Palace - Freezor Chest", True, ['Fire Rod']],
+            ["Ice Palace - Freezor Chest", True, ['Bombos', 'Progressive Sword']],
+
+            ["Ice Palace - Iced T Room", False, []],
+            ["Ice Palace - Iced T Room", False, [], ['Fire Rod', 'Bombos']],
+            ["Ice Palace - Iced T Room", False, [], ['Fire Rod', 'Progressive Sword']],
+            ["Ice Palace - Iced T Room", True, ['Fire Rod']],
+            ["Ice Palace - Iced T Room", True, ['Bombos', 'Progressive Sword']],
+
+            ["Ice Palace - Big Chest", False, []],
+            ["Ice Palace - Big Chest", False, [], ['Big Key (Ice Palace)']],
+            ["Ice Palace - Big Chest", False, [], ['Fire Rod', 'Bombos']],
+            ["Ice Palace - Big Chest", False, [], ['Fire Rod', 'Progressive Sword']],
+            ["Ice Palace - Big Chest", True, ['Big Key (Ice Palace)', 'Fire Rod']],
+            ["Ice Palace - Big Chest", True, ['Big Key (Ice Palace)', 'Bombos', 'Progressive Sword']],
+
+            ["Ice Palace - Boss", False, []],
+            ["Ice Palace - Boss", False, [], ['Hammer']],
+            ["Ice Palace - Boss", False, [], ['Progressive Glove']],
+            ["Ice Palace - Boss", False, [], ['Big Key (Ice Palace)']],
+            ["Ice Palace - Boss", False, [], ['Fire Rod', 'Bombos']],
+            ["Ice Palace - Boss", False, [], ['Fire Rod', 'Progressive Sword']],
+            ["Ice Palace - Boss", True, ['Progressive Glove', 'Big Key (Ice Palace)', 'Fire Rod', 'Hammer', 'Small Key (Ice Palace)', 'Small Key (Ice Palace)']],
+            ["Ice Palace - Boss", True, ['Progressive Glove', 'Big Key (Ice Palace)', 'Fire Rod', 'Hammer', 'Cane of Somaria', 'Small Key (Ice Palace)']],
+            ["Ice Palace - Boss", True, ['Progressive Glove', 'Big Key (Ice Palace)', 'Bombos', 'Progressive Sword', 'Hammer', 'Small Key (Ice Palace)', 'Small Key (Ice Palace)']],
+            ["Ice Palace - Boss", True, ['Progressive Glove', 'Big Key (Ice Palace)', 'Bombos', 'Progressive Sword', 'Hammer', 'Cane of Somaria', 'Small Key (Ice Palace)']],
+        ])

test/dungeons/TestMiseryMire.py

@@ -0,0 +1,84 @@
+from test.dungeons.TestDungeon import TestDungeon
+
+
+class TestMiseryMire(TestDungeon):
+
+    def testMiseryMire(self):
+        self.starting_regions = ['Misery Mire (Entrance)']
+        self.run_tests([
+            ["Misery Mire - Bridge Chest", False, []],
+            ["Misery Mire - Bridge Chest", False, [], ['Pegasus Boots', 'Hookshot']],
+            ["Misery Mire - Bridge Chest", False, [], ['Progressive Sword', 'Hammer', 'Fire Rod', 'Cane of Somaria', 'Progressive Bow', 'Ice Rod']],  #Ice Rod works!
+            ["Misery Mire - Bridge Chest", True, ['Progressive Sword', 'Pegasus Boots']],
+            ["Misery Mire - Bridge Chest", True, ['Progressive Sword', 'Hookshot']],
+            ["Misery Mire - Bridge Chest", True, ['Hammer', 'Pegasus Boots']],
+            ["Misery Mire - Bridge Chest", True, ['Hammer', 'Hookshot']],
+            ["Misery Mire - Bridge Chest", True, ['Fire Rod', 'Pegasus Boots']],
+            ["Misery Mire - Bridge Chest", True, ['Fire Rod', 'Hookshot']],
+            ["Misery Mire - Bridge Chest", True, ['Cane of Somaria', 'Pegasus Boots']],
+            ["Misery Mire - Bridge Chest", True, ['Cane of Somaria', 'Hookshot']],
+            ["Misery Mire - Bridge Chest", True, ['Progressive Bow', 'Pegasus Boots']],
+            ["Misery Mire - Bridge Chest", True, ['Progressive Bow', 'Hookshot']],
+            ["Misery Mire - Bridge Chest", True, ['Ice Rod', 'Pegasus Boots']],
+            ["Misery Mire - Bridge Chest", True, ['Ice Rod', 'Hookshot']],
+
+            ["Misery Mire - Big Chest", False, []],
+            ["Misery Mire - Big Chest", False, [], ['Big Key (Misery Mire)']],
+            ["Misery Mire - Big Chest", False, [], ['Pegasus Boots', 'Hookshot']],
+            ["Misery Mire - Big Chest", False, [], ['Progressive Sword', 'Hammer', 'Fire Rod', 'Cane of Somaria', 'Progressive Bow', 'Ice Rod']],
+            ["Misery Mire - Big Chest", True, ['Big Key (Misery Mire)', 'Pegasus Boots', 'Progressive Sword']],
+            ["Misery Mire - Big Chest", True, ['Big Key (Misery Mire)', 'Hookshot', 'Progressive Sword']],
+
+            ["Misery Mire - Main Lobby", False, []],
+            ["Misery Mire - Main Lobby", False, [], ['Pegasus Boots', 'Hookshot']],
+            ["Misery Mire - Main Lobby", False, [], ['Small Key (Misery Mire)', 'Big Key (Misery Mire)']],
+            ["Misery Mire - Main Lobby", True, ['Small Key (Misery Mire)', 'Hookshot', 'Progressive Sword']],
+            ["Misery Mire - Main Lobby", True, ['Small Key (Misery Mire)', 'Pegasus Boots', 'Progressive Sword']],
+            ["Misery Mire - Main Lobby", True, ['Big Key (Misery Mire)', 'Hookshot', 'Progressive Sword']],
+            ["Misery Mire - Main Lobby", True, ['Big Key (Misery Mire)', 'Pegasus Boots', 'Progressive Sword']],
+
+            ["Misery Mire - Big Key Chest", False, []],
+            ["Misery Mire - Big Key Chest", False, [], ['Fire Rod', 'Lamp']],
+            ["Misery Mire - Big Key Chest", False, [], ['Pegasus Boots', 'Hookshot']],
+            ["Misery Mire - Big Key Chest", False, ['Small Key (Misery Mire)', 'Small Key (Misery Mire)'], ['Small Key (Misery Mire)']],
+            ["Misery Mire - Big Key Chest", True, ['Small Key (Misery Mire)', 'Small Key (Misery Mire)', 'Small Key (Misery Mire)', 'Lamp', 'Progressive Sword', 'Pegasus Boots']],
+            ["Misery Mire - Big Key Chest", True, ['Small Key (Misery Mire)', 'Small Key (Misery Mire)', 'Small Key (Misery Mire)', 'Lamp', 'Progressive Sword', 'Hookshot']],
+            ["Misery Mire - Big Key Chest", True, ['Small Key (Misery Mire)', 'Small Key (Misery Mire)', 'Small Key (Misery Mire)', 'Fire Rod', 'Progressive Sword', 'Pegasus Boots']],
+            ["Misery Mire - Big Key Chest", True, ['Small Key (Misery Mire)', 'Small Key (Misery Mire)', 'Small Key (Misery Mire)', 'Fire Rod', 'Progressive Sword', 'Hookshot']],
+
+            ["Misery Mire - Compass Chest", False, []],
+            ["Misery Mire - Compass Chest", False, [], ['Fire Rod', 'Lamp']],
+            ["Misery Mire - Compass Chest", False, [], ['Pegasus Boots', 'Hookshot']],
+            ["Misery Mire - Compass Chest", False, ['Small Key (Misery Mire)', 'Small Key (Misery Mire)'], ['Small Key (Misery Mire)']],
+            ["Misery Mire - Compass Chest", True, ['Small Key (Misery Mire)', 'Small Key (Misery Mire)', 'Small Key (Misery Mire)', 'Lamp', 'Progressive Sword', 'Pegasus Boots']],
+            ["Misery Mire - Compass Chest", True, ['Small Key (Misery Mire)', 'Small Key (Misery Mire)', 'Small Key (Misery Mire)', 'Lamp', 'Progressive Sword', 'Hookshot']],
+            ["Misery Mire - Compass Chest", True, ['Small Key (Misery Mire)', 'Small Key (Misery Mire)', 'Small Key (Misery Mire)', 'Fire Rod', 'Progressive Sword', 'Pegasus Boots']],
+            ["Misery Mire - Compass Chest", True, ['Small Key (Misery Mire)', 'Small Key (Misery Mire)', 'Small Key (Misery Mire)', 'Fire Rod', 'Progressive Sword', 'Hookshot']],
+
+            ["Misery Mire - Map Chest", False, []],
+            ["Misery Mire - Map Chest", False, [], ['Small Key (Misery Mire)', 'Big Key (Misery Mire)']],
+            ["Misery Mire - Map Chest", False, [], ['Pegasus Boots', 'Hookshot']],
+            ["Misery Mire - Map Chest", True, ['Small Key (Misery Mire)', 'Progressive Sword', 'Pegasus Boots']],
+            ["Misery Mire - Map Chest", True, ['Small Key (Misery Mire)', 'Progressive Sword', 'Hookshot']],
+            ["Misery Mire - Map Chest", True, ['Big Key (Misery Mire)', 'Progressive Sword', 'Pegasus Boots']],
+            ["Misery Mire - Map Chest", True, ['Big Key (Misery Mire)', 'Progressive Sword', 'Hookshot']],
+
+            ["Misery Mire - Spike Chest", False, []],
+            ["Misery Mire - Spike Chest", False, [], ['Pegasus Boots', 'Hookshot']],
+            ["Misery Mire - Spike Chest", True, ['Progressive Sword', 'Pegasus Boots', 'Cape']],
+            ["Misery Mire - Spike Chest", True, ['Progressive Sword', 'Hookshot', 'Cape']],
+            ["Misery Mire - Spike Chest", True, ['Progressive Sword', 'Pegasus Boots', 'Cane of Byrna']],
+            ["Misery Mire - Spike Chest", True, ['Progressive Sword', 'Hookshot', 'Cane of Byrna']],
+            ["Misery Mire - Spike Chest", True, ['Progressive Sword', 'Pegasus Boots', 'Boss Heart Container']],
+            ["Misery Mire - Spike Chest", True, ['Progressive Sword', 'Hookshot', 'Boss Heart Container']],
+
+            ["Misery Mire - Boss", False, []],
+            ["Misery Mire - Boss", False, [], ['Lamp']],
+            ["Misery Mire - Boss", False, [], ['Cane of Somaria']],
+            ["Misery Mire - Boss", False, [], ['Progressive Sword', 'Hammer', 'Progressive Bow']],
+            ["Misery Mire - Boss", False, [], ['Big Key (Misery Mire)']],
+            ["Misery Mire - Boss", False, [], ['Pegasus Boots', 'Hookshot']],
+            ["Misery Mire - Boss", True, ['Big Key (Misery Mire)', 'Lamp', 'Cane of Somaria', 'Progressive Sword', 'Pegasus Boots']],
+            ["Misery Mire - Boss", True, ['Big Key (Misery Mire)', 'Lamp', 'Cane of Somaria', 'Hammer', 'Pegasus Boots']],
+            ["Misery Mire - Boss", True, ['Big Key (Misery Mire)', 'Lamp', 'Cane of Somaria', 'Progressive Bow', 'Pegasus Boots']],
+        ])

test/dungeons/TestSkullWoods.py

@@ -0,0 +1,96 @@
+from test.dungeons.TestDungeon import TestDungeon
+
+
+class TestSkullWoods(TestDungeon):
+
+    def testSkullWoodsFrontAllEntrances(self):
+        self.starting_regions = ['Skull Woods First Section', 'Skull Woods First Section (Left)', 'Skull Woods First Section (Top)']
+        self.run_tests([
+            ["Skull Woods - Big Chest", False, []],
+            ["Skull Woods - Big Chest", False, [], ['Big Key (Skull Woods)']],
+            ["Skull Woods - Big Chest", True, ['Big Key (Skull Woods)']],
+
+            ["Skull Woods - Compass Chest", True, []],
+
+            ["Skull Woods - Map Chest", True, []],
+
+            ["Skull Woods - Pot Prison", True, []],
+
+            ["Skull Woods - Pinball Room", True, []]
+        ])
+
+    def testSkullWoodsFrontOnly(self):
+        self.starting_regions = ['Skull Woods First Section']
+        self.run_tests([
+            ["Skull Woods - Big Chest", False, []],
+            ["Skull Woods - Big Chest", False, [], ['Never in logic']],
+
+            ["Skull Woods - Compass Chest", False, []],
+            ["Skull Woods - Compass Chest", False, ['Small Key (Skull Woods)'], ['Small Key (Skull Woods)']],
+            ["Skull Woods - Compass Chest", True, ['Small Key (Skull Woods)', 'Small Key (Skull Woods)']],
+
+            ["Skull Woods - Map Chest", True, []],
+
+            ["Skull Woods - Pot Prison", False, []],
+            ["Skull Woods - Pot Prison", False, ['Small Key (Skull Woods)'], ['Small Key (Skull Woods)']],
+            ["Skull Woods - Pot Prison", True, ['Small Key (Skull Woods)', 'Small Key (Skull Woods)']],
+
+            ["Skull Woods - Pinball Room", False, []],
+            ["Skull Woods - Pinball Room", False, [], ['Small Key (Skull Woods)']],
+            ["Skull Woods - Pinball Room", True, ['Small Key (Skull Woods)']]
+        ])
+
+    def testSkullWoodsLeftOnly(self):
+        self.starting_regions = ['Skull Woods First Section (Left)']
+        self.run_tests([
+            ["Skull Woods - Big Chest", False, []],
+            ["Skull Woods - Big Chest", False, [], ['Never in logic']],
+
+            ["Skull Woods - Compass Chest", True, []],
+
+            ["Skull Woods - Map Chest", False, []],
+            ["Skull Woods - Map Chest", False, [], ['Small Key (Skull Woods)']],
+            ["Skull Woods - Map Chest", True, ['Small Key (Skull Woods)']],
+
+            ["Skull Woods - Pot Prison", True, []],
+
+            ["Skull Woods - Pinball Room", True, []]
+        ])
+
+    def testSkullWoodsBackOnly(self):
+        self.starting_regions = ['Skull Woods First Section (Top)']
+        self.run_tests([
+            ["Skull Woods - Big Chest", False, []],
+            ["Skull Woods - Big Chest", False, [], ['Big Key (Skull Woods)']],
+            ["Skull Woods - Big Chest", True, ['Big Key (Skull Woods)']],
+
+            ["Skull Woods - Compass Chest", False, []],
+            ["Skull Woods - Compass Chest", False, ['Small Key (Skull Woods)'], ['Small Key (Skull Woods)']],
+            ["Skull Woods - Compass Chest", True, ['Small Key (Skull Woods)', 'Small Key (Skull Woods)']],
+
+            ["Skull Woods - Map Chest", True, []],
+
+            ["Skull Woods - Pot Prison", False, []],
+            ["Skull Woods - Pot Prison", False, ['Small Key (Skull Woods)'], ['Small Key (Skull Woods)']],
+            ["Skull Woods - Pot Prison", True, ['Small Key (Skull Woods)', 'Small Key (Skull Woods)']],
+
+            ["Skull Woods - Pinball Room", False, []],
+            ["Skull Woods - Pinball Room", False, [], ['Small Key (Skull Woods)']],
+            ["Skull Woods - Pinball Room", True, ['Small Key (Skull Woods)']]
+        ])
+
+    def testSkullWoodsMiddle(self):
+        self.starting_regions = ['Skull Woods Second Section']
+        self.run_tests([["Skull Woods - Big Key Chest", True, []]])
+
+    def testSkullWoodsBack(self):
+        self.starting_regions = ['Skull Woods Final Section (Entrance)']
+        self.run_tests([
+            ["Skull Woods - Bridge Room", True, []],
+
+            ["Skull Woods - Boss", False, []],
+            ["Skull Woods - Boss", False, [], ['Fire Rod']],
+            ["Skull Woods - Boss", False, [], ['Progressive Sword']],
+            ["Skull Woods - Boss", False, ['Small Key (Skull Woods)', 'Small Key (Skull Woods)'], ['Small Key (Skull Woods)']],
+            ["Skull Woods - Boss", True, ['Small Key (Skull Woods)', 'Small Key (Skull Woods)', 'Small Key (Skull Woods)', 'Fire Rod', 'Progressive Sword']],
+        ])

test/dungeons/TestSwampPalace.py

@@ -0,0 +1,80 @@
+from test.dungeons.TestDungeon import TestDungeon
+
+
+class TestSwampPalace(TestDungeon):
+
+    def testSwampPalace(self):
+        self.starting_regions = ['Swamp Palace (Entrance)']
+        self.run_tests([
+            ["Swamp Palace - Entrance", False, []],
+            ["Swamp Palace - Entrance", False, [], ['Flippers']],
+            ["Swamp Palace - Entrance", False, [], ['Open Floodgate']],
+            ["Swamp Palace - Entrance", True, ['Open Floodgate', 'Flippers']],
+
+            ["Swamp Palace - Big Chest", False, []],
+            ["Swamp Palace - Big Chest", False, [], ['Flippers']],
+            ["Swamp Palace - Big Chest", False, [], ['Open Floodgate']],
+            ["Swamp Palace - Big Chest", False, [], ['Hammer']],
+            ["Swamp Palace - Big Chest", False, [], ['Big Key (Swamp Palace)']],
+            ["Swamp Palace - Big Chest", False, [], ['Small Key (Swamp Palace)']],
+            ["Swamp Palace - Big Chest", True, ['Open Floodgate', 'Big Key (Swamp Palace)', 'Small Key (Swamp Palace)', 'Flippers', 'Hammer']],
+
+            ["Swamp Palace - Big Key Chest", False, []],
+            ["Swamp Palace - Big Key Chest", False, [], ['Flippers']],
+            ["Swamp Palace - Big Key Chest", False, [], ['Open Floodgate']],
+            ["Swamp Palace - Big Key Chest", False, [], ['Hammer']],
+            ["Swamp Palace - Big Key Chest", False, [], ['Small Key (Swamp Palace)']],
+            ["Swamp Palace - Big Key Chest", True, ['Open Floodgate', 'Small Key (Swamp Palace)', 'Flippers', 'Hammer']],
+
+            ["Swamp Palace - Map Chest", False, []],
+            ["Swamp Palace - Map Chest", False, [], ['Flippers']],
+            ["Swamp Palace - Map Chest", False, [], ['Open Floodgate']],
+            ["Swamp Palace - Map Chest", False, [], ['Small Key (Swamp Palace)']],
+            ["Swamp Palace - Map Chest", True, ['Open Floodgate', 'Small Key (Swamp Palace)', 'Flippers']],
+
+            ["Swamp Palace - West Chest", False, []],
+            ["Swamp Palace - West Chest", False, [], ['Flippers']],
+            ["Swamp Palace - West Chest", False, [], ['Open Floodgate']],
+            ["Swamp Palace - West Chest", False, [], ['Hammer']],
+            ["Swamp Palace - West Chest", False, [], ['Small Key (Swamp Palace)']],
+            ["Swamp Palace - West Chest", True, ['Open Floodgate', 'Small Key (Swamp Palace)', 'Flippers', 'Hammer']],
+
+            ["Swamp Palace - Compass Chest", False, []],
+            ["Swamp Palace - Compass Chest", False, [], ['Flippers']],
+            ["Swamp Palace - Compass Chest", False, [], ['Open Floodgate']],
+            ["Swamp Palace - Compass Chest", False, [], ['Hammer']],
+            ["Swamp Palace - Compass Chest", False, [], ['Small Key (Swamp Palace)']],
+            ["Swamp Palace - Compass Chest", True, ['Open Floodgate', 'Small Key (Swamp Palace)', 'Flippers', 'Hammer']],
+
+            ["Swamp Palace - Flooded Room - Left", False, []],
+            ["Swamp Palace - Flooded Room - Left", False, [], ['Flippers']],
+            ["Swamp Palace - Flooded Room - Left", False, [], ['Open Floodgate']],
+            ["Swamp Palace - Flooded Room - Left", False, [], ['Hammer']],
+            ["Swamp Palace - Flooded Room - Left", False, [], ['Hookshot']],
+            ["Swamp Palace - Flooded Room - Left", False, [], ['Small Key (Swamp Palace)']],
+            ["Swamp Palace - Flooded Room - Left", True, ['Open Floodgate', 'Small Key (Swamp Palace)', 'Flippers', 'Hammer', 'Hookshot']],
+
+            ["Swamp Palace - Flooded Room - Right", False, []],
+            ["Swamp Palace - Flooded Room - Right", False, [], ['Flippers']],
+            ["Swamp Palace - Flooded Room - Right", False, [], ['Open Floodgate']],
+            ["Swamp Palace - Flooded Room - Right", False, [], ['Hammer']],
+            ["Swamp Palace - Flooded Room - Right", False, [], ['Hookshot']],
+            ["Swamp Palace - Flooded Room - Right", False, [], ['Small Key (Swamp Palace)']],
+            ["Swamp Palace - Flooded Room - Right", True, ['Open Floodgate', 'Small Key (Swamp Palace)', 'Flippers', 'Hammer', 'Hookshot']],
+
+            ["Swamp Palace - Waterfall Room", False, []],
+            ["Swamp Palace - Waterfall Room", False, [], ['Flippers']],
+            ["Swamp Palace - Waterfall Room", False, [], ['Open Floodgate']],
+            ["Swamp Palace - Waterfall Room", False, [], ['Hammer']],
+            ["Swamp Palace - Waterfall Room", False, [], ['Hookshot']],
+            ["Swamp Palace - Waterfall Room", False, [], ['Small Key (Swamp Palace)']],
+            ["Swamp Palace - Waterfall Room", True, ['Open Floodgate', 'Small Key (Swamp Palace)', 'Flippers', 'Hammer', 'Hookshot']],
+
+            ["Swamp Palace - Boss", False, []],
+            ["Swamp Palace - Boss", False, [], ['Flippers']],
+            ["Swamp Palace - Boss", False, [], ['Open Floodgate']],
+            ["Swamp Palace - Boss", False, [], ['Hammer']],
+            ["Swamp Palace - Boss", False, [], ['Hookshot']],
+            ["Swamp Palace - Boss", False, [], ['Small Key (Swamp Palace)']],
+            ["Swamp Palace - Boss", True, ['Open Floodgate', 'Small Key (Swamp Palace)', 'Flippers', 'Hammer', 'Hookshot']],
+        ])

test/dungeons/TestThievesTown.py

@@ -0,0 +1,40 @@
+from test.dungeons.TestDungeon import TestDungeon
+
+
+class TestThievesTown(TestDungeon):
+    
+    def testThievesTown(self):
+        self.starting_regions = ['Thieves Town (Entrance)']
+        self.run_tests([
+            ["Thieves' Town - Attic", False, []],
+            ["Thieves' Town - Attic", False, [], ['Big Key (Thieves Town)']],
+            ["Thieves' Town - Attic", False, [], ['Small Key (Thieves Town)']],
+            ["Thieves' Town - Attic", True, ['Big Key (Thieves Town)', 'Small Key (Thieves Town)']],
+
+            ["Thieves' Town - Big Key Chest", True, []],
+
+            ["Thieves' Town - Map Chest", True, []],
+
+            ["Thieves' Town - Compass Chest", True, []],
+
+            ["Thieves' Town - Ambush Chest", True, []],
+
+            ["Thieves' Town - Big Chest", False, []],
+            ["Thieves' Town - Big Chest", False, [], ['Big Key (Thieves Town)']],
+            ["Thieves' Town - Big Chest", False, [], ['Small Key (Thieves Town)']],
+            ["Thieves' Town - Big Chest", False, [], ['Hammer']],
+            ["Thieves' Town - Big Chest", True, ['Hammer', 'Small Key (Thieves Town)', 'Big Key (Thieves Town)']],
+
+            ["Thieves' Town - Blind's Cell", False, []],
+            ["Thieves' Town - Blind's Cell", False, [], ['Big Key (Thieves Town)']],
+            ["Thieves' Town - Blind's Cell", True, ['Big Key (Thieves Town)']],
+
+            ["Thieves' Town - Boss", False, []],
+            ["Thieves' Town - Boss", False, [], ['Big Key (Thieves Town)']],
+            ["Thieves' Town - Boss", False, [], ['Small Key (Thieves Town)']],
+            ["Thieves' Town - Boss", False, [], ['Hammer', 'Progressive Sword', 'Cane of Somaria', 'Cane of Byrna']],
+            ["Thieves' Town - Boss", True, ['Small Key (Thieves Town)', 'Big Key (Thieves Town)', 'Hammer']],
+            ["Thieves' Town - Boss", True, ['Small Key (Thieves Town)', 'Big Key (Thieves Town)', 'Progressive Sword']],
+            ["Thieves' Town - Boss", True, ['Small Key (Thieves Town)', 'Big Key (Thieves Town)', 'Cane of Somaria']],
+            ["Thieves' Town - Boss", True, ['Small Key (Thieves Town)', 'Big Key (Thieves Town)', 'Cane of Byrna']],
+        ])

test/dungeons/TestTowerOfHera.py

@@ -0,0 +1,32 @@
+from test.dungeons.TestDungeon import TestDungeon
+
+
+class TestTowerOfHera(TestDungeon):
+
+    def testTowerOfHera(self):
+        self.starting_regions = ['Tower of Hera (Bottom)']
+        self.run_tests([
+            ["Tower of Hera - Big Key Chest", False, []],
+            ["Tower of Hera - Big Key Chest", False, [], ['Small Key (Tower of Hera)']],
+            ["Tower of Hera - Big Key Chest", False, [], ['Lamp', 'Fire Rod']],
+            ["Tower of Hera - Big Key Chest", True, ['Small Key (Tower of Hera)', 'Lamp']],
+            ["Tower of Hera - Big Key Chest", True, ['Small Key (Tower of Hera)', 'Fire Rod']],
+
+            ["Tower of Hera - Basement Cage", True, []],
+
+            ["Tower of Hera - Map Chest", True, []],
+
+            ["Tower of Hera - Compass Chest", False, []],
+            ["Tower of Hera - Compass Chest", False, [], ['Big Key (Tower of Hera)']],
+            ["Tower of Hera - Compass Chest", True, ['Big Key (Tower of Hera)']],
+
+            ["Tower of Hera - Big Chest", False, []],
+            ["Tower of Hera - Big Chest", False, [], ['Big Key (Tower of Hera)']],
+            ["Tower of Hera - Big Chest", True, ['Big Key (Tower of Hera)']],
+
+            ["Tower of Hera - Boss", False, []],
+            ["Tower of Hera - Boss", False, [], ['Big Key (Tower of Hera)']],
+            ["Tower of Hera - Boss", False, [], ['Progressive Sword', 'Hammer']],
+            ["Tower of Hera - Boss", True, ['Progressive Sword', 'Big Key (Tower of Hera)']],
+            ["Tower of Hera - Boss", True, ['Hammer', 'Big Key (Tower of Hera)']],
+        ])

test/inverted/TestInverted.py

@@ -0,0 +1,28 @@
+from BaseClasses import World
+from Dungeons import create_dungeons, get_dungeon_item_pool
+from EntranceShuffle import link_inverted_entrances
+from InvertedRegions import create_inverted_regions
+from ItemList import generate_itempool, difficulties
+from Items import ItemFactory
+from Regions import mark_light_world_regions
+from Rules import set_rules
+from test.TestVanilla import TestVanilla
+
+
+class TestInverted(TestVanilla):
+    def setUp(self):
+        self.world = World(1, 'vanilla', 'noglitches', 'inverted', 'random', 'normal', 'normal', 'none', 'on', 'ganon', 'balanced',
+                      True, False, False, False, False, False, False, False, False, None,
+                      'none', False)
+        self.world.difficulty_requirements = difficulties['normal']
+        create_inverted_regions(self.world, 1)
+        create_dungeons(self.world, 1)
+        link_inverted_entrances(self.world, 1)
+        generate_itempool(self.world, 1)
+        self.world.required_medallions[1] = ['Ether', 'Quake']
+        self.world.itempool.extend(get_dungeon_item_pool(self.world))
+        self.world.itempool.extend(ItemFactory(['Green Pendant', 'Red Pendant', 'Blue Pendant', 'Beat Agahnim 1', 'Beat Agahnim 2', 'Crystal 1', 'Crystal 2', 'Crystal 3', 'Crystal 4', 'Crystal 5', 'Crystal 6', 'Crystal 7'], 1))
+        self.world.get_location('Agahnim 1', 1).item = None
+        self.world.get_location('Agahnim 2', 1).item = None
+        mark_light_world_regions(self.world)
+        set_rules(self.world, 1)

test/inverted/TestInvertedBombRules.py

@@ -0,0 +1,47 @@
+import unittest
+
+from BaseClasses import World
+from Dungeons import create_dungeons
+from EntranceShuffle import connect_entrance, Inverted_LW_Entrances, Inverted_LW_Dungeon_Entrances, Inverted_LW_Single_Cave_Doors, Inverted_Old_Man_Entrances, Inverted_DW_Entrances, Inverted_DW_Dungeon_Entrances, Inverted_DW_Single_Cave_Doors, \
+    Inverted_LW_Entrances_Must_Exit, Inverted_LW_Dungeon_Entrances_Must_Exit, Inverted_Bomb_Shop_Multi_Cave_Doors, Inverted_Bomb_Shop_Single_Cave_Doors, Inverted_Blacksmith_Single_Cave_Doors, Inverted_Blacksmith_Multi_Cave_Doors
+from InvertedRegions import create_inverted_regions
+from ItemList import difficulties
+from Rules import set_inverted_big_bomb_rules
+
+
+class TestInvertedBombRules(unittest.TestCase):
+
+    def setUp(self):
+        self.world = World(1, 'vanilla', 'noglitches', 'inverted', 'random', 'normal', 'normal', 'none', 'on', 'ganon', 'balanced',
+                           True, False, False, False, False, False, False, False, False, None,
+                           'none', False)
+        self.world.difficulty_requirements = difficulties['normal']
+        create_inverted_regions(self.world, 1)
+        create_dungeons(self.world, 1)
+
+    #TODO: Just making sure I haven't missed an entrance.  It would be good to test the rules make sense as well.
+    def testInvertedBombRulesAreComplete(self):
+        entrances = list(Inverted_LW_Entrances + Inverted_LW_Dungeon_Entrances + Inverted_LW_Single_Cave_Doors + Inverted_Old_Man_Entrances + Inverted_DW_Entrances + Inverted_DW_Dungeon_Entrances + Inverted_DW_Single_Cave_Doors)
+        must_exits = list(Inverted_LW_Entrances_Must_Exit + Inverted_LW_Dungeon_Entrances_Must_Exit)
+        for entrance_name in (entrances + must_exits):
+            if entrance_name not in ['Desert Palace Entrance (East)', 'Spectacle Rock Cave', 'Spectacle Rock Cave (Bottom)']:
+                entrance = self.world.get_entrance(entrance_name, 1)
+                connect_entrance(self.world, entrance, 'Inverted Big Bomb Shop', 1)
+                set_inverted_big_bomb_rules(self.world, 1)
+                entrance.connected_region.entrances.remove(entrance)
+                entrance.connected_region = None
+
+    def testInvalidEntrancesAreNotUsed(self):
+        entrances = list(Inverted_Blacksmith_Multi_Cave_Doors + Inverted_Blacksmith_Single_Cave_Doors + Inverted_Bomb_Shop_Multi_Cave_Doors + Inverted_Bomb_Shop_Single_Cave_Doors)
+        invalid_entrances = ['Desert Palace Entrance (East)', 'Spectacle Rock Cave', 'Spectacle Rock Cave (Bottom)', 'Pyramid Fairy']
+        for invalid_entrance in invalid_entrances:
+            self.assertNotIn(invalid_entrance, entrances)
+
+    def testInvalidEntrances(self):
+        for entrance_name in ['Desert Palace Entrance (East)', 'Spectacle Rock Cave', 'Spectacle Rock Cave (Bottom)']:
+            entrance = self.world.get_entrance(entrance_name, 1)
+            connect_entrance(self.world, entrance, 'Inverted Big Bomb Shop', 1)
+            with self.assertRaises(Exception):
+                set_inverted_big_bomb_rules(self.world, 1)
+            entrance.connected_region.entrances.remove(entrance)
+            entrance.connected_region = None

test/inverted/TestInvertedDarkWorld.py

@@ -0,0 +1,116 @@
+from test.inverted.TestInverted import TestInverted
+
+
+class TestInvertedDeathMountain(TestInverted):
+
+    def testNorthWest(self):
+        self.run_tests([
+            ["Brewery", True, []],
+
+            ["C-Shaped House", True, []],
+
+            ["Chest Game", True, []],
+
+            ["Peg Cave", False, []],
+            ["Peg Cave", False, [], ['Hammer']],
+            ["Peg Cave", False, [], ['Progressive Glove', 'Magic Mirror']],
+            ["Peg Cave", True, ['Hammer', 'Progressive Glove', 'Progressive Glove']],
+            ["Peg Cave", True, ['Hammer', 'Progressive Glove', 'Magic Mirror', 'Moon Pearl']],
+            ["Peg Cave", True, ['Hammer', 'Beat Agahnim 1', 'Magic Mirror']],
+
+            ["Bumper Cave Ledge", False, []],
+            ["Bumper Cave Ledge", False, [], ['Moon Pearl']],
+            ["Bumper Cave Ledge", False, [], ['Cape']],
+            ["Bumper Cave Ledge", False, [], ['Progressive Glove']],
+            ["Bumper Cave Ledge", False, [], ['Magic Mirror']],
+            ["Bumper Cave Ledge", True, ['Moon Pearl', 'Cape', 'Magic Mirror', 'Progressive Glove', 'Progressive Glove']],
+            ["Bumper Cave Ledge", True, ['Moon Pearl', 'Cape', 'Magic Mirror', 'Progressive Glove', 'Hammer']],
+            ["Bumper Cave Ledge", True, ['Moon Pearl', 'Cape', 'Magic Mirror', 'Progressive Glove', 'Beat Agahnim 1']],
+
+            ["Blacksmith", False, []],
+            ["Blacksmith", False, [], ['Progressive Glove', 'Magic Mirror']],
+            ["Blacksmith", True, ['Progressive Glove', 'Progressive Glove', 'Moon Pearl']],
+            #@todo: Can get this without moon pearl
+            #["Blacksmith", True, ['Beat Agahnim 1', 'Magic Mirror']],
+            ["Blacksmith", True, ['Beat Agahnim 1', 'Magic Mirror', 'Moon Pearl']],
+            ["Blacksmith", True, ['Progressive Glove', 'Hammer', 'Magic Mirror', 'Moon Pearl']],
+
+            ["Purple Chest", False, []],
+            ["Purple Chest", False, [], ['Progressive Glove', 'Magic Mirror']],
+            ["Purple Chest", True, ['Progressive Glove', 'Progressive Glove', 'Moon Pearl']],
+            # @todo: Can get this without moon pearl
+            #["Purple Chest", True, ['Beat Agahnim 1', 'Magic Mirror']],
+            ["Purple Chest", True, ['Beat Agahnim 1', 'Magic Mirror', 'Moon Pearl']],
+            ["Purple Chest", True, ['Progressive Glove', 'Hammer', 'Magic Mirror', 'Moon Pearl']],
+        ])
+
+    def testNorthEast(self):
+        self.run_tests([
+            ["Catfish", False, []],
+            ["Catfish", False, [], ['Progressive Glove', 'Flippers']],
+            ["Catfish", False, [], ['Progressive Glove', 'Magic Mirror']],
+            ["Catfish", False, [], ['Progressive Glove', 'Moon Pearl']],
+            ["Catfish", True, ['Beat Agahnim 1', 'Magic Mirror', 'Progressive Glove']],
+            ["Catfish", True, ['Beat Agahnim 1', 'Moon Pearl', 'Magic Mirror', 'Flippers']],
+            ["Catfish", True, ['Progressive Glove', 'Hammer']],
+            ["Catfish", True, ['Progressive Glove', 'Flippers']],
+            ["Catfish", True, ['Progressive Glove', 'Progressive Glove', 'Magic Mirror', 'Moon Pearl']],
+
+            ["Pyramid", False, []],
+            ["Pyramid", True, ['Beat Agahnim 1', 'Magic Mirror']],
+            ["Pyramid", True, ['Hammer']],
+            ["Pyramid", True, ['Flippers', 'Progressive Glove']],
+            ["Pyramid", True, ['Progressive Glove', 'Progressive Glove', 'Magic Mirror', 'Moon Pearl']],
+
+            ["Pyramid Fairy - Left", False, []],
+            ["Pyramid Fairy - Left", False, [], ['Magic Mirror']],
+            ["Pyramid Fairy - Left", False, [], ['Crystal 5']],
+            ["Pyramid Fairy - Left", False, [], ['Crystal 6']],
+            ["Pyramid Fairy - Left", True, ['Crystal 5', 'Crystal 6', 'Magic Mirror', 'Hammer', 'Progressive Glove', 'Moon Pearl']],
+            ["Pyramid Fairy - Left", True, ['Crystal 5', 'Crystal 6', 'Magic Mirror', 'Progressive Glove', 'Progressive Glove', 'Moon Pearl']],
+            ["Pyramid Fairy - Left", True, ['Crystal 5', 'Crystal 6', 'Magic Mirror', 'Beat Agahnim 1']],
+
+            ["Pyramid Fairy - Right", False, []],
+            ["Pyramid Fairy - Right", False, [], ['Magic Mirror']],
+            ["Pyramid Fairy - Right", False, [], ['Crystal 5']],
+            ["Pyramid Fairy - Right", False, [], ['Crystal 6']],
+            ["Pyramid Fairy - Right", True, ['Crystal 5', 'Crystal 6', 'Magic Mirror', 'Hammer', 'Progressive Glove', 'Moon Pearl']],
+            ["Pyramid Fairy - Right", True, ['Crystal 5', 'Crystal 6', 'Magic Mirror', 'Progressive Glove', 'Progressive Glove', 'Moon Pearl']],
+            ["Pyramid Fairy - Right", True, ['Crystal 5', 'Crystal 6', 'Magic Mirror', 'Beat Agahnim 1']],
+        ])
+
+    def testSouth(self):
+        self.run_tests([
+            ["Hype Cave - Top", True, []],
+
+            ["Hype Cave - Middle Right", True, []],
+
+            ["Hype Cave - Middle Left", True, []],
+
+            ["Hype Cave - Bottom", True, []],
+
+            ["Hype Cave - Generous Guy", True, []],
+
+            ["Stumpy", True, []],
+
+            ["Digging Game", True, []],
+
+            ["Link's House", True, []],
+        ])
+
+    def testMireArea(self):
+        self.run_tests([
+            ["Mire Shed - Left", False, []],
+            ["Mire Shed - Left", False, [], ['Ocarina', 'Magic Mirror']],
+            ["Mire Shed - Left", True, ['Moon Pearl', 'Ocarina', 'Progressive Glove', 'Progressive Glove']],
+            ["Mire Shed - Left", True, ['Moon Pearl', 'Ocarina', 'Progressive Glove', 'Hammer']],
+            ["Mire Shed - Left", True, ['Moon Pearl', 'Ocarina', 'Beat Agahnim 1']],
+            ["Mire Shed - Left", True, ['Magic Mirror', 'Beat Agahnim 1']],
+
+            ["Mire Shed - Right", False, []],
+            ["Mire Shed - Right", False, [], ['Ocarina', 'Magic Mirror']],
+            ["Mire Shed - Right", True, ['Moon Pearl', 'Ocarina', 'Progressive Glove', 'Progressive Glove']],
+            ["Mire Shed - Right", True, ['Moon Pearl', 'Ocarina', 'Progressive Glove', 'Hammer']],
+            ["Mire Shed - Right", True, ['Moon Pearl', 'Ocarina', 'Beat Agahnim 1']],
+            ["Mire Shed - Right", True, ['Magic Mirror', 'Beat Agahnim 1']],
+        ])

test/inverted/TestInvertedDeathMountain.py

@@ -0,0 +1,229 @@
+from test.inverted.TestInverted import TestInverted
+
+
+class TestInvertedDeathMountain(TestInverted):
+
+    def testWestDeathMountain(self):
+        self.run_tests([
+            ["Old Man", False, []],
+            ["Old Man", False, [], ['Progressive Glove', 'Ocarina']],
+            ["Old Man", False, [], ['Lamp']],
+            ["Old Man", True, ['Progressive Glove', 'Lamp']],
+            ["Old Man", False, ['Ocarina', 'Lamp']],
+
+            ["Spectacle Rock Cave", False, []],
+            ["Spectacle Rock Cave", False, [], ['Progressive Glove', 'Ocarina']],
+            ["Spectacle Rock Cave", False, [], ['Lamp', 'Ocarina']],
+            ["Spectacle Rock Cave", False, ['Ocarina', 'Progressive Glove', 'Hammer']],
+            ["Spectacle Rock Cave", False, ['Ocarina', 'Progressive Glove', 'Progressive Glove', 'Hammer']],
+            ["Spectacle Rock Cave", False, ['Progressive Glove', 'Hammer', 'Moon Pearl']],
+            ["Spectacle Rock Cave", True, ['Ocarina', 'Moon Pearl', 'Progressive Glove', 'Hammer']],
+            ["Spectacle Rock Cave", True, ['Ocarina', 'Moon Pearl', 'Progressive Glove', 'Progressive Glove']],
+            ["Spectacle Rock Cave", True, ['Progressive Glove', 'Lamp']],
+        ])
+        
+    def testEastDeathMountain(self):
+        self.run_tests([
+            ["Spiral Cave", False, []],
+            ["Spiral Cave", False, [], ['Moon Pearl']],
+            ["Spiral Cave", False, [], ['Progressive Glove', 'Ocarina']],
+            ["Spiral Cave", False, [], ['Lamp', 'Ocarina']],
+            ["Spiral Cave", False, ['Progressive Glove'], ['Hookshot', 'Progressive Glove']],
+            ["Spiral Cave", False, ['Progressive Glove', 'Lamp', 'Moon Pearl']],
+            ["Spiral Cave", False, ['Progressive Glove', 'Hookshot', 'Moon Pearl']],
+            ["Spiral Cave", False, ['Ocarina', 'Moon Pearl', 'Progressive Glove', 'Hammer']],
+            ["Spiral Cave", False, ['Ocarina', 'Hookshot', 'Moon Pearl']],
+            ["Spiral Cave", True, ['Ocarina', 'Hookshot', 'Moon Pearl', 'Progressive Glove', 'Hammer']],
+            ["Spiral Cave", True, ['Progressive Glove', 'Lamp', 'Moon Pearl', 'Hookshot']],
+            ["Spiral Cave", True, ['Progressive Glove', 'Progressive Glove', 'Lamp', 'Moon Pearl']],
+            ["Spiral Cave", True, ['Ocarina', 'Progressive Glove', 'Progressive Glove', 'Moon Pearl']],
+
+            ["Paradox Cave Lower - Far Left", False, []],
+            ["Paradox Cave Lower - Far Left", False, [], ['Moon Pearl']],
+            ["Paradox Cave Lower - Far Left", False, [], ['Progressive Glove', 'Ocarina']],
+            ["Paradox Cave Lower - Far Left", False, [], ['Lamp', 'Ocarina']],
+            ["Paradox Cave Lower - Far Left", False, ['Progressive Glove'], ['Progressive Glove', 'Hookshot']],
+            ["Paradox Cave Lower - Far Left", False, ['Progressive Glove', 'Hookshot', 'Moon Pearl']],
+            ["Paradox Cave Lower - Far Left", False, ['Ocarina', 'Progressive Glove', 'Hammer', 'Moon Pearl']],
+            ["Paradox Cave Lower - Far Left", True, ['Ocarina', 'Progressive Glove', 'Hammer', 'Hookshot', 'Moon Pearl']],
+            ["Paradox Cave Lower - Far Left", True, ['Progressive Glove', 'Lamp', 'Hookshot', 'Moon Pearl']],
+            ["Paradox Cave Lower - Far Left", True, ['Progressive Glove', 'Progressive Glove', 'Lamp', 'Moon Pearl']],
+            ["Paradox Cave Lower - Far Left", True, ['Ocarina', 'Progressive Glove', 'Progressive Glove', 'Moon Pearl']],
+            
+            ["Paradox Cave Lower - Left", False, []],
+            ["Paradox Cave Lower - Left", False, [], ['Moon Pearl']],
+            ["Paradox Cave Lower - Left", False, [], ['Progressive Glove', 'Ocarina']],
+            ["Paradox Cave Lower - Left", False, [], ['Lamp', 'Ocarina']],
+            ["Paradox Cave Lower - Left", False, ['Progressive Glove'], ['Progressive Glove', 'Hookshot']],
+            ["Paradox Cave Lower - Left", False, ['Progressive Glove', 'Hookshot', 'Moon Pearl']],
+            ["Paradox Cave Lower - Left", False, ['Ocarina', 'Progressive Glove', 'Hammer', 'Moon Pearl']],
+            ["Paradox Cave Lower - Left", True, ['Ocarina', 'Progressive Glove', 'Hammer', 'Hookshot', 'Moon Pearl']],
+            ["Paradox Cave Lower - Left", True, ['Progressive Glove', 'Lamp', 'Hookshot', 'Moon Pearl']],
+            ["Paradox Cave Lower - Left", True, ['Progressive Glove', 'Progressive Glove', 'Lamp', 'Moon Pearl']],
+            ["Paradox Cave Lower - Left", True, ['Ocarina', 'Progressive Glove', 'Progressive Glove', 'Moon Pearl']],
+            
+            ["Paradox Cave Lower - Middle", False, []],
+            ["Paradox Cave Lower - Middle", False, [], ['Moon Pearl']],
+            ["Paradox Cave Lower - Middle", False, [], ['Progressive Glove', 'Ocarina']],
+            ["Paradox Cave Lower - Middle", False, [], ['Lamp', 'Ocarina']],
+            ["Paradox Cave Lower - Middle", False, ['Progressive Glove'], ['Progressive Glove', 'Hookshot']],
+            ["Paradox Cave Lower - Middle", False, ['Progressive Glove', 'Hookshot', 'Moon Pearl']],
+            ["Paradox Cave Lower - Middle", False, ['Ocarina', 'Progressive Glove', 'Hammer', 'Moon Pearl']],
+            ["Paradox Cave Lower - Middle", True, ['Ocarina', 'Progressive Glove', 'Hammer', 'Hookshot', 'Moon Pearl']],
+            ["Paradox Cave Lower - Middle", True, ['Progressive Glove', 'Lamp', 'Hookshot', 'Moon Pearl']],
+            ["Paradox Cave Lower - Middle", True, ['Progressive Glove', 'Progressive Glove', 'Lamp', 'Moon Pearl']],
+            ["Paradox Cave Lower - Middle", True, ['Ocarina', 'Progressive Glove', 'Progressive Glove', 'Moon Pearl']],
+            
+            ["Paradox Cave Lower - Right", False, []],
+            ["Paradox Cave Lower - Right", False, [], ['Moon Pearl']],
+            ["Paradox Cave Lower - Right", False, [], ['Progressive Glove', 'Ocarina']],
+            ["Paradox Cave Lower - Right", False, [], ['Lamp', 'Ocarina']],
+            ["Paradox Cave Lower - Right", False, ['Progressive Glove'], ['Progressive Glove', 'Hookshot']],
+            ["Paradox Cave Lower - Right", False, ['Progressive Glove', 'Hookshot', 'Moon Pearl']],
+            ["Paradox Cave Lower - Right", False, ['Ocarina', 'Progressive Glove', 'Hammer', 'Moon Pearl']],
+            ["Paradox Cave Lower - Right", True, ['Ocarina', 'Progressive Glove', 'Hammer', 'Hookshot', 'Moon Pearl']],
+            ["Paradox Cave Lower - Right", True, ['Progressive Glove', 'Lamp', 'Hookshot', 'Moon Pearl']],
+            ["Paradox Cave Lower - Right", True, ['Progressive Glove', 'Progressive Glove', 'Lamp', 'Moon Pearl']],
+            ["Paradox Cave Lower - Right", True, ['Ocarina', 'Progressive Glove', 'Progressive Glove', 'Moon Pearl']],
+            
+            ["Paradox Cave Lower - Far Right", False, []],
+            ["Paradox Cave Lower - Far Right", False, [], ['Moon Pearl']],
+            ["Paradox Cave Lower - Far Right", False, [], ['Progressive Glove', 'Ocarina']],
+            ["Paradox Cave Lower - Far Right", False, [], ['Lamp', 'Ocarina']],
+            ["Paradox Cave Lower - Far Right", False, ['Progressive Glove'], ['Progressive Glove', 'Hookshot']],
+            ["Paradox Cave Lower - Far Right", False, ['Progressive Glove', 'Hookshot', 'Moon Pearl']],
+            ["Paradox Cave Lower - Far Right", False, ['Ocarina', 'Progressive Glove', 'Hammer', 'Moon Pearl']],
+            ["Paradox Cave Lower - Far Right", True, ['Ocarina', 'Progressive Glove', 'Hammer', 'Hookshot', 'Moon Pearl']],
+            ["Paradox Cave Lower - Far Right", True, ['Progressive Glove', 'Lamp', 'Hookshot', 'Moon Pearl']],
+            ["Paradox Cave Lower - Far Right", True, ['Progressive Glove', 'Progressive Glove', 'Lamp', 'Moon Pearl']],
+            ["Paradox Cave Lower - Far Right", True, ['Ocarina', 'Progressive Glove', 'Progressive Glove', 'Moon Pearl']],
+            
+            ["Paradox Cave Upper - Left", False, []],
+            ["Paradox Cave Upper - Left", False, [], ['Moon Pearl']],
+            ["Paradox Cave Upper - Left", False, [], ['Progressive Glove', 'Ocarina']],
+            ["Paradox Cave Upper - Left", False, [], ['Lamp', 'Ocarina']],
+            ["Paradox Cave Upper - Left", False, ['Progressive Glove'], ['Progressive Glove', 'Hookshot']],
+            ["Paradox Cave Upper - Left", False, ['Progressive Glove', 'Hookshot', 'Moon Pearl']],
+            ["Paradox Cave Upper - Left", False, ['Ocarina', 'Progressive Glove', 'Hammer', 'Moon Pearl']],
+            ["Paradox Cave Upper - Left", True, ['Ocarina', 'Progressive Glove', 'Hammer', 'Hookshot', 'Moon Pearl']],
+            ["Paradox Cave Upper - Left", True, ['Progressive Glove', 'Lamp', 'Hookshot', 'Moon Pearl']],
+            ["Paradox Cave Upper - Left", True, ['Progressive Glove', 'Progressive Glove', 'Lamp', 'Moon Pearl']],
+            ["Paradox Cave Upper - Left", True, ['Ocarina', 'Progressive Glove', 'Progressive Glove', 'Moon Pearl']],
+            
+            ["Paradox Cave Upper - Right", False, []],
+            ["Paradox Cave Upper - Right", False, [], ['Moon Pearl']],
+            ["Paradox Cave Upper - Right", False, [], ['Progressive Glove', 'Ocarina']],
+            ["Paradox Cave Upper - Right", False, [], ['Lamp', 'Ocarina']],
+            ["Paradox Cave Upper - Right", False, ['Progressive Glove'], ['Progressive Glove', 'Hookshot']],
+            ["Paradox Cave Upper - Right", False, ['Progressive Glove', 'Hookshot', 'Moon Pearl']],
+            ["Paradox Cave Upper - Right", False, ['Ocarina', 'Progressive Glove', 'Hammer', 'Moon Pearl']],
+            ["Paradox Cave Upper - Right", True, ['Ocarina', 'Progressive Glove', 'Hammer', 'Hookshot', 'Moon Pearl']],
+            ["Paradox Cave Upper - Right", True, ['Progressive Glove', 'Lamp', 'Hookshot', 'Moon Pearl']],
+            ["Paradox Cave Upper - Right", True, ['Progressive Glove', 'Progressive Glove', 'Lamp', 'Moon Pearl']],
+            ["Paradox Cave Upper - Right", True, ['Ocarina', 'Progressive Glove', 'Progressive Glove', 'Moon Pearl']],
+            
+            ["Mimic Cave", False, []],
+            ["Mimic Cave", False, [], ['Moon Pearl']],
+            ["Mimic Cave", False, [], ['Hammer']],
+            ["Mimic Cave", False, [], ['Progressive Glove', 'Ocarina']],
+            ["Mimic Cave", False, [], ['Lamp', 'Ocarina']],
+            ["Mimic Cave", True, ['Ocarina', 'Moon Pearl', 'Progressive Glove', 'Hammer', 'Hookshot']],
+            ["Mimic Cave", True, ['Ocarina', 'Moon Pearl', 'Progressive Glove', 'Progressive Glove', 'Hammer']],
+            ["Mimic Cave", True, ['Progressive Glove', 'Lamp', 'Moon Pearl', 'Hammer', 'Hookshot']],
+            ["Mimic Cave", True, ['Progressive Glove', 'Progressive Glove', 'Lamp', 'Moon Pearl', 'Hammer']],
+
+            ["Ether Tablet", False, []],
+            ["Ether Tablet", False, [], ['Moon Pearl']],
+            ["Ether Tablet", False, [], ['Progressive Glove', 'Ocarina']],
+            ["Ether Tablet", False, [], ['Lamp', 'Ocarina']],
+            ["Ether Tablet", False, ['Progressive Glove'], ['Progressive Glove', 'Hookshot']],
+            ["Ether Tablet", False, [], ['Hammer']],
+            ["Ether Tablet", False, ['Progressive Sword'], ['Progressive Sword']],
+            ["Ether Tablet", False, [], ['Book of Mudora']],
+            ["Ether Tablet", True, ['Ocarina', 'Moon Pearl', 'Progressive Glove', 'Hammer', 'Hookshot', 'Book of Mudora', 'Progressive Sword', 'Progressive Sword']],
+            ["Ether Tablet", True, ['Ocarina', 'Moon Pearl', 'Progressive Glove', 'Progressive Glove', 'Hammer', 'Book of Mudora', 'Progressive Sword', 'Progressive Sword']],
+            ["Ether Tablet", True, ['Progressive Glove', 'Lamp', 'Moon Pearl', 'Hammer', 'Hookshot', 'Book of Mudora', 'Progressive Sword', 'Progressive Sword']],
+            ["Ether Tablet", True, ['Progressive Glove', 'Progressive Glove', 'Lamp', 'Moon Pearl', 'Hammer', 'Book of Mudora', 'Progressive Sword', 'Progressive Sword']],
+
+            ["Spectacle Rock", False, []],
+            ["Spectacle Rock", False, [], ['Moon Pearl']],
+            ["Spectacle Rock", False, [], ['Progressive Glove', 'Ocarina']],
+            ["Spectacle Rock", False, [], ['Lamp', 'Ocarina']],
+            ["Spectacle Rock", False, ['Progressive Glove'], ['Progressive Glove', 'Hookshot']],
+            ["Spectacle Rock", False, [], ['Hammer']],
+            ["Spectacle Rock", True, ['Ocarina', 'Moon Pearl', 'Progressive Glove', 'Hammer', 'Hookshot']],
+            ["Spectacle Rock", True, ['Ocarina', 'Moon Pearl', 'Progressive Glove', 'Progressive Glove', 'Hammer']],
+            ["Spectacle Rock", True, ['Progressive Glove', 'Lamp', 'Moon Pearl', 'Hammer', 'Hookshot']],
+            ["Spectacle Rock", True, ['Progressive Glove', 'Progressive Glove', 'Lamp', 'Moon Pearl', 'Hammer']],
+        ])
+
+    def testEastDarkWorldDeathMountain(self):
+        self.run_tests([
+            ["Superbunny Cave - Top", False, []],
+            ["Superbunny Cave - Top", False, [], ['Progressive Glove', 'Ocarina']],
+            ["Superbunny Cave - Top", True, ['Progressive Glove', 'Lamp']],
+            ["Superbunny Cave - Top", True, ['Progressive Glove', 'Progressive Glove', 'Moon Pearl', 'Ocarina']],
+            ["Superbunny Cave - Top", True, ['Hammer', 'Progressive Glove', 'Moon Pearl', 'Ocarina']],
+
+            ["Superbunny Cave - Bottom", False, []],
+            ["Superbunny Cave - Bottom", False, [], ['Progressive Glove', 'Ocarina']],
+            ["Superbunny Cave - Bottom", True, ['Progressive Glove', 'Lamp']],
+            ["Superbunny Cave - Bottom", True, ['Progressive Glove', 'Progressive Glove', 'Moon Pearl', 'Ocarina']],
+            ["Superbunny Cave - Bottom", True, ['Hammer', 'Progressive Glove', 'Moon Pearl', 'Ocarina']],
+
+            ["Hookshot Cave - Bottom Right", False, []],
+            ["Hookshot Cave - Bottom Right", False, [], ['Progressive Glove', 'Ocarina']],
+            ["Hookshot Cave - Bottom Right", False, [], ['Pegasus Boots', 'Hookshot']],
+            ["Hookshot Cave - Bottom Right", True, ['Progressive Glove', 'Lamp', 'Pegasus Boots']],
+            ["Hookshot Cave - Bottom Right", True, ['Progressive Glove', 'Progressive Glove', 'Moon Pearl', 'Ocarina', 'Pegasus Boots']],
+            ["Hookshot Cave - Bottom Right", True, ['Progressive Glove', 'Hammer', 'Moon Pearl', 'Ocarina', 'Pegasus Boots']],
+            ["Hookshot Cave - Bottom Right", True, ['Progressive Glove', 'Lamp', 'Hookshot']],
+            ["Hookshot Cave - Bottom Right", True, ['Progressive Glove', 'Progressive Glove', 'Moon Pearl', 'Ocarina', 'Hookshot']],
+            ["Hookshot Cave - Bottom Right", True, ['Progressive Glove', 'Hammer', 'Moon Pearl', 'Ocarina', 'Hookshot']],
+
+            ["Hookshot Cave - Bottom Left", False, []],
+            ["Hookshot Cave - Bottom Left", False, [], ['Progressive Glove', 'Ocarina']],
+            ["Hookshot Cave - Bottom Left", False, [], ['Pegasus Boots', 'Hookshot']],
+            ["Hookshot Cave - Bottom Left", True, ['Progressive Glove', 'Lamp', 'Hookshot']],
+            ["Hookshot Cave - Bottom Left", True, ['Progressive Glove', 'Progressive Glove', 'Moon Pearl', 'Ocarina', 'Hookshot']],
+            ["Hookshot Cave - Bottom Left", True, ['Progressive Glove', 'Hammer', 'Moon Pearl', 'Ocarina', 'Hookshot']],
+
+            ["Hookshot Cave - Top Left", False, []],
+            ["Hookshot Cave - Top Left", False, [], ['Progressive Glove', 'Ocarina']],
+            ["Hookshot Cave - Top Left", False, [], ['Pegasus Boots', 'Hookshot']],
+            ["Hookshot Cave - Top Left", True, ['Progressive Glove', 'Lamp', 'Hookshot']],
+            ["Hookshot Cave - Top Left", True, ['Progressive Glove', 'Progressive Glove', 'Moon Pearl', 'Ocarina', 'Hookshot']],
+            ["Hookshot Cave - Top Left", True, ['Progressive Glove', 'Hammer', 'Moon Pearl', 'Ocarina', 'Hookshot']],
+
+            ["Hookshot Cave - Top Right", False, []],
+            ["Hookshot Cave - Top Right", False, [], ['Progressive Glove', 'Ocarina']],
+            ["Hookshot Cave - Top Right", False, [], ['Pegasus Boots', 'Hookshot']],
+            ["Hookshot Cave - Top Right", True, ['Progressive Glove', 'Lamp', 'Hookshot']],
+            ["Hookshot Cave - Top Right", True, ['Progressive Glove', 'Progressive Glove', 'Moon Pearl', 'Ocarina', 'Hookshot']],
+            ["Hookshot Cave - Top Right", True, ['Progressive Glove', 'Hammer', 'Moon Pearl', 'Ocarina', 'Hookshot']],
+        ])
+
+    def testWestDarkWorldDeathMountain(self):
+        self.run_tests([
+            ["Spike Cave", False, []],
+            ["Spike Cave", False, [], ['Progressive Glove']],
+            ["Spike Cave", False, [], ['Hammer']],
+            ["Spike Cave", False, [], ['Cape', 'Cane of Byrna']],
+            ["Spike Cave", False, [], ['Cane of Byrna', 'AnyBottle', 'Magic Upgrade (1/2)']],
+            ["Spike Cave", False, [], ['AnyBottle', 'Magic Upgrade (1/2)', 'Pegasus Boots', 'Boss Heart Container', 'Piece of Heart', 'Sanctuary Heart Container']],
+            ["Spike Cave", False, ['Bottle', 'Hammer', 'Progressive Glove', 'Lamp', 'Cape']],
+            ["Spike Cave", True, ['Bottle', 'Hammer', 'Progressive Glove', 'Lamp', 'Moon Pearl', 'Cape']],
+            ["Spike Cave", True, ['Bottle', 'Hammer', 'Progressive Glove', 'Ocarina', 'Moon Pearl', 'Cape']],
+            ["Spike Cave", False, ['Bottle', 'Hammer', 'Progressive Glove', 'Lamp', 'Cane of Byrna']],
+            ["Spike Cave", True, ['Bottle', 'Hammer', 'Progressive Glove', 'Lamp', 'Moon Pearl', 'Cane of Byrna']],
+            ["Spike Cave", True, ['Bottle', 'Hammer', 'Progressive Glove', 'Ocarina', 'Moon Pearl', 'Cane of Byrna']],
+            ["Spike Cave", True, ['Magic Upgrade (1/2)', 'Hammer', 'Progressive Glove', 'Lamp', 'Cape']],
+            ["Spike Cave", True, ['Magic Upgrade (1/2)', 'Hammer', 'Progressive Glove', 'Ocarina', 'Moon Pearl', 'Cape']],
+            ["Spike Cave", True, ['Magic Upgrade (1/2)', 'Hammer', 'Progressive Glove', 'Lamp', 'Cane of Byrna']],
+            ["Spike Cave", True, ['Magic Upgrade (1/2)', 'Hammer', 'Progressive Glove', 'Ocarina', 'Moon Pearl', 'Cane of Byrna']],
+            ["Spike Cave", True, ['Pegasus Boots', 'Hammer', 'Progressive Glove', 'Lamp', 'Cane of Byrna']],
+            ["Spike Cave", True, ['Pegasus Boots', 'Hammer', 'Progressive Glove', 'Ocarina', 'Moon Pearl', 'Cane of Byrna']],
+            ["Spike Cave", True, ['Boss Heart Container', 'Hammer', 'Progressive Glove', 'Lamp', 'Cane of Byrna']],
+            ["Spike Cave", True, ['Boss Heart Container', 'Hammer', 'Progressive Glove', 'Ocarina', 'Moon Pearl', 'Cane of Byrna']],
+        ])
+

test/inverted/TestInvertedLightWorld.py

@@ -0,0 +1,380 @@
+from test.inverted.TestInverted import TestInverted
+
+
+class TestInvertedLightWorld(TestInverted):
+    def setUp(self):
+        super().setUp()
+
+    def testLostWoods(self):
+        self.run_tests([
+            ["Master Sword Pedestal", False, []],
+            ["Master Sword Pedestal", False, [], ['Green Pendant']],
+            ["Master Sword Pedestal", False, [], ['Red Pendant']],
+            ["Master Sword Pedestal", False, [], ['Blue Pendant']],
+            # @todo: Can get this without moon pearl
+            # ["Master Sword Pedestal", True, ['Green Pendant', 'Red Pendant', 'Blue Pendant', 'Beat Agahnim 1']],
+            ["Master Sword Pedestal", True, ['Green Pendant', 'Red Pendant', 'Blue Pendant', 'Beat Agahnim 1', 'Moon Pearl']],
+            ["Master Sword Pedestal", True, ['Green Pendant', 'Red Pendant', 'Blue Pendant', 'Moon Pearl', 'Progressive Glove', 'Hammer']],
+            ["Master Sword Pedestal", True, ['Green Pendant', 'Red Pendant', 'Blue Pendant', 'Moon Pearl', 'Progressive Glove', 'Progressive Glove']],
+
+            ["Mushroom", False, []],
+            ["Mushroom", False, [], ['Moon Pearl']],
+            ["Mushroom", True, ['Moon Pearl', 'Beat Agahnim 1']],
+            ["Mushroom", True, ['Moon Pearl', 'Progressive Glove', 'Hammer']],
+            ["Mushroom", True, ['Moon Pearl', 'Progressive Glove', 'Progressive Glove']],
+
+            ["Lost Woods Hideout", False, []],
+            ["Lost Woods Hideout", False, [], ['Moon Pearl']],
+            ["Lost Woods Hideout", True, ['Moon Pearl', 'Beat Agahnim 1']],
+            ["Lost Woods Hideout", True, ['Moon Pearl', 'Progressive Glove', 'Hammer']],
+            ["Lost Woods Hideout", True, ['Moon Pearl', 'Progressive Glove', 'Progressive Glove']],
+
+            ["Lumberjack Tree", False, []],
+            ["Lumberjack Tree", False, [], ['Pegasus Boots']],
+            ["Lumberjack Tree", False, [], ['Beat Agahnim 1']],
+            ["Lumberjack Tree", False, [], ['Moon Pearl']],
+            ["Lumberjack Tree", True, ['Pegasus Boots', 'Beat Agahnim 1', 'Moon Pearl']],
+        ])
+
+    def testKakariko(self):
+        self.run_tests([
+            ["Kakariko Tavern", False, []],
+            ["Kakariko Tavern", False, [], ['Moon Pearl']],
+            ["Kakariko Tavern", True, ['Moon Pearl', 'Beat Agahnim 1']],
+            ["Kakariko Tavern", True, ['Moon Pearl', 'Progressive Glove', 'Hammer']],
+            ["Kakariko Tavern", True, ['Moon Pearl', 'Progressive Glove', 'Progressive Glove']],
+
+            ["Chicken House", False, []],
+            ["Chicken House", False, [], ['Moon Pearl']],
+            ["Chicken House", True, ['Moon Pearl', 'Beat Agahnim 1']],
+            ["Chicken House", True, ['Moon Pearl', 'Progressive Glove', 'Hammer']],
+            ["Chicken House", True, ['Moon Pearl', 'Progressive Glove', 'Progressive Glove']],
+
+            ["Kakariko Well - Top", False, []],
+            ["Kakariko Well - Top", False, [], ['Moon Pearl']],
+            ["Kakariko Well - Top", True, ['Moon Pearl', 'Beat Agahnim 1']],
+            ["Kakariko Well - Top", True, ['Moon Pearl', 'Progressive Glove', 'Hammer']],
+            ["Kakariko Well - Top", True, ['Moon Pearl', 'Progressive Glove', 'Progressive Glove']],
+
+            ["Kakariko Well - Left", False, []],
+            ["Kakariko Well - Left", False, [], ['Moon Pearl']],
+            ["Kakariko Well - Left", True, ['Moon Pearl', 'Beat Agahnim 1']],
+            ["Kakariko Well - Left", True, ['Moon Pearl', 'Progressive Glove', 'Hammer']],
+            ["Kakariko Well - Left", True, ['Moon Pearl', 'Progressive Glove', 'Progressive Glove']],
+
+            ["Kakariko Well - Middle", False, []],
+            ["Kakariko Well - Middle", False, [], ['Moon Pearl']],
+            ["Kakariko Well - Middle", True, ['Moon Pearl', 'Beat Agahnim 1']],
+            ["Kakariko Well - Middle", True, ['Moon Pearl', 'Progressive Glove', 'Hammer']],
+            ["Kakariko Well - Middle", True, ['Moon Pearl', 'Progressive Glove', 'Progressive Glove']],
+
+            ["Kakariko Well - Right", False, []],
+            ["Kakariko Well - Right", False, [], ['Moon Pearl']],
+            ["Kakariko Well - Right", True, ['Moon Pearl', 'Beat Agahnim 1']],
+            ["Kakariko Well - Right", True, ['Moon Pearl', 'Progressive Glove', 'Hammer']],
+            ["Kakariko Well - Right", True, ['Moon Pearl', 'Progressive Glove', 'Progressive Glove']],
+
+            ["Kakariko Well - Bottom", False, []],
+            ["Kakariko Well - Bottom", False, [], ['Moon Pearl']],
+            ["Kakariko Well - Bottom", True, ['Moon Pearl', 'Beat Agahnim 1']],
+            ["Kakariko Well - Bottom", True, ['Moon Pearl', 'Progressive Glove', 'Hammer']],
+            ["Kakariko Well - Bottom", True, ['Moon Pearl', 'Progressive Glove', 'Progressive Glove']],
+
+            ["Blind's Hideout - Top", False, []],
+            ["Blind's Hideout - Top", False, [], ['Moon Pearl']],
+            ["Blind's Hideout - Top", True, ['Moon Pearl', 'Beat Agahnim 1']],
+            ["Blind's Hideout - Top", True, ['Moon Pearl', 'Progressive Glove', 'Hammer']],
+            ["Blind's Hideout - Top", True, ['Moon Pearl', 'Progressive Glove', 'Progressive Glove']],
+
+            ["Blind's Hideout - Left", False, []],
+            ["Blind's Hideout - Left", False, [], ['Moon Pearl']],
+            ["Blind's Hideout - Left", True, ['Moon Pearl', 'Beat Agahnim 1']],
+            ["Blind's Hideout - Left", True, ['Moon Pearl', 'Progressive Glove', 'Hammer']],
+            ["Blind's Hideout - Left", True, ['Moon Pearl', 'Progressive Glove', 'Progressive Glove']],
+
+            ["Blind's Hideout - Right", False, []],
+            ["Blind's Hideout - Right", False, [], ['Moon Pearl']],
+            ["Blind's Hideout - Right", True, ['Moon Pearl', 'Beat Agahnim 1']],
+            ["Blind's Hideout - Right", True, ['Moon Pearl', 'Progressive Glove', 'Hammer']],
+            ["Blind's Hideout - Right", True, ['Moon Pearl', 'Progressive Glove', 'Progressive Glove']],
+
+            ["Blind's Hideout - Far Left", False, []],
+            ["Blind's Hideout - Far Left", False, [], ['Moon Pearl']],
+            ["Blind's Hideout - Far Left", True, ['Moon Pearl', 'Beat Agahnim 1']],
+            ["Blind's Hideout - Far Left", True, ['Moon Pearl', 'Progressive Glove', 'Hammer']],
+            ["Blind's Hideout - Far Left", True, ['Moon Pearl', 'Progressive Glove', 'Progressive Glove']],
+
+            ["Blind's Hideout - Far Right", False, []],
+            ["Blind's Hideout - Far Right", False, [], ['Moon Pearl']],
+            ["Blind's Hideout - Far Right", True, ['Moon Pearl', 'Beat Agahnim 1']],
+            ["Blind's Hideout - Far Right", True, ['Moon Pearl', 'Progressive Glove', 'Hammer']],
+            ["Blind's Hideout - Far Right", True, ['Moon Pearl', 'Progressive Glove', 'Progressive Glove']],
+
+            ["Bottle Merchant", False, []],
+            #@todo: Can get this without moon pearl
+            #["Bottle Merchant", True, ['Beat Agahnim 1']],
+            ["Bottle Merchant", True, ['Beat Agahnim 1', 'Moon Pearl']],
+            ["Bottle Merchant", True, ['Moon Pearl', 'Progressive Glove', 'Hammer']],
+            ["Bottle Merchant", True, ['Moon Pearl', 'Progressive Glove', 'Progressive Glove']],
+
+            ["Sick Kid", False, []],
+            ["Sick Kid", False, [], ['AnyBottle']],
+            ["Sick Kid", False, ['Bottle (Bee)']],
+            ["Sick Kid", False, ['Bottle (Fairy)']],
+            ["Sick Kid", False, ['Bottle (Red Potion)']],
+            ["Sick Kid", False, ['Bottle (Green Potion)']],
+            ["Sick Kid", False, ['Bottle (Blue Potion)']],
+            ["Sick Kid", False, ['Bottle']],
+            ["Sick Kid", False, ['Bottle (Good Bee)']],
+            ["Sick Kid", True, ['Bottle (Bee)', 'Beat Agahnim 1']],
+            ["Sick Kid", True, ['Bottle (Bee)', 'Moon Pearl', 'Progressive Glove', 'Hammer']],
+            ["Sick Kid", True, ['Bottle (Bee)', 'Moon Pearl', 'Progressive Glove', 'Progressive Glove']],
+            ["Sick Kid", True, ['Bottle (Fairy)', 'Beat Agahnim 1']],
+            ["Sick Kid", True, ['Bottle (Fairy)', 'Moon Pearl', 'Progressive Glove', 'Hammer']],
+            ["Sick Kid", True, ['Bottle (Fairy)', 'Moon Pearl', 'Progressive Glove', 'Progressive Glove']],
+            ["Sick Kid", True, ['Bottle (Red Potion)', 'Beat Agahnim 1']],
+            ["Sick Kid", True, ['Bottle (Red Potion)', 'Moon Pearl', 'Progressive Glove', 'Hammer']],
+            ["Sick Kid", True, ['Bottle (Red Potion)', 'Moon Pearl', 'Progressive Glove', 'Progressive Glove']],
+            ["Sick Kid", True, ['Bottle (Green Potion)', 'Beat Agahnim 1']],
+            ["Sick Kid", True, ['Bottle (Green Potion)', 'Moon Pearl', 'Progressive Glove', 'Hammer']],
+            ["Sick Kid", True, ['Bottle (Green Potion)', 'Moon Pearl', 'Progressive Glove', 'Progressive Glove']],
+            ["Sick Kid", True, ['Bottle (Blue Potion)', 'Beat Agahnim 1']],
+            ["Sick Kid", True, ['Bottle (Blue Potion)', 'Moon Pearl', 'Progressive Glove', 'Hammer']],
+            ["Sick Kid", True, ['Bottle (Blue Potion)', 'Moon Pearl', 'Progressive Glove', 'Progressive Glove']],
+            ["Sick Kid", True, ['Bottle', 'Beat Agahnim 1']],
+            ["Sick Kid", True, ['Bottle', 'Moon Pearl', 'Progressive Glove', 'Hammer']],
+            ["Sick Kid", True, ['Bottle', 'Moon Pearl', 'Progressive Glove', 'Progressive Glove']],
+            ["Sick Kid", True, ['Bottle (Good Bee)', 'Beat Agahnim 1']],
+            ["Sick Kid", True, ['Bottle (Good Bee)', 'Moon Pearl', 'Progressive Glove', 'Hammer']],
+            ["Sick Kid", True, ['Bottle (Good Bee)', 'Moon Pearl', 'Progressive Glove', 'Progressive Glove']],
+
+            ["Magic Bat", False, []],
+            ["Magic Bat", False, [], ['Magic Powder']],
+            ["Magic Bat", False, [], ['Hammer']],
+            ["Magic Bat", False, [], ['Moon Pearl']],
+            ["Magic Bat", False, ['Magic Powder', 'Hammer', 'Moon Pearl']],
+            ["Magic Bat", True, ['Magic Powder', 'Hammer', 'Moon Pearl', 'Beat Agahnim 1']],
+            ["Magic Bat", True, ['Magic Powder', 'Hammer', 'Moon Pearl', 'Progressive Glove']],
+
+            ["Library", False, []],
+            ["Library", False, [], ['Pegasus Boots']],
+            ["Library", False, [], ['Moon Pearl']],
+            ["Library", True, ['Pegasus Boots', 'Moon Pearl', 'Beat Agahnim 1']],
+            ["Library", True, ['Pegasus Boots', 'Moon Pearl', 'Progressive Glove', 'Hammer']],
+            ["Library", True, ['Pegasus Boots', 'Moon Pearl', 'Progressive Glove', 'Progressive Glove']],
+
+            ["Maze Race", False, []],
+            ["Maze Race", False, [], ['Moon Pearl']],
+            ["Maze Race", True, ['Moon Pearl', 'Beat Agahnim 1']],
+            ["Maze Race", True, ['Moon Pearl', 'Progressive Glove', 'Hammer']],
+            ["Maze Race", True, ['Moon Pearl', 'Progressive Glove', 'Progressive Glove']],
+        ])
+
+    def testSouthLightWorld(self):
+        self.run_tests([
+            ["Desert Ledge", False, []],
+            ["Desert Ledge", False, [], ['Book of Mudora']],
+            ["Desert Ledge", False, [], ['Moon Pearl']],
+            ["Desert Ledge", True, ['Book of Mudora', 'Moon Pearl', 'Beat Agahnim 1']],
+            ["Desert Ledge", True, ['Book of Mudora', 'Moon Pearl', 'Progressive Glove', 'Hammer']],
+            ["Desert Ledge", True, ['Book of Mudora', 'Moon Pearl', 'Progressive Glove', 'Progressive Glove']],
+
+            ["Checkerboard Cave", False, []],
+            ["Checkerboard Cave", False, [], ['Progressive Glove']],
+            ["Checkerboard Cave", False, [], ['Moon Pearl']],
+            ["Checkerboard Cave", True, ['Progressive Glove', 'Beat Agahnim 1', 'Moon Pearl']],
+            ["Checkerboard Cave", True, ['Progressive Glove', 'Hammer', 'Moon Pearl']],
+            ["Checkerboard Cave", True, ['Progressive Glove', 'Progressive Glove', 'Moon Pearl']],
+
+            ["Aginah's Cave", False, []],
+            ["Aginah's Cave", False, [], ['Moon Pearl']],
+            ["Aginah's Cave", True, ['Moon Pearl', 'Beat Agahnim 1']],
+            ["Aginah's Cave", True, ['Moon Pearl', 'Progressive Glove', 'Hammer']],
+            ["Aginah's Cave", True, ['Moon Pearl', 'Progressive Glove', 'Progressive Glove']],
+
+            ["Bombos Tablet", False, []],
+            ["Bombos Tablet", False, ['Progressive Sword'], ['Progressive Sword']],
+            ["Bombos Tablet", False, [], ['Book of Mudora']],
+            ["Bombos Tablet", False, [], ['Moon Pearl', 'Beat Agahnim 1']],
+            ["Bombos Tablet", True, ['Beat Agahnim 1', 'Book of Mudora', 'Progressive Sword', 'Progressive Sword']],
+            ["Bombos Tablet", True, ['Moon Pearl', 'Book of Mudora', 'Progressive Glove', 'Progressive Glove', 'Progressive Sword', 'Progressive Sword']],
+            ["Bombos Tablet", True, ['Moon Pearl', 'Book of Mudora', 'Progressive Glove', 'Hammer', 'Progressive Sword', 'Progressive Sword']],
+            ["Bombos Tablet", True, ['Moon Pearl', 'Book of Mudora', 'Beat Agahnim 1', 'Progressive Sword', 'Progressive Sword']],
+
+            ["Floodgate Chest", False, []],
+            ["Floodgate Chest", False, [], ['Moon Pearl']],
+            ["Floodgate Chest", True, ['Moon Pearl', 'Beat Agahnim 1']],
+            ["Floodgate Chest", True, ['Moon Pearl', 'Progressive Glove', 'Hammer']],
+            ["Floodgate Chest", True, ['Moon Pearl', 'Progressive Glove', 'Progressive Glove']],
+
+            ["Sunken Treasure", False, []],
+            ["Sunken Treasure", False, [], ['Moon Pearl']],
+            ["Sunken Treasure", True, ['Moon Pearl', 'Beat Agahnim 1']],
+            ["Sunken Treasure", True, ['Moon Pearl', 'Progressive Glove', 'Hammer']],
+            ["Sunken Treasure", True, ['Moon Pearl', 'Progressive Glove', 'Progressive Glove']],
+
+            ["Mini Moldorm Cave - Far Left", False, []],
+            ["Mini Moldorm Cave - Far Left", False, [], ['Moon Pearl']],
+            ["Mini Moldorm Cave - Far Left", True, ['Moon Pearl', 'Beat Agahnim 1']],
+            ["Mini Moldorm Cave - Far Left", True, ['Moon Pearl', 'Progressive Glove', 'Hammer']],
+            ["Mini Moldorm Cave - Far Left", True, ['Moon Pearl', 'Progressive Glove', 'Progressive Glove']],
+
+            ["Mini Moldorm Cave - Left", False, []],
+            ["Mini Moldorm Cave - Left", False, [], ['Moon Pearl']],
+            ["Mini Moldorm Cave - Left", True, ['Moon Pearl', 'Beat Agahnim 1']],
+            ["Mini Moldorm Cave - Left", True, ['Moon Pearl', 'Progressive Glove', 'Hammer']],
+            ["Mini Moldorm Cave - Left", True, ['Moon Pearl', 'Progressive Glove', 'Progressive Glove']],
+
+            ["Mini Moldorm Cave - Generous Guy", False, []],
+            ["Mini Moldorm Cave - Generous Guy", False, [], ['Moon Pearl']],
+            ["Mini Moldorm Cave - Generous Guy", True, ['Moon Pearl', 'Beat Agahnim 1']],
+            ["Mini Moldorm Cave - Generous Guy", True, ['Moon Pearl', 'Progressive Glove', 'Hammer']],
+            ["Mini Moldorm Cave - Generous Guy", True, ['Moon Pearl', 'Progressive Glove', 'Progressive Glove']],
+
+            ["Mini Moldorm Cave - Right", False, []],
+            ["Mini Moldorm Cave - Right", False, [], ['Moon Pearl']],
+            ["Mini Moldorm Cave - Right", True, ['Moon Pearl', 'Beat Agahnim 1']],
+            ["Mini Moldorm Cave - Right", True, ['Moon Pearl', 'Progressive Glove', 'Hammer']],
+            ["Mini Moldorm Cave - Right", True, ['Moon Pearl', 'Progressive Glove', 'Progressive Glove']],
+
+            ["Mini Moldorm Cave - Far Right", False, []],
+            ["Mini Moldorm Cave - Far Right", False, [], ['Moon Pearl']],
+            ["Mini Moldorm Cave - Far Right", True, ['Moon Pearl', 'Beat Agahnim 1']],
+            ["Mini Moldorm Cave - Far Right", True, ['Moon Pearl', 'Progressive Glove', 'Hammer']],
+            ["Mini Moldorm Cave - Far Right", True, ['Moon Pearl', 'Progressive Glove', 'Progressive Glove']],
+
+            ["Ice Rod Cave", False, []],
+            ["Ice Rod Cave", False, [], ['Moon Pearl']],
+            ["Ice Rod Cave", True, ['Moon Pearl', 'Beat Agahnim 1']],
+            ["Ice Rod Cave", True, ['Moon Pearl', 'Progressive Glove', 'Hammer']],
+            ["Ice Rod Cave", True, ['Moon Pearl', 'Progressive Glove', 'Progressive Glove']],
+        ])
+
+    def testZoraArea(self):
+        self.run_tests([
+            ["King Zora", False, []],
+            ["King Zora", False, [], ['Progressive Glove', 'Flippers']],
+            ["King Zora", False, [], ['Moon Pearl']],
+            ["King Zora", True, ['Flippers', 'Moon Pearl', 'Beat Agahnim 1']],
+            ["King Zora", True, ['Progressive Glove', 'Moon Pearl', 'Beat Agahnim 1']],
+            ["King Zora", True, ['Progressive Glove', 'Moon Pearl', 'Hammer']],
+            ["King Zora", True, ['Progressive Glove', 'Progressive Glove', 'Moon Pearl']],
+
+            ["Zora's Ledge", False, []],
+            ["Zora's Ledge", False, [], ['Flippers']],
+            ["Zora's Ledge", False, [], ['Moon Pearl']],
+            ["Zora's Ledge", True, ['Flippers', 'Moon Pearl', 'Beat Agahnim 1']],
+            ["Zora's Ledge", True, ['Flippers', 'Moon Pearl', 'Progressive Glove', 'Hammer']],
+            ["Zora's Ledge", True, ['Flippers', 'Moon Pearl', 'Progressive Glove', 'Progressive Glove']],
+
+            ["Waterfall Fairy - Left", False, []],
+            ["Waterfall Fairy - Left", False, [], ['Flippers']],
+            ["Waterfall Fairy - Left", False, [], ['Moon Pearl']],
+            ["Waterfall Fairy - Left", True, ['Flippers', 'Moon Pearl', 'Beat Agahnim 1']],
+            ["Waterfall Fairy - Left", True, ['Flippers', 'Moon Pearl', 'Progressive Glove', 'Hammer']],
+            ["Waterfall Fairy - Left", True, ['Flippers', 'Moon Pearl', 'Progressive Glove', 'Progressive Glove']],
+
+            ["Waterfall Fairy - Right", False, []],
+            ["Waterfall Fairy - Right", False, [], ['Flippers']],
+            ["Waterfall Fairy - Right", False, [], ['Moon Pearl']],
+            ["Waterfall Fairy - Right", True, ['Flippers', 'Moon Pearl', 'Beat Agahnim 1']],
+            ["Waterfall Fairy - Right", True, ['Flippers', 'Moon Pearl', 'Progressive Glove', 'Hammer']],
+            ["Waterfall Fairy - Right", True, ['Flippers', 'Moon Pearl', 'Progressive Glove', 'Progressive Glove']],
+
+        ])
+    
+    def testLightWorld(self):
+        self.run_tests([
+            ["Link's Uncle", False, []],
+            ["Link's Uncle", False, [], ['Moon Pearl']],
+            ["Link's Uncle", True, ['Moon Pearl', 'Beat Agahnim 1']],
+            ["Link's Uncle", True, ['Moon Pearl', 'Progressive Glove', 'Hammer']],
+            ["Link's Uncle", True, ['Moon Pearl', 'Progressive Glove', 'Progressive Glove']],
+
+            ["Secret Passage", False, []],
+            ["Secret Passage", False, [], ['Moon Pearl']],
+            ["Secret Passage", True, ['Moon Pearl', 'Beat Agahnim 1']],
+            ["Secret Passage", True, ['Moon Pearl', 'Progressive Glove', 'Hammer']],
+            ["Secret Passage", True, ['Moon Pearl', 'Progressive Glove', 'Progressive Glove']],
+
+            ["King's Tomb", False, []],
+            ["King's Tomb", False, [], ['Pegasus Boots']],
+            ["King's Tomb", False, ['Progressive Glove'], ['Progressive Glove']],
+            ["King's Tomb", False, [], ['Moon Pearl']],
+            ["King's Tomb", True, ['Pegasus Boots', 'Progressive Glove', 'Progressive Glove', 'Moon Pearl']],
+
+            ["Sahasrahla's Hut - Left", False, []],
+            ["Sahasrahla's Hut - Left", False, [], ['Moon Pearl']],
+            ["Sahasrahla's Hut - Left", True, ['Moon Pearl', 'Beat Agahnim 1']],
+            ["Sahasrahla's Hut - Left", True, ['Moon Pearl', 'Progressive Glove', 'Hammer']],
+            ["Sahasrahla's Hut - Left", True, ['Moon Pearl', 'Progressive Glove', 'Progressive Glove']],
+
+            ["Sahasrahla's Hut - Middle", False, []],
+            ["Sahasrahla's Hut - Middle", False, [], ['Moon Pearl']],
+            ["Sahasrahla's Hut - Middle", True, ['Moon Pearl', 'Beat Agahnim 1']],
+            ["Sahasrahla's Hut - Middle", True, ['Moon Pearl', 'Progressive Glove', 'Hammer']],
+            ["Sahasrahla's Hut - Middle", True, ['Moon Pearl', 'Progressive Glove', 'Progressive Glove']],
+
+            ["Sahasrahla's Hut - Right", False, []],
+            ["Sahasrahla's Hut - Right", False, [], ['Moon Pearl']],
+            ["Sahasrahla's Hut - Right", True, ['Moon Pearl', 'Beat Agahnim 1']],
+            ["Sahasrahla's Hut - Right", True, ['Moon Pearl', 'Progressive Glove', 'Hammer']],
+            ["Sahasrahla's Hut - Right", True, ['Moon Pearl', 'Progressive Glove', 'Progressive Glove']],
+
+            ["Sahasrahla", False, []],
+            ["Sahasrahla", False, [], ['Green Pendant']],
+            ["Sahasrahla", True, ['Green Pendant', 'Beat Agahnim 1']],
+            ["Sahasrahla", True, ['Green Pendant', 'Moon Pearl', 'Progressive Glove', 'Hammer']],
+            ["Sahasrahla", True, ['Green Pendant', 'Moon Pearl', 'Progressive Glove', 'Progressive Glove']],
+
+            ["Bonk Rock Cave", False, []],
+            ["Bonk Rock Cave", False, [], ['Pegasus Boots']],
+            ["Bonk Rock Cave", False, [], ['Moon Pearl']],
+            ["Bonk Rock Cave", True, ['Pegasus Boots', 'Moon Pearl', 'Beat Agahnim 1']],
+            ["Bonk Rock Cave", True, ['Pegasus Boots', 'Moon Pearl', 'Progressive Glove', 'Hammer']],
+            ["Bonk Rock Cave", True, ['Pegasus Boots', 'Moon Pearl', 'Progressive Glove', 'Progressive Glove']],
+
+            ["Hobo", False, []],
+            ["Hobo", False, [], ['Flippers']],
+            ["Hobo", False, [], ['Flippers', 'Moon Pearl']],
+            ["Hobo", True, ['Flippers', 'Moon Pearl', 'Beat Agahnim 1']],
+            ["Hobo", True, ['Flippers', 'Moon Pearl', 'Progressive Glove', 'Hammer']],
+            ["Hobo", True, ['Flippers', 'Moon Pearl', 'Progressive Glove', 'Progressive Glove']],
+
+            ["Cave 45", False, []],
+            ["Cave 45", False, [], ['Moon Pearl']],
+            ["Cave 45", True, ['Moon Pearl', 'Progressive Glove', 'Progressive Glove']],
+            ["Cave 45", True, ['Moon Pearl', 'Progressive Glove', 'Hammer']],
+            ["Cave 45", True, ['Moon Pearl', 'Beat Agahnim 1']],
+
+            ["Graveyard Cave", False, []],
+            ["Graveyard Cave", False, [], ['Moon Pearl']],
+            ["Graveyard Cave", True, ['Moon Pearl', 'Progressive Glove', 'Progressive Glove']],
+            ["Graveyard Cave", True, ['Moon Pearl', 'Progressive Glove', 'Hammer']],
+            ["Graveyard Cave", True, ['Moon Pearl', 'Beat Agahnim 1']],
+
+            ["Potion Shop", False, []],
+            ["Potion Shop", False, [], ['Mushroom']],
+            ["Potion Shop", False, [], ['Moon Pearl']],
+            ["Potion Shop", True, ['Mushroom', 'Moon Pearl', 'Beat Agahnim 1']],
+            ["Potion Shop", True, ['Mushroom', 'Moon Pearl', 'Progressive Glove', 'Hammer']],
+            ["Potion Shop", True, ['Mushroom', 'Moon Pearl', 'Progressive Glove', 'Progressive Glove']],
+
+            ["Lake Hylia Island", False, []],
+            ["Lake Hylia Island", False, [], ['Moon Pearl']],
+            ["Lake Hylia Island", False, [], ['Flippers']],
+            ["Lake Hylia Island", True, ['Flippers', 'Moon Pearl', 'Progressive Glove', 'Progressive Glove']],
+            ["Lake Hylia Island", True, ['Flippers', 'Moon Pearl', 'Progressive Glove', 'Hammer']],
+            ["Lake Hylia Island", True, ['Flippers', 'Moon Pearl', 'Beat Agahnim 1']],
+
+            ["Flute Spot", False, []],
+            ["Flute Spot", False, [], ['Shovel']],
+            ["Flute Spot", False, [], ['Moon Pearl']],
+            ["Flute Spot", True, ['Shovel', 'Moon Pearl', 'Beat Agahnim 1']],
+            ["Flute Spot", True, ['Shovel', 'Moon Pearl', 'Progressive Glove', 'Hammer']],
+            ["Flute Spot", True, ['Shovel', 'Moon Pearl', 'Progressive Glove', 'Progressive Glove']],
+
+            ["Ganon", False, []],
+            ["Ganon", False, [], ['Moon Pearl']],
+            ["Ganon", False, [], ['Beat Agahnim 2']],
+        ])

test/inverted/TestInvertedTurtleRock.py

@@ -0,0 +1,207 @@
+from test.inverted.TestInverted import TestInverted
+
+
+class TestInvertedTurtleRock(TestInverted):
+
+    def testTurtleRock(self):
+        self.run_tests([
+            ["Turtle Rock - Compass Chest", False, []],
+            ["Turtle Rock - Compass Chest", False, [], ['Cane of Somaria']],
+            ["Turtle Rock - Compass Chest", False, [], ['Quake', 'Magic Mirror']],
+            ["Turtle Rock - Compass Chest", False, ['Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)'], ['Quake', 'Small Key (Turtle Rock)']],
+            ["Turtle Rock - Compass Chest", True, ['Moon Pearl', 'Ocarina', 'Beat Agahnim 1', 'Quake', 'Progressive Sword', 'Cane of Somaria']],
+            ["Turtle Rock - Compass Chest", True, ['Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria']],
+            ["Turtle Rock - Compass Chest", True, ['Lamp', 'Magic Mirror', 'Progressive Glove', 'Progressive Glove', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
+            ["Turtle Rock - Compass Chest", True, ['Lamp', 'Magic Mirror', 'Progressive Glove', 'Moon Pearl', 'Hookshot', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
+            ["Turtle Rock - Compass Chest", True, ['Moon Pearl', 'Ocarina', 'Beat Agahnim 1', 'Magic Mirror', 'Hookshot', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
+            ["Turtle Rock - Compass Chest", True, ['Moon Pearl', 'Ocarina', 'Progressive Glove', 'Progressive Glove', 'Magic Mirror', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
+
+            ["Turtle Rock - Chain Chomps", False, []],
+            ["Turtle Rock - Chain Chomps", False, [], ['Magic Mirror', 'Cane of Somaria']],
+            #@todo: Item rando only needs 1 key
+            ["Turtle Rock - Chain Chomps", False, ['Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)'], ['Magic Mirror', 'Small Key (Turtle Rock)']],
+            ["Turtle Rock - Chain Chomps", True, ['Moon Pearl', 'Ocarina', 'Beat Agahnim 1', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
+            ["Turtle Rock - Chain Chomps", True, ['Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
+            ["Turtle Rock - Chain Chomps", True, ['Lamp', 'Magic Mirror', 'Progressive Glove', 'Progressive Glove']],
+            ["Turtle Rock - Chain Chomps", True, ['Lamp', 'Magic Mirror', 'Progressive Glove', 'Moon Pearl', 'Hookshot']],
+            ["Turtle Rock - Chain Chomps", True, ['Moon Pearl', 'Ocarina', 'Beat Agahnim 1', 'Magic Mirror', 'Hookshot']],
+            ["Turtle Rock - Chain Chomps", True, ['Moon Pearl', 'Ocarina', 'Progressive Glove', 'Progressive Glove', 'Magic Mirror']],
+
+            ["Turtle Rock - Roller Room - Left", False, []],
+            ["Turtle Rock - Roller Room - Left", False, [], ['Cane of Somaria']],
+            ["Turtle Rock - Roller Room - Left", False, [], ['Fire Rod']],
+            ["Turtle Rock - Roller Room - Left", False, [], ['Quake', 'Magic Mirror']],
+            ["Turtle Rock - Roller Room - Left", False, ['Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)'], ['Quake', 'Small Key (Turtle Rock)']],
+            ["Turtle Rock - Roller Room - Left", True, ['Fire Rod', 'Moon Pearl', 'Ocarina', 'Beat Agahnim 1', 'Quake', 'Progressive Sword', 'Cane of Somaria']],
+            ["Turtle Rock - Roller Room - Left", True, ['Fire Rod', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria']],
+            ["Turtle Rock - Roller Room - Left", True, ['Fire Rod', 'Lamp', 'Magic Mirror', 'Progressive Glove', 'Progressive Glove', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
+            ["Turtle Rock - Roller Room - Left", True, ['Fire Rod', 'Lamp', 'Magic Mirror', 'Progressive Glove', 'Moon Pearl', 'Hookshot', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
+            ["Turtle Rock - Roller Room - Left", True, ['Fire Rod', 'Moon Pearl', 'Ocarina', 'Beat Agahnim 1', 'Magic Mirror', 'Hookshot', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
+            ["Turtle Rock - Roller Room - Left", True, ['Fire Rod', 'Moon Pearl', 'Ocarina', 'Progressive Glove', 'Progressive Glove', 'Magic Mirror', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
+            
+            ["Turtle Rock - Roller Room - Right", False, []],
+            ["Turtle Rock - Roller Room - Right", False, [], ['Cane of Somaria']],
+            ["Turtle Rock - Roller Room - Right", False, [], ['Fire Rod']],
+            ["Turtle Rock - Roller Room - Right", False, [], ['Quake', 'Magic Mirror']],
+            ["Turtle Rock - Roller Room - Right", False, ['Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)'], ['Quake', 'Small Key (Turtle Rock)']],
+            ["Turtle Rock - Roller Room - Right", True, ['Fire Rod', 'Moon Pearl', 'Ocarina', 'Beat Agahnim 1', 'Quake', 'Progressive Sword', 'Cane of Somaria']],
+            ["Turtle Rock - Roller Room - Right", True, ['Fire Rod', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria']],
+            ["Turtle Rock - Roller Room - Right", True, ['Fire Rod', 'Lamp', 'Magic Mirror', 'Progressive Glove', 'Progressive Glove', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
+            ["Turtle Rock - Roller Room - Right", True, ['Fire Rod', 'Lamp', 'Magic Mirror', 'Progressive Glove', 'Moon Pearl', 'Hookshot', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
+            ["Turtle Rock - Roller Room - Right", True, ['Fire Rod', 'Moon Pearl', 'Ocarina', 'Beat Agahnim 1', 'Magic Mirror', 'Hookshot', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
+            ["Turtle Rock - Roller Room - Right", True, ['Fire Rod', 'Moon Pearl', 'Ocarina', 'Progressive Glove', 'Progressive Glove', 'Magic Mirror', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
+
+            ["Turtle Rock - Big Chest", False, []],
+            ["Turtle Rock - Big Chest", False, [], ['Big Key (Turtle Rock)']],
+            ["Turtle Rock - Big Chest", False, [], ['Magic Mirror', 'Cane of Somaria']],
+            ["Turtle Rock - Big Chest", False, ['Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)'], ['Magic Mirror', 'Small Key (Turtle Rock)']],
+            ["Turtle Rock - Big Chest", True, ['Big Key (Turtle Rock)', 'Moon Pearl', 'Ocarina', 'Beat Agahnim 1', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
+            ["Turtle Rock - Big Chest", True, ['Big Key (Turtle Rock)', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
+            ["Turtle Rock - Big Chest", True, ['Big Key (Turtle Rock)', 'Lamp', 'Magic Mirror', 'Progressive Glove', 'Progressive Glove', 'Cane of Somaria']],
+            ["Turtle Rock - Big Chest", True, ['Big Key (Turtle Rock)', 'Lamp', 'Magic Mirror', 'Progressive Glove', 'Progressive Glove', 'Hookshot']],
+            ["Turtle Rock - Big Chest", True, ['Big Key (Turtle Rock)', 'Lamp', 'Magic Mirror', 'Progressive Glove', 'Moon Pearl', 'Hookshot']],
+            ["Turtle Rock - Big Chest", True, ['Big Key (Turtle Rock)', 'Moon Pearl', 'Ocarina', 'Beat Agahnim 1', 'Magic Mirror', 'Hookshot']],
+            ["Turtle Rock - Big Chest", True, ['Big Key (Turtle Rock)', 'Moon Pearl', 'Ocarina', 'Progressive Glove', 'Progressive Glove', 'Magic Mirror', 'Cane of Somaria']],
+            ["Turtle Rock - Big Chest", True, ['Big Key (Turtle Rock)', 'Moon Pearl', 'Ocarina', 'Progressive Glove', 'Progressive Glove', 'Magic Mirror', 'Hookshot']],
+
+            ["Turtle Rock - Big Key Chest", False, []],
+            ["Turtle Rock - Big Key Chest", False, ['Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)'], ['Small Key (Turtle Rock)']],
+            ["Turtle Rock - Big Key Chest", True, ['Moon Pearl', 'Ocarina', 'Beat Agahnim 1', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
+            ["Turtle Rock - Big Key Chest", True, ['Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
+            ["Turtle Rock - Big Key Chest", True, ['Lamp', 'Magic Mirror', 'Progressive Glove', 'Progressive Glove', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
+            ["Turtle Rock - Big Key Chest", True, ['Lamp', 'Magic Mirror', 'Progressive Glove', 'Moon Pearl', 'Hookshot', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
+            ["Turtle Rock - Big Key Chest", True, ['Moon Pearl', 'Ocarina', 'Beat Agahnim 1', 'Magic Mirror', 'Hookshot', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
+            ["Turtle Rock - Big Key Chest", True, ['Moon Pearl', 'Ocarina', 'Progressive Glove', 'Progressive Glove', 'Magic Mirror', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
+
+            ["Turtle Rock - Crystaroller Room", False, []],
+            ["Turtle Rock - Crystaroller Room", False, [], ['Big Key (Turtle Rock)', 'Magic Mirror']],
+            ["Turtle Rock - Crystaroller Room", False, [], ['Big Key (Turtle Rock)', 'Cane of Somaria']],
+            ["Turtle Rock - Crystaroller Room", False, [], ['Big Key (Turtle Rock)', 'Lamp']],
+            ["Turtle Rock - Crystaroller Room", False, [], ['Magic Mirror', 'Cane of Somaria']],
+            ["Turtle Rock - Crystaroller Room", False, ['Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)'], ['Magic Mirror', 'Small Key (Turtle Rock)']],
+            ["Turtle Rock - Crystaroller Room", True, ['Big Key (Turtle Rock)', 'Moon Pearl', 'Ocarina', 'Beat Agahnim 1', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
+            ["Turtle Rock - Crystaroller Room", True, ['Big Key (Turtle Rock)', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
+            ["Turtle Rock - Crystaroller Room", True, ['Big Key (Turtle Rock)', 'Lamp', 'Magic Mirror', 'Progressive Glove', 'Progressive Glove']],
+            ["Turtle Rock - Crystaroller Room", True, ['Big Key (Turtle Rock)', 'Lamp', 'Magic Mirror', 'Progressive Glove', 'Moon Pearl', 'Hookshot']],
+            ["Turtle Rock - Crystaroller Room", True, ['Big Key (Turtle Rock)', 'Moon Pearl', 'Ocarina', 'Beat Agahnim 1', 'Magic Mirror', 'Hookshot']],
+            ["Turtle Rock - Crystaroller Room", True, ['Big Key (Turtle Rock)', 'Moon Pearl', 'Ocarina', 'Progressive Glove', 'Progressive Glove', 'Magic Mirror']],
+            ["Turtle Rock - Crystaroller Room", True, ['Lamp', 'Magic Mirror', 'Progressive Glove', 'Progressive Glove', 'Cane of Somaria']],
+            ["Turtle Rock - Crystaroller Room", True, ['Lamp', 'Magic Mirror', 'Progressive Glove', 'Moon Pearl', 'Hookshot', 'Cane of Somaria']],
+            ["Turtle Rock - Crystaroller Room", True, ['Lamp', 'Moon Pearl', 'Ocarina', 'Beat Agahnim 1', 'Magic Mirror', 'Hookshot', 'Cane of Somaria']],
+            ["Turtle Rock - Crystaroller Room", True, ['Lamp', 'Moon Pearl', 'Ocarina', 'Progressive Glove', 'Progressive Glove', 'Magic Mirror', 'Cane of Somaria']],
+
+            #@todo: Advanced?
+            ["Turtle Rock - Eye Bridge - Bottom Left", False, []],
+            ["Turtle Rock - Eye Bridge - Bottom Left", False, ['Progressive Shield', 'Progressive Shield'], ['Progressive Shield', 'Cape', 'Cane of Byrna']],
+            ["Turtle Rock - Eye Bridge - Bottom Left", False, [], ['Big Key (Turtle Rock)', 'Magic Mirror']],
+            ["Turtle Rock - Eye Bridge - Bottom Left", False, [], ['Magic Mirror', 'Cane of Somaria']],
+            ["Turtle Rock - Eye Bridge - Bottom Left", False, [], ['Magic Mirror', 'Lamp']],
+            ["Turtle Rock - Eye Bridge - Bottom Left", False, ['Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)'], ['Magic Mirror', 'Small Key (Turtle Rock)']],
+            ["Turtle Rock - Eye Bridge - Bottom Left", True, ['Big Key (Turtle Rock)', 'Moon Pearl', 'Ocarina', 'Beat Agahnim 1', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Lamp', 'Cane of Byrna']],
+            ["Turtle Rock - Eye Bridge - Bottom Left", True, ['Big Key (Turtle Rock)', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Cane of Byrna']],
+            ["Turtle Rock - Eye Bridge - Bottom Left", True, ['Big Key (Turtle Rock)', 'Moon Pearl', 'Ocarina', 'Beat Agahnim 1', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Lamp', 'Cape']],
+            ["Turtle Rock - Eye Bridge - Bottom Left", True, ['Big Key (Turtle Rock)', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Cape']],
+            ["Turtle Rock - Eye Bridge - Bottom Left", True, ['Big Key (Turtle Rock)', 'Moon Pearl', 'Ocarina', 'Beat Agahnim 1', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Lamp', 'Progressive Shield', 'Progressive Shield', 'Progressive Shield']],
+            ["Turtle Rock - Eye Bridge - Bottom Left", True, ['Big Key (Turtle Rock)', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Progressive Shield', 'Progressive Shield', 'Progressive Shield']],
+            ["Turtle Rock - Eye Bridge - Bottom Left", True, ['Lamp', 'Magic Mirror', 'Progressive Glove', 'Progressive Glove', 'Cane of Somaria', 'Cane of Byrna']],
+            ["Turtle Rock - Eye Bridge - Bottom Left", True, ['Lamp', 'Magic Mirror', 'Progressive Glove', 'Moon Pearl', 'Hookshot', 'Cane of Somaria', 'Cane of Byrna']],
+            ["Turtle Rock - Eye Bridge - Bottom Left", True, ['Moon Pearl', 'Ocarina', 'Beat Agahnim 1', 'Magic Mirror', 'Hookshot', 'Cane of Somaria', 'Cane of Byrna']],
+            ["Turtle Rock - Eye Bridge - Bottom Left", True, ['Moon Pearl', 'Ocarina', 'Progressive Glove', 'Progressive Glove', 'Magic Mirror', 'Cane of Somaria', 'Cane of Byrna']],
+            ["Turtle Rock - Eye Bridge - Bottom Left", True, ['Lamp', 'Magic Mirror', 'Progressive Glove', 'Progressive Glove', 'Cane of Somaria', 'Cape']],
+            ["Turtle Rock - Eye Bridge - Bottom Left", True, ['Lamp', 'Magic Mirror', 'Progressive Glove', 'Moon Pearl', 'Hookshot', 'Cane of Somaria', 'Cape']],
+            ["Turtle Rock - Eye Bridge - Bottom Left", True, ['Moon Pearl', 'Ocarina', 'Beat Agahnim 1', 'Magic Mirror', 'Hookshot', 'Cane of Somaria', 'Cape']],
+            ["Turtle Rock - Eye Bridge - Bottom Left", True, ['Moon Pearl', 'Ocarina', 'Progressive Glove', 'Progressive Glove', 'Magic Mirror', 'Cane of Somaria', 'Cape']],
+            ["Turtle Rock - Eye Bridge - Bottom Left", True, ['Lamp', 'Magic Mirror', 'Progressive Glove', 'Progressive Glove', 'Cane of Somaria', 'Progressive Shield', 'Progressive Shield', 'Progressive Shield']],
+            ["Turtle Rock - Eye Bridge - Bottom Left", True, ['Lamp', 'Magic Mirror', 'Progressive Glove', 'Moon Pearl', 'Hookshot', 'Cane of Somaria', 'Progressive Shield', 'Progressive Shield', 'Progressive Shield']],
+            ["Turtle Rock - Eye Bridge - Bottom Left", True, ['Moon Pearl', 'Ocarina', 'Beat Agahnim 1', 'Magic Mirror', 'Hookshot', 'Cane of Somaria', 'Progressive Shield', 'Progressive Shield', 'Progressive Shield']],
+            ["Turtle Rock - Eye Bridge - Bottom Left", True, ['Moon Pearl', 'Ocarina', 'Progressive Glove', 'Progressive Glove', 'Magic Mirror', 'Cane of Somaria', 'Progressive Shield', 'Progressive Shield', 'Progressive Shield']],
+            
+            ["Turtle Rock - Eye Bridge - Bottom Right", False, []],
+            ["Turtle Rock - Eye Bridge - Bottom Right", False, ['Progressive Shield', 'Progressive Shield'], ['Progressive Shield', 'Cape', 'Cane of Byrna']],
+            ["Turtle Rock - Eye Bridge - Bottom Right", False, [], ['Big Key (Turtle Rock)', 'Magic Mirror']],
+            ["Turtle Rock - Eye Bridge - Bottom Right", False, [], ['Magic Mirror', 'Cane of Somaria']],
+            ["Turtle Rock - Eye Bridge - Bottom Right", False, [], ['Magic Mirror', 'Lamp']],
+            ["Turtle Rock - Eye Bridge - Bottom Right", False, ['Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)'], ['Magic Mirror', 'Small Key (Turtle Rock)']],
+            ["Turtle Rock - Eye Bridge - Bottom Right", True, ['Big Key (Turtle Rock)', 'Moon Pearl', 'Ocarina', 'Beat Agahnim 1', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Lamp', 'Cane of Byrna']],
+            ["Turtle Rock - Eye Bridge - Bottom Right", True, ['Big Key (Turtle Rock)', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Cane of Byrna']],
+            ["Turtle Rock - Eye Bridge - Bottom Right", True, ['Big Key (Turtle Rock)', 'Moon Pearl', 'Ocarina', 'Beat Agahnim 1', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Lamp', 'Cape']],
+            ["Turtle Rock - Eye Bridge - Bottom Right", True, ['Big Key (Turtle Rock)', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Cape']],
+            ["Turtle Rock - Eye Bridge - Bottom Right", True, ['Big Key (Turtle Rock)', 'Moon Pearl', 'Ocarina', 'Beat Agahnim 1', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Lamp', 'Progressive Shield', 'Progressive Shield', 'Progressive Shield']],
+            ["Turtle Rock - Eye Bridge - Bottom Right", True, ['Big Key (Turtle Rock)', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Progressive Shield', 'Progressive Shield', 'Progressive Shield']],
+            ["Turtle Rock - Eye Bridge - Bottom Right", True, ['Lamp', 'Magic Mirror', 'Progressive Glove', 'Progressive Glove', 'Cane of Somaria', 'Cane of Byrna']],
+            ["Turtle Rock - Eye Bridge - Bottom Right", True, ['Lamp', 'Magic Mirror', 'Progressive Glove', 'Moon Pearl', 'Hookshot', 'Cane of Somaria', 'Cane of Byrna']],
+            ["Turtle Rock - Eye Bridge - Bottom Right", True, ['Moon Pearl', 'Ocarina', 'Beat Agahnim 1', 'Magic Mirror', 'Hookshot', 'Cane of Somaria', 'Cane of Byrna']],
+            ["Turtle Rock - Eye Bridge - Bottom Right", True, ['Moon Pearl', 'Ocarina', 'Progressive Glove', 'Progressive Glove', 'Magic Mirror', 'Cane of Somaria', 'Cane of Byrna']],
+            ["Turtle Rock - Eye Bridge - Bottom Right", True, ['Lamp', 'Magic Mirror', 'Progressive Glove', 'Progressive Glove', 'Cane of Somaria', 'Cape']],
+            ["Turtle Rock - Eye Bridge - Bottom Right", True, ['Lamp', 'Magic Mirror', 'Progressive Glove', 'Moon Pearl', 'Hookshot', 'Cane of Somaria', 'Cape']],
+            ["Turtle Rock - Eye Bridge - Bottom Right", True, ['Moon Pearl', 'Ocarina', 'Beat Agahnim 1', 'Magic Mirror', 'Hookshot', 'Cane of Somaria', 'Cape']],
+            ["Turtle Rock - Eye Bridge - Bottom Right", True, ['Moon Pearl', 'Ocarina', 'Progressive Glove', 'Progressive Glove', 'Magic Mirror', 'Cane of Somaria', 'Cape']],
+            ["Turtle Rock - Eye Bridge - Bottom Right", True, ['Lamp', 'Magic Mirror', 'Progressive Glove', 'Progressive Glove', 'Cane of Somaria', 'Progressive Shield', 'Progressive Shield', 'Progressive Shield']],
+            ["Turtle Rock - Eye Bridge - Bottom Right", True, ['Lamp', 'Magic Mirror', 'Progressive Glove', 'Moon Pearl', 'Hookshot', 'Cane of Somaria', 'Progressive Shield', 'Progressive Shield', 'Progressive Shield']],
+            ["Turtle Rock - Eye Bridge - Bottom Right", True, ['Moon Pearl', 'Ocarina', 'Beat Agahnim 1', 'Magic Mirror', 'Hookshot', 'Cane of Somaria', 'Progressive Shield', 'Progressive Shield', 'Progressive Shield']],
+            ["Turtle Rock - Eye Bridge - Bottom Right", True, ['Moon Pearl', 'Ocarina', 'Progressive Glove', 'Progressive Glove', 'Magic Mirror', 'Cane of Somaria', 'Progressive Shield', 'Progressive Shield', 'Progressive Shield']],
+            
+            ["Turtle Rock - Eye Bridge - Top Left", False, []],
+            ["Turtle Rock - Eye Bridge - Top Left", False, ['Progressive Shield', 'Progressive Shield'], ['Progressive Shield', 'Cape', 'Cane of Byrna']],
+            ["Turtle Rock - Eye Bridge - Top Left", False, [], ['Big Key (Turtle Rock)', 'Magic Mirror']],
+            ["Turtle Rock - Eye Bridge - Top Left", False, [], ['Magic Mirror', 'Cane of Somaria']],
+            ["Turtle Rock - Eye Bridge - Top Left", False, [], ['Magic Mirror', 'Lamp']],
+            ["Turtle Rock - Eye Bridge - Top Left", False, ['Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)'], ['Magic Mirror', 'Small Key (Turtle Rock)']],
+            ["Turtle Rock - Eye Bridge - Top Left", True, ['Big Key (Turtle Rock)', 'Moon Pearl', 'Ocarina', 'Beat Agahnim 1', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Lamp', 'Cane of Byrna']],
+            ["Turtle Rock - Eye Bridge - Top Left", True, ['Big Key (Turtle Rock)', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Cane of Byrna']],
+            ["Turtle Rock - Eye Bridge - Top Left", True, ['Big Key (Turtle Rock)', 'Moon Pearl', 'Ocarina', 'Beat Agahnim 1', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Lamp', 'Cape']],
+            ["Turtle Rock - Eye Bridge - Top Left", True, ['Big Key (Turtle Rock)', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Cape']],
+            ["Turtle Rock - Eye Bridge - Top Left", True, ['Big Key (Turtle Rock)', 'Moon Pearl', 'Ocarina', 'Beat Agahnim 1', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Lamp', 'Progressive Shield', 'Progressive Shield', 'Progressive Shield']],
+            ["Turtle Rock - Eye Bridge - Top Left", True, ['Big Key (Turtle Rock)', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Progressive Shield', 'Progressive Shield', 'Progressive Shield']],
+            ["Turtle Rock - Eye Bridge - Top Left", True, ['Lamp', 'Magic Mirror', 'Progressive Glove', 'Progressive Glove', 'Cane of Somaria', 'Cane of Byrna']],
+            ["Turtle Rock - Eye Bridge - Top Left", True, ['Lamp', 'Magic Mirror', 'Progressive Glove', 'Moon Pearl', 'Hookshot', 'Cane of Somaria', 'Cane of Byrna']],
+            ["Turtle Rock - Eye Bridge - Top Left", True, ['Moon Pearl', 'Ocarina', 'Beat Agahnim 1', 'Magic Mirror', 'Hookshot', 'Cane of Somaria', 'Cane of Byrna']],
+            ["Turtle Rock - Eye Bridge - Top Left", True, ['Moon Pearl', 'Ocarina', 'Progressive Glove', 'Progressive Glove', 'Magic Mirror', 'Cane of Somaria', 'Cane of Byrna']],
+            ["Turtle Rock - Eye Bridge - Top Left", True, ['Lamp', 'Magic Mirror', 'Progressive Glove', 'Progressive Glove', 'Cane of Somaria', 'Cape']],
+            ["Turtle Rock - Eye Bridge - Top Left", True, ['Lamp', 'Magic Mirror', 'Progressive Glove', 'Moon Pearl', 'Hookshot', 'Cane of Somaria', 'Cape']],
+            ["Turtle Rock - Eye Bridge - Top Left", True, ['Moon Pearl', 'Ocarina', 'Beat Agahnim 1', 'Magic Mirror', 'Hookshot', 'Cane of Somaria', 'Cape']],
+            ["Turtle Rock - Eye Bridge - Top Left", True, ['Moon Pearl', 'Ocarina', 'Progressive Glove', 'Progressive Glove', 'Magic Mirror', 'Cane of Somaria', 'Cape']],
+            ["Turtle Rock - Eye Bridge - Top Left", True, ['Lamp', 'Magic Mirror', 'Progressive Glove', 'Progressive Glove', 'Cane of Somaria', 'Progressive Shield', 'Progressive Shield', 'Progressive Shield']],
+            ["Turtle Rock - Eye Bridge - Top Left", True, ['Lamp', 'Magic Mirror', 'Progressive Glove', 'Moon Pearl', 'Hookshot', 'Cane of Somaria', 'Progressive Shield', 'Progressive Shield', 'Progressive Shield']],
+            ["Turtle Rock - Eye Bridge - Top Left", True, ['Moon Pearl', 'Ocarina', 'Beat Agahnim 1', 'Magic Mirror', 'Hookshot', 'Cane of Somaria', 'Progressive Shield', 'Progressive Shield', 'Progressive Shield']],
+            ["Turtle Rock - Eye Bridge - Top Left", True, ['Moon Pearl', 'Ocarina', 'Progressive Glove', 'Progressive Glove', 'Magic Mirror', 'Cane of Somaria', 'Progressive Shield', 'Progressive Shield', 'Progressive Shield']],
+            
+            ["Turtle Rock - Eye Bridge - Top Right", False, []],
+            ["Turtle Rock - Eye Bridge - Top Right", False, ['Progressive Shield', 'Progressive Shield'], ['Progressive Shield', 'Cape', 'Cane of Byrna']],
+            ["Turtle Rock - Eye Bridge - Top Right", False, [], ['Big Key (Turtle Rock)', 'Magic Mirror']],
+            ["Turtle Rock - Eye Bridge - Top Right", False, [], ['Magic Mirror', 'Cane of Somaria']],
+            ["Turtle Rock - Eye Bridge - Top Right", False, [], ['Magic Mirror', 'Lamp']],
+            ["Turtle Rock - Eye Bridge - Top Right", False, ['Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)'], ['Magic Mirror', 'Small Key (Turtle Rock)']],
+            ["Turtle Rock - Eye Bridge - Top Right", True, ['Big Key (Turtle Rock)', 'Moon Pearl', 'Ocarina', 'Beat Agahnim 1', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Lamp', 'Cane of Byrna']],
+            ["Turtle Rock - Eye Bridge - Top Right", True, ['Big Key (Turtle Rock)', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Cane of Byrna']],
+            ["Turtle Rock - Eye Bridge - Top Right", True, ['Big Key (Turtle Rock)', 'Moon Pearl', 'Ocarina', 'Beat Agahnim 1', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Lamp', 'Cape']],
+            ["Turtle Rock - Eye Bridge - Top Right", True, ['Big Key (Turtle Rock)', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Cape']],
+            ["Turtle Rock - Eye Bridge - Top Right", True, ['Big Key (Turtle Rock)', 'Moon Pearl', 'Ocarina', 'Beat Agahnim 1', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Lamp', 'Progressive Shield', 'Progressive Shield', 'Progressive Shield']],
+            ["Turtle Rock - Eye Bridge - Top Right", True, ['Big Key (Turtle Rock)', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Progressive Shield', 'Progressive Shield', 'Progressive Shield']],
+            ["Turtle Rock - Eye Bridge - Top Right", True, ['Lamp', 'Magic Mirror', 'Progressive Glove', 'Progressive Glove', 'Cane of Somaria', 'Cane of Byrna']],
+            ["Turtle Rock - Eye Bridge - Top Right", True, ['Lamp', 'Magic Mirror', 'Progressive Glove', 'Moon Pearl', 'Hookshot', 'Cane of Somaria', 'Cane of Byrna']],
+            ["Turtle Rock - Eye Bridge - Top Right", True, ['Moon Pearl', 'Ocarina', 'Beat Agahnim 1', 'Magic Mirror', 'Hookshot', 'Cane of Somaria', 'Cane of Byrna']],
+            ["Turtle Rock - Eye Bridge - Top Right", True, ['Moon Pearl', 'Ocarina', 'Progressive Glove', 'Progressive Glove', 'Magic Mirror', 'Cane of Somaria', 'Cane of Byrna']],
+            ["Turtle Rock - Eye Bridge - Top Right", True, ['Lamp', 'Magic Mirror', 'Progressive Glove', 'Progressive Glove', 'Cane of Somaria', 'Cape']],
+            ["Turtle Rock - Eye Bridge - Top Right", True, ['Lamp', 'Magic Mirror', 'Progressive Glove', 'Moon Pearl', 'Hookshot', 'Cane of Somaria', 'Cape']],
+            ["Turtle Rock - Eye Bridge - Top Right", True, ['Moon Pearl', 'Ocarina', 'Beat Agahnim 1', 'Magic Mirror', 'Hookshot', 'Cane of Somaria', 'Cape']],
+            ["Turtle Rock - Eye Bridge - Top Right", True, ['Moon Pearl', 'Ocarina', 'Progressive Glove', 'Progressive Glove', 'Magic Mirror', 'Cane of Somaria', 'Cape']],
+            ["Turtle Rock - Eye Bridge - Top Right", True, ['Lamp', 'Magic Mirror', 'Progressive Glove', 'Progressive Glove', 'Cane of Somaria', 'Progressive Shield', 'Progressive Shield', 'Progressive Shield']],
+            ["Turtle Rock - Eye Bridge - Top Right", True, ['Lamp', 'Magic Mirror', 'Progressive Glove', 'Moon Pearl', 'Hookshot', 'Cane of Somaria', 'Progressive Shield', 'Progressive Shield', 'Progressive Shield']],
+            ["Turtle Rock - Eye Bridge - Top Right", True, ['Moon Pearl', 'Ocarina', 'Beat Agahnim 1', 'Magic Mirror', 'Hookshot', 'Cane of Somaria', 'Progressive Shield', 'Progressive Shield', 'Progressive Shield']],
+            ["Turtle Rock - Eye Bridge - Top Right", True, ['Moon Pearl', 'Ocarina', 'Progressive Glove', 'Progressive Glove', 'Magic Mirror', 'Cane of Somaria', 'Progressive Shield', 'Progressive Shield', 'Progressive Shield']],
+
+            ["Turtle Rock - Boss", False, []],
+            ["Turtle Rock - Boss", False, [], ['Cane of Somaria']],
+            ["Turtle Rock - Boss", False, [], ['Ice Rod']],
+            ["Turtle Rock - Boss", False, [], ['Fire Rod']],
+            ["Turtle Rock - Boss", False, [], ['Progressive Sword', 'Hammer']],
+            ["Turtle Rock - Boss", False, [], ['Big Key (Turtle Rock)']],
+            ["Turtle Rock - Boss", False, [], ['Magic Mirror', 'Lamp']],
+            ["Turtle Rock - Boss", False, ['Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)'], ['Small Key (Turtle Rock)']],
+            ["Turtle Rock - Boss", True, ['Ice Rod', 'Fire Rod', 'Lamp', 'Moon Pearl', 'Ocarina', 'Beat Agahnim 1', 'Quake', 'Progressive Sword', 'Progressive Sword', 'Cane of Somaria', 'Bottle', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Big Key (Turtle Rock)']],
+            ["Turtle Rock - Boss", True, ['Ice Rod', 'Fire Rod', 'Lamp', 'Moon Pearl', 'Beat Agahnim 1', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Progressive Sword', 'Cane of Somaria', 'Bottle', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Big Key (Turtle Rock)']],
+            ["Turtle Rock - Boss", True, ['Ice Rod', 'Fire Rod', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Progressive Sword', 'Cane of Somaria', 'Magic Upgrade (1/2)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)','Small Key (Turtle Rock)', 'Big Key (Turtle Rock)']],
+            ["Turtle Rock - Boss", True, ['Ice Rod', 'Fire Rod', 'Lamp', 'Magic Mirror', 'Progressive Glove', 'Progressive Glove', 'Hammer', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Big Key (Turtle Rock)']],
+            ["Turtle Rock - Boss", True, ['Ice Rod', 'Fire Rod', 'Ocarina', 'Beat Agahnim 1', 'Magic Mirror', 'Moon Pearl', 'Hookshot', 'Hammer', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Big Key (Turtle Rock)']]
+        ])