From 41a8da1b0570bc65fd2eae31fdd17939c6b994f5 Mon Sep 17 00:00:00 2001 From: aerinon Date: Tue, 19 Nov 2019 16:24:08 -0700 Subject: [PATCH] Desert Palace interior rooms I skipped --- DoorShuffle.py | 2 ++ Doors.py | 5 ++++- Dungeons.py | 6 +++--- Regions.py | 8 ++++---- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/DoorShuffle.py b/DoorShuffle.py index 132d57b9..7ac30e07 100644 --- a/DoorShuffle.py +++ b/DoorShuffle.py @@ -1693,10 +1693,12 @@ interior_doors = [ ('Desert East Wing Key Door EN', 'Desert Compass Key Door WN'), ('Desert North Hall NW', 'Desert Map SW'), ('Desert North Hall NE', 'Desert Map SE'), + ('Desert Arrow Pot Corner NW', 'Desert Trap Room SW'), ('Desert Sandworm Corner NE', 'Desert Bonk Torch SE'), ('Desert Sandworm Corner WS', 'Desert Circle of Pots ES'), ('Desert Circle of Pots NW', 'Desert Big Chest SW'), ('Desert West Wing WS', 'Desert West Lobby ES',), + ('Desert Fairy Fountain SW', 'Desert West Lobby NW'), ('Desert Back Lobby NW', 'Desert Tiles 1 SW'), ('Desert Bridge SW', 'Desert Four Statues NW'), ('Desert Four Statues ES', 'Desert Beamos Hall WS',), diff --git a/Doors.py b/Doors.py index 21e276e6..637a8ced 100644 --- a/Doors.py +++ b/Doors.py @@ -193,6 +193,8 @@ def create_doors(world, player): create_door(player, 'Desert Cannonball S', Nrml).dir(So, 0x75, Right, High).pos(1), create_door(player, 'Desert Arrow Pot Corner S Edge', Open).dir(So, 0x75, None, High), create_door(player, 'Desert Arrow Pot Corner W Edge', Open).dir(We, 0x75, None, High), + create_door(player, 'Desert Arrow Pot Corner NW', Intr).dir(No, 0x75, Left, High).pos(0), + create_door(player, 'Desert Trap Room SW', Intr).dir(So, 0x75, Left, High).pos(0), create_door(player, 'Desert North Hall SE Edge', Open).dir(So, 0x74, None, High), create_door(player, 'Desert North Hall SW Edge', Open).dir(So, 0x74, None, High), create_door(player, 'Desert North Hall W Edge', Open).dir(We, 0x74, None, High), @@ -206,13 +208,14 @@ def create_doors(world, player): create_door(player, 'Desert Sandworm Corner NE', Intr).dir(No, 0x73, Right, High).pos(2), create_door(player, 'Desert Bonk Torch SE', Intr).dir(So, 0x73, Right, High).pos(2), create_door(player, 'Desert Sandworm Corner WS', Intr).dir(We, 0x73, Bot, High).pos(1), - # I don't know if I have to mark trap on interior doors yet - haven't mucked them up much create_door(player, 'Desert Circle of Pots ES', Intr).dir(Ea, 0x73, Bot, High).pos(1), create_door(player, 'Desert Circle of Pots NW', Intr).dir(No, 0x73, Left, High).pos(0), create_door(player, 'Desert Big Chest SW', Intr).dir(So, 0x73, Left, High).pos(0), create_door(player, 'Desert West Wing N Edge', Open).dir(No, 0x83, None, High), create_door(player, 'Desert West Wing WS', Intr).dir(We, 0x83, Bot, High).pos(2), create_door(player, 'Desert West Lobby ES', Intr).dir(Ea, 0x83, Bot, High).pos(2), + create_door(player, 'Desert West Lobby NW', Intr).dir(No, 0x83, Left, High).pos(0), + create_door(player, 'Desert Fairy Fountain SW', Intr).dir(So, 0x83, Left, High).pos(0), # Desert Back create_door(player, 'Desert Back Lobby NW', Intr).dir(No, 0x63, Left, High).pos(1), create_door(player, 'Desert Tiles 1 SW', Intr).dir(So, 0x63, Left, High).pos(1), diff --git a/Dungeons.py b/Dungeons.py index 83a1ec54..0a4478e3 100644 --- a/Dungeons.py +++ b/Dungeons.py @@ -187,9 +187,9 @@ eastern_regions = [ desert_regions = [ 'Desert Main Lobby', 'Desert Dead End', 'Desert East Lobby', 'Desert East Wing', 'Desert Compass Room', - 'Desert Cannonball', 'Desert Arrow Pot Corner', 'Desert North Hall', 'Desert Map Room', 'Desert Sandworm Corner', - 'Desert Bonk Torch', 'Desert Circle of Pots', 'Desert Big Chest Room', 'Desert West Wing', - 'Desert West Lobby', 'Desert Back Lobby', 'Desert Tiles 1', + 'Desert Cannonball', 'Desert Arrow Pot Corner', 'Desert Trap Room', 'Desert North Hall', 'Desert Map Room', + 'Desert Sandworm Corner', 'Desert Bonk Torch', 'Desert Circle of Pots', 'Desert Big Chest Room', 'Desert West Wing', + 'Desert West Lobby', 'Desert Fairy Fountain', 'Desert Back Lobby', 'Desert Tiles 1', 'Desert Bridge', 'Desert Four Statues', 'Desert Beamos Hall', 'Desert Tiles 2', 'Desert Wall Slide', 'Desert Boss', ] diff --git a/Regions.py b/Regions.py index 42d80525..b73d717a 100644 --- a/Regions.py +++ b/Regions.py @@ -275,8 +275,8 @@ def create_regions(world, player): create_dungeon_region(player, 'Desert East Wing', 'Desert Palace', None, ['Desert East Wing ES', 'Desert East Wing Key Door EN', 'Desert East Wing W Edge', 'Desert East Wing N Edge']), create_dungeon_region(player, 'Desert Compass Room', 'Desert Palace', ['Desert Palace - Compass Chest'], ['Desert Compass Key Door WN', 'Desert Compass NW']), create_dungeon_region(player, 'Desert Cannonball', 'Desert Palace', ['Desert Palace - Big Key Chest'], ['Desert Cannonball S']), - create_dungeon_region(player, 'Desert Arrow Pot Corner', 'Desert Palace', None, ['Desert Arrow Pot Corner S Edge', 'Desert Arrow Pot Corner W Edge']), - # skip the trap room for now + create_dungeon_region(player, 'Desert Arrow Pot Corner', 'Desert Palace', None, ['Desert Arrow Pot Corner S Edge', 'Desert Arrow Pot Corner W Edge', 'Desert Arrow Pot Corner NW']), + create_dungeon_region(player, 'Desert Trap Room', 'Desert Palace', None, ['Desert Trap Room SW']), create_dungeon_region(player, 'Desert North Hall', 'Desert Palace', None, ['Desert North Hall SE Edge', 'Desert North Hall SW Edge', 'Desert North Hall W Edge', 'Desert North Hall E Edge', 'Desert North Hall NW', 'Desert North Hall NE']), create_dungeon_region(player, 'Desert Map Room', 'Desert Palace', ['Desert Palace - Map Chest'], ['Desert Map SW', 'Desert Map SE']), create_dungeon_region(player, 'Desert Sandworm Corner', 'Desert Palace', None, ['Desert Sandworm Corner S Edge', 'Desert Sandworm Corner E Edge', 'Desert Sandworm Corner NE', 'Desert Sandworm Corner WS']), @@ -284,8 +284,8 @@ def create_regions(world, player): create_dungeon_region(player, 'Desert Circle of Pots', 'Desert Palace', None, ['Desert Circle of Pots ES', 'Desert Circle of Pots NW']), create_dungeon_region(player, 'Desert Big Chest Room', 'Desert Palace', ['Desert Palace - Big Chest'], ['Desert Big Chest SW']), create_dungeon_region(player, 'Desert West Wing', 'Desert Palace', None, ['Desert West Wing N Edge', 'Desert West Wing WS']), - create_dungeon_region(player, 'Desert West Lobby', 'Desert Palace', None, ['Desert West Lobby ES', 'Desert Palace Exit (West)']), - # skipping the fairy room for now + create_dungeon_region(player, 'Desert West Lobby', 'Desert Palace', None, ['Desert West Lobby ES', 'Desert Palace Exit (West)', 'Desert West Lobby NW']), + create_dungeon_region(player, 'Desert Fairy Fountain', 'Desert Palace', None, ['Desert Fairy Fountain SW']), create_dungeon_region(player, 'Desert Back Lobby', 'Desert Palace', None, ['Desert Palace Exit (North)', 'Desert Back Lobby NW']), create_dungeon_region(player, 'Desert Tiles 1', 'Desert Palace', ['Desert Palace - Desert Tiles 1 Pot Key'], ['Desert Tiles 1 SW', 'Desert Tiles 1 Up Stairs']), create_dungeon_region(player, 'Desert Bridge', 'Desert Palace', None, ['Desert Bridge Down Stairs', 'Desert Bridge SW']),