alttpr-gwaa-kiwi/alttpr-python
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Modeled South Portal Area correctly for OWG prep

Browse Source
This commit is contained in:
codemann8
2022-11-28 14:24:32 -06:00
parent 217fcc14da
commit 3ffe137f57
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OWEdges.py
View File

@@ -1137,6 +1137,7 @@ OWTileRegions = bidict({
'Cave 45 Ledge': 0x32, 'Cave 45 Ledge': 0x32,
'C Whirlpool Area': 0x33, 'C Whirlpool Area': 0x33,
'C Whirlpool Portal Area': 0x33,
'C Whirlpool Water': 0x33, 'C Whirlpool Water': 0x33,
'C Whirlpool Outer Area': 0x33, 'C Whirlpool Outer Area': 0x33,
@@ -1274,6 +1275,7 @@ OWTileRegions = bidict({
'Stumpy Approach Bush Entry': 0x72, 'Stumpy Approach Bush Entry': 0x72,
'Dark C Whirlpool Area': 0x73, 'Dark C Whirlpool Area': 0x73,
'Dark C Whirlpool Portal Area': 0x73,
'Dark C Whirlpool Water': 0x73, 'Dark C Whirlpool Water': 0x73,
'Dark C Whirlpool Outer Area': 0x73, 'Dark C Whirlpool Outer Area': 0x73,

4
OverworldShuffle.py
View File

@@ -1690,7 +1690,7 @@ ow_connections = {
0x33: ([ 0x33: ([
('C Whirlpool Mirror Spot', 'C Whirlpool Area'), ('C Whirlpool Mirror Spot', 'C Whirlpool Area'),
('C Whirlpool Outer Mirror Spot', 'C Whirlpool Outer 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 ('C Whirlpool Cliff Ledge Drop', 'C Whirlpool Area'), # OWG
('Dark C Whirlpool Cliff Ledge Drop', 'Dark 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 ('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 Mirror Spot', 'Dark C Whirlpool Area'),
('Dark C Whirlpool Outer Mirror Spot', 'Dark C Whirlpool Outer 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 ('C Whirlpool Cliff Ledge Drop', 'Dark C Whirlpool Area'), # OWG
('Dark C Whirlpool Cliff Ledge Drop', '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 ('C Whirlpool Outer Cliff Ledge Drop', 'Dark C Whirlpool Outer Area'), # OWG

2
Rules.py
View File

@@ -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('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('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_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('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)) set_rule(world.get_location('Missing Smith', player), lambda state: state.has('Get Frog', player))