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

As blacksmith now sticks with you post S&Q, we need to reduce the available pool of delivery locations, as having him as a follower may prevent you from collecting the item required to reach some cave entrances.

This commit is contained in:
LLCoolDave 2017-06-04 21:10:09 +02:00
parent dfe9d3da3b
commit dd049e5a52
2 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
EntranceShuffle.py
View File

@ -1023,11 +1023,9 @@ DW_Entrances = ['Bumper Cave (Bottom)',
'Hookshot Cave'] 'Hookshot Cave']
Blacksmith_Single_Cave_Doors = ['Thiefs Hut', Blacksmith_Single_Cave_Doors = ['Thiefs Hut',
'Bonk Fairy (Light)',
'Lake Hylia Fairy', 'Lake Hylia Fairy',
'Swamp Fairy', 'Swamp Fairy',
'Desert Fairy', 'Desert Fairy',
'Kings Grave',
'Chicken House', 'Chicken House',
'Aginahs Cave', 'Aginahs Cave',
'Sahasrahlas Hut', 'Sahasrahlas Hut',
@ -1042,27 +1040,29 @@ Blacksmith_Single_Cave_Doors = ['Thiefs Hut',
'Tavern (Front)', 'Tavern (Front)',
'Light World Bomb Hut', 'Light World Bomb Hut',
'Kakariko Shop', 'Kakariko Shop',
'Cave South of Haunted Grove',
'Graveyard Cave',
'Checkerboard Cave',
'Mini Moldorm Cave', 'Mini Moldorm Cave',
'Long Fairy Cave', 'Long Fairy Cave',
'Good Bee Cave', 'Good Bee Cave',
'20 Rupee Cave', '20 Rupee Cave',
'50 Rupee Cave', '50 Rupee Cave',
'Ice Cave', 'Ice Cave',
'Bonk Rock Cave',
'Library', 'Library',
'Witch Hut', 'Witch Hut',
'Hookshot Fairy',
'Waterfall of Wishing',
'Capacity Upgrade',
'Dam', 'Dam',
'Lumberjack House', 'Lumberjack House',
'Lake Hylia Fortune Teller', 'Lake Hylia Fortune Teller',
'Kakariko Gamble Game'] 'Kakariko Gamble Game']
Bomb_Shop_Single_Cave_Doors = ['East Dark World Hint', Bomb_Shop_Single_Cave_Doors = ['Waterfall of Wishing',
'Capacity Upgrade',
'Bonk Rock Cave',
'Graveyard Cave',
'Checkerboard Cave',
'Cave South of Haunted Grove',
'Kings Grave',
'Bonk Fairy (Light)',
'Hookshot Fairy',
'East Dark World Hint',
'Palace of Darkness Hint', 'Palace of Darkness Hint',
'Dark Lake Hylia Fairy', 'Dark Lake Hylia Fairy',
'Dark Lake Hylia Ledge Fairy', 'Dark Lake Hylia Ledge Fairy',

8
Rules.py
View File

@ -22,7 +22,6 @@ def set_rules(world):
# require altar for ganon to enforce getting everything # require altar for ganon to enforce getting everything
add_rule(world.get_location('Ganon'), lambda state: state.can_reach('Altar', 'Location')) add_rule(world.get_location('Ganon'), lambda state: state.can_reach('Altar', 'Location'))
set_blacksmith_rules(world)
set_big_bomb_rules(world) set_big_bomb_rules(world)
# if swamp and dam have not been moved we require mirror for swamp palace # if swamp and dam have not been moved we require mirror for swamp palace
@ -384,13 +383,6 @@ def standard_rules(world):
add_rule(world.get_location('[dungeon-C-B1] Escape - First B1 Room'), lambda state: state.can_reach('Sewer Drop') or (state.world.get_location('[dungeon-C-B1] Escape - First B1 Room').item is not None and state.world.get_location('[dungeon-C-B1] Escape - First B1 Room').item.name in ['Small Key (Escape)'])) # you could skip this chest and be unable to go back until you can drop into escape add_rule(world.get_location('[dungeon-C-B1] Escape - First B1 Room'), lambda state: state.can_reach('Sewer Drop') or (state.world.get_location('[dungeon-C-B1] Escape - First B1 Room').item is not None and state.world.get_location('[dungeon-C-B1] Escape - First B1 Room').item.name in ['Small Key (Escape)'])) # you could skip this chest and be unable to go back until you can drop into escape
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('Hookshot') or (state.has('Hammer') and state.has('Mirror'))))
def set_big_bomb_rules(world): def set_big_bomb_rules(world):
# this is a mess # this is a mess
bombshop_entrance = world.get_region('Big Bomb Shop').entrances[0] bombshop_entrance = world.get_region('Big Bomb Shop').entrances[0]