Update my dev branch for v31

Update my dev branch for v31

.gitignore

@@ -8,3 +8,8 @@ build
 bundle/components.wxs
 dist
 README.html
+.vs/
+*multidata
+*multisave
+EnemizerCLI/
+.mypy_cache/

AdjusterMain.py

@@ -21,7 +21,7 @@ def adjust(args):
 
     outfilebase = os.path.basename(args.rom)[:-4] + '_adjusted'
 
-    if os.stat(args.rom).st_size == 2097152 and os.path.splitext(args.rom)[-1].lower() == '.sfc':
+    if os.stat(args.rom).st_size in (0x200000, 0x400000) and os.path.splitext(args.rom)[-1].lower() == '.sfc':
         rom = LocalRom(args.rom, False)
     else:
         raise RuntimeError('Provided Rom is not a valid Link to the Past Randomizer Rom. Please provide one for adjusting.')

Bosses.py

@@ -4,101 +4,101 @@ import random
 from BaseClasses import Boss
 from Fill import FillError
 
-def BossFactory(boss):
+def BossFactory(boss, player):
     if boss is None:
         return None
     if boss in boss_table:
         enemizer_name, defeat_rule = boss_table[boss]
-        return Boss(boss, enemizer_name, defeat_rule)
+        return Boss(boss, enemizer_name, defeat_rule, player)
 
     logging.getLogger('').error('Unknown Boss: %s', boss)
     return None
 
-def ArmosKnightsDefeatRule(state):
+def ArmosKnightsDefeatRule(state, player):
     # Magic amounts are probably a bit overkill
     return (
-        state.has_blunt_weapon() or
-        (state.has('Cane of Somaria') and state.can_extend_magic(10)) or
-        (state.has('Cane of Byrna') and state.can_extend_magic(16)) or
-        (state.has('Ice Rod') and state.can_extend_magic(32)) or
-        (state.has('Fire Rod') and state.can_extend_magic(32)) or
-        state.has('Blue Boomerang') or
-        state.has('Red Boomerang'))
+        state.has_blunt_weapon(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
+        (state.has('Fire Rod', player) and state.can_extend_magic(player, 32)) or
+        state.has('Blue Boomerang', player) or
+        state.has('Red Boomerang', player))
 
-def LanmolasDefeatRule(state):
+def LanmolasDefeatRule(state, player):
     # TODO: Allow the canes here?
     return (
-        state.has_blunt_weapon() or
-        state.has('Fire Rod') or
-        state.has('Ice Rod') or
-        state.can_shoot_arrows())
+        state.has_blunt_weapon(player) or
+        state.has('Fire Rod', player) or
+        state.has('Ice Rod', player) or
+        state.can_shoot_arrows(player))
 
-def MoldormDefeatRule(state):
-    return state.has_blunt_weapon()
+def MoldormDefeatRule(state, player):
+    return state.has_blunt_weapon(player)
 
-def HelmasaurKingDefeatRule(state):
-    return state.has_blunt_weapon() or state.can_shoot_arrows()
+def HelmasaurKingDefeatRule(state, player):
+    return state.has_blunt_weapon(player) or state.can_shoot_arrows(player)
 
-def ArrghusDefeatRule(state):
-    if not state.has('Hookshot'):
+def ArrghusDefeatRule(state, player):
+    if not state.has('Hookshot', player):
         return False
     # TODO: ideally we would have a check for bow and silvers, which combined with the
     # hookshot is enough. This is not coded yet because the silvers that only work in pyramid feature
     # makes this complicated
-    if state.has_blunt_weapon():
+    if state.has_blunt_weapon(player):
         return True
 
-    return ((state.has('Fire Rod') and (state.can_shoot_arrows() or state.can_extend_magic(12))) or #assuming mostly gitting two puff with one shot
-            (state.has('Ice Rod') and (state.can_shoot_arrows() or state.can_extend_magic(16))))
+    return ((state.has('Fire Rod', player) and (state.can_shoot_arrows(player) or state.can_extend_magic(player, 12))) or #assuming mostly gitting two puff with one shot
+            (state.has('Ice Rod', player) and (state.can_shoot_arrows(player) or state.can_extend_magic(player, 16))))
 
 
-def MothulaDefeatRule(state):
+def MothulaDefeatRule(state, player):
     return (
-        state.has_blunt_weapon() or
-        (state.has('Fire Rod') and state.can_extend_magic(10)) or
+        state.has_blunt_weapon(player) or
+        (state.has('Fire Rod', player) and state.can_extend_magic(player, 10)) or
         # TODO: Not sure how much (if any) extend magic is needed for these two, since they only apply
         # to non-vanilla locations, so are harder to test, so sticking with what VT has for now:
-        (state.has('Cane of Somaria') and state.can_extend_magic(16)) or
-        (state.has('Cane of Byrna') and state.can_extend_magic(16)) or
-        state.can_get_good_bee()
+        (state.has('Cane of Somaria', player) and state.can_extend_magic(player, 16)) or
+        (state.has('Cane of Byrna', player) and state.can_extend_magic(player, 16)) or
+        state.can_get_good_bee(player)
     )
 
-def BlindDefeatRule(state):
-    return state.has_blunt_weapon() or state.has('Cane of Somaria') or state.has('Cane of Byrna')
+def BlindDefeatRule(state, player):
+    return state.has_blunt_weapon(player) or state.has('Cane of Somaria', player) or state.has('Cane of Byrna', player)
 
-def KholdstareDefeatRule(state):
+def KholdstareDefeatRule(state, player):
     return (
         (
-            state.has('Fire Rod') or
+            state.has('Fire Rod', player) or
             (
-                state.has('Bombos') and
-                # FIXME: the following only actually works for the vanilla location for swordless mode
-                (state.has_sword() or state.world.mode == 'swordless')
+                state.has('Bombos', player) and
+                # FIXME: the following only actually works for the vanilla location for swordless
+                (state.has_sword(player) or state.world.swords == 'swordless')
             )
         ) and
         (
-            state.has_blunt_weapon() or
-            (state.has('Fire Rod') and state.can_extend_magic(20)) or
-            # FIXME: this actually only works for the vanilla location for swordless mode
+            state.has_blunt_weapon(player) or
+            (state.has('Fire Rod', player) and state.can_extend_magic(player, 20)) or
+            # FIXME: this actually only works for the vanilla location for swordless
             (
-                state.has('Fire Rod') and
-                state.has('Bombos') and
-                state.world.mode == 'swordless' and
-                state.can_extend_magic(16)
+                state.has('Fire Rod', player) and
+                state.has('Bombos', player) and
+                state.world.swords == 'swordless' and
+                state.can_extend_magic(player, 16)
             )
         )
     )
 
-def VitreousDefeatRule(state):
-    return state.can_shoot_arrows() or state.has_blunt_weapon()
+def VitreousDefeatRule(state, player):
+    return state.can_shoot_arrows(player) or state.has_blunt_weapon(player)
 
-def TrinexxDefeatRule(state):
-    if not (state.has('Fire Rod') and state.has('Ice Rod')):
+def TrinexxDefeatRule(state, player):
+    if not (state.has('Fire Rod', player) and state.has('Ice Rod', player)):
         return False
-    return state.has('Hammer') or state.has_beam_sword() or (state.has_sword() and state.can_extend_magic(32))
+    return state.has('Hammer', player) or state.has_beam_sword(player) or (state.has_sword(player) and state.can_extend_magic(player, 32))
 
-def AgahnimDefeatRule(state):
-    return state.has_sword() or state.has('Hammer') or state.has('Bug Catching Net')
+def AgahnimDefeatRule(state, player):
+    return state.has_sword(player) or state.has('Hammer', player) or state.has('Bug Catching Net', player)
 
 boss_table = {
     'Armos Knights': ('Armos', ArmosKnightsDefeatRule),
@@ -116,14 +116,14 @@ boss_table = {
 }
 
 def can_place_boss(world, boss, dungeon_name, level=None):
-    if world.mode in ['swordless'] and boss == 'Kholdstare' and dungeon_name != 'Ice Palace':
+    if world.swords in ['swordless'] and boss == 'Kholdstare' and dungeon_name != 'Ice Palace':
         return False
 
-    if dungeon_name == 'Ganons Tower' and level == 'top':
+    if dungeon_name in ['Ganons Tower', 'Inverted Ganons Tower'] and level == 'top':
         if boss in ["Armos Knights", "Arrghus",	"Blind", "Trinexx", "Lanmolas"]:
             return False
 
-    if dungeon_name == 'Ganons Tower' and level == 'middle':
+    if dungeon_name in ['Ganons Tower', 'Inverted Ganons Tower'] and level == 'middle':
         if boss in ["Blind"]:
             return False
 
@@ -137,32 +137,50 @@ def can_place_boss(world, boss, dungeon_name, level=None):
         return False
     return True
 
-def place_bosses(world):
+def place_bosses(world, player):
     if world.boss_shuffle == 'none':
         return
     # Most to least restrictive order
-    boss_locations = [
-        ['Ganons Tower', 'top'],
-        ['Tower of Hera', None],
-        ['Skull Woods', None],
-        ['Ganons Tower', 'middle'],
-        ['Eastern Palace', None],
-        ['Desert Palace', None],
-        ['Palace of Darkness', None],
-        ['Swamp Palace', None],
-        ['Thieves Town', None],
-        ['Ice Palace', None],
-        ['Misery Mire', None],
-        ['Turtle Rock', None],
-        ['Ganons Tower', 'bottom'],
-    ]
+    if world.mode != 'inverted':
+        boss_locations = [
+            ['Ganons Tower', 'top'],
+            ['Tower of Hera', None],
+            ['Skull Woods', None],
+            ['Ganons Tower', 'middle'],
+            ['Eastern Palace', None],
+            ['Desert Palace', None],
+            ['Palace of Darkness', None],
+            ['Swamp Palace', None],
+            ['Thieves Town', None],
+            ['Ice Palace', None],
+            ['Misery Mire', None],
+            ['Turtle Rock', None],
+            ['Ganons Tower', 'bottom'],
+        ]
+    else:
+        boss_locations = [
+            ['Inverted Ganons Tower', 'top'],
+            ['Tower of Hera', None],
+            ['Skull Woods', None],
+            ['Inverted Ganons Tower', 'middle'],
+            ['Eastern Palace', None],
+            ['Desert Palace', None],
+            ['Palace of Darkness', None],
+            ['Swamp Palace', None],
+            ['Thieves Town', None],
+            ['Ice Palace', None],
+            ['Misery Mire', None],
+            ['Turtle Rock', None],
+            ['Inverted Ganons Tower', 'bottom'],
+        ]
+
     all_bosses = sorted(boss_table.keys()) #s orted to be deterministic on older pythons
     placeable_bosses = [boss for boss in all_bosses if boss not in ['Agahnim', 'Agahnim2', 'Ganon']]
 
     if world.boss_shuffle in ["basic", "normal"]:
         # temporary hack for swordless kholdstare:
-        if world.mode == 'swordless':
-            world.get_dungeon('Ice Palace').boss = BossFactory('Kholdstare')
+        if world.swords == 'swordless':
+            world.get_dungeon('Ice Palace', player).boss = BossFactory('Kholdstare', player)
             logging.getLogger('').debug('Placing boss Kholdstare at Ice Palace')
             boss_locations.remove(['Ice Palace', None])
             placeable_bosses.remove('Kholdstare')
@@ -183,7 +201,7 @@ def place_bosses(world):
             bosses.remove(boss)
 
             logging.getLogger('').debug('Placing boss %s at %s', boss, loc_text)
-            world.get_dungeon(loc).bosses[level] = BossFactory(boss)
+            world.get_dungeon(loc, player).bosses[level] = BossFactory(boss, player)
     elif world.boss_shuffle == "chaos": #all bosses chosen at random
         for [loc, level] in boss_locations:
             loc_text = loc + (' ('+level+')' if level else '')
@@ -193,4 +211,4 @@ def place_bosses(world):
                 raise FillError('Could not place boss for location %s' % loc_text)
 
             logging.getLogger('').debug('Placing boss %s at %s', boss, loc_text)
-            world.get_dungeon(loc).bosses[level] = BossFactory(boss)
+            world.get_dungeon(loc, player).bosses[level] = BossFactory(boss, player)

Dungeons.py

@@ -6,44 +6,53 @@ from Fill import fill_restrictive
 from Items import ItemFactory
 
 
-def create_dungeons(world):
+def create_dungeons(world, player):
     def make_dungeon(name, default_boss, dungeon_regions, big_key, small_keys, dungeon_items):
-        dungeon = Dungeon(name, dungeon_regions, big_key, [] if world.retro else small_keys, dungeon_items)
-        dungeon.boss = BossFactory(default_boss)
+        dungeon = Dungeon(name, dungeon_regions, big_key, [] if world.retro else small_keys, dungeon_items, player)
+        dungeon.boss = BossFactory(default_boss, player)
         for region in dungeon.regions:
-            world.get_region(region).dungeon = dungeon
+            world.get_region(region, player).dungeon = dungeon
+            dungeon.world = world
         return dungeon
 
-    ES = make_dungeon('Hyrule Castle', None, ['Hyrule Castle', 'Sewers', 'Sewer Drop', 'Sewers (Dark)', 'Sanctuary'], None, [ItemFactory('Small Key (Escape)')], [ItemFactory('Map (Escape)')])
-    EP = make_dungeon('Eastern Palace', 'Armos Knights', ['Eastern Palace'], ItemFactory('Big Key (Eastern Palace)'), [], ItemFactory(['Map (Eastern Palace)', 'Compass (Eastern Palace)']))
-    DP = make_dungeon('Desert Palace', 'Lanmolas', ['Desert Palace North', 'Desert Palace Main (Inner)', 'Desert Palace Main (Outer)', 'Desert Palace East'], ItemFactory('Big Key (Desert Palace)'), [ItemFactory('Small Key (Desert Palace)')], ItemFactory(['Map (Desert Palace)', 'Compass (Desert Palace)']))
-    ToH = make_dungeon('Tower of Hera', 'Moldorm', ['Tower of Hera (Bottom)', 'Tower of Hera (Basement)', 'Tower of Hera (Top)'], ItemFactory('Big Key (Tower of Hera)'), [ItemFactory('Small Key (Tower of Hera)')], ItemFactory(['Map (Tower of Hera)', 'Compass (Tower of Hera)']))
-    AT = make_dungeon('Agahnims Tower', 'Agahnim', ['Agahnims Tower', 'Agahnim 1'], None, ItemFactory(['Small Key (Agahnims Tower)'] * 2), [])
-    PoD = make_dungeon('Palace of Darkness', 'Helmasaur King', ['Palace of Darkness (Entrance)', 'Palace of Darkness (Center)', 'Palace of Darkness (Big Key Chest)', 'Palace of Darkness (Bonk Section)', 'Palace of Darkness (North)', 'Palace of Darkness (Maze)', 'Palace of Darkness (Harmless Hellway)', 'Palace of Darkness (Final Section)'], ItemFactory('Big Key (Palace of Darkness)'), ItemFactory(['Small Key (Palace of Darkness)'] * 6), ItemFactory(['Map (Palace of Darkness)', 'Compass (Palace of Darkness)']))
-    TT = make_dungeon('Thieves Town', 'Blind', ['Thieves Town (Entrance)', 'Thieves Town (Deep)', 'Blind Fight'], ItemFactory('Big Key (Thieves Town)'), [ItemFactory('Small Key (Thieves Town)')], ItemFactory(['Map (Thieves Town)', 'Compass (Thieves Town)']))
-    SW = make_dungeon('Skull Woods', 'Mothula', ['Skull Woods Final Section (Entrance)', 'Skull Woods First Section', 'Skull Woods Second Section', 'Skull Woods Second Section (Drop)', 'Skull Woods Final Section (Mothula)', 'Skull Woods First Section (Right)', 'Skull Woods First Section (Left)', 'Skull Woods First Section (Top)'], ItemFactory('Big Key (Skull Woods)'), ItemFactory(['Small Key (Skull Woods)'] * 2), ItemFactory(['Map (Skull Woods)', 'Compass (Skull Woods)']))
-    SP = make_dungeon('Swamp Palace', 'Arrghus', ['Swamp Palace (Entrance)', 'Swamp Palace (First Room)', 'Swamp Palace (Starting Area)', 'Swamp Palace (Center)', 'Swamp Palace (North)'], ItemFactory('Big Key (Swamp Palace)'), [ItemFactory('Small Key (Swamp Palace)')], ItemFactory(['Map (Swamp Palace)', 'Compass (Swamp Palace)']))
-    IP = make_dungeon('Ice Palace', 'Kholdstare', ['Ice Palace (Entrance)', 'Ice Palace (Main)', 'Ice Palace (East)', 'Ice Palace (East Top)', 'Ice Palace (Kholdstare)'], ItemFactory('Big Key (Ice Palace)'), ItemFactory(['Small Key (Ice Palace)'] * 2), ItemFactory(['Map (Ice Palace)', 'Compass (Ice Palace)']))
-    MM = make_dungeon('Misery Mire', 'Vitreous', ['Misery Mire (Entrance)', 'Misery Mire (Main)', 'Misery Mire (West)', 'Misery Mire (Final Area)', 'Misery Mire (Vitreous)'], ItemFactory('Big Key (Misery Mire)'), ItemFactory(['Small Key (Misery Mire)'] * 3), ItemFactory(['Map (Misery Mire)', 'Compass (Misery Mire)']))
-    TR = make_dungeon('Turtle Rock', 'Trinexx', ['Turtle Rock (Entrance)', 'Turtle Rock (First Section)', 'Turtle Rock (Chain Chomp Room)', 'Turtle Rock (Second Section)', 'Turtle Rock (Big Chest)', 'Turtle Rock (Crystaroller Room)', 'Turtle Rock (Dark Room)', 'Turtle Rock (Eye Bridge)', 'Turtle Rock (Trinexx)'], ItemFactory('Big Key (Turtle Rock)'), ItemFactory(['Small Key (Turtle Rock)'] * 4), ItemFactory(['Map (Turtle Rock)', 'Compass (Turtle Rock)']))
-    GT = make_dungeon('Ganons Tower', 'Agahnim2', ['Ganons Tower (Entrance)', 'Ganons Tower (Tile Room)', 'Ganons Tower (Compass Room)', 'Ganons Tower (Hookshot Room)', 'Ganons Tower (Map Room)', 'Ganons Tower (Firesnake Room)', 'Ganons Tower (Teleport Room)', 'Ganons Tower (Bottom)', 'Ganons Tower (Top)', 'Ganons Tower (Before Moldorm)', 'Ganons Tower (Moldorm)', 'Agahnim 2'], ItemFactory('Big Key (Ganons Tower)'), ItemFactory(['Small Key (Ganons Tower)'] * 4), ItemFactory(['Map (Ganons Tower)', 'Compass (Ganons Tower)']))
+    ES = make_dungeon('Hyrule Castle', None, ['Hyrule Castle', 'Sewers', 'Sewer Drop', 'Sewers (Dark)', 'Sanctuary'], None, [ItemFactory('Small Key (Escape)', player)], [ItemFactory('Map (Escape)', player)])
+    EP = make_dungeon('Eastern Palace', 'Armos Knights', ['Eastern Palace'], ItemFactory('Big Key (Eastern Palace)', player), [], ItemFactory(['Map (Eastern Palace)', 'Compass (Eastern Palace)'], player))
+    DP = make_dungeon('Desert Palace', 'Lanmolas', ['Desert Palace North', 'Desert Palace Main (Inner)', 'Desert Palace Main (Outer)', 'Desert Palace East'], ItemFactory('Big Key (Desert Palace)', player), [ItemFactory('Small Key (Desert Palace)', player)], ItemFactory(['Map (Desert Palace)', 'Compass (Desert Palace)'], player))
+    ToH = make_dungeon('Tower of Hera', 'Moldorm', ['Tower of Hera (Bottom)', 'Tower of Hera (Basement)', 'Tower of Hera (Top)'], ItemFactory('Big Key (Tower of Hera)', player), [ItemFactory('Small Key (Tower of Hera)', player)], ItemFactory(['Map (Tower of Hera)', 'Compass (Tower of Hera)'], player))
+    PoD = make_dungeon('Palace of Darkness', 'Helmasaur King', ['Palace of Darkness (Entrance)', 'Palace of Darkness (Center)', 'Palace of Darkness (Big Key Chest)', 'Palace of Darkness (Bonk Section)', 'Palace of Darkness (North)', 'Palace of Darkness (Maze)', 'Palace of Darkness (Harmless Hellway)', 'Palace of Darkness (Final Section)'], ItemFactory('Big Key (Palace of Darkness)', player), ItemFactory(['Small Key (Palace of Darkness)'] * 6, player), ItemFactory(['Map (Palace of Darkness)', 'Compass (Palace of Darkness)'], player))
+    TT = make_dungeon('Thieves Town', 'Blind', ['Thieves Town (Entrance)', 'Thieves Town (Deep)', 'Blind Fight'], ItemFactory('Big Key (Thieves Town)', player), [ItemFactory('Small Key (Thieves Town)', player)], ItemFactory(['Map (Thieves Town)', 'Compass (Thieves Town)'], player))
+    SW = make_dungeon('Skull Woods', 'Mothula', ['Skull Woods Final Section (Entrance)', 'Skull Woods First Section', 'Skull Woods Second Section', 'Skull Woods Second Section (Drop)', 'Skull Woods Final Section (Mothula)', 'Skull Woods First Section (Right)', 'Skull Woods First Section (Left)', 'Skull Woods First Section (Top)'], ItemFactory('Big Key (Skull Woods)', player), ItemFactory(['Small Key (Skull Woods)'] * 2, player), ItemFactory(['Map (Skull Woods)', 'Compass (Skull Woods)'], player))
+    SP = make_dungeon('Swamp Palace', 'Arrghus', ['Swamp Palace (Entrance)', 'Swamp Palace (First Room)', 'Swamp Palace (Starting Area)', 'Swamp Palace (Center)', 'Swamp Palace (North)'], ItemFactory('Big Key (Swamp Palace)', player), [ItemFactory('Small Key (Swamp Palace)', player)], ItemFactory(['Map (Swamp Palace)', 'Compass (Swamp Palace)'], player))
+    IP = make_dungeon('Ice Palace', 'Kholdstare', ['Ice Palace (Entrance)', 'Ice Palace (Main)', 'Ice Palace (East)', 'Ice Palace (East Top)', 'Ice Palace (Kholdstare)'], ItemFactory('Big Key (Ice Palace)', player), ItemFactory(['Small Key (Ice Palace)'] * 2, player), ItemFactory(['Map (Ice Palace)', 'Compass (Ice Palace)'], player))
+    MM = make_dungeon('Misery Mire', 'Vitreous', ['Misery Mire (Entrance)', 'Misery Mire (Main)', 'Misery Mire (West)', 'Misery Mire (Final Area)', 'Misery Mire (Vitreous)'], ItemFactory('Big Key (Misery Mire)', player), ItemFactory(['Small Key (Misery Mire)'] * 3, player), ItemFactory(['Map (Misery Mire)', 'Compass (Misery Mire)'], player))
+    TR = make_dungeon('Turtle Rock', 'Trinexx', ['Turtle Rock (Entrance)', 'Turtle Rock (First Section)', 'Turtle Rock (Chain Chomp Room)', 'Turtle Rock (Second Section)', 'Turtle Rock (Big Chest)', 'Turtle Rock (Crystaroller Room)', 'Turtle Rock (Dark Room)', 'Turtle Rock (Eye Bridge)', 'Turtle Rock (Trinexx)'], ItemFactory('Big Key (Turtle Rock)', player), ItemFactory(['Small Key (Turtle Rock)'] * 4, player), ItemFactory(['Map (Turtle Rock)', 'Compass (Turtle Rock)'], player))
 
-    GT.bosses['bottom'] = BossFactory('Armos Knights')
-    GT.bosses['middle'] = BossFactory('Lanmolas')
-    GT.bosses['top'] = BossFactory('Moldorm')
+    if world.mode != 'inverted':
+        AT = make_dungeon('Agahnims Tower', 'Agahnim', ['Agahnims Tower', 'Agahnim 1'], None, ItemFactory(['Small Key (Agahnims Tower)'] * 2, player), [])
+        GT = make_dungeon('Ganons Tower', 'Agahnim2', ['Ganons Tower (Entrance)', 'Ganons Tower (Tile Room)', 'Ganons Tower (Compass Room)', 'Ganons Tower (Hookshot Room)', 'Ganons Tower (Map Room)', 'Ganons Tower (Firesnake Room)', 'Ganons Tower (Teleport Room)', 'Ganons Tower (Bottom)', 'Ganons Tower (Top)', 'Ganons Tower (Before Moldorm)', 'Ganons Tower (Moldorm)', 'Agahnim 2'], ItemFactory('Big Key (Ganons Tower)', player), ItemFactory(['Small Key (Ganons Tower)'] * 4, player), ItemFactory(['Map (Ganons Tower)', 'Compass (Ganons Tower)'], player))
+    else:
+        AT = make_dungeon('Inverted Agahnims Tower', 'Agahnim', ['Inverted Agahnims Tower', 'Agahnim 1'], None, ItemFactory(['Small Key (Agahnims Tower)'] * 2, player), [])
+        GT = make_dungeon('Inverted Ganons Tower', 'Agahnim2', ['Inverted Ganons Tower (Entrance)', 'Ganons Tower (Tile Room)', 'Ganons Tower (Compass Room)', 'Ganons Tower (Hookshot Room)', 'Ganons Tower (Map Room)', 'Ganons Tower (Firesnake Room)', 'Ganons Tower (Teleport Room)', 'Ganons Tower (Bottom)', 'Ganons Tower (Top)', 'Ganons Tower (Before Moldorm)', 'Ganons Tower (Moldorm)', 'Agahnim 2'], ItemFactory('Big Key (Ganons Tower)', player), ItemFactory(['Small Key (Ganons Tower)'] * 4, player), ItemFactory(['Map (Ganons Tower)', 'Compass (Ganons Tower)'], player))
 
-    world.dungeons = [ES, EP, DP, ToH, AT, PoD, TT, SW, SP, IP, MM, TR, GT]
+    GT.bosses['bottom'] = BossFactory('Armos Knights', player)
+    GT.bosses['middle'] = BossFactory('Lanmolas', player)
+    GT.bosses['top'] = BossFactory('Moldorm', player)
+
+    world.dungeons += [ES, EP, DP, ToH, AT, PoD, TT, SW, SP, IP, MM, TR, GT]
 
 def fill_dungeons(world):
     freebes = ['Ganons Tower - Map Chest', 'Palace of Darkness - Harmless Hellway', 'Palace of Darkness - Big Key Chest', 'Turtle Rock - Big Key Chest']
 
     all_state_base = world.get_all_state()
 
-    if world.retro:
-        world.push_item(world.get_location('Skull Woods - Pinball Room'), ItemFactory('Small Key (Universal)'), False)
-    else:
-        world.push_item(world.get_location('Skull Woods - Pinball Room'), ItemFactory('Small Key (Skull Woods)'), False)
-    world.get_location('Skull Woods - Pinball Room').event = True
+    for player in range(1, world.players + 1):
+        pinball_room = world.get_location('Skull Woods - Pinball Room', player)
+        if world.retro:
+            world.push_item(pinball_room, ItemFactory('Small Key (Universal)', player), False)
+        else:
+            world.push_item(pinball_room, ItemFactory('Small Key (Skull Woods)', player), False)
+        pinball_room.event = True
+        pinball_room.locked = True
 
     dungeons = [(list(dungeon.regions), dungeon.big_key, list(dungeon.small_keys), list(dungeon.dungeon_items)) for dungeon in world.dungeons]
 
@@ -70,8 +79,8 @@ def fill_dungeons(world):
 
             world.push_item(bk_location, big_key, False)
             bk_location.event = True
+            bk_location.locked = True
             dungeon_locations.remove(bk_location)
-            all_state.clear_cached_unreachable()
             big_key = None
 
         # next place small keys
@@ -89,15 +98,15 @@ def fill_dungeons(world):
                 small_keys.append(small_key)
                 dungeons.append((dungeon_regions, big_key, small_keys, dungeon_items))
                 # infinite regression protection
-                if loopcnt < 30:
+                if loopcnt < (30 * world.players):
                     break
                 else:
                     raise RuntimeError('No suitable location for %s' % small_key)
 
             world.push_item(sk_location, small_key, False)
             sk_location.event = True
+            sk_location.locked = True
             dungeon_locations.remove(sk_location)
-            all_state.clear_cached_unreachable()
 
         if small_keys:
             # key placement not finished, loop again
@@ -109,7 +118,6 @@ def fill_dungeons(world):
                 di_location = dungeon_locations.pop()
                 world.push_item(di_location, dungeon_item, False)
 
-    world.state.clear_cached_unreachable()
 
 def get_dungeon_item_pool(world):
     return [item for dungeon in world.dungeons for item in dungeon.all_items if item.key or world.place_dungeon_items]
@@ -117,13 +125,15 @@ def get_dungeon_item_pool(world):
 def fill_dungeons_restrictive(world, shuffled_locations):
     all_state_base = world.get_all_state()
 
-    skull_woods_big_chest = world.get_location('Skull Woods - Pinball Room')
-    if world.retro:
-        world.push_item(skull_woods_big_chest, ItemFactory('Small Key (Universal)'), False)
-    else:
-        world.push_item(skull_woods_big_chest, ItemFactory('Small Key (Skull Woods)'), False)
-    skull_woods_big_chest.event = True
-    shuffled_locations.remove(skull_woods_big_chest)
+    for player in range(1, world.players + 1):
+        pinball_room = world.get_location('Skull Woods - Pinball Room', player)
+        if world.retro:
+            world.push_item(pinball_room, ItemFactory('Small Key (Universal)', player), False)
+        else:
+            world.push_item(pinball_room, ItemFactory('Small Key (Skull Woods)', player), False)
+        pinball_room.event = True
+        pinball_room.locked = True
+        shuffled_locations.remove(pinball_room)
 
     if world.keysanity:
         #in keysanity dungeon items are distributed as part of the normal item pool
@@ -142,7 +152,6 @@ def fill_dungeons_restrictive(world, shuffled_locations):
 
     fill_restrictive(world, all_state_base, shuffled_locations, dungeon_items)
 
-    world.state.clear_cached_unreachable()
 
 
 dungeon_music_addresses = {'Eastern Palace - Prize': [0x1559A],

EntranceRandomizer.py

@@ -6,9 +6,8 @@ import random
 import textwrap
 import sys
 
-from Gui import guiMain
 from Main import main
-from Utils import is_bundled, close_console
+from Utils import is_bundled, close_console, output_path
 
 
 class ArgumentDefaultsHelpFormatter(argparse.RawTextHelpFormatter):
@@ -29,7 +28,7 @@ def start():
                              No Logic: Distribute items without regard for
                                              item requirements.
                              ''')
-    parser.add_argument('--mode', default='open', const='open', nargs='?', choices=['standard', 'open', 'swordless'],
+    parser.add_argument('--mode', default='open', const='open', nargs='?', choices=['standard', 'open', 'inverted'],
                         help='''\
                              Select game mode. (default: %(default)s)
                              Open:      World starts with Zelda rescued.
@@ -37,12 +36,24 @@ def start():
                                         but may lead to weird rain state issues if you exit
                                         through the Hyrule Castle side exits before rescuing
                                         Zelda in a full shuffle.
-                             Swordless: Like Open, but with no swords. Curtains in
-                                        Skull Woods and Agahnims Tower are removed,
-                                        Agahnim\'s Tower barrier can be destroyed with
-                                        hammer. Misery Mire and Turtle Rock can be opened
-                                        without a sword. Hammer damages Ganon. Ether and
-                                        Bombos Tablet can be activated with Hammer (and Book).
+                             Inverted:  Starting locations are Dark Sanctuary in West Dark
+                                        World or at Link's House, which is shuffled freely.
+                                        Requires the moon pearl to be Link in the Light World
+                                        instead of a bunny.
+                             ''')
+    parser.add_argument('--swords', default='random', const='random', nargs='?', choices= ['random', 'assured', 'swordless', 'vanilla'],
+                        help='''\
+                             Select sword placement. (default: %(default)s)
+                             Random:    All swords placed randomly.
+                             Assured:   Start game with a sword already.
+                             Swordless: No swords. Curtains in Skull Woods and Agahnim\'s 
+                                        Tower are removed, Agahnim\'s Tower barrier can be
+                                        destroyed with hammer. Misery Mire and Turtle Rock
+                                        can be opened without a sword. Hammer damages Ganon.
+                                        Ether and Bombos Tablet can be activated with Hammer
+                                        (and Book). Bombos pads have been added in Ice
+                                        Palace, to allow for an alternative to firerod.
+                             Vanilla:   Swords are in vanilla locations.
                              ''')
     parser.add_argument('--goal', default='ganon', const='ganon', nargs='?', choices=['ganon', 'pedestal', 'dungeons', 'triforcehunt', 'crystals'],
                         help='''\
@@ -56,15 +67,20 @@ def start():
                              Triforce Hunt: Places 30 Triforce Pieces in the world, collect
                                             20 of them to beat the game.
                              ''')
-    parser.add_argument('--difficulty', default='normal', const='normal', nargs='?', choices=['easy', 'normal', 'hard', 'expert', 'insane'],
+    parser.add_argument('--difficulty', default='normal', const='normal', nargs='?', choices=['normal', 'hard', 'expert'],
                         help='''\
                              Select game difficulty. Affects available itempool. (default: %(default)s)
-                             Easy:            An easy setting with extra equipment.
                              Normal:          Normal difficulty.
                              Hard:            A harder setting with less equipment and reduced health.
                              Expert:          A harder yet setting with minimum equipment and health.
-                             Insane:          A setting with the absolute minimum in equipment and no extra health.
                              ''')
+    parser.add_argument('--item_functionality', default='normal', const='normal', nargs='?', choices=['normal', 'hard', 'expert'],
+                             help='''\
+                             Select limits on item functionality to increase difficulty. (default: %(default)s)
+                             Normal:          Normal functionality.
+                             Hard:            Reduced functionality.
+                             Expert:          Greatly reduced functionality.
+                                  ''')
     parser.add_argument('--timer', default='none', const='normal', nargs='?', choices=['none', 'display', 'timed', 'timed-ohko', 'ohko', 'timed-countdown'],
                         help='''\
                              Select game timer setting. Affects available itempool. (default: %(default)s)
@@ -146,6 +162,23 @@ def start():
                              The dungeon variants only mix up dungeons and keep the rest of
                              the overworld vanilla.
                              ''')
+    parser.add_argument('--crystals_ganon', default='7', const='7', nargs='?', choices=['random', '0', '1', '2', '3', '4', '5', '6', '7'],
+                        help='''\
+                             How many crystals are needed to defeat ganon. Any other 
+                             requirements for ganon for the selected goal still apply.
+                             This setting does not apply when the all dungeons goal is
+                             selected. (default: %(default)s)
+                             Random: Picks a random value between 0 and 7 (inclusive).
+                             0-7:    Number of crystals needed
+                             ''')
+    parser.add_argument('--crystals_gt', default='7', const='7', nargs='?', choices=['random', '0', '1', '2', '3', '4', '5', '6', '7'],
+                        help='''\
+                             How many crystals are needed to open GT. For inverted mode
+                             this applies to the castle tower door instead. (default: %(default)s)
+                             Random: Picks a random value between 0 and 7 (inclusive).
+                             0-7:    Number of crystals needed
+                             ''')
+
     parser.add_argument('--rom', default='Zelda no Densetsu - Kamigami no Triforce (Japan).sfc', help='Path to an ALttP JAP(1.0) rom to use as a base.')
     parser.add_argument('--loglevel', default='info', const='info', nargs='?', choices=['error', 'info', 'warning', 'debug'], help='Select level of logging for output.')
     parser.add_argument('--seed', help='Define seed number to generate.', type=int)
@@ -177,11 +210,13 @@ def start():
                              Remove Maps and Compasses from Itempool, replacing them by
                              empty slots.
                              ''', action='store_true')
-    parser.add_argument('--beatableonly', help='''\
-                             Only check if the game is beatable with placement. Do not
-                             ensure all locations are reachable. This only has an effect
-                             on the restrictive algorithm currently.
-                             ''', action='store_true')
+    parser.add_argument('--accessibility', default='items', const='items', nargs='?', choices=['items', 'locations', 'none'], help='''\
+                             Select Item/Location Accessibility. (default: %(default)s)
+                             Items:     You can reach all unique inventory items. No guarantees about
+                                        reaching all locations or all keys. 
+                             Locations: You will be able to reach every location in the game.
+                             None:      You will be able to reach enough locations to beat the game.
+                             ''')
     parser.add_argument('--hints', help='''\
                              Make telepathic tiles and storytellers give helpful hints.
                              ''', action='store_true')
@@ -207,19 +242,32 @@ def start():
                              ''')
     parser.add_argument('--suppress_rom', help='Do not create an output rom file.', action='store_true')
     parser.add_argument('--gui', help='Launch the GUI', action='store_true')
-    # Deliberately not documented, only useful for vt site integration right now:
-    parser.add_argument('--shufflebosses', help=argparse.SUPPRESS, default='none', const='none', nargs='?', choices=['none', 'basic', 'normal', 'chaos'])
     parser.add_argument('--jsonout', action='store_true', help='''\
                             Output .json patch to stdout instead of a patched rom. Used
                             for VT site integration, do not use otherwise.
                             ''')
+    parser.add_argument('--skip_playthrough', action='store_true', default=False)
+    parser.add_argument('--enemizercli', default='')
+    parser.add_argument('--shufflebosses', default='none', choices=['none', 'basic', 'normal', 'chaos'])
+    parser.add_argument('--shuffleenemies', default=False, action='store_true')
+    parser.add_argument('--enemy_health', default='default', choices=['default', 'easy', 'normal', 'hard', 'expert'])
+    parser.add_argument('--enemy_damage', default='default', choices=['default', 'shuffled', 'chaos'])
+    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('--outputpath')
     args = parser.parse_args()
 
+    if args.outputpath and os.path.isdir(args.outputpath):
+        output_path.cached_path = args.outputpath
+
     if is_bundled() and len(sys.argv) == 1:
         # for the bundled builds, if we have no arguments, the user
         # probably wants the gui. Users of the bundled build who want the command line
         # interface shouuld specify at least one option, possibly setting a value to a
         # default if they like all the defaults
+        from Gui import guiMain
         close_console()
         guiMain()
         sys.exit(0)
@@ -240,6 +288,7 @@ def start():
     logging.basicConfig(format='%(message)s', level=loglevel)
 
     if args.gui:
+        from Gui import guiMain
         guiMain(args)
     elif args.count is not None:
         seed = args.seed

Fill.py

@@ -1,6 +1,9 @@
 import random
 import logging
 
+from BaseClasses import CollectionState
+
+
 class FillError(RuntimeError):
     pass
 
@@ -167,31 +170,41 @@ def fill_restrictive(world, base_state, locations, itempool):
         return new_state
 
     while itempool and locations:
-        item_to_place = itempool.pop()
+        items_to_place = []
+        nextpool = []
+        placing_players = set()
+        for item in reversed(itempool):
+            if item.player not in placing_players:
+                placing_players.add(item.player)
+                items_to_place.append(item)
+            else:
+                nextpool.insert(0, item)
+        itempool = nextpool
+
         maximum_exploration_state = sweep_from_pool()
 
         perform_access_check = True
-        if world.check_beatable_only:
+        if world.accessibility == 'none':
             perform_access_check = not world.has_beaten_game(maximum_exploration_state)
 
+        for item_to_place in items_to_place:
+            spot_to_fill = None
+            for location in locations:
+                if location.can_fill(maximum_exploration_state, item_to_place, perform_access_check):
+                    spot_to_fill = location
+                    break
 
-        spot_to_fill = None
-        for location in locations:
-            if location.can_fill(maximum_exploration_state, item_to_place, perform_access_check):
-                spot_to_fill = location
-                break
+            if spot_to_fill is None:
+                # we filled all reachable spots. Maybe the game can be beaten anyway?
+                if world.can_beat_game():
+                    if world.accessibility != 'none':
+                        logging.getLogger('').warning('Not all items placed. Game beatable anyway. (Could not place %s)' % item_to_place)
+                    continue
+                raise FillError('No more spots to place %s' % item_to_place)
 
-        if spot_to_fill is None:
-            # we filled all reachable spots. Maybe the game can be beaten anyway?
-            if world.can_beat_game():
-                if not world.check_beatable_only:
-                    logging.getLogger('').warning('Not all items placed. Game beatable anyway.')
-                break
-            raise FillError('No more spots to place %s' % item_to_place)
-
-        world.push_item(spot_to_fill, item_to_place, False)
-        locations.remove(spot_to_fill)
-        spot_to_fill.event = True
+            world.push_item(spot_to_fill, item_to_place, False)
+            locations.remove(spot_to_fill)
+            spot_to_fill.event = True
 
 
 def distribute_items_restrictive(world, gftower_trash_count=0, fill_locations=None):
@@ -207,20 +220,25 @@ def distribute_items_restrictive(world, gftower_trash_count=0, fill_locations=No
     restitempool = [item for item in world.itempool if not item.advancement and not item.priority]
 
     # fill in gtower locations with trash first
-    if world.ganonstower_vanilla:
-        gtower_locations = [location for location in fill_locations if 'Ganons Tower' in location.name]
-        random.shuffle(gtower_locations)
-        trashcnt = 0
-        while gtower_locations and restitempool and trashcnt < gftower_trash_count:
-            spot_to_fill = gtower_locations.pop()
-            item_to_place = restitempool.pop()
-            world.push_item(spot_to_fill, item_to_place, False)
-            fill_locations.remove(spot_to_fill)
-            trashcnt += 1
+    for player in range(1, world.players + 1):
+        if world.ganonstower_vanilla[player]:
+            gtower_locations = [location for location in fill_locations if 'Ganons Tower' in location.name and location.player == player]
+            random.shuffle(gtower_locations)
+            trashcnt = 0
+            while gtower_locations and restitempool and trashcnt < gftower_trash_count:
+                spot_to_fill = gtower_locations.pop()
+                item_to_place = restitempool.pop()
+                world.push_item(spot_to_fill, item_to_place, False)
+                fill_locations.remove(spot_to_fill)
+                trashcnt += 1
 
     random.shuffle(fill_locations)
     fill_locations.reverse()
 
+    # Make sure the escape small key is placed first in standard keysanity to prevent running out of spots
+    if world.keysanity and world.mode == 'standard':
+        progitempool.sort(key=lambda item: 1 if item.name == 'Small Key (Escape)' else 0)
+
     fill_restrictive(world, world.state, fill_locations, progitempool)
 
     random.shuffle(fill_locations)
@@ -297,3 +315,96 @@ def flood_items(world):
                 world.push_item(location, item_to_place, True)
                 itempool.remove(item_to_place)
                 break
+
+def balance_multiworld_progression(world):
+    state = CollectionState(world)
+    checked_locations = []
+    unchecked_locations = world.get_locations().copy()
+    random.shuffle(unchecked_locations)
+
+    reachable_locations_count = {}
+    for player in range(1, world.players + 1):
+        reachable_locations_count[player] = 0
+
+    def get_sphere_locations(sphere_state, locations):
+        if not world.keysanity:
+            sphere_state.sweep_for_events(key_only=True, locations=locations)
+        return [loc for loc in locations if sphere_state.can_reach(loc)]
+
+    while True:
+        sphere_locations = get_sphere_locations(state, unchecked_locations)
+        for location in sphere_locations:
+            unchecked_locations.remove(location)
+            reachable_locations_count[location.player] += 1
+
+        if checked_locations:
+            average_reachable_locations = sum(reachable_locations_count.values()) / world.players
+            threshold = ((average_reachable_locations + max(reachable_locations_count.values())) / 2) * 0.8 #todo: probably needs some tweaking
+
+            balancing_players = [player for player, reachables in reachable_locations_count.items() if reachables < threshold]
+            if balancing_players:
+                balancing_state = state.copy()
+                balancing_unchecked_locations = unchecked_locations.copy()
+                balancing_reachables = reachable_locations_count.copy()
+                balancing_sphere = sphere_locations.copy()
+                candidate_items = []
+                while True:
+                    for location in balancing_sphere:
+                        if location.event:
+                            balancing_state.collect(location.item, True, location)
+                            if location.item.player in balancing_players:
+                                candidate_items.append(location)
+                    balancing_sphere = get_sphere_locations(balancing_state, balancing_unchecked_locations)
+                    for location in balancing_sphere:
+                        balancing_unchecked_locations.remove(location)
+                        balancing_reachables[location.player] += 1
+                    if world.has_beaten_game(balancing_state) or all([reachables >= threshold for reachables in balancing_reachables.values()]):
+                        break
+
+                unlocked_locations = [l for l in unchecked_locations if l not in balancing_unchecked_locations]
+                items_to_replace = []
+                for player in balancing_players:
+                    locations_to_test = [l for l in unlocked_locations if l.player == player]
+                    items_to_test = [l for l in candidate_items if l.item.player == player and l.player != player]
+                    while items_to_test:
+                        testing = items_to_test.pop()
+                        reducing_state = state.copy()
+                        for location in [*[l for l in items_to_replace if l.item.player == player], *items_to_test]:
+                            reducing_state.collect(location.item, True, location)
+
+                        reducing_state.sweep_for_events(locations=locations_to_test)
+
+                        if testing.locked:
+                            continue
+
+                        if world.has_beaten_game(balancing_state):
+                            if not world.has_beaten_game(reducing_state):
+                                items_to_replace.append(testing)
+                        else:
+                            reduced_sphere = get_sphere_locations(reducing_state, locations_to_test)
+                            if reachable_locations_count[player] + len(reduced_sphere) < threshold:
+                                items_to_replace.append(testing)
+
+                replaced_items = False
+                locations_for_replacing = [l for l in checked_locations if not l.event and not l.locked]
+                while locations_for_replacing and items_to_replace:
+                    new_location = locations_for_replacing.pop()
+                    old_location = items_to_replace.pop()
+                    new_location.item, old_location.item = old_location.item, new_location.item
+                    new_location.event = True
+                    old_location.event = False
+                    state.collect(new_location.item, True, new_location)
+                    replaced_items = True
+                if replaced_items:
+                    for location in get_sphere_locations(state, [l for l in unlocked_locations if l.player in balancing_players]):
+                        unchecked_locations.remove(location)
+                        reachable_locations_count[location.player] += 1
+                        sphere_locations.append(location)
+
+        for location in sphere_locations:
+            if location.event:
+                state.collect(location.item, True, location)
+        checked_locations.extend(sphere_locations)
+
+        if world.has_beaten_game(state):
+            break

Gui.py

@@ -5,7 +5,7 @@ import json
 import 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, Entry, Spinbox, Button, filedialog, messagebox, ttk
+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
 from urllib.parse import urlparse
 from urllib.request import urlopen
 
@@ -66,8 +66,6 @@ def guiMain(args=None):
     retroCheckbutton = Checkbutton(checkBoxFrame, text="Retro mode (universal keys)", variable=retroVar)
     dungeonItemsVar = IntVar()
     dungeonItemsCheckbutton = Checkbutton(checkBoxFrame, text="Place Dungeon Items (Compasses/Maps)", onvalue=0, offvalue=1, variable=dungeonItemsVar)
-    beatableOnlyVar = IntVar()
-    beatableOnlyCheckbutton = Checkbutton(checkBoxFrame, text="Only ensure seed is beatable, not all items must be reachable", variable=beatableOnlyVar)
     disableMusicVar = IntVar()
     disableMusicCheckbutton = Checkbutton(checkBoxFrame, text="Disable game music", variable=disableMusicVar)
     shuffleGanonVar = IntVar()
@@ -85,7 +83,6 @@ def guiMain(args=None):
     keysanityCheckbutton.pack(expand=True, anchor=W)
     retroCheckbutton.pack(expand=True, anchor=W)
     dungeonItemsCheckbutton.pack(expand=True, anchor=W)
-    beatableOnlyCheckbutton.pack(expand=True, anchor=W)
     disableMusicCheckbutton.pack(expand=True, anchor=W)
     shuffleGanonCheckbutton.pack(expand=True, anchor=W)
     hintsCheckbutton.pack(expand=True, anchor=W)
@@ -145,7 +142,7 @@ def guiMain(args=None):
     modeFrame = Frame(drowDownFrame)
     modeVar = StringVar()
     modeVar.set('open')
-    modeOptionMenu = OptionMenu(modeFrame, modeVar, 'standard', 'open', 'swordless')
+    modeOptionMenu = OptionMenu(modeFrame, modeVar, 'standard', 'open', 'inverted')
     modeOptionMenu.pack(side=RIGHT)
     modeLabel = Label(modeFrame, text='Game Mode')
     modeLabel.pack(side=LEFT)
@@ -169,7 +166,7 @@ def guiMain(args=None):
     difficultyFrame = Frame(drowDownFrame)
     difficultyVar = StringVar()
     difficultyVar.set('normal')
-    difficultyOptionMenu = OptionMenu(difficultyFrame, difficultyVar, 'easy', 'normal', 'hard', 'expert', 'insane')
+    difficultyOptionMenu = OptionMenu(difficultyFrame, difficultyVar, 'normal', 'hard', 'expert')
     difficultyOptionMenu.pack(side=RIGHT)
     difficultyLabel = Label(difficultyFrame, text='Game difficulty')
     difficultyLabel.pack(side=LEFT)
@@ -242,17 +239,77 @@ def guiMain(args=None):
     heartcolorFrame.pack(expand=True, anchor=E)
     fastMenuFrame.pack(expand=True, anchor=E)
 
-    bottomFrame = Frame(randomizerWindow)
+    enemizerFrame = LabelFrame(randomizerWindow, text="Enemizer", padx=5, pady=5)
+    enemizerFrame.columnconfigure(0, weight=1)
+    enemizerFrame.columnconfigure(1, weight=1)
+    enemizerFrame.columnconfigure(2, weight=1)
 
+    enemizerPathFrame = Frame(enemizerFrame)
+    enemizerPathFrame.grid(row=0, column=0, columnspan=3, sticky=W)
+    enemizerCLIlabel = Label(enemizerPathFrame, text="EnemizerCLI path: ")
+    enemizerCLIlabel.pack(side=LEFT)
+    enemizerCLIpathVar = StringVar()
+    enemizerCLIpathEntry = Entry(enemizerPathFrame, textvariable=enemizerCLIpathVar, width=80)
+    enemizerCLIpathEntry.pack(side=LEFT)
+    def EnemizerSelectPath():
+        path = filedialog.askopenfilename(filetypes=[("EnemizerCLI executable", "*EnemizerCLI*")])
+        if path:
+            enemizerCLIpathVar.set(path)
+    enemizerCLIbrowseButton = Button(enemizerPathFrame, text='...', command=EnemizerSelectPath)
+    enemizerCLIbrowseButton.pack(side=LEFT)
+
+    enemyShuffleVar = IntVar()
+    enemyShuffleButton = Checkbutton(enemizerFrame, text="Enemy shuffle", variable=enemyShuffleVar)
+    enemyShuffleButton.grid(row=1, column=0)
+    paletteShuffleVar = IntVar()
+    paletteShuffleButton = Checkbutton(enemizerFrame, text="Palette shuffle", variable=paletteShuffleVar)
+    paletteShuffleButton.grid(row=1, column=1)
+    potShuffleVar = IntVar()
+    potShuffleButton = Checkbutton(enemizerFrame, text="Pot shuffle", variable=potShuffleVar)
+    potShuffleButton.grid(row=1, column=2)
+
+    enemizerBossFrame = Frame(enemizerFrame)
+    enemizerBossFrame.grid(row=2, column=0)
+    enemizerBossLabel = Label(enemizerBossFrame, text='Boss shuffle')
+    enemizerBossLabel.pack(side=LEFT)
+    enemizerBossVar = StringVar()
+    enemizerBossVar.set('none')
+    enemizerBossOption = OptionMenu(enemizerBossFrame, enemizerBossVar, 'none', 'basic', 'normal', 'chaos')
+    enemizerBossOption.pack(side=LEFT)
+
+    enemizerDamageFrame = Frame(enemizerFrame)
+    enemizerDamageFrame.grid(row=2, column=1)
+    enemizerDamageLabel = Label(enemizerDamageFrame, text='Enemy damage')
+    enemizerDamageLabel.pack(side=LEFT)
+    enemizerDamageVar = StringVar()
+    enemizerDamageVar.set('default')
+    enemizerDamageOption = OptionMenu(enemizerDamageFrame, enemizerDamageVar, 'default', 'shuffled', 'chaos')
+    enemizerDamageOption.pack(side=LEFT)
+
+    enemizerHealthFrame = Frame(enemizerFrame)
+    enemizerHealthFrame.grid(row=2, column=2)
+    enemizerHealthLabel = Label(enemizerHealthFrame, text='Enemy health')
+    enemizerHealthLabel.pack(side=LEFT)
+    enemizerHealthVar = StringVar()
+    enemizerHealthVar.set('default')
+    enemizerHealthOption = OptionMenu(enemizerHealthFrame, enemizerHealthVar, 'default', 'easy', 'normal', 'hard', 'expert')
+    enemizerHealthOption.pack(side=LEFT)
+
+    bottomFrame = Frame(randomizerWindow, pady=5)
+
+    worldLabel = Label(bottomFrame, text='Worlds')
+    worldVar = StringVar()
+    worldSpinbox = Spinbox(bottomFrame, from_=1, to=100, width=5, textvariable=worldVar)
     seedLabel = Label(bottomFrame, text='Seed #')
     seedVar = StringVar()
-    seedEntry = Entry(bottomFrame, textvariable=seedVar)
+    seedEntry = Entry(bottomFrame, width=15, textvariable=seedVar)
     countLabel = Label(bottomFrame, text='Count')
     countVar = StringVar()
-    countSpinbox = Spinbox(bottomFrame, from_=1, to=100, textvariable=countVar)
+    countSpinbox = Spinbox(bottomFrame, from_=1, to=100, width=5, textvariable=countVar)
 
     def generateRom():
         guiargs = Namespace
+        guiargs.multi = int(worldVar.get())
         guiargs.seed = int(seedVar.get()) if seedVar.get() else None
         guiargs.count = int(countVar.get()) if countVar.get() != '1' else None
         guiargs.mode = modeVar.get()
@@ -271,11 +328,17 @@ def guiMain(args=None):
         guiargs.keysanity = bool(keysanityVar.get())
         guiargs.retro = bool(retroVar.get())
         guiargs.nodungeonitems = bool(dungeonItemsVar.get())
-        guiargs.beatableonly = bool(beatableOnlyVar.get())
         guiargs.quickswap = bool(quickSwapVar.get())
         guiargs.disablemusic = bool(disableMusicVar.get())
         guiargs.shuffleganon = bool(shuffleGanonVar.get())
         guiargs.hints = bool(hintsVar.get())
+        guiargs.enemizercli = enemizerCLIpathVar.get()
+        guiargs.shufflebosses = enemizerBossVar.get()
+        guiargs.shuffleenemies = bool(enemyShuffleVar.get())
+        guiargs.enemy_health = enemizerHealthVar.get()
+        guiargs.enemy_damage = enemizerDamageVar.get()
+        guiargs.shufflepalette = bool(paletteShuffleVar.get())
+        guiargs.shufflepots = bool(potShuffleVar.get())
         guiargs.custom = bool(customVar.get())
         guiargs.customitemarray = [int(bowVar.get()), int(silverarrowVar.get()), int(boomerangVar.get()), int(magicboomerangVar.get()), int(hookshotVar.get()), int(mushroomVar.get()), int(magicpowderVar.get()), int(firerodVar.get()),
                                    int(icerodVar.get()), int(bombosVar.get()), int(etherVar.get()), int(quakeVar.get()), int(lampVar.get()), int(hammerVar.get()), int(shovelVar.get()), int(fluteVar.get()), int(bugnetVar.get()),
@@ -286,10 +349,11 @@ def guiMain(args=None):
                                    int(arrow1Var.get()), int(arrow10Var.get()), int(bomb1Var.get()), int(bomb3Var.get()), int(rupee1Var.get()), int(rupee5Var.get()), int(rupee20Var.get()), int(rupee50Var.get()), int(rupee100Var.get()),
                                    int(rupee300Var.get()), int(rupoorVar.get()), int(blueclockVar.get()), int(greenclockVar.get()), int(redclockVar.get()), int(triforcepieceVar.get()), int(triforcecountVar.get()),
                                    int(triforceVar.get()), int(rupoorcostVar.get()), int(universalkeyVar.get())]
-        guiargs.shufflebosses = None
         guiargs.rom = romVar.get()
         guiargs.jsonout = None
         guiargs.sprite = sprite
+        guiargs.skip_playthrough = False
+        guiargs.outputpath = None
         try:
             if guiargs.count is not None:
                 seed = guiargs.seed
@@ -305,7 +369,9 @@ def guiMain(args=None):
 
     generateButton = Button(bottomFrame, text='Generate Patched Rom', command=generateRom)
 
-    seedLabel.pack(side=LEFT)
+    worldLabel.pack(side=LEFT)
+    worldSpinbox.pack(side=LEFT)
+    seedLabel.pack(side=LEFT,  padx=(5, 0))
     seedEntry.pack(side=LEFT)
     countLabel.pack(side=LEFT, padx=(5, 0))
     countSpinbox.pack(side=LEFT)
@@ -317,6 +383,7 @@ def guiMain(args=None):
     rightHalfFrame.pack(side=RIGHT)
     topFrame.pack(side=TOP)
     bottomFrame.pack(side=BOTTOM)
+    enemizerFrame.pack(side=BOTTOM, fill=BOTH)
 
     # Adjuster Controls
 
@@ -384,6 +451,7 @@ def guiMain(args=None):
     fastMenuLabel2 = Label(fastMenuFrame2, text='Menu speed')
     fastMenuLabel2.pack(side=LEFT)
 
+
     heartbeepFrame2.pack(expand=True, anchor=E)
     heartcolorFrame2.pack(expand=True, anchor=E)
     fastMenuFrame2.pack(expand=True, anchor=E)
@@ -999,7 +1067,6 @@ def guiMain(args=None):
         retroVar.set(args.retro)
         if args.nodungeonitems:
             dungeonItemsVar.set(int(not args.nodungeonitems))
-        beatableOnlyVar.set(int(args.beatableonly))
         quickSwapVar.set(int(args.quickswap))
         disableMusicVar.set(int(args.disablemusic))
         if args.count:

InvertedRegions.py

@@ -0,0 +1,642 @@
+import collections
+from BaseClasses import Region, Location, Entrance, RegionType, Shop, ShopType
+
+
+def create_inverted_regions(world, player):
+
+    world.regions += [
+        create_lw_region(player, 'Light World', ['Mushroom', 'Bottle Merchant', 'Flute Spot', 'Sunken Treasure', 'Purple Chest', 'Bombos Tablet'],
+                         ["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',
+                          '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)',
+                          'Kakariko Shop', 'Long Fairy Cave', 'Good Bee Cave', '20 Rupee Cave', 'Cave Shop (Lake Hylia)',
+                          'Bonk Fairy (Light)', '50 Rupee Cave', 'Fortune Teller (Light)', 'Lake Hylia Fairy', 'Light Hype Fairy', 'Desert Fairy', 'Lumberjack House', 'Lake Hylia Fortune Teller', 'Kakariko Gamble Game',
+                          'East Dark World Mirror Spot', 'West Dark World Mirror Spot', 'South Dark World Mirror Spot', 'Cave 45', 'Checkerboard Cave', 'Mire Mirror Spot', 'Hammer Peg Area Mirror Spot', 
+                          'Shopping Mall Mirror Spot', 'Skull Woods Mirror Spot', 'Inverted Pyramid Entrance','Hyrule Castle Entrance (South)', 'Secret Passage Outer Bushes', 'LW Hyrule Castle Ledge SQ', 'Bush Covered Lawn Outer Bushes',
+                          'Potion Shop Outer Bushes', 'Graveyard Cave Outer Bushes', 'Bomb Hut Outer Bushes']),
+        create_lw_region(player, 'Bush Covered Lawn', None, ['Bush Covered House', 'Bush Covered Lawn Inner Bushes', 'Bush Covered Lawn Mirror Spot']),
+        create_lw_region(player, 'Bomb Hut Area', None, ['Light World Bomb Hut', 'Bomb Hut Inner Bushes', 'Bomb Hut Mirror Spot']),
+        create_lw_region(player, 'Hyrule Castle Secret Entrance Area', None, ['Hyrule Castle Secret Entrance Stairs', 'Secret Passage Inner Bushes']),
+        create_lw_region(player, 'Death Mountain Entrance', None, ['Old Man Cave (West)', 'Death Mountain Entrance Drop', 'Bumper Cave Entrance Mirror Spot']),
+        create_lw_region(player, 'Lake Hylia Central Island', None, ['Capacity Upgrade', 'Lake Hylia Central Island Mirror Spot']),
+        create_cave_region(player, 'Blinds Hideout', 'a bounty of five items', ["Blind\'s Hideout - Top",
+                                                                        "Blind\'s Hideout - Left",
+                                                                        "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', 'Northeast Dark World Mirror Spot']),
+        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']),
+        create_cave_region(player, 'Hyrule Castle Secret Entrance', 'a drop\'s exit', ['Link\'s Uncle', 'Secret Passage'], ['Hyrule Castle Secret Entrance Exit']),
+        create_lw_region(player, 'Zoras River', ['King Zora', 'Zora\'s Ledge']),
+        create_cave_region(player, 'Waterfall of Wishing', 'a cave with two chests', ['Waterfall Fairy - Left', 'Waterfall Fairy - Right']),
+        create_lw_region(player, 'Kings Grave Area', None, ['Kings Grave', 'Kings Grave Inner Rocks']),
+        create_cave_region(player, 'Kings Grave', 'a cave with a chest', ['King\'s Tomb']),
+        create_cave_region(player, 'North Fairy Cave', 'a drop\'s exit', None, ['North Fairy Cave Exit']),
+        create_cave_region(player, 'Dam', 'the dam', ['Floodgate', 'Floodgate Chest']),
+        create_cave_region(player, 'Inverted Links House', 'your house', ['Link\'s House'], ['Inverted Links House Exit']),
+        create_cave_region(player, 'Chris Houlihan Room', 'I AM ERROR', None, ['Chris Houlihan Room Exit']),
+        create_cave_region(player, 'Tavern', 'the tavern', ['Kakariko Tavern']),
+        create_cave_region(player, 'Elder House', 'a connector', None, ['Elder House Exit (East)', 'Elder House Exit (West)']),
+        create_cave_region(player, 'Snitch Lady (East)', 'a boring house'),
+        create_cave_region(player, 'Snitch Lady (West)', 'a boring house'),
+        create_cave_region(player, 'Bush Covered House', 'the grass man'),
+        create_cave_region(player, 'Tavern (Front)', 'the tavern'),
+        create_cave_region(player, 'Light World Bomb Hut', 'a restock room'),
+        create_cave_region(player, 'Kakariko Shop', 'a common shop'),
+        create_cave_region(player, 'Fortune Teller (Light)', 'a fortune teller'),
+        create_cave_region(player, 'Lake Hylia Fortune Teller', 'a fortune teller'),
+        create_cave_region(player, 'Lumberjack House', 'a boring house'),
+        create_cave_region(player, 'Bonk Fairy (Light)', 'a fairy fountain'),
+        create_cave_region(player, 'Bonk Fairy (Dark)', 'a fairy fountain'),
+        create_cave_region(player, 'Lake Hylia Healer Fairy', 'a fairy fountain'),
+        create_cave_region(player, 'Swamp Healer Fairy', 'a fairy fountain'),
+        create_cave_region(player, 'Desert Healer Fairy', 'a fairy fountain'),
+        create_cave_region(player, 'Dark Lake Hylia Healer Fairy', 'a fairy fountain'),
+        create_cave_region(player, 'Dark Lake Hylia Ledge Healer Fairy', 'a fairy fountain'),
+        create_cave_region(player, 'Dark Desert Healer Fairy', 'a fairy fountain'),
+        create_cave_region(player, 'Dark Death Mountain Healer Fairy', 'a fairy fountain'),
+        create_cave_region(player, 'Chicken House', 'a house with a chest', ['Chicken House']),
+        create_cave_region(player, 'Aginahs Cave', 'a cave with a chest', ['Aginah\'s Cave']),
+        create_cave_region(player, 'Sahasrahlas Hut', 'Sahasrahla', ['Sahasrahla\'s Hut - Left', 'Sahasrahla\'s Hut - Middle', 'Sahasrahla\'s Hut - Right', 'Sahasrahla']),
+        create_cave_region(player, 'Kakariko Well (top)', 'a drop\'s exit', ['Kakariko Well - Top', 'Kakariko Well - Left', 'Kakariko Well - Middle',
+                                                                     'Kakariko Well - Right', 'Kakariko Well - Bottom'], ['Kakariko Well (top to bottom)']),
+        create_cave_region(player, 'Kakariko Well (bottom)', 'a drop\'s exit', None, ['Kakariko Well Exit']),
+        create_cave_region(player, 'Blacksmiths Hut', 'the smith', ['Blacksmith', 'Missing Smith']),
+        create_lw_region(player, 'Bat Cave Drop Ledge', None, ['Bat Cave Drop']),
+        create_cave_region(player, 'Bat Cave (right)', 'a drop\'s exit', ['Magic Bat'], ['Bat Cave Door']),
+        create_cave_region(player, 'Bat Cave (left)', 'a drop\'s exit', None, ['Bat Cave Exit']),
+        create_cave_region(player, 'Sick Kids House', 'the sick kid', ['Sick Kid']),
+        create_lw_region(player, 'Hobo Bridge', ['Hobo']),
+        create_cave_region(player, 'Lost Woods Hideout (top)', 'a drop\'s exit', ['Lost Woods Hideout'], ['Lost Woods Hideout (top to bottom)']),
+        create_cave_region(player, 'Lost Woods Hideout (bottom)', 'a drop\'s exit', None, ['Lost Woods Hideout Exit']),
+        create_cave_region(player, 'Lumberjack Tree (top)', 'a drop\'s exit', ['Lumberjack Tree'], ['Lumberjack Tree (top to bottom)']),
+        create_cave_region(player, 'Lumberjack Tree (bottom)', 'a drop\'s exit', None, ['Lumberjack Tree Exit']),
+        create_cave_region(player, 'Cave 45', 'a cave with an item', ['Cave 45']),
+        create_cave_region(player, 'Graveyard Cave', 'a cave with an item', ['Graveyard Cave']),
+        create_cave_region(player, 'Checkerboard Cave', 'a cave with an item', ['Checkerboard Cave']),
+        create_cave_region(player, 'Long Fairy Cave', 'a fairy fountain'),
+        create_cave_region(player, 'Mini Moldorm Cave', 'a bounty of five items', ['Mini Moldorm Cave - Far Left', 'Mini Moldorm Cave - Left', 'Mini Moldorm Cave - Right',
+                                                                           'Mini Moldorm Cave - Far Right', 'Mini Moldorm Cave - Generous Guy']),
+        create_cave_region(player, 'Ice Rod Cave', 'a cave with a chest', ['Ice Rod Cave']),
+        create_cave_region(player, 'Good Bee Cave', 'a cold bee'),
+        create_cave_region(player, '20 Rupee Cave', 'a cave with some cash'),
+        create_cave_region(player, 'Cave Shop (Lake Hylia)', 'a common shop'),
+        create_cave_region(player, 'Cave Shop (Dark Death Mountain)', 'a common shop'),
+        create_cave_region(player, 'Bonk Rock Cave', 'a cave with a chest', ['Bonk Rock Cave']),
+        create_cave_region(player, 'Library', 'the library', ['Library']),
+        create_cave_region(player, 'Kakariko Gamble Game', 'a game of chance'),
+        create_cave_region(player, 'Potion Shop', 'the potion shop', ['Potion Shop']),
+        create_lw_region(player, 'Lake Hylia Island', ['Lake Hylia Island']),
+        create_cave_region(player, 'Capacity Upgrade', 'the queen of fairies'),
+        create_cave_region(player, 'Two Brothers House', 'a connector', None, ['Two Brothers House Exit (East)', 'Two Brothers House Exit (West)']),
+        create_lw_region(player, 'Maze Race Ledge', ['Maze Race'], ['Two Brothers House (West)', 'Maze Race Mirror Spot']),
+        create_cave_region(player, '50 Rupee Cave', 'a cave with some cash'),
+        create_lw_region(player, 'Desert Ledge', ['Desert Ledge'], ['Desert Palace Entrance (North) Rocks', 'Desert Palace Entrance (West)', 'Desert Ledge Drop']),
+        create_lw_region(player, 'Desert Palace Stairs', None, ['Desert Palace Entrance (South)', 'Desert Palace Stairs Mirror Spot']),
+        create_lw_region(player, 'Desert Palace Lone Stairs', None, ['Desert Palace Stairs Drop', 'Desert Palace Entrance (East)']),
+        create_lw_region(player, 'Desert Palace Entrance (North) Spot', None, ['Desert Palace Entrance (North)', 'Desert Ledge Return Rocks', 'Desert Palace North Mirror Spot']),
+        create_dungeon_region(player, 'Desert Palace Main (Outer)', 'Desert Palace', ['Desert Palace - Big Chest', 'Desert Palace - Torch', 'Desert Palace - Map Chest'],
+                              ['Desert Palace Pots (Outer)', 'Desert Palace Exit (West)', 'Desert Palace Exit (East)', 'Desert Palace East Wing']),
+        create_dungeon_region(player, 'Desert Palace Main (Inner)', 'Desert Palace', None, ['Desert Palace Exit (South)', 'Desert Palace Pots (Inner)']),
+        create_dungeon_region(player, 'Desert Palace East', 'Desert Palace', ['Desert Palace - Compass Chest', 'Desert Palace - Big Key Chest']),
+        create_dungeon_region(player, 'Desert Palace North', 'Desert Palace', ['Desert Palace - Boss', 'Desert Palace - Prize'], ['Desert Palace Exit (North)']),
+        create_dungeon_region(player, 'Eastern Palace', 'Eastern Palace', ['Eastern Palace - Compass Chest', 'Eastern Palace - Big Chest', 'Eastern Palace - Cannonball Chest',
+                                                 'Eastern Palace - Big Key Chest', 'Eastern Palace - Map Chest', 'Eastern Palace - Boss', 'Eastern Palace - Prize'], ['Eastern Palace Exit']),
+        create_lw_region(player, 'Master Sword Meadow', ['Master Sword Pedestal']),
+        create_cave_region(player, 'Lost Woods Gamble', 'a game of chance'),
+        create_lw_region(player, 'Hyrule Castle Ledge', None, ['Hyrule Castle Entrance (East)', 'Hyrule Castle Entrance (West)', 'Inverted Ganons Tower', 'Hyrule Castle Ledge Courtyard Drop', 'Inverted Pyramid Hole']),
+        create_dungeon_region(player, 'Hyrule Castle', 'Hyrule Castle', ['Hyrule Castle - Boomerang Chest', 'Hyrule Castle - Map Chest', 'Hyrule Castle - Zelda\'s Chest'],
+                              ['Hyrule Castle Exit (East)', 'Hyrule Castle Exit (West)', 'Hyrule Castle Exit (South)', 'Throne Room']),
+        create_dungeon_region(player, 'Sewer Drop', 'a drop\'s exit', None, ['Sewer Drop']),  # This exists only to be referenced for access checks
+        create_dungeon_region(player, 'Sewers (Dark)', 'a drop\'s exit', ['Sewers - Dark Cross'], ['Sewers Door']),
+        create_dungeon_region(player, 'Sewers', 'a drop\'s exit', ['Sewers - Secret Room - Left', 'Sewers - Secret Room - Middle',
+                                         'Sewers - Secret Room - Right'], ['Sanctuary Push Door', 'Sewers Back Door']),
+        create_dungeon_region(player, 'Sanctuary', 'a drop\'s exit', ['Sanctuary'], ['Sanctuary Exit']),
+        create_dungeon_region(player, 'Inverted Agahnims Tower', 'Castle Tower', ['Castle Tower - Room 03', 'Castle Tower - Dark Maze'], ['Agahnim 1', 'Inverted Agahnims Tower Exit']),
+        create_dungeon_region(player, 'Agahnim 1', 'Castle Tower', ['Agahnim 1'], None),
+        create_cave_region(player, 'Old Man Cave', 'a connector', ['Old Man'], ['Old Man Cave Exit (East)', 'Old Man Cave Exit (West)']),
+        create_cave_region(player, 'Old Man House', 'a connector', None, ['Old Man House Exit (Bottom)', 'Old Man House Front to Back']),
+        create_cave_region(player, 'Old Man House Back', 'a connector', None, ['Old Man House Exit (Top)', 'Old Man House Back to Front']),
+        create_lw_region(player, 'Death Mountain', None, ['Old Man Cave (East)', 'Old Man House (Bottom)', 'Old Man House (Top)', 'Death Mountain Return Cave (East)', 'Spectacle Rock Cave', 
+                                                  'Spectacle Rock Cave Peak', 'Spectacle Rock Cave (Bottom)', 'Broken Bridge (West)', 'Death Mountain Mirror Spot', 'WDM Hyrule Castle Ledge SQ']),
+        create_cave_region(player, 'Death Mountain Return Cave', 'a connector', None, ['Death Mountain Return Cave Exit (West)', 'Death Mountain Return Cave Exit (East)']),
+        create_lw_region(player, 'Death Mountain Return Ledge', None, ['Death Mountain Return Ledge Drop', 'Death Mountain Return Cave (West)', 'Bumper Cave Ledge Mirror Spot']),
+        create_cave_region(player, 'Spectacle Rock Cave (Top)', 'a connector', ['Spectacle Rock Cave'], ['Spectacle Rock Cave Drop', 'Spectacle Rock Cave Exit (Top)']),
+        create_cave_region(player, 'Spectacle Rock Cave (Bottom)', 'a connector', None, ['Spectacle Rock Cave Exit']),
+        create_cave_region(player, 'Spectacle Rock Cave (Peak)', 'a connector', None, ['Spectacle Rock Cave Peak Drop', 'Spectacle Rock Cave Exit (Peak)']),
+        create_lw_region(player, 'East Death Mountain (Bottom)', None, ['Broken Bridge (East)', 'Paradox Cave (Bottom)', 'Paradox Cave (Middle)', 'East Death Mountain Mirror Spot (Bottom)', 'Hookshot Fairy', 
+                                                                'Fairy Ascension Rocks', 'Spiral Cave (Bottom)', 'EDM Hyrule Castle Ledge SQ']),
+        create_cave_region(player, 'Hookshot Fairy', 'fairies deep in a cave'),
+        create_cave_region(player, 'Paradox Cave Front', 'a connector', None, ['Paradox Cave Push Block Reverse', 'Paradox Cave Exit (Bottom)', 'Light World Death Mountain Shop']),
+        create_cave_region(player, 'Paradox Cave Chest Area', 'a connector', ['Paradox Cave Lower - Far Left',
+                                                                      'Paradox Cave Lower - Left',
+                                                                      'Paradox Cave Lower - Right',
+                                                                      'Paradox Cave Lower - Far Right',
+                                                                      'Paradox Cave Lower - Middle',
+                                                                      'Paradox Cave Upper - Left',
+                                                                      'Paradox Cave Upper - Right'],
+                           ['Paradox Cave Push Block', 'Paradox Cave Bomb Jump']),
+        create_cave_region(player, 'Paradox Cave', 'a connector', None, ['Paradox Cave Exit (Middle)', 'Paradox Cave Exit (Top)', 'Paradox Cave Drop']),
+        create_cave_region(player, 'Light World Death Mountain Shop', 'a common shop'),
+        create_lw_region(player, 'East Death Mountain (Top)', ['Floating Island'], ['Paradox Cave (Top)', 'Death Mountain (Top)', 'Spiral Cave Ledge Access', 'East Death Mountain Drop', 'East Death Mountain Mirror Spot (Top)', 'Fairy Ascension Ledge Access', 'Mimic Cave Ledge Access',
+                                                                            'Floating Island Mirror Spot']),
+        create_lw_region(player, 'Spiral Cave Ledge', None, ['Spiral Cave', 'Spiral Cave Ledge Drop', 'Dark Death Mountain Ledge Mirror Spot (West)']),
+        create_lw_region(player, 'Mimic Cave Ledge', None, ['Mimic Cave', 'Mimic Cave Ledge Drop', 'Dark Death Mountain Ledge Mirror Spot (East)']),
+        create_cave_region(player, 'Spiral Cave (Top)', 'a connector', ['Spiral Cave'], ['Spiral Cave (top to bottom)', 'Spiral Cave Exit (Top)']),
+        create_cave_region(player, 'Spiral Cave (Bottom)', 'a connector', None, ['Spiral Cave Exit']),
+        create_lw_region(player, 'Fairy Ascension Plateau', None, ['Fairy Ascension Drop', 'Fairy Ascension Cave (Bottom)']),
+        create_cave_region(player, 'Fairy Ascension Cave (Bottom)', 'a connector', None, ['Fairy Ascension Cave Climb', 'Fairy Ascension Cave Exit (Bottom)']),
+        create_cave_region(player, 'Fairy Ascension Cave (Drop)', 'a connector', None, ['Fairy Ascension Cave Pots']),
+        create_cave_region(player, 'Fairy Ascension Cave (Top)', 'a connector', None, ['Fairy Ascension Cave Exit (Top)', 'Fairy Ascension Cave Drop']),
+        create_lw_region(player, 'Fairy Ascension Ledge', None, ['Fairy Ascension Ledge Drop', 'Fairy Ascension Cave (Top)', 'Laser Bridge Mirror Spot']),
+        create_lw_region(player, 'Death Mountain (Top)', ['Ether Tablet', 'Spectacle Rock'], ['East Death Mountain (Top)', 'Tower of Hera', 'Death Mountain Drop', 'Death Mountain (Top) Mirror Spot']),
+        create_dw_region(player, 'Bumper Cave Ledge', ['Bumper Cave Ledge'], ['Bumper Cave Ledge Drop', 'Bumper Cave (Top)']),
+        create_dungeon_region(player, 'Tower of Hera (Bottom)', 'Tower of Hera', ['Tower of Hera - Basement Cage', 'Tower of Hera - Map Chest'], ['Tower of Hera Small Key Door', 'Tower of Hera Big Key Door', 'Tower of Hera Exit']),
+        create_dungeon_region(player, 'Tower of Hera (Basement)', 'Tower of Hera', ['Tower of Hera - Big Key Chest']),
+        create_dungeon_region(player, 'Tower of Hera (Top)', 'Tower of Hera', ['Tower of Hera - Compass Chest', 'Tower of Hera - Big Chest', 'Tower of Hera - Boss', 'Tower of Hera - Prize']),
+
+        create_dw_region(player, 'East Dark World', ['Pyramid'], ['Pyramid Fairy', 'South Dark World Bridge', 'Palace of Darkness', 'Dark Lake Hylia Drop (East)', 
+                                                          'Dark Lake Hylia Fairy', 'Palace of Darkness Hint', 'East Dark World Hint', 'Northeast Dark World Broken Bridge Pass', 'East Dark World Teleporter', 'EDW Flute']),
+        create_dw_region(player, 'Northeast Dark World', ['Catfish'], ['West Dark World Gap', 'Dark World Potion Shop', 'East Dark World Broken Bridge Pass', 'NEDW Flute', 'Dark Lake Hylia Teleporter']),
+        create_cave_region(player, 'Palace of Darkness Hint', 'a storyteller'),
+        create_cave_region(player, 'East Dark World Hint', 'a storyteller'),
+        create_dw_region(player, 'South Dark World', ['Stumpy', 'Digging Game'], ['Dark Lake Hylia Drop (South)', 'Hype Cave', 'Swamp Palace', 'Village of Outcasts Heavy Rock', 'East Dark World Bridge', 'Inverted Links House', 'Archery Game', 'Bonk Fairy (Dark)', 
+                                              'Dark Lake Hylia Shop', 'South Dark World Teleporter', 'Post Aga Teleporter', 'SDW Flute']),
+        create_cave_region(player, 'Inverted Big Bomb Shop', 'the bomb shop'),
+        create_cave_region(player, 'Archery Game', 'a game of skill'),
+        create_dw_region(player, 'Dark Lake Hylia', None, ['East Dark World Pier', 'Dark Lake Hylia Ledge Pier', 'Ice Palace', 'Dark Lake Hylia Central Island Teleporter']),
+        create_dw_region(player, 'Dark Lake Hylia Ledge', None, ['Dark Lake Hylia Ledge Drop', 'Dark Lake Hylia Ledge Fairy', 'Dark Lake Hylia Ledge Hint', 'Dark Lake Hylia Ledge Spike Cave', 'DLHL Flute']),
+        create_cave_region(player, 'Dark Lake Hylia Ledge Hint', 'a storyteller'),
+        create_cave_region(player, 'Dark Lake Hylia Ledge Spike Cave', 'a spiky hint'),
+        create_cave_region(player, 'Hype Cave', 'a bounty of five items', ['Hype Cave - Top', 'Hype Cave - Middle Right', 'Hype Cave - Middle Left',
+                                                                   'Hype Cave - Bottom', 'Hype Cave - Generous Guy']),
+        create_dw_region(player, 'West Dark World', ['Frog'], ['Village of Outcasts Drop', 'East Dark World River Pier', 'Brewery', 'C-Shaped House', 'Chest Game', 'Thieves Town', 'Bumper Cave Entrance Rock',
+                                                       'Skull Woods Forest', 'Village of Outcasts Pegs', 'Village of Outcasts Eastern Rocks', 'Red Shield Shop', 'Inverted Dark Sanctuary', 'Fortune Teller (Dark)', 'Dark World Lumberjack Shop',
+                                                       'West Dark World Teleporter', 'WDW Flute']),
+        create_dw_region(player, 'Dark Grassy Lawn', None, ['Grassy Lawn Pegs', 'Dark World Shop', 'Dark Grassy Lawn Flute']),
+        create_dw_region(player, 'Hammer Peg Area', ['Dark Blacksmith Ruins'], ['Dark World Hammer Peg Cave', 'Peg Area Rocks', 'Hammer Peg Area Flute']),
+        create_dw_region(player, 'Bumper Cave Entrance', None, ['Bumper Cave (Bottom)', 'Bumper Cave Entrance Drop']),
+        create_cave_region(player, 'Fortune Teller (Dark)', 'a fortune teller'),
+        create_cave_region(player, 'Village of Outcasts Shop', 'a common shop'),
+        create_cave_region(player, 'Dark Lake Hylia Shop', 'a common shop'),
+        create_cave_region(player, 'Dark World Lumberjack Shop', 'a common shop'),
+        create_cave_region(player, 'Dark World Potion Shop', 'a common shop'),
+        create_cave_region(player, 'Dark World Hammer Peg Cave', 'a cave with an item', ['Peg Cave']),
+        create_cave_region(player, 'Pyramid Fairy', 'a cave with two chests', ['Pyramid Fairy - Left', 'Pyramid Fairy - Right']),
+        create_cave_region(player, 'Brewery', 'a house with a chest', ['Brewery']),
+        create_cave_region(player, 'C-Shaped House', 'a house with a chest', ['C-Shaped House']),
+        create_cave_region(player, 'Chest Game', 'a game of 16 chests', ['Chest Game']),
+        create_cave_region(player, 'Red Shield Shop', 'the rare shop'),
+        create_cave_region(player, 'Inverted Dark Sanctuary', 'a storyteller'),
+        create_cave_region(player, 'Bumper Cave', 'a connector', None, ['Bumper Cave Exit (Bottom)', 'Bumper Cave Exit (Top)']),
+        create_dw_region(player, 'Skull Woods Forest', None, ['Skull Woods First Section Hole (East)', 'Skull Woods First Section Hole (West)', 'Skull Woods First Section Hole (North)',
+                                                      'Skull Woods First Section Door', 'Skull Woods Second Section Door (East)']),
+        create_dw_region(player, 'Skull Woods Forest (West)', None, ['Skull Woods Second Section Hole', 'Skull Woods Second Section Door (West)', 'Skull Woods Final Section']),
+        create_dw_region(player, 'Dark Desert',  None, ['Misery Mire', 'Mire Shed', 'Dark Desert Hint', 'Dark Desert Fairy', 'DD Flute']),
+        create_dw_region(player, 'Dark Desert Ledge',  None, ['Dark Desert Drop', 'Dark Desert Teleporter']),
+        create_cave_region(player, 'Mire Shed', 'a cave with two chests', ['Mire Shed - Left', 'Mire Shed - Right']),
+        create_cave_region(player, 'Dark Desert Hint', 'a storyteller'),
+        create_dw_region(player, 'Dark Death Mountain', None, ['Dark Death Mountain Drop (East)', 'Inverted Agahnims Tower', 'Superbunny Cave (Top)', 'Hookshot Cave', 'Turtle Rock', 
+                                                      'Spike Cave', 'Dark Death Mountain Fairy', 'Dark Death Mountain Teleporter (West)', 'Turtle Rock Tail Drop', 'DDM Flute']),
+        create_dw_region(player, 'Dark Death Mountain Ledge', None, ['Dark Death Mountain Ledge (East)', 'Dark Death Mountain Ledge (West)']),
+        create_dw_region(player, 'Turtle Rock (Top)', None, ['Dark Death Mountain Teleporter (East)', 'Turtle Rock Drop']),
+        create_dw_region(player, 'Dark Death Mountain Isolated Ledge', None, ['Turtle Rock Isolated Ledge Entrance']),
+        create_dw_region(player, 'Dark Death Mountain (East Bottom)', None, ['Superbunny Cave (Bottom)', 'Cave Shop (Dark Death Mountain)', 'Dark Death Mountain Teleporter (East Bottom)', 'EDDM Flute']),
+        create_cave_region(player, 'Superbunny Cave', 'a connector', ['Superbunny Cave - Top', 'Superbunny Cave - Bottom'],
+                           ['Superbunny Cave Exit (Top)', 'Superbunny Cave Exit (Bottom)']),
+        create_cave_region(player, 'Spike Cave', 'Spike Cave', ['Spike Cave']),
+        create_cave_region(player, 'Hookshot Cave', 'a connector', ['Hookshot Cave - Top Right', 'Hookshot Cave - Top Left', 'Hookshot Cave - Bottom Right', 'Hookshot Cave - Bottom Left'],
+                           ['Hookshot Cave Exit (South)', 'Hookshot Cave Exit (North)']),
+        create_dw_region(player, 'Death Mountain Floating Island (Dark World)', None, ['Floating Island Drop', 'Hookshot Cave Back Entrance']),
+        create_cave_region(player, 'Mimic Cave', 'Mimic Cave', ['Mimic Cave']),
+
+        create_dungeon_region(player, 'Swamp Palace (Entrance)', 'Swamp Palace', None, ['Swamp Palace Moat', 'Swamp Palace Exit']),
+        create_dungeon_region(player, 'Swamp Palace (First Room)', 'Swamp Palace', ['Swamp Palace - Entrance'], ['Swamp Palace Small Key Door']),
+        create_dungeon_region(player, 'Swamp Palace (Starting Area)', 'Swamp Palace', ['Swamp Palace - Map Chest'], ['Swamp Palace (Center)']),
+        create_dungeon_region(player, 'Swamp Palace (Center)', 'Swamp Palace', ['Swamp Palace - Big Chest', 'Swamp Palace - Compass Chest',
+                                                                        'Swamp Palace - Big Key Chest', 'Swamp Palace - West Chest'], ['Swamp Palace (North)']),
+        create_dungeon_region(player, 'Swamp Palace (North)', 'Swamp Palace', ['Swamp Palace - Flooded Room - Left', 'Swamp Palace - Flooded Room - Right',
+                                                                       'Swamp Palace - Waterfall Room', 'Swamp Palace - Boss', 'Swamp Palace - Prize']),
+        create_dungeon_region(player, 'Thieves Town (Entrance)', 'Thieves\' Town', ['Thieves\' Town - Big Key Chest',
+                                                                            'Thieves\' Town - Map Chest',
+                                                                            'Thieves\' Town - Compass Chest',
+                                                                            'Thieves\' Town - Ambush Chest'], ['Thieves Town Big Key Door', 'Thieves Town Exit']),
+        create_dungeon_region(player, 'Thieves Town (Deep)', 'Thieves\' Town', ['Thieves\' Town - Attic',
+                                                                        'Thieves\' Town - Big Chest',
+                                                                        'Thieves\' Town - Blind\'s Cell'], ['Blind Fight']),
+        create_dungeon_region(player, 'Blind Fight', 'Thieves\' Town', ['Thieves\' Town - Boss', 'Thieves\' Town - Prize']),
+        create_dungeon_region(player, 'Skull Woods First Section', 'Skull Woods', ['Skull Woods - Map Chest'], ['Skull Woods First Section Exit', 'Skull Woods First Section Bomb Jump', 'Skull Woods First Section South Door', 'Skull Woods First Section West Door']),
+        create_dungeon_region(player, 'Skull Woods First Section (Right)', 'Skull Woods', ['Skull Woods - Pinball Room'], ['Skull Woods First Section (Right) North Door']),
+        create_dungeon_region(player, 'Skull Woods First Section (Left)', 'Skull Woods', ['Skull Woods - Compass Chest', 'Skull Woods - Pot Prison'], ['Skull Woods First Section (Left) Door to Exit', 'Skull Woods First Section (Left) Door to Right']),
+        create_dungeon_region(player, 'Skull Woods First Section (Top)', 'Skull Woods', ['Skull Woods - Big Chest'], ['Skull Woods First Section (Top) One-Way Path']),
+        create_dungeon_region(player, 'Skull Woods Second Section (Drop)', 'Skull Woods', None, ['Skull Woods Second Section (Drop)']),
+        create_dungeon_region(player, 'Skull Woods Second Section', 'Skull Woods', ['Skull Woods - Big Key Chest'], ['Skull Woods Second Section Exit (East)', 'Skull Woods Second Section Exit (West)']),
+        create_dungeon_region(player, 'Skull Woods Final Section (Entrance)', 'Skull Woods', ['Skull Woods - Bridge Room'], ['Skull Woods Torch Room', 'Skull Woods Final Section Exit']),
+        create_dungeon_region(player, 'Skull Woods Final Section (Mothula)', 'Skull Woods', ['Skull Woods - Boss', 'Skull Woods - Prize']),
+        create_dungeon_region(player, 'Ice Palace (Entrance)', 'Ice Palace', None, ['Ice Palace Entrance Room', 'Ice Palace Exit']),
+        create_dungeon_region(player, 'Ice Palace (Main)', 'Ice Palace', ['Ice Palace - Compass Chest', 'Ice Palace - Freezor Chest',
+                                                                  'Ice Palace - Big Chest', 'Ice Palace - Iced T Room'], ['Ice Palace (East)', 'Ice Palace (Kholdstare)']),
+        create_dungeon_region(player, 'Ice Palace (East)', 'Ice Palace', ['Ice Palace - Spike Room'], ['Ice Palace (East Top)']),
+        create_dungeon_region(player, 'Ice Palace (East Top)', 'Ice Palace', ['Ice Palace - Big Key Chest', 'Ice Palace - Map Chest']),
+        create_dungeon_region(player, 'Ice Palace (Kholdstare)', 'Ice Palace', ['Ice Palace - Boss', 'Ice Palace - Prize']),
+        create_dungeon_region(player, 'Misery Mire (Entrance)', 'Misery Mire', None, ['Misery Mire Entrance Gap', 'Misery Mire Exit']),
+        create_dungeon_region(player, 'Misery Mire (Main)', 'Misery Mire', ['Misery Mire - Big Chest', 'Misery Mire - Map Chest', 'Misery Mire - Main Lobby',
+                                                                    'Misery Mire - Bridge Chest', 'Misery Mire - Spike Chest'], ['Misery Mire (West)', 'Misery Mire Big Key Door']),
+        create_dungeon_region(player, 'Misery Mire (West)', 'Misery Mire', ['Misery Mire - Compass Chest', 'Misery Mire - Big Key Chest']),
+        create_dungeon_region(player, 'Misery Mire (Final Area)', 'Misery Mire', None, ['Misery Mire (Vitreous)']),
+        create_dungeon_region(player, 'Misery Mire (Vitreous)', 'Misery Mire', ['Misery Mire - Boss', 'Misery Mire - Prize']),
+        create_dungeon_region(player, 'Turtle Rock (Entrance)', 'Turtle Rock', None, ['Turtle Rock Entrance Gap', 'Turtle Rock Exit (Front)']),
+        create_dungeon_region(player, 'Turtle Rock (First Section)', 'Turtle Rock', ['Turtle Rock - Compass Chest', 'Turtle Rock - Roller Room - Left',
+                                                                             'Turtle Rock - Roller Room - Right'], ['Turtle Rock Pokey Room', 'Turtle Rock Entrance Gap Reverse']),
+        create_dungeon_region(player, 'Turtle Rock (Chain Chomp Room)', 'Turtle Rock', ['Turtle Rock - Chain Chomps'], ['Turtle Rock (Chain Chomp Room) (North)', 'Turtle Rock (Chain Chomp Room) (South)']),
+        create_dungeon_region(player, 'Turtle Rock (Second Section)', 'Turtle Rock', ['Turtle Rock - Big Key Chest'], ['Turtle Rock Ledge Exit (West)', 'Turtle Rock Chain Chomp Staircase', 'Turtle Rock Big Key Door']),
+        create_dungeon_region(player, 'Turtle Rock (Big Chest)', 'Turtle Rock', ['Turtle Rock - Big Chest'], ['Turtle Rock (Big Chest) (North)', 'Turtle Rock Ledge Exit (East)']),
+        create_dungeon_region(player, 'Turtle Rock (Crystaroller Room)', 'Turtle Rock', ['Turtle Rock - Crystaroller Room'], ['Turtle Rock Dark Room Staircase', 'Turtle Rock Big Key Door Reverse']),
+        create_dungeon_region(player, 'Turtle Rock (Dark Room)', 'Turtle Rock', None, ['Turtle Rock (Dark Room) (North)', 'Turtle Rock (Dark Room) (South)']),
+        create_dungeon_region(player, 'Turtle Rock (Eye Bridge)', 'Turtle Rock', ['Turtle Rock - Eye Bridge - Bottom Left', 'Turtle Rock - Eye Bridge - Bottom Right',
+                                                                          'Turtle Rock - Eye Bridge - Top Left', 'Turtle Rock - Eye Bridge - Top Right'],
+                              ['Turtle Rock Dark Room (South)', 'Turtle Rock (Trinexx)', 'Turtle Rock Isolated Ledge Exit']),
+        create_dungeon_region(player, 'Turtle Rock (Trinexx)', 'Turtle Rock', ['Turtle Rock - Boss', 'Turtle Rock - Prize']),
+        create_dungeon_region(player, 'Palace of Darkness (Entrance)', 'Palace of Darkness', ['Palace of Darkness - Shooter Room'], ['Palace of Darkness Bridge Room', 'Palace of Darkness Bonk Wall', 'Palace of Darkness Exit']),
+        create_dungeon_region(player, 'Palace of Darkness (Center)', 'Palace of Darkness', ['Palace of Darkness - The Arena - Bridge', 'Palace of Darkness - Stalfos Basement'],
+                              ['Palace of Darkness Big Key Chest Staircase', 'Palace of Darkness (North)', 'Palace of Darkness Big Key Door']),
+        create_dungeon_region(player, 'Palace of Darkness (Big Key Chest)', 'Palace of Darkness', ['Palace of Darkness - Big Key Chest']),
+        create_dungeon_region(player, 'Palace of Darkness (Bonk Section)', 'Palace of Darkness', ['Palace of Darkness - The Arena - Ledge', 'Palace of Darkness - Map Chest'], ['Palace of Darkness Hammer Peg Drop']),
+        create_dungeon_region(player, 'Palace of Darkness (North)', 'Palace of Darkness', ['Palace of Darkness - Compass Chest', 'Palace of Darkness - Dark Basement - Left', 'Palace of Darkness - Dark Basement - Right'],
+                              ['Palace of Darkness Spike Statue Room Door', 'Palace of Darkness Maze Door']),
+        create_dungeon_region(player, 'Palace of Darkness (Maze)', 'Palace of Darkness', ['Palace of Darkness - Dark Maze - Top', 'Palace of Darkness - Dark Maze - Bottom', 'Palace of Darkness - Big Chest']),
+        create_dungeon_region(player, 'Palace of Darkness (Harmless Hellway)', 'Palace of Darkness', ['Palace of Darkness - Harmless Hellway']),
+        create_dungeon_region(player, 'Palace of Darkness (Final Section)', 'Palace of Darkness', ['Palace of Darkness - Boss', 'Palace of Darkness - Prize']),
+        create_dungeon_region(player, 'Inverted Ganons Tower (Entrance)', 'Ganon\'s Tower', ['Ganons Tower - Bob\'s Torch', 'Ganons Tower - Hope Room - Left', 'Ganons Tower - Hope Room - Right'],
+                              ['Ganons Tower (Tile Room)', 'Ganons Tower (Hookshot Room)', 'Ganons Tower Big Key Door', 'Inverted Ganons Tower Exit']),
+        create_dungeon_region(player, 'Ganons Tower (Tile Room)', 'Ganon\'s Tower', ['Ganons Tower - Tile Room'], ['Ganons Tower (Tile Room) Key Door']),
+        create_dungeon_region(player, 'Ganons Tower (Compass Room)', 'Ganon\'s Tower', ['Ganons Tower - Compass Room - Top Left', 'Ganons Tower - Compass Room - Top Right',
+                                                                                'Ganons Tower - Compass Room - Bottom Left', 'Ganons Tower - Compass Room - Bottom Right'],
+                              ['Ganons Tower (Bottom) (East)']),
+        create_dungeon_region(player, 'Ganons Tower (Hookshot Room)', 'Ganon\'s Tower', ['Ganons Tower - DMs Room - Top Left', 'Ganons Tower - DMs Room - Top Right',
+                                                                                 'Ganons Tower - DMs Room - Bottom Left', 'Ganons Tower - DMs Room - Bottom Right'],
+                              ['Ganons Tower (Map Room)', 'Ganons Tower (Double Switch Room)']),
+        create_dungeon_region(player, 'Ganons Tower (Map Room)', 'Ganon\'s Tower', ['Ganons Tower - Map Chest']),
+        create_dungeon_region(player, 'Ganons Tower (Firesnake Room)', 'Ganon\'s Tower', ['Ganons Tower - Firesnake Room'], ['Ganons Tower (Firesnake Room)']),
+        create_dungeon_region(player, 'Ganons Tower (Teleport Room)', 'Ganon\'s Tower', ['Ganons Tower - Randomizer Room - Top Left', 'Ganons Tower - Randomizer Room - Top Right',
+                                                                                 'Ganons Tower - Randomizer Room - Bottom Left', 'Ganons Tower - Randomizer Room - Bottom Right'],
+                              ['Ganons Tower (Bottom) (West)']),
+        create_dungeon_region(player, 'Ganons Tower (Bottom)', 'Ganon\'s Tower', ['Ganons Tower - Bob\'s Chest', 'Ganons Tower - Big Chest', 'Ganons Tower - Big Key Room - Left',
+                                                                          'Ganons Tower - Big Key Room - Right', 'Ganons Tower - Big Key Chest']),
+        create_dungeon_region(player, 'Ganons Tower (Top)', 'Ganon\'s Tower', None, ['Ganons Tower Torch Rooms']),
+        create_dungeon_region(player, 'Ganons Tower (Before Moldorm)', 'Ganon\'s Tower', ['Ganons Tower - Mini Helmasaur Room - Left', 'Ganons Tower - Mini Helmasaur Room - Right',
+                                                                                  'Ganons Tower - Pre-Moldorm Chest'], ['Ganons Tower Moldorm Door']),
+        create_dungeon_region(player, 'Ganons Tower (Moldorm)', 'Ganon\'s Tower', None, ['Ganons Tower Moldorm Gap']),
+        create_dungeon_region(player, 'Agahnim 2', 'Ganon\'s Tower', ['Ganons Tower - Validation Chest', 'Agahnim 2'], None),
+        create_cave_region(player, 'Pyramid', 'a drop\'s exit', ['Ganon'], ['Ganon Drop']),
+        create_cave_region(player, 'Bottom of Pyramid', 'a drop\'s exit', None, ['Pyramid Exit']),
+        create_dw_region(player, 'Pyramid Ledge', None, ['Pyramid Drop']),  # houlihan room exits here in inverted 
+        
+        # to simplify flute connections
+        create_cave_region(player, 'The Sky', 'A Dark Sky', None, ['DDM Landing','NEDW Landing', 'WDW Landing', 'SDW Landing', 'EDW Landing', 'DD Landing', 'DLHL Landing']) 
+    ]
+
+    for region_name, (room_id, shopkeeper, replaceable) in shop_table.items():
+        region = world.get_region(region_name, player)
+        shop = Shop(region, room_id, ShopType.Shop, shopkeeper, replaceable)
+        region.shop = shop
+        world.shops.append(shop)
+        for index, (item, price) in enumerate(default_shop_contents[region_name]):
+            shop.add_inventory(index, item, price)
+
+    region = world.get_region('Capacity Upgrade', player)
+    shop = Shop(region, 0x0115, ShopType.UpgradeShop, 0x04, True)
+    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)
+    world.intialize_regions()
+
+def create_lw_region(player, name, locations=None, exits=None):
+    return _create_region(player, name, RegionType.LightWorld, 'Light World', locations, exits)
+
+def create_dw_region(player, name, locations=None, exits=None):
+    return _create_region(player, name, RegionType.DarkWorld, 'Dark World', locations, exits)
+
+def create_cave_region(player, name, hint='Hyrule', locations=None, exits=None):
+    return _create_region(player, name, RegionType.Cave, hint, locations, exits)
+
+def create_dungeon_region(player, name, hint='Hyrule', locations=None, exits=None):
+    return _create_region(player, name, RegionType.Dungeon, hint, locations, exits)
+
+def _create_region(player, name, type, hint='Hyrule', locations=None, exits=None):
+    ret = Region(name, type, hint, player)
+    if locations is None:
+        locations = []
+    if exits is None:
+        exits = []
+
+    for exit in exits:
+        ret.exits.append(Entrance(player, exit, ret))
+    for location in locations:
+        address, crystal, hint_text = location_table[location]
+        ret.locations.append(Location(player, location, address, crystal, hint_text, ret))
+    return ret
+
+def mark_dark_world_regions(world):
+    # cross world caves may have some sections marked as both in_light_world, and in_dark_work.
+    # That is ok. the bunny logic will check for this case and incorporate special rules.
+
+    queue = collections.deque(region for region in world.regions if region.type == RegionType.DarkWorld)
+    seen = set(queue)
+    while queue:
+        current = queue.popleft()
+        current.is_dark_world = True
+        for exit in current.exits:
+            if exit.connected_region.type == RegionType.LightWorld:
+                # Don't venture into the dark world
+                continue
+            if exit.connected_region not in seen:
+                seen.add(exit.connected_region)
+                queue.append(exit.connected_region)
+
+    queue = collections.deque(region for region in world.regions if region.type == RegionType.LightWorld)
+    seen = set(queue)
+    while queue:
+        current = queue.popleft()
+        current.is_light_world = True
+        for exit in current.exits:
+            if exit.connected_region.type == RegionType.DarkWorld:
+                # Don't venture into the light world
+                continue
+            if exit.connected_region not in seen:
+                seen.add(exit.connected_region)
+                queue.append(exit.connected_region)
+
+# (room_id, shopkeeper, replaceable)
+shop_table = {
+    'Cave Shop (Dark Death Mountain)': (0x0112, 0xC1, True),
+    'Red Shield Shop': (0x0110, 0xC1, True),
+    'Dark Lake Hylia Shop': (0x010F, 0xC1, True),
+    'Dark World Lumberjack Shop': (0x010F, 0xC1, True),
+    'Village of Outcasts Shop': (0x010F, 0xC1, True),
+    'Dark World Potion Shop': (0x010F, 0xC1, True),
+    'Light World Death Mountain Shop': (0x00FF, 0xA0, True),
+    'Kakariko Shop': (0x011F, 0xA0, True),
+    'Cave Shop (Lake Hylia)': (0x0112, 0xA0, True),
+    'Potion Shop': (0x0109, 0xFF, False),
+    # Bomb Shop not currently modeled as a shop, due to special nature of items
+}
+# region, [item]
+# slot, item, price, max=0, replacement=None, replacement_price=0
+# item = (item, price)
+
+_basic_shop_defaults = [('Red Potion', 150), ('Small Heart', 10), ('Bombs (10)', 50)]
+_dark_world_shop_defaults = [('Red Potion', 150), ('Blue Shield', 50), ('Bombs (10)', 50)]
+default_shop_contents = {
+    'Cave Shop (Dark Death Mountain)': _basic_shop_defaults,
+    'Red Shield Shop': [('Red Shield', 500), ('Bee', 10), ('Arrows (10)', 30)],
+    'Dark Lake Hylia Shop': _dark_world_shop_defaults,
+    'Dark World Lumberjack Shop': _dark_world_shop_defaults,
+    'Village of Outcasts Shop': _dark_world_shop_defaults,
+    'Dark World Potion Shop': _dark_world_shop_defaults,
+    'Light World Death Mountain Shop': _basic_shop_defaults,
+    'Kakariko Shop': _basic_shop_defaults,
+    'Cave Shop (Lake Hylia)': _basic_shop_defaults,
+    'Potion Shop': [('Red Potion', 120), ('Green Potion', 60), ('Blue Potion', 160)],
+}
+
+location_table = {'Mushroom': (0x180013, False, 'in the woods'),
+                  'Bottle Merchant': (0x2EB18, False, 'with a merchant'),
+                  'Flute Spot': (0x18014A, False, 'underground'),
+                  'Sunken Treasure': (0x180145, False, 'underwater'),
+                  'Purple Chest': (0x33D68, False, 'from a box'),
+                  'Blind\'s Hideout - Top': (0xEB0F, False, 'in a basement'),
+                  'Blind\'s Hideout - Left': (0xEB12, False, 'in a basement'),
+                  'Blind\'s Hideout - Right': (0xEB15, False, 'in a basement'),
+                  'Blind\'s Hideout - Far Left': (0xEB18, False, 'in a basement'),
+                  'Blind\'s Hideout - Far Right': (0xEB1B, False, 'in a basement'),
+                  'Link\'s Uncle': (0x2DF45, False, 'with your uncle'),
+                  'Secret Passage': (0xE971, False, 'near your uncle'),
+                  'King Zora': (0xEE1C3, False, 'at a high price'),
+                  'Zora\'s Ledge': (0x180149, False, 'near Zora'),
+                  'Waterfall Fairy - Left': (0xE9B0, False, 'near a fairy'),
+                  'Waterfall Fairy - Right': (0xE9D1, False, 'near a fairy'),
+                  'King\'s Tomb': (0xE97A, False, 'alone in a cave'),
+                  'Floodgate Chest': (0xE98C, False, 'in the dam'),
+                  'Link\'s House': (0xE9BC, False, 'in your home'),
+                  'Kakariko Tavern': (0xE9CE, False, 'in the bar'),
+                  'Chicken House': (0xE9E9, False, 'near poultry'),
+                  'Aginah\'s Cave': (0xE9F2, False, 'with Aginah'),
+                  'Sahasrahla\'s Hut - Left': (0xEA82, False, 'near the elder'),
+                  'Sahasrahla\'s Hut - Middle': (0xEA85, False, 'near the elder'),
+                  'Sahasrahla\'s Hut - Right': (0xEA88, False, 'near the elder'),
+                  'Sahasrahla': (0x2F1FC, False, 'with the elder'),
+                  'Kakariko Well - Top': (0xEA8E, False, 'in a well'),
+                  'Kakariko Well - Left': (0xEA91, False, 'in a well'),
+                  'Kakariko Well - Middle': (0xEA94, False, 'in a well'),
+                  'Kakariko Well - Right': (0xEA97, False, 'in a well'),
+                  'Kakariko Well - Bottom': (0xEA9A, False, 'in a well'),
+                  'Blacksmith': (0x18002A, False, 'with the smith'),
+                  'Magic Bat': (0x180015, False, 'with the bat'),
+                  'Sick Kid': (0x339CF, False, 'with the sick'),
+                  'Hobo': (0x33E7D, False, 'with the hobo'),
+                  'Lost Woods Hideout': (0x180000, False, 'near a thief'),
+                  'Lumberjack Tree': (0x180001, False, 'in a hole'),
+                  'Cave 45': (0x180003, False, 'alone in a cave'),
+                  'Graveyard Cave': (0x180004, False, 'alone in a cave'),
+                  'Checkerboard Cave': (0x180005, False, 'alone in a cave'),
+                  'Mini Moldorm Cave - Far Left': (0xEB42, False, 'near Moldorms'),
+                  'Mini Moldorm Cave - Left': (0xEB45, False, 'near Moldorms'),
+                  'Mini Moldorm Cave - Right': (0xEB48, False, 'near Moldorms'),
+                  'Mini Moldorm Cave - Far Right': (0xEB4B, False, 'near Moldorms'),
+                  'Mini Moldorm Cave - Generous Guy': (0x180010, False, 'near Moldorms'),
+                  'Ice Rod Cave': (0xEB4E, False, 'in a frozen cave'),
+                  'Bonk Rock Cave': (0xEB3F, False, 'alone in a cave'),
+                  'Library': (0x180012, False, 'near books'),
+                  'Potion Shop': (0x180014, False, 'near potions'),
+                  'Lake Hylia Island': (0x180144, False, 'on an island'),
+                  'Maze Race': (0x180142, False, 'at the race'),
+                  'Desert Ledge': (0x180143, False, 'in the desert'),
+                  'Desert Palace - Big Chest': (0xE98F, False, 'in Desert Palace'),
+                  'Desert Palace - Torch': (0x180160, False, 'in Desert Palace'),
+                  'Desert Palace - Map Chest': (0xE9B6, False, 'in Desert Palace'),
+                  'Desert Palace - Compass Chest': (0xE9CB, False, 'in Desert Palace'),
+                  'Desert Palace - Big Key Chest': (0xE9C2, False, 'in Desert Palace'),
+                  'Desert Palace - Boss': (0x180151, False, 'with Lanmolas'),
+                  'Eastern Palace - Compass Chest': (0xE977, False, 'in Eastern Palace'),
+                  'Eastern Palace - Big Chest': (0xE97D, False, 'in Eastern Palace'),
+                  'Eastern Palace - Cannonball Chest': (0xE9B3, False, 'in Eastern Palace'),
+                  'Eastern Palace - Big Key Chest': (0xE9B9, False, 'in Eastern Palace'),
+                  'Eastern Palace - Map Chest': (0xE9F5, False, 'in Eastern Palace'),
+                  'Eastern Palace - Boss': (0x180150, False, 'with the Armos'),
+                  'Master Sword Pedestal': (0x289B0, False, 'at the pedestal'),
+                  'Hyrule Castle - Boomerang Chest': (0xE974, False, 'in Hyrule Castle'),
+                  'Hyrule Castle - Map Chest': (0xEB0C, False, 'in Hyrule Castle'),
+                  'Hyrule Castle - Zelda\'s Chest': (0xEB09, False, 'in Hyrule Castle'),
+                  'Sewers - Dark Cross': (0xE96E, False, 'in the sewers'),
+                  'Sewers - Secret Room - Left': (0xEB5D, False, 'in the sewers'),
+                  'Sewers - Secret Room - Middle': (0xEB60, False, 'in the sewers'),
+                  'Sewers - Secret Room - Right': (0xEB63, False, 'in the sewers'),
+                  'Sanctuary': (0xEA79, False, 'in Sanctuary'),
+                  'Castle Tower - Room 03': (0xEAB5, False, 'in Castle Tower'),
+                  'Castle Tower - Dark Maze': (0xEAB2, False, 'in Castle Tower'),
+                  'Old Man': (0xF69FA, False, 'with the old man'),
+                  'Spectacle Rock Cave': (0x180002, False, 'alone in a cave'),
+                  'Paradox Cave Lower - Far Left': (0xEB2A, False, 'in a cave with seven chests'),
+                  'Paradox Cave Lower - Left': (0xEB2D, False, 'in a cave with seven chests'),
+                  'Paradox Cave Lower - Right': (0xEB30, False, 'in a cave with seven chests'),
+                  'Paradox Cave Lower - Far Right': (0xEB33, False, 'in a cave with seven chests'),
+                  'Paradox Cave Lower - Middle': (0xEB36, False, 'in a cave with seven chests'),
+                  'Paradox Cave Upper - Left': (0xEB39, False, 'in a cave with seven chests'),
+                  'Paradox Cave Upper - Right': (0xEB3C, False, 'in a cave with seven chests'),
+                  'Spiral Cave': (0xE9BF, False, 'in spiral cave'),
+                  'Ether Tablet': (0x180016, False, 'at a monolith'),
+                  'Spectacle Rock': (0x180140, False, 'atop a rock'),
+                  'Tower of Hera - Basement Cage': (0x180162, False, 'in Tower of Hera'),
+                  'Tower of Hera - Map Chest': (0xE9AD, False, 'in Tower of Hera'),
+                  'Tower of Hera - Big Key Chest': (0xE9E6, False, 'in Tower of Hera'),
+                  'Tower of Hera - Compass Chest': (0xE9FB, False, 'in Tower of Hera'),
+                  'Tower of Hera - Big Chest': (0xE9F8, False, 'in Tower of Hera'),
+                  'Tower of Hera - Boss': (0x180152, False, 'with Moldorm'),
+                  'Pyramid': (0x180147, False, 'on the pyramid'),
+                  'Catfish': (0xEE185, False, 'with a catfish'),
+                  'Stumpy': (0x330C7, False, 'with tree boy'),
+                  'Digging Game': (0x180148, False, 'underground'),
+                  'Bombos Tablet': (0x180017, False, 'at a monolith'),
+                  'Hype Cave - Top': (0xEB1E, False, 'near a bat-like man'),
+                  'Hype Cave - Middle Right': (0xEB21, False, 'near a bat-like man'),
+                  'Hype Cave - Middle Left': (0xEB24, False, 'near a bat-like man'),
+                  'Hype Cave - Bottom': (0xEB27, False, 'near a bat-like man'),
+                  'Hype Cave - Generous Guy': (0x180011, False, 'with a bat-like man'),
+                  'Peg Cave': (0x180006, False, 'alone in a cave'),
+                  'Pyramid Fairy - Left': (0xE980, False, 'near a fairy'),
+                  'Pyramid Fairy - Right': (0xE983, False, 'near a fairy'),
+                  'Brewery': (0xE9EC, False, 'alone in a home'),
+                  'C-Shaped House': (0xE9EF, False, 'alone in a home'),
+                  'Chest Game': (0xEDA8, False, 'as a prize'),
+                  'Bumper Cave Ledge': (0x180146, False, 'on a ledge'),
+                  'Mire Shed - Left': (0xEA73, False, 'near sparks'),
+                  'Mire Shed - Right': (0xEA76, False, 'near sparks'),
+                  'Superbunny Cave - Top': (0xEA7C, False, 'in a connection'),
+                  'Superbunny Cave - Bottom': (0xEA7F, False, 'in a connection'),
+                  'Spike Cave': (0xEA8B, False, 'beyond spikes'),
+                  'Hookshot Cave - Top Right': (0xEB51, False, 'across pits'),
+                  'Hookshot Cave - Top Left': (0xEB54, False, 'across pits'),
+                  'Hookshot Cave - Bottom Right': (0xEB5A, False, 'across pits'),
+                  'Hookshot Cave - Bottom Left': (0xEB57, False, 'across pits'),
+                  'Floating Island': (0x180141, False, 'on an island'),
+                  'Mimic Cave': (0xE9C5, False, 'in a cave of mimicry'),
+                  'Swamp Palace - Entrance': (0xEA9D, False, 'in Swamp Palace'),
+                  'Swamp Palace - Map Chest': (0xE986, False, 'in Swamp Palace'),
+                  'Swamp Palace - Big Chest': (0xE989, False, 'in Swamp Palace'),
+                  'Swamp Palace - Compass Chest': (0xEAA0, False, 'in Swamp Palace'),
+                  'Swamp Palace - Big Key Chest': (0xEAA6, False, 'in Swamp Palace'),
+                  'Swamp Palace - West Chest': (0xEAA3, False, 'in Swamp Palace'),
+                  'Swamp Palace - Flooded Room - Left': (0xEAA9, False, 'in Swamp Palace'),
+                  'Swamp Palace - Flooded Room - Right': (0xEAAC, False, 'in Swamp Palace'),
+                  'Swamp Palace - Waterfall Room': (0xEAAF, False, 'in Swamp Palace'),
+                  'Swamp Palace - Boss': (0x180154, False, 'with Arrghus'),
+                  'Thieves\' Town - Big Key Chest': (0xEA04, False, 'in Thieves\' Town'),
+                  'Thieves\' Town - Map Chest': (0xEA01, False, 'in Thieves\' Town'),
+                  'Thieves\' Town - Compass Chest': (0xEA07, False, 'in Thieves\' Town'),
+                  'Thieves\' Town - Ambush Chest': (0xEA0A, False, 'in Thieves\' Town'),
+                  'Thieves\' Town - Attic': (0xEA0D, False, 'in Thieves\' Town'),
+                  'Thieves\' Town - Big Chest': (0xEA10, False, 'in Thieves\' Town'),
+                  'Thieves\' Town - Blind\'s Cell': (0xEA13, False, 'in Thieves\' Town'),
+                  'Thieves\' Town - Boss': (0x180156, False, 'with Blind'),
+                  'Skull Woods - Compass Chest': (0xE992, False, 'in Skull Woods'),
+                  'Skull Woods - Map Chest': (0xE99B, False, 'in Skull Woods'),
+                  'Skull Woods - Big Chest': (0xE998, False, 'in Skull Woods'),
+                  'Skull Woods - Pot Prison': (0xE9A1, False, 'in Skull Woods'),
+                  'Skull Woods - Pinball Room': (0xE9C8, False, 'in Skull Woods'),
+                  'Skull Woods - Big Key Chest': (0xE99E, False, 'in Skull Woods'),
+                  'Skull Woods - Bridge Room': (0xE9FE, False, 'near Mothula'),
+                  'Skull Woods - Boss': (0x180155, False, 'with Mothula'),
+                  'Ice Palace - Compass Chest': (0xE9D4, False, 'in Ice Palace'),
+                  'Ice Palace - Freezor Chest': (0xE995, False, 'in Ice Palace'),
+                  'Ice Palace - Big Chest': (0xE9AA, False, 'in Ice Palace'),
+                  'Ice Palace - Iced T Room': (0xE9E3, False, 'in Ice Palace'),
+                  'Ice Palace - Spike Room': (0xE9E0, False, 'in Ice Palace'),
+                  'Ice Palace - Big Key Chest': (0xE9A4, False, 'in Ice Palace'),
+                  'Ice Palace - Map Chest': (0xE9DD, False, 'in Ice Palace'),
+                  'Ice Palace - Boss': (0x180157, False, 'with Kholdstare'),
+                  'Misery Mire - Big Chest': (0xEA67, False, 'in Misery Mire'),
+                  'Misery Mire - Map Chest': (0xEA6A, False, 'in Misery Mire'),
+                  'Misery Mire - Main Lobby': (0xEA5E, False, 'in Misery Mire'),
+                  'Misery Mire - Bridge Chest': (0xEA61, False, 'in Misery Mire'),
+                  'Misery Mire - Spike Chest': (0xE9DA, False, 'in Misery Mire'),
+                  'Misery Mire - Compass Chest': (0xEA64, False, 'in Misery Mire'),
+                  'Misery Mire - Big Key Chest': (0xEA6D, False, 'in Misery Mire'),
+                  'Misery Mire - Boss': (0x180158, False, 'with Vitreous'),
+                  'Turtle Rock - Compass Chest': (0xEA22, False, 'in Turtle Rock'),
+                  'Turtle Rock - Roller Room - Left': (0xEA1C, False, 'in Turtle Rock'),
+                  'Turtle Rock - Roller Room - Right': (0xEA1F, False, 'in Turtle Rock'),
+                  'Turtle Rock - Chain Chomps': (0xEA16, False, 'in Turtle Rock'),
+                  'Turtle Rock - Big Key Chest': (0xEA25, False, 'in Turtle Rock'),
+                  'Turtle Rock - Big Chest': (0xEA19, False, 'in Turtle Rock'),
+                  'Turtle Rock - Crystaroller Room': (0xEA34, False, 'in Turtle Rock'),
+                  'Turtle Rock - Eye Bridge - Bottom Left': (0xEA31, False, 'in Turtle Rock'),
+                  'Turtle Rock - Eye Bridge - Bottom Right': (0xEA2E, False, 'in Turtle Rock'),
+                  'Turtle Rock - Eye Bridge - Top Left': (0xEA2B, False, 'in Turtle Rock'),
+                  'Turtle Rock - Eye Bridge - Top Right': (0xEA28, False, 'in Turtle Rock'),
+                  'Turtle Rock - Boss': (0x180159, False, 'with Trinexx'),
+                  'Palace of Darkness - Shooter Room': (0xEA5B, False, 'in Palace of Darkness'),
+                  'Palace of Darkness - The Arena - Bridge': (0xEA3D, False, 'in Palace of Darkness'),
+                  'Palace of Darkness - Stalfos Basement': (0xEA49, False, 'in Palace of Darkness'),
+                  'Palace of Darkness - Big Key Chest': (0xEA37, False, 'in Palace of Darkness'),
+                  'Palace of Darkness - The Arena - Ledge': (0xEA3A, False, 'in Palace of Darkness'),
+                  'Palace of Darkness - Map Chest': (0xEA52, False, 'in Palace of Darkness'),
+                  'Palace of Darkness - Compass Chest': (0xEA43, False, 'in Palace of Darkness'),
+                  'Palace of Darkness - Dark Basement - Left': (0xEA4C, False, 'in Palace of Darkness'),
+                  'Palace of Darkness - Dark Basement - Right': (0xEA4F, False, 'in Palace of Darkness'),
+                  'Palace of Darkness - Dark Maze - Top': (0xEA55, False, 'in Palace of Darkness'),
+                  'Palace of Darkness - Dark Maze - Bottom': (0xEA58, False, 'in Palace of Darkness'),
+                  'Palace of Darkness - Big Chest': (0xEA40, False, 'in Palace of Darkness'),
+                  'Palace of Darkness - Harmless Hellway': (0xEA46, False, 'in Palace of Darkness'),
+                  'Palace of Darkness - Boss': (0x180153, False, 'with Helmasaur King'),
+                  'Ganons Tower - Bob\'s Torch': (0x180161, False, 'in Ganon\'s Tower'),
+                  'Ganons Tower - Hope Room - Left': (0xEAD9, False, 'in Ganon\'s Tower'),
+                  'Ganons Tower - Hope Room - Right': (0xEADC, False, 'in Ganon\'s Tower'),
+                  'Ganons Tower - Tile Room': (0xEAE2, False, 'in Ganon\'s Tower'),
+                  'Ganons Tower - Compass Room - Top Left': (0xEAE5, False, 'in Ganon\'s Tower'),
+                  'Ganons Tower - Compass Room - Top Right': (0xEAE8, False, 'in Ganon\'s Tower'),
+                  'Ganons Tower - Compass Room - Bottom Left': (0xEAEB, False, 'in Ganon\'s Tower'),
+                  'Ganons Tower - Compass Room - Bottom Right': (0xEAEE, False, 'in Ganon\'s Tower'),
+                  'Ganons Tower - DMs Room - Top Left': (0xEAB8, False, 'in Ganon\'s Tower'),
+                  'Ganons Tower - DMs Room - Top Right': (0xEABB, False, 'in Ganon\'s Tower'),
+                  'Ganons Tower - DMs Room - Bottom Left': (0xEABE, False, 'in Ganon\'s Tower'),
+                  'Ganons Tower - DMs Room - Bottom Right': (0xEAC1, False, 'in Ganon\'s Tower'),
+                  'Ganons Tower - Map Chest': (0xEAD3, False, 'in Ganon\'s Tower'),
+                  'Ganons Tower - Firesnake Room': (0xEAD0, False, 'in Ganon\'s Tower'),
+                  'Ganons Tower - Randomizer Room - Top Left': (0xEAC4, False, 'in Ganon\'s Tower'),
+                  'Ganons Tower - Randomizer Room - Top Right': (0xEAC7, False, 'in Ganon\'s Tower'),
+                  'Ganons Tower - Randomizer Room - Bottom Left': (0xEACA, False, 'in Ganon\'s Tower'),
+                  'Ganons Tower - Randomizer Room - Bottom Right': (0xEACD, False, 'in Ganon\'s Tower'),
+                  'Ganons Tower - Bob\'s Chest': (0xEADF, False, 'in Ganon\'s Tower'),
+                  'Ganons Tower - Big Chest': (0xEAD6, False, 'in Ganon\'s Tower'),
+                  'Ganons Tower - Big Key Room - Left': (0xEAF4, False, 'in Ganon\'s Tower'),
+                  'Ganons Tower - Big Key Room - Right': (0xEAF7, False, 'in Ganon\'s Tower'),
+                  'Ganons Tower - Big Key Chest': (0xEAF1, False, 'in Ganon\'s Tower'),
+                  'Ganons Tower - Mini Helmasaur Room - Left': (0xEAFD, False, 'atop Ganon\'s Tower'),
+                  'Ganons Tower - Mini Helmasaur Room - Right': (0xEB00, False, 'atop Ganon\'s Tower'),
+                  'Ganons Tower - Pre-Moldorm Chest': (0xEB03, False, 'atop Ganon\'s Tower'),
+                  'Ganons Tower - Validation Chest': (0xEB06, False, 'atop Ganon\'s Tower'),
+                  'Ganon': (None, False, 'from me'),
+                  'Agahnim 1': (None, False, 'from Ganon\'s wizardry form'),
+                  'Agahnim 2': (None, False, 'from Ganon\'s wizardry form'),
+                  'Floodgate': (None, False, None),
+                  'Frog': (None, False, None),
+                  'Missing Smith': (None, False, None),
+                  'Dark Blacksmith Ruins': (None, False, None),
+                  'Eastern Palace - Prize': ([0x1209D, 0x53EF8, 0x53EF9, 0x180052, 0x18007C, 0xC6FE], True, 'Eastern Palace'),
+                  'Desert Palace - Prize': ([0x1209E, 0x53F1C, 0x53F1D, 0x180053, 0x180078, 0xC6FF], True, 'Desert Palace'),
+                  'Tower of Hera - Prize': ([0x120A5, 0x53F0A, 0x53F0B, 0x18005A, 0x18007A, 0xC706], True, 'Tower of Hera'),
+                  'Palace of Darkness - Prize': ([0x120A1, 0x53F00, 0x53F01, 0x180056, 0x18007D, 0xC702], True, 'Palace of Darkness'),
+                  'Swamp Palace - Prize': ([0x120A0, 0x53F6C, 0x53F6D, 0x180055, 0x180071, 0xC701], True, 'Swamp Palace'),
+                  'Thieves\' Town - Prize': ([0x120A6, 0x53F36, 0x53F37, 0x18005B, 0x180077, 0xC707], True, 'Thieves\' Town'),
+                  'Skull Woods - Prize': ([0x120A3, 0x53F12, 0x53F13, 0x180058, 0x18007B, 0xC704], True, 'Skull Woods'),
+                  'Ice Palace - Prize': ([0x120A4, 0x53F5A, 0x53F5B, 0x180059, 0x180073, 0xC705], True, 'Ice Palace'),
+                  'Misery Mire - Prize': ([0x120A2, 0x53F48, 0x53F49, 0x180057, 0x180075, 0xC703], True, 'Misery Mire'),
+                  'Turtle Rock - Prize': ([0x120A7, 0x53F24, 0x53F25, 0x18005C, 0x180079, 0xC708], True, 'Turtle Rock')}

ItemList.py

@@ -13,7 +13,7 @@ from Items import ItemFactory
 #This file sets the item pools for various modes. Timed modes and triforce hunt are enforced first, and then extra items are specified per mode to fill in the remaining space.
 #Some basic items that various modes require are placed here, including pendants and crystals. Medallion requirements for the two relevant entrances are also decided.
 
-alwaysitems = ['Bombos', 'Book of Mudora', 'Bow', 'Cane of Somaria', 'Ether', 'Fire Rod', 'Flippers', 'Ocarina', 'Hammer', 'Hookshot', 'Ice Rod', 'Lamp',
+alwaysitems = ['Bombos', 'Book of Mudora', 'Cane of Somaria', 'Ether', 'Fire Rod', 'Flippers', 'Ocarina', 'Hammer', 'Hookshot', 'Ice Rod', 'Lamp',
                'Cape', 'Magic Powder', 'Mushroom', 'Pegasus Boots', 'Quake', 'Shovel', 'Bug Catching Net', 'Cane of Byrna', 'Blue Boomerang', 'Red Boomerang']
 progressivegloves = ['Progressive Glove'] * 2
 basicgloves = ['Power Glove', 'Titans Mitts']
@@ -21,69 +21,25 @@ basicgloves = ['Power Glove', 'Titans Mitts']
 normalbottles = ['Bottle', 'Bottle (Red Potion)', 'Bottle (Green Potion)', 'Bottle (Blue Potion)', 'Bottle (Fairy)', 'Bottle (Bee)', 'Bottle (Good Bee)']
 hardbottles = ['Bottle', 'Bottle (Red Potion)', 'Bottle (Green Potion)', 'Bottle (Blue Potion)', 'Bottle (Bee)', 'Bottle (Good Bee)']
 
-normalbaseitems = (['Silver Arrows', 'Magic Upgrade (1/2)', 'Single Arrow', 'Sanctuary Heart Container', 'Arrows (10)', 'Bombs (3)'] +
+normalbaseitems = (['Magic Upgrade (1/2)', 'Single Arrow', 'Sanctuary Heart Container', 'Arrows (10)', 'Bombs (10)'] +
                    ['Rupees (300)'] * 4 + ['Boss Heart Container'] * 10 + ['Piece of Heart'] * 24)
 normalfirst15extra = ['Rupees (100)', 'Rupees (300)', 'Rupees (50)'] + ['Arrows (10)'] * 6 + ['Bombs (3)'] * 6
-normalsecond15extra = ['Bombs (3)'] * 9 + ['Rupees (50)'] * 2 + ['Arrows (10)'] * 2 + ['Rupee (1)'] + ['Bombs (10)']
+normalsecond15extra = ['Bombs (3)'] * 10 + ['Rupees (50)'] * 2 + ['Arrows (10)'] * 2 + ['Rupee (1)']
 normalthird10extra = ['Rupees (50)'] * 4 + ['Rupees (20)'] * 3 + ['Arrows (10)', 'Rupee (1)', 'Rupees (5)']
 normalfourth5extra = ['Arrows (10)'] * 2 + ['Rupees (20)'] * 2 + ['Rupees (5)']
 normalfinal25extra = ['Rupees (20)'] * 23 + ['Rupees (5)'] * 2
 
-
-easybaseitems = (['Sanctuary Heart Container'] + ['Rupees (300)'] * 4 + ['Magic Upgrade (1/2)'] * 2 + ['Lamp'] * 2 + ['Silver Arrows'] * 2 +
-                 ['Boss Heart Container'] * 10 + ['Piece of Heart'] * 12)
-easyextra = ['Piece of Heart'] * 12 + ['Rupees (300)']
-easylimitedextra = ['Boss Heart Container'] * 3 # collapsing down the 12 pieces of heart
-easyfirst15extra = ['Rupees (100)'] + ['Arrows (10)'] * 7 + ['Bombs (3)'] * 7
-easysecond10extra = ['Bombs (3)'] * 7 + ['Rupee (1)', 'Rupees (50)', 'Bombs (10)']
-easythird5extra = ['Rupees (50)'] * 2 + ['Bombs (3)'] * 2 + ['Arrows (10)']
-easyfinal25extra = ['Rupees (50)'] * 4 + ['Rupees (20)'] * 14 + ['Rupee (1)'] + ['Arrows (10)'] * 4 + ['Rupees (5)'] * 2
-easytimedotherextra = ['Red Clock'] * 5
-
-hardbaseitems = ['Silver Arrows', 'Single Arrow', 'Bombs (10)'] + ['Rupees (300)'] * 4 + ['Boss Heart Container'] * 6 + ['Piece of Heart'] * 20 + ['Rupees (5)'] * 7 + ['Bombs (3)'] * 4
-hardfirst20extra = ['Rupees (100)', 'Rupees (300)', 'Rupees (50)'] + ['Bombs (3)'] * 5 + ['Rupees (5)'] * 10 + ['Arrows (10)', 'Rupee (1)']
-hardsecond10extra = ['Rupees (5)'] * 5 + ['Rupees (50)'] * 2 + ['Arrows (10)'] * 2 + ['Rupee (1)']
-hardthird10extra = ['Rupees (50)'] * 4 + ['Rupees (20)'] * 3 + ['Rupees (5)'] * 3
-hardfourth10extra = ['Arrows (10)'] * 2 + ['Rupees (20)'] * 7 + ['Rupees (5)']
-hardfinal20extra = ['Rupees (20)'] * 18 + ['Rupees (5)'] * 2
-
-expertbaseitems = (['Rupees (300)'] * 4 + ['Single Arrow', 'Silver Arrows', 'Boss Heart Container', 'Rupee (1)', 'Bombs (10)'] + ['Piece of Heart'] * 20 + ['Rupees (5)'] * 2 +
-                   ['Bombs (3)'] * 9 + ['Rupees (50)'] * 2 + ['Arrows (10)'] * 2 + ['Rupees (20)'] * 2)
-expertfirst15extra = ['Rupees (100)', 'Rupees (300)', 'Rupees (50)'] + ['Rupees (5)'] * 12
-expertsecond15extra = ['Rupees (5)'] * 10 + ['Rupees (20)'] * 5
-expertthird10extra = ['Rupees (50)'] * 4 + ['Rupees (5)'] * 2 + ['Arrows (10)'] * 3 + ['Rupee (1)']
-expertfourth5extra = ['Rupees (5)'] * 5
-expertfinal25extra = ['Rupees (20)'] * 23 + ['Rupees (5)'] * 2
-
-insanebaseitems = ['Rupees (300)'] * 4 + ['Single Arrow', 'Bombs (10)', 'Rupee (1)'] + ['Rupees (5)'] * 24 + ['Bombs (3)'] * 9 + ['Rupees (50)'] * 2 + ['Arrows (10)'] * 2 + ['Rupees (20)'] * 5
-insanefirst15extra = ['Rupees (100)', 'Rupees (300)', 'Rupees (50)'] + ['Rupees (5)'] * 12
-insanesecond15extra = ['Rupees (5)'] * 10 + ['Rupees (20)'] * 5
-insanethird10extra = ['Rupees (50)'] * 4 + ['Rupees (5)'] * 2 + ['Arrows (10)'] * 3 + ['Rupee (1)']
-insanefourth5extra = ['Rupees (5)'] * 5
-insanefinal25extra = ['Rupees (20)'] * 23 + ['Rupees (5)'] * 2
-
 Difficulty = namedtuple('Difficulty',
                         ['baseitems', 'bottles', 'bottle_count', 'same_bottle', 'progressiveshield',
                          'basicshield', 'progressivearmor', 'basicarmor', 'swordless',
-                         'progressivesword', 'basicsword', 'timedohko', 'timedother',
-                         'triforcehunt', 'triforce_pieces_required', 'retro', 'conditional_extras',
+                         'progressivesword', 'basicsword', 'basicbow', 'timedohko', 'timedother',
+                         'triforcehunt', 'triforce_pieces_required', 'retro',
                          'extras', 'progressive_sword_limit', 'progressive_shield_limit',
-                         'progressive_armor_limit', 'progressive_bottle_limit'])
+                         'progressive_armor_limit', 'progressive_bottle_limit', 
+                         'progressive_bow_limit', 'heart_piece_limit', 'boss_heart_container_limit'])
 
 total_items_to_place = 153
 
-def easy_conditional_extras(timer, _goal, _mode, pool, placed_items):
-    extraitems = total_items_to_place - len(pool) - len(placed_items)
-    if extraitems < len(easyextra):
-        return easylimitedextra
-    if timer in ['timed', 'timed-countdown']:
-        return easytimedotherextra
-    return []
-
-def no_conditional_extras(*_args):
-    return []
-
-
 difficulties = {
     'normal': Difficulty(
         baseitems = normalbaseitems,
@@ -97,149 +53,141 @@ difficulties = {
         swordless = ['Rupees (20)'] * 4,
         progressivesword = ['Progressive Sword'] * 3,
         basicsword = ['Master Sword', 'Tempered Sword', 'Golden Sword'],
+        basicbow = ['Bow', 'Silver Arrows'],
         timedohko = ['Green Clock'] * 25,
         timedother = ['Green Clock'] * 20 + ['Blue Clock'] * 10 + ['Red Clock'] * 10,
         triforcehunt = ['Triforce Piece'] * 30,
         triforce_pieces_required = 20,
         retro = ['Small Key (Universal)'] * 17 + ['Rupees (20)'] * 10,
-        conditional_extras = no_conditional_extras,
         extras = [normalfirst15extra, normalsecond15extra, normalthird10extra, normalfourth5extra, normalfinal25extra],
         progressive_sword_limit = 4,
         progressive_shield_limit = 3,
         progressive_armor_limit = 2,
+        progressive_bow_limit = 2,
         progressive_bottle_limit = 4,
-    ),
-    'easy': Difficulty(
-        baseitems = easybaseitems,
-        bottles = normalbottles,
-        bottle_count = 8,
-        same_bottle = False,
-        progressiveshield = ['Progressive Shield'] * 6,
-        basicshield = ['Blue Shield', 'Red Shield', 'Mirror Shield'] * 2,
-        progressivearmor = ['Progressive Armor'] * 4,
-        basicarmor = ['Blue Mail', 'Red Mail'] * 2,
-        swordless = ['Rupees (20)'] * 8,
-        progressivesword = ['Progressive Sword'] * 7,
-        basicsword = ['Master Sword', 'Tempered Sword', 'Golden Sword'] *2 + ['Fighter Sword'],
-        timedohko = ['Green Clock'] * 25,
-        timedother = ['Green Clock'] * 20 + ['Blue Clock'] * 10 + ['Red Clock'] * 5, # +5 more Red Clocks if there is room
-        triforcehunt = ['Triforce Piece'] * 30,
-        triforce_pieces_required = 20,
-        retro = ['Small Key (Universal)'] * 27,
-        conditional_extras = easy_conditional_extras,
-        extras = [easyextra, easyfirst15extra, easysecond10extra, easythird5extra, easyfinal25extra],
-        progressive_sword_limit = 4,
-        progressive_shield_limit = 3,
-        progressive_armor_limit = 2,
-        progressive_bottle_limit = 4,
+        boss_heart_container_limit = 255,
+        heart_piece_limit = 255,
     ),
     'hard': Difficulty(
-        baseitems = hardbaseitems,
+        baseitems = normalbaseitems,
         bottles = hardbottles,
         bottle_count = 4,
         same_bottle = False,
         progressiveshield = ['Progressive Shield'] * 3,
         basicshield = ['Blue Shield', 'Red Shield', 'Red Shield'],
         progressivearmor = ['Progressive Armor'] * 2,
-        basicarmor = ['Progressive Armor'] * 2, #only the first one will upgrade, making this equivalent to two blue mail
+        basicarmor = ['Progressive Armor'] * 2, # neither will count
         swordless =  ['Rupees (20)'] * 4,
         progressivesword =  ['Progressive Sword'] * 3,
         basicsword = ['Master Sword', 'Master Sword', 'Tempered Sword'],
-        timedohko = ['Green Clock'] * 20,
+        basicbow = ['Bow'] * 2,
+        timedohko = ['Green Clock'] * 25,
         timedother = ['Green Clock'] * 20 + ['Blue Clock'] * 10 + ['Red Clock'] * 10,
         triforcehunt = ['Triforce Piece'] * 30,
         triforce_pieces_required = 20,
         retro = ['Small Key (Universal)'] * 12 + ['Rupees (5)'] * 15,
-        conditional_extras = no_conditional_extras,
-        extras = [hardfirst20extra, hardsecond10extra, hardthird10extra, hardfourth10extra, hardfinal20extra],
+        extras = [normalfirst15extra, normalsecond15extra, normalthird10extra, normalfourth5extra, normalfinal25extra],
         progressive_sword_limit = 3,
         progressive_shield_limit = 2,
-        progressive_armor_limit = 1,
+        progressive_armor_limit = 0,
+        progressive_bow_limit = 1,
         progressive_bottle_limit = 4,
+        boss_heart_container_limit = 6,
+        heart_piece_limit = 16,
     ),
     'expert': Difficulty(
-        baseitems = expertbaseitems,
+        baseitems = normalbaseitems,
         bottles = hardbottles,
         bottle_count = 4,
         same_bottle = False,
         progressiveshield = ['Progressive Shield'] * 3,
         basicshield = ['Progressive Shield'] * 3,  #only the first one will upgrade, making this equivalent to two blue shields
-        progressivearmor = [],
-        basicarmor = [],
+        progressivearmor = ['Progressive Armor'] * 2, # neither will count
+        basicarmor = ['Progressive Armor'] * 2, # neither will count
         swordless = ['Rupees (20)'] * 4,
         progressivesword = ['Progressive Sword'] * 3,
         basicsword = ['Fighter Sword', 'Master Sword', 'Master Sword'],
+        basicbow = ['Bow'] * 2,
         timedohko = ['Green Clock'] * 20 + ['Red Clock'] * 5,
         timedother = ['Green Clock'] * 20 + ['Blue Clock'] * 10 + ['Red Clock'] * 10,
         triforcehunt = ['Triforce Piece'] * 30,
         triforce_pieces_required = 20,
         retro = ['Small Key (Universal)'] * 12 + ['Rupees (5)'] * 15,
-        conditional_extras = no_conditional_extras,
-        extras = [expertfirst15extra, expertsecond15extra, expertthird10extra, expertfourth5extra, expertfinal25extra],
+        extras = [normalfirst15extra, normalsecond15extra, normalthird10extra, normalfourth5extra, normalfinal25extra],
         progressive_sword_limit = 2,
         progressive_shield_limit = 1,
         progressive_armor_limit = 0,
+        progressive_bow_limit = 1,
         progressive_bottle_limit = 4,
-    ),
-    'insane': Difficulty(
-        baseitems = insanebaseitems,
-        bottles = hardbottles,
-        bottle_count = 4,
-        same_bottle = False,
-        progressiveshield = [],
-        basicshield = [],
-        progressivearmor = [],
-        basicarmor = [],
-        swordless = ['Rupees (20)'] * 3 + ['Silver Arrows'],
-        progressivesword = ['Progressive Sword'] * 3,
-        basicsword = ['Fighter Sword', 'Master Sword', 'Master Sword'],
-        timedohko = ['Green Clock'] * 20 + ['Red Clock'] * 5,
-        timedother = ['Green Clock'] * 20 + ['Blue Clock'] * 10 + ['Red Clock'] * 10,
-        triforcehunt = ['Triforce Piece'] * 30,
-        triforce_pieces_required = 20,
-        retro = ['Small Key (Universal)'] * 12 + ['Rupees (5)'] * 15,
-        conditional_extras = no_conditional_extras,
-        extras = [insanefirst15extra, insanesecond15extra, insanethird10extra, insanefourth5extra, insanefinal25extra],
-        progressive_sword_limit = 2,
-        progressive_shield_limit = 0,
-        progressive_armor_limit = 0,
-        progressive_bottle_limit = 4,
+        boss_heart_container_limit = 2,
+        heart_piece_limit = 8,
     ),
 }
 
-def generate_itempool(world):
-    if (world.difficulty not in ['easy', 'normal', 'hard', 'expert', 'insane'] or world.goal not in ['ganon', 'pedestal', 'dungeons', 'triforcehunt', 'crystals']
-            or world.mode not in ['open', 'standard', 'swordless'] or world.timer not in ['none', 'display', 'timed', 'timed-ohko', 'ohko', 'timed-countdown'] or world.progressive not in ['on', 'off', 'random']):
+def generate_itempool(world, player):
+    if (world.difficulty not in ['normal', 'hard', 'expert'] or world.goal not in ['ganon', 'pedestal', 'dungeons', 'triforcehunt', 'crystals']
+            or world.mode not in ['open', 'standard', 'swordless', 'inverted'] or world.timer not in ['none', 'display', 'timed', 'timed-ohko', 'ohko', 'timed-countdown'] or world.progressive not in ['on', 'off', 'random']):
         raise NotImplementedError('Not supported yet')
 
     if world.timer in ['ohko', 'timed-ohko']:
         world.can_take_damage = False
 
-    world.push_item('Ganon', ItemFactory('Triforce'), False)
-    world.get_location('Ganon').event = True
-    world.push_item('Agahnim 1', ItemFactory('Beat Agahnim 1'), False)
-    world.get_location('Agahnim 1').event = True
-    world.push_item('Agahnim 2', ItemFactory('Beat Agahnim 2'), False)
-    world.get_location('Agahnim 2').event = True
-    world.push_item('Dark Blacksmith Ruins', ItemFactory('Pick Up Purple Chest'), False)
-    world.get_location('Dark Blacksmith Ruins').event = True
-    world.push_item('Frog', ItemFactory('Get Frog'), False)
-    world.get_location('Frog').event = True
-    world.push_item('Missing Smith', ItemFactory('Return Smith'), False)
-    world.get_location('Missing Smith').event = True
-    world.push_item('Floodgate', ItemFactory('Open Floodgate'), False)
-    world.get_location('Floodgate').event = True
+    if world.goal in ['pedestal', 'triforcehunt']:
+        world.push_item(world.get_location('Ganon', player), ItemFactory('Nothing', player), False)
+    else:
+        world.push_item(world.get_location('Ganon', player), ItemFactory('Triforce', player), False)
+    
+    if world.goal in ['triforcehunt']:
+        if world.mode == 'inverted':
+            region = world.get_region('Light World',player)
+        else:
+            region = world.get_region('Hyrule Castle Courtyard', player)
+
+        loc = Location(player, "Murahdahla", parent=region)
+        loc.access_rule = lambda state: state.item_count('Triforce Piece', player) + state.item_count('Power Star', player) > state.world.treasure_hunt_count
+        region.locations.append(loc)
+        world.dynamic_locations.append(loc)
+
+        world.clear_location_cache()
+
+        world.push_item(loc, ItemFactory('Triforce', player), False)
+        loc.event = True
+        loc.locked = True
+    
+    world.get_location('Ganon', player).event = True
+    world.get_location('Ganon', player).locked = True
+    world.push_item(world.get_location('Agahnim 1', player), ItemFactory('Beat Agahnim 1', player), False)
+    world.get_location('Agahnim 1', player).event = True
+    world.get_location('Agahnim 1', player).locked = True
+    world.push_item(world.get_location('Agahnim 2', player), ItemFactory('Beat Agahnim 2', player), False)
+    world.get_location('Agahnim 2', player).event = True
+    world.get_location('Agahnim 2', player).locked = True
+    world.push_item(world.get_location('Dark Blacksmith Ruins', player), ItemFactory('Pick Up Purple Chest', player), False)
+    world.get_location('Dark Blacksmith Ruins', player).event = True
+    world.get_location('Dark Blacksmith Ruins', player).locked = True
+    world.push_item(world.get_location('Frog', player), ItemFactory('Get Frog', player), False)
+    world.get_location('Frog', player).event = True
+    world.get_location('Frog', player).locked = True
+    world.push_item(world.get_location('Missing Smith', player), ItemFactory('Return Smith', player), False)
+    world.get_location('Missing Smith', player).event = True
+    world.get_location('Missing Smith', player).locked = True
+    world.push_item(world.get_location('Floodgate', player), ItemFactory('Open Floodgate', player), False)
+    world.get_location('Floodgate', player).event = True
+    world.get_location('Floodgate', player).locked = True
 
     # set up item pool
     if world.custom:
-        (pool, placed_items, clock_mode, treasure_hunt_count, treasure_hunt_icon, lamps_needed_for_dark_rooms) = make_custom_item_pool(world.progressive, world.shuffle, world.difficulty, world.timer, world.goal, world.mode, world.retro, world.customitemarray)
+        (pool, placed_items, precollected_items, clock_mode, treasure_hunt_count, treasure_hunt_icon, lamps_needed_for_dark_rooms) = make_custom_item_pool(world.progressive, world.shuffle, world.difficulty, world.timer, world.goal, world.mode, world.swords, world.retro, world.customitemarray)
         world.rupoor_cost = min(world.customitemarray[67], 9999)
     else:
-        (pool, placed_items, clock_mode, treasure_hunt_count, treasure_hunt_icon, lamps_needed_for_dark_rooms) = get_pool_core(world.progressive, world.shuffle, world.difficulty, world.timer, world.goal, world.mode, world.retro)
-    world.itempool = ItemFactory(pool)
+        (pool, placed_items, precollected_items, clock_mode, treasure_hunt_count, treasure_hunt_icon, lamps_needed_for_dark_rooms) = get_pool_core(world.progressive, world.shuffle, world.difficulty, world.timer, world.goal, world.mode, world.swords, world.retro)
+    world.itempool += ItemFactory(pool, player)
+    for item in precollected_items:
+        world.push_precollected(ItemFactory(item, player))
     for (location, item) in placed_items:
-        world.push_item(location, ItemFactory(item), False)
-        world.get_location(location).event = True
+        world.push_item(world.get_location(location, player), ItemFactory(item, player), False)
+        world.get_location(location, player).event = True
+        world.get_location(location, player).locked = True
     world.lamps_needed_for_dark_rooms = lamps_needed_for_dark_rooms
     if clock_mode is not None:
         world.clock_mode = clock_mode
@@ -249,30 +197,30 @@ def generate_itempool(world):
         world.treasure_hunt_icon = treasure_hunt_icon
 
     if world.keysanity:
-        world.itempool.extend(get_dungeon_item_pool(world))
+        world.itempool.extend([item for item in get_dungeon_item_pool(world) if item.player == player])
 
     # logic has some branches where having 4 hearts is one possible requirement (of several alternatives)
     # rather than making all hearts/heart pieces progression items (which slows down generation considerably)
     # We mark one random heart container as an advancement item (or 4 heart pieces in expert mode)
-    if world.difficulty in ['easy', 'normal', 'hard'] and not (world.custom and world.customitemarray[30] == 0):
-        [item for item in world.itempool if item.name == 'Boss Heart Container'][0].advancement = True
+    if world.difficulty in ['normal', 'hard'] and not (world.custom and world.customitemarray[30] == 0):
+        [item for item in world.itempool if item.name == 'Boss Heart Container' and item.player == player][0].advancement = True
     elif world.difficulty in ['expert'] and not (world.custom and world.customitemarray[29] < 4):
-        adv_heart_pieces = [item for item in world.itempool if item.name == 'Piece of Heart'][0:4]
+        adv_heart_pieces = [item for item in world.itempool if item.name == 'Piece of Heart' and item.player == player][0:4]
         for hp in adv_heart_pieces:
             hp.advancement = True
 
     # shuffle medallions
     mm_medallion = ['Ether', 'Quake', 'Bombos'][random.randint(0, 2)]
     tr_medallion = ['Ether', 'Quake', 'Bombos'][random.randint(0, 2)]
-    world.required_medallions = (mm_medallion, tr_medallion)
+    world.required_medallions[player] = (mm_medallion, tr_medallion)
 
-    place_bosses(world)
-    set_up_shops(world)
+    place_bosses(world, player)
+    set_up_shops(world, player)
 
     if world.retro:
-        set_up_take_anys(world)
+        set_up_take_anys(world, player)
 
-    create_dynamic_shop_locations(world)
+    create_dynamic_shop_locations(world, player)
 
 take_any_locations = [
     'Snitch Lady (East)', 'Snitch Lady (West)', 'Bush Covered House', 'Light World Bomb Hut',
@@ -284,39 +232,42 @@ take_any_locations = [
     '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']
 
-def set_up_take_anys(world):
+def set_up_take_anys(world, player):
+    if world.mode == 'inverted' and 'Dark Sanctuary Hint' in take_any_locations:
+        take_any_locations.remove('Dark Sanctuary Hint')
+    
     regions = random.sample(take_any_locations, 5)
 
-    old_man_take_any = Region("Old Man Sword Cave", RegionType.Cave, 'the sword cave')
+    old_man_take_any = Region("Old Man Sword Cave", RegionType.Cave, 'the sword cave', player)
     world.regions.append(old_man_take_any)
     world.dynamic_regions.append(old_man_take_any)
 
     reg = regions.pop()
-    entrance = world.get_region(reg).entrances[0]
-    connect_entrance(world, entrance, old_man_take_any)
+    entrance = world.get_region(reg, player).entrances[0]
+    connect_entrance(world, entrance, old_man_take_any, player)
     entrance.target = 0x58
     old_man_take_any.shop = Shop(old_man_take_any, 0x0112, ShopType.TakeAny, 0xE2, True)
     world.shops.append(old_man_take_any.shop)
     old_man_take_any.shop.active = True
 
-    swords = [item for item in world.itempool if item.type == 'Sword']
+    swords = [item for item in world.itempool if item.type == 'Sword' and item.player == player]
     if swords:
         sword = random.choice(swords)
         world.itempool.remove(sword)
-        world.itempool.append(ItemFactory('Rupees (20)'))
+        world.itempool.append(ItemFactory('Rupees (20)', player))
         old_man_take_any.shop.add_inventory(0, sword.name, 0, 0, create_location=True)
     else:
         old_man_take_any.shop.add_inventory(0, 'Rupees (300)', 0, 0)
 
     for num in range(4):
-        take_any = Region("Take-Any #{}".format(num+1), RegionType.Cave, 'a cave of choice')
+        take_any = Region("Take-Any #{}".format(num+1), RegionType.Cave, 'a cave of choice', player)
         world.regions.append(take_any)
         world.dynamic_regions.append(take_any)
 
         target, room_id = random.choice([(0x58, 0x0112), (0x60, 0x010F), (0x46, 0x011F)])
         reg = regions.pop()
-        entrance = world.get_region(reg).entrances[0]
-        connect_entrance(world, entrance, take_any)
+        entrance = world.get_region(reg, player).entrances[0]
+        connect_entrance(world, entrance, take_any, player)
         entrance.target = target
         take_any.shop = Shop(take_any, room_id, ShopType.TakeAny, 0xE3, True)
         world.shops.append(take_any.shop)
@@ -326,50 +277,53 @@ def set_up_take_anys(world):
 
     world.intialize_regions()
 
-def create_dynamic_shop_locations(world):
+def create_dynamic_shop_locations(world, player):
     for shop in world.shops:
-        for i, item in enumerate(shop.inventory):
-            if item is None:
-                continue
-            if item['create_location']:
-                loc = Location("{} Item {}".format(shop.region.name, i+1), parent=shop.region)
-                shop.region.locations.append(loc)
-                world.dynamic_locations.append(loc)
+        if shop.region.player == player:
+            for i, item in enumerate(shop.inventory):
+                if item is None:
+                    continue
+                if item['create_location']:
+                    loc = Location(player, "{} Item {}".format(shop.region.name, i+1), parent=shop.region)
+                    shop.region.locations.append(loc)
+                    world.dynamic_locations.append(loc)
 
-                world.clear_location_cache()
+                    world.clear_location_cache()
 
-                world.push_item(loc, ItemFactory(item['item']), False)
-                loc.event = True
+                    world.push_item(loc, ItemFactory(item['item'], player), False)
+                    loc.event = True
+                    loc.locked = True
 
 
 def fill_prizes(world, attempts=15):
-    crystals = ItemFactory(['Red Pendant', 'Blue Pendant', 'Green Pendant', 'Crystal 1', 'Crystal 2', 'Crystal 3', 'Crystal 4', 'Crystal 7', 'Crystal 5', 'Crystal 6'])
-    crystal_locations = [world.get_location('Turtle Rock - Prize'), world.get_location('Eastern Palace - Prize'), world.get_location('Desert Palace - Prize'), world.get_location('Tower of Hera - Prize'), world.get_location('Palace of Darkness - Prize'),
-                         world.get_location('Thieves\' Town - Prize'), world.get_location('Skull Woods - Prize'), world.get_location('Swamp Palace - Prize'), world.get_location('Ice Palace - Prize'),
-                         world.get_location('Misery Mire - Prize')]
-    placed_prizes = [loc.item.name for loc in crystal_locations if loc.item is not None]
-    unplaced_prizes = [crystal for crystal in crystals if crystal.name not in placed_prizes]
-    empty_crystal_locations = [loc for loc in crystal_locations if loc.item is None]
+    all_state = world.get_all_state(keys=True)
+    for player in range(1, world.players + 1):
+        crystals = ItemFactory(['Red Pendant', 'Blue Pendant', 'Green Pendant', 'Crystal 1', 'Crystal 2', 'Crystal 3', 'Crystal 4', 'Crystal 7', 'Crystal 5', 'Crystal 6'], player)
+        crystal_locations = [world.get_location('Turtle Rock - Prize', player), world.get_location('Eastern Palace - Prize', player), world.get_location('Desert Palace - Prize', player), world.get_location('Tower of Hera - Prize', player), world.get_location('Palace of Darkness - Prize', player),
+                             world.get_location('Thieves\' Town - Prize', player), world.get_location('Skull Woods - Prize', player), world.get_location('Swamp Palace - Prize', player), world.get_location('Ice Palace - Prize', player),
+                             world.get_location('Misery Mire - Prize', player)]
+        placed_prizes = [loc.item.name for loc in crystal_locations if loc.item is not None]
+        unplaced_prizes = [crystal for crystal in crystals if crystal.name not in placed_prizes]
+        empty_crystal_locations = [loc for loc in crystal_locations if loc.item is None]
 
-    while attempts:
-        attempts -= 1
-        try:
-            prizepool = list(unplaced_prizes)
-            prize_locs = list(empty_crystal_locations)
-            random.shuffle(prizepool)
-            random.shuffle(prize_locs)
-            fill_restrictive(world, world.get_all_state(keys=True), prize_locs, prizepool)
-        except FillError:
-            logging.getLogger('').info("Failed to place dungeon prizes. Will retry %s more times", attempts)
-            for location in empty_crystal_locations:
-                location.item = None
-            continue
-        break
-    else:
-        raise FillError('Unable to place dungeon prizes')
+        for attempt in range(attempts):
+            try:
+                prizepool = list(unplaced_prizes)
+                prize_locs = list(empty_crystal_locations)
+                random.shuffle(prizepool)
+                random.shuffle(prize_locs)
+                fill_restrictive(world, all_state, prize_locs, prizepool)
+            except FillError as e:
+                logging.getLogger('').info("Failed to place dungeon prizes (%s). Will retry %s more times", e, attempts)
+                for location in empty_crystal_locations:
+                    location.item = None
+                continue
+            break
+        else:
+            raise FillError('Unable to place dungeon prizes')
 
 
-def set_up_shops(world):
+def set_up_shops(world, player):
     # Changes to basic Shops
     # TODO: move hard+ mode changes for sheilds here, utilizing the new shops
 
@@ -377,13 +331,13 @@ def set_up_shops(world):
         shop.active = True
 
     if world.retro:
-        rss = world.get_region('Red Shield Shop').shop
+        rss = world.get_region('Red Shield Shop', player).shop
         rss.active = True
         rss.add_inventory(2, 'Single Arrow', 80)
 
     # Randomized changes to Shops
     if world.retro:
-        for shop in random.sample([s for s in world.shops if s.replaceable], 5):
+        for shop in random.sample([s for s in world.shops if s.replaceable and s.region.player == player], 5):
             shop.active = True
             shop.add_inventory(0, 'Single Arrow', 80)
             shop.add_inventory(1, 'Small Key (Universal)', 100)
@@ -391,9 +345,10 @@ def set_up_shops(world):
 
     #special shop types
 
-def get_pool_core(progressive, shuffle, difficulty, timer, goal, mode, retro):
+def get_pool_core(progressive, shuffle, difficulty, timer, goal, mode, swords, retro):
     pool = []
     placed_items = []
+    precollected_items = []
     clock_mode = None
     treasure_hunt_count = None
     treasure_hunt_icon = None
@@ -409,8 +364,6 @@ def get_pool_core(progressive, shuffle, difficulty, timer, goal, mode, retro):
         pool.extend(basicgloves)
 
     lamps_needed_for_dark_rooms = 1
-    if difficulty == 'easy':
-        lamps_needed_for_dark_rooms = 3
 
     # insanity shuffle doesn't have fake LW/DW logic so for now guaranteed Mirror and Moon Pearl at the start
     if  shuffle == 'insanity_legacy':
@@ -446,15 +399,43 @@ def get_pool_core(progressive, shuffle, difficulty, timer, goal, mode, retro):
     else:
         pool.extend(diff.basicarmor)
 
-    if mode == 'swordless':
-        pool.extend(diff.swordless)
-    elif mode == 'standard':
+    if swords != 'swordless':
         if want_progressives():
-            placed_items.append(('Link\'s Uncle', 'Progressive Sword'))
-            pool.extend(diff.progressivesword)
+            pool.extend(['Progressive Bow'] * 2)
+        else:
+            pool.extend(diff.basicbow)
+
+    if swords == 'swordless':
+        pool.extend(diff.swordless)
+        if want_progressives():
+            pool.extend(['Progressive Bow'] * 2)
+        else:
+            pool.extend(['Bow', 'Silver Arrows'])
+    elif swords == 'assured':
+        precollected_items.append('Fighter Sword')
+        if want_progressives():
+            pool.extend(diff.progressivesword)
+            pool.extend(['Rupees (100)'])
         else:
-            placed_items.append(('Link\'s Uncle', 'Fighter Sword'))
             pool.extend(diff.basicsword)
+            pool.extend(['Rupees (100)'])
+    elif swords == 'vanilla':
+        swords_to_use = []
+        if want_progressives():
+            swords_to_use.extend(diff.progressivesword)
+            swords_to_use.extend(['Progressive Sword'])
+        else:
+            swords_to_use.extend(diff.basicsword)
+            swords_to_use.extend(['Fighter Sword'])
+        random.shuffle(swords_to_use)
+
+        placed_items.append(('Link\'s Uncle', swords_to_use.pop()))
+        placed_items.append(('Blacksmith', swords_to_use.pop()))
+        placed_items.append(('Pyramid Fairy - Left', swords_to_use.pop()))
+        if goal != 'pedestal':
+            placed_items.append(('Master Sword Pedestal', swords_to_use.pop()))
+        else:
+            placed_items.append(('Master Sword Pedestal', 'Triforce'))
     else:
         if want_progressives():
             pool.extend(diff.progressivesword)
@@ -479,16 +460,12 @@ def get_pool_core(progressive, shuffle, difficulty, timer, goal, mode, retro):
         treasure_hunt_count = diff.triforce_pieces_required
         treasure_hunt_icon = 'Triforce Piece'
 
-    cond_extras = diff.conditional_extras(timer, goal, mode, pool, placed_items)
-    pool.extend(cond_extras)
-    extraitems -= len(cond_extras)
-
     for extra in diff.extras:
         if extraitems > 0:
             pool.extend(extra)
             extraitems -= len(extra)
 
-    if goal == 'pedestal':
+    if goal == 'pedestal' and swords != 'vanilla':
         placed_items.append(('Master Sword Pedestal', 'Triforce'))
     if retro:
         pool = [item.replace('Single Arrow','Rupees (5)') for item in pool]
@@ -501,11 +478,12 @@ def get_pool_core(progressive, shuffle, difficulty, timer, goal, mode, retro):
             placed_items.append((key_location, 'Small Key (Universal)'))
         else:
             pool.extend(['Small Key (Universal)'])
-    return (pool, placed_items, clock_mode, treasure_hunt_count, treasure_hunt_icon, lamps_needed_for_dark_rooms)
+    return (pool, placed_items, precollected_items, clock_mode, treasure_hunt_count, treasure_hunt_icon, lamps_needed_for_dark_rooms)
 
-def make_custom_item_pool(progressive, shuffle, difficulty, timer, goal, mode, retro, customitemarray):
+def make_custom_item_pool(progressive, shuffle, difficulty, timer, goal, mode, swords, retro, customitemarray):
     pool = []
     placed_items = []
+    precollected_items = []
     clock_mode = None
     treasure_hunt_count = None
     treasure_hunt_icon = None
@@ -587,8 +565,6 @@ def make_custom_item_pool(progressive, shuffle, difficulty, timer, goal, mode, r
     diff = difficulties[difficulty]
 
     lamps_needed_for_dark_rooms = 1
-    if difficulty == 'easy':
-        lamps_needed_for_dark_rooms = customitemarray[12]
 
     # expert+ difficulties produce the same contents for
     # all bottles, since only one bottle is available
@@ -620,14 +596,6 @@ def make_custom_item_pool(progressive, shuffle, difficulty, timer, goal, mode, r
         itemtotal = itemtotal + 1
 
     if mode == 'standard':
-        if progressive == 'off':
-            placed_items.append(('Link\'s Uncle', 'Fighter Sword'))
-            pool.extend(['Fighter Sword'] * max((customitemarray[32] - 1), 0))
-            pool.extend(['Progressive Sword'] * customitemarray[36])
-        else:
-            placed_items.append(('Link\'s Uncle', 'Progressive Sword'))
-            pool.extend(['Fighter Sword'] * customitemarray[32])
-            pool.extend(['Progressive Sword'] * max((customitemarray[36] - 1), 0))
         if retro:
             key_location = random.choice(['Secret Passage', 'Hyrule Castle - Boomerang Chest', 'Hyrule Castle - Map Chest', 'Hyrule Castle - Zelda\'s Chest', 'Sewers - Dark Cross'])
             placed_items.append((key_location, 'Small Key (Universal)'))
@@ -635,10 +603,11 @@ def make_custom_item_pool(progressive, shuffle, difficulty, timer, goal, mode, r
         else:
             pool.extend(['Small Key (Universal)'] * customitemarray[68])
     else:
-        pool.extend(['Fighter Sword'] * customitemarray[32])
-        pool.extend(['Progressive Sword'] * customitemarray[36])
         pool.extend(['Small Key (Universal)'] * customitemarray[68])
 
+    pool.extend(['Fighter Sword'] * customitemarray[32])
+    pool.extend(['Progressive Sword'] * customitemarray[36])
+
     if shuffle == 'insanity_legacy':
         placed_items.append(('Link\'s House', 'Magic Mirror'))
         placed_items.append(('Sanctuary', 'Moon Pearl'))
@@ -653,28 +622,31 @@ def make_custom_item_pool(progressive, shuffle, difficulty, timer, goal, mode, r
     if itemtotal < total_items_to_place:
         pool.extend(['Nothing'] * (total_items_to_place - itemtotal))
 
-    return (pool, placed_items, clock_mode, treasure_hunt_count, treasure_hunt_icon, lamps_needed_for_dark_rooms)
+    return (pool, placed_items, precollected_items, clock_mode, treasure_hunt_count, treasure_hunt_icon, lamps_needed_for_dark_rooms)
 
 # A quick test to ensure all combinations generate the correct amount of items.
 def test():
-    for difficulty in ['easy', 'normal', 'hard', 'expert', 'insane']:
+    for difficulty in ['normal', 'hard', 'expert']:
         for goal in ['ganon', 'triforcehunt', 'pedestal']:
             for timer in ['none', 'display', 'timed', 'timed-ohko', 'ohko', 'timed-countdown']:
-                for mode in ['open', 'standard', 'swordless']:
-                    for progressive in ['on', 'off']:
-                        for shuffle in ['full', 'insane']:
-                            for retro in [True, False]:
-                                out = get_pool_core(progressive, shuffle, difficulty, timer, goal, mode, retro)
-                                count = len(out[0]) + len(out[1])
+                for mode in ['open', 'standard', 'inverted']:
+                    for swords in ['random', 'assured', 'swordless', 'vanilla']:
+                        for progressive in ['on', 'off']:
+                            for shuffle in ['full', 'insanity_legacy']:
+                                for retro in [True, False]:
+                                    out = get_pool_core(progressive, shuffle, difficulty, timer, goal, mode, swords, retro)
+                                    count = len(out[0]) + len(out[1])
 
-                                correct_count = total_items_to_place
-                                if goal in ['pedestal']:
-                                    # pedestal goals generate one extra item
-                                    correct_count += 1
-                                if retro:
-                                    correct_count += 28
-
-                                assert count == correct_count, "expected {0} items but found {1} items for {2}".format(correct_count, count, (progressive, shuffle, difficulty, timer, goal, mode, retro))
+                                    correct_count = total_items_to_place
+                                    if goal == 'pedestal' and swords != 'vanilla':
+                                        # pedestal goals generate one extra item
+                                        correct_count += 1
+                                    if retro:
+                                        correct_count += 28
+                                    try:
+                                        assert count == correct_count, "expected {0} items but found {1} items for {2}".format(correct_count, count, (progressive, shuffle, difficulty, timer, goal, mode, swords, retro))
+                                    except AssertionError as e:
+                                        print(e)
 
 if __name__ == '__main__':
     test()

Items.py

@@ -3,7 +3,7 @@ import logging
 from BaseClasses import Item
 
 
-def ItemFactory(items):
+def ItemFactory(items, player):
     ret = []
     singleton = False
     if isinstance(items, str):
@@ -12,7 +12,7 @@ def ItemFactory(items):
     for item in items:
         if item in item_table:
             advancement, priority, type, code, pedestal_hint, pedestal_credit, sickkid_credit, zora_credit, witch_credit, fluteboy_credit, hint_text = item_table[item]
-            ret.append(Item(item, advancement, priority, type, code, pedestal_hint, pedestal_credit, sickkid_credit, zora_credit, witch_credit, fluteboy_credit, hint_text))
+            ret.append(Item(item, advancement, priority, type, code, pedestal_hint, pedestal_credit, sickkid_credit, zora_credit, witch_credit, fluteboy_credit, hint_text, player))
         else:
             logging.getLogger('').warning('Unknown Item: %s', item)
             return None
@@ -24,6 +24,7 @@ def ItemFactory(items):
 
 # Format: Name: (Advancement, Priority, Type, ItemCode, Pedestal Hint Text, Pedestal Credit Text, Sick Kid Credit Text, Zora Credit Text, Witch Credit Text, Flute Boy Credit Text, Hint Text)
 item_table = {'Bow': (True, False, None, 0x0B, 'You have\nchosen the\narcher class.', 'the stick and twine', 'arrow-slinging kid', 'arrow sling for sale', 'witch and robin hood', 'archer boy shoots again', 'the Bow'),
+              'Progressive Bow': (True, False, None, 0x64, 'You have\nchosen the\narcher class.', 'the stick and twine', 'arrow-slinging kid', 'arrow sling for sale', 'witch and robin hood', 'archer boy shoots again', 'a Bow'),
               'Book of Mudora': (True, False, None, 0x1D, 'This is a\nparadox?!', 'and the story book', 'the scholarly kid', 'moon runes for sale', 'drugs for literacy', 'book-worm boy can read again', 'the Book'),
               'Hammer': (True, False, None, 0x09, 'stop\nhammer time!', 'and m c hammer', 'hammer-smashing kid', 'm c hammer for sale', 'stop...   hammer time', 'stop, hammer time', 'the hammer'),
               'Hookshot': (True, False, None, 0x0A, 'BOING!!!\nBOING!!!\nBOING!!!', 'and the tickle beam', 'tickle-monster kid', 'tickle beam for sale', 'witch and tickle boy', 'beam boy tickles again', 'the Hookshot'),

Main.py

@@ -3,44 +3,28 @@ import copy
 from itertools import zip_longest
 import json
 import logging
+import os
 import random
 import time
 
 from BaseClasses import World, CollectionState, Item, Region, Location, Shop
 from Regions import create_regions, mark_light_world_regions
-from EntranceShuffle import link_entrances
-from Rom import patch_rom, Sprite, LocalRom, JsonRom
+from InvertedRegions import create_inverted_regions, mark_dark_world_regions
+from EntranceShuffle import link_entrances, link_inverted_entrances
+from Rom import patch_rom, get_enemizer_patch, apply_rom_settings, Sprite, LocalRom, JsonRom
 from Rules import set_rules
 from Dungeons import create_dungeons, fill_dungeons, fill_dungeons_restrictive
-from Fill import distribute_items_cutoff, distribute_items_staleness, distribute_items_restrictive, flood_items
+from Fill import distribute_items_cutoff, distribute_items_staleness, distribute_items_restrictive, flood_items, balance_multiworld_progression
 from ItemList import generate_itempool, difficulties, fill_prizes
 from Utils import output_path
 
-__version__ = '0.6.2'
-
-logic_hash = [134, 166, 181, 191, 228, 89, 188, 200, 5, 157, 217, 139, 180, 198, 106, 104,
-              88, 223, 138, 28, 54, 18, 216, 129, 248, 19, 109, 220, 159, 75, 238, 57,
-              231, 183, 143, 167, 114, 176, 82, 169, 179, 94, 115, 193, 252, 222, 52, 245,
-              33, 208, 39, 122, 177, 136, 29, 161, 210, 165, 6, 125, 146, 212, 101, 185,
-              65, 247, 253, 85, 171, 147, 71, 148, 203, 202, 230, 1, 13, 64, 254, 141,
-              32, 93, 152, 4, 92, 16, 195, 204, 246, 201, 11, 7, 189, 97, 9, 91,
-              237, 215, 163, 131, 142, 34, 111, 196, 120, 127, 168, 211, 227, 61, 187, 110,
-              190, 162, 59, 80, 225, 186, 37, 154, 76, 72, 27, 17, 79, 206, 207, 243,
-              184, 197, 153, 48, 119, 99, 2, 151, 51, 67, 121, 175, 38, 224, 87, 242,
-              45, 22, 155, 244, 209, 117, 214, 213, 194, 126, 236, 73, 133, 70, 49, 140,
-              229, 108, 156, 124, 105, 226, 44, 23, 112, 102, 173, 219, 14, 116, 58, 103,
-              55, 10, 95, 251, 84, 118, 160, 78, 63, 250, 31, 41, 35, 255, 170, 25,
-              66, 172, 98, 249, 68, 8, 113, 21, 46, 24, 137, 149, 81, 130, 42, 164,
-              50, 12, 158, 15, 47, 182, 30, 40, 36, 83, 77, 205, 20, 241, 3, 132,
-              0, 60, 96, 62, 74, 178, 53, 56, 135, 174, 145, 86, 107, 233, 218, 221,
-              43, 150, 100, 69, 235, 26, 234, 192, 199, 144, 232, 128, 239, 123, 240, 90]
-
+__version__ = '0.6.3-pre'
 
 def main(args, seed=None):
     start = time.clock()
 
     # initialize the world
-    world = World(args.shuffle, args.logic, args.mode, args.difficulty, args.timer, args.progressive, args.goal, args.algorithm, not args.nodungeonitems, args.beatableonly, args.shuffleganon, args.quickswap, args.fastmenu, args.disablemusic, args.keysanity, args.retro, args.custom, args.customitemarray, args.shufflebosses, args.hints)
+    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)
     logger = logging.getLogger('')
     if seed is None:
         random.seed(None)
@@ -49,26 +33,46 @@ def main(args, seed=None):
         world.seed = int(seed)
     random.seed(world.seed)
 
+    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)
+
+    world.rom_seeds = {player: random.randint(0, 999999999) for player in range(1, world.players + 1)}
+
     logger.info('ALttP Entrance Randomizer Version %s  -  Seed: %s\n\n', __version__, world.seed)
 
     world.difficulty_requirements = difficulties[world.difficulty]
 
-    create_regions(world)
-
-    create_dungeons(world)
+    if world.mode != 'inverted':
+        for player in range(1, world.players + 1):
+            create_regions(world, player)
+            create_dungeons(world, player)
+    else:
+        for player in range(1, world.players + 1):
+            create_inverted_regions(world, player)
+            create_dungeons(world, player)
 
     logger.info('Shuffling the World about.')
 
-    link_entrances(world)
-    mark_light_world_regions(world)
+    if world.mode != 'inverted':
+        for player in range(1, world.players + 1):
+            link_entrances(world, player)
+
+        mark_light_world_regions(world)
+    else:
+        for player in range(1, world.players + 1):
+            link_inverted_entrances(world, player)
+
+        mark_dark_world_regions(world)
 
     logger.info('Generating Item Pool.')
 
-    generate_itempool(world)
+    for player in range(1, world.players + 1):
+        generate_itempool(world, player)
 
     logger.info('Calculating Access Rules.')
 
-    set_rules(world)
+    for player in range(1, world.players + 1):
+        set_rules(world, player)
 
     logger.info('Placing Dungeon Prizes.')
 
@@ -102,9 +106,9 @@ def main(args, seed=None):
     elif args.algorithm == 'balanced':
         distribute_items_restrictive(world, gt_filler(world))
 
-    logger.info('Calculating playthrough.')
-
-    create_playthrough(world)
+    if world.players > 1:
+        logger.info('Balancing multiworld progression.')
+        balance_multiworld_progression(world)
 
     logger.info('Patching ROM.')
 
@@ -116,22 +120,57 @@ def main(args, seed=None):
     else:
         sprite = None
 
-    outfilebase = 'ER_%s_%s-%s-%s%s_%s-%s%s%s%s%s_%s' % (world.logic, world.difficulty, world.mode, world.goal, "" if world.timer in ['none', 'display'] else "-" + world.timer, world.shuffle, world.algorithm, "-keysanity" if world.keysanity else "", "-retro" if world.retro else "", "-prog_" + world.progressive if world.progressive in ['off', 'random'] else "", "-nohints" if not world.hints else "", world.seed)
+    outfilebase = 'ER_%s_%s-%s-%s-%s%s_%s-%s%s%s%s%s_%s' % (world.logic, world.difficulty, world.difficulty_adjustments, world.mode, world.goal, "" if world.timer in ['none', 'display'] else "-" + world.timer, world.shuffle, world.algorithm, "-keysanity" if world.keysanity else "", "-retro" if world.retro else "", "-prog_" + world.progressive if world.progressive in ['off', 'random'] else "", "-nohints" if not world.hints else "", world.seed)
 
+    use_enemizer = args.enemizercli and (args.shufflebosses != 'none' or args.shuffleenemies or args.enemy_health != 'default' or args.enemy_health != 'default' or args.enemy_damage or args.shufflepalette or args.shufflepots)
+
+    jsonout = {}
     if not args.suppress_rom:
-        if args.jsonout:
-            rom = JsonRom()
+        if world.players > 1:
+            raise NotImplementedError("Multiworld rom writes have not been implemented")
         else:
-            rom = LocalRom(args.rom)
-        patch_rom(world, rom, bytearray(logic_hash), args.heartbeep, args.heartcolor, sprite)
-        if args.jsonout:
-            print(json.dumps({'patch': rom.patches, 'spoiler': world.spoiler.to_json()}))
-        else:
-            rom.write_to_file(args.jsonout or output_path('%s.sfc' % outfilebase))
+            player = 1
+
+            local_rom = None
+            if args.jsonout:
+                rom = JsonRom()
+            else:
+                if use_enemizer:
+                    local_rom = LocalRom(args.rom)
+                    rom = JsonRom()
+                else:
+                    rom = LocalRom(args.rom)
+
+            patch_rom(world, player, rom)
+
+            enemizer_patch = []
+            if use_enemizer:
+                enemizer_patch = get_enemizer_patch(world, player, rom, args.rom, args.enemizercli, args.shuffleenemies, args.enemy_health, args.enemy_damage, args.shufflepalette, args.shufflepots)
+
+            if args.jsonout:
+                jsonout['patch'] = rom.patches
+                if use_enemizer:
+                    jsonout['enemizer' % player] = enemizer_patch
+            else:
+                if use_enemizer:
+                    local_rom.patch_enemizer(rom.patches, os.path.join(os.path.dirname(args.enemizercli), "enemizerBasePatch.json"), enemizer_patch)
+                    rom = local_rom
+
+                apply_rom_settings(rom, args.heartbeep, args.heartcolor, world.quickswap, world.fastmenu, world.disable_music, sprite)
+                rom.write_to_file(output_path('%s.sfc' % outfilebase))
 
     if args.create_spoiler and not args.jsonout:
         world.spoiler.to_file(output_path('%s_Spoiler.txt' % outfilebase))
 
+    if not args.skip_playthrough:
+        logger.info('Calculating playthrough.')
+        create_playthrough(world)
+
+    if args.jsonout:
+        print(json.dumps({**jsonout, 'spoiler': world.spoiler.to_json()}))
+    elif args.create_spoiler and not args.skip_playthrough:
+        world.spoiler.to_file(output_path('%s_Spoiler.txt' % outfilebase))
+
     logger.info('Done. Enjoy.')
     logger.debug('Total Time: %s', time.clock() - start)
 
@@ -144,10 +183,12 @@ def gt_filler(world):
 
 def copy_world(world):
     # ToDo: Not good yet
-    ret = World(world.shuffle, world.logic, world.mode, world.difficulty, world.timer, world.progressive, world.goal, world.algorithm, world.place_dungeon_items, world.check_beatable_only, world.shuffle_ganon, world.quickswap, world.fastmenu, world.disable_music, world.keysanity, world.retro, world.custom, world.customitemarray, world.boss_shuffle, world.hints)
-    ret.required_medallions = list(world.required_medallions)
-    ret.swamp_patch_required = world.swamp_patch_required
-    ret.ganon_at_pyramid = world.ganon_at_pyramid
+    ret = World(world.players, world.shuffle, world.logic, world.mode, world.swords, world.difficulty, world.difficulty_adjustments, world.timer, world.progressive, world.goal, world.algorithm, world.place_dungeon_items, world.accessibility, world.shuffle_ganon, world.quickswap, world.fastmenu, world.disable_music, world.keysanity, world.retro, world.custom, world.customitemarray, world.boss_shuffle, world.hints)
+    ret.required_medallions = world.required_medallions.copy()
+    ret.swamp_patch_required = world.swamp_patch_required.copy()
+    ret.ganon_at_pyramid = world.ganon_at_pyramid.copy()
+    ret.powder_patch_required = world.powder_patch_required.copy()
+    ret.ganonstower_vanilla = world.ganonstower_vanilla.copy()
     ret.treasure_hunt_count = world.treasure_hunt_count
     ret.treasure_hunt_icon = world.treasure_hunt_icon
     ret.sewer_light_cone = world.sewer_light_cone
@@ -162,52 +203,67 @@ def copy_world(world):
     ret.difficulty_requirements = world.difficulty_requirements
     ret.fix_fake_world = world.fix_fake_world
     ret.lamps_needed_for_dark_rooms = world.lamps_needed_for_dark_rooms
-    create_regions(ret)
-    create_dungeons(ret)
+    ret.crystals_needed_for_ganon = world.crystals_needed_for_ganon
+    ret.crystals_needed_for_gt = world.crystals_needed_for_gt
+
+    if world.mode != 'inverted':
+        for player in range(1, world.players + 1):
+            create_regions(ret, player)
+            create_dungeons(ret, player)
+    else:
+        for player in range(1, world.players + 1):
+            create_inverted_regions(ret, player)
+            create_dungeons(ret, player)
 
     copy_dynamic_regions_and_locations(world, ret)
 
     # copy bosses
     for dungeon in world.dungeons:
         for level, boss in dungeon.bosses.items():
-            ret.get_dungeon(dungeon.name).bosses[level] = boss
+            ret.get_dungeon(dungeon.name, dungeon.player).bosses[level] = boss
 
     for shop in world.shops:
-        copied_shop = ret.get_region(shop.region.name).shop
+        copied_shop = ret.get_region(shop.region.name, shop.region.player).shop
         copied_shop.active = shop.active
         copied_shop.inventory = copy.copy(shop.inventory)
 
     # connect copied world
     for region in world.regions:
-        copied_region = ret.get_region(region.name)
+        copied_region = ret.get_region(region.name, region.player)
         copied_region.is_light_world = region.is_light_world
         copied_region.is_dark_world = region.is_dark_world
         for entrance in region.entrances:
-            ret.get_entrance(entrance.name).connect(copied_region)
+            ret.get_entrance(entrance.name, entrance.player).connect(copied_region)
 
     # fill locations
     for location in world.get_locations():
         if location.item is not None:
-            item = Item(location.item.name, location.item.advancement, location.item.priority, location.item.type)
-            ret.get_location(location.name).item = item
-            item.location = ret.get_location(location.name)
+            item = Item(location.item.name, location.item.advancement, location.item.priority, location.item.type, player = location.item.player)
+            ret.get_location(location.name, location.player).item = item
+            item.location = ret.get_location(location.name, location.player)
         if location.event:
-            ret.get_location(location.name).event = True
+            ret.get_location(location.name, location.player).event = True
+        if location.locked:
+            ret.get_location(location.name, location.player).locked = True
 
     # copy remaining itempool. No item in itempool should have an assigned location
     for item in world.itempool:
-        ret.itempool.append(Item(item.name, item.advancement, item.priority, item.type))
+        ret.itempool.append(Item(item.name, item.advancement, item.priority, item.type, player = item.player))
 
     # copy progress items in state
-    ret.state.prog_items = list(world.state.prog_items)
+    ret.state.prog_items = world.state.prog_items.copy()
+    ret.precollected_items = world.precollected_items.copy()
+    ret.state.stale = {player: True for player in range(1, world.players + 1)}
 
-    set_rules(ret)
+    for player in range(1, world.players + 1):
+        set_rules(ret, player)
 
     return ret
 
 def copy_dynamic_regions_and_locations(world, ret):
     for region in world.dynamic_regions:
-        new_reg = Region(region.name, region.type, region.hint_text)
+        new_reg = Region(region.name, region.type, region.hint_text, region.player)
+        new_reg.world = ret
         ret.regions.append(new_reg)
         ret.dynamic_regions.append(new_reg)
 
@@ -218,9 +274,16 @@ def copy_dynamic_regions_and_locations(world, ret):
             ret.shops.append(new_reg.shop)
 
     for location in world.dynamic_locations:
-        new_loc = Location(location.name, location.address, location.crystal, location.hint_text, location.parent_region)
-        new_reg = ret.get_region(location.parent_region.name)
+        new_reg = ret.get_region(location.parent_region.name, location.parent_region.player)
+        new_loc = Location(location.player, location.name, location.address, location.crystal, location.hint_text, new_reg)
+        # todo: this is potentially dangerous. later refactor so we
+        # can apply dynamic region rules on top of copied world like other rules
+        new_loc.access_rule = location.access_rule
+        new_loc.always_allow = location.always_allow
+        new_loc.item_rule = location.item_rule
         new_reg.locations.append(new_loc)
+    
+        ret.clear_location_cache()
 
 
 def create_playthrough(world):
@@ -228,12 +291,8 @@ def create_playthrough(world):
     old_world = world
     world = copy_world(world)
 
-    # in treasure hunt and pedestal goals, ganon is invincible
-    if world.goal in ['pedestal', 'triforcehunt']:
-        world.get_location('Ganon').item = None
-
     # if we only check for beatable, we can do this sanity check first before writing down spheres
-    if world.check_beatable_only and not world.can_beat_game():
+    if world.accessibility == 'none' and not world.can_beat_game():
         raise RuntimeError('Cannot beat game. Something went terribly wrong here!')
 
     # get locations containing progress items
@@ -263,8 +322,8 @@ def create_playthrough(world):
 
         logging.getLogger('').debug('Calculated sphere %i, containing %i of %i progress items.', len(collection_spheres), len(sphere), len(prog_locations))
         if not sphere:
-            logging.getLogger('').debug('The following items could not be reached: %s', ['%s at %s' % (location.item.name, location.name) for location in sphere_candidates])
-            if not world.check_beatable_only:
+            logging.getLogger('').debug('The following items could not be reached: %s', ['%s (Player %d) at %s (Player %d)' % (location.item.name, location.item.player, location.name, location.player) for location in sphere_candidates])
+            if not world.accessibility == 'none':
                 raise RuntimeError('Not all progression items reachable. Something went terribly wrong here.')
             else:
                 break
@@ -274,12 +333,11 @@ def create_playthrough(world):
         to_delete = []
         for location in sphere:
             # we remove the item at location and check if game is still beatable
-            logging.getLogger('').debug('Checking if %s is required to beat the game.', location.item.name)
+            logging.getLogger('').debug('Checking if %s (Player %d) is required to beat the game.', location.item.name, location.item.player)
             old_item = location.item
             location.item = None
             state.remove(old_item)
-            ##if world.can_beat_game(state_cache[num]):
-            if world.can_beat_game():
+            if world.can_beat_game(state_cache[num]):
                 to_delete.append(location)
             else:
                 # still required, got to keep it around
@@ -315,7 +373,7 @@ def create_playthrough(world):
             raise RuntimeError('Not all required items reachable. Something went terribly wrong here.')
 
     # store the required locations for statistical analysis
-    old_world.required_locations = [location.name for sphere in collection_spheres for location in sphere]
+    old_world.required_locations = [(location.name, location.player) for sphere in collection_spheres for location in sphere]
 
     def flist_to_iter(node):
         while node:
@@ -330,9 +388,15 @@ def create_playthrough(world):
         pathpairs = zip_longest(pathsiter, pathsiter)
         return list(pathpairs)
 
-    old_world.spoiler.paths = {location.name : get_path(state, location.parent_region) for sphere in collection_spheres for location in sphere}
-    if any(exit == 'Pyramid Fairy' for path in old_world.spoiler.paths.values() for (_, exit) in path):
-        old_world.spoiler.paths['Big Bomb Shop'] = get_path(state, world.get_region('Big Bomb Shop'))
+    old_world.spoiler.paths = dict()
+    for player in range(1, world.players + 1):
+        old_world.spoiler.paths.update({ str(location) : get_path(state, location.parent_region) for sphere in collection_spheres for location in sphere if location.player == player})
+        for _, path in dict(old_world.spoiler.paths).items():
+            if any(exit == 'Pyramid Fairy' for (_, exit) in path):
+                if world.mode != 'inverted':
+                    old_world.spoiler.paths[str(world.get_region('Big Bomb Shop', player))] = get_path(state, world.get_region('Big Bomb Shop', player))
+                else:
+                    old_world.spoiler.paths[str(world.get_region('Inverted Big Bomb Shop', player))] = get_path(state, world.get_region('Inverted Big Bomb Shop', player))
 
     # we can finally output our playthrough
     old_world.spoiler.playthrough = OrderedDict([(str(i + 1), {str(location): str(location.item) for location in sphere}) for i, sphere in enumerate(collection_spheres)])

Plando.py

@@ -19,21 +19,11 @@ from Main import create_playthrough
 
 __version__ = '0.2-dev'
 
-logic_hash = [182, 244, 144, 92, 149, 200, 93, 183, 124, 169, 226, 46, 111, 163, 5, 193, 13, 112, 125, 101, 128, 84, 31, 67, 107, 94, 184, 100, 189, 18, 8, 171,
-              142, 57, 173, 38, 37, 211, 253, 131, 98, 239, 167, 116, 32, 186, 70, 148, 66, 151, 143, 86, 59, 83, 16, 51, 240, 152, 60, 242, 190, 117, 76, 122,
-              15, 221, 62, 39, 174, 177, 223, 34, 150, 50, 178, 238, 95, 219, 10, 162, 222, 0, 165, 202, 74, 36, 206, 209, 251, 105, 175, 135, 121, 88, 214, 247,
-              154, 161, 71, 19, 85, 157, 40, 96, 225, 27, 230, 49, 231, 207, 64, 35, 249, 134, 132, 108, 63, 24, 4, 127, 255, 14, 145, 23, 81, 216, 113, 90, 194,
-              110, 65, 229, 43, 1, 11, 168, 147, 103, 156, 77, 80, 220, 28, 227, 213, 198, 172, 79, 75, 140, 44, 146, 188, 17, 6, 102, 56, 235, 166, 89, 218, 246,
-              99, 78, 187, 126, 119, 196, 69, 137, 181, 55, 20, 215, 199, 130, 9, 45, 58, 185, 91, 33, 197, 72, 115, 195, 114, 29, 30, 233, 141, 129, 155, 159, 47,
-              224, 236, 21, 234, 191, 136, 104, 87, 106, 26, 73, 250, 248, 228, 48, 53, 243, 237, 241, 61, 180, 12, 208, 245, 232, 192, 2, 7, 170, 123, 176, 160, 201,
-              153, 217, 252, 158, 25, 205, 22, 133, 254, 138, 203, 118, 210, 204, 82, 97, 52, 164, 68, 139, 120, 109, 54, 3, 41, 179, 212, 42]
-
-
 def main(args):
     start_time = time.clock()
 
     # initialize the world
-    world = World('vanilla', 'noglitches', 'standard', 'normal', 'none', 'on', 'ganon', 'freshness', False, False, False, args.quickswap, args.fastmenu, args.disablemusic, False, False, False, None)
+    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)
     logger = logging.getLogger('')
 
     hasher = hashlib.md5()
@@ -48,14 +38,14 @@ def main(args):
 
     world.difficulty_requirements = difficulties[world.difficulty]
 
-    create_regions(world)
-    create_dungeons(world)
+    create_regions(world, 1)
+    create_dungeons(world, 1)
 
-    link_entrances(world)
+    link_entrances(world, 1)
 
     logger.info('Calculating Access Rules.')
 
-    set_rules(world)
+    set_rules(world, 1)
 
     logger.info('Fill the world.')
 
@@ -63,8 +53,8 @@ def main(args):
 
     fill_world(world, args.plando, text_patches)
 
-    if world.get_entrance('Dam').connected_region.name != 'Dam' or world.get_entrance('Swamp Palace').connected_region.name != 'Swamp Palace (Entrance)':
-        world.swamp_patch_required = True
+    if world.get_entrance('Dam', 1).connected_region.name != 'Dam' or world.get_entrance('Swamp Palace', 1).connected_region.name != 'Swamp Palace (Entrance)':
+        world.swamp_patch_required[1] = True
 
     logger.info('Calculating playthrough.')
 
@@ -84,7 +74,7 @@ def main(args):
         sprite = None
 
     rom = LocalRom(args.rom)
-    patch_rom(world, rom, logic_hash, args.heartbeep, args.heartcolor, sprite)
+    patch_rom(world, 1, rom, args.heartbeep, args.heartcolor, sprite)
 
     for textname, texttype, text in text_patches:
         if texttype == 'text':
@@ -174,33 +164,33 @@ def fill_world(world, plando, text_patches):
                     continue
 
                 locationstr, itemstr = line.split(':', 1)
-                location = world.get_location(locationstr.strip())
+                location = world.get_location(locationstr.strip(), 1)
                 if location is None:
                     logger.warning('Unknown location: %s', locationstr)
                     continue
                 else:
-                    item = ItemFactory(itemstr.strip())
+                    item = ItemFactory(itemstr.strip(), 1)
                     if item is not None:
                         world.push_item(location, item)
                     if item.key:
                         location.event = True
             elif '<=>' in line:
                 entrance, exit = line.split('<=>', 1)
-                connect_two_way(world, entrance.strip(), exit.strip())
+                connect_two_way(world, entrance.strip(), exit.strip(), 1)
             elif '=>' in line:
                 entrance, exit = line.split('=>', 1)
-                connect_entrance(world, entrance.strip(), exit.strip())
+                connect_entrance(world, entrance.strip(), exit.strip(), 1)
             elif '<=' in line:
                 entrance, exit = line.split('<=', 1)
-                connect_exit(world, exit.strip(), entrance.strip())
+                connect_exit(world, exit.strip(), entrance.strip(), 1)
 
-    world.required_medallions = (mm_medallion, tr_medallion)
+    world.required_medallions[1] = (mm_medallion, tr_medallion)
 
     # set up Agahnim Events
-    world.get_location('Agahnim 1').event = True
-    world.get_location('Agahnim 1').item = ItemFactory('Beat Agahnim 1')
-    world.get_location('Agahnim 2').event = True
-    world.get_location('Agahnim 2').item = ItemFactory('Beat Agahnim 2')
+    world.get_location('Agahnim 1', 1).event = True
+    world.get_location('Agahnim 1', 1).item = ItemFactory('Beat Agahnim 1', 1)
+    world.get_location('Agahnim 2', 1).event = True
+    world.get_location('Agahnim 2', 1).item = ItemFactory('Beat Agahnim 2', 1)
 
 
 def start():

README.md

@@ -43,6 +43,16 @@ Special notes:
 - The magic barrier to Hyrule Castle Tower can be broken with a Hammer.
 - The Hammer can be used to activate the Ether and Bombos tablets.
 
+### Inverted
+
+This mode is similar to Open but requires the Moon Pearl in order to not transform into a bunny in the Light World and the Sanctuary spawn point is moved to the Dark Sanctuary
+
+Special Notes:
+
+- Link's House is shuffled freely. The Dark Sanctuary is shuffled within West Dark World.
+- There are a number of overworld changes to account for the inability to mirror from the Light World to the Dark World.
+- Legacy shuffles are not implemente for this mode.
+
 ## Game Logic
 This determines the Item Requirements for each location.
 
@@ -85,12 +95,6 @@ This is only noticeably different if the the Ganon shuffle option is enabled.
 
 ## Game Difficulty
 
-### Easy
-
-This setting doubles the number of swords, shields, armors, bottles, and silver arrows in the item pool.
-This setting will also triple the number of Lamps available, and all will be obtainable before dark rooms.
-Within dungeons, the number of items found will be displayed on screen if there is no timer.
-
 ### Normal
 
 This is the default setting that has an item pool most similar to the original
@@ -108,11 +112,6 @@ the player from having fairies in bottles.
 This setting is a more extreme version of the Hard setting. Potions are further nerfed, the item
 pool is less helpful, and the player can find no armor, only a Master Sword, and only a single bottle.
 
-### Insane
-
-This setting is a modest step up from Expert. The main difference is that the player will never find any
-additional health.
-
 ## Timer Setting
 
 ### None
@@ -288,10 +287,6 @@ In further concert with the Bow changes, all arrows under pots, in chests, and e
 If not set, Compasses and Maps are removed from the dungeon item pools and replaced by empty chests that may end up anywhere in the world.
 This may lead to different amount of itempool items being placed in a dungeon than you are used to.
 
-## Only Ensure Seed Beatable
-
-If set, will only ensure the goal can be achieved, but not necessarily that all locations are reachable. Currently only affects VT25, VT26 and balanced algorithms.
-
 ## Include Ganon's Tower and Pyramid Hole in Shuffle pool
 
 If set, Ganon's Tower is included in the dungeon shuffle pool and the Pyramid Hole/Exit pair is included in the Holes shuffle pool. Ganon can not be defeated until the primary goal is fulfilled.
@@ -336,7 +331,7 @@ Output a Spoiler File (default: False)
 Select the game logic (default: noglitches)
 
 ```
---mode [{standard,open,swordless}]
+--mode [{standard,open,swordless,inverted}]
 ```
 
 Select the game mode. (default: open)
@@ -348,11 +343,17 @@ Select the game mode. (default: open)
 Select the game completion goal. (default: ganon)
 
 ```
---difficulty [{easy,normal,hard,expert,insane}]
+--difficulty [{normal,hard,expert}]
 ```
 
 Select the game difficulty. Affects available itempool. (default: normal)
 
+```
+--item_functionality [{normal,hard,expert}]
+```
+
+Select limits on item functionality to increase difficulty. (default: normal)
+
 ```
 --timer [{none,display,timed,timed-ohko,ohko,timed-countdown}]
 ```
@@ -458,10 +459,10 @@ Select the color of Link\'s heart meter. (default: red)
 Use to select a different sprite sheet to use for Link. Path to a binary file of length 0x7000 containing the sprite data stored at address 0x80000 in the rom. (default: None)
 
 ```
---beatableonly
+--accessibility [{items,locations,none}]
 ```
 
-Enables the "Only Ensure Seed Beatable" option (default: False)
+Sets the item/location accessibility rules. (default: items)
 
 ```
 --hints

Regions.py

@@ -2,10 +2,10 @@ import collections
 from BaseClasses import Region, Location, Entrance, RegionType, Shop, ShopType
 
 
-def create_regions(world):
+def create_regions(world, player):
 
-    world.regions = [
-        create_lw_region('Light World', ['Mushroom', 'Bottle Merchant', 'Flute Spot', 'Sunken Treasure', 'Purple Chest'],
+    world.regions += [
+        create_lw_region(player, 'Light World', ['Mushroom', 'Bottle Merchant', 'Flute Spot', 'Sunken Treasure', 'Purple Chest'],
                          ["Blinds Hideout", "Hyrule Castle Secret Entrance Drop", 'Zoras River', 'Kings Grave Outer Rocks', 'Dam',
                           'Links House', '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',
@@ -15,118 +15,118 @@ def create_regions(world):
                           'Elder House (East)', 'Elder House (West)', 'North Fairy Cave', 'North Fairy Cave Drop', 'Lost Woods Gamble', 'Snitch Lady (East)', 'Snitch Lady (West)', 'Tavern (Front)',
                           'Bush Covered House', 'Light World Bomb Hut', 'Kakariko Shop', 'Long Fairy Cave', 'Good Bee Cave', '20 Rupee Cave', 'Cave Shop (Lake Hylia)', 'Waterfall of Wishing', 'Hyrule Castle Main Gate',
                           'Bonk Fairy (Light)', '50 Rupee Cave', 'Fortune Teller (Light)', 'Lake Hylia Fairy', 'Light Hype Fairy', 'Desert Fairy', 'Lumberjack House', 'Lake Hylia Fortune Teller', 'Kakariko Gamble Game', 'Top of Pyramid']),
-        create_lw_region('Death Mountain Entrance', None, ['Old Man Cave (West)', 'Death Mountain Entrance Drop']),
-        create_lw_region('Lake Hylia Central Island', None, ['Capacity Upgrade', 'Lake Hylia Central Island Teleporter']),
-        create_cave_region('Blinds Hideout', 'a bounty of five items', ["Blind\'s Hideout - Top",
+        create_lw_region(player, 'Death Mountain Entrance', None, ['Old Man Cave (West)', 'Death Mountain Entrance Drop']),
+        create_lw_region(player, 'Lake Hylia Central Island', None, ['Capacity Upgrade', 'Lake Hylia Central Island Teleporter']),
+        create_cave_region(player, 'Blinds Hideout', 'a bounty of five items', ["Blind\'s Hideout - Top",
                                                                         "Blind\'s Hideout - Left",
                                                                         "Blind\'s Hideout - Right",
                                                                         "Blind\'s Hideout - Far Left",
                                                                         "Blind\'s Hideout - Far Right"]),
-        create_cave_region('Hyrule Castle Secret Entrance', 'a drop\'s exit', ['Link\'s Uncle', 'Secret Passage'], ['Hyrule Castle Secret Entrance Exit']),
-        create_lw_region('Zoras River', ['King Zora', 'Zora\'s Ledge']),
-        create_cave_region('Waterfall of Wishing', 'a cave with two chests', ['Waterfall Fairy - Left', 'Waterfall Fairy - Right']),
-        create_lw_region('Kings Grave Area', None, ['Kings Grave', 'Kings Grave Inner Rocks']),
-        create_cave_region('Kings Grave', 'a cave with a chest', ['King\'s Tomb']),
-        create_cave_region('North Fairy Cave', 'a drop\'s exit', None, ['North Fairy Cave Exit']),
-        create_cave_region('Dam', 'the dam', ['Floodgate', 'Floodgate Chest']),
-        create_cave_region('Links House', 'your house', ['Link\'s House'], ['Links House Exit']),
-        create_cave_region('Chris Houlihan Room', 'I AM ERROR', None, ['Chris Houlihan Room Exit']),
-        create_cave_region('Tavern', 'the tavern', ['Kakariko Tavern']),
-        create_cave_region('Elder House', 'a connector', None, ['Elder House Exit (East)', 'Elder House Exit (West)']),
-        create_cave_region('Snitch Lady (East)', 'a boring house'),
-        create_cave_region('Snitch Lady (West)', 'a boring house'),
-        create_cave_region('Bush Covered House', 'the grass man'),
-        create_cave_region('Tavern (Front)', 'the tavern'),
-        create_cave_region('Light World Bomb Hut', 'a restock room'),
-        create_cave_region('Kakariko Shop', 'a common shop'),
-        create_cave_region('Fortune Teller (Light)', 'a fortune teller'),
-        create_cave_region('Lake Hylia Fortune Teller', 'a fortune teller'),
-        create_cave_region('Lumberjack House', 'a boring house'),
-        create_cave_region('Bonk Fairy (Light)', 'a fairy fountain'),
-        create_cave_region('Bonk Fairy (Dark)', 'a fairy fountain'),
-        create_cave_region('Lake Hylia Healer Fairy', 'a fairy fountain'),
-        create_cave_region('Swamp Healer Fairy', 'a fairy fountain'),
-        create_cave_region('Desert Healer Fairy', 'a fairy fountain'),
-        create_cave_region('Dark Lake Hylia Healer Fairy', 'a fairy fountain'),
-        create_cave_region('Dark Lake Hylia Ledge Healer Fairy', 'a fairy fountain'),
-        create_cave_region('Dark Desert Healer Fairy', 'a fairy fountain'),
-        create_cave_region('Dark Death Mountain Healer Fairy', 'a fairy fountain'),
-        create_cave_region('Chicken House', 'a house with a chest', ['Chicken House']),
-        create_cave_region('Aginahs Cave', 'a cave with a chest', ['Aginah\'s Cave']),
-        create_cave_region('Sahasrahlas Hut', 'Sahasrahla', ['Sahasrahla\'s Hut - Left', 'Sahasrahla\'s Hut - Middle', 'Sahasrahla\'s Hut - Right', 'Sahasrahla']),
-        create_cave_region('Kakariko Well (top)', 'a drop\'s exit', ['Kakariko Well - Top', 'Kakariko Well - Left', 'Kakariko Well - Middle',
+        create_cave_region(player, 'Hyrule Castle Secret Entrance', 'a drop\'s exit', ['Link\'s Uncle', 'Secret Passage'], ['Hyrule Castle Secret Entrance Exit']),
+        create_lw_region(player, 'Zoras River', ['King Zora', 'Zora\'s Ledge']),
+        create_cave_region(player, 'Waterfall of Wishing', 'a cave with two chests', ['Waterfall Fairy - Left', 'Waterfall Fairy - Right']),
+        create_lw_region(player, 'Kings Grave Area', None, ['Kings Grave', 'Kings Grave Inner Rocks']),
+        create_cave_region(player, 'Kings Grave', 'a cave with a chest', ['King\'s Tomb']),
+        create_cave_region(player, 'North Fairy Cave', 'a drop\'s exit', None, ['North Fairy Cave Exit']),
+        create_cave_region(player, 'Dam', 'the dam', ['Floodgate', 'Floodgate Chest']),
+        create_cave_region(player, 'Links House', 'your house', ['Link\'s House'], ['Links House Exit']),
+        create_cave_region(player, 'Chris Houlihan Room', 'I AM ERROR', None, ['Chris Houlihan Room Exit']),
+        create_cave_region(player, 'Tavern', 'the tavern', ['Kakariko Tavern']),
+        create_cave_region(player, 'Elder House', 'a connector', None, ['Elder House Exit (East)', 'Elder House Exit (West)']),
+        create_cave_region(player, 'Snitch Lady (East)', 'a boring house'),
+        create_cave_region(player, 'Snitch Lady (West)', 'a boring house'),
+        create_cave_region(player, 'Bush Covered House', 'the grass man'),
+        create_cave_region(player, 'Tavern (Front)', 'the tavern'),
+        create_cave_region(player, 'Light World Bomb Hut', 'a restock room'),
+        create_cave_region(player, 'Kakariko Shop', 'a common shop'),
+        create_cave_region(player, 'Fortune Teller (Light)', 'a fortune teller'),
+        create_cave_region(player, 'Lake Hylia Fortune Teller', 'a fortune teller'),
+        create_cave_region(player, 'Lumberjack House', 'a boring house'),
+        create_cave_region(player, 'Bonk Fairy (Light)', 'a fairy fountain'),
+        create_cave_region(player, 'Bonk Fairy (Dark)', 'a fairy fountain'),
+        create_cave_region(player, 'Lake Hylia Healer Fairy', 'a fairy fountain'),
+        create_cave_region(player, 'Swamp Healer Fairy', 'a fairy fountain'),
+        create_cave_region(player, 'Desert Healer Fairy', 'a fairy fountain'),
+        create_cave_region(player, 'Dark Lake Hylia Healer Fairy', 'a fairy fountain'),
+        create_cave_region(player, 'Dark Lake Hylia Ledge Healer Fairy', 'a fairy fountain'),
+        create_cave_region(player, 'Dark Desert Healer Fairy', 'a fairy fountain'),
+        create_cave_region(player, 'Dark Death Mountain Healer Fairy', 'a fairy fountain'),
+        create_cave_region(player, 'Chicken House', 'a house with a chest', ['Chicken House']),
+        create_cave_region(player, 'Aginahs Cave', 'a cave with a chest', ['Aginah\'s Cave']),
+        create_cave_region(player, 'Sahasrahlas Hut', 'Sahasrahla', ['Sahasrahla\'s Hut - Left', 'Sahasrahla\'s Hut - Middle', 'Sahasrahla\'s Hut - Right', 'Sahasrahla']),
+        create_cave_region(player, 'Kakariko Well (top)', 'a drop\'s exit', ['Kakariko Well - Top', 'Kakariko Well - Left', 'Kakariko Well - Middle',
                                                                      'Kakariko Well - Right', 'Kakariko Well - Bottom'], ['Kakariko Well (top to bottom)']),
-        create_cave_region('Kakariko Well (bottom)', 'a drop\'s exit', None, ['Kakariko Well Exit']),
-        create_cave_region('Blacksmiths Hut', 'the smith', ['Blacksmith', 'Missing Smith']),
-        create_lw_region('Bat Cave Drop Ledge', None, ['Bat Cave Drop']),
-        create_cave_region('Bat Cave (right)', 'a drop\'s exit', ['Magic Bat'], ['Bat Cave Door']),
-        create_cave_region('Bat Cave (left)', 'a drop\'s exit', None, ['Bat Cave Exit']),
-        create_cave_region('Sick Kids House', 'the sick kid', ['Sick Kid']),
-        create_lw_region('Hobo Bridge', ['Hobo']),
-        create_cave_region('Lost Woods Hideout (top)', 'a drop\'s exit', ['Lost Woods Hideout'], ['Lost Woods Hideout (top to bottom)']),
-        create_cave_region('Lost Woods Hideout (bottom)', 'a drop\'s exit', None, ['Lost Woods Hideout Exit']),
-        create_cave_region('Lumberjack Tree (top)', 'a drop\'s exit', ['Lumberjack Tree'], ['Lumberjack Tree (top to bottom)']),
-        create_cave_region('Lumberjack Tree (bottom)', 'a drop\'s exit', None, ['Lumberjack Tree Exit']),
-        create_lw_region('Cave 45 Ledge', None, ['Cave 45']),
-        create_cave_region('Cave 45', 'a cave with an item', ['Cave 45']),
-        create_lw_region('Graveyard Ledge', None, ['Graveyard Cave']),
-        create_cave_region('Graveyard Cave', 'a cave with an item', ['Graveyard Cave']),
-        create_cave_region('Checkerboard Cave', 'a cave with an item', ['Checkerboard Cave']),
-        create_cave_region('Long Fairy Cave', 'a fairy fountain'),
-        create_cave_region('Mini Moldorm Cave', 'a bounty of five items', ['Mini Moldorm Cave - Far Left', 'Mini Moldorm Cave - Left', 'Mini Moldorm Cave - Right',
+        create_cave_region(player, 'Kakariko Well (bottom)', 'a drop\'s exit', None, ['Kakariko Well Exit']),
+        create_cave_region(player, 'Blacksmiths Hut', 'the smith', ['Blacksmith', 'Missing Smith']),
+        create_lw_region(player, 'Bat Cave Drop Ledge', None, ['Bat Cave Drop']),
+        create_cave_region(player, 'Bat Cave (right)', 'a drop\'s exit', ['Magic Bat'], ['Bat Cave Door']),
+        create_cave_region(player, 'Bat Cave (left)', 'a drop\'s exit', None, ['Bat Cave Exit']),
+        create_cave_region(player, 'Sick Kids House', 'the sick kid', ['Sick Kid']),
+        create_lw_region(player, 'Hobo Bridge', ['Hobo']),
+        create_cave_region(player, 'Lost Woods Hideout (top)', 'a drop\'s exit', ['Lost Woods Hideout'], ['Lost Woods Hideout (top to bottom)']),
+        create_cave_region(player, 'Lost Woods Hideout (bottom)', 'a drop\'s exit', None, ['Lost Woods Hideout Exit']),
+        create_cave_region(player, 'Lumberjack Tree (top)', 'a drop\'s exit', ['Lumberjack Tree'], ['Lumberjack Tree (top to bottom)']),
+        create_cave_region(player, 'Lumberjack Tree (bottom)', 'a drop\'s exit', None, ['Lumberjack Tree Exit']),
+        create_lw_region(player, 'Cave 45 Ledge', None, ['Cave 45']),
+        create_cave_region(player, 'Cave 45', 'a cave with an item', ['Cave 45']),
+        create_lw_region(player, 'Graveyard Ledge', None, ['Graveyard Cave']),
+        create_cave_region(player, 'Graveyard Cave', 'a cave with an item', ['Graveyard Cave']),
+        create_cave_region(player, 'Checkerboard Cave', 'a cave with an item', ['Checkerboard Cave']),
+        create_cave_region(player, 'Long Fairy Cave', 'a fairy fountain'),
+        create_cave_region(player, 'Mini Moldorm Cave', 'a bounty of five items', ['Mini Moldorm Cave - Far Left', 'Mini Moldorm Cave - Left', 'Mini Moldorm Cave - Right',
                                                                            'Mini Moldorm Cave - Far Right', 'Mini Moldorm Cave - Generous Guy']),
-        create_cave_region('Ice Rod Cave', 'a cave with a chest', ['Ice Rod Cave']),
-        create_cave_region('Good Bee Cave', 'a cold bee'),
-        create_cave_region('20 Rupee Cave', 'a cave with some cash'),
-        create_cave_region('Cave Shop (Lake Hylia)', 'a common shop'),
-        create_cave_region('Cave Shop (Dark Death Mountain)', 'a common shop'),
-        create_cave_region('Bonk Rock Cave', 'a cave with a chest', ['Bonk Rock Cave']),
-        create_cave_region('Library', 'the library', ['Library']),
-        create_cave_region('Kakariko Gamble Game', 'a game of chance'),
-        create_cave_region('Potion Shop', 'the potion shop', ['Potion Shop']),
-        create_lw_region('Lake Hylia Island', ['Lake Hylia Island']),
-        create_cave_region('Capacity Upgrade', 'the queen of fairies'),
-        create_cave_region('Two Brothers House', 'a connector', None, ['Two Brothers House Exit (East)', 'Two Brothers House Exit (West)']),
-        create_lw_region('Maze Race Ledge', ['Maze Race'], ['Two Brothers House (West)']),
-        create_cave_region('50 Rupee Cave', 'a cave with some cash'),
-        create_lw_region('Desert Ledge', ['Desert Ledge'], ['Desert Palace Entrance (North) Rocks', 'Desert Palace Entrance (West)']),
-        create_lw_region('Desert Ledge (Northeast)', None, ['Checkerboard Cave']),
-        create_lw_region('Desert Palace Stairs', None, ['Desert Palace Entrance (South)']),
-        create_lw_region('Desert Palace Lone Stairs', None, ['Desert Palace Stairs Drop', 'Desert Palace Entrance (East)']),
-        create_lw_region('Desert Palace Entrance (North) Spot', None, ['Desert Palace Entrance (North)', 'Desert Ledge Return Rocks']),
-        create_dungeon_region('Desert Palace Main (Outer)', 'Desert Palace', ['Desert Palace - Big Chest', 'Desert Palace - Torch', 'Desert Palace - Map Chest'],
+        create_cave_region(player, 'Ice Rod Cave', 'a cave with a chest', ['Ice Rod Cave']),
+        create_cave_region(player, 'Good Bee Cave', 'a cold bee'),
+        create_cave_region(player, '20 Rupee Cave', 'a cave with some cash'),
+        create_cave_region(player, 'Cave Shop (Lake Hylia)', 'a common shop'),
+        create_cave_region(player, 'Cave Shop (Dark Death Mountain)', 'a common shop'),
+        create_cave_region(player, 'Bonk Rock Cave', 'a cave with a chest', ['Bonk Rock Cave']),
+        create_cave_region(player, 'Library', 'the library', ['Library']),
+        create_cave_region(player, 'Kakariko Gamble Game', 'a game of chance'),
+        create_cave_region(player, 'Potion Shop', 'the potion shop', ['Potion Shop']),
+        create_lw_region(player, 'Lake Hylia Island', ['Lake Hylia Island']),
+        create_cave_region(player, 'Capacity Upgrade', 'the queen of fairies'),
+        create_cave_region(player, 'Two Brothers House', 'a connector', None, ['Two Brothers House Exit (East)', 'Two Brothers House Exit (West)']),
+        create_lw_region(player, 'Maze Race Ledge', ['Maze Race'], ['Two Brothers House (West)']),
+        create_cave_region(player, '50 Rupee Cave', 'a cave with some cash'),
+        create_lw_region(player, 'Desert Ledge', ['Desert Ledge'], ['Desert Palace Entrance (North) Rocks', 'Desert Palace Entrance (West)']),
+        create_lw_region(player, 'Desert Ledge (Northeast)', None, ['Checkerboard Cave']),
+        create_lw_region(player, 'Desert Palace Stairs', None, ['Desert Palace Entrance (South)']),
+        create_lw_region(player, 'Desert Palace Lone Stairs', None, ['Desert Palace Stairs Drop', 'Desert Palace Entrance (East)']),
+        create_lw_region(player, 'Desert Palace Entrance (North) Spot', None, ['Desert Palace Entrance (North)', 'Desert Ledge Return Rocks']),
+        create_dungeon_region(player, 'Desert Palace Main (Outer)', 'Desert Palace', ['Desert Palace - Big Chest', 'Desert Palace - Torch', 'Desert Palace - Map Chest'],
                               ['Desert Palace Pots (Outer)', 'Desert Palace Exit (West)', 'Desert Palace Exit (East)', 'Desert Palace East Wing']),
-        create_dungeon_region('Desert Palace Main (Inner)', 'Desert Palace', None, ['Desert Palace Exit (South)', 'Desert Palace Pots (Inner)']),
-        create_dungeon_region('Desert Palace East', 'Desert Palace', ['Desert Palace - Compass Chest', 'Desert Palace - Big Key Chest']),
-        create_dungeon_region('Desert Palace North', 'Desert Palace', ['Desert Palace - Boss', 'Desert Palace - Prize'], ['Desert Palace Exit (North)']),
-        create_dungeon_region('Eastern Palace', 'Eastern Palace', ['Eastern Palace - Compass Chest', 'Eastern Palace - Big Chest', 'Eastern Palace - Cannonball Chest',
+        create_dungeon_region(player, 'Desert Palace Main (Inner)', 'Desert Palace', None, ['Desert Palace Exit (South)', 'Desert Palace Pots (Inner)']),
+        create_dungeon_region(player, 'Desert Palace East', 'Desert Palace', ['Desert Palace - Compass Chest', 'Desert Palace - Big Key Chest']),
+        create_dungeon_region(player, 'Desert Palace North', 'Desert Palace', ['Desert Palace - Boss', 'Desert Palace - Prize'], ['Desert Palace Exit (North)']),
+        create_dungeon_region(player, 'Eastern Palace', 'Eastern Palace', ['Eastern Palace - Compass Chest', 'Eastern Palace - Big Chest', 'Eastern Palace - Cannonball Chest',
                                                  'Eastern Palace - Big Key Chest', 'Eastern Palace - Map Chest', 'Eastern Palace - Boss', 'Eastern Palace - Prize'], ['Eastern Palace Exit']),
-        create_lw_region('Master Sword Meadow', ['Master Sword Pedestal']),
-        create_cave_region('Lost Woods Gamble', 'a game of chance'),
-        create_lw_region('Hyrule Castle Courtyard', None, ['Hyrule Castle Secret Entrance Stairs', 'Hyrule Castle Entrance (South)']),
-        create_lw_region('Hyrule Castle Ledge', None, ['Hyrule Castle Entrance (East)', 'Hyrule Castle Entrance (West)', 'Agahnims Tower', 'Hyrule Castle Ledge Courtyard Drop']),
-        create_dungeon_region('Hyrule Castle', 'Hyrule Castle', ['Hyrule Castle - Boomerang Chest', 'Hyrule Castle - Map Chest', 'Hyrule Castle - Zelda\'s Chest'],
+        create_lw_region(player, 'Master Sword Meadow', ['Master Sword Pedestal']),
+        create_cave_region(player, 'Lost Woods Gamble', 'a game of chance'),
+        create_lw_region(player, 'Hyrule Castle Courtyard', None, ['Hyrule Castle Secret Entrance Stairs', 'Hyrule Castle Entrance (South)']),
+        create_lw_region(player, 'Hyrule Castle Ledge', None, ['Hyrule Castle Entrance (East)', 'Hyrule Castle Entrance (West)', 'Agahnims Tower', 'Hyrule Castle Ledge Courtyard Drop']),
+        create_dungeon_region(player, 'Hyrule Castle', 'Hyrule Castle', ['Hyrule Castle - Boomerang Chest', 'Hyrule Castle - Map Chest', 'Hyrule Castle - Zelda\'s Chest'],
                               ['Hyrule Castle Exit (East)', 'Hyrule Castle Exit (West)', 'Hyrule Castle Exit (South)', 'Throne Room']),
-        create_dungeon_region('Sewer Drop', 'a drop\'s exit', None, ['Sewer Drop']),  # This exists only to be referenced for access checks
-        create_dungeon_region('Sewers (Dark)', 'a drop\'s exit', ['Sewers - Dark Cross'], ['Sewers Door']),
-        create_dungeon_region('Sewers', 'a drop\'s exit', ['Sewers - Secret Room - Left', 'Sewers - Secret Room - Middle',
+        create_dungeon_region(player, 'Sewer Drop', 'a drop\'s exit', None, ['Sewer Drop']),  # This exists only to be referenced for access checks
+        create_dungeon_region(player, 'Sewers (Dark)', 'a drop\'s exit', ['Sewers - Dark Cross'], ['Sewers Door']),
+        create_dungeon_region(player, 'Sewers', 'a drop\'s exit', ['Sewers - Secret Room - Left', 'Sewers - Secret Room - Middle',
                                          'Sewers - Secret Room - Right'], ['Sanctuary Push Door', 'Sewers Back Door']),
-        create_dungeon_region('Sanctuary', 'a drop\'s exit', ['Sanctuary'], ['Sanctuary Exit']),
-        create_dungeon_region('Agahnims Tower', 'Castle Tower', ['Castle Tower - Room 03', 'Castle Tower - Dark Maze'], ['Agahnim 1', 'Agahnims Tower Exit']),
-        create_dungeon_region('Agahnim 1', 'Castle Tower', ['Agahnim 1'], None),
-        create_cave_region('Old Man Cave', 'a connector', ['Old Man'], ['Old Man Cave Exit (East)', 'Old Man Cave Exit (West)']),
-        create_cave_region('Old Man House', 'a connector', None, ['Old Man House Exit (Bottom)', 'Old Man House Front to Back']),
-        create_cave_region('Old Man House Back', 'a connector', None, ['Old Man House Exit (Top)', 'Old Man House Back to Front']),
-        create_lw_region('Death Mountain', None, ['Old Man Cave (East)', 'Old Man House (Bottom)', 'Old Man House (Top)', 'Death Mountain Return Cave (East)', 'Spectacle Rock Cave', 'Spectacle Rock Cave Peak', 'Spectacle Rock Cave (Bottom)', 'Broken Bridge (West)', 'Death Mountain Teleporter']),
-        create_cave_region('Death Mountain Return Cave', 'a connector', None, ['Death Mountain Return Cave Exit (West)', 'Death Mountain Return Cave Exit (East)']),
-        create_lw_region('Death Mountain Return Ledge', None, ['Death Mountain Return Ledge Drop', 'Death Mountain Return Cave (West)']),
-        create_cave_region('Spectacle Rock Cave (Top)', 'a connector', ['Spectacle Rock Cave'], ['Spectacle Rock Cave Drop', 'Spectacle Rock Cave Exit (Top)']),
-        create_cave_region('Spectacle Rock Cave (Bottom)', 'a connector', None, ['Spectacle Rock Cave Exit']),
-        create_cave_region('Spectacle Rock Cave (Peak)', 'a connector', None, ['Spectacle Rock Cave Peak Drop', 'Spectacle Rock Cave Exit (Peak)']),
-        create_lw_region('East Death Mountain (Bottom)', None, ['Broken Bridge (East)', 'Paradox Cave (Bottom)', 'Paradox Cave (Middle)', 'East Death Mountain Teleporter', 'Hookshot Fairy', 'Fairy Ascension Rocks', 'Spiral Cave (Bottom)']),
-        create_cave_region('Hookshot Fairy', 'fairies deep in a cave'),
-        create_cave_region('Paradox Cave Front', 'a connector', None, ['Paradox Cave Push Block Reverse', 'Paradox Cave Exit (Bottom)', 'Light World Death Mountain Shop']),
-        create_cave_region('Paradox Cave Chest Area', 'a connector', ['Paradox Cave Lower - Far Left',
+        create_dungeon_region(player, 'Sanctuary', 'a drop\'s exit', ['Sanctuary'], ['Sanctuary Exit']),
+        create_dungeon_region(player, 'Agahnims Tower', 'Castle Tower', ['Castle Tower - Room 03', 'Castle Tower - Dark Maze'], ['Agahnim 1', 'Agahnims Tower Exit']),
+        create_dungeon_region(player, 'Agahnim 1', 'Castle Tower', ['Agahnim 1'], None),
+        create_cave_region(player, 'Old Man Cave', 'a connector', ['Old Man'], ['Old Man Cave Exit (East)', 'Old Man Cave Exit (West)']),
+        create_cave_region(player, 'Old Man House', 'a connector', None, ['Old Man House Exit (Bottom)', 'Old Man House Front to Back']),
+        create_cave_region(player, 'Old Man House Back', 'a connector', None, ['Old Man House Exit (Top)', 'Old Man House Back to Front']),
+        create_lw_region(player, 'Death Mountain', None, ['Old Man Cave (East)', 'Old Man House (Bottom)', 'Old Man House (Top)', 'Death Mountain Return Cave (East)', 'Spectacle Rock Cave', 'Spectacle Rock Cave Peak', 'Spectacle Rock Cave (Bottom)', 'Broken Bridge (West)', 'Death Mountain Teleporter']),
+        create_cave_region(player, 'Death Mountain Return Cave', 'a connector', None, ['Death Mountain Return Cave Exit (West)', 'Death Mountain Return Cave Exit (East)']),
+        create_lw_region(player, 'Death Mountain Return Ledge', None, ['Death Mountain Return Ledge Drop', 'Death Mountain Return Cave (West)']),
+        create_cave_region(player, 'Spectacle Rock Cave (Top)', 'a connector', ['Spectacle Rock Cave'], ['Spectacle Rock Cave Drop', 'Spectacle Rock Cave Exit (Top)']),
+        create_cave_region(player, 'Spectacle Rock Cave (Bottom)', 'a connector', None, ['Spectacle Rock Cave Exit']),
+        create_cave_region(player, 'Spectacle Rock Cave (Peak)', 'a connector', None, ['Spectacle Rock Cave Peak Drop', 'Spectacle Rock Cave Exit (Peak)']),
+        create_lw_region(player, 'East Death Mountain (Bottom)', None, ['Broken Bridge (East)', 'Paradox Cave (Bottom)', 'Paradox Cave (Middle)', 'East Death Mountain Teleporter', 'Hookshot Fairy', 'Fairy Ascension Rocks', 'Spiral Cave (Bottom)']),
+        create_cave_region(player, 'Hookshot Fairy', 'fairies deep in a cave'),
+        create_cave_region(player, 'Paradox Cave Front', 'a connector', None, ['Paradox Cave Push Block Reverse', 'Paradox Cave Exit (Bottom)', 'Light World Death Mountain Shop']),
+        create_cave_region(player, 'Paradox Cave Chest Area', 'a connector', ['Paradox Cave Lower - Far Left',
                                                                       'Paradox Cave Lower - Left',
                                                                       'Paradox Cave Lower - Right',
                                                                       'Paradox Cave Lower - Far Right',
@@ -134,174 +134,174 @@ def create_regions(world):
                                                                       'Paradox Cave Upper - Left',
                                                                       'Paradox Cave Upper - Right'],
                            ['Paradox Cave Push Block', 'Paradox Cave Bomb Jump']),
-        create_cave_region('Paradox Cave', 'a connector', None, ['Paradox Cave Exit (Middle)', 'Paradox Cave Exit (Top)', 'Paradox Cave Drop']),
-        create_cave_region('Light World Death Mountain Shop', 'a common shop'),
-        create_lw_region('East Death Mountain (Top)', None, ['Paradox Cave (Top)', 'Death Mountain (Top)', 'Spiral Cave Ledge Access', 'East Death Mountain Drop', 'Turtle Rock Teleporter', 'Fairy Ascension Ledge']),
-        create_lw_region('Spiral Cave Ledge', None, ['Spiral Cave', 'Spiral Cave Ledge Drop']),
-        create_cave_region('Spiral Cave (Top)', 'a connector', ['Spiral Cave'], ['Spiral Cave (top to bottom)', 'Spiral Cave Exit (Top)']),
-        create_cave_region('Spiral Cave (Bottom)', 'a connector', None, ['Spiral Cave Exit']),
-        create_lw_region('Fairy Ascension Plateau', None, ['Fairy Ascension Drop', 'Fairy Ascension Cave (Bottom)']),
-        create_cave_region('Fairy Ascension Cave (Bottom)', 'a connector', None, ['Fairy Ascension Cave Climb', 'Fairy Ascension Cave Exit (Bottom)']),
-        create_cave_region('Fairy Ascension Cave (Drop)', 'a connector', None, ['Fairy Ascension Cave Pots']),
-        create_cave_region('Fairy Ascension Cave (Top)', 'a connector', None, ['Fairy Ascension Cave Exit (Top)', 'Fairy Ascension Cave Drop']),
-        create_lw_region('Fairy Ascension Ledge', None, ['Fairy Ascension Ledge Drop', 'Fairy Ascension Cave (Top)']),
-        create_lw_region('Death Mountain (Top)', ['Ether Tablet'], ['East Death Mountain (Top)', 'Tower of Hera', 'Death Mountain Drop']),
-        create_lw_region('Spectacle Rock', ['Spectacle Rock'], ['Spectacle Rock Drop']),
-        create_dungeon_region('Tower of Hera (Bottom)', 'Tower of Hera', ['Tower of Hera - Basement Cage', 'Tower of Hera - Map Chest'], ['Tower of Hera Small Key Door', 'Tower of Hera Big Key Door', 'Tower of Hera Exit']),
-        create_dungeon_region('Tower of Hera (Basement)', 'Tower of Hera', ['Tower of Hera - Big Key Chest']),
-        create_dungeon_region('Tower of Hera (Top)', 'Tower of Hera', ['Tower of Hera - Compass Chest', 'Tower of Hera - Big Chest', 'Tower of Hera - Boss', 'Tower of Hera - Prize']),
+        create_cave_region(player, 'Paradox Cave', 'a connector', None, ['Paradox Cave Exit (Middle)', 'Paradox Cave Exit (Top)', 'Paradox Cave Drop']),
+        create_cave_region(player, 'Light World Death Mountain Shop', 'a common shop'),
+        create_lw_region(player, 'East Death Mountain (Top)', None, ['Paradox Cave (Top)', 'Death Mountain (Top)', 'Spiral Cave Ledge Access', 'East Death Mountain Drop', 'Turtle Rock Teleporter', 'Fairy Ascension Ledge']),
+        create_lw_region(player, 'Spiral Cave Ledge', None, ['Spiral Cave', 'Spiral Cave Ledge Drop']),
+        create_cave_region(player, 'Spiral Cave (Top)', 'a connector', ['Spiral Cave'], ['Spiral Cave (top to bottom)', 'Spiral Cave Exit (Top)']),
+        create_cave_region(player, 'Spiral Cave (Bottom)', 'a connector', None, ['Spiral Cave Exit']),
+        create_lw_region(player, 'Fairy Ascension Plateau', None, ['Fairy Ascension Drop', 'Fairy Ascension Cave (Bottom)']),
+        create_cave_region(player, 'Fairy Ascension Cave (Bottom)', 'a connector', None, ['Fairy Ascension Cave Climb', 'Fairy Ascension Cave Exit (Bottom)']),
+        create_cave_region(player, 'Fairy Ascension Cave (Drop)', 'a connector', None, ['Fairy Ascension Cave Pots']),
+        create_cave_region(player, 'Fairy Ascension Cave (Top)', 'a connector', None, ['Fairy Ascension Cave Exit (Top)', 'Fairy Ascension Cave Drop']),
+        create_lw_region(player, 'Fairy Ascension Ledge', None, ['Fairy Ascension Ledge Drop', 'Fairy Ascension Cave (Top)']),
+        create_lw_region(player, 'Death Mountain (Top)', ['Ether Tablet'], ['East Death Mountain (Top)', 'Tower of Hera', 'Death Mountain Drop']),
+        create_lw_region(player, 'Spectacle Rock', ['Spectacle Rock'], ['Spectacle Rock Drop']),
+        create_dungeon_region(player, 'Tower of Hera (Bottom)', 'Tower of Hera', ['Tower of Hera - Basement Cage', 'Tower of Hera - Map Chest'], ['Tower of Hera Small Key Door', 'Tower of Hera Big Key Door', 'Tower of Hera Exit']),
+        create_dungeon_region(player, 'Tower of Hera (Basement)', 'Tower of Hera', ['Tower of Hera - Big Key Chest']),
+        create_dungeon_region(player, 'Tower of Hera (Top)', 'Tower of Hera', ['Tower of Hera - Compass Chest', 'Tower of Hera - Big Chest', 'Tower of Hera - Boss', 'Tower of Hera - Prize']),
 
-        create_dw_region('East Dark World', ['Pyramid'], ['Pyramid Fairy', 'South Dark World Bridge', 'Palace of Darkness', 'Dark Lake Hylia Drop (East)', 'Dark Lake Hylia Teleporter',
+        create_dw_region(player, 'East Dark World', ['Pyramid'], ['Pyramid Fairy', 'South Dark World Bridge', 'Palace of Darkness', 'Dark Lake Hylia Drop (East)', 'Dark Lake Hylia Teleporter',
                                                            'Hyrule Castle Ledge Mirror Spot', 'Dark Lake Hylia Fairy', 'Palace of Darkness Hint', 'East Dark World Hint', 'Pyramid Hole', 'Northeast Dark World Broken Bridge Pass']),
-        create_dw_region('Northeast Dark World', ['Catfish'], ['West Dark World Gap', 'Dark World Potion Shop', 'East Dark World Broken Bridge Pass']),
-        create_cave_region('Palace of Darkness Hint', 'a storyteller'),
-        create_cave_region('East Dark World Hint', 'a storyteller'),
-        create_dw_region('South Dark World', ['Stumpy', 'Digging Game', 'Bombos Tablet'], ['Dark Lake Hylia Drop (South)', 'Hype Cave', 'Swamp Palace', 'Village of Outcasts Heavy Rock', 'Maze Race Mirror Spot',
+        create_dw_region(player, 'Northeast Dark World', ['Catfish'], ['West Dark World Gap', 'Dark World Potion Shop', 'East Dark World Broken Bridge Pass']),
+        create_cave_region(player, 'Palace of Darkness Hint', 'a storyteller'),
+        create_cave_region(player, 'East Dark World Hint', 'a storyteller'),
+        create_dw_region(player, 'South Dark World', ['Stumpy', 'Digging Game', 'Bombos Tablet'], ['Dark Lake Hylia Drop (South)', 'Hype Cave', 'Swamp Palace', 'Village of Outcasts Heavy Rock', 'Maze Race Mirror Spot',
                                                                                            'Cave 45 Mirror Spot', 'East Dark World Bridge', 'Big Bomb Shop', 'Archery Game', 'Bonk Fairy (Dark)', 'Dark Lake Hylia Shop']),
-        create_cave_region('Big Bomb Shop', 'the bomb shop'),
-        create_cave_region('Archery Game', 'a game of skill'),
-        create_dw_region('Dark Lake Hylia', None, ['Lake Hylia Island Mirror Spot', 'East Dark World Pier', 'Dark Lake Hylia Ledge']),
-        create_dw_region('Dark Lake Hylia Central Island', None, ['Ice Palace', 'Lake Hylia Central Island Mirror Spot']),
-        create_dw_region('Dark Lake Hylia Ledge', None, ['Dark Lake Hylia Ledge Drop', 'Dark Lake Hylia Ledge Fairy', 'Dark Lake Hylia Ledge Hint', 'Dark Lake Hylia Ledge Spike Cave']),
-        create_cave_region('Dark Lake Hylia Ledge Hint', 'a storyteller'),
-        create_cave_region('Dark Lake Hylia Ledge Spike Cave', 'a spiky hint'),
-        create_cave_region('Hype Cave', 'a bounty of five items', ['Hype Cave - Top', 'Hype Cave - Middle Right', 'Hype Cave - Middle Left',
+        create_cave_region(player, 'Big Bomb Shop', 'the bomb shop'),
+        create_cave_region(player, 'Archery Game', 'a game of skill'),
+        create_dw_region(player, 'Dark Lake Hylia', None, ['Lake Hylia Island Mirror Spot', 'East Dark World Pier', 'Dark Lake Hylia Ledge']),
+        create_dw_region(player, 'Dark Lake Hylia Central Island', None, ['Ice Palace', 'Lake Hylia Central Island Mirror Spot']),
+        create_dw_region(player, 'Dark Lake Hylia Ledge', None, ['Dark Lake Hylia Ledge Drop', 'Dark Lake Hylia Ledge Fairy', 'Dark Lake Hylia Ledge Hint', 'Dark Lake Hylia Ledge Spike Cave']),
+        create_cave_region(player, 'Dark Lake Hylia Ledge Hint', 'a storyteller'),
+        create_cave_region(player, 'Dark Lake Hylia Ledge Spike Cave', 'a spiky hint'),
+        create_cave_region(player, 'Hype Cave', 'a bounty of five items', ['Hype Cave - Top', 'Hype Cave - Middle Right', 'Hype Cave - Middle Left',
                                                                    'Hype Cave - Bottom', 'Hype Cave - Generous Guy']),
-        create_dw_region('West Dark World', ['Frog'], ['Village of Outcasts Drop', 'East Dark World River Pier', 'Brewery', 'C-Shaped House', 'Chest Game', 'Thieves Town', 'Graveyard Ledge Mirror Spot', 'Kings Grave Mirror Spot', 'Bumper Cave Entrance Rock',
+        create_dw_region(player, 'West Dark World', ['Frog'], ['Village of Outcasts Drop', 'East Dark World River Pier', 'Brewery', 'C-Shaped House', 'Chest Game', 'Thieves Town', 'Graveyard Ledge Mirror Spot', 'Kings Grave Mirror Spot', 'Bumper Cave Entrance Rock',
                                                        'Skull Woods Forest', 'Village of Outcasts Pegs', 'Village of Outcasts Eastern Rocks', 'Red Shield Shop', 'Dark Sanctuary Hint', 'Fortune Teller (Dark)', 'Dark World Lumberjack Shop']),
-        create_dw_region('Dark Grassy Lawn', None, ['Grassy Lawn Pegs', 'Dark World Shop']),
-        create_dw_region('Hammer Peg Area', ['Dark Blacksmith Ruins'], ['Bat Cave Drop Ledge Mirror Spot', 'Dark World Hammer Peg Cave', 'Peg Area Rocks']),
-        create_dw_region('Bumper Cave Entrance', None, ['Bumper Cave (Bottom)', 'Bumper Cave Entrance Mirror Spot', 'Bumper Cave Entrance Drop']),
-        create_cave_region('Fortune Teller (Dark)', 'a fortune teller'),
-        create_cave_region('Village of Outcasts Shop', 'a common shop'),
-        create_cave_region('Dark Lake Hylia Shop', 'a common shop'),
-        create_cave_region('Dark World Lumberjack Shop', 'a common shop'),
-        create_cave_region('Dark World Potion Shop', 'a common shop'),
-        create_cave_region('Dark World Hammer Peg Cave', 'a cave with an item', ['Peg Cave']),
-        create_cave_region('Pyramid Fairy', 'a cave with two chests', ['Pyramid Fairy - Left', 'Pyramid Fairy - Right']),
-        create_cave_region('Brewery', 'a house with a chest', ['Brewery']),
-        create_cave_region('C-Shaped House', 'a house with a chest', ['C-Shaped House']),
-        create_cave_region('Chest Game', 'a game of 16 chests', ['Chest Game']),
-        create_cave_region('Red Shield Shop', 'the rare shop'),
-        create_cave_region('Dark Sanctuary Hint', 'a storyteller'),
-        create_cave_region('Bumper Cave', 'a connector', None, ['Bumper Cave Exit (Bottom)', 'Bumper Cave Exit (Top)']),
-        create_dw_region('Bumper Cave Ledge', ['Bumper Cave Ledge'], ['Bumper Cave Ledge Drop', 'Bumper Cave (Top)', 'Bumper Cave Ledge Mirror Spot']),
-        create_dw_region('Skull Woods Forest', None, ['Skull Woods First Section Hole (East)', 'Skull Woods First Section Hole (West)', 'Skull Woods First Section Hole (North)',
+        create_dw_region(player, 'Dark Grassy Lawn', None, ['Grassy Lawn Pegs', 'Dark World Shop']),
+        create_dw_region(player, 'Hammer Peg Area', ['Dark Blacksmith Ruins'], ['Bat Cave Drop Ledge Mirror Spot', 'Dark World Hammer Peg Cave', 'Peg Area Rocks']),
+        create_dw_region(player, 'Bumper Cave Entrance', None, ['Bumper Cave (Bottom)', 'Bumper Cave Entrance Mirror Spot', 'Bumper Cave Entrance Drop']),
+        create_cave_region(player, 'Fortune Teller (Dark)', 'a fortune teller'),
+        create_cave_region(player, 'Village of Outcasts Shop', 'a common shop'),
+        create_cave_region(player, 'Dark Lake Hylia Shop', 'a common shop'),
+        create_cave_region(player, 'Dark World Lumberjack Shop', 'a common shop'),
+        create_cave_region(player, 'Dark World Potion Shop', 'a common shop'),
+        create_cave_region(player, 'Dark World Hammer Peg Cave', 'a cave with an item', ['Peg Cave']),
+        create_cave_region(player, 'Pyramid Fairy', 'a cave with two chests', ['Pyramid Fairy - Left', 'Pyramid Fairy - Right']),
+        create_cave_region(player, 'Brewery', 'a house with a chest', ['Brewery']),
+        create_cave_region(player, 'C-Shaped House', 'a house with a chest', ['C-Shaped House']),
+        create_cave_region(player, 'Chest Game', 'a game of 16 chests', ['Chest Game']),
+        create_cave_region(player, 'Red Shield Shop', 'the rare shop'),
+        create_cave_region(player, 'Dark Sanctuary Hint', 'a storyteller'),
+        create_cave_region(player, 'Bumper Cave', 'a connector', None, ['Bumper Cave Exit (Bottom)', 'Bumper Cave Exit (Top)']),
+        create_dw_region(player, 'Bumper Cave Ledge', ['Bumper Cave Ledge'], ['Bumper Cave Ledge Drop', 'Bumper Cave (Top)', 'Bumper Cave Ledge Mirror Spot']),
+        create_dw_region(player, 'Skull Woods Forest', None, ['Skull Woods First Section Hole (East)', 'Skull Woods First Section Hole (West)', 'Skull Woods First Section Hole (North)',
                                                       'Skull Woods First Section Door', 'Skull Woods Second Section Door (East)']),
-        create_dw_region('Skull Woods Forest (West)', None, ['Skull Woods Second Section Hole', 'Skull Woods Second Section Door (West)', 'Skull Woods Final Section']),
-        create_dw_region('Dark Desert',  None, ['Misery Mire', 'Mire Shed', 'Desert Ledge (Northeast) Mirror Spot', 'Desert Ledge Mirror Spot', 'Desert Palace Stairs Mirror Spot',
+        create_dw_region(player, 'Skull Woods Forest (West)', None, ['Skull Woods Second Section Hole', 'Skull Woods Second Section Door (West)', 'Skull Woods Final Section']),
+        create_dw_region(player, 'Dark Desert',  None, ['Misery Mire', 'Mire Shed', 'Desert Ledge (Northeast) Mirror Spot', 'Desert Ledge Mirror Spot', 'Desert Palace Stairs Mirror Spot',
                                                 'Desert Palace Entrance (North) Mirror Spot', 'Dark Desert Hint', 'Dark Desert Fairy']),
-        create_cave_region('Mire Shed', 'a cave with two chests', ['Mire Shed - Left', 'Mire Shed - Right']),
-        create_cave_region('Dark Desert Hint', 'a storyteller'),
-        create_dw_region('Dark Death Mountain (West Bottom)', None, ['Spike Cave', 'Spectacle Rock Mirror Spot', 'Dark Death Mountain Fairy']),
-        create_dw_region('Dark Death Mountain (Top)', None, ['Dark Death Mountain Drop (East)', 'Dark Death Mountain Drop (West)', 'Ganons Tower', 'Superbunny Cave (Top)',
+        create_cave_region(player, 'Mire Shed', 'a cave with two chests', ['Mire Shed - Left', 'Mire Shed - Right']),
+        create_cave_region(player, 'Dark Desert Hint', 'a storyteller'),
+        create_dw_region(player, 'Dark Death Mountain (West Bottom)', None, ['Spike Cave', 'Spectacle Rock Mirror Spot', 'Dark Death Mountain Fairy']),
+        create_dw_region(player, 'Dark Death Mountain (Top)', None, ['Dark Death Mountain Drop (East)', 'Dark Death Mountain Drop (West)', 'Ganons Tower', 'Superbunny Cave (Top)',
                                                              'Hookshot Cave', 'East Death Mountain (Top) Mirror Spot', 'Turtle Rock']),
-        create_dw_region('Dark Death Mountain Ledge', None, ['Dark Death Mountain Ledge (East)', 'Dark Death Mountain Ledge (West)', 'Mimic Cave Mirror Spot', 'Spiral Cave Mirror Spot']),
-        create_dw_region('Dark Death Mountain Isolated Ledge', None, ['Isolated Ledge Mirror Spot', 'Turtle Rock Isolated Ledge Entrance']),
-        create_dw_region('Dark Death Mountain (East Bottom)', None, ['Superbunny Cave (Bottom)', 'Cave Shop (Dark Death Mountain)', 'Fairy Ascension Mirror Spot']),
-        create_cave_region('Superbunny Cave', 'a connector', ['Superbunny Cave - Top', 'Superbunny Cave - Bottom'],
+        create_dw_region(player, 'Dark Death Mountain Ledge', None, ['Dark Death Mountain Ledge (East)', 'Dark Death Mountain Ledge (West)', 'Mimic Cave Mirror Spot', 'Spiral Cave Mirror Spot']),
+        create_dw_region(player, 'Dark Death Mountain Isolated Ledge', None, ['Isolated Ledge Mirror Spot', 'Turtle Rock Isolated Ledge Entrance']),
+        create_dw_region(player, 'Dark Death Mountain (East Bottom)', None, ['Superbunny Cave (Bottom)', 'Cave Shop (Dark Death Mountain)', 'Fairy Ascension Mirror Spot']),
+        create_cave_region(player, 'Superbunny Cave', 'a connector', ['Superbunny Cave - Top', 'Superbunny Cave - Bottom'],
                            ['Superbunny Cave Exit (Top)', 'Superbunny Cave Exit (Bottom)']),
-        create_cave_region('Spike Cave', 'Spike Cave', ['Spike Cave']),
-        create_cave_region('Hookshot Cave', 'a connector', ['Hookshot Cave - Top Right', 'Hookshot Cave - Top Left', 'Hookshot Cave - Bottom Right', 'Hookshot Cave - Bottom Left'],
+        create_cave_region(player, 'Spike Cave', 'Spike Cave', ['Spike Cave']),
+        create_cave_region(player, 'Hookshot Cave', 'a connector', ['Hookshot Cave - Top Right', 'Hookshot Cave - Top Left', 'Hookshot Cave - Bottom Right', 'Hookshot Cave - Bottom Left'],
                            ['Hookshot Cave Exit (South)', 'Hookshot Cave Exit (North)']),
-        create_dw_region('Death Mountain Floating Island (Dark World)', None, ['Floating Island Drop', 'Hookshot Cave Back Entrance', 'Floating Island Mirror Spot']),
-        create_lw_region('Death Mountain Floating Island (Light World)', ['Floating Island']),
-        create_dw_region('Turtle Rock (Top)', None, ['Turtle Rock Drop']),
-        create_lw_region('Mimic Cave Ledge', None, ['Mimic Cave']),
-        create_cave_region('Mimic Cave', 'Mimic Cave', ['Mimic Cave']),
+        create_dw_region(player, 'Death Mountain Floating Island (Dark World)', None, ['Floating Island Drop', 'Hookshot Cave Back Entrance', 'Floating Island Mirror Spot']),
+        create_lw_region(player, 'Death Mountain Floating Island (Light World)', ['Floating Island']),
+        create_dw_region(player, 'Turtle Rock (Top)', None, ['Turtle Rock Drop']),
+        create_lw_region(player, 'Mimic Cave Ledge', None, ['Mimic Cave']),
+        create_cave_region(player, 'Mimic Cave', 'Mimic Cave', ['Mimic Cave']),
 
-        create_dungeon_region('Swamp Palace (Entrance)', 'Swamp Palace', None, ['Swamp Palace Moat', 'Swamp Palace Exit']),
-        create_dungeon_region('Swamp Palace (First Room)', 'Swamp Palace', ['Swamp Palace - Entrance'], ['Swamp Palace Small Key Door']),
-        create_dungeon_region('Swamp Palace (Starting Area)', 'Swamp Palace', ['Swamp Palace - Map Chest'], ['Swamp Palace (Center)']),
-        create_dungeon_region('Swamp Palace (Center)', 'Swamp Palace', ['Swamp Palace - Big Chest', 'Swamp Palace - Compass Chest',
+        create_dungeon_region(player, 'Swamp Palace (Entrance)', 'Swamp Palace', None, ['Swamp Palace Moat', 'Swamp Palace Exit']),
+        create_dungeon_region(player, 'Swamp Palace (First Room)', 'Swamp Palace', ['Swamp Palace - Entrance'], ['Swamp Palace Small Key Door']),
+        create_dungeon_region(player, 'Swamp Palace (Starting Area)', 'Swamp Palace', ['Swamp Palace - Map Chest'], ['Swamp Palace (Center)']),
+        create_dungeon_region(player, 'Swamp Palace (Center)', 'Swamp Palace', ['Swamp Palace - Big Chest', 'Swamp Palace - Compass Chest',
                                                                         'Swamp Palace - Big Key Chest', 'Swamp Palace - West Chest'], ['Swamp Palace (North)']),
-        create_dungeon_region('Swamp Palace (North)', 'Swamp Palace', ['Swamp Palace - Flooded Room - Left', 'Swamp Palace - Flooded Room - Right',
+        create_dungeon_region(player, 'Swamp Palace (North)', 'Swamp Palace', ['Swamp Palace - Flooded Room - Left', 'Swamp Palace - Flooded Room - Right',
                                                                        'Swamp Palace - Waterfall Room', 'Swamp Palace - Boss', 'Swamp Palace - Prize']),
-        create_dungeon_region('Thieves Town (Entrance)', 'Thieves\' Town', ['Thieves\' Town - Big Key Chest',
+        create_dungeon_region(player, 'Thieves Town (Entrance)', 'Thieves\' Town', ['Thieves\' Town - Big Key Chest',
                                                                             'Thieves\' Town - Map Chest',
                                                                             'Thieves\' Town - Compass Chest',
                                                                             'Thieves\' Town - Ambush Chest'], ['Thieves Town Big Key Door', 'Thieves Town Exit']),
-        create_dungeon_region('Thieves Town (Deep)', 'Thieves\' Town', ['Thieves\' Town - Attic',
+        create_dungeon_region(player, 'Thieves Town (Deep)', 'Thieves\' Town', ['Thieves\' Town - Attic',
                                                                         'Thieves\' Town - Big Chest',
                                                                         'Thieves\' Town - Blind\'s Cell'], ['Blind Fight']),
-        create_dungeon_region('Blind Fight', 'Thieves\' Town', ['Thieves\' Town - Boss', 'Thieves\' Town - Prize']),
-        create_dungeon_region('Skull Woods First Section', 'Skull Woods', ['Skull Woods - Map Chest'], ['Skull Woods First Section Exit', 'Skull Woods First Section Bomb Jump', 'Skull Woods First Section South Door', 'Skull Woods First Section West Door']),
-        create_dungeon_region('Skull Woods First Section (Right)', 'Skull Woods', ['Skull Woods - Pinball Room'], ['Skull Woods First Section (Right) North Door']),
-        create_dungeon_region('Skull Woods First Section (Left)', 'Skull Woods', ['Skull Woods - Compass Chest', 'Skull Woods - Pot Prison'], ['Skull Woods First Section (Left) Door to Exit', 'Skull Woods First Section (Left) Door to Right']),
-        create_dungeon_region('Skull Woods First Section (Top)', 'Skull Woods', ['Skull Woods - Big Chest'], ['Skull Woods First Section (Top) One-Way Path']),
-        create_dungeon_region('Skull Woods Second Section (Drop)', 'Skull Woods', None, ['Skull Woods Second Section (Drop)']),
-        create_dungeon_region('Skull Woods Second Section', 'Skull Woods', ['Skull Woods - Big Key Chest'], ['Skull Woods Second Section Exit (East)', 'Skull Woods Second Section Exit (West)']),
-        create_dungeon_region('Skull Woods Final Section (Entrance)', 'Skull Woods', ['Skull Woods - Bridge Room'], ['Skull Woods Torch Room', 'Skull Woods Final Section Exit']),
-        create_dungeon_region('Skull Woods Final Section (Mothula)', 'Skull Woods', ['Skull Woods - Boss', 'Skull Woods - Prize']),
-        create_dungeon_region('Ice Palace (Entrance)', 'Ice Palace', None, ['Ice Palace Entrance Room', 'Ice Palace Exit']),
-        create_dungeon_region('Ice Palace (Main)', 'Ice Palace', ['Ice Palace - Compass Chest', 'Ice Palace - Freezor Chest',
+        create_dungeon_region(player, 'Blind Fight', 'Thieves\' Town', ['Thieves\' Town - Boss', 'Thieves\' Town - Prize']),
+        create_dungeon_region(player, 'Skull Woods First Section', 'Skull Woods', ['Skull Woods - Map Chest'], ['Skull Woods First Section Exit', 'Skull Woods First Section Bomb Jump', 'Skull Woods First Section South Door', 'Skull Woods First Section West Door']),
+        create_dungeon_region(player, 'Skull Woods First Section (Right)', 'Skull Woods', ['Skull Woods - Pinball Room'], ['Skull Woods First Section (Right) North Door']),
+        create_dungeon_region(player, 'Skull Woods First Section (Left)', 'Skull Woods', ['Skull Woods - Compass Chest', 'Skull Woods - Pot Prison'], ['Skull Woods First Section (Left) Door to Exit', 'Skull Woods First Section (Left) Door to Right']),
+        create_dungeon_region(player, 'Skull Woods First Section (Top)', 'Skull Woods', ['Skull Woods - Big Chest'], ['Skull Woods First Section (Top) One-Way Path']),
+        create_dungeon_region(player, 'Skull Woods Second Section (Drop)', 'Skull Woods', None, ['Skull Woods Second Section (Drop)']),
+        create_dungeon_region(player, 'Skull Woods Second Section', 'Skull Woods', ['Skull Woods - Big Key Chest'], ['Skull Woods Second Section Exit (East)', 'Skull Woods Second Section Exit (West)']),
+        create_dungeon_region(player, 'Skull Woods Final Section (Entrance)', 'Skull Woods', ['Skull Woods - Bridge Room'], ['Skull Woods Torch Room', 'Skull Woods Final Section Exit']),
+        create_dungeon_region(player, 'Skull Woods Final Section (Mothula)', 'Skull Woods', ['Skull Woods - Boss', 'Skull Woods - Prize']),
+        create_dungeon_region(player, 'Ice Palace (Entrance)', 'Ice Palace', None, ['Ice Palace Entrance Room', 'Ice Palace Exit']),
+        create_dungeon_region(player, 'Ice Palace (Main)', 'Ice Palace', ['Ice Palace - Compass Chest', 'Ice Palace - Freezor Chest',
                                                                   'Ice Palace - Big Chest', 'Ice Palace - Iced T Room'], ['Ice Palace (East)', 'Ice Palace (Kholdstare)']),
-        create_dungeon_region('Ice Palace (East)', 'Ice Palace', ['Ice Palace - Spike Room'], ['Ice Palace (East Top)']),
-        create_dungeon_region('Ice Palace (East Top)', 'Ice Palace', ['Ice Palace - Big Key Chest', 'Ice Palace - Map Chest']),
-        create_dungeon_region('Ice Palace (Kholdstare)', 'Ice Palace', ['Ice Palace - Boss', 'Ice Palace - Prize']),
-        create_dungeon_region('Misery Mire (Entrance)', 'Misery Mire', None, ['Misery Mire Entrance Gap', 'Misery Mire Exit']),
-        create_dungeon_region('Misery Mire (Main)', 'Misery Mire', ['Misery Mire - Big Chest', 'Misery Mire - Map Chest', 'Misery Mire - Main Lobby',
+        create_dungeon_region(player, 'Ice Palace (East)', 'Ice Palace', ['Ice Palace - Spike Room'], ['Ice Palace (East Top)']),
+        create_dungeon_region(player, 'Ice Palace (East Top)', 'Ice Palace', ['Ice Palace - Big Key Chest', 'Ice Palace - Map Chest']),
+        create_dungeon_region(player, 'Ice Palace (Kholdstare)', 'Ice Palace', ['Ice Palace - Boss', 'Ice Palace - Prize']),
+        create_dungeon_region(player, 'Misery Mire (Entrance)', 'Misery Mire', None, ['Misery Mire Entrance Gap', 'Misery Mire Exit']),
+        create_dungeon_region(player, 'Misery Mire (Main)', 'Misery Mire', ['Misery Mire - Big Chest', 'Misery Mire - Map Chest', 'Misery Mire - Main Lobby',
                                                                     'Misery Mire - Bridge Chest', 'Misery Mire - Spike Chest'], ['Misery Mire (West)', 'Misery Mire Big Key Door']),
-        create_dungeon_region('Misery Mire (West)', 'Misery Mire', ['Misery Mire - Compass Chest', 'Misery Mire - Big Key Chest']),
-        create_dungeon_region('Misery Mire (Final Area)', 'Misery Mire', None, ['Misery Mire (Vitreous)']),
-        create_dungeon_region('Misery Mire (Vitreous)', 'Misery Mire', ['Misery Mire - Boss', 'Misery Mire - Prize']),
-        create_dungeon_region('Turtle Rock (Entrance)', 'Turtle Rock', None, ['Turtle Rock Entrance Gap', 'Turtle Rock Exit (Front)']),
-        create_dungeon_region('Turtle Rock (First Section)', 'Turtle Rock', ['Turtle Rock - Compass Chest', 'Turtle Rock - Roller Room - Left',
+        create_dungeon_region(player, 'Misery Mire (West)', 'Misery Mire', ['Misery Mire - Compass Chest', 'Misery Mire - Big Key Chest']),
+        create_dungeon_region(player, 'Misery Mire (Final Area)', 'Misery Mire', None, ['Misery Mire (Vitreous)']),
+        create_dungeon_region(player, 'Misery Mire (Vitreous)', 'Misery Mire', ['Misery Mire - Boss', 'Misery Mire - Prize']),
+        create_dungeon_region(player, 'Turtle Rock (Entrance)', 'Turtle Rock', None, ['Turtle Rock Entrance Gap', 'Turtle Rock Exit (Front)']),
+        create_dungeon_region(player, 'Turtle Rock (First Section)', 'Turtle Rock', ['Turtle Rock - Compass Chest', 'Turtle Rock - Roller Room - Left',
                                                                              'Turtle Rock - Roller Room - Right'], ['Turtle Rock Pokey Room', 'Turtle Rock Entrance Gap Reverse']),
-        create_dungeon_region('Turtle Rock (Chain Chomp Room)', 'Turtle Rock', ['Turtle Rock - Chain Chomps'], ['Turtle Rock (Chain Chomp Room) (North)', 'Turtle Rock (Chain Chomp Room) (South)']),
-        create_dungeon_region('Turtle Rock (Second Section)', 'Turtle Rock', ['Turtle Rock - Big Key Chest'], ['Turtle Rock Ledge Exit (West)', 'Turtle Rock Chain Chomp Staircase', 'Turtle Rock Big Key Door']),
-        create_dungeon_region('Turtle Rock (Big Chest)', 'Turtle Rock', ['Turtle Rock - Big Chest'], ['Turtle Rock (Big Chest) (North)', 'Turtle Rock Ledge Exit (East)']),
-        create_dungeon_region('Turtle Rock (Crystaroller Room)', 'Turtle Rock', ['Turtle Rock - Crystaroller Room'], ['Turtle Rock Dark Room Staircase', 'Turtle Rock Big Key Door Reverse']),
-        create_dungeon_region('Turtle Rock (Dark Room)', 'Turtle Rock', None, ['Turtle Rock (Dark Room) (North)', 'Turtle Rock (Dark Room) (South)']),
-        create_dungeon_region('Turtle Rock (Eye Bridge)', 'Turtle Rock', ['Turtle Rock - Eye Bridge - Bottom Left', 'Turtle Rock - Eye Bridge - Bottom Right',
+        create_dungeon_region(player, 'Turtle Rock (Chain Chomp Room)', 'Turtle Rock', ['Turtle Rock - Chain Chomps'], ['Turtle Rock (Chain Chomp Room) (North)', 'Turtle Rock (Chain Chomp Room) (South)']),
+        create_dungeon_region(player, 'Turtle Rock (Second Section)', 'Turtle Rock', ['Turtle Rock - Big Key Chest'], ['Turtle Rock Ledge Exit (West)', 'Turtle Rock Chain Chomp Staircase', 'Turtle Rock Big Key Door']),
+        create_dungeon_region(player, 'Turtle Rock (Big Chest)', 'Turtle Rock', ['Turtle Rock - Big Chest'], ['Turtle Rock (Big Chest) (North)', 'Turtle Rock Ledge Exit (East)']),
+        create_dungeon_region(player, 'Turtle Rock (Crystaroller Room)', 'Turtle Rock', ['Turtle Rock - Crystaroller Room'], ['Turtle Rock Dark Room Staircase', 'Turtle Rock Big Key Door Reverse']),
+        create_dungeon_region(player, 'Turtle Rock (Dark Room)', 'Turtle Rock', None, ['Turtle Rock (Dark Room) (North)', 'Turtle Rock (Dark Room) (South)']),
+        create_dungeon_region(player, 'Turtle Rock (Eye Bridge)', 'Turtle Rock', ['Turtle Rock - Eye Bridge - Bottom Left', 'Turtle Rock - Eye Bridge - Bottom Right',
                                                                           'Turtle Rock - Eye Bridge - Top Left', 'Turtle Rock - Eye Bridge - Top Right'],
                               ['Turtle Rock Dark Room (South)', 'Turtle Rock (Trinexx)', 'Turtle Rock Isolated Ledge Exit']),
-        create_dungeon_region('Turtle Rock (Trinexx)', 'Turtle Rock', ['Turtle Rock - Boss', 'Turtle Rock - Prize']),
-        create_dungeon_region('Palace of Darkness (Entrance)', 'Palace of Darkness', ['Palace of Darkness - Shooter Room'], ['Palace of Darkness Bridge Room', 'Palace of Darkness Bonk Wall', 'Palace of Darkness Exit']),
-        create_dungeon_region('Palace of Darkness (Center)', 'Palace of Darkness', ['Palace of Darkness - The Arena - Bridge', 'Palace of Darkness - Stalfos Basement'],
+        create_dungeon_region(player, 'Turtle Rock (Trinexx)', 'Turtle Rock', ['Turtle Rock - Boss', 'Turtle Rock - Prize']),
+        create_dungeon_region(player, 'Palace of Darkness (Entrance)', 'Palace of Darkness', ['Palace of Darkness - Shooter Room'], ['Palace of Darkness Bridge Room', 'Palace of Darkness Bonk Wall', 'Palace of Darkness Exit']),
+        create_dungeon_region(player, 'Palace of Darkness (Center)', 'Palace of Darkness', ['Palace of Darkness - The Arena - Bridge', 'Palace of Darkness - Stalfos Basement'],
                               ['Palace of Darkness Big Key Chest Staircase', 'Palace of Darkness (North)', 'Palace of Darkness Big Key Door']),
-        create_dungeon_region('Palace of Darkness (Big Key Chest)', 'Palace of Darkness', ['Palace of Darkness - Big Key Chest']),
-        create_dungeon_region('Palace of Darkness (Bonk Section)', 'Palace of Darkness', ['Palace of Darkness - The Arena - Ledge', 'Palace of Darkness - Map Chest'], ['Palace of Darkness Hammer Peg Drop']),
-        create_dungeon_region('Palace of Darkness (North)', 'Palace of Darkness', ['Palace of Darkness - Compass Chest', 'Palace of Darkness - Dark Basement - Left', 'Palace of Darkness - Dark Basement - Right'],
+        create_dungeon_region(player, 'Palace of Darkness (Big Key Chest)', 'Palace of Darkness', ['Palace of Darkness - Big Key Chest']),
+        create_dungeon_region(player, 'Palace of Darkness (Bonk Section)', 'Palace of Darkness', ['Palace of Darkness - The Arena - Ledge', 'Palace of Darkness - Map Chest'], ['Palace of Darkness Hammer Peg Drop']),
+        create_dungeon_region(player, 'Palace of Darkness (North)', 'Palace of Darkness', ['Palace of Darkness - Compass Chest', 'Palace of Darkness - Dark Basement - Left', 'Palace of Darkness - Dark Basement - Right'],
                               ['Palace of Darkness Spike Statue Room Door', 'Palace of Darkness Maze Door']),
-        create_dungeon_region('Palace of Darkness (Maze)', 'Palace of Darkness', ['Palace of Darkness - Dark Maze - Top', 'Palace of Darkness - Dark Maze - Bottom', 'Palace of Darkness - Big Chest']),
-        create_dungeon_region('Palace of Darkness (Harmless Hellway)', 'Palace of Darkness', ['Palace of Darkness - Harmless Hellway']),
-        create_dungeon_region('Palace of Darkness (Final Section)', 'Palace of Darkness', ['Palace of Darkness - Boss', 'Palace of Darkness - Prize']),
-        create_dungeon_region('Ganons Tower (Entrance)', 'Ganon\'s Tower', ['Ganons Tower - Bob\'s Torch', 'Ganons Tower - Hope Room - Left', 'Ganons Tower - Hope Room - Right'],
+        create_dungeon_region(player, 'Palace of Darkness (Maze)', 'Palace of Darkness', ['Palace of Darkness - Dark Maze - Top', 'Palace of Darkness - Dark Maze - Bottom', 'Palace of Darkness - Big Chest']),
+        create_dungeon_region(player, 'Palace of Darkness (Harmless Hellway)', 'Palace of Darkness', ['Palace of Darkness - Harmless Hellway']),
+        create_dungeon_region(player, 'Palace of Darkness (Final Section)', 'Palace of Darkness', ['Palace of Darkness - Boss', 'Palace of Darkness - Prize']),
+        create_dungeon_region(player, 'Ganons Tower (Entrance)', 'Ganon\'s Tower', ['Ganons Tower - Bob\'s Torch', 'Ganons Tower - Hope Room - Left', 'Ganons Tower - Hope Room - Right'],
                               ['Ganons Tower (Tile Room)', 'Ganons Tower (Hookshot Room)', 'Ganons Tower Big Key Door', 'Ganons Tower Exit']),
-        create_dungeon_region('Ganons Tower (Tile Room)', 'Ganon\'s Tower', ['Ganons Tower - Tile Room'], ['Ganons Tower (Tile Room) Key Door']),
-        create_dungeon_region('Ganons Tower (Compass Room)', 'Ganon\'s Tower', ['Ganons Tower - Compass Room - Top Left', 'Ganons Tower - Compass Room - Top Right',
+        create_dungeon_region(player, 'Ganons Tower (Tile Room)', 'Ganon\'s Tower', ['Ganons Tower - Tile Room'], ['Ganons Tower (Tile Room) Key Door']),
+        create_dungeon_region(player, 'Ganons Tower (Compass Room)', 'Ganon\'s Tower', ['Ganons Tower - Compass Room - Top Left', 'Ganons Tower - Compass Room - Top Right',
                                                                                 'Ganons Tower - Compass Room - Bottom Left', 'Ganons Tower - Compass Room - Bottom Right'],
                               ['Ganons Tower (Bottom) (East)']),
-        create_dungeon_region('Ganons Tower (Hookshot Room)', 'Ganon\'s Tower', ['Ganons Tower - DMs Room - Top Left', 'Ganons Tower - DMs Room - Top Right',
+        create_dungeon_region(player, 'Ganons Tower (Hookshot Room)', 'Ganon\'s Tower', ['Ganons Tower - DMs Room - Top Left', 'Ganons Tower - DMs Room - Top Right',
                                                                                  'Ganons Tower - DMs Room - Bottom Left', 'Ganons Tower - DMs Room - Bottom Right'],
                               ['Ganons Tower (Map Room)', 'Ganons Tower (Double Switch Room)']),
-        create_dungeon_region('Ganons Tower (Map Room)', 'Ganon\'s Tower', ['Ganons Tower - Map Chest']),
-        create_dungeon_region('Ganons Tower (Firesnake Room)', 'Ganon\'s Tower', ['Ganons Tower - Firesnake Room'], ['Ganons Tower (Firesnake Room)']),
-        create_dungeon_region('Ganons Tower (Teleport Room)', 'Ganon\'s Tower', ['Ganons Tower - Randomizer Room - Top Left', 'Ganons Tower - Randomizer Room - Top Right',
+        create_dungeon_region(player, 'Ganons Tower (Map Room)', 'Ganon\'s Tower', ['Ganons Tower - Map Chest']),
+        create_dungeon_region(player, 'Ganons Tower (Firesnake Room)', 'Ganon\'s Tower', ['Ganons Tower - Firesnake Room'], ['Ganons Tower (Firesnake Room)']),
+        create_dungeon_region(player, 'Ganons Tower (Teleport Room)', 'Ganon\'s Tower', ['Ganons Tower - Randomizer Room - Top Left', 'Ganons Tower - Randomizer Room - Top Right',
                                                                                  'Ganons Tower - Randomizer Room - Bottom Left', 'Ganons Tower - Randomizer Room - Bottom Right'],
                               ['Ganons Tower (Bottom) (West)']),
-        create_dungeon_region('Ganons Tower (Bottom)', 'Ganon\'s Tower', ['Ganons Tower - Bob\'s Chest', 'Ganons Tower - Big Chest', 'Ganons Tower - Big Key Room - Left',
+        create_dungeon_region(player, 'Ganons Tower (Bottom)', 'Ganon\'s Tower', ['Ganons Tower - Bob\'s Chest', 'Ganons Tower - Big Chest', 'Ganons Tower - Big Key Room - Left',
                                                                           'Ganons Tower - Big Key Room - Right', 'Ganons Tower - Big Key Chest']),
-        create_dungeon_region('Ganons Tower (Top)', 'Ganon\'s Tower', None, ['Ganons Tower Torch Rooms']),
-        create_dungeon_region('Ganons Tower (Before Moldorm)', 'Ganon\'s Tower', ['Ganons Tower - Mini Helmasaur Room - Left', 'Ganons Tower - Mini Helmasaur Room - Right',
+        create_dungeon_region(player, 'Ganons Tower (Top)', 'Ganon\'s Tower', None, ['Ganons Tower Torch Rooms']),
+        create_dungeon_region(player, 'Ganons Tower (Before Moldorm)', 'Ganon\'s Tower', ['Ganons Tower - Mini Helmasaur Room - Left', 'Ganons Tower - Mini Helmasaur Room - Right',
                                                                                   'Ganons Tower - Pre-Moldorm Chest'], ['Ganons Tower Moldorm Door']),
-        create_dungeon_region('Ganons Tower (Moldorm)', 'Ganon\'s Tower', None, ['Ganons Tower Moldorm Gap']),
-        create_dungeon_region('Agahnim 2', 'Ganon\'s Tower', ['Ganons Tower - Validation Chest', 'Agahnim 2'], None),
-        create_cave_region('Pyramid', 'a drop\'s exit', ['Ganon'], ['Ganon Drop']),
-        create_cave_region('Bottom of Pyramid', 'a drop\'s exit', None, ['Pyramid Exit']),
-        create_dw_region('Pyramid Ledge', None, ['Pyramid Entrance', 'Pyramid Drop'])
+        create_dungeon_region(player, 'Ganons Tower (Moldorm)', 'Ganon\'s Tower', None, ['Ganons Tower Moldorm Gap']),
+        create_dungeon_region(player, 'Agahnim 2', 'Ganon\'s Tower', ['Ganons Tower - Validation Chest', 'Agahnim 2'], None),
+        create_cave_region(player, 'Pyramid', 'a drop\'s exit', ['Ganon'], ['Ganon Drop']),
+        create_cave_region(player, 'Bottom of Pyramid', 'a drop\'s exit', None, ['Pyramid Exit']),
+        create_dw_region(player, 'Pyramid Ledge', None, ['Pyramid Entrance', 'Pyramid Drop'])
     ]
 
     for region_name, (room_id, shopkeeper, replaceable) in shop_table.items():
-        region = world.get_region(region_name)
+        region = world.get_region(region_name, player)
         shop = Shop(region, room_id, ShopType.Shop, shopkeeper, replaceable)
         region.shop = shop
         world.shops.append(shop)
         for index, (item, price) in enumerate(default_shop_contents[region_name]):
             shop.add_inventory(index, item, price)
 
-    region = world.get_region('Capacity Upgrade')
+    region = world.get_region('Capacity Upgrade', player)
     shop = Shop(region, 0x0115, ShopType.UpgradeShop, 0x04, True)
     region.shop = shop
     world.shops.append(shop)
@@ -309,30 +309,30 @@ def create_regions(world):
     shop.add_inventory(1, 'Arrow Upgrade (+5)', 100, 7)
     world.intialize_regions()
 
-def create_lw_region(name, locations=None, exits=None):
-    return _create_region(name, RegionType.LightWorld, 'Light World', locations, exits)
+def create_lw_region(player, name, locations=None, exits=None):
+    return _create_region(player, name, RegionType.LightWorld, 'Light World', locations, exits)
 
-def create_dw_region(name, locations=None, exits=None):
-    return _create_region(name, RegionType.DarkWorld, 'Dark World', locations, exits)
+def create_dw_region(player, name, locations=None, exits=None):
+    return _create_region(player, name, RegionType.DarkWorld, 'Dark World', locations, exits)
 
-def create_cave_region(name, hint='Hyrule', locations=None, exits=None):
-    return _create_region(name, RegionType.Cave, hint, locations, exits)
+def create_cave_region(player, name, hint='Hyrule', locations=None, exits=None):
+    return _create_region(player, name, RegionType.Cave, hint, locations, exits)
 
-def create_dungeon_region(name, hint='Hyrule', locations=None, exits=None):
-    return _create_region(name, RegionType.Dungeon, hint, locations, exits)
+def create_dungeon_region(player, name, hint='Hyrule', locations=None, exits=None):
+    return _create_region(player, name, RegionType.Dungeon, hint, locations, exits)
 
-def _create_region(name, type, hint='Hyrule', locations=None, exits=None):
-    ret = Region(name, type, hint)
+def _create_region(player, name, type, hint='Hyrule', locations=None, exits=None):
+    ret = Region(name, type, hint, player)
     if locations is None:
         locations = []
     if exits is None:
         exits = []
 
     for exit in exits:
-        ret.exits.append(Entrance(exit, ret))
+        ret.exits.append(Entrance(player, exit, ret))
     for location in locations:
         address, crystal, hint_text = location_table[location]
-        ret.locations.append(Location(location, address, crystal, hint_text, ret))
+        ret.locations.append(Location(player, location, address, crystal, hint_text, ret))
     return ret
 
 def mark_light_world_regions(world):
@@ -398,221 +398,221 @@ default_shop_contents = {
 }
 
 location_table = {'Mushroom': (0x180013, False, 'in the woods'),
-                  'Bottle Merchant': (0x2EB18, False, 'with a merchant'),
-                  'Flute Spot': (0x18014A, False, 'underground'),
+                  'Bottle Merchant': (0x2eb18, False, 'with a merchant'),
+                  'Flute Spot': (0x18014a, False, 'underground'),
                   'Sunken Treasure': (0x180145, False, 'underwater'),
-                  'Purple Chest': (0x33D68, False, 'from a box'),
-                  'Blind\'s Hideout - Top': (0xEB0F, False, 'in a basement'),
-                  'Blind\'s Hideout - Left': (0xEB12, False, 'in a basement'),
-                  'Blind\'s Hideout - Right': (0xEB15, False, 'in a basement'),
-                  'Blind\'s Hideout - Far Left': (0xEB18, False, 'in a basement'),
-                  'Blind\'s Hideout - Far Right': (0xEB1B, False, 'in a basement'),
-                  'Link\'s Uncle': (0x2DF45, False, 'with your uncle'),
-                  'Secret Passage': (0xE971, False, 'near your uncle'),
-                  'King Zora': (0xEE1C3, False, 'at a high price'),
-                  'Zora\'s Ledge': (0x180149, False, 'near Zora'),
-                  'Waterfall Fairy - Left': (0xE9B0, False, 'near a fairy'),
-                  'Waterfall Fairy - Right': (0xE9D1, False, 'near a fairy'),
-                  'King\'s Tomb': (0xE97A, False, 'alone in a cave'),
-                  'Floodgate Chest': (0xE98C, False, 'in the dam'),
-                  'Link\'s House': (0xE9BC, False, 'in your home'),
-                  'Kakariko Tavern': (0xE9CE, False, 'in the bar'),
-                  'Chicken House': (0xE9E9, False, 'near poultry'),
-                  'Aginah\'s Cave': (0xE9F2, False, 'with Aginah'),
-                  'Sahasrahla\'s Hut - Left': (0xEA82, False, 'near the elder'),
-                  'Sahasrahla\'s Hut - Middle': (0xEA85, False, 'near the elder'),
-                  'Sahasrahla\'s Hut - Right': (0xEA88, False, 'near the elder'),
-                  'Sahasrahla': (0x2F1FC, False, 'with the elder'),
-                  'Kakariko Well - Top': (0xEA8E, False, 'in a well'),
-                  'Kakariko Well - Left': (0xEA91, False, 'in a well'),
-                  'Kakariko Well - Middle': (0xEA94, False, 'in a well'),
-                  'Kakariko Well - Right': (0xEA97, False, 'in a well'),
-                  'Kakariko Well - Bottom': (0xEA9A, False, 'in a well'),
-                  'Blacksmith': (0x18002A, False, 'with the smith'),
+                  'Purple Chest': (0x33d68, False, 'from a box'),
+                  "Blind's Hideout - Top": (0xeb0f, False, 'in a basement'),
+                  "Blind's Hideout - Left": (0xeb12, False, 'in a basement'),
+                  "Blind's Hideout - Right": (0xeb15, False, 'in a basement'),
+                  "Blind's Hideout - Far Left": (0xeb18, False, 'in a basement'),
+                  "Blind's Hideout - Far Right": (0xeb1b, False, 'in a basement'),
+                  "Link's Uncle": (0x2df45, False, 'with your uncle'),
+                  'Secret Passage': (0xe971, False, 'near your uncle'),
+                  'King Zora': (0xee1c3, False, 'at a high price'),
+                  "Zora's Ledge": (0x180149, False, 'near Zora'),
+                  'Waterfall Fairy - Left': (0xe9b0, False, 'near a fairy'),
+                  'Waterfall Fairy - Right': (0xe9d1, False, 'near a fairy'),
+                  "King's Tomb": (0xe97a, False, 'alone in a cave'),
+                  'Floodgate Chest': (0xe98c, False, 'in the dam'),
+                  "Link's House": (0xe9bc, False, 'in your home'),
+                  'Kakariko Tavern': (0xe9ce, False, 'in the bar'),
+                  'Chicken House': (0xe9e9, False, 'near poultry'),
+                  "Aginah's Cave": (0xe9f2, False, 'with Aginah'),
+                  "Sahasrahla's Hut - Left": (0xea82, False, 'near the elder'),
+                  "Sahasrahla's Hut - Middle": (0xea85, False, 'near the elder'),
+                  "Sahasrahla's Hut - Right": (0xea88, False, 'near the elder'),
+                  'Sahasrahla': (0x2f1fc, False, 'with the elder'),
+                  'Kakariko Well - Top': (0xea8e, False, 'in a well'),
+                  'Kakariko Well - Left': (0xea91, False, 'in a well'),
+                  'Kakariko Well - Middle': (0xea94, False, 'in a well'),
+                  'Kakariko Well - Right': (0xea97, False, 'in a well'),
+                  'Kakariko Well - Bottom': (0xea9a, False, 'in a well'),
+                  'Blacksmith': (0x18002a, False, 'with the smith'),
                   'Magic Bat': (0x180015, False, 'with the bat'),
-                  'Sick Kid': (0x339CF, False, 'with the sick'),
-                  'Hobo': (0x33E7D, False, 'with the hobo'),
+                  'Sick Kid': (0x339cf, False, 'with the sick'),
+                  'Hobo': (0x33e7d, False, 'with the hobo'),
                   'Lost Woods Hideout': (0x180000, False, 'near a thief'),
                   'Lumberjack Tree': (0x180001, False, 'in a hole'),
                   'Cave 45': (0x180003, False, 'alone in a cave'),
                   'Graveyard Cave': (0x180004, False, 'alone in a cave'),
                   'Checkerboard Cave': (0x180005, False, 'alone in a cave'),
-                  'Mini Moldorm Cave - Far Left': (0xEB42, False, 'near Moldorms'),
-                  'Mini Moldorm Cave - Left': (0xEB45, False, 'near Moldorms'),
-                  'Mini Moldorm Cave - Right': (0xEB48, False, 'near Moldorms'),
-                  'Mini Moldorm Cave - Far Right': (0xEB4B, False, 'near Moldorms'),
+                  'Mini Moldorm Cave - Far Left': (0xeb42, False, 'near Moldorms'),
+                  'Mini Moldorm Cave - Left': (0xeb45, False, 'near Moldorms'),
+                  'Mini Moldorm Cave - Right': (0xeb48, False, 'near Moldorms'),
+                  'Mini Moldorm Cave - Far Right': (0xeb4b, False, 'near Moldorms'),
                   'Mini Moldorm Cave - Generous Guy': (0x180010, False, 'near Moldorms'),
-                  'Ice Rod Cave': (0xEB4E, False, 'in a frozen cave'),
-                  'Bonk Rock Cave': (0xEB3F, False, 'alone in a cave'),
+                  'Ice Rod Cave': (0xeb4e, False, 'in a frozen cave'),
+                  'Bonk Rock Cave': (0xeb3f, False, 'alone in a cave'),
                   'Library': (0x180012, False, 'near books'),
                   'Potion Shop': (0x180014, False, 'near potions'),
                   'Lake Hylia Island': (0x180144, False, 'on an island'),
                   'Maze Race': (0x180142, False, 'at the race'),
                   'Desert Ledge': (0x180143, False, 'in the desert'),
-                  'Desert Palace - Big Chest': (0xE98F, False, 'in Desert Palace'),
+                  'Desert Palace - Big Chest': (0xe98f, False, 'in Desert Palace'),
                   'Desert Palace - Torch': (0x180160, False, 'in Desert Palace'),
-                  'Desert Palace - Map Chest': (0xE9B6, False, 'in Desert Palace'),
-                  'Desert Palace - Compass Chest': (0xE9CB, False, 'in Desert Palace'),
-                  'Desert Palace - Big Key Chest': (0xE9C2, False, 'in Desert Palace'),
+                  'Desert Palace - Map Chest': (0xe9b6, False, 'in Desert Palace'),
+                  'Desert Palace - Compass Chest': (0xe9cb, False, 'in Desert Palace'),
+                  'Desert Palace - Big Key Chest': (0xe9c2, False, 'in Desert Palace'),
                   'Desert Palace - Boss': (0x180151, False, 'with Lanmolas'),
-                  'Eastern Palace - Compass Chest': (0xE977, False, 'in Eastern Palace'),
-                  'Eastern Palace - Big Chest': (0xE97D, False, 'in Eastern Palace'),
-                  'Eastern Palace - Cannonball Chest': (0xE9B3, False, 'in Eastern Palace'),
-                  'Eastern Palace - Big Key Chest': (0xE9B9, False, 'in Eastern Palace'),
-                  'Eastern Palace - Map Chest': (0xE9F5, False, 'in Eastern Palace'),
+                  'Eastern Palace - Compass Chest': (0xe977, False, 'in Eastern Palace'),
+                  'Eastern Palace - Big Chest': (0xe97d, False, 'in Eastern Palace'),
+                  'Eastern Palace - Cannonball Chest': (0xe9b3, False, 'in Eastern Palace'),
+                  'Eastern Palace - Big Key Chest': (0xe9b9, False, 'in Eastern Palace'),
+                  'Eastern Palace - Map Chest': (0xe9f5, False, 'in Eastern Palace'),
                   'Eastern Palace - Boss': (0x180150, False, 'with the Armos'),
-                  'Master Sword Pedestal': (0x289B0, False, 'at the pedestal'),
-                  'Hyrule Castle - Boomerang Chest': (0xE974, False, 'in Hyrule Castle'),
-                  'Hyrule Castle - Map Chest': (0xEB0C, False, 'in Hyrule Castle'),
-                  'Hyrule Castle - Zelda\'s Chest': (0xEB09, False, 'in Hyrule Castle'),
-                  'Sewers - Dark Cross': (0xE96E, False, 'in the sewers'),
-                  'Sewers - Secret Room - Left': (0xEB5D, False, 'in the sewers'),
-                  'Sewers - Secret Room - Middle': (0xEB60, False, 'in the sewers'),
-                  'Sewers - Secret Room - Right': (0xEB63, False, 'in the sewers'),
-                  'Sanctuary': (0xEA79, False, 'in Sanctuary'),
-                  'Castle Tower - Room 03': (0xEAB5, False, 'in Castle Tower'),
-                  'Castle Tower - Dark Maze': (0xEAB2, False, 'in Castle Tower'),
-                  'Old Man': (0xF69FA, False, 'with the old man'),
+                  'Master Sword Pedestal': (0x289b0, False, 'at the pedestal'),
+                  'Hyrule Castle - Boomerang Chest': (0xe974, False, 'in Hyrule Castle'),
+                  'Hyrule Castle - Map Chest': (0xeb0c, False, 'in Hyrule Castle'),
+                  "Hyrule Castle - Zelda's Chest": (0xeb09, False, 'in Hyrule Castle'),
+                  'Sewers - Dark Cross': (0xe96e, False, 'in the sewers'),
+                  'Sewers - Secret Room - Left': (0xeb5d, False, 'in the sewers'),
+                  'Sewers - Secret Room - Middle': (0xeb60, False, 'in the sewers'),
+                  'Sewers - Secret Room - Right': (0xeb63, False, 'in the sewers'),
+                  'Sanctuary': (0xea79, False, 'in Sanctuary'),
+                  'Castle Tower - Room 03': (0xeab5, False, 'in Castle Tower'),
+                  'Castle Tower - Dark Maze': (0xeab2, False, 'in Castle Tower'),
+                  'Old Man': (0xf69fa, False, 'with the old man'),
                   'Spectacle Rock Cave': (0x180002, False, 'alone in a cave'),
-                  'Paradox Cave Lower - Far Left': (0xEB2A, False, 'in a cave with seven chests'),
-                  'Paradox Cave Lower - Left': (0xEB2D, False, 'in a cave with seven chests'),
-                  'Paradox Cave Lower - Right': (0xEB30, False, 'in a cave with seven chests'),
-                  'Paradox Cave Lower - Far Right': (0xEB33, False, 'in a cave with seven chests'),
-                  'Paradox Cave Lower - Middle': (0xEB36, False, 'in a cave with seven chests'),
-                  'Paradox Cave Upper - Left': (0xEB39, False, 'in a cave with seven chests'),
-                  'Paradox Cave Upper - Right': (0xEB3C, False, 'in a cave with seven chests'),
-                  'Spiral Cave': (0xE9BF, False, 'in spiral cave'),
+                  'Paradox Cave Lower - Far Left': (0xeb2a, False, 'in a cave with seven chests'),
+                  'Paradox Cave Lower - Left': (0xeb2d, False, 'in a cave with seven chests'),
+                  'Paradox Cave Lower - Right': (0xeb30, False, 'in a cave with seven chests'),
+                  'Paradox Cave Lower - Far Right': (0xeb33, False, 'in a cave with seven chests'),
+                  'Paradox Cave Lower - Middle': (0xeb36, False, 'in a cave with seven chests'),
+                  'Paradox Cave Upper - Left': (0xeb39, False, 'in a cave with seven chests'),
+                  'Paradox Cave Upper - Right': (0xeb3c, False, 'in a cave with seven chests'),
+                  'Spiral Cave': (0xe9bf, False, 'in spiral cave'),
                   'Ether Tablet': (0x180016, False, 'at a monolith'),
                   'Spectacle Rock': (0x180140, False, 'atop a rock'),
                   'Tower of Hera - Basement Cage': (0x180162, False, 'in Tower of Hera'),
-                  'Tower of Hera - Map Chest': (0xE9AD, False, 'in Tower of Hera'),
-                  'Tower of Hera - Big Key Chest': (0xE9E6, False, 'in Tower of Hera'),
-                  'Tower of Hera - Compass Chest': (0xE9FB, False, 'in Tower of Hera'),
-                  'Tower of Hera - Big Chest': (0xE9F8, False, 'in Tower of Hera'),
+                  'Tower of Hera - Map Chest': (0xe9ad, False, 'in Tower of Hera'),
+                  'Tower of Hera - Big Key Chest': (0xe9e6, False, 'in Tower of Hera'),
+                  'Tower of Hera - Compass Chest': (0xe9fb, False, 'in Tower of Hera'),
+                  'Tower of Hera - Big Chest': (0xe9f8, False, 'in Tower of Hera'),
                   'Tower of Hera - Boss': (0x180152, False, 'with Moldorm'),
                   'Pyramid': (0x180147, False, 'on the pyramid'),
-                  'Catfish': (0xEE185, False, 'with a catfish'),
-                  'Stumpy': (0x330C7, False, 'with tree boy'),
+                  'Catfish': (0xee185, False, 'with a catfish'),
+                  'Stumpy': (0x330c7, False, 'with tree boy'),
                   'Digging Game': (0x180148, False, 'underground'),
                   'Bombos Tablet': (0x180017, False, 'at a monolith'),
-                  'Hype Cave - Top': (0xEB1E, False, 'near a bat-like man'),
-                  'Hype Cave - Middle Right': (0xEB21, False, 'near a bat-like man'),
-                  'Hype Cave - Middle Left': (0xEB24, False, 'near a bat-like man'),
-                  'Hype Cave - Bottom': (0xEB27, False, 'near a bat-like man'),
+                  'Hype Cave - Top': (0xeb1e, False, 'near a bat-like man'),
+                  'Hype Cave - Middle Right': (0xeb21, False, 'near a bat-like man'),
+                  'Hype Cave - Middle Left': (0xeb24, False, 'near a bat-like man'),
+                  'Hype Cave - Bottom': (0xeb27, False, 'near a bat-like man'),
                   'Hype Cave - Generous Guy': (0x180011, False, 'with a bat-like man'),
                   'Peg Cave': (0x180006, False, 'alone in a cave'),
-                  'Pyramid Fairy - Left': (0xE980, False, 'near a fairy'),
-                  'Pyramid Fairy - Right': (0xE983, False, 'near a fairy'),
-                  'Brewery': (0xE9EC, False, 'alone in a home'),
-                  'C-Shaped House': (0xE9EF, False, 'alone in a home'),
-                  'Chest Game': (0xEDA8, False, 'as a prize'),
+                  'Pyramid Fairy - Left': (0xe980, False, 'near a fairy'),
+                  'Pyramid Fairy - Right': (0xe983, False, 'near a fairy'),
+                  'Brewery': (0xe9ec, False, 'alone in a home'),
+                  'C-Shaped House': (0xe9ef, False, 'alone in a home'),
+                  'Chest Game': (0xeda8, False, 'as a prize'),
                   'Bumper Cave Ledge': (0x180146, False, 'on a ledge'),
-                  'Mire Shed - Left': (0xEA73, False, 'near sparks'),
-                  'Mire Shed - Right': (0xEA76, False, 'near sparks'),
-                  'Superbunny Cave - Top': (0xEA7C, False, 'in a connection'),
-                  'Superbunny Cave - Bottom': (0xEA7F, False, 'in a connection'),
-                  'Spike Cave': (0xEA8B, False, 'beyond spikes'),
-                  'Hookshot Cave - Top Right': (0xEB51, False, 'across pits'),
-                  'Hookshot Cave - Top Left': (0xEB54, False, 'across pits'),
-                  'Hookshot Cave - Bottom Right': (0xEB5A, False, 'across pits'),
-                  'Hookshot Cave - Bottom Left': (0xEB57, False, 'across pits'),
+                  'Mire Shed - Left': (0xea73, False, 'near sparks'),
+                  'Mire Shed - Right': (0xea76, False, 'near sparks'),
+                  'Superbunny Cave - Top': (0xea7c, False, 'in a connection'),
+                  'Superbunny Cave - Bottom': (0xea7f, False, 'in a connection'),
+                  'Spike Cave': (0xea8b, False, 'beyond spikes'),
+                  'Hookshot Cave - Top Right': (0xeb51, False, 'across pits'),
+                  'Hookshot Cave - Top Left': (0xeb54, False, 'across pits'),
+                  'Hookshot Cave - Bottom Right': (0xeb5a, False, 'across pits'),
+                  'Hookshot Cave - Bottom Left': (0xeb57, False, 'across pits'),
                   'Floating Island': (0x180141, False, 'on an island'),
-                  'Mimic Cave': (0xE9C5, False, 'in a cave of mimicry'),
-                  'Swamp Palace - Entrance': (0xEA9D, False, 'in Swamp Palace'),
-                  'Swamp Palace - Map Chest': (0xE986, False, 'in Swamp Palace'),
-                  'Swamp Palace - Big Chest': (0xE989, False, 'in Swamp Palace'),
-                  'Swamp Palace - Compass Chest': (0xEAA0, False, 'in Swamp Palace'),
-                  'Swamp Palace - Big Key Chest': (0xEAA6, False, 'in Swamp Palace'),
-                  'Swamp Palace - West Chest': (0xEAA3, False, 'in Swamp Palace'),
-                  'Swamp Palace - Flooded Room - Left': (0xEAA9, False, 'in Swamp Palace'),
-                  'Swamp Palace - Flooded Room - Right': (0xEAAC, False, 'in Swamp Palace'),
-                  'Swamp Palace - Waterfall Room': (0xEAAF, False, 'in Swamp Palace'),
+                  'Mimic Cave': (0xe9c5, False, 'in a cave of mimicry'),
+                  'Swamp Palace - Entrance': (0xea9d, False, 'in Swamp Palace'),
+                  'Swamp Palace - Map Chest': (0xe986, False, 'in Swamp Palace'),
+                  'Swamp Palace - Big Chest': (0xe989, False, 'in Swamp Palace'),
+                  'Swamp Palace - Compass Chest': (0xeaa0, False, 'in Swamp Palace'),
+                  'Swamp Palace - Big Key Chest': (0xeaa6, False, 'in Swamp Palace'),
+                  'Swamp Palace - West Chest': (0xeaa3, False, 'in Swamp Palace'),
+                  'Swamp Palace - Flooded Room - Left': (0xeaa9, False, 'in Swamp Palace'),
+                  'Swamp Palace - Flooded Room - Right': (0xeaac, False, 'in Swamp Palace'),
+                  'Swamp Palace - Waterfall Room': (0xeaaf, False, 'in Swamp Palace'),
                   'Swamp Palace - Boss': (0x180154, False, 'with Arrghus'),
-                  'Thieves\' Town - Big Key Chest': (0xEA04, False, 'in Thieves\' Town'),
-                  'Thieves\' Town - Map Chest': (0xEA01, False, 'in Thieves\' Town'),
-                  'Thieves\' Town - Compass Chest': (0xEA07, False, 'in Thieves\' Town'),
-                  'Thieves\' Town - Ambush Chest': (0xEA0A, False, 'in Thieves\' Town'),
-                  'Thieves\' Town - Attic': (0xEA0D, False, 'in Thieves\' Town'),
-                  'Thieves\' Town - Big Chest': (0xEA10, False, 'in Thieves\' Town'),
-                  'Thieves\' Town - Blind\'s Cell': (0xEA13, False, 'in Thieves\' Town'),
-                  'Thieves\' Town - Boss': (0x180156, False, 'with Blind'),
-                  'Skull Woods - Compass Chest': (0xE992, False, 'in Skull Woods'),
-                  'Skull Woods - Map Chest': (0xE99B, False, 'in Skull Woods'),
-                  'Skull Woods - Big Chest': (0xE998, False, 'in Skull Woods'),
-                  'Skull Woods - Pot Prison': (0xE9A1, False, 'in Skull Woods'),
-                  'Skull Woods - Pinball Room': (0xE9C8, False, 'in Skull Woods'),
-                  'Skull Woods - Big Key Chest': (0xE99E, False, 'in Skull Woods'),
-                  'Skull Woods - Bridge Room': (0xE9FE, False, 'near Mothula'),
+                  "Thieves' Town - Big Key Chest": (0xea04, False, "in Thieves' Town"),
+                  "Thieves' Town - Map Chest": (0xea01, False, "in Thieves' Town"),
+                  "Thieves' Town - Compass Chest": (0xea07, False, "in Thieves' Town"),
+                  "Thieves' Town - Ambush Chest": (0xea0a, False, "in Thieves' Town"),
+                  "Thieves' Town - Attic": (0xea0d, False, "in Thieves' Town"),
+                  "Thieves' Town - Big Chest": (0xea10, False, "in Thieves' Town"),
+                  "Thieves' Town - Blind's Cell": (0xea13, False, "in Thieves' Town"),
+                  "Thieves' Town - Boss": (0x180156, False, 'with Blind'),
+                  'Skull Woods - Compass Chest': (0xe992, False, 'in Skull Woods'),
+                  'Skull Woods - Map Chest': (0xe99b, False, 'in Skull Woods'),
+                  'Skull Woods - Big Chest': (0xe998, False, 'in Skull Woods'),
+                  'Skull Woods - Pot Prison': (0xe9a1, False, 'in Skull Woods'),
+                  'Skull Woods - Pinball Room': (0xe9c8, False, 'in Skull Woods'),
+                  'Skull Woods - Big Key Chest': (0xe99e, False, 'in Skull Woods'),
+                  'Skull Woods - Bridge Room': (0xe9fe, False, 'near Mothula'),
                   'Skull Woods - Boss': (0x180155, False, 'with Mothula'),
-                  'Ice Palace - Compass Chest': (0xE9D4, False, 'in Ice Palace'),
-                  'Ice Palace - Freezor Chest': (0xE995, False, 'in Ice Palace'),
-                  'Ice Palace - Big Chest': (0xE9AA, False, 'in Ice Palace'),
-                  'Ice Palace - Iced T Room': (0xE9E3, False, 'in Ice Palace'),
-                  'Ice Palace - Spike Room': (0xE9E0, False, 'in Ice Palace'),
-                  'Ice Palace - Big Key Chest': (0xE9A4, False, 'in Ice Palace'),
-                  'Ice Palace - Map Chest': (0xE9DD, False, 'in Ice Palace'),
+                  'Ice Palace - Compass Chest': (0xe9d4, False, 'in Ice Palace'),
+                  'Ice Palace - Freezor Chest': (0xe995, False, 'in Ice Palace'),
+                  'Ice Palace - Big Chest': (0xe9aa, False, 'in Ice Palace'),
+                  'Ice Palace - Iced T Room': (0xe9e3, False, 'in Ice Palace'),
+                  'Ice Palace - Spike Room': (0xe9e0, False, 'in Ice Palace'),
+                  'Ice Palace - Big Key Chest': (0xe9a4, False, 'in Ice Palace'),
+                  'Ice Palace - Map Chest': (0xe9dd, False, 'in Ice Palace'),
                   'Ice Palace - Boss': (0x180157, False, 'with Kholdstare'),
-                  'Misery Mire - Big Chest': (0xEA67, False, 'in Misery Mire'),
-                  'Misery Mire - Map Chest': (0xEA6A, False, 'in Misery Mire'),
-                  'Misery Mire - Main Lobby': (0xEA5E, False, 'in Misery Mire'),
-                  'Misery Mire - Bridge Chest': (0xEA61, False, 'in Misery Mire'),
-                  'Misery Mire - Spike Chest': (0xE9DA, False, 'in Misery Mire'),
-                  'Misery Mire - Compass Chest': (0xEA64, False, 'in Misery Mire'),
-                  'Misery Mire - Big Key Chest': (0xEA6D, False, 'in Misery Mire'),
+                  'Misery Mire - Big Chest': (0xea67, False, 'in Misery Mire'),
+                  'Misery Mire - Map Chest': (0xea6a, False, 'in Misery Mire'),
+                  'Misery Mire - Main Lobby': (0xea5e, False, 'in Misery Mire'),
+                  'Misery Mire - Bridge Chest': (0xea61, False, 'in Misery Mire'),
+                  'Misery Mire - Spike Chest': (0xe9da, False, 'in Misery Mire'),
+                  'Misery Mire - Compass Chest': (0xea64, False, 'in Misery Mire'),
+                  'Misery Mire - Big Key Chest': (0xea6d, False, 'in Misery Mire'),
                   'Misery Mire - Boss': (0x180158, False, 'with Vitreous'),
-                  'Turtle Rock - Compass Chest': (0xEA22, False, 'in Turtle Rock'),
-                  'Turtle Rock - Roller Room - Left': (0xEA1C, False, 'in Turtle Rock'),
-                  'Turtle Rock - Roller Room - Right': (0xEA1F, False, 'in Turtle Rock'),
-                  'Turtle Rock - Chain Chomps': (0xEA16, False, 'in Turtle Rock'),
-                  'Turtle Rock - Big Key Chest': (0xEA25, False, 'in Turtle Rock'),
-                  'Turtle Rock - Big Chest': (0xEA19, False, 'in Turtle Rock'),
-                  'Turtle Rock - Crystaroller Room': (0xEA34, False, 'in Turtle Rock'),
-                  'Turtle Rock - Eye Bridge - Bottom Left': (0xEA31, False, 'in Turtle Rock'),
-                  'Turtle Rock - Eye Bridge - Bottom Right': (0xEA2E, False, 'in Turtle Rock'),
-                  'Turtle Rock - Eye Bridge - Top Left': (0xEA2B, False, 'in Turtle Rock'),
-                  'Turtle Rock - Eye Bridge - Top Right': (0xEA28, False, 'in Turtle Rock'),
+                  'Turtle Rock - Compass Chest': (0xea22, False, 'in Turtle Rock'),
+                  'Turtle Rock - Roller Room - Left': (0xea1c, False, 'in Turtle Rock'),
+                  'Turtle Rock - Roller Room - Right': (0xea1f, False, 'in Turtle Rock'),
+                  'Turtle Rock - Chain Chomps': (0xea16, False, 'in Turtle Rock'),
+                  'Turtle Rock - Big Key Chest': (0xea25, False, 'in Turtle Rock'),
+                  'Turtle Rock - Big Chest': (0xea19, False, 'in Turtle Rock'),
+                  'Turtle Rock - Crystaroller Room': (0xea34, False, 'in Turtle Rock'),
+                  'Turtle Rock - Eye Bridge - Bottom Left': (0xea31, False, 'in Turtle Rock'),
+                  'Turtle Rock - Eye Bridge - Bottom Right': (0xea2e, False, 'in Turtle Rock'),
+                  'Turtle Rock - Eye Bridge - Top Left': (0xea2b, False, 'in Turtle Rock'),
+                  'Turtle Rock - Eye Bridge - Top Right': (0xea28, False, 'in Turtle Rock'),
                   'Turtle Rock - Boss': (0x180159, False, 'with Trinexx'),
-                  'Palace of Darkness - Shooter Room': (0xEA5B, False, 'in Palace of Darkness'),
-                  'Palace of Darkness - The Arena - Bridge': (0xEA3D, False, 'in Palace of Darkness'),
-                  'Palace of Darkness - Stalfos Basement': (0xEA49, False, 'in Palace of Darkness'),
-                  'Palace of Darkness - Big Key Chest': (0xEA37, False, 'in Palace of Darkness'),
-                  'Palace of Darkness - The Arena - Ledge': (0xEA3A, False, 'in Palace of Darkness'),
-                  'Palace of Darkness - Map Chest': (0xEA52, False, 'in Palace of Darkness'),
-                  'Palace of Darkness - Compass Chest': (0xEA43, False, 'in Palace of Darkness'),
-                  'Palace of Darkness - Dark Basement - Left': (0xEA4C, False, 'in Palace of Darkness'),
-                  'Palace of Darkness - Dark Basement - Right': (0xEA4F, False, 'in Palace of Darkness'),
-                  'Palace of Darkness - Dark Maze - Top': (0xEA55, False, 'in Palace of Darkness'),
-                  'Palace of Darkness - Dark Maze - Bottom': (0xEA58, False, 'in Palace of Darkness'),
-                  'Palace of Darkness - Big Chest': (0xEA40, False, 'in Palace of Darkness'),
-                  'Palace of Darkness - Harmless Hellway': (0xEA46, False, 'in Palace of Darkness'),
+                  'Palace of Darkness - Shooter Room': (0xea5b, False, 'in Palace of Darkness'),
+                  'Palace of Darkness - The Arena - Bridge': (0xea3d, False, 'in Palace of Darkness'),
+                  'Palace of Darkness - Stalfos Basement': (0xea49, False, 'in Palace of Darkness'),
+                  'Palace of Darkness - Big Key Chest': (0xea37, False, 'in Palace of Darkness'),
+                  'Palace of Darkness - The Arena - Ledge': (0xea3a, False, 'in Palace of Darkness'),
+                  'Palace of Darkness - Map Chest': (0xea52, False, 'in Palace of Darkness'),
+                  'Palace of Darkness - Compass Chest': (0xea43, False, 'in Palace of Darkness'),
+                  'Palace of Darkness - Dark Basement - Left': (0xea4c, False, 'in Palace of Darkness'),
+                  'Palace of Darkness - Dark Basement - Right': (0xea4f, False, 'in Palace of Darkness'),
+                  'Palace of Darkness - Dark Maze - Top': (0xea55, False, 'in Palace of Darkness'),
+                  'Palace of Darkness - Dark Maze - Bottom': (0xea58, False, 'in Palace of Darkness'),
+                  'Palace of Darkness - Big Chest': (0xea40, False, 'in Palace of Darkness'),
+                  'Palace of Darkness - Harmless Hellway': (0xea46, False, 'in Palace of Darkness'),
                   'Palace of Darkness - Boss': (0x180153, False, 'with Helmasaur King'),
-                  'Ganons Tower - Bob\'s Torch': (0x180161, False, 'in Ganon\'s Tower'),
-                  'Ganons Tower - Hope Room - Left': (0xEAD9, False, 'in Ganon\'s Tower'),
-                  'Ganons Tower - Hope Room - Right': (0xEADC, False, 'in Ganon\'s Tower'),
-                  'Ganons Tower - Tile Room': (0xEAE2, False, 'in Ganon\'s Tower'),
-                  'Ganons Tower - Compass Room - Top Left': (0xEAE5, False, 'in Ganon\'s Tower'),
-                  'Ganons Tower - Compass Room - Top Right': (0xEAE8, False, 'in Ganon\'s Tower'),
-                  'Ganons Tower - Compass Room - Bottom Left': (0xEAEB, False, 'in Ganon\'s Tower'),
-                  'Ganons Tower - Compass Room - Bottom Right': (0xEAEE, False, 'in Ganon\'s Tower'),
-                  'Ganons Tower - DMs Room - Top Left': (0xEAB8, False, 'in Ganon\'s Tower'),
-                  'Ganons Tower - DMs Room - Top Right': (0xEABB, False, 'in Ganon\'s Tower'),
-                  'Ganons Tower - DMs Room - Bottom Left': (0xEABE, False, 'in Ganon\'s Tower'),
-                  'Ganons Tower - DMs Room - Bottom Right': (0xEAC1, False, 'in Ganon\'s Tower'),
-                  'Ganons Tower - Map Chest': (0xEAD3, False, 'in Ganon\'s Tower'),
-                  'Ganons Tower - Firesnake Room': (0xEAD0, False, 'in Ganon\'s Tower'),
-                  'Ganons Tower - Randomizer Room - Top Left': (0xEAC4, False, 'in Ganon\'s Tower'),
-                  'Ganons Tower - Randomizer Room - Top Right': (0xEAC7, False, 'in Ganon\'s Tower'),
-                  'Ganons Tower - Randomizer Room - Bottom Left': (0xEACA, False, 'in Ganon\'s Tower'),
-                  'Ganons Tower - Randomizer Room - Bottom Right': (0xEACD, False, 'in Ganon\'s Tower'),
-                  'Ganons Tower - Bob\'s Chest': (0xEADF, False, 'in Ganon\'s Tower'),
-                  'Ganons Tower - Big Chest': (0xEAD6, False, 'in Ganon\'s Tower'),
-                  'Ganons Tower - Big Key Room - Left': (0xEAF4, False, 'in Ganon\'s Tower'),
-                  'Ganons Tower - Big Key Room - Right': (0xEAF7, False, 'in Ganon\'s Tower'),
-                  'Ganons Tower - Big Key Chest': (0xEAF1, False, 'in Ganon\'s Tower'),
-                  'Ganons Tower - Mini Helmasaur Room - Left': (0xEAFD, False, 'atop Ganon\'s Tower'),
-                  'Ganons Tower - Mini Helmasaur Room - Right': (0xEB00, False, 'atop Ganon\'s Tower'),
-                  'Ganons Tower - Pre-Moldorm Chest': (0xEB03, False, 'atop Ganon\'s Tower'),
-                  'Ganons Tower - Validation Chest': (0xEB06, False, 'atop Ganon\'s Tower'),
+                  "Ganons Tower - Bob's Torch": (0x180161, False, "in Ganon's Tower"),
+                  'Ganons Tower - Hope Room - Left': (0xead9, False, "in Ganon's Tower"),
+                  'Ganons Tower - Hope Room - Right': (0xeadc, False, "in Ganon's Tower"),
+                  'Ganons Tower - Tile Room': (0xeae2, False, "in Ganon's Tower"),
+                  'Ganons Tower - Compass Room - Top Left': (0xeae5, False, "in Ganon's Tower"),
+                  'Ganons Tower - Compass Room - Top Right': (0xeae8, False, "in Ganon's Tower"),
+                  'Ganons Tower - Compass Room - Bottom Left': (0xeaeb, False, "in Ganon's Tower"),
+                  'Ganons Tower - Compass Room - Bottom Right': (0xeaee, False, "in Ganon's Tower"),
+                  'Ganons Tower - DMs Room - Top Left': (0xeab8, False, "in Ganon's Tower"),
+                  'Ganons Tower - DMs Room - Top Right': (0xeabb, False, "in Ganon's Tower"),
+                  'Ganons Tower - DMs Room - Bottom Left': (0xeabe, False, "in Ganon's Tower"),
+                  'Ganons Tower - DMs Room - Bottom Right': (0xeac1, False, "in Ganon's Tower"),
+                  'Ganons Tower - Map Chest': (0xead3, False, "in Ganon's Tower"),
+                  'Ganons Tower - Firesnake Room': (0xead0, False, "in Ganon's Tower"),
+                  'Ganons Tower - Randomizer Room - Top Left': (0xeac4, False, "in Ganon's Tower"),
+                  'Ganons Tower - Randomizer Room - Top Right': (0xeac7, False, "in Ganon's Tower"),
+                  'Ganons Tower - Randomizer Room - Bottom Left': (0xeaca, False, "in Ganon's Tower"),
+                  'Ganons Tower - Randomizer Room - Bottom Right': (0xeacd, False, "in Ganon's Tower"),
+                  "Ganons Tower - Bob's Chest": (0xeadf, False, "in Ganon's Tower"),
+                  'Ganons Tower - Big Chest': (0xead6, False, "in Ganon's Tower"),
+                  'Ganons Tower - Big Key Room - Left': (0xeaf4, False, "in Ganon's Tower"),
+                  'Ganons Tower - Big Key Room - Right': (0xeaf7, False, "in Ganon's Tower"),
+                  'Ganons Tower - Big Key Chest': (0xeaf1, False, "in Ganon's Tower"),
+                  'Ganons Tower - Mini Helmasaur Room - Left': (0xeafd, False, "atop Ganon's Tower"),
+                  'Ganons Tower - Mini Helmasaur Room - Right': (0xeb00, False, "atop Ganon's Tower"),
+                  'Ganons Tower - Pre-Moldorm Chest': (0xeb03, False, "atop Ganon's Tower"),
+                  'Ganons Tower - Validation Chest': (0xeb06, False, "atop Ganon's Tower"),
                   'Ganon': (None, False, 'from me'),
                   'Agahnim 1': (None, False, 'from Ganon\'s wizardry form'),
                   'Agahnim 2': (None, False, 'from Ganon\'s wizardry form'),

Text.py

@@ -25,7 +25,8 @@ Uncle_texts = [
     'Forward this message to 10 other people or this seed will be awful.',
     'I hope you like your seeds bootless and fluteless.',
     '10\n9\n8\n7\n6\n5\n4\n3\n2\n1\nGo!',
-    'I\'m off to visit cousin Fritzl.'
+    'I\'m off to visit cousin Fritzl.',
+    'Don\'t forget to check Antlion Cave.'
 ] * 2 + [
     "We're out of\nWeetabix. To\nthe store!",
     "This seed is\nbootless\nuntil boots.",
@@ -534,7 +535,7 @@ class MultiByteCoreTextMapper(object):
         "{INTRO}": [0x6E, 0x00, 0x77, 0x07, 0x7A, 0x03, 0x6B, 0x02, 0x67],
         "{NOTEXT}": [0x6E, 0x00, 0x6B, 0x04],
         "{IBOX}": [0x6B, 0x02, 0x77, 0x07, 0x7A, 0x03],
-        "{C:GREEN}": [0x77, 0x07],
+        "{C:GREEN}": [0x77, 0x07],
         "{C:YELLOW}": [0x77, 0x02],
     }
 
@@ -551,10 +552,10 @@ class MultiByteCoreTextMapper(object):
             linespace = wrap
             line = lines.pop(0)
             if line.startswith('{'):
-                if line == '{PAGEBREAK}':
-                    if lineindex % 3 != 0:
-                        # insert a wait for keypress, unless we just did so
-                        outbuf.append(0x7E)
+                if line == '{PAGEBREAK}':
+                    if lineindex % 3 != 0:
+                        # insert a wait for keypress, unless we just did so
+                        outbuf.append(0x7E)
                     lineindex = 0
                 outbuf.extend(cls.special_commands[line])
                 continue
@@ -1431,6 +1432,7 @@ class TextTable(object):
             'desert_thief_question_yes',
             'desert_thief_after_item_get',
             'desert_thief_reassure',
+            'pond_item_bottle_filled'
         ]
 
         for msg in messages_to_zero:
@@ -1882,5 +1884,12 @@ class TextTable(object):
         # 190
         text['sign_east_death_mountain_bridge'] = CompressedTextMapper.convert("How did you get up here?")
         text['fish_money'] = CompressedTextMapper.convert("It's a secret to everyone.")
+        text['sign_ganons_tower'] = CompressedTextMapper.convert("You need all 7 crystals to enter.")
+        text['sign_ganon'] = CompressedTextMapper.convert("You need all 7 crystals to beat Ganon.")
+        text['ganon_phase_3_no_bow'] = CompressedTextMapper.convert("You have no bow. Dingus!")
+        text['ganon_phase_3_no_silvers_alt'] = CompressedTextMapper.convert("You can't best me without silver arrows!")
+        text['ganon_phase_3_no_silvers'] = CompressedTextMapper.convert("You can't best me without silver arrows!")
+        text['ganon_phase_3_silvers'] = CompressedTextMapper.convert("Oh no! Silver! My one true weakness!")
+        text['murahdahla'] = CompressedTextMapper.convert("Hello @. I\nam Murahdahla, brother of\nSahasrahla and Aginah. Behold the power of\ninvisibility.\n{PAUSE3}\n… … …\nWait! you can see me? I knew I should have\nhidden in  a hollow tree.")
         text['end_pad_data'] = bytearray([0xfb])
         text['terminator'] =  bytearray([0xFF, 0xFF])

Utils.py

@@ -87,14 +87,6 @@ def close_console():
         except Exception:
             pass
 
-def new_logic_array():
-    import random
-    l = list(range(256))
-    random.SystemRandom().shuffle(l)
-    chunks = [l[i:i + 16] for i in range(0, len(l), 16)]
-    lines = [", ".join([str(j) for j in i]) for i in chunks]
-    print("logic_hash = ["+",\n              ".join(lines)+"]")
-
 def make_new_base2current(old_rom='Zelda no Densetsu - Kamigami no Triforce (Japan).sfc', new_rom='working.sfc'):
     from collections import OrderedDict
     import json

_vendor/collections_extended/CONTRIBUTERS

@@ -0,0 +1,5 @@
+Mike Lenzen <m.lenzen@gmail.com> https://github.com/mlenzen
+Caleb Levy <caleb.levy@berkeley.edu> https://github.com/caleblevy
+Marein Könings <mail@marein.org> https://github.com/MareinK
+Jad Kik <jadkik94@gmail.com> https://github.com/jadkik
+Kuba Marek <blue.cube@seznam.cz> https://github.com/bluecube

_vendor/collections_extended/LICENSE

@@ -0,0 +1,191 @@
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and
+distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright
+owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities
+that control, are controlled by, or are under common control with that entity.
+For the purposes of this definition, "control" means (i) the power, direct or
+indirect, to cause the direction or management of such entity, whether by
+contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
+outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising
+permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including
+but not limited to software source code, documentation source, and configuration
+files.
+
+"Object" form shall mean any form resulting from mechanical transformation or
+translation of a Source form, including but not limited to compiled object code,
+generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made
+available under the License, as indicated by a copyright notice that is included
+in or attached to the work (an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that
+is based on (or derived from) the Work and for which the editorial revisions,
+annotations, elaborations, or other modifications represent, as a whole, an
+original work of authorship. For the purposes of this License, Derivative Works
+shall not include works that remain separable from, or merely link (or bind by
+name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version
+of the Work and any modifications or additions to that Work or Derivative Works
+thereof, that is intentionally submitted to Licensor for inclusion in the Work
+by the copyright owner or by an individual or Legal Entity authorized to submit
+on behalf of the copyright owner. For the purposes of this definition,
+"submitted" means any form of electronic, verbal, or written communication sent
+to the Licensor or its representatives, including but not limited to
+communication on electronic mailing lists, source code control systems, and
+issue tracking systems that are managed by, or on behalf of, the Licensor for
+the purpose of discussing and improving the Work, but excluding communication
+that is conspicuously marked or otherwise designated in writing by the copyright
+owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
+of whom a Contribution has been received by Licensor and subsequently
+incorporated within the Work.
+
+2. Grant of Copyright License.
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable copyright license to reproduce, prepare Derivative Works of,
+publicly display, publicly perform, sublicense, and distribute the Work and such
+Derivative Works in Source or Object form.
+
+3. Grant of Patent License.
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable (except as stated in this section) patent license to make, have
+made, use, offer to sell, sell, import, and otherwise transfer the Work, where
+such license applies only to those patent claims licensable by such Contributor
+that are necessarily infringed by their Contribution(s) alone or by combination
+of their Contribution(s) with the Work to which such Contribution(s) was
+submitted. If You institute patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Work or a
+Contribution incorporated within the Work constitutes direct or contributory
+patent infringement, then any patent licenses granted to You under this License
+for that Work shall terminate as of the date such litigation is filed.
+
+4. Redistribution.
+
+You may reproduce and distribute copies of the Work or Derivative Works thereof
+in any medium, with or without modifications, and in Source or Object form,
+provided that You meet the following conditions:
+
+You must give any other recipients of the Work or Derivative Works a copy of
+this License; and
+You must cause any modified files to carry prominent notices stating that You
+changed the files; and
+You must retain, in the Source form of any Derivative Works that You distribute,
+all copyright, patent, trademark, and attribution notices from the Source form
+of the Work, excluding those notices that do not pertain to any part of the
+Derivative Works; and
+If the Work includes a "NOTICE" text file as part of its distribution, then any
+Derivative Works that You distribute must include a readable copy of the
+attribution notices contained within such NOTICE file, excluding those notices
+that do not pertain to any part of the Derivative Works, in at least one of the
+following places: within a NOTICE text file distributed as part of the
+Derivative Works; within the Source form or documentation, if provided along
+with the Derivative Works; or, within a display generated by the Derivative
+Works, if and wherever such third-party notices normally appear. The contents of
+the NOTICE file are for informational purposes only and do not modify the
+License. You may add Your own attribution notices within Derivative Works that
+You distribute, alongside or as an addendum to the NOTICE text from the Work,
+provided that such additional attribution notices cannot be construed as
+modifying the License.
+You may add Your own copyright statement to Your modifications and may provide
+additional or different license terms and conditions for use, reproduction, or
+distribution of Your modifications, or for any such Derivative Works as a whole,
+provided Your use, reproduction, and distribution of the Work otherwise complies
+with the conditions stated in this License.
+
+5. Submission of Contributions.
+
+Unless You explicitly state otherwise, any Contribution intentionally submitted
+for inclusion in the Work by You to the Licensor shall be under the terms and
+conditions of this License, without any additional terms or conditions.
+Notwithstanding the above, nothing herein shall supersede or modify the terms of
+any separate license agreement you may have executed with Licensor regarding
+such Contributions.
+
+6. Trademarks.
+
+This License does not grant permission to use the trade names, trademarks,
+service marks, or product names of the Licensor, except as required for
+reasonable and customary use in describing the origin of the Work and
+reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty.
+
+Unless required by applicable law or agreed to in writing, Licensor provides the
+Work (and each Contributor provides its Contributions) on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
+including, without limitation, any warranties or conditions of TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
+solely responsible for determining the appropriateness of using or
+redistributing the Work and assume any risks associated with Your exercise of
+permissions under this License.
+
+8. Limitation of Liability.
+
+In no event and under no legal theory, whether in tort (including negligence),
+contract, or otherwise, unless required by applicable law (such as deliberate
+and grossly negligent acts) or agreed to in writing, shall any Contributor be
+liable to You for damages, including any direct, indirect, special, incidental,
+or consequential damages of any character arising as a result of this License or
+out of the use or inability to use the Work (including but not limited to
+damages for loss of goodwill, work stoppage, computer failure or malfunction, or
+any and all other commercial damages or losses), even if such Contributor has
+been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability.
+
+While redistributing the Work or Derivative Works thereof, You may choose to
+offer, and charge a fee for, acceptance of support, warranty, indemnity, or
+other liability obligations and/or rights consistent with this License. However,
+in accepting such obligations, You may act only on Your own behalf and on Your
+sole responsibility, not on behalf of any other Contributor, and only if You
+agree to indemnify, defend, and hold each Contributor harmless for any liability
+incurred by, or claims asserted against, such Contributor by reason of your
+accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work
+
+To apply the Apache License to your work, attach the following boilerplate
+notice, with the fields enclosed by brackets "[]" replaced with your own
+identifying information. (Don't include the brackets!) The text should be
+enclosed in the appropriate comment syntax for the file format. We also
+recommend that a file or class name and description of purpose be included on
+the same "printed page" as the copyright notice for easier identification within
+third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

_vendor/collections_extended/__init__.py

@@ -0,0 +1,55 @@
+"""collections_extended contains a few extra basic data structures."""
+from ._compat import Collection
+from .bags import bag, frozenbag
+from .setlists import setlist, frozensetlist
+from .bijection import bijection
+from .range_map import RangeMap, MappedRange
+
+__version__ = '1.0.2'
+
+__all__ = (
+	'collection',
+	'setlist',
+	'frozensetlist',
+	'bag',
+	'frozenbag',
+	'bijection',
+	'RangeMap',
+	'MappedRange',
+	'Collection',
+	)
+
+
+def collection(iterable=None, mutable=True, ordered=False, unique=False):
+	"""Return a Collection with the specified properties.
+
+	Args:
+		iterable (Iterable): collection to instantiate new collection from.
+		mutable (bool): Whether or not the new collection is mutable.
+		ordered (bool): Whether or not the new collection is ordered.
+		unique (bool): Whether or not the new collection contains only unique values.
+	"""
+	if iterable is None:
+		iterable = tuple()
+	if unique:
+		if ordered:
+			if mutable:
+				return setlist(iterable)
+			else:
+				return frozensetlist(iterable)
+		else:
+			if mutable:
+				return set(iterable)
+			else:
+				return frozenset(iterable)
+	else:
+		if ordered:
+			if mutable:
+				return list(iterable)
+			else:
+				return tuple(iterable)
+		else:
+			if mutable:
+				return bag(iterable)
+			else:
+				return frozenbag(iterable)

_vendor/collections_extended/_compat.py

@@ -0,0 +1,53 @@
+"""Python 2/3 compatibility helpers."""
+import sys
+
+is_py2 = sys.version_info[0] == 2
+
+if is_py2:
+	def keys_set(d):
+		"""Return a set of passed dictionary's keys."""
+		return set(d.keys())
+else:
+	keys_set = dict.keys
+
+
+if sys.version_info < (3, 6):
+	from collections import Sized, Iterable, Container
+
+	def _check_methods(C, *methods):
+		mro = C.__mro__
+		for method in methods:
+			for B in mro:
+				if method in B.__dict__:
+					if B.__dict__[method] is None:
+						return NotImplemented
+					break
+			else:
+				return NotImplemented
+		return True
+
+	class Collection(Sized, Iterable, Container):
+		"""Backport from Python3.6."""
+
+		__slots__ = tuple()
+
+		@classmethod
+		def __subclasshook__(cls, C):
+			if cls is Collection:
+				return _check_methods(C, "__len__", "__iter__", "__contains__")
+			return NotImplemented
+
+else:
+	from collections.abc import Collection
+
+
+def handle_rich_comp_not_implemented():
+	"""Correctly handle unimplemented rich comparisons.
+
+	In Python 3, return NotImplemented.
+	In Python 2, raise a TypeError.
+	"""
+	if is_py2:
+		raise TypeError()
+	else:
+		return NotImplemented

_vendor/collections_extended/_util.py

@@ -0,0 +1,16 @@
+"""util functions for collections_extended."""
+
+
+def hash_iterable(it):
+	"""Perform a O(1) memory hash of an iterable of arbitrary length.
+
+	hash(tuple(it)) creates a temporary tuple containing all values from it
+	which could be a problem if it is large.
+
+	See discussion at:
+	https://groups.google.com/forum/#!msg/python-ideas/XcuC01a8SYs/e-doB9TbDwAJ
+	"""
+	hash_value = hash(type(it))
+	for value in it:
+		hash_value = hash((hash_value, value))
+	return hash_value

_vendor/collections_extended/bags.py

@@ -0,0 +1,527 @@
+"""Bag class definitions."""
+import heapq
+from operator import itemgetter
+from collections import Set, MutableSet, Hashable
+
+from . import _compat
+
+
+class _basebag(Set):
+	"""Base class for bag classes.
+
+	Base class for bag and frozenbag.	Is not mutable and not hashable, so there's
+	no reason to use this instead of either bag or frozenbag.
+	"""
+
+	# Basic object methods
+
+	def __init__(self, iterable=None):
+		"""Create a new basebag.
+
+		If iterable isn't given, is None or is empty then the bag starts empty.
+		Otherwise each element from iterable will be added to the bag
+		however many times it appears.
+
+		This runs in O(len(iterable))
+		"""
+		self._dict = dict()
+		self._size = 0
+		if iterable:
+			if isinstance(iterable, _basebag):
+				for elem, count in iterable._dict.items():
+					self._dict[elem] = count
+					self._size += count
+			else:
+				for value in iterable:
+					self._dict[value] = self._dict.get(value, 0) + 1
+					self._size += 1
+
+	def __repr__(self):
+		if self._size == 0:
+			return '{0}()'.format(self.__class__.__name__)
+		else:
+			repr_format = '{class_name}({values!r})'
+			return repr_format.format(
+				class_name=self.__class__.__name__,
+				values=tuple(self),
+				)
+
+	def __str__(self):
+		if self._size == 0:
+			return '{class_name}()'.format(class_name=self.__class__.__name__)
+		else:
+			format_single = '{elem!r}'
+			format_mult = '{elem!r}^{mult}'
+			strings = []
+			for elem, mult in self._dict.items():
+				if mult > 1:
+					strings.append(format_mult.format(elem=elem, mult=mult))
+				else:
+					strings.append(format_single.format(elem=elem))
+			return '{%s}' % ', '.join(strings)
+
+	# New public methods (not overriding/implementing anything)
+
+	def num_unique_elements(self):
+		"""Return the number of unique elements.
+
+		This runs in O(1) time
+		"""
+		return len(self._dict)
+
+	def unique_elements(self):
+		"""Return a view of unique elements in this bag.
+
+		In Python 3:
+			This runs in O(1) time and returns a view of the unique elements
+		In Python 2:
+			This runs in O(n) and returns set of the current elements.
+		"""
+		return _compat.keys_set(self._dict)
+
+	def count(self, value):
+		"""Return the number of value present in this bag.
+
+		If value is not in the bag no Error is raised, instead 0 is returned.
+
+		This runs in O(1) time
+
+		Args:
+			value: The element of self to get the count of
+		Returns:
+			int: The count of value in self
+		"""
+		return self._dict.get(value, 0)
+
+	def nlargest(self, n=None):
+		"""List the n most common elements and their counts.
+
+		List is from the most
+		common to the least.  If n is None, the list all element counts.
+
+		Run time should be O(m log m) where m is len(self)
+		Args:
+			n (int): The number of elements to return
+		"""
+		if n is None:
+			return sorted(self._dict.items(), key=itemgetter(1), reverse=True)
+		else:
+			return heapq.nlargest(n, self._dict.items(), key=itemgetter(1))
+
+	@classmethod
+	def _from_iterable(cls, it):
+		return cls(it)
+
+	@classmethod
+	def from_mapping(cls, mapping):
+		"""Create a bag from a dict of elem->count.
+
+		Each key in the dict is added if the value is > 0.
+		"""
+		out = cls()
+		for elem, count in mapping.items():
+			if count > 0:
+				out._dict[elem] = count
+				out._size += count
+		return out
+
+	def copy(self):
+		"""Create a shallow copy of self.
+
+		This runs in O(len(self.num_unique_elements()))
+		"""
+		return self.from_mapping(self._dict)
+
+	# implementing Sized methods
+
+	def __len__(self):
+		"""Return the cardinality of the bag.
+
+		This runs in O(1)
+		"""
+		return self._size
+
+	# implementing Container methods
+
+	def __contains__(self, value):
+		"""Return the multiplicity of the element.
+
+		This runs in O(1)
+		"""
+		return self._dict.get(value, 0)
+
+	# implementing Iterable methods
+
+	def __iter__(self):
+		"""Iterate through all elements.
+
+		Multiple copies will be returned if they exist.
+		"""
+		for value, count in self._dict.items():
+			for i in range(count):
+				yield(value)
+
+	# Comparison methods
+
+	def _is_subset(self, other):
+		"""Check that every element in self has a count <= in other.
+
+		Args:
+			other (Set)
+		"""
+		if isinstance(other, _basebag):
+			for elem, count in self._dict.items():
+				if not count <= other._dict.get(elem, 0):
+					return False
+		else:
+			for elem in self:
+				if self._dict.get(elem, 0) > 1 or elem not in other:
+					return False
+		return True
+
+	def _is_superset(self, other):
+		"""Check that every element in self has a count >= in other.
+
+		Args:
+			other (Set)
+		"""
+		if isinstance(other, _basebag):
+			for elem, count in other._dict.items():
+				if not self._dict.get(elem, 0) >= count:
+					return False
+		else:
+			for elem in other:
+				if elem not in self:
+					return False
+		return True
+
+	def __le__(self, other):
+		if not isinstance(other, Set):
+			return _compat.handle_rich_comp_not_implemented()
+		return len(self) <= len(other) and self._is_subset(other)
+
+	def __lt__(self, other):
+		if not isinstance(other, Set):
+			return _compat.handle_rich_comp_not_implemented()
+		return len(self) < len(other) and self._is_subset(other)
+
+	def __gt__(self, other):
+		if not isinstance(other, Set):
+			return _compat.handle_rich_comp_not_implemented()
+		return len(self) > len(other) and self._is_superset(other)
+
+	def __ge__(self, other):
+		if not isinstance(other, Set):
+			return _compat.handle_rich_comp_not_implemented()
+		return len(self) >= len(other) and self._is_superset(other)
+
+	def __eq__(self, other):
+		if not isinstance(other, Set):
+			return False
+		if isinstance(other, _basebag):
+			return self._dict == other._dict
+		if not len(self) == len(other):
+			return False
+		for elem in other:
+			if self._dict.get(elem, 0) != 1:
+				return False
+		return True
+
+	def __ne__(self, other):
+		return not (self == other)
+
+	# Operations - &, |, +, -, ^, * and isdisjoint
+
+	def __and__(self, other):
+		"""Intersection is the minimum of corresponding counts.
+
+		This runs in O(l + n) where:
+			n is self.num_unique_elements()
+			if other is a bag:
+				l = 1
+			else:
+				l = len(other)
+		"""
+		if not isinstance(other, _basebag):
+			other = self._from_iterable(other)
+		values = dict()
+		for elem in self._dict:
+			values[elem] = min(other._dict.get(elem, 0), self._dict.get(elem, 0))
+		return self.from_mapping(values)
+
+	def isdisjoint(self, other):
+		"""Return if this bag is disjoint with the passed collection.
+
+		This runs in O(len(other))
+
+		TODO move isdisjoint somewhere more appropriate
+		"""
+		for value in other:
+			if value in self:
+				return False
+		return True
+
+	def __or__(self, other):
+		"""Union is the maximum of all elements.
+
+		This runs in O(m + n) where:
+			n is self.num_unique_elements()
+			if other is a bag:
+				m = other.num_unique_elements()
+			else:
+				m = len(other)
+		"""
+		if not isinstance(other, _basebag):
+			other = self._from_iterable(other)
+		values = dict()
+		for elem in self.unique_elements() | other.unique_elements():
+			values[elem] = max(self._dict.get(elem, 0), other._dict.get(elem, 0))
+		return self.from_mapping(values)
+
+	def __add__(self, other):
+		"""Return a new bag also containing all the elements of other.
+
+		self + other = self & other + self | other
+
+		This runs in O(m + n) where:
+			n is self.num_unique_elements()
+			m is len(other)
+		Args:
+			other (Iterable): elements to add to self
+		"""
+		out = self.copy()
+		for value in other:
+			out._dict[value] = out._dict.get(value, 0) + 1
+			out._size += 1
+		return out
+
+	def __sub__(self, other):
+		"""Difference between the sets.
+
+		For normal sets this is all x s.t. x in self and x not in other.
+		For bags this is count(x) = max(0, self.count(x)-other.count(x))
+
+		This runs in O(m + n) where:
+			n is self.num_unique_elements()
+			m is len(other)
+		Args:
+			other (Iterable): elements to remove
+		"""
+		out = self.copy()
+		for value in other:
+			old_count = out._dict.get(value, 0)
+			if old_count == 1:
+				del out._dict[value]
+				out._size -= 1
+			elif old_count > 1:
+				out._dict[value] = old_count - 1
+				out._size -= 1
+		return out
+
+	def __mul__(self, other):
+		"""Cartesian product of the two sets.
+
+		other can be any iterable.
+		Both self and other must contain elements that can be added together.
+
+		This should run in O(m*n+l) where:
+			m is the number of unique elements in self
+			n is the number of unique elements in other
+			if other is a bag:
+				l is 0
+			else:
+				l is the len(other)
+		The +l will only really matter when other is an iterable with MANY
+		repeated elements.
+		For example: {'a'^2} * 'bbbbbbbbbbbbbbbbbbbbbbbbbb'
+		The algorithm will be dominated by counting the 'b's
+		"""
+		if not isinstance(other, _basebag):
+			other = self._from_iterable(other)
+		values = dict()
+		for elem, count in self._dict.items():
+			for other_elem, other_count in other._dict.items():
+				new_elem = elem + other_elem
+				new_count = count * other_count
+				values[new_elem] = new_count
+		return self.from_mapping(values)
+
+	def __xor__(self, other):
+		"""Symmetric difference between the sets.
+
+		other can be any iterable.
+
+		This runs in O(m + n) where:
+			m = len(self)
+			n = len(other)
+		"""
+		return (self - other) | (other - self)
+
+
+class bag(_basebag, MutableSet):
+	"""bag is a mutable unhashable bag."""
+
+	def pop(self):
+		"""Remove and return an element of self."""
+		# TODO can this be done more efficiently (no need to create an iterator)?
+		it = iter(self)
+		try:
+			value = next(it)
+		except StopIteration:
+			raise KeyError
+		self.discard(value)
+		return value
+
+	def add(self, elem):
+		"""Add elem to self."""
+		self._dict[elem] = self._dict.get(elem, 0) + 1
+		self._size += 1
+
+	def discard(self, elem):
+		"""Remove elem from this bag, silent if it isn't present."""
+		try:
+			self.remove(elem)
+		except ValueError:
+			pass
+
+	def remove(self, elem):
+		"""Remove elem from this bag, raising a ValueError if it isn't present.
+
+		Args:
+			elem: object to remove from self
+		Raises:
+			ValueError: if the elem isn't present
+		"""
+		old_count = self._dict.get(elem, 0)
+		if old_count == 0:
+			raise ValueError
+		elif old_count == 1:
+			del self._dict[elem]
+		else:
+			self._dict[elem] -= 1
+		self._size -= 1
+
+	def discard_all(self, other):
+		"""Discard all of the elems from other."""
+		if not isinstance(other, _basebag):
+			other = self._from_iterable(other)
+		for elem, other_count in other._dict.items():
+			old_count = self._dict.get(elem, 0)
+			new_count = old_count - other_count
+			if new_count >= 0:
+				if new_count == 0:
+					if elem in self:
+						del self._dict[elem]
+				else:
+					self._dict[elem] = new_count
+				self._size += new_count - old_count
+
+	def remove_all(self, other):
+		"""Remove all of the elems from other.
+
+		Raises a ValueError if the multiplicity of any elem in other is greater
+		than in self.
+		"""
+		if not self._is_superset(other):
+			raise ValueError
+		self.discard_all(other)
+
+	def clear(self):
+		"""Remove all elements from this bag."""
+		self._dict = dict()
+		self._size = 0
+
+	# In-place operations
+
+	def __ior__(self, other):
+		"""Set multiplicity of each element to the maximum of the two collections.
+
+		if isinstance(other, _basebag):
+			This runs in O(other.num_unique_elements())
+		else:
+			This runs in O(len(other))
+		"""
+		if not isinstance(other, _basebag):
+			other = self._from_iterable(other)
+		for elem, other_count in other._dict.items():
+			old_count = self._dict.get(elem, 0)
+			new_count = max(other_count, old_count)
+			self._dict[elem] = new_count
+			self._size += new_count - old_count
+		return self
+
+	def __iand__(self, other):
+		"""Set multiplicity of each element to the minimum of the two collections.
+
+		if isinstance(other, _basebag):
+			This runs in O(other.num_unique_elements())
+		else:
+			This runs in O(len(other))
+		"""
+		if not isinstance(other, _basebag):
+			other = self._from_iterable(other)
+		for elem, old_count in set(self._dict.items()):
+			other_count = other._dict.get(elem, 0)
+			new_count = min(other_count, old_count)
+			if new_count == 0:
+				del self._dict[elem]
+			else:
+				self._dict[elem] = new_count
+			self._size += new_count - old_count
+		return self
+
+	def __ixor__(self, other):
+		"""Set self to the symmetric difference between the sets.
+
+		if isinstance(other, _basebag):
+			This runs in O(other.num_unique_elements())
+		else:
+			This runs in O(len(other))
+		"""
+		if not isinstance(other, _basebag):
+			other = self._from_iterable(other)
+		other_minus_self = other - self
+		self -= other
+		self |= other_minus_self
+		return self
+
+	def __isub__(self, other):
+		"""Discard the elements of other from self.
+
+		if isinstance(it, _basebag):
+			This runs in O(it.num_unique_elements())
+		else:
+			This runs in O(len(it))
+		"""
+		self.discard_all(other)
+		return self
+
+	def __iadd__(self, other):
+		"""Add all of the elements of other to self.
+
+		if isinstance(it, _basebag):
+			This runs in O(it.num_unique_elements())
+		else:
+			This runs in O(len(it))
+		"""
+		if not isinstance(other, _basebag):
+			other = self._from_iterable(other)
+		for elem, other_count in other._dict.items():
+			self._dict[elem] = self._dict.get(elem, 0) + other_count
+			self._size += other_count
+		return self
+
+
+class frozenbag(_basebag, Hashable):
+	"""frozenbag is an immutable, hashable bab."""
+
+	def __hash__(self):
+		"""Compute the hash value of a frozenbag.
+
+		This was copied directly from _collections_abc.Set._hash in Python3 which
+		is identical to _abcoll.Set._hash
+		We can't call it directly because Python2 raises a TypeError.
+		"""
+		if not hasattr(self, '_hash_value'):
+			self._hash_value = self._hash()
+		return self._hash_value

_vendor/collections_extended/bijection.py

@@ -0,0 +1,94 @@
+"""Class definition for bijection."""
+
+from collections import MutableMapping, Mapping
+
+
+class bijection(MutableMapping):
+	"""A one-to-one onto mapping, a dict with unique values."""
+
+	def __init__(self, iterable=None, **kwarg):
+		"""Create a bijection from an iterable.
+
+		Matches dict.__init__.
+		"""
+		self._data = {}
+		self.__inverse = self.__new__(bijection)
+		self.__inverse._data = {}
+		self.__inverse.__inverse = self
+		if iterable is not None:
+			if isinstance(iterable, Mapping):
+				for key, value in iterable.items():
+					self[key] = value
+			else:
+				for pair in iterable:
+					self[pair[0]] = pair[1]
+		for key, value in kwarg.items():
+			self[key] = value
+
+	def __repr__(self):
+		if len(self._data) == 0:
+			return '{0}()'.format(self.__class__.__name__)
+		else:
+			repr_format = '{class_name}({values!r})'
+			return repr_format.format(
+				class_name=self.__class__.__name__,
+				values=self._data,
+				)
+
+	@property
+	def inverse(self):
+		"""Return the inverse of this bijection."""
+		return self.__inverse
+
+	# Required for MutableMapping
+	def __len__(self):
+		return len(self._data)
+
+	# Required for MutableMapping
+	def __getitem__(self, key):
+		return self._data[key]
+
+	# Required for MutableMapping
+	def __setitem__(self, key, value):
+		if key in self:
+			del self.inverse._data[self[key]]
+		if value in self.inverse:
+			del self._data[self.inverse[value]]
+		self._data[key] = value
+		self.inverse._data[value] = key
+
+	# Required for MutableMapping
+	def __delitem__(self, key):
+		value = self._data.pop(key)
+		del self.inverse._data[value]
+
+	# Required for MutableMapping
+	def __iter__(self):
+		return iter(self._data)
+
+	def __contains__(self, key):
+		return key in self._data
+
+	def clear(self):
+		"""Remove everything from this bijection."""
+		self._data.clear()
+		self.inverse._data.clear()
+
+	def copy(self):
+		"""Return a copy of this bijection."""
+		return bijection(self)
+
+	def items(self):
+		"""See Mapping.items."""
+		return self._data.items()
+
+	def keys(self):
+		"""See Mapping.keys."""
+		return self._data.keys()
+
+	def values(self):
+		"""See Mapping.values."""
+		return self.inverse.keys()
+
+	def __eq__(self, other):
+		return isinstance(other, bijection) and self._data == other._data

_vendor/collections_extended/range_map.py

@@ -0,0 +1,384 @@
+"""RangeMap class definition."""
+from bisect import bisect_left, bisect_right
+from collections import namedtuple, Mapping, MappingView, Set
+
+
+# Used to mark unmapped ranges
+_empty = object()
+
+MappedRange = namedtuple('MappedRange', ('start', 'stop', 'value'))
+
+
+class KeysView(MappingView, Set):
+	"""A view of the keys that mark the starts of subranges.
+
+	Since iterating over all the keys is impossible, the KeysView only
+	contains the keys that start each subrange.
+	"""
+
+	__slots__ = ()
+
+	@classmethod
+	def _from_iterable(self, it):
+		return set(it)
+
+	def __contains__(self, key):
+		loc = self._mapping._bisect_left(key)
+		return self._mapping._keys[loc] == key and \
+			self._mapping._values[loc] is not _empty
+
+	def __iter__(self):
+		for item in self._mapping.ranges():
+			yield item.start
+
+
+class ItemsView(MappingView, Set):
+	"""A view of the items that mark the starts of subranges.
+
+	Since iterating over all the keys is impossible, the ItemsView only
+	contains the items that start each subrange.
+	"""
+
+	__slots__ = ()
+
+	@classmethod
+	def _from_iterable(self, it):
+		return set(it)
+
+	def __contains__(self, item):
+		key, value = item
+		loc = self._mapping._bisect_left(key)
+		return self._mapping._keys[loc] == key and \
+			self._mapping._values[loc] == value
+
+	def __iter__(self):
+		for mapped_range in self._mapping.ranges():
+			yield (mapped_range.start, mapped_range.value)
+
+
+class ValuesView(MappingView):
+	"""A view on the values of a Mapping."""
+
+	__slots__ = ()
+
+	def __contains__(self, value):
+		return value in self._mapping._values
+
+	def __iter__(self):
+		for value in self._mapping._values:
+			if value is not _empty:
+				yield value
+
+
+def _check_start_stop(start, stop):
+	"""Check that start and stop are valid - orderable and in the right order.
+
+	Raises:
+		ValueError: if stop <= start
+		TypeError: if unorderable
+	"""
+	if start is not None and stop is not None and stop <= start:
+		raise ValueError('stop must be > start')
+
+
+def _check_key_slice(key):
+	if not isinstance(key, slice):
+		raise TypeError('Can only set and delete slices')
+	if key.step is not None:
+		raise ValueError('Cannot set or delete slices with steps')
+
+
+class RangeMap(Mapping):
+	"""Map ranges of orderable elements to values."""
+
+	def __init__(self, iterable=None, **kwargs):
+		"""Create a RangeMap.
+
+		A mapping or other iterable can be passed to initialize the RangeMap.
+		If mapping is passed, it is interpreted as a mapping from range start
+		indices to values.
+		If an iterable is passed, each element will define a range in the
+		RangeMap and should be formatted (start, stop, value).
+
+		default_value is a an optional keyword argument that will initialize the
+		entire RangeMap to that value. Any missing ranges will be mapped to that
+		value. However, if ranges are subsequently deleted they will be removed
+		and *not* mapped to the default_value.
+
+		Args:
+			iterable: A Mapping or an Iterable to initialize from.
+			default_value: If passed, the return value for all keys less than the
+				least key in mapping or missing ranges in iterable. If no mapping
+				or iterable, the return value for all keys.
+		"""
+		default_value = kwargs.pop('default_value', _empty)
+		if kwargs:
+			raise TypeError('Unknown keyword arguments: %s' % ', '.join(kwargs.keys()))
+		self._keys = [None]
+		self._values = [default_value]
+		if iterable:
+			if isinstance(iterable, Mapping):
+				self._init_from_mapping(iterable)
+			else:
+				self._init_from_iterable(iterable)
+
+	@classmethod
+	def from_mapping(cls, mapping):
+		"""Create a RangeMap from a mapping of interval starts to values."""
+		obj = cls()
+		obj._init_from_mapping(mapping)
+		return obj
+
+	def _init_from_mapping(self, mapping):
+		for key, value in sorted(mapping.items()):
+			self.set(value, key)
+
+	@classmethod
+	def from_iterable(cls, iterable):
+		"""Create a RangeMap from an iterable of tuples defining each range.
+
+		Each element of the iterable is a tuple (start, stop, value).
+		"""
+		obj = cls()
+		obj._init_from_iterable(iterable)
+		return obj
+
+	def _init_from_iterable(self, iterable):
+		for start, stop, value in iterable:
+			self.set(value, start=start, stop=stop)
+
+	def __str__(self):
+		range_format = '({range.start}, {range.stop}): {range.value}'
+		values = ', '.join([range_format.format(range=r) for r in self.ranges()])
+		return 'RangeMap(%s)' % values
+
+	def __repr__(self):
+		range_format = '({range.start!r}, {range.stop!r}, {range.value!r})'
+		values = ', '.join([range_format.format(range=r) for r in self.ranges()])
+		return 'RangeMap([%s])' % values
+
+	def _bisect_left(self, key):
+		"""Return the index of the key or the last key < key."""
+		if key is None:
+			return 0
+		else:
+			return bisect_left(self._keys, key, lo=1)
+
+	def _bisect_right(self, key):
+		"""Return the index of the first key > key."""
+		if key is None:
+			return 1
+		else:
+			return bisect_right(self._keys, key, lo=1)
+
+	def ranges(self, start=None, stop=None):
+		"""Generate MappedRanges for all mapped ranges.
+
+		Yields:
+			MappedRange
+		"""
+		_check_start_stop(start, stop)
+		start_loc = self._bisect_right(start)
+		if stop is None:
+			stop_loc = len(self._keys)
+		else:
+			stop_loc = self._bisect_left(stop)
+		start_val = self._values[start_loc - 1]
+		candidate_keys = [start] + self._keys[start_loc:stop_loc] + [stop]
+		candidate_values = [start_val] + self._values[start_loc:stop_loc]
+		for i, value in enumerate(candidate_values):
+			if value is not _empty:
+				start_key = candidate_keys[i]
+				stop_key = candidate_keys[i + 1]
+				yield MappedRange(start_key, stop_key, value)
+
+	def __contains__(self, value):
+		try:
+			self.__getitem(value) is not _empty
+		except KeyError:
+			return False
+		else:
+			return True
+
+	def __iter__(self):
+		for key, value in zip(self._keys, self._values):
+			if value is not _empty:
+				yield key
+
+	def __bool__(self):
+		if len(self._keys) > 1:
+			return True
+		else:
+			return self._values[0] != _empty
+
+	__nonzero__ = __bool__
+
+	def __getitem(self, key):
+		"""Get the value for a key (not a slice)."""
+		loc = self._bisect_right(key) - 1
+		value = self._values[loc]
+		if value is _empty:
+			raise KeyError(key)
+		else:
+			return value
+
+	def get(self, key, restval=None):
+		"""Get the value of the range containing key, otherwise return restval."""
+		try:
+			return self.__getitem(key)
+		except KeyError:
+			return restval
+
+	def get_range(self, start=None, stop=None):
+		"""Return a RangeMap for the range start to stop.
+
+		Returns:
+			A RangeMap
+		"""
+		return self.from_iterable(self.ranges(start, stop))
+
+	def set(self, value, start=None, stop=None):
+		"""Set the range from start to stop to value."""
+		_check_start_stop(start, stop)
+		# start_index, stop_index will denote the sections we are replacing
+		start_index = self._bisect_left(start)
+		if start is not None:  # start_index == 0
+			prev_value = self._values[start_index - 1]
+			if prev_value == value:
+				# We're setting a range where the left range has the same
+				# value, so create one big range
+				start_index -= 1
+				start = self._keys[start_index]
+		if stop is None:
+			new_keys = [start]
+			new_values = [value]
+			stop_index = len(self._keys)
+		else:
+			stop_index = self._bisect_right(stop)
+			stop_value = self._values[stop_index - 1]
+			stop_key = self._keys[stop_index - 1]
+			if stop_key == stop and stop_value == value:
+				new_keys = [start]
+				new_values = [value]
+			else:
+				new_keys = [start, stop]
+				new_values = [value, stop_value]
+		self._keys[start_index:stop_index] = new_keys
+		self._values[start_index:stop_index] = new_values
+
+	def delete(self, start=None, stop=None):
+		"""Delete the range from start to stop from self.
+
+		Raises:
+			KeyError: If part of the passed range isn't mapped.
+		"""
+		_check_start_stop(start, stop)
+		start_loc = self._bisect_right(start) - 1
+		if stop is None:
+			stop_loc = len(self._keys)
+		else:
+			stop_loc = self._bisect_left(stop)
+		for value in self._values[start_loc:stop_loc]:
+			if value is _empty:
+				raise KeyError((start, stop))
+		# this is inefficient, we've already found the sub ranges
+		self.set(_empty, start=start, stop=stop)
+
+	def empty(self, start=None, stop=None):
+		"""Empty the range from start to stop.
+
+		Like delete, but no Error is raised if the entire range isn't mapped.
+		"""
+		self.set(_empty, start=start, stop=stop)
+
+	def clear(self):
+		"""Remove all elements."""
+		self._keys = [None]
+		self._values = [_empty]
+
+	@property
+	def start(self):
+		"""Get the start key of the first range.
+
+		None if RangeMap is empty or unbounded to the left.
+		"""
+		if self._values[0] is _empty:
+			try:
+				return self._keys[1]
+			except IndexError:
+				# This is empty or everything is mapped to a single value
+				return None
+		else:
+			# This is unbounded to the left
+			return self._keys[0]
+
+	@property
+	def end(self):
+		"""Get the stop key of the last range.
+
+		None if RangeMap is empty or unbounded to the right.
+		"""
+		if self._values[-1] is _empty:
+			return self._keys[-1]
+		else:
+			# This is unbounded to the right
+			return None
+
+	def __eq__(self, other):
+		if isinstance(other, RangeMap):
+			return (
+				self._keys == other._keys and
+				self._values == other._values
+				)
+		else:
+			return False
+
+	def __getitem__(self, key):
+		try:
+			_check_key_slice(key)
+		except TypeError:
+			return self.__getitem(key)
+		else:
+			return self.get_range(key.start, key.stop)
+
+	def __setitem__(self, key, value):
+		_check_key_slice(key)
+		self.set(value, key.start, key.stop)
+
+	def __delitem__(self, key):
+		_check_key_slice(key)
+		self.delete(key.start, key.stop)
+
+	def __len__(self):
+		count = 0
+		for v in self._values:
+			if v is not _empty:
+				count += 1
+		return count
+
+	def keys(self):
+		"""Return a view of the keys."""
+		return KeysView(self)
+
+	def values(self):
+		"""Return a view of the values."""
+		return ValuesView(self)
+
+	def items(self):
+		"""Return a view of the item pairs."""
+		return ItemsView(self)
+
+	# Python2 - override slice methods
+	def __setslice__(self, i, j, value):
+		"""Implement __setslice__ to override behavior in Python 2.
+
+		This is required because empty slices pass integers in python2 as opposed
+		to None in python 3.
+		"""
+		raise SyntaxError('Assigning slices doesn\t work in Python 2, use set')
+
+	def __delslice__(self, i, j):
+		raise SyntaxError('Deleting slices doesn\t work in Python 2, use delete')
+
+	def __getslice__(self, i, j):
+		raise SyntaxError('Getting slices doesn\t work in Python 2, use get_range.')

_vendor/collections_extended/setlists.py

@@ -0,0 +1,552 @@
+"""Setlist class definitions."""
+import random as random_
+
+from collections import (
+	Sequence,
+	Set,
+	MutableSequence,
+	MutableSet,
+	Hashable,
+	)
+
+from . import _util
+
+
+class _basesetlist(Sequence, Set):
+	"""A setlist is an ordered Collection of unique elements.
+
+	_basesetlist is the superclass of setlist and frozensetlist.  It is immutable
+	and unhashable.
+	"""
+
+	def __init__(self, iterable=None, raise_on_duplicate=False):
+		"""Create a setlist.
+
+		Args:
+			iterable (Iterable): Values to initialize the setlist with.
+		"""
+		self._list = list()
+		self._dict = dict()
+		if iterable:
+			if raise_on_duplicate:
+				self._extend(iterable)
+			else:
+				self._update(iterable)
+
+	def __repr__(self):
+		if len(self) == 0:
+			return '{0}()'.format(self.__class__.__name__)
+		else:
+			repr_format = '{class_name}({values!r})'
+			return repr_format.format(
+				class_name=self.__class__.__name__,
+				values=tuple(self),
+				)
+
+	# Convenience methods
+	def _fix_neg_index(self, index):
+		if index < 0:
+			index += len(self)
+		if index < 0:
+			raise IndexError('index is out of range')
+		return index
+
+	def _fix_end_index(self, index):
+		if index is None:
+			return len(self)
+		else:
+			return self._fix_neg_index(index)
+
+	def _append(self, value):
+		# Checking value in self will check that value is Hashable
+		if value in self:
+			raise ValueError('Value "%s" already present' % str(value))
+		else:
+			self._dict[value] = len(self)
+			self._list.append(value)
+
+	def _extend(self, values):
+		new_values = set()
+		for value in values:
+			if value in new_values:
+				raise ValueError('New values contain duplicates')
+			elif value in self:
+				raise ValueError('New values contain elements already present in self')
+			else:
+				new_values.add(value)
+		for value in values:
+			self._dict[value] = len(self)
+			self._list.append(value)
+
+	def _add(self, item):
+		if item not in self:
+			self._dict[item] = len(self)
+			self._list.append(item)
+
+	def _update(self, values):
+		for value in values:
+			if value not in self:
+				self._dict[value] = len(self)
+				self._list.append(value)
+
+	@classmethod
+	def _from_iterable(cls, it, **kwargs):
+		return cls(it, **kwargs)
+
+	# Implement Container
+	def __contains__(self, value):
+		return value in self._dict
+
+	# Iterable we get by inheriting from Sequence
+
+	# Implement Sized
+	def __len__(self):
+		return len(self._list)
+
+	# Implement Sequence
+	def __getitem__(self, index):
+		if isinstance(index, slice):
+			return self._from_iterable(self._list[index])
+		return self._list[index]
+
+	def count(self, value):
+		"""Return the number of occurences of value in self.
+
+		This runs in O(1)
+
+		Args:
+			value: The value to count
+		Returns:
+			int: 1 if the value is in the setlist, otherwise 0
+		"""
+		if value in self:
+			return 1
+		else:
+			return 0
+
+	def index(self, value, start=0, end=None):
+		"""Return the index of value between start and end.
+
+		By default, the entire setlist is searched.
+
+		This runs in O(1)
+
+		Args:
+			value: The value to find the index of
+			start (int): The index to start searching at (defaults to 0)
+			end (int): The index to stop searching at (defaults to the end of the list)
+		Returns:
+			int: The index of the value
+		Raises:
+			ValueError: If the value is not in the list or outside of start - end
+			IndexError: If start or end are out of range
+		"""
+		try:
+			index = self._dict[value]
+		except KeyError:
+			raise ValueError
+		else:
+			start = self._fix_neg_index(start)
+			end = self._fix_end_index(end)
+			if start <= index and index < end:
+				return index
+			else:
+				raise ValueError
+
+	@classmethod
+	def _check_type(cls, other, operand_name):
+		if not isinstance(other, _basesetlist):
+			message = (
+				"unsupported operand type(s) for {operand_name}: "
+				"'{self_type}' and '{other_type}'").format(
+					operand_name=operand_name,
+					self_type=cls,
+					other_type=type(other),
+					)
+			raise TypeError(message)
+
+	def __add__(self, other):
+		self._check_type(other, '+')
+		out = self.copy()
+		out._extend(other)
+		return out
+
+	# Implement Set
+
+	def issubset(self, other):
+		return self <= other
+
+	def issuperset(self, other):
+		return self >= other
+
+	def union(self, other):
+		out = self.copy()
+		out.update(other)
+		return out
+
+	def intersection(self, other):
+		other = set(other)
+		return self._from_iterable(item for item in self if item in other)
+
+	def difference(self, other):
+		other = set(other)
+		return self._from_iterable(item for item in self if item not in other)
+
+	def symmetric_difference(self, other):
+		return self.union(other) - self.intersection(other)
+
+	def __sub__(self, other):
+		self._check_type(other, '-')
+		return self.difference(other)
+
+	def __and__(self, other):
+		self._check_type(other, '&')
+		return self.intersection(other)
+
+	def __or__(self, other):
+		self._check_type(other, '|')
+		return self.union(other)
+
+	def __xor__(self, other):
+		self._check_type(other, '^')
+		return self.symmetric_difference(other)
+
+	# Comparison
+
+	def __eq__(self, other):
+		if not isinstance(other, _basesetlist):
+			return False
+		if not len(self) == len(other):
+			return False
+		for self_elem, other_elem in zip(self, other):
+			if self_elem != other_elem:
+				return False
+		return True
+
+	def __ne__(self, other):
+		return not (self == other)
+
+	# New methods
+
+	def sub_index(self, sub, start=0, end=None):
+		"""Return the index of a subsequence.
+
+		This runs in O(len(sub))
+
+		Args:
+			sub (Sequence): An Iterable to search for
+		Returns:
+			int: The index of the first element of sub
+		Raises:
+			ValueError: If sub isn't a subsequence
+			TypeError: If sub isn't iterable
+			IndexError: If start or end are out of range
+		"""
+		start_index = self.index(sub[0], start, end)
+		end = self._fix_end_index(end)
+		if start_index + len(sub) > end:
+			raise ValueError
+		for i in range(1, len(sub)):
+			if sub[i] != self[start_index + i]:
+				raise ValueError
+		return start_index
+
+	def copy(self):
+		return self.__class__(self)
+
+
+class setlist(_basesetlist, MutableSequence, MutableSet):
+	"""A mutable (unhashable) setlist."""
+
+	def __str__(self):
+		return '{[%s}]' % ', '.join(repr(v) for v in self)
+
+	# Helper methods
+	def _delete_all(self, elems_to_delete, raise_errors):
+		indices_to_delete = set()
+		for elem in elems_to_delete:
+			try:
+				elem_index = self._dict[elem]
+			except KeyError:
+				if raise_errors:
+					raise ValueError('Passed values contain elements not in self')
+			else:
+				if elem_index in indices_to_delete:
+					if raise_errors:
+						raise ValueError('Passed vales contain duplicates')
+				indices_to_delete.add(elem_index)
+		self._delete_values_by_index(indices_to_delete)
+
+	def _delete_values_by_index(self, indices_to_delete):
+		deleted_count = 0
+		for i, elem in enumerate(self._list):
+			if i in indices_to_delete:
+				deleted_count += 1
+				del self._dict[elem]
+			else:
+				new_index = i - deleted_count
+				self._list[new_index] = elem
+				self._dict[elem] = new_index
+		# Now remove deleted_count items from the end of the list
+		if deleted_count:
+			self._list = self._list[:-deleted_count]
+
+	# Set/Sequence agnostic
+	def pop(self, index=-1):
+		"""Remove and return the item at index."""
+		value = self._list.pop(index)
+		del self._dict[value]
+		return value
+
+	def clear(self):
+		"""Remove all elements from self."""
+		self._dict = dict()
+		self._list = list()
+
+	# Implement MutableSequence
+	def __setitem__(self, index, value):
+		if isinstance(index, slice):
+			old_values = self[index]
+			for v in value:
+				if v in self and v not in old_values:
+					raise ValueError
+			self._list[index] = value
+			self._dict = {}
+			for i, v in enumerate(self._list):
+				self._dict[v] = i
+		else:
+			index = self._fix_neg_index(index)
+			old_value = self._list[index]
+			if value in self:
+				if value == old_value:
+					return
+				else:
+					raise ValueError
+			del self._dict[old_value]
+			self._list[index] = value
+			self._dict[value] = index
+
+	def __delitem__(self, index):
+		if isinstance(index, slice):
+			indices_to_delete = set(self.index(e) for e in self._list[index])
+			self._delete_values_by_index(indices_to_delete)
+		else:
+			index = self._fix_neg_index(index)
+			value = self._list[index]
+			del self._dict[value]
+			for elem in self._list[index + 1:]:
+				self._dict[elem] -= 1
+			del self._list[index]
+
+	def insert(self, index, value):
+		"""Insert value at index.
+
+		Args:
+			index (int): Index to insert value at
+			value: Value to insert
+		Raises:
+			ValueError: If value already in self
+			IndexError: If start or end are out of range
+		"""
+		if value in self:
+			raise ValueError
+		index = self._fix_neg_index(index)
+		self._dict[value] = index
+		for elem in self._list[index:]:
+			self._dict[elem] += 1
+		self._list.insert(index, value)
+
+	def append(self, value):
+		"""Append value to the end.
+
+		Args:
+			value: Value to append
+		Raises:
+			ValueError: If value alread in self
+			TypeError: If value isn't hashable
+		"""
+		self._append(value)
+
+	def extend(self, values):
+		"""Append all values to the end.
+
+		If any of the values are present, ValueError will
+		be raised and none of the values will be appended.
+
+		Args:
+			values (Iterable): Values to append
+		Raises:
+			ValueError: If any values are already present or there are duplicates
+				in the passed values.
+			TypeError: If any of the values aren't hashable.
+		"""
+		self._extend(values)
+
+	def __iadd__(self, values):
+		"""Add all values to the end of self.
+
+		Args:
+			values (Iterable): Values to append
+		Raises:
+			ValueError: If any values are already present
+		"""
+		self._check_type(values, '+=')
+		self.extend(values)
+		return self
+
+	def remove(self, value):
+		"""Remove value from self.
+
+		Args:
+			value: Element to remove from self
+		Raises:
+			ValueError: if element is already present
+		"""
+		try:
+			index = self._dict[value]
+		except KeyError:
+			raise ValueError('Value "%s" is not present.')
+		else:
+			del self[index]
+
+	def remove_all(self, elems_to_delete):
+		"""Remove all elements from elems_to_delete, raises ValueErrors.
+
+		See Also:
+			discard_all
+		Args:
+			elems_to_delete (Iterable): Elements to remove.
+		Raises:
+			ValueError: If the count of any element is greater in
+				elems_to_delete than self.
+			TypeError: If any of the values aren't hashable.
+		"""
+		self._delete_all(elems_to_delete, raise_errors=True)
+
+	# Implement MutableSet
+
+	def add(self, item):
+		"""Add an item.
+
+		Note:
+			This does not raise a ValueError for an already present value like
+			append does. This is to match the behavior of set.add
+		Args:
+			item: Item to add
+		Raises:
+			TypeError: If item isn't hashable.
+		"""
+		self._add(item)
+
+	def update(self, values):
+		"""Add all values to the end.
+
+		If any of the values are present, silently ignore
+		them (as opposed to extend which raises an Error).
+
+		See also:
+			extend
+		Args:
+			values (Iterable): Values to add
+		Raises:
+			TypeError: If any of the values are unhashable.
+		"""
+		self._update(values)
+
+	def discard_all(self, elems_to_delete):
+		"""Discard all the elements from elems_to_delete.
+
+		This is much faster than removing them one by one.
+		This runs in O(len(self) + len(elems_to_delete))
+
+		Args:
+			elems_to_delete (Iterable): Elements to discard.
+		Raises:
+			TypeError: If any of the values aren't hashable.
+		"""
+		self._delete_all(elems_to_delete, raise_errors=False)
+
+	def discard(self, value):
+		"""Discard an item.
+
+		Note:
+			This does not raise a ValueError for a missing value like remove does.
+			This is to match the behavior of set.discard
+		"""
+		try:
+			self.remove(value)
+		except ValueError:
+			pass
+
+	def difference_update(self, other):
+		"""Update self to include only the differene with other."""
+		other = set(other)
+		indices_to_delete = set()
+		for i, elem in enumerate(self):
+			if elem in other:
+				indices_to_delete.add(i)
+		if indices_to_delete:
+			self._delete_values_by_index(indices_to_delete)
+
+	def intersection_update(self, other):
+		"""Update self to include only the intersection with other."""
+		other = set(other)
+		indices_to_delete = set()
+		for i, elem in enumerate(self):
+			if elem not in other:
+				indices_to_delete.add(i)
+		if indices_to_delete:
+			self._delete_values_by_index(indices_to_delete)
+
+	def symmetric_difference_update(self, other):
+		"""Update self to include only the symmetric difference with other."""
+		other = setlist(other)
+		indices_to_delete = set()
+		for i, item in enumerate(self):
+			if item in other:
+				indices_to_delete.add(i)
+		for item in other:
+			self.add(item)
+		self._delete_values_by_index(indices_to_delete)
+
+	def __isub__(self, other):
+		self._check_type(other, '-=')
+		self.difference_update(other)
+		return self
+
+	def __iand__(self, other):
+		self._check_type(other, '&=')
+		self.intersection_update(other)
+		return self
+
+	def __ior__(self, other):
+		self._check_type(other, '|=')
+		self.update(other)
+		return self
+
+	def __ixor__(self, other):
+		self._check_type(other, '^=')
+		self.symmetric_difference_update(other)
+		return self
+
+	# New methods
+	def shuffle(self, random=None):
+		"""Shuffle all of the elements in self randomly."""
+		random_.shuffle(self._list, random=random)
+		for i, elem in enumerate(self._list):
+			self._dict[elem] = i
+
+	def sort(self, *args, **kwargs):
+		"""Sort this setlist in place."""
+		self._list.sort(*args, **kwargs)
+		for index, value in enumerate(self._list):
+			self._dict[value] = index
+
+
+class frozensetlist(_basesetlist, Hashable):
+	"""An immutable (hashable) setlist."""
+
+	def __hash__(self):
+		if not hasattr(self, '_hash_value'):
+			self._hash_value = _util.hash_iterable(self)
+		return self._hash_value

bundle/EntranceRandomizer.spec

@@ -24,7 +24,7 @@ exe = EXE(pyz,
           debug=False,
           strip=False,
           upx=False,
-          icon='data/ER.ico',
+          icon='../data/ER.ico',
           console=is_win )
 coll = COLLECT(exe,
                a.binaries,
@@ -35,5 +35,5 @@ coll = COLLECT(exe,
                name='EntranceRandomizer')
 app = BUNDLE(coll,
              name ='EntranceRandomizer.app',
-             icon = 'data/ER.icns',
+             icon = '../data/ER.icns',
              bundle_identifier = None)