Swamp regions and doors

DoorShuffle.py

@@ -1147,6 +1147,40 @@ logical_connections = [
     ('PoD Arena Bridge Drop Down', 'PoD Arena Main'),
     ('PoD Map Balcony Drop Down', 'PoD Sexy Statue'),
     ('PoD Basement Ledge Drop Down', 'PoD Stalfos Basement'),
+    ('Swamp Lobby Moat', 'Swamp Entrance'),
+    ('Swamp Entrance Moat', 'Swamp Lobby'),
+    ('Swamp Trench 1 Approach Dry', 'Swamp Trench 1 Nexus'),
+    ('Swamp Trench 1 Approach Key', 'Swamp Trench 1 Key Ledge'),
+    ('Swamp Trench 1 Approach Swim Depart', 'Swamp Trench 1 Departure'),
+    ('Swamp Trench 1 Nexus Approach', 'Swamp Trench 1 Approach'),
+    ('Swamp Trench 1 Nexus Key', 'Swamp Trench 1 Key Ledge'),
+    ('Swamp Trench 1 Key Ledge Dry', 'Swamp Trench 1 Nexus'),
+    ('Swamp Trench 1 Key Approach', 'Swamp Trench 1 Approach'),
+    ('Swamp Trench 1 Key Ledge Depart', 'Swamp Trench 1 Departure'),
+    ('Swamp Trench 1 Departure Dry', 'Swamp Trench 1 Nexus'),
+    ('Swamp Trench 1 Departure Approach', 'Swamp Trench 1 Approach'),
+    ('Swamp Trench 1 Departure Key', 'Swamp Trench 1 Key Ledge'),
+    ('Swamp Hub Hook Path', 'Swamp Hub North Ledge'),
+    ('Swamp Hub North Ledge Drop Down', 'Swamp Hub'),
+    ('Swamp Compass Donut Push Block', 'Swamp Donut Top'),
+    ('Swamp Shortcut Blue Barrier', 'Swamp Trench 2 Pots'),
+    ('Swamp Trench 2 Pots Blue Barrier', 'Swamp Shortcut'),
+    ('Swamp Trench 2 Pots Dry', 'Swamp Trench 2 Blocks'),
+    ('Swamp Trench 2 Pots Wet', 'Swamp Trench 2 Departure'),
+    ('Swamp Trench 2 Blocks Pots', 'Swamp Trench 2 Pots'),
+    ('Swamp Trench 2 Departure Wet', 'Swamp Trench 2 Pots'),
+    ('Swamp West Shallows Push Blocks', 'Swamp West Block Path'),
+    ('Swamp West Ledge Drop Down', 'Swamp West Shallows'),
+    ('Swamp West Ledge Hook Path', 'Swamp Barrier Ledge'),
+    ('Swamp Barrier Ledge Drop Down', 'Swamp West Shallows'),
+    ('Swamp Barrier Ledge - Orange', 'Swamp Barrier'),
+    ('Swamp Barrier - Orange', 'Swamp Barrier Ledge'),
+    ('Swamp Barrier Ledge Hook Path', 'Swamp West Ledge'),
+    ('Swamp Drain Left Switch', 'Swamp Drain Right'),
+    ('Swamp Drain Right Switch', 'Swamp Drain Left'),
+    # ('', ''),
+    # ('', ''),
+    # ('', ''),
 ]
 
 spiral_staircases = [
@@ -1172,6 +1206,14 @@ spiral_staircases = [
     ('PoD Basement Ledge Up Stairs', 'PoD Big Key Landing Down Stairs'),
     ('PoD Compass Room W Down Stairs', 'PoD Dark Basement W Up Stairs'),
     ('PoD Compass Room E Down Stairs', 'PoD Dark Basement E Up Stairs'),
+    ('Swamp Entrance Down Stairs', 'Swamp Pot Row Up Stairs'),
+    ('Swamp West Block Path Up Stairs', 'Swamp Attic Down Stairs'),
+    ('Swamp Push Statue Down Stairs', 'Swamp Flooded Room Up Stairs'),
+    ('Swamp Left Elbow Down Stairs', 'Swamp Drain Left Up Stairs'),
+    ('Swamp Right Elbow Down Stairs', 'Swamp Drain Right Up Stairs'),
+    ('Swamp Behind Waterfall Up Stairs', 'Swamp C Down Stairs'),
+    # ('', ''),
+    # ('', ''),
     # ('', ''),
 ]
 
@@ -1212,6 +1254,9 @@ falldown_pits = [
     ('PoD Pit Room Freefall', 'PoD Stalfos Basement'),
     ('PoD Pit Room Bomb Hole', 'PoD Basement Ledge'),
     ('PoD Big Key Landing Hole', 'PoD Stalfos Basement'),
+    ('Swamp Attic Right Pit', 'Swamp Barrier Ledge'),
+    ('Swamp Attic Left Pit', 'Swamp West Ledge'),
+    # ('', ''),
     # ('', ''),
 ]
 
@@ -1270,6 +1315,22 @@ interior_doors = [
     ('PoD Dark Pegs WN', 'PoD Lonely Turtle EN'),
     ('PoD Lonely Turtle SW', 'PoD Turtle Party NW'),
     ('PoD Turtle Party ES', 'PoD Callback WS'),
+    ('Swamp Trench 1 Nexus N', 'Swamp Trench 1 Alcove S'),
+    ('Swamp Trench 1 Key Ledge NW', 'Swamp Hammer Switch SW'),
+    ('Swamp Donut Top SE', 'Swamp Donut Bottom NE'),
+    ('Swamp Donut Bottom NW', 'Swamp Compass Donut SW'),
+    ('Swamp Crystal Switch SE', 'Swamp Shortcut NE'),
+    ('Swamp Trench 2 Blocks N', 'Swamp Trench 2 Alcove S'),
+    ('Swamp Push Statue NW', 'Swamp Shooters SW'),
+    ('Swamp Push Statue NE', 'Swamp Right Elbow SE'),
+    ('Swamp Shooters EN', 'Swamp Left Elbow WN'),
+    ('Swamp Drain WN', 'Swamp Basement Shallows EN'),
+    ('Swamp Flooded Room WS', 'Swamp Basement Shallows ES'),
+    ('Swamp Waterfall Room NW', 'Swamp Refill 1 SW'),
+    ('Swamp Waterfall Room NE', 'Swamp Behind Waterfall SE'),
+    ('Swamp C SE', 'Swamp Waterway NE'),
+    ('Swamp Waterway N', 'Swamp I S'),
+    ('Swamp Waterway NW', 'Swamp T SW'),
     # ('', ''),
 ]
 
@@ -1330,9 +1391,23 @@ default_door_connections = [
     ('PoD Falling Bridge WN', 'PoD Dark Maze EN'),
     ('PoD Dark Maze E', 'PoD Big Chest Balcony W'),
     ('PoD Sexy Statue NW', 'PoD Mimics 2 SW'),
+    ('Swamp Pot Row WN', 'Swamp Map Ledge EN'),
+    ('Swamp Pot Row WS', 'Swamp Trench 1 Approach ES'),
+    ('Swamp Trench 1 Departure WS', 'Swamp Hub ES'),
+    ('Swamp Hammer Switch WN', 'Swamp Hub Dead Ledge EN'),
+    ('Swamp Hub S', 'Swamp Donut Top N'),
+    ('Swamp Hub WS', 'Swamp Trench 2 Pots ES'),
+    ('Swamp Hub WN', 'Swamp Crystal Switch EN'),
+    ('Swamp Hub North Ledge N', 'Swamp Push Statue S'),
+    ('Swamp Trench 2 Departure WS', 'Swamp West Shallows ES'),
+    ('Swamp Big Key Ledge WN', 'Swamp Barrier EN'),
+    ('Swamp Basement Shallows NW', 'Swamp Waterfall Room SW'),
+    # ('', ''),
+    # ('', ''),
+    # ('', ''),
+    # ('', ''),
 ]
 
-
 # ('', ''),
 default_one_way_connections = [
     ('Sewers Pull Switch S', 'Sanctuary N'),
@@ -1341,6 +1416,7 @@ default_one_way_connections = [
     ('Tower Altar NW', 'Tower Agahnim 1 SW'),
     ('PoD Harmless Hellway SE', 'PoD Arena Main NE'),
     ('PoD Dark Alley NE', 'PoD Boss SE'),
+    ('Swamp T NW', 'Swamp Boss SW'),
 ]
 
 # todo: these path rules are more complicated I think...
@@ -1374,7 +1450,8 @@ default_dungeon_sets = [
     ['Desert Back Lobby', 'Desert Boss', 'Desert Main Lobby', 'Desert West Lobby', 'Desert East Lobby'],
     ['Hera Lobby', 'Hera Boss'],
     ['Tower Lobby', 'Tower Agahnim 1'],
-    ['PoD Lobby', 'PoD Boss']
+    ['PoD Lobby', 'PoD Boss'],
+    ['Swamp Lobby', 'Swamp Boss']
 ]
 
 dungeon_x_idx_to_name = {
@@ -1384,5 +1461,6 @@ dungeon_x_idx_to_name = {
     3: 'Tower of Hera',
     4: 'Agahnims Tower',
     5: 'Palace of Darkness',
+    6: 'Swamp Palace',
 #     etc
 }

Doors.py

@@ -323,6 +323,108 @@ def create_doors(world, player):
         create_door(player, 'PoD Callback WS', DoorType.Interior).dir(Direction.West, 0x0b, Mid, High).pos(1),
         create_door(player, 'PoD Callback Warp', DoorType.Warp),
         create_door(player, 'PoD Boss SE', DoorType.Normal).dir(Direction.South, 0x5a, Right, High).no_exit().trap(0x4).pos(0),
+
+        create_door(player, 'Swamp Lobby Moat', DoorType.Logical),
+        create_door(player, 'Swamp Entrance Down Stairs', DoorType.SpiralStairs),
+        create_door(player, 'Swamp Entrance Moat', DoorType.Logical),
+        create_door(player, 'Swamp Pot Row Up Stairs', DoorType.SpiralStairs),
+        create_door(player, 'Swamp Pot Row WN', DoorType.Normal).dir(Direction.West, 0x38, Top, High).pos(0),
+        create_door(player, 'Swamp Pot Row WS', DoorType.Normal).dir(Direction.West, 0x38, Bot, High).small_key().pos(1),
+        create_door(player, 'Swamp Map Ledge EN', DoorType.Normal).dir(Direction.East, 0x37, Top, High).pos(1),
+        create_door(player, 'Swamp Trench 1 Approach ES', DoorType.Normal).dir(Direction.East, 0x37, Bot, High).small_key().pos(3),
+        create_door(player, 'Swamp Trench 1 Approach Dry', DoorType.Logical),
+        create_door(player, 'Swamp Trench 1 Approach Key', DoorType.Logical),
+        create_door(player, 'Swamp Trench 1 Approach Swim Depart', DoorType.Logical),
+        create_door(player, 'Swamp Trench 1 Nexus Approach', DoorType.Logical),
+        create_door(player, 'Swamp Trench 1 Nexus Key', DoorType.Logical),
+        create_door(player, 'Swamp Trench 1 Nexus N', DoorType.Interior).dir(Direction.North, 0x37, Mid, Low).pos(5),
+        create_door(player, 'Swamp Trench 1 Alcove S', DoorType.Interior).dir(Direction.South, 0x37, Mid, Low).pos(5),
+        create_door(player, 'Swamp Trench 1 Key Ledge Dry', DoorType.Logical),
+        create_door(player, 'Swamp Trench 1 Key Approach', DoorType.Logical),
+        create_door(player, 'Swamp Trench 1 Key Ledge Depart', DoorType.Logical),
+        create_door(player, 'Swamp Trench 1 Key Ledge NW', DoorType.Interior).dir(Direction.North, 0x37, Left, High).small_key().pos(2),
+        create_door(player, 'Swamp Trench 1 Departure Dry', DoorType.Logical),
+        create_door(player, 'Swamp Trench 1 Departure Approach', DoorType.Logical),
+        create_door(player, 'Swamp Trench 1 Departure Key', DoorType.Logical),
+        create_door(player, 'Swamp Trench 1 Departure WS', DoorType.Normal).dir(Direction.West, 0x37, Bot, High).pos(4),
+        create_door(player, 'Swamp Hammer Switch SW', DoorType.Interior).dir(Direction.South, 0x37, Left, High).small_key().pos(2),
+        create_door(player, 'Swamp Hammer Switch WN', DoorType.Normal).dir(Direction.West, 0x37, Top, High).pos(0),
+        create_door(player, 'Swamp Hub ES', DoorType.Normal).dir(Direction.East, 0x36, Bot, High).pos(4),
+        create_door(player, 'Swamp Hub S', DoorType.Normal).dir(Direction.South, 0x36, Mid, Low).pos(5),
+        create_door(player, 'Swamp Hub WS', DoorType.Normal).dir(Direction.West, 0x36, Bot, High).pos(3),
+        create_door(player, 'Swamp Hub WN', DoorType.Normal).dir(Direction.West, 0x36, Top, High).small_key().pos(2),
+        create_door(player, 'Swamp Hub Hook Path', DoorType.Logical),
+        create_door(player, 'Swamp Hub Dead Ledge EN', DoorType.Normal).dir(Direction.East, 0x36, Top, High).pos(0),
+        create_door(player, 'Swamp Hub North Ledge N', DoorType.Normal).dir(Direction.North, 0x36, Mid, High).small_key().pos(1),
+        create_door(player, 'Swamp Hub North Ledge Drop Down', DoorType.Logical),
+        create_door(player, 'Swamp Donut Top N', DoorType.Normal).dir(Direction.North, 0x46, Mid, Low).pos(0),
+        create_door(player, 'Swamp Donut Top SE', DoorType.Interior).dir(Direction.South, 0x46, Right, Low).pos(2),
+        create_door(player, 'Swamp Donut Bottom NE', DoorType.Interior).dir(Direction.North, 0x46, Right, Low).pos(2),
+        create_door(player, 'Swamp Donut Bottom NW', DoorType.Interior).dir(Direction.North, 0x46, Left, Low).pos(1),
+        create_door(player, 'Swamp Compass Donut SW', DoorType.Interior).dir(Direction.South, 0x46, Left, Low).pos(1),
+        create_door(player, 'Swamp Compass Donut Push Block', DoorType.Logical),
+        create_door(player, 'Swamp Crystal Switch EN', DoorType.Normal).dir(Direction.East, 0x35, Top, High).small_key().pos(0),
+        create_door(player, 'Swamp Crystal Switch SE', DoorType.Interior).dir(Direction.South, 0x35, Right, High).pos(3),
+        create_door(player, 'Swamp Shortcut NE', DoorType.Interior).dir(Direction.North, 0x35, Right, High).pos(3),
+        create_door(player, 'Swamp Shortcut Blue Barrier', DoorType.Logical),
+        create_door(player, 'Swamp Trench 2 Pots ES', DoorType.Normal).dir(Direction.East, 0x35, Bot, High).pos(4),
+        create_door(player, 'Swamp Trench 2 Pots Blue Barrier', DoorType.Logical),
+        create_door(player, 'Swamp Trench 2 Pots Dry', DoorType.Logical),
+        create_door(player, 'Swamp Trench 2 Pots Wet', DoorType.Logical),
+        create_door(player, 'Swamp Trench 2 Blocks Pots', DoorType.Logical),
+        create_door(player, 'Swamp Trench 2 Blocks N', DoorType.Interior).dir(Direction.North, 0x35, Mid, Low).pos(5),
+        create_door(player, 'Swamp Trench 2 Alcove S', DoorType.Interior).dir(Direction.South, 0x35, Mid, Low).pos(5),
+        create_door(player, 'Swamp Trench 2 Departure Wet', DoorType.Logical),
+        create_door(player, 'Swamp Trench 2 Departure WS', DoorType.Normal).dir(Direction.West, 0x35, Bot, High).pos(2),
+        create_door(player, 'Swamp Big Key Ledge WN', DoorType.Normal).dir(Direction.West, 0x35, Top, High).pos(1),
+        create_door(player, 'Swamp West Shallows ES', DoorType.Normal),
+        create_door(player, 'Swamp West Shallows Push Blocks', DoorType.Logical),
+        create_door(player, 'Swamp West Block Path Up Stairs', DoorType.SpiralStairs),
+        create_door(player, 'Swamp West Ledge Drop Down', DoorType.Logical),
+        create_door(player, 'Swamp West Ledge Hook Path', DoorType.Logical),
+        create_door(player, 'Swamp Barrier Ledge Drop Down', DoorType.Logical),
+        create_door(player, 'Swamp Barrier Ledge - Orange', DoorType.Logical),
+        create_door(player, 'Swamp Barrier EN', DoorType.Normal),
+        create_door(player, 'Swamp Barrier - Orange', DoorType.Logical),
+        create_door(player, 'Swamp Barrier Ledge Hook Path', DoorType.Logical),
+        create_door(player, 'Swamp Attic Down Stairs', DoorType.SpiralStairs),
+        create_door(player, 'Swamp Attic Left Pit', DoorType.Warp),
+        create_door(player, 'Swamp Attic Right Pit', DoorType.Warp),
+        create_door(player, 'Swamp Push Statue S', DoorType.Normal),
+        create_door(player, 'Swamp Push Statue NW', DoorType.Interior),
+        create_door(player, 'Swamp Push Statue NE', DoorType.Interior),
+        create_door(player, 'Swamp Push Statue Down Stairs', DoorType.SpiralStairs),
+        create_door(player, 'Swamp Shooters SW', DoorType.Interior),
+        create_door(player, 'Swamp Shooters EN', DoorType.Interior),
+        create_door(player, 'Swamp Left Elbow WN', DoorType.Interior),
+        create_door(player, 'Swamp Left Elbow Down Stairs', DoorType.SpiralStairs),
+        create_door(player, 'Swamp Right Elbow SE', DoorType.Interior),
+        create_door(player, 'Swamp Right Elbow Down Stairs', DoorType.SpiralStairs),
+        create_door(player, 'Swamp Drain Left Up Stairs', DoorType.SpiralStairs),
+        create_door(player, 'Swamp Drain WN', DoorType.Interior),
+        create_door(player, 'Swamp Drain Left Switch', DoorType.Logical),
+        create_door(player, 'Swamp Drain Right Switch', DoorType.Logical),
+        create_door(player, 'Swamp Drain Right Up Stairs', DoorType.SpiralStairs),
+        create_door(player, 'Swamp Flooded Room Up Stairs', DoorType.SpiralStairs),
+        create_door(player, 'Swamp Flooded Room WS', DoorType.Interior),
+        create_door(player, 'Swamp Basement Shallows NW', DoorType.Normal),
+        create_door(player, 'Swamp Basement Shallows EN', DoorType.Interior),
+        create_door(player, 'Swamp Basement Shallows ES', DoorType.Interior),
+        create_door(player, 'Swamp Waterfall Room SW', DoorType.Normal),
+        create_door(player, 'Swamp Waterfall Room NW', DoorType.Interior),
+        create_door(player, 'Swamp Waterfall Room NE', DoorType.Interior),
+        create_door(player, 'Swamp Refill 1 SW', DoorType.Interior),
+        create_door(player, 'Swamp Behind Waterfall SE', DoorType.Interior),
+        create_door(player, 'Swamp Behind Waterfall Up Stairs', DoorType.SpiralStairs),
+        create_door(player, 'Swamp C Down Stairs', DoorType.SpiralStairs),
+        create_door(player, 'Swamp C SE', DoorType.Interior),
+        create_door(player, 'Swamp Waterway NE', DoorType.Interior),
+        create_door(player, 'Swamp Waterway N', DoorType.Interior),
+        create_door(player, 'Swamp Waterway NW', DoorType.Interior),
+        create_door(player, 'Swamp I S', DoorType.Interior),
+        create_door(player, 'Swamp T SW', DoorType.Interior),
+        create_door(player, 'Swamp T NW', DoorType.Normal),
+        create_door(player, 'Swamp Boss SW', DoorType.Normal),
     ]
     create_paired_doors(world, player)
 
@@ -336,11 +438,12 @@ def create_paired_doors(world, player):
         PairedDoor('PoD Dark Maze E', 'PoD Big Chest Balcony W'),  # PoD Bombable by Big Chest
         PairedDoor('PoD Arena Main NW', 'PoD Falling Bridge SW'),  # Pod key door by bridge
         PairedDoor('Sewers Dark Cross Key Door N', 'Sewers Dark Cross Key Door S'),
-        # PairedDoor('', ''),  # Swamp key door above big chest
+        PairedDoor('Swamp Hub WN', 'Swamp Crystal Switch EN'),  # Swamp key door crystal switch
+        PairedDoor('Swamp Hub North Ledge N', 'Swamp Push Statue S'),  # Swamp key door above big chest
         PairedDoor('PoD Map Balcony WS', 'PoD Arena Ledge ES'),  # Pod bombable by arena
-        # PairedDoor('', ''),  # Swamp bombable to random pots
+        PairedDoor('Swamp Hub Dead Ledge EN', 'Swamp Hammer Switch WN'),  # Swamp bombable to random pots
-        # PairedDoor('', ''),  # Swamp bombable to map chest
+        PairedDoor('Swamp Pot Row WN', 'Swamp Map Ledge EN'),  # Swamp bombable to map chest
-        # PairedDoor('', ''),  # Swamp key door early room $38
+        PairedDoor('Swamp Pot Row WS', 'Swamp Trench 1 Approach ES'),  # Swamp key door early room $38
         PairedDoor('PoD Middle Cage N', 'PoD Pit Room S'),
         # PairedDoor('', ''),  # GT moldorm key door
         # PairedDoor('', ''),  # Ice BJ key door

Dungeons.py

@@ -24,7 +24,7 @@ def create_dungeons(world, player):
     #still standard dungeons
     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))
