From 10bf6fcb2ff419ac810f019bee0a6a17a02b5f11 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Mon, 8 Feb 2021 12:41:37 -0600 Subject: [PATCH] Added temporary flute exit on Link's House tile to deal with flute logic --- EntranceShuffle.py | 2 ++ Regions.py | 2 +- Rules.py | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/EntranceShuffle.py b/EntranceShuffle.py index 9a20df7a..7105b49e 100644 --- a/EntranceShuffle.py +++ b/EntranceShuffle.py @@ -2994,6 +2994,8 @@ mandatory_connections = [('Links House S&Q', 'Links House'), ('Dark Death Mountain Drop (East)', 'Dark Death Mountain (East Bottom)'), ('Floating Island Drop', 'Dark Death Mountain (Top East)'), ('Turtle Rock Ledge Drop', 'Turtle Rock Area'), + + ('Flute Away', 'Flute Sky'), # Portal Connections ('Kakariko Teleporter (Hammer)', 'Skull Woods Pass East Top Area'), diff --git a/Regions.py b/Regions.py index dd1c7d1c..78a3431f 100644 --- a/Regions.py +++ b/Regions.py @@ -58,7 +58,7 @@ def create_regions(world, player): create_lw_region(player, 'C Whirlpool Area', None, ['C Whirlpool Rock (Bottom)', 'South Hyrule Teleporter', 'C Whirlpool EN', 'C Whirlpool EC', 'C Whirlpool ES', 'C Whirlpool SC', 'C Whirlpool']), create_lw_region(player, 'C Whirlpool Outer Area', None, ['C Whirlpool Rock (Top)', 'C Whirlpool WC', 'C Whirlpool NW']), create_lw_region(player, 'Central Bonk Rock Area', None, ['Bonk Fairy (Light)', 'Central Bonk Rock NW', 'Central Bonk Rock SW', 'Central Bonk Rock EN', 'Central Bonk Rock EC', 'Central Bonk Rock ES']), - create_lw_region(player, 'Links House Area', None, ['Links House', 'Links House NE', 'Links House WN', 'Links House WC', 'Links House WS', 'Links House SC', 'Links House ES']), + create_lw_region(player, 'Links House Area', None, ['Links House', 'Links House NE', 'Links House WN', 'Links House WC', 'Links House WS', 'Links House SC', 'Links House ES', 'Flute Away']), create_lw_region(player, 'Stone Bridge Area', None, ['Stone Bridge NC', 'Stone Bridge EN', 'Stone Bridge WS', 'Stone Bridge SC']), create_lw_region(player, 'Stone Bridge Water', None, ['Stone Bridge WC', 'Stone Bridge EC']), create_lw_region(player, 'Hobo Bridge', ['Hobo'], ['Hobo EC']), diff --git a/Rules.py b/Rules.py index 1b505d6b..94307da1 100644 --- a/Rules.py +++ b/Rules.py @@ -514,6 +514,8 @@ def default_rules(world, player): set_rule(world.get_entrance('Hammer Bridge Pegs (North)', player), lambda state: state.has('Hammer', player) and state.has_Pearl(player)) set_rule(world.get_entrance('Hammer Bridge Pegs (South)', player), lambda state: state.has_Pearl(player) and state.has('Hammer', player)) + set_rule(world.get_entrance('Flute Away', player), lambda state: state.can_flute(player)) + set_rule(world.get_entrance('Useless Fairy Water Drop', player), lambda state: state.has('Flippers', player)) set_rule(world.get_entrance('Useless Fairy East Water Drop', player), lambda state: state.has('Flippers', player)) set_rule(world.get_entrance('Wooden Bridge Water Drop', player), lambda state: state.has('Flippers', player))