Add inverted door shuffle
This commit is contained in:
compiling
@@ -1746,8 +1746,8 @@ def link_inverted_entrances(world, player):
|
||||
else:
|
||||
raise NotImplementedError('Shuffling not supported yet')
|
||||
|
||||
# patch swamp drain
|
||||
if world.get_entrance('Dam', player).connected_region.name != 'Dam' or world.get_entrance('Swamp Palace', player).connected_region.name != 'Swamp Palace (Entrance)':
|
||||
# check for swamp palace fix
|
||||
if world.get_entrance('Dam', player).connected_region.name != 'Dam' or world.get_entrance('Swamp Palace', player).connected_region.name != 'Swamp Lobby':
|
||||
world.swamp_patch_required[player] = True
|
||||
|
||||
# check for potion shop location
|
||||
@@ -1759,7 +1759,7 @@ def link_inverted_entrances(world, player):
|
||||
world.ganon_at_pyramid[player] = False
|
||||
|
||||
# check for Ganon's Tower location
|
||||
if world.get_entrance('Inverted Ganons Tower', player).connected_region.name != 'Ganons Tower (Entrance)':
|
||||
if world.get_entrance('Inverted Ganons Tower', player).connected_region.name != 'GT Lobby':
|
||||
world.ganonstower_vanilla[player] = False
|
||||
|
||||
def connect_simple(world, exitname, regionname, player):
|
||||
@@ -2935,11 +2935,7 @@ inverted_mandatory_connections = [('Lake Hylia Central Island Pier', 'Lake Hylia
|
||||
('Desert Palace Stairs Drop', 'Light World'),
|
||||
('Desert Palace Entrance (North) Rocks', 'Desert Palace Entrance (North) Spot'),
|
||||
('Desert Ledge Return Rocks', 'Desert Ledge'),
|
||||
('Throne Room', 'Sewers (Dark)'), ('Sewers Door', 'Sewers'),
|
||||
('Sanctuary Push Door', 'Sanctuary'),
|
||||
('Sewer Drop', 'Sewers'),
|
||||
('Sewers Back Door', 'Sewers (Dark)'),
|
||||
('Agahnim 1', 'Agahnim 1'),
|
||||
('Sewer Drop', 'Sewers Rat Path'),
|
||||
('Death Mountain Entrance Rock', 'Death Mountain Entrance'),
|
||||
('Death Mountain Entrance Drop', 'Light World'),
|
||||
('Spectacle Rock Cave Drop', 'Spectacle Rock Cave (Bottom)'),
|
||||
@@ -2991,37 +2987,6 @@ inverted_mandatory_connections = [('Lake Hylia Central Island Pier', 'Lake Hylia
|
||||
('Fairy Ascension Cave Pots', 'Fairy Ascension Cave (Bottom)'),
|
||||
('Fairy Ascension Cave Drop', 'Fairy Ascension Cave (Drop)'),
|
||||
('Dark Death Mountain Drop (East)', 'Dark Death Mountain (East Bottom)'),
|
||||
('Swamp Palace Moat', 'Swamp Palace (First Room)'),
|
||||
('Swamp Palace Small Key Door', 'Swamp Palace (Starting Area)'),
|
||||
('Swamp Palace (Center)', 'Swamp Palace (Center)'),
|
||||
('Swamp Palace (North)', 'Swamp Palace (North)'),
|
||||
('Skull Woods Torch Room', 'Skull Woods Final Section (Mothula)'),
|
||||
('Skull Woods First Section South Door', 'Skull Woods First Section (Right)'),
|
||||
('Skull Woods First Section West Door', 'Skull Woods First Section (Left)'),
|
||||
('Skull Woods First Section (Right) North Door', 'Skull Woods First Section'),
|
||||
('Skull Woods First Section (Left) Door to Right', 'Skull Woods First Section (Right)'),
|
||||
('Skull Woods First Section (Left) Door to Exit', 'Skull Woods First Section'),
|
||||
('Skull Woods First Section (Top) One-Way Path', 'Skull Woods First Section'),
|
||||
('Skull Woods Second Section (Drop)', 'Skull Woods Second Section'),
|
||||
('Blind Fight', 'Blind Fight'),
|
||||
('Misery Mire Entrance Gap', 'Misery Mire (Main)'),
|
||||
('Misery Mire (West)', 'Misery Mire (West)'),
|
||||
('Misery Mire Big Key Door', 'Misery Mire (Final Area)'),
|
||||
('Misery Mire (Vitreous)', 'Misery Mire (Vitreous)'),
|
||||
('Turtle Rock Entrance Gap', 'Turtle Rock (First Section)'),
|
||||
('Turtle Rock Entrance Gap Reverse', 'Turtle Rock (Entrance)'),
|
||||
('Turtle Rock Pokey Room', 'Turtle Rock (Chain Chomp Room)'),
|
||||
('Turtle Rock (Chain Chomp Room) (North)', 'Turtle Rock (Second Section)'),
|
||||
('Turtle Rock (Chain Chomp Room) (South)', 'Turtle Rock (First Section)'),
|
||||
('Turtle Rock Chain Chomp Staircase', 'Turtle Rock (Chain Chomp Room)'),
|
||||
('Turtle Rock (Big Chest) (North)', 'Turtle Rock (Second Section)'),
|
||||
('Turtle Rock Big Key Door', 'Turtle Rock (Crystaroller Room)'),
|
||||
('Turtle Rock Big Key Door Reverse', 'Turtle Rock (Second Section)'),
|
||||
('Turtle Rock Dark Room Staircase', 'Turtle Rock (Dark Room)'),
|
||||
('Turtle Rock (Dark Room) (North)', 'Turtle Rock (Crystaroller Room)'),
|
||||
('Turtle Rock (Dark Room) (South)', 'Turtle Rock (Eye Bridge)'),
|
||||
('Turtle Rock Dark Room (South)', 'Turtle Rock (Dark Room)'),
|
||||
('Turtle Rock (Trinexx)', 'Turtle Rock (Trinexx)'),
|
||||
('Ganon Drop', 'Bottom of Pyramid'),
|
||||
('Pyramid Drop', 'East Dark World'),
|
||||
('Post Aga Teleporter', 'Light World'),
|
||||
@@ -3461,58 +3426,59 @@ default_dungeon_connections = [('Desert Palace Entrance (South)', 'Desert Main L
|
||||
('Ganons Tower Exit', 'Dark Death Mountain (Top)')
|
||||
]
|
||||
|
||||
inverted_default_dungeon_connections = [('Desert Palace Entrance (South)', 'Desert Palace Main (Inner)'),
|
||||
('Desert Palace Entrance (West)', 'Desert Palace Main (Outer)'),
|
||||
('Desert Palace Entrance (North)', 'Desert Palace North'),
|
||||
('Desert Palace Entrance (East)', 'Desert Palace Main (Outer)'),
|
||||
('Desert Palace Exit (South)', 'Desert Palace Stairs'),
|
||||
('Desert Palace Exit (West)', 'Desert Ledge'),
|
||||
('Desert Palace Exit (East)', 'Desert Palace Lone Stairs'),
|
||||
('Desert Palace Exit (North)', 'Desert Palace Entrance (North) Spot'),
|
||||
('Eastern Palace', 'Eastern Palace'),
|
||||
('Eastern Palace Exit', 'Light World'),
|
||||
('Tower of Hera', 'Tower of Hera (Bottom)'),
|
||||
('Tower of Hera Exit', 'Death Mountain (Top)'),
|
||||
('Hyrule Castle Entrance (South)', 'Hyrule Castle'),
|
||||
('Hyrule Castle Entrance (West)', 'Hyrule Castle'),
|
||||
('Hyrule Castle Entrance (East)', 'Hyrule Castle'),
|
||||
('Hyrule Castle Exit (South)', 'Light World'),
|
||||
('Hyrule Castle Exit (West)', 'Hyrule Castle Ledge'),
|
||||
('Hyrule Castle Exit (East)', 'Hyrule Castle Ledge'),
|
||||
('Thieves Town', 'Thieves Lobby'),
|
||||
('Thieves Town Exit', 'West Dark World'),
|
||||
('Skull Woods First Section Hole (East)', 'Skull Woods First Section (Right)'),
|
||||
('Skull Woods First Section Hole (West)', 'Skull Woods First Section (Left)'),
|
||||
('Skull Woods First Section Hole (North)', 'Skull Woods First Section (Top)'),
|
||||
('Skull Woods First Section Door', 'Skull Woods First Section'),
|
||||
('Skull Woods First Section Exit', 'Skull Woods Forest'),
|
||||
('Skull Woods Second Section Hole', 'Skull Woods Second Section (Drop)'),
|
||||
('Skull Woods Second Section Door (East)', 'Skull Woods Second Section'),
|
||||
('Skull Woods Second Section Door (West)', 'Skull Woods Second Section'),
|
||||
('Skull Woods Second Section Exit (East)', 'Skull Woods Forest'),
|
||||
('Skull Woods Second Section Exit (West)', 'Skull Woods Forest (West)'),
|
||||
('Skull Woods Final Section', 'Skull Woods Final Section (Entrance)'),
|
||||
('Skull Woods Final Section Exit', 'Skull Woods Forest (West)'),
|
||||
('Ice Palace', 'Ice Lobby'),
|
||||
('Misery Mire', 'Misery Mire (Entrance)'),
|
||||
('Misery Mire Exit', 'Dark Desert'),
|
||||
('Palace of Darkness', 'PoD Lobby'),
|
||||
('Palace of Darkness Exit', 'East Dark World'),
|
||||
('Swamp Palace', 'Swamp Palace (Entrance)'),
|
||||
('Swamp Palace Exit', 'South Dark World'),
|
||||
('Turtle Rock', 'Turtle Rock (Entrance)'),
|
||||
('Turtle Rock Ledge Exit (West)', 'Dark Death Mountain Ledge'),
|
||||
('Turtle Rock Ledge Exit (East)', 'Dark Death Mountain Ledge'),
|
||||
('Dark Death Mountain Ledge (West)', 'Turtle Rock (Second Section)'),
|
||||
('Dark Death Mountain Ledge (East)', 'Turtle Rock (Big Chest)'),
|
||||
('Turtle Rock Isolated Ledge Exit', 'Dark Death Mountain Isolated Ledge'),
|
||||
('Turtle Rock Isolated Ledge Entrance', 'Turtle Rock (Eye Bridge)'),
|
||||
('Inverted Ganons Tower', 'Inverted Ganons Tower (Entrance)'),
|
||||
('Inverted Ganons Tower Exit', 'Hyrule Castle Ledge'),
|
||||
('Inverted Agahnims Tower', 'Inverted Agahnims Tower'),
|
||||
('Inverted Agahnims Tower Exit', 'Dark Death Mountain'),
|
||||
('Turtle Rock Exit (Front)', 'Dark Death Mountain'),
|
||||
('Ice Palace Exit', 'Dark Lake Hylia')]
|
||||
inverted_default_dungeon_connections = [('Desert Palace Entrance (South)', 'Desert Main Lobby'),
|
||||
('Desert Palace Entrance (West)', 'Desert West Lobby'),
|
||||
('Desert Palace Entrance (North)', 'Desert Back Lobby'),
|
||||
('Desert Palace Entrance (East)', 'Desert East Lobby'),
|
||||
('Desert Palace Exit (South)', 'Desert Palace Stairs'),
|
||||
('Desert Palace Exit (West)', 'Desert Ledge'),
|
||||
('Desert Palace Exit (East)', 'Desert Palace Lone Stairs'),
|
||||
('Desert Palace Exit (North)', 'Desert Palace Entrance (North) Spot'),
|
||||
('Eastern Palace', 'Eastern Lobby'),
|
||||
('Eastern Palace Exit', 'Light World'),
|
||||
('Tower of Hera', 'Hera Lobby'),
|
||||
('Tower of Hera Exit', 'Death Mountain (Top)'),
|
||||
('Hyrule Castle Entrance (South)', 'Hyrule Castle Lobby'),
|
||||
('Hyrule Castle Entrance (West)', 'Hyrule Castle West Lobby'),
|
||||
('Hyrule Castle Entrance (East)', 'Hyrule Castle East Lobby'),
|
||||
('Hyrule Castle Exit (South)', 'Light World'),
|
||||
('Hyrule Castle Exit (West)', 'Hyrule Castle Ledge'),
|
||||
('Hyrule Castle Exit (East)', 'Hyrule Castle Ledge'),
|
||||
('Thieves Town', 'Thieves Lobby'),
|
||||
('Thieves Town Exit', 'West Dark World'),
|
||||
('Skull Woods First Section Hole (East)', 'Skull Pinball'),
|
||||
('Skull Woods First Section Hole (West)', 'Skull Left Drop'),
|
||||
('Skull Woods First Section Hole (North)', 'Skull Pot Circle'),
|
||||
('Skull Woods First Section Door', 'Skull 1 Lobby'),
|
||||
('Skull Woods First Section Exit', 'Skull Woods Forest'),
|
||||
('Skull Woods Second Section Hole', 'Skull Back Drop'),
|
||||
('Skull Woods Second Section Door (East)', 'Skull 2 East Lobby'),
|
||||
('Skull Woods Second Section Door (West)', 'Skull 2 West Lobby'),
|
||||
('Skull Woods Second Section Exit (East)', 'Skull Woods Forest'),
|
||||
('Skull Woods Second Section Exit (West)', 'Skull Woods Forest (West)'),
|
||||
('Skull Woods Final Section', 'Skull 3 Lobby'),
|
||||
('Skull Woods Final Section Exit', 'Skull Woods Forest (West)'),
|
||||
('Ice Palace', 'Ice Lobby'),
|
||||
('Misery Mire', 'Mire Lobby'),
|
||||
('Misery Mire Exit', 'Dark Desert'),
|
||||
('Palace of Darkness', 'PoD Lobby'),
|
||||
('Palace of Darkness Exit', 'East Dark World'),
|
||||
('Swamp Palace', 'Swamp Lobby'), # requires additional patch for flooding moat if moved
|
||||
('Swamp Palace Exit', 'South Dark World'),
|
||||
('Turtle Rock', 'TR Main Lobby'),
|
||||
('Turtle Rock Ledge Exit (West)', 'Dark Death Mountain Ledge'),
|
||||
('Turtle Rock Ledge Exit (East)', 'Dark Death Mountain Ledge'),
|
||||
('Dark Death Mountain Ledge (West)', 'TR Lazy Eyes'),
|
||||
('Dark Death Mountain Ledge (East)', 'TR Big Chest Entrance'),
|
||||
('Turtle Rock Isolated Ledge Exit', 'Dark Death Mountain Isolated Ledge'),
|
||||
('Turtle Rock Isolated Ledge Entrance', 'TR Eye Bridge'),
|
||||
('Inverted Ganons Tower', 'GT Lobby'),
|
||||
('Inverted Ganons Tower Exit', 'Hyrule Castle Ledge'),
|
||||
('Inverted Agahnims Tower', 'Tower Lobby'),
|
||||
('Inverted Agahnims Tower Exit', 'Dark Death Mountain'),
|
||||
('Turtle Rock Exit (Front)', 'Dark Death Mountain'),
|
||||
('Ice Palace Exit', 'Dark Lake Hylia')
|
||||
]
|
||||
|
||||
# format:
|
||||
# Key=Name
|
||||
|
||||
Reference in New Issue
Block a user