Update to v22 rom and logic.

This commit is contained in:
LLCoolDave
2017-06-03 21:27:34 +02:00
parent aa909f2eaf
commit 2ef977b386
6 changed files with 15 additions and 14 deletions

View File

@@ -84,11 +84,11 @@ 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())
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())
set_rule(world.get_location('Haunted Grove'), lambda state: state.has('Shovel'))
set_rule(world.get_location('Purple Chest'), lambda state: state.can_reach('Blacksmiths', 'Location'))
set_rule(world.get_location('Purple Chest'), lambda state: state.can_reach('Blacksmiths', 'Location') and state.has_Mirror()) # ToDo check if can S&Q with chest to avoid mirror
set_rule(world.get_location('Piece of Heart (Zoras River)'), 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('Blacksmiths'), lambda state: state.can_lift_heavy_rocks() and state.has_Mirror() and state.can_reach('West Dark World'))
set_rule(world.get_location('Blacksmiths'), lambda state: state.can_lift_heavy_rocks() and state.can_reach('West Dark World'))
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())
@@ -388,7 +388,7 @@ def set_blacksmith_rules(world):
blacksmith_entrance = world.get_region('Blacksmiths Hut').entrances[0]
# some special handling if shuffled as we cannot use connected caves to take the smith up to death mountain
if blacksmith_entrance.name == 'Hookshot Fairy':
add_rule(world.get_location('Blacksmiths'), lambda state: state.has('Ocarina') and (state.has('Hammer') or state.has('Hookshot')))
add_rule(world.get_location('Blacksmiths'), lambda state: state.has('Ocarina') and (state.has('Hookshot') or (state.has('Hammer') and state.has('Mirror'))))
def set_big_bomb_rules(world):