+    SP = make_dungeon('Swamp Palace', 'Arrghus', swamp_regions, 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))
@@ -214,6 +214,17 @@ pod_regions = [
     'PoD Turtle Party', 'PoD Dark Alley', 'PoD Callback', 'PoD Boss'
 ]
 
+swamp_regions = [
+    'Swamp Lobby', 'Swamp Entrance', 'Swamp Pot Row', 'Swamp Map Ledge', 'Swamp Trench 1 Approach',
+    'Swamp Trench 1 Nexus', 'Swamp Trench 1 Alcove', 'Swamp Trench 1 Key Ledge', 'Swamp Trench 1 Departure'
+    'Swamp Hammer Switch', 'Swamp Hub', 'Swamp Hub Dead Ledge', 'Swamp Hub North Ledge', 'Swamp Donut Top'
+    'Swamp Donut Bottom', 'Swamp Compass Donut', 'Swamp Crystal Switch', 'Swamp Shortcut', 'Swamp Trench 2 Pots'
+    'Swamp Trench 2 Blocks', 'Swamp Trench 2 Alcove', 'Swamp Trench 2 Departure', 'Swamp Big Key Ledge'
+    'Swamp West Shallows', 'Swamp West Block Path', 'Swamp West Ledge', 'Swamp Barrier Ledge', 'Swamp Barrier'
+    'Swamp Attic', 'Swamp Push Statue', 'Swamp Shooters', 'Swamp Left Elbow', 'Swamp Right Elbow', 'Swamp Drain Left'
+    'Swamp Drain Right', 'Swamp Flooded Room', 'Swamp Basement Shallows', 'Swamp Waterfall Room', 'Swamp Refill 1'
+    'Swamp Behind Waterfall', 'Swamp C', 'Swamp Waterway', 'Swamp I', 'Swamp T', 'Swamp Boss'
+]
 
 dungeon_regions = {
     'Hyrule Castle': hyrule_castle_regions,
@@ -222,7 +233,7 @@ dungeon_regions = {
     'Tower of Hera': hera_regions,
     'Agahnims Tower': tower_regions,
     'Palace of Darkness': pod_regions,
-    # 'Swamp':
+    'Swamp Palace': swamp_regions,
     # 'Skull':
     # 'TT':
     # 'Ice':
@@ -238,7 +249,7 @@ region_starts = {
     'Tower of Hera': ['Hera Lobby'],
     'Agahnims Tower': ['Tower Lobby'],
     'Palace of Darkness': ['PoD Lobby'],
-    # ['Swamp Lobby'],
+    'Swamp Palace': ['Swamp Lobby'],
     # ['TT Lobby'],
     # ['Ice Lobby'],
     # ['Mire Lobby'],

Regions.py

@@ -193,13 +193,6 @@ def create_regions(world, player):
         create_lw_region(player, 'Mimic Cave Ledge', None, ['Mimic Cave']),
         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',
@@ -418,6 +411,52 @@ def create_regions(world, player):
         create_dungeon_region(player, 'PoD Boss', 'Palace of Darkness', ['Palace of Darkness - Boss', 'Palace of Darkness - Prize'], ['PoD Boss SE']),
 
         # swamp
+        create_dungeon_region(player, 'Swamp Lobby', 'Swamp Palace', None, ['Swamp Palace Exit', 'Swamp Lobby Moat']),
+        create_dungeon_region(player, 'Swamp Entrance', 'Swamp Palace', ['Swamp Palace - Entrance'], ['Swamp Entrance Down Stairs', 'Swamp Entrance Moat']),
+        create_dungeon_region(player, 'Swamp Pot Row', 'Swamp Palace', ['Swamp Palace - Pot Row Pot Key'], ['Swamp Pot Row Up Stairs', 'Swamp Pot Row WN', 'Swamp Pot Row WS']),
+        create_dungeon_region(player, 'Swamp Map Ledge', 'Swamp Palace', ['Swamp Palace - Map Chest'], ['Swamp Map Ledge EN']),
+        create_dungeon_region(player, 'Swamp Trench 1 Approach', 'Swamp Palace', None, ['Swamp Trench 1 Approach ES', 'Swamp Trench 1 Approach Dry', 'Swamp Trench 1 Approach Key', 'Swamp Trench 1 Approach Swim Depart']),
+        create_dungeon_region(player, 'Swamp Trench 1 Nexus', 'Swamp Palace', None, ['Swamp Trench 1 Nexus Approach', 'Swamp Trench 1 Nexus N', 'Swamp Trench 1 Nexus Key']),
+        create_dungeon_region(player, 'Swamp Trench 1 Alcove', 'Swamp Palace', ['Swamp Palace - Trench 1 Pot Key'], ['Swamp Trench 1 Alcove S']),
+        create_dungeon_region(player, 'Swamp Trench 1 Key Ledge', 'Swamp Palace', None, ['Swamp Trench 1 Key Ledge Dry', 'Swamp Trench 1 Key Approach', 'Swamp Trench 1 Key Ledge Depart', 'Swamp Trench 1 Key Ledge NW']),
+        create_dungeon_region(player, 'Swamp Trench 1 Departure', 'Swamp Palace', None, ['Swamp Trench 1 Departure Dry', 'Swamp Trench 1 Departure Approach', 'Swamp Trench 1 Departure Key', 'Swamp Trench 1 Departure WS']),
+        create_dungeon_region(player, 'Swamp Hammer Switch', 'Swamp Palace', None, ['Swamp Hammer Switch SW', 'Swamp Hammer Switch WN']),
+        create_dungeon_region(player, 'Swamp Hub', 'Swamp Palace', ['Swamp Palace - Big Chest', 'Swamp Palace - Hookshot Pot Key'], ['Swamp Hub ES', 'Swamp Hub S', 'Swamp Hub WS', 'Swamp Hub WN', 'Swamp Hub Hook Path']),
+        create_dungeon_region(player, 'Swamp Hub Dead Ledge', 'Swamp Palace', None, ['Swamp Hub Dead Ledge EN']),
+        create_dungeon_region(player, 'Swamp Hub North Ledge', 'Swamp Palace', None, ['Swamp Hub North Ledge N', 'Swamp Hub North Ledge Drop Down']),
+        create_dungeon_region(player, 'Swamp Donut Top', 'Swamp Palace', None, ['Swamp Donut Top N', 'Swamp Donut Top SE']),
+        create_dungeon_region(player, 'Swamp Donut Bottom', 'Swamp Palace', None, ['Swamp Donut Bottom NE', 'Swamp Donut Bottom NW']),
+        create_dungeon_region(player, 'Swamp Compass Donut', 'Swamp Palace', ['Swamp Palace - Compass Chest'], ['Swamp Compass Donut SW', 'Swamp Compass Donut Push Block']),
+        create_dungeon_region(player, 'Swamp Crystal Switch', 'Swamp Palace', None, ['Swamp Crystal Switch EN', 'Swamp Crystal Switch SE']),
+        create_dungeon_region(player, 'Swamp Shortcut', 'Swamp Palace', None, ['Swamp Shortcut NE', 'Swamp Shortcut Blue Barrier']),
+        create_dungeon_region(player, 'Swamp Trench 2 Pots', 'Swamp Palace', None, ['Swamp Trench 2 Pots ES', 'Swamp Trench 2 Pots Blue Barrier', 'Swamp Trench 2 Pots Dry', 'Swamp Trench 2 Pots Wet']),
+        create_dungeon_region(player, 'Swamp Trench 2 Blocks', 'Swamp Palace', None, ['Swamp Trench 2 Blocks Pots', 'Swamp Trench 2 Blocks N']),
+        create_dungeon_region(player, 'Swamp Trench 2 Alcove', 'Swamp Palace', ['Swamp Palace - Trench 2 Pot Key'], ['Swamp Trench 2 Alcove S']),
+        create_dungeon_region(player, 'Swamp Trench 2 Departure', 'Swamp Palace', None, ['Swamp Trench 2 Departure Wet', 'Swamp Trench 2 Departure WS']),
+        create_dungeon_region(player, 'Swamp Big Key Ledge', 'Swamp Palace', ['Swamp Palace - Big Key Chest'], ['Swamp Big Key Ledge WN']),
+        create_dungeon_region(player, 'Swamp West Shallows', 'Swamp Palace', None, ['Swamp West Shallows ES', 'Swamp West Shallows Push Blocks']),
+        create_dungeon_region(player, 'Swamp West Block Path', 'Swamp Palace', None, ['Swamp West Block Path Up Stairs']),
+        create_dungeon_region(player, 'Swamp West Ledge', 'Swamp Palace', ['Swamp Palace - West Chest'], ['Swamp West Ledge Drop Down', 'Swamp West Ledge Hook Path']),
+        create_dungeon_region(player, 'Swamp Barrier Ledge', 'Swamp Palace', None, ['Swamp Barrier Ledge Drop Down', 'Swamp Barrier Ledge - Orange', 'Swamp Barrier Ledge Hook Path']),
+        create_dungeon_region(player, 'Swamp Barrier', 'Swamp Palace', None, ['Swamp Barrier EN', 'Swamp Barrier - Orange']),
+        create_dungeon_region(player, 'Swamp Attic', 'Swamp Palace', None, ['Swamp Attic Down Stairs', 'Swamp Attic Left Pit', 'Swamp Attic Right Pit']),
+        create_dungeon_region(player, 'Swamp Push Statue', 'Swamp Palace', None, ['Swamp Push Statue S', 'Swamp Push Statue NW', 'Swamp Push Statue NE', 'Swamp Push Statue Down Stairs']),
+        create_dungeon_region(player, 'Swamp Shooters', 'Swamp Palace', None, ['Swamp Shooters SW', 'Swamp Shooters EN']),
+        create_dungeon_region(player, 'Swamp Left Elbow', 'Swamp Palace', None, ['Swamp Left Elbow WN', 'Swamp Left Elbow Down Stairs']),
+        create_dungeon_region(player, 'Swamp Right Elbow', 'Swamp Palace', None, ['Swamp Right Elbow SE', 'Swamp Right Elbow Down Stairs']),
+        create_dungeon_region(player, 'Swamp Drain Left', 'Swamp Palace', None, ['Swamp Drain Left Up Stairs', 'Swamp Drain WN', 'Swamp Drain Left Switch']),
+        create_dungeon_region(player, 'Swamp Drain Right', 'Swamp Palace', None, ['Swamp Drain Right Switch', 'Swamp Drain Right Up Stairs']),
+        create_dungeon_region(player, 'Swamp Flooded Room', 'Swamp Palace', ['Swamp Palace - Flooded Room - Left', 'Swamp Palace - Flooded Room - Right'], ['Swamp Flooded Room Up Stairs', 'Swamp Flooded Room WS']),
+        create_dungeon_region(player, 'Swamp Basement Shallows', 'Swamp Palace', None, ['Swamp Basement Shallows NW', 'Swamp Basement Shallows EN', 'Swamp Basement Shallows ES']),
+        create_dungeon_region(player, 'Swamp Waterfall Room', 'Swamp Palace', ['Swamp Palace - Waterfall Room'], ['Swamp Waterfall Room SW', 'Swamp Waterfall Room NW', 'Swamp Waterfall Room NE']),
+        create_dungeon_region(player, 'Swamp Refill 1', 'Swamp Palace', None, ['Swamp Refill 1 SW']),
+        create_dungeon_region(player, 'Swamp Behind Waterfall', 'Swamp Palace', None, ['Swamp Behind Waterfall SE', 'Swamp Behind Waterfall Up Stairs']),
+        create_dungeon_region(player, 'Swamp C', 'Swamp Palace', None, ['Swamp C Down Stairs', 'Swamp C SE']),
+        create_dungeon_region(player, 'Swamp Waterway', 'Swamp Palace', ['Swamp Palace - Waterway Pot Key'], ['Swamp Waterway NE', 'Swamp Waterway N', 'Swamp Waterway NW']),
+        create_dungeon_region(player, 'Swamp I', 'Swamp Palace', None, ['Swamp I S']),
+        create_dungeon_region(player, 'Swamp T', 'Swamp Palace', None, ['Swamp T SW', 'Swamp T NW']),
+        create_dungeon_region(player, 'Swamp Boss', 'Swamp Palace', ['Swamp Palace - Boss', 'Swamp Palace - Prize'], ['Swamp Boss SW']),
+
         # sw
         # tt
         # ice
@@ -545,6 +584,11 @@ key_only_locations = {
   'Desert Palace - Desert Tiles 2 Pot Key': 'Small Key (Desert Palace)',
   'Castle Tower - Dark Archer Key Drop': 'Small Key (Agahnims Tower)',
   'Castle Tower - Circle of Pots Key Drop': 'Small Key (Agahnims Tower)',
+  'Swamp Palace - Pot Row Pot Key': 'Small Key (Swamp Palace)',
+  'Swamp Palace - Trench 1 Pot Key': 'Small Key (Swamp Palace)',
+  'Swamp Palace - Hookshot Pot Key': 'Small Key (Swamp Palace)',
+  'Swamp Palace - Trench 2 Pot Key': 'Small Key (Swamp Palace)',
+  'Swamp Palace - Waterway Pot Key': 'Small Key (Swamp Palace)'
 }
 
 # todo: escape big key? - should be separate from above for dungeon key layout validation