monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Typo in Agahnim's Name.

This commit is contained in:
LLCoolDave 2017-05-21 16:32:34 +02:00
parent 3cab83f074
commit 0a23b5c1de
6 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BaseClasses.py
View File

@ -23,7 +23,7 @@ class World(object):
self._item_cache = {} self._item_cache = {}
self.spoiler = '' self.spoiler = ''
self.place_dungeon_items = True # configurable in future self.place_dungeon_items = True # configurable in future
self.aghanim_fix_required = False self.agahnim_fix_required = False
self.swamp_patch_required = False self.swamp_patch_required = False
def get_region(self, regionname): def get_region(self, regionname):

4
Dungeons.py
View File

@ -8,7 +8,7 @@ def fill_dungeons(world):
EP = (['Eastern Palace'], EPBigKey(), [], [EPMap(), EPCompass()]) EP = (['Eastern Palace'], EPBigKey(), [], [EPMap(), EPCompass()])
DP = (['Desert Palace Main', 'Desert Palace East', 'Desert Palace North'], DPBigKey(), [DPSmallKey()], [DPCompass(), DPMap()]) DP = (['Desert Palace Main', 'Desert Palace East', 'Desert Palace North'], DPBigKey(), [DPSmallKey()], [DPCompass(), DPMap()])
ToH = (['Tower of Hera (Bottom)', 'Tower of Hera (Basement)', 'Tower of Hera (Top)'], THBigKey(), [THSmallKey()], [THCompass(), THMap()]) ToH = (['Tower of Hera (Bottom)', 'Tower of Hera (Basement)', 'Tower of Hera (Top)'], THBigKey(), [THSmallKey()], [THCompass(), THMap()])
AT = (['Aghanims Tower', 'Aghanim 1'], None, [ATSmallKey(), ATSmallKey()], []) AT = (['Agahnims Tower', 'Agahnim 1'], None, [ATSmallKey(), ATSmallKey()], [])
PoD = (['Dark Palace (Entrance)', 'Dark Palace (Center)', 'Dark Palace (Big Key Chest)', 'Dark Palace (Bonk Section)', 'Dark Palace (North)', 'Dark Palace (Maze)', 'Dark Palace (Spike Statue Room)', 'Dark Palace (Final Section)'], PDBigKey(), [PDSmallKey(), PDSmallKey(), PDSmallKey(), PDSmallKey(), PDSmallKey(), PDSmallKey()], [PDCompass(), PDMap()]) PoD = (['Dark Palace (Entrance)', 'Dark Palace (Center)', 'Dark Palace (Big Key Chest)', 'Dark Palace (Bonk Section)', 'Dark Palace (North)', 'Dark Palace (Maze)', 'Dark Palace (Spike Statue Room)', 'Dark Palace (Final Section)'], PDBigKey(), [PDSmallKey(), PDSmallKey(), PDSmallKey(), PDSmallKey(), PDSmallKey(), PDSmallKey()], [PDCompass(), PDMap()])
TT = (['Thieves Town (Entrance)', 'Thieves Town (Deep)', 'Blind Fight'], TTBigKey(), [TTSmallKey()], [TTCompass(), TTMap()]) TT = (['Thieves Town (Entrance)', 'Thieves Town (Deep)', 'Blind Fight'], TTBigKey(), [TTSmallKey()], [TTCompass(), TTMap()])
SW = (['Skull Woods First Section', 'Skull Woods Second Section', 'Skull Woods Final Section (Entrance)', 'Skull Woods Final Section (Mothula)'], SWBigKey(), [SWSmallKey(), SWSmallKey()], [SWCompass(), SWMap()]) SW = (['Skull Woods First Section', 'Skull Woods Second Section', 'Skull Woods Final Section (Entrance)', 'Skull Woods Final Section (Mothula)'], SWBigKey(), [SWSmallKey(), SWSmallKey()], [SWCompass(), SWMap()])
@ -16,7 +16,7 @@ def fill_dungeons(world):
IP = (['Ice Palace (Entrance)', 'Ice Palace (Main)', 'Ice Palace (East)', 'Ice Palace (East Top)', 'Ice Palace (Kholdstare)'], IPBigKey(), [IPSmallKey(), IPSmallKey()], [IPMap(), IPCompass()]) IP = (['Ice Palace (Entrance)', 'Ice Palace (Main)', 'Ice Palace (East)', 'Ice Palace (East Top)', 'Ice Palace (Kholdstare)'], IPBigKey(), [IPSmallKey(), IPSmallKey()], [IPMap(), IPCompass()])
MM = (['Misery Mire (Entrance)', 'Misery Mire (Main)', 'Misery Mire (West)', 'Misery Mire (Final Area)', 'Misery Mire (Vitreous)'], MMBigKey(), [MMSmallKey(), MMSmallKey(), MMSmallKey()], [MMCompass(), MMMap()]) MM = (['Misery Mire (Entrance)', 'Misery Mire (Main)', 'Misery Mire (West)', 'Misery Mire (Final Area)', 'Misery Mire (Vitreous)'], MMBigKey(), [MMSmallKey(), MMSmallKey(), MMSmallKey()], [MMCompass(), MMMap()])
TR = (['Turtle Rock (Entrance)', 'Turtle Rock (First Section)', 'Turtle Rock (Chain Chomp Room)', 'Turtle Rock (Second Section)', 'Turtle Rock (Big Chest)', 'Turtle Rock (Roller Switch Room)', 'Turtle Rock (Dark Room)', 'Turtle Rock (Eye Bridge)', 'Turtle Rock (Trinexx)'], TRBigKey(), [TRSmallKey(), TRSmallKey(), TRSmallKey(), TRSmallKey()], [TRMap(), TRCompass()]) TR = (['Turtle Rock (Entrance)', 'Turtle Rock (First Section)', 'Turtle Rock (Chain Chomp Room)', 'Turtle Rock (Second Section)', 'Turtle Rock (Big Chest)', 'Turtle Rock (Roller Switch Room)', 'Turtle Rock (Dark Room)', 'Turtle Rock (Eye Bridge)', 'Turtle Rock (Trinexx)'], TRBigKey(), [TRSmallKey(), TRSmallKey(), TRSmallKey(), TRSmallKey()], [TRMap(), TRCompass()])
GT = (['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)', 'Aghanim 2'], GTBigKey(), [GTSmallKey(), GTSmallKey(), GTSmallKey(), GTSmallKey()], [GTMap(), GTCompass()]) GT = (['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'], GTBigKey(), [GTSmallKey(), GTSmallKey(), GTSmallKey(), GTSmallKey()], [GTMap(), GTCompass()])
freebes = ['[dungeon-A2-1F] Ganons Tower - Map Room', '[dungeon-D1-1F] Dark Palace - Spike Statue Room', '[dungeon-D1-1F] Dark Palace - Big Key Room'] freebes = ['[dungeon-A2-1F] Ganons Tower - Map Room', '[dungeon-D1-1F] Dark Palace - Spike Statue Room', '[dungeon-D1-1F] Dark Palace - Big Key Room']

