From 2ad03af1da109e73a2d830f2814f289cd5caf896 Mon Sep 17 00:00:00 2001 From: aerinon Date: Thu, 14 Nov 2019 06:39:27 -0700 Subject: [PATCH] Removed Pot Circle from drops (it has unique regions) Fixed a door in mire Adjusted stair camera in Swamp --- DoorShuffle.py | 2 +- Doors.py | 6 +++--- Dungeons.py | 2 +- Regions.py | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/DoorShuffle.py b/DoorShuffle.py index 92361a71..5f967022 100644 --- a/DoorShuffle.py +++ b/DoorShuffle.py @@ -1797,7 +1797,7 @@ default_door_connections = [ ('Mire Minibridge NE', 'Mire Right Bridge SE'), ('Mire BK Door Room EN', 'Mire Ledgehop WN'), ('Mire BK Door Room N', 'Mire Left Bridge S'), - ('Mire Spikes SW', 'Mire Crystal Dead End NE'), + ('Mire Spikes SW', 'Mire Crystal Dead End NW'), ('Mire Ledgehop NW', 'Mire Bent Bridge SW'), ('Mire Bent Bridge W', 'Mire Over Bridge E'), ('Mire Over Bridge W', 'Mire Fishbone E'), diff --git a/Doors.py b/Doors.py index cf057175..8307d8a1 100644 --- a/Doors.py +++ b/Doors.py @@ -431,7 +431,7 @@ def create_doors(world, player): create_door(player, 'Swamp Big Key Ledge WN', Nrml).dir(We, 0x35, Top, High).pos(1), create_door(player, 'Swamp West Shallows ES', Nrml).dir(Ea, 0x34, Bot, High).pos(1), create_door(player, 'Swamp West Shallows Push Blocks', Lgcl), - create_door(player, 'Swamp West Block Path Up Stairs', Sprl).dir(Up, 0x34, 0, HTH).ss(Z, 0x1b, 0x6c, False, True), + create_door(player, 'Swamp West Block Path Up Stairs', Sprl).dir(Up, 0x34, 0, HTH).ss(Z, 0x1b, 0x6c), create_door(player, 'Swamp West Block Path Drop Down', Lgcl), create_door(player, 'Swamp West Ledge Drop Down', Lgcl), create_door(player, 'Swamp West Ledge Hook Path', Lgcl), @@ -440,7 +440,7 @@ def create_doors(world, player): create_door(player, 'Swamp Barrier EN', Nrml).dir(Ea, 0x34, Top, High).pos(0), create_door(player, 'Swamp Barrier - Orange', Lgcl), create_door(player, 'Swamp Barrier Ledge Hook Path', Lgcl), - create_door(player, 'Swamp Attic Down Stairs', Sprl).dir(Dn, 0x54, 0, HTH).ss(Z, 0x12, 0x80, False, True), + create_door(player, 'Swamp Attic Down Stairs', Sprl).dir(Dn, 0x54, 0, HTH).ss(Z, 0x12, 0x80), create_door(player, 'Swamp Attic Left Pit', Hole), create_door(player, 'Swamp Attic Right Pit', Hole), create_door(player, 'Swamp Push Statue S', Nrml).dir(So, 0x26, Mid, High).small_key().pos(0), @@ -721,7 +721,7 @@ def create_doors(world, player): create_door(player, 'Mire Falling Bridge WN', Intr).dir(We, 0xc3, Top, High).pos(1), create_door(player, 'Mire Map Spike Side EN', Intr).dir(Ea, 0xc3, Top, High).no_exit().pos(1), create_door(player, 'Mire Map Spot WN', Nrml).dir(We, 0xc3, Top, High).small_key().pos(0), - create_door(player, 'Mire Crystal Dead End NE', Nrml).dir(No, 0xc3, Right, High).pos(4), + create_door(player, 'Mire Crystal Dead End NW', Nrml).dir(No, 0xc3, Left, High).pos(4), create_door(player, 'Mire Map Spike Side Drop Down', Lgcl), create_door(player, 'Mire Map Spike Side Blue Barrier', Lgcl), create_door(player, 'Mire Map Spot Blue Barrier', Lgcl), diff --git a/Dungeons.py b/Dungeons.py index 69aadc88..32bd0da2 100644 --- a/Dungeons.py +++ b/Dungeons.py @@ -327,7 +327,7 @@ flexible_starts = { } drop_entrances = [ - 'Sewers Rat Path', 'Skull Pot Circle', 'Skull Pinball', 'Skull Left Drop', 'Skull Back Drop' + 'Sewers Rat Path', 'Skull Pinball', 'Skull Left Drop', 'Skull Back Drop' # Pot circle is unique ] dungeon_keys = { diff --git a/Regions.py b/Regions.py index 12f0a8f5..71af339a 100644 --- a/Regions.py +++ b/Regions.py @@ -557,7 +557,7 @@ def create_regions(world, player): create_dungeon_region(player, 'Mire Falling Bridge', 'Misery Mire', ['Misery Mire - Big Chest'], ['Mire Falling Bridge WS', 'Mire Falling Bridge W', 'Mire Falling Bridge WN']), create_dungeon_region(player, 'Mire Map Spike Side', 'Misery Mire', None, ['Mire Map Spike Side EN', 'Mire Map Spike Side Drop Down', 'Mire Map Spike Side Blue Barrier']), create_dungeon_region(player, 'Mire Map Spot', 'Misery Mire', ['Misery Mire - Map Chest'], ['Mire Map Spot WN', 'Mire Map Spot Blue Barrier']), - create_dungeon_region(player, 'Mire Crystal Dead End', 'Misery Mire', None, ['Mire Crystal Dead End Left Barrier', 'Mire Crystal Dead End Right Barrier', 'Mire Crystal Dead End NE']), + create_dungeon_region(player, 'Mire Crystal Dead End', 'Misery Mire', None, ['Mire Crystal Dead End Left Barrier', 'Mire Crystal Dead End Right Barrier', 'Mire Crystal Dead End NW']), create_dungeon_region(player, 'Mire Hidden Shooters', 'Misery Mire', None, ['Mire Hidden Shooters SE', 'Mire Hidden Shooters WS', 'Mire Hidden Shooters ES', 'Mire Hidden Shooters NE']), create_dungeon_region(player, 'Mire Cross', 'Misery Mire', None, ['Mire Cross ES', 'Mire Cross SW']), create_dungeon_region(player, 'Mire Minibridge', 'Misery Mire', None, ['Mire Minibridge SE', 'Mire Minibridge NE']),