Convert several locations to using events
Event locations automatically get Moon Perarl requirements added, and ensure the other referenced location is listed in the spoiler log's path section
This commit is contained in:
Kevin Cathcart
parent
3fd2dc662a
commit
3592d12bfd
|
|
@ -217,6 +217,14 @@ def generate_itempool(world):
|
|||
world.get_location('Agahnim 1').event = True
|
||||
world.push_item('Agahnim 2', ItemFactory('Beat Agahnim 2'), False)
|
||||
world.get_location('Agahnim 2').event = True
|
||||
world.push_item('Dark Blacksmith Ruins', ItemFactory('Pick Up Purple Chest'), False)
|
||||
world.get_location('Dark Blacksmith Ruins').event = True
|
||||
world.push_item('Frog', ItemFactory('Get Frog'), False)
|
||||
world.get_location('Frog').event = True
|
||||
world.push_item('Missing Smith', ItemFactory('Return Smith'), False)
|
||||
world.get_location('Missing Smith').event = True
|
||||
world.push_item('Floodgate', ItemFactory('Open Floodgate'), False)
|
||||
world.get_location('Floodgate').event = True
|
||||
|
||||
# set up item pool
|
||||
if world.custom:
|
||||
|
|
|
|||
7
Items.py
7
Items.py
|
|
@ -161,4 +161,9 @@ item_table = {'Bow': (True, False, None, 0x0B, 'You have\nchosen the\narcher cla
|
|||
'Small Key (Universal)': (False, True, None, 0xAF, 'A small key for any door', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again'),
|
||||
'Nothing': (False, False, None, 0x5A, 'Some Hot Air', 'and the Nothing', 'the zen kid', 'outright theft', 'shroom theft', 'empty boy is bored again'),
|
||||
'Beat Agahnim 1': (True, False, 'Event', None, None, None, None, None, None, None),
|
||||
'Beat Agahnim 2': (True, False, 'Event', None, None, None, None, None, None, None)}
|
||||
'Beat Agahnim 2': (True, False, 'Event', None, None, None, None, None, None, None),
|
||||
'Get Frog': (True, False, 'Event', None, None, None, None, None, None, None),
|
||||
'Return Smith': (True, False, 'Event', None, None, None, None, None, None, None),
|
||||
'Pick Up Purple Chest': (True, False, 'Event', None, None, None, None, None, None, None),
|
||||
'Open Floodgate': (True, False, 'Event', None, None, None, None, None, None, None),
|
||||
}
|
||||
|
|
|
|||
2
Main.py
2
Main.py
|
|
@ -294,8 +294,6 @@ def create_playthrough(world):
|
|||
old_world.spoiler.paths = {location.name : get_path(state, location.parent_region) for sphere in collection_spheres for location in sphere}
|
||||
if any(exit == 'Pyramid Fairy' for path in old_world.spoiler.paths.values() for (_, exit) in path):
|
||||
old_world.spoiler.paths['Big Bomb Shop'] = get_path(state, world.get_region('Big Bomb Shop'))
|
||||
if any(exit == 'Swamp Palace Moat' for path in old_world.spoiler.paths.values() for (_, exit) in path) or 'Sunken Treasure' in old_world.required_locations:
|
||||
old_world.spoiler.paths['Dam'] = get_path(state, world.get_region('Dam'))
|
||||
|
||||
# we can finally output our playthrough
|
||||
old_world.spoiler.playthrough = OrderedDict([(str(i + 1), {str(location): str(location.item) for location in sphere}) for i, sphere in enumerate(collection_spheres)])
|
||||
|
|
|
|||
14
Regions.py
14
Regions.py
|
|
@ -28,7 +28,7 @@ def create_regions(world):
|
|||
create_lw_region('Kings Grave Area', None, ['Kings Grave', 'Kings Grave Inner Rocks']),
|
||||
create_cave_region('Kings Grave', ['King\'s Tomb']),
|
||||
create_cave_region('North Fairy Cave', None, ['North Fairy Cave Exit']),
|
||||
create_cave_region('Dam', ['Floodgate Chest']),
|
||||
create_cave_region('Dam', ['Floodgate', 'Floodgate Chest']),
|
||||
create_cave_region('Links House', ['Link\'s House'], ['Links House Exit']),
|
||||
create_cave_region('Chris Houlihan Room', None, ['Chris Houlihan Room Exit']),
|
||||
create_cave_region('Tavern', ['Kakariko Tavern']),
|
||||
|
|
@ -57,7 +57,7 @@ def create_regions(world):
|
|||
create_cave_region('Kakariko Well (top)', ['Kakariko Well - Top', 'Kakariko Well - Left', 'Kakariko Well - Middle',
|
||||
'Kakariko Well - Right', 'Kakariko Well - Bottom'], ['Kakariko Well (top to bottom)']),
|
||||
create_cave_region('Kakariko Well (bottom)', None, ['Kakariko Well Exit']),
|
||||
create_cave_region('Blacksmiths Hut', ['Blacksmith']),
|
||||
create_cave_region('Blacksmiths Hut', ['Blacksmith', 'Missing Smith']),
|
||||
create_lw_region('Bat Cave Drop Ledge', None, ['Bat Cave Drop']),
|
||||
create_cave_region('Bat Cave (right)', ['Magic Bat'], ['Bat Cave Door']),
|
||||
create_cave_region('Bat Cave (left)', None, ['Bat Cave Exit']),
|
||||
|
|
@ -164,10 +164,10 @@ def create_regions(world):
|
|||
create_cave_region('Dark Lake Hylia Ledge Spike Cave'),
|
||||
create_cave_region('Hype Cave', ['Hype Cave - Top', 'Hype Cave - Middle Right', 'Hype Cave - Middle Left',
|
||||
'Hype Cave - Bottom', 'Hype Cave - Generous Guy']),
|
||||
create_dw_region('West Dark World', None, ['Village of Outcasts Drop', 'East Dark World River Pier', 'Brewery', 'C-Shaped House', 'Chest Game', 'Thieves Town', 'Graveyard Ledge Mirror Spot', 'Kings Grave Mirror Spot', 'Bumper Cave Entrance Rock',
|
||||
'Skull Woods Forest', 'Village of Outcasts Pegs', 'Village of Outcasts Eastern Rocks', 'Red Shield Shop', 'Dark Sanctuary Hint', 'Fortune Teller (Dark)', 'Dark World Lumberjack Shop']),
|
||||
create_dw_region('West Dark World', ['Frog'], ['Village of Outcasts Drop', 'East Dark World River Pier', 'Brewery', 'C-Shaped House', 'Chest Game', 'Thieves Town', 'Graveyard Ledge Mirror Spot', 'Kings Grave Mirror Spot', 'Bumper Cave Entrance Rock',
|
||||
'Skull Woods Forest', 'Village of Outcasts Pegs', 'Village of Outcasts Eastern Rocks', 'Red Shield Shop', 'Dark Sanctuary Hint', 'Fortune Teller (Dark)', 'Dark World Lumberjack Shop']),
|
||||
create_dw_region('Dark Grassy Lawn', None, ['Grassy Lawn Pegs', 'Dark World Shop']),
|
||||
create_dw_region('Hammer Peg Area', None, ['Bat Cave Drop Ledge Mirror Spot', 'Dark World Hammer Peg Cave', 'Peg Area Rocks']),
|
||||
create_dw_region('Hammer Peg Area', ['Dark Blacksmith Ruins'], ['Bat Cave Drop Ledge Mirror Spot', 'Dark World Hammer Peg Cave', 'Peg Area Rocks']),
|
||||
create_dw_region('Bumper Cave Entrance', None, ['Bumper Cave (Bottom)', 'Bumper Cave Entrance Mirror Spot', 'Bumper Cave Entrance Drop']),
|
||||
create_cave_region('Fortune Teller (Dark)'),
|
||||
create_cave_region('Village of Outcasts Shop'),
|
||||
|
|
@ -567,6 +567,10 @@ location_table = {'Mushroom': (0x180013, False, 'in the woods'),
|
|||
'Ganon': (None, False, 'from me'),
|
||||
'Agahnim 1': (None, False, 'from my wizardry form'),
|
||||
'Agahnim 2': (None, False, 'from my wizardry form'),
|
||||
'Floodgate': (None, False, None),
|
||||
'Frog': (None, False, None),
|
||||
'Missing Smith': (None, False, None),
|
||||
'Dark Blacksmith Ruins': (None, False, None),
|
||||
'Eastern Palace - Prize': ([0x1209D, 0x53EF8, 0x53EF9, 0x180052, 0x18007C, 0xC6FE], True, 'Eastern Palace'),
|
||||
'Desert Palace - Prize': ([0x1209E, 0x53F1C, 0x53F1D, 0x180053, 0x180078, 0xC6FF], True, 'Desert Palace'),
|
||||
'Tower of Hera - Prize': ([0x120A5, 0x53F0A, 0x53F0B, 0x18005A, 0x18007A, 0xC706], True, 'Tower of Hera'),
|
||||
|
|
|
|||
18
Rules.py
18
Rules.py
|
|
@ -110,11 +110,14 @@ def global_rules(world):
|
|||
set_rule(world.get_entrance('South Hyrule Teleporter'), lambda state: state.has('Hammer') and state.can_lift_rocks() and state.has_Pearl()) # bunny cannot use hammer
|
||||
set_rule(world.get_entrance('Kakariko Teleporter'), lambda state: ((state.has('Hammer') and state.can_lift_rocks()) or state.can_lift_heavy_rocks()) and state.has_Pearl()) # bunny cannot lift bushes
|
||||
set_rule(world.get_location('Flute Spot'), lambda state: state.has('Shovel'))
|
||||
set_rule(world.get_location('Purple Chest'), lambda state: state.can_reach('Blacksmith', 'Location')) # Can S&Q with chest
|
||||
set_rule(world.get_location('Dark Blacksmith Ruins'), lambda state: state.has('Return Smith'))
|
||||
set_rule(world.get_location('Purple Chest'), lambda state: state.has('Pick Up Purple Chest')) # Can S&Q with chest
|
||||
|
||||
set_rule(world.get_location('Zora\'s Ledge'), lambda state: state.has('Flippers'))
|
||||
set_rule(world.get_entrance('Waterfall of Wishing'), lambda state: state.has('Flippers')) # can be fake flippered into, but is in weird state inside that might prevent you from doing things. Can be improved in future Todo
|
||||
set_rule(world.get_location('Blacksmith'), lambda state: state.can_lift_heavy_rocks() and state.can_reach('West Dark World') and state.has_Pearl()) # Can S&Q with smith
|
||||
set_rule(world.get_location('Frog'), lambda state: state.can_lift_heavy_rocks()) # will get automatic moon pearl requirement
|
||||
set_rule(world.get_location('Missing Smith'), lambda state: state.has('Get Frog')) # Can S&Q with smith
|
||||
set_rule(world.get_location('Blacksmith'), lambda state: state.has('Return Smith'))
|
||||
set_rule(world.get_location('Magic Bat'), lambda state: state.has('Magic Powder'))
|
||||
set_rule(world.get_location('Sick Kid'), lambda state: state.has_bottle())
|
||||
set_rule(world.get_location('Library'), lambda state: state.has_Boots())
|
||||
|
|
@ -246,7 +249,9 @@ def global_rules(world):
|
|||
# for location in ['Tower of Hera - Big Key Chest']:
|
||||
# forbid_item(world.get_location(location), 'Small Key (Tower of Hera)')
|
||||
|
||||
set_rule(world.get_entrance('Swamp Palace Moat'), lambda state: state.has('Flippers') and state.can_reach('Dam'))
|
||||
set_rule(world.get_entrance('Swamp Palace Moat'), lambda state: state.has('Flippers') and state.has('Open Floodgate'))
|
||||
add_rule(world.get_location('Sunken Treasure'), lambda state: state.has('Open Floodgate'))
|
||||
|
||||
set_rule(world.get_entrance('Swamp Palace Small Key Door'), lambda state: state.has_key('Small Key (Swamp Palace)'))
|
||||
set_rule(world.get_entrance('Swamp Palace (Center)'), lambda state: state.has('Hammer'))
|
||||
set_rule(world.get_location('Swamp Palace - Big Chest'), lambda state: state.has('Big Key (Swamp Palace)') or item_name(state, 'Swamp Palace - Big Chest') == 'Big Key (Swamp Palace)')
|
||||
|
|
@ -780,13 +785,8 @@ def set_bunny_rules(world):
|
|||
bunny_impassable_caves = ['Bumper Cave', 'Two Brothers House', 'Hookshot Cave', 'Skull Woods First Section (Right)', 'Skull Woods First Section (Left)', 'Skull Woods First Section (Top)', 'Turtle Rock (Entrance)', 'Turtle Rock (Second Section)', 'Turtle Rock (Big Chest)', 'Skull Woods Second Section (Drop)',
|
||||
'Turtle Rock (Eye Bridge)', 'Sewers', 'Pyramid', 'Spiral Cave (Top)', 'Desert Palace Main (Inner)']
|
||||
|
||||
bunny_accessible_locations = ['Link\'s Uncle', 'Sahasrahla', 'Sick Kid', 'Lost Woods Hideout', 'Lumberjack Tree', 'Checkerboard Cave', 'Potion Shop', 'Spectacle Rock Cave', 'Pyramid', 'Hype Cave - Generous Guy', 'Peg Cave', 'Bumper Cave Ledge']
|
||||
bunny_accessible_locations = ['Link\'s Uncle', 'Sahasrahla', 'Sick Kid', 'Lost Woods Hideout', 'Lumberjack Tree', 'Checkerboard Cave', 'Potion Shop', 'Spectacle Rock Cave', 'Pyramid', 'Hype Cave - Generous Guy', 'Peg Cave', 'Bumper Cave Ledge', 'Dark Blacksmith Ruins']
|
||||
|
||||
if world.get_region('Dam').is_dark_world:
|
||||
# if Dam is is dark world, then it is required to have the pearl to get the sunken item
|
||||
add_rule(world.get_location('Sunken Treasure'), lambda state: state.has_Pearl())
|
||||
# similarly we need perl to get across the swamp palace moat
|
||||
add_rule(world.get_entrance('Swamp Palace Moat'), lambda state: state.has_Pearl())
|
||||
|
||||
def path_to_access_rule(path, entrance):
|
||||
return lambda state: state.can_reach(entrance) and all(rule(state) for rule in path)
|
||||
|
|
|
|||
Loading…
Reference in New Issue