Fix Waterfall of Wishing connection not requiring flippers
This commit is contained in:
@@ -3276,7 +3276,9 @@ inverted_mandatory_connections = [('Lake Hylia Central Island Pier', 'Lake Hylia
|
||||
('Bush Covered Lawn Mirror Spot', 'Dark Grassy Lawn'),
|
||||
('Bomb Hut Inner Bushes', 'Light World'),
|
||||
('Bomb Hut Outer Bushes', 'Bomb Hut Area'),
|
||||
('Bomb Hut Mirror Spot', 'West Dark World')]
|
||||
('Bomb Hut Mirror Spot', 'West Dark World'),
|
||||
('Northeast Light World', 'Northeast Light World'),
|
||||
('Waterfall Stoop', 'Waterfall Stoop')]
|
||||
# non-shuffled entrance links
|
||||
default_connections = [('Waterfall of Wishing', 'Waterfall of Wishing'),
|
||||
("Blinds Hideout", "Blinds Hideout"),
|
||||
|
||||
@@ -28,7 +28,9 @@ def create_inverted_regions(world, player):
|
||||
"Blind\'s Hideout - Right",
|
||||
"Blind\'s Hideout - Far Left",
|
||||
"Blind\'s Hideout - Far Right"]),
|
||||
create_lw_region(player, 'Northeast Light World', None, ['Zoras River', 'Waterfall of Wishing', 'Potion Shop Outer Rock', 'Northeast Dark World Mirror Spot', 'Northeast Light World Warp']),
|
||||
create_lw_region(player, 'Northeast Light World', None, ['Zoras River', 'Waterfall Stoop', 'Potion Shop Outer Rock', 'Northeast Dark World Mirror Spot', 'Northeast Light World Warp']),
|
||||
create_lw_region(player, 'Waterfall Stoop', None, ['Northeast Light World', 'Waterfall of Wishing']),
|
||||
|
||||
create_lw_region(player, 'Potion Shop Area', None, ['Potion Shop', 'Potion Shop Inner Bushes', 'Potion Shop Inner Rock', 'Potion Shop Mirror Spot', 'Potion Shop River Drop']),
|
||||
create_lw_region(player, 'Graveyard Cave Area', None, ['Graveyard Cave', 'Graveyard Cave Inner Bushes', 'Graveyard Cave Mirror Spot']),
|
||||
create_lw_region(player, 'River', None, ['Light World Pier', 'Potion Shop Pier']),
|
||||
|
||||
2
Rom.py
2
Rom.py
@@ -942,7 +942,7 @@ def patch_rom(world, player, rom):
|
||||
hud_bits = 0
|
||||
hud_bits |= 0x0F if world.keysanity else 0x00
|
||||
hud_bits |= 0x10 if world.logic == 'nologic' else 0x00
|
||||
rom.write_byte(0x180045, hudbits) # free roaming items in menu
|
||||
rom.write_byte(0x180045, hud_bits) # free roaming items in menu
|
||||
|
||||
# Map reveals
|
||||
reveal_bytes = {
|
||||
|
||||
3
Rules.py
3
Rules.py
@@ -601,6 +601,9 @@ def inverted_rules(world, player):
|
||||
set_rule(world.get_entrance('Laser Bridge Mirror Spot', player), lambda state: state.has_Mirror(player))
|
||||
set_rule(world.get_entrance('Superbunny Cave Exit (Bottom)', player), lambda state: False) # Cannot get to bottom exit from top. Just exists for shuffling
|
||||
|
||||
set_rule(world.get_entrance('Waterfall Stoop', player), lambda state: state.has('Flippers', player))
|
||||
set_rule(world.get_entrance('Northeast Light World', player), lambda state: state.has('Flippers', player))
|
||||
|
||||
set_rule(world.get_location('Spike Cave', player), lambda state:
|
||||
state.has('Hammer', player) and state.can_lift_rocks(player) and
|
||||
((state.has('Cape', player) and state.can_extend_magic(player, 16, True)) or
|
||||
|
||||
Reference in New Issue
Block a user