From 3ffe137f5762931bd7990472a76d051d40d5550e Mon Sep 17 00:00:00 2001 From: codemann8 Date: Mon, 28 Nov 2022 14:24:32 -0600 Subject: [PATCH] Modeled South Portal Area correctly for OWG prep --- OWEdges.py | 2 ++ OverworldShuffle.py | 4 ++-- Rules.py | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/OWEdges.py b/OWEdges.py index cb61a153..7fe4b016 100644 --- a/OWEdges.py +++ b/OWEdges.py @@ -1137,6 +1137,7 @@ OWTileRegions = bidict({ 'Cave 45 Ledge': 0x32, 'C Whirlpool Area': 0x33, + 'C Whirlpool Portal Area': 0x33, 'C Whirlpool Water': 0x33, 'C Whirlpool Outer Area': 0x33, @@ -1274,6 +1275,7 @@ OWTileRegions = bidict({ 'Stumpy Approach Bush Entry': 0x72, 'Dark C Whirlpool Area': 0x73, + 'Dark C Whirlpool Portal Area': 0x73, 'Dark C Whirlpool Water': 0x73, 'Dark C Whirlpool Outer Area': 0x73, diff --git a/OverworldShuffle.py b/OverworldShuffle.py index d07b64f6..c6be3b90 100644 --- a/OverworldShuffle.py +++ b/OverworldShuffle.py @@ -1690,7 +1690,7 @@ ow_connections = { 0x33: ([ ('C Whirlpool Mirror Spot', 'C Whirlpool Area'), ('C Whirlpool Outer Mirror Spot', 'C Whirlpool Outer Area'), - ('South Hyrule Teleporter', 'Dark C Whirlpool Area'), + ('South Hyrule Teleporter', 'Dark C Whirlpool Portal Area'), ('C Whirlpool Cliff Ledge Drop', 'C Whirlpool Area'), # OWG ('Dark C Whirlpool Cliff Ledge Drop', 'Dark C Whirlpool Area'), # OWG ('C Whirlpool Outer Cliff Ledge Drop', 'C Whirlpool Outer Area'), # OWG @@ -1702,7 +1702,7 @@ ow_connections = { ], [ ('Dark C Whirlpool Mirror Spot', 'Dark C Whirlpool Area'), ('Dark C Whirlpool Outer Mirror Spot', 'Dark C Whirlpool Outer Area'), - ('South Dark World Teleporter', 'C Whirlpool Area'), + ('South Dark World Teleporter', 'C Whirlpool Portal Area'), ('C Whirlpool Cliff Ledge Drop', 'Dark C Whirlpool Area'), # OWG ('Dark C Whirlpool Cliff Ledge Drop', 'C Whirlpool Area'), # OWG ('C Whirlpool Outer Cliff Ledge Drop', 'Dark C Whirlpool Outer Area'), # OWG diff --git a/Rules.py b/Rules.py index 8394fbd5..ec4aec40 100644 --- a/Rules.py +++ b/Rules.py @@ -199,7 +199,7 @@ def global_rules(world, player): set_rule(world.get_location('Purple Chest', player), lambda state: state.has('Deliver Purple Chest', player)) # Can S&Q with chest set_rule(world.get_location('Big Bomb', player), lambda state: state.has('Crystal 5', player) and state.has('Crystal 6', player)) set_rule(world.get_location('Pyramid Crack', player), lambda state: state.has('Pick Up Big Bomb', player)) - set_rule(world.get_entrance('Pyramid Fairy', player), lambda state: state.has('Detonate Big Bomb', player)) + set_rule(world.get_entrance('Pyramid Crack', player), lambda state: state.has('Detonate Big Bomb', player)) set_rule(world.get_location('Master Sword Pedestal', player), lambda state: state.has('Red Pendant', player) and state.has('Blue Pendant', player) and state.has('Green Pendant', player)) set_rule(world.get_location('Missing Smith', player), lambda state: state.has('Get Frog', player))