42
EntranceShuffle.py
View File

@ -47,7 +47,7 @@ def link_entrances(world):
else: else:
ret.append(connect_mandatory_exits(world, lw_entrances, dungeon_exits, list(LW_Dungeon_Entrances_Must_Exit))) ret.append(connect_mandatory_exits(world, lw_entrances, dungeon_exits, list(LW_Dungeon_Entrances_Must_Exit)))
ret.append(connect_mandatory_exits(world, dw_entrances, dungeon_exits, list(DW_Dungeon_Entrances_Must_Exit))) ret.append(connect_mandatory_exits(world, dw_entrances, dungeon_exits, list(DW_Dungeon_Entrances_Must_Exit)))
ret.append(connect_caves(world, lw_entrances, [], list(LW_Dungeon_Exits))) # Aghanim must be light world ret.append(connect_caves(world, lw_entrances, [], list(LW_Dungeon_Exits))) # Agahnim must be light world
ret.append(connect_caves(world, lw_entrances, dw_entrances, dungeon_exits)) ret.append(connect_caves(world, lw_entrances, dw_entrances, dungeon_exits))
elif world.shuffle == 'simple': elif world.shuffle == 'simple':
@ -221,7 +221,7 @@ def link_entrances(world):
if world.mode == 'standard': if world.mode == 'standard':
# rest of hyrule castle must be in light world to avoid fake darkworld stuff # rest of hyrule castle must be in light world to avoid fake darkworld stuff
ret.append(connect_caves(world, lw_entrances, [], [('Hyrule Castle Exit (West)', 'Hyrule Castle Exit (East)')])) ret.append(connect_caves(world, lw_entrances, [], [('Hyrule Castle Exit (West)', 'Hyrule Castle Exit (East)')]))
ret.append(connect_caves(world, lw_entrances, [], list(LW_Dungeon_Exits))) # Aghanim must be light world ret.append(connect_caves(world, lw_entrances, [], list(LW_Dungeon_Exits))) # Agahnim must be light world
# place old man, has limited options # place old man, has limited options
# exit has to come from specific set of doors, the entrance is free to move about # exit has to come from specific set of doors, the entrance is free to move about
@ -287,7 +287,7 @@ def link_entrances(world):
lw_entrances_must_exits = list(LW_Dungeon_Entrances_Must_Exit) lw_entrances_must_exits = list(LW_Dungeon_Entrances_Must_Exit)
old_man_entrances = list(Old_Man_Entrances) old_man_entrances = list(Old_Man_Entrances)
mandatory_light_world = ['Aghanims Tower Exit', 'Old Man House Exit (Bottom)', 'Old Man House Exit (Top)'] mandatory_light_world = ['Agahnims Tower Exit', 'Old Man House Exit (Bottom)', 'Old Man House Exit (Top)']
mandatory_dark_world = [] mandatory_dark_world = []
caves = list(Cave_Exits + Dungeon_Exits + Cave_Three_Exits) caves = list(Cave_Exits + Dungeon_Exits + Cave_Three_Exits)
@ -499,12 +499,12 @@ def link_entrances(world):
else: else:
raise NotImplementedError('Shuffling not supported yet') raise NotImplementedError('Shuffling not supported yet')
if world.aghanim_fix_required: if world.agahnim_fix_required:
# need to swap contents of Mimic Cave and TRock Ledge Right so Aghanim 1 is in Light World! # need to swap contents of Mimic Cave and TRock Ledge Right so Agahnim 1 is in Light World!
ret.append('Fix to prevent Aghanim Softlock: Swap Contents of Turtle Rock Ledge (East) and Mimic Cave:') ret.append('Fix to prevent Agahnim Softlock: Swap Contents of Turtle Rock Ledge (East) and Mimic Cave:')
mimic_cave_target = world.get_entrance('Mimic Cave Mirror Spot').connected_region mimic_cave_target = world.get_entrance('Mimic Cave Mirror Spot').connected_region
ret.append(connect_one_way(world, 'Dark Death Mountain Ledge (East)', mimic_cave_target)) ret.append(connect_one_way(world, 'Dark Death Mountain Ledge (East)', mimic_cave_target))
ret.append(connect_one_way(world, 'Mimic Cave Mirror Spot', 'Aghanims Tower')) ret.append(connect_one_way(world, 'Mimic Cave Mirror Spot', 'Agahnims Tower'))
# check for swamp palace fix # check for swamp palace fix
if world.get_entrance('Dam').connected_region.name != 'Dam' or world.get_entrance('Swamp Palace').connected_region.name != 'Swamp Palace (Entrance)': if world.get_entrance('Dam').connected_region.name != 'Dam' or world.get_entrance('Swamp Palace').connected_region.name != 'Swamp Palace (Entrance)':
@ -712,24 +712,24 @@ def simple_shuffle_dungeons(world):
ret.append(connect_two_way(world, 'Hyrule Castle Entrance (South)', 'Hyrule Castle Exit (South)')) ret.append(connect_two_way(world, 'Hyrule Castle Entrance (South)', 'Hyrule Castle Exit (South)'))
ret.append(connect_two_way(world, 'Hyrule Castle Entrance (East)', 'Hyrule Castle Exit (East)')) ret.append(connect_two_way(world, 'Hyrule Castle Entrance (East)', 'Hyrule Castle Exit (East)'))
ret.append(connect_two_way(world, 'Hyrule Castle Entrance (West)', 'Hyrule Castle Exit (West)')) ret.append(connect_two_way(world, 'Hyrule Castle Entrance (West)', 'Hyrule Castle Exit (West)'))
ret.append(connect_two_way(world, 'Aghanims Tower', 'Aghanims Tower Exit')) ret.append(connect_two_way(world, 'Agahnims Tower', 'Agahnims Tower Exit'))
elif hc_target == 'Desert': elif hc_target == 'Desert':
ret.append(connect_two_way(world, 'Desert Palace Entrance (South)', 'Hyrule Castle Exit (South)')) ret.append(connect_two_way(world, 'Desert Palace Entrance (South)', 'Hyrule Castle Exit (South)'))
ret.append(connect_two_way(world, 'Desert Palace Entrance (East)', 'Hyrule Castle Exit (East)')) ret.append(connect_two_way(world, 'Desert Palace Entrance (East)', 'Hyrule Castle Exit (East)'))
ret.append(connect_two_way(world, 'Desert Palace Entrance (West)', 'Hyrule Castle Exit (West)')) ret.append(connect_two_way(world, 'Desert Palace Entrance (West)', 'Hyrule Castle Exit (West)'))
ret.append(connect_two_way(world, 'Desert Palace Entrance (North)', 'Aghanims Tower Exit')) ret.append(connect_two_way(world, 'Desert Palace Entrance (North)', 'Agahnims Tower Exit'))
elif hc_target == 'Turtle Rock': elif hc_target == 'Turtle Rock':
ret.append(connect_two_way(world, 'Turtle Rock', 'Hyrule Castle Exit (South)')) ret.append(connect_two_way(world, 'Turtle Rock', 'Hyrule Castle Exit (South)'))
ret.append(connect_two_way(world, 'Turtle Rock Isolated Ledge Entrance', 'Hyrule Castle Exit (East)')) ret.append(connect_two_way(world, 'Turtle Rock Isolated Ledge Entrance', 'Hyrule Castle Exit (East)'))
ret.append(connect_two_way(world, 'Dark Death Mountain Ledge (West)', 'Hyrule Castle Exit (West)')) ret.append(connect_two_way(world, 'Dark Death Mountain Ledge (West)', 'Hyrule Castle Exit (West)'))
ret.append(connect_two_way(world, 'Dark Death Mountain Ledge (East)', 'Aghanims Tower Exit')) ret.append(connect_two_way(world, 'Dark Death Mountain Ledge (East)', 'Agahnims Tower Exit'))
world.aghanim_fix_required = True # need this for now world.agahnim_fix_required = True # need this for now
if dp_target == 'Hyrule Castle': if dp_target == 'Hyrule Castle':
ret.append(connect_two_way(world, 'Hyrule Castle Entrance (South)', 'Desert Palace Exit (South)')) ret.append(connect_two_way(world, 'Hyrule Castle Entrance (South)', 'Desert Palace Exit (South)'))
ret.append(connect_two_way(world, 'Hyrule Castle Entrance (East)', 'Desert Palace Exit (East)')) ret.append(connect_two_way(world, 'Hyrule Castle Entrance (East)', 'Desert Palace Exit (East)'))
ret.append(connect_two_way(world, 'Hyrule Castle Entrance (West)', 'Desert Palace Exit (West)')) ret.append(connect_two_way(world, 'Hyrule Castle Entrance (West)', 'Desert Palace Exit (West)'))
ret.append(connect_two_way(world, 'Aghanims Tower', 'Desert Palace Exit (North)')) ret.append(connect_two_way(world, 'Agahnims Tower', 'Desert Palace Exit (North)'))
elif dp_target == 'Desert': elif dp_target == 'Desert':
ret.append(connect_two_way(world, 'Desert Palace Entrance (South)', 'Desert Palace Exit (South)')) ret.append(connect_two_way(world, 'Desert Palace Entrance (South)', 'Desert Palace Exit (South)'))
ret.append(connect_two_way(world, 'Desert Palace Entrance (East)', 'Desert Palace Exit (East)')) ret.append(connect_two_way(world, 'Desert Palace Entrance (East)', 'Desert Palace Exit (East)'))
@ -745,7 +745,7 @@ def simple_shuffle_dungeons(world):
ret.append(connect_two_way(world, 'Hyrule Castle Entrance (South)', 'Turtle Rock Exit (Front)')) ret.append(connect_two_way(world, 'Hyrule Castle Entrance (South)', 'Turtle Rock Exit (Front)'))
ret.append(connect_two_way(world, 'Hyrule Castle Entrance (East)', 'Turtle Rock Ledge Exit (East)')) ret.append(connect_two_way(world, 'Hyrule Castle Entrance (East)', 'Turtle Rock Ledge Exit (East)'))
ret.append(connect_two_way(world, 'Hyrule Castle Entrance (West)', 'Turtle Rock Ledge Exit (West)')) ret.append(connect_two_way(world, 'Hyrule Castle Entrance (West)', 'Turtle Rock Ledge Exit (West)'))
ret.append(connect_two_way(world, 'Aghanims Tower', 'Turtle Rock Isolated Ledge Exit')) ret.append(connect_two_way(world, 'Agahnims Tower', 'Turtle Rock Isolated Ledge Exit'))
elif tr_target == 'Desert': elif tr_target == 'Desert':
ret.append(connect_two_way(world, 'Desert Palace Entrance (South)', 'Turtle Rock Exit (Front)')) ret.append(connect_two_way(world, 'Desert Palace Entrance (South)', 'Turtle Rock Exit (Front)'))
ret.append(connect_two_way(world, 'Desert Palace Entrance (North)', 'Turtle Rock Ledge Exit (East)')) ret.append(connect_two_way(world, 'Desert Palace Entrance (North)', 'Turtle Rock Ledge Exit (East)'))
@ -767,7 +767,7 @@ LW_Dungeon_Entrances = ['Desert Palace Entrance (South)',
'Tower of Hera', 'Tower of Hera',
'Hyrule Castle Entrance (West)', 'Hyrule Castle Entrance (West)',
'Hyrule Castle Entrance (East)', 'Hyrule Castle Entrance (East)',
'Aghanims Tower'] 'Agahnims Tower']
LW_Dungeon_Entrances_Must_Exit = ['Desert Palace Entrance (East)'] LW_Dungeon_Entrances_Must_Exit = ['Desert Palace Entrance (East)']
@ -783,7 +783,7 @@ DW_Dungeon_Entrances = ['Thieves Town',
DW_Dungeon_Entrances_Must_Exit = ['Dark Death Mountain Ledge (East)', DW_Dungeon_Entrances_Must_Exit = ['Dark Death Mountain Ledge (East)',
'Turtle Rock Isolated Ledge Entrance'] 'Turtle Rock Isolated Ledge Entrance']
LW_Dungeon_Exits = ['Aghanims Tower Exit'] LW_Dungeon_Exits = ['Agahnims Tower Exit']
Dungeon_Exits = [('Desert Palace Exit (South)', 'Desert Palace Exit (West)', 'Desert Palace Exit (East)'), Dungeon_Exits = [('Desert Palace Exit (South)', 'Desert Palace Exit (West)', 'Desert Palace Exit (East)'),
'Desert Palace Exit (North)', 'Desert Palace Exit (North)',
@ -1004,7 +1004,7 @@ mandatory_connections = [('Links House', 'Links House'), # unshuffled. For now
('Sanctuary Push Door', 'Sanctuary'), ('Sanctuary Push Door', 'Sanctuary'),
('Sewer Drop', 'Sewers'), ('Sewer Drop', 'Sewers'),
('Sewers Back Door', 'Sewers (Dark)'), ('Sewers Back Door', 'Sewers (Dark)'),
('Aghanim 1', 'Aghanim 1'), ('Agahnim 1', 'Agahnim 1'),
('Flute Spot 1', 'Death Mountain'), ('Flute Spot 1', 'Death Mountain'),
('Spectacle Rock Cave Drop', 'Spectacle Rock Cave (Bottom)'), ('Spectacle Rock Cave Drop', 'Spectacle Rock Cave (Bottom)'),
('Spectacle Rock Cave Peak Drop', 'Spectacle Rock Cave (Bottom)'), ('Spectacle Rock Cave Peak Drop', 'Spectacle Rock Cave (Bottom)'),
@ -1125,7 +1125,7 @@ mandatory_connections = [('Links House', 'Links House'), # unshuffled. For now
('Ganons Tower Big Key Door', 'Ganons Tower (Top)'), ('Ganons Tower Big Key Door', 'Ganons Tower (Top)'),
('Ganons Tower Torch Rooms', 'Ganons Tower (Before Moldorm)'), ('Ganons Tower Torch Rooms', 'Ganons Tower (Before Moldorm)'),
('Ganons Tower Moldorm Door', 'Ganons Tower (Moldorm)'), ('Ganons Tower Moldorm Door', 'Ganons Tower (Moldorm)'),
('Ganons Tower Moldorm Gap', 'Aghanim 2'), ('Ganons Tower Moldorm Gap', 'Agahnim 2'),
('Pyramid Hole', 'Pyramid') # not shuffled, for now ('Pyramid Hole', 'Pyramid') # not shuffled, for now
] ]
@ -1298,8 +1298,8 @@ default_dungeon_connections = [('Desert Palace Entrance (South)', 'Desert Palace
('Hyrule Castle Exit (South)', 'Light World'), ('Hyrule Castle Exit (South)', 'Light World'),
('Hyrule Castle Exit (West)', 'Hyrule Castle Ledge'), ('Hyrule Castle Exit (West)', 'Hyrule Castle Ledge'),
('Hyrule Castle Exit (East)', 'Hyrule Castle Ledge'), ('Hyrule Castle Exit (East)', 'Hyrule Castle Ledge'),
('Aghanims Tower', 'Aghanims Tower'), ('Agahnims Tower', 'Agahnims Tower'),
('Aghanims Tower Exit', 'Hyrule Castle Ledge'), ('Agahnims Tower Exit', 'Hyrule Castle Ledge'),
('Thieves Town', 'Thieves Town (Entrance)'), ('Thieves Town', 'Thieves Town (Entrance)'),
('Thieves Town Exit', 'West Dark World'), ('Thieves Town Exit', 'West Dark World'),
@ -1349,7 +1349,7 @@ door_addresses = {'Desert Palace Entrance (South)': (0xDBB7B, 0x15B02),
'Hyrule Castle Entrance (South)': (0xDBB76, 0x15AF4), 'Hyrule Castle Entrance (South)': (0xDBB76, 0x15AF4),
'Hyrule Castle Entrance (West)': (0xDBB75, 0x15AF2), 'Hyrule Castle Entrance (West)': (0xDBB75, 0x15AF2),
'Hyrule Castle Entrance (East)': (0xDBB77, 0x15AF6), 'Hyrule Castle Entrance (East)': (0xDBB77, 0x15AF6),
'Aghanims Tower': (0xDBB96, 0x15B38), 'Agahnims Tower': (0xDBB96, 0x15B38),
'Thieves Town': (0xDBBA6, 0x15B58), 'Thieves Town': (0xDBBA6, 0x15B58),
'Skull Woods First Section Door': (0xDBB9C, 0x15B44), 'Skull Woods First Section Door': (0xDBB9C, 0x15B44),
'Skull Woods Second Section Door (East)': (0xDBB9B, 0x15B42), 'Skull Woods Second Section Door (East)': (0xDBB9B, 0x15B42),
@ -1406,7 +1406,7 @@ exit_ids = {'Desert Palace Exit (South)': (0x09, 0x84),
'Hyrule Castle Exit (South)': (0x04, 0x61), 'Hyrule Castle Exit (South)': (0x04, 0x61),
'Hyrule Castle Exit (West)': (0x03, 0x60), 'Hyrule Castle Exit (West)': (0x03, 0x60),
'Hyrule Castle Exit (East)': (0x05, 0x62), 'Hyrule Castle Exit (East)': (0x05, 0x62),
'Aghanims Tower Exit': (0x24, 0xE0), 'Agahnims Tower Exit': (0x24, 0xE0),
'Thieves Town Exit': (0x34, 0xDB), 'Thieves Town Exit': (0x34, 0xDB),
'Skull Woods First Section Exit': (0x2A, 0x58), 'Skull Woods First Section Exit': (0x2A, 0x58),
'Skull Woods Second Section Exit (East)': (0x29, 0x57), 'Skull Woods Second Section Exit (East)': (0x29, 0x57),

2
Items.py
View File

@ -441,7 +441,7 @@ class ESMap(Item):
class ATSmallKey(Item): class ATSmallKey(Item):
def __init__(self): def __init__(self):
super(ATSmallKey, self).__init__('Small Key (Aghanims Tower)', False, True, code=0x24) super(ATSmallKey, self).__init__('Small Key (Agahnims Tower)', False, True, code=0x24)
class PDSmallKey(Item): class PDSmallKey(Item):

8
Regions.py
View File

@ -77,7 +77,7 @@ def create_regions(world):
'[dungeon-L1-1F] Eastern Palace - Big Key Room', '[dungeon-L1-1F] Eastern Palace - Map Room', 'Armos - Heart Container', 'Armos - Pendant'], ['Eastern Palace Exit']), '[dungeon-L1-1F] Eastern Palace - Big Key Room', '[dungeon-L1-1F] Eastern Palace - Map Room', 'Armos - Heart Container', 'Armos - Pendant'], ['Eastern Palace Exit']),
create_region('Master Sword Meadow', ['Altar']), create_region('Master Sword Meadow', ['Altar']),
create_region('Lost Woods Gamble'), create_region('Lost Woods Gamble'),
create_region('Hyrule Castle Ledge', None, ['Hyrule Castle Entrance (East)', 'Hyrule Castle Entrance (West)', 'Aghanims Tower']), create_region('Hyrule Castle Ledge', None, ['Hyrule Castle Entrance (East)', 'Hyrule Castle Entrance (West)', 'Agahnims Tower']),
create_region('Hyrule Castle', ['[dungeon-C-B1] Hyrule Castle - Boomerang Room', '[dungeon-C-B1] Hyrule Castle - Map Room', '[dungeon-C-B1] Hyrule Castle - Next To Zelda'], create_region('Hyrule Castle', ['[dungeon-C-B1] Hyrule Castle - Boomerang Room', '[dungeon-C-B1] Hyrule Castle - Map Room', '[dungeon-C-B1] Hyrule Castle - Next To Zelda'],
['Hyrule Castle Exit (East)', 'Hyrule Castle Exit (West)', 'Hyrule Castle Exit (South)', 'Throne Room']), ['Hyrule Castle Exit (East)', 'Hyrule Castle Exit (West)', 'Hyrule Castle Exit (South)', 'Throne Room']),
create_region('Sewer Drop', None, ['Sewer Drop']), # This exists only to be referenced for access checks create_region('Sewer Drop', None, ['Sewer Drop']), # This exists only to be referenced for access checks
@ -85,8 +85,8 @@ def create_regions(world):
create_region('Sewers', ['[dungeon-C-B1] Escape - Final Basement Room [left chest]', '[dungeon-C-B1] Escape - Final Basement Room [middle chest]', create_region('Sewers', ['[dungeon-C-B1] Escape - Final Basement Room [left chest]', '[dungeon-C-B1] Escape - Final Basement Room [middle chest]',
'[dungeon-C-B1] Escape - Final Basement Room [right chest]'], ['Sanctuary Push Door', 'Sewers Back Door']), '[dungeon-C-B1] Escape - Final Basement Room [right chest]'], ['Sanctuary Push Door', 'Sewers Back Door']),
create_region('Sanctuary', ['[dungeon-C-1F] Sanctuary'], ['Sanctuary Exit']), create_region('Sanctuary', ['[dungeon-C-1F] Sanctuary'], ['Sanctuary Exit']),
create_region('Aghanims Tower', ['[dungeon-A1-2F] Hyrule Castle Tower - 2 Knife Guys Room', '[dungeon-A1-3F] Hyrule Castle Tower - Maze Room'], ['Aghanim 1', 'Aghanims Tower Exit']), create_region('Agahnims Tower', ['[dungeon-A1-2F] Hyrule Castle Tower - 2 Knife Guys Room', '[dungeon-A1-3F] Hyrule Castle Tower - Maze Room'], ['Agahnim 1', 'Agahnims Tower Exit']),
create_region('Aghanim 1', None, ['Top of Pyramid']), create_region('Agahnim 1', None, ['Top of Pyramid']),
create_region('Old Man Cave', ['Old Mountain Man'], ['Old Man Cave Exit (East)', 'Old Man Cave Exit (West)']), create_region('Old Man Cave', ['Old Mountain Man'], ['Old Man Cave Exit (East)', 'Old Man Cave Exit (West)']),
create_region('Old Man House', None, ['Old Man House Exit (Bottom)', 'Old Man House Front to Back']), create_region('Old Man House', None, ['Old Man House Exit (Bottom)', 'Old Man House Front to Back']),
create_region('Old Man House Back', None, ['Old Man House Exit (Top)', 'Old Man House Back to Front']), create_region('Old Man House Back', None, ['Old Man House Exit (Top)', 'Old Man House Back to Front']),
@ -250,7 +250,7 @@ def create_regions(world):
create_region('Ganons Tower (Before Moldorm)', ['[dungeon-A2-6F] Ganons Tower - Mini Helmasaur Room [left chest]', '[dungeon-A2-6F] Ganons Tower - Mini Helmasaur Room [right chest]', create_region('Ganons Tower (Before Moldorm)', ['[dungeon-A2-6F] Ganons Tower - Mini Helmasaur Room [left chest]', '[dungeon-A2-6F] Ganons Tower - Mini Helmasaur Room [right chest]',
'[dungeon-A2-6F] Ganons Tower - Room before Moldorm'], ['Ganons Tower Moldorm Door']), '[dungeon-A2-6F] Ganons Tower - Room before Moldorm'], ['Ganons Tower Moldorm Door']),
create_region('Ganons Tower (Moldorm)', None, ['Ganons Tower Moldorm Gap']), create_region('Ganons Tower (Moldorm)', None, ['Ganons Tower Moldorm Gap']),
create_region('Aghanim 2', ['[dungeon-A2-6F] Ganons Tower - Moldorm Room'], ['Pyramid Hole']), create_region('Agahnim 2', ['[dungeon-A2-6F] Ganons Tower - Moldorm Room'], ['Pyramid Hole']),
create_region('Pyramid', ['Ganon']) create_region('Pyramid', ['Ganon'])
] ]

6
Rules.py
View File

@ -98,8 +98,8 @@ def global_rules(world):
set_rule(world.get_entrance('Desert Cave'), lambda state: state.can_lift_rocks()) set_rule(world.get_entrance('Desert Cave'), lambda state: state.can_lift_rocks())
set_rule(world.get_location('Altar'), lambda state: state.can_collect('Red Pendant') and state.can_collect('Blue Pendant') and state.can_collect('Green Pendant')) set_rule(world.get_location('Altar'), lambda state: state.can_collect('Red Pendant') and state.can_collect('Blue Pendant') and state.can_collect('Green Pendant'))
set_rule(world.get_location('Sahasrahla'), lambda state: state.can_collect('Green Pendant')) set_rule(world.get_location('Sahasrahla'), lambda state: state.can_collect('Green Pendant'))
set_rule(world.get_entrance('Aghanims Tower'), lambda state: state.has('Cape') or state.has_beam_sword() or state.can_reach('Aghanim 1')) # barrier gets removed after killing aghanim, relevant for entrance shuffle set_rule(world.get_entrance('Agahnims Tower'), lambda state: state.has('Cape') or state.has_beam_sword() or state.can_reach('Agahnim 1')) # barrier gets removed after killing agahnim, relevant for entrance shuffle
set_rule(world.get_entrance('Aghanim 1'), lambda state: state.has_sword()) set_rule(world.get_entrance('Agahnim 1'), lambda state: state.has_sword())
set_rule(world.get_entrance('Old Man Cave Exit (West)'), lambda state: False) # drop cannott be climbed up set_rule(world.get_entrance('Old Man Cave Exit (West)'), lambda state: False) # drop cannott be climbed up
set_rule(world.get_entrance('Broken Bridge (West)'), lambda state: state.has('Hookshot')) set_rule(world.get_entrance('Broken Bridge (West)'), lambda state: state.has('Hookshot'))
set_rule(world.get_entrance('Broken Bridge (East)'), lambda state: state.has('Hookshot')) set_rule(world.get_entrance('Broken Bridge (East)'), lambda state: state.has('Hookshot'))
@ -342,7 +342,7 @@ def no_glitches_rules(world):
add_conditional_lamp('Dark Palace Maze Door', 'Dark Palace (Entrance)', 'Entrance') add_conditional_lamp('Dark Palace Maze Door', 'Dark Palace (Entrance)', 'Entrance')
add_conditional_lamp('[dungeon-D1-B1] Dark Palace - Dark Room [left chest]', 'Dark Palace (Entrance)', 'Location') add_conditional_lamp('[dungeon-D1-B1] Dark Palace - Dark Room [left chest]', 'Dark Palace (Entrance)', 'Location')
add_conditional_lamp('[dungeon-D1-B1] Dark Palace - Dark Room [right chest]', 'Dark Palace (Entrance)', 'Location') add_conditional_lamp('[dungeon-D1-B1] Dark Palace - Dark Room [right chest]', 'Dark Palace (Entrance)', 'Location')
add_conditional_lamp('Aghanim 1', 'Aghanims Tower', 'Entrance') add_conditional_lamp('Agahnim 1', 'Agahnims Tower', 'Entrance')
add_conditional_lamp('Old Mountain Man', 'Old Man Cave', 'Location') add_conditional_lamp('Old Mountain Man', 'Old Man Cave', 'Location')
add_conditional_lamp('Old Man Cave Exit (East)', 'Old Man Cave', 'Entrance') add_conditional_lamp('Old Man Cave Exit (East)', 'Old Man Cave', 'Entrance')
add_conditional_lamp('Death Mountain Return Cave Exit (East)', 'Death Mountain Return Cave', 'Entrance') add_conditional_lamp('Death Mountain Return Cave Exit (East)', 'Death Mountain Return Cave', 'Entrance')