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

Modeling Fairy Ascension Mirror Spot more correctly

Browse Source
This commit is contained in:
codemann8
2022-12-26 05:21:59 -06:00
parent ce93770887
commit c6d0df5f4f
4 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
EntranceShuffle.py
View File

@@ -2160,6 +2160,7 @@ mandatory_connections = [('Links House S&Q', 'Links House'),
('Desert Ledge Rocks (Inner)', 'Desert Ledge'),
('Skull Woods Forest', 'Skull Woods Forest'),
('East Dark Death Mountain Bushes', 'East Dark Death Mountain (Bushes)'),
('Bumper Cave Entrance Rock', 'Bumper Cave Entrance'),
('Dark Witch Rock (North)', 'Northeast Dark World'),
('Dark Witch Rock (South)', 'Catfish Area'),

5
Regions.py
View File

@@ -81,8 +81,9 @@ def create_regions(world, player):
create_dw_region(player, 'Dark Death Mountain Floating Island', None, ['Hookshot Cave Back Entrance', 'Floating Island Drop', 'Dark Floating Island Mirror Spot'], 'a dark island'),
create_dw_region(player, 'Dark Death Mountain Ledge', None, ['Dark Death Mountain Ledge (West)', 'Dark Death Mountain Ledge (East)', 'Mimic Cave Mirror Spot', 'Spiral Cave Mirror Spot'], 'a dark ledge'),
create_dw_region(player, 'Dark Death Mountain Isolated Ledge', None, ['Turtle Rock Isolated Ledge Entrance', 'Isolated Ledge Mirror Spot'], 'a dark vista'),
create_dw_region(player, 'East Dark Death Mountain (Bottom)', None, ['Superbunny Cave (Bottom)', 'Dark Death Mountain Shop',
'East Dark Death Mountain Teleporter (Bottom)', 'EDDM Flute', 'Fairy Ascension Mirror Spot']),
create_dw_region(player, 'East Dark Death Mountain (Bottom)', None, ['East Dark Death Mountain Bushes', 'Superbunny Cave (Bottom)', 'Dark Death Mountain Shop',
'East Dark Death Mountain Teleporter (Bottom)', 'EDDM Flute']),
create_dw_region(player, 'East Dark Death Mountain (Bushes)', None, ['Fairy Ascension Mirror Spot']),
create_dw_region(player, 'Turtle Rock (Top)', None, ['Turtle Rock Drop', 'East Dark Death Mountain Teleporter (Top)']),
create_dw_region(player, 'West Dark World', ['Frog'], ['Dark Lumberjack Shop', 'Fortune Teller (Dark)', 'Dark Sanctuary Hint', 'Chest Game', 'Thieves Town',
'C-Shaped House', 'Brewery', 'Red Shield Shop', 'Skull Woods Forest', 'Bumper Cave Entrance Rock',

3
Rules.py
View File

@@ -860,7 +860,7 @@ def ow_inverted_rules(world, player):
set_rule(world.get_entrance('Spiral Cave Mirror Spot', player), lambda state: state.has_Mirror(player))
set_rule(world.get_entrance('Mimic Cave Mirror Spot', player), lambda state: state.has_Mirror(player))
set_rule(world.get_entrance('Isolated Ledge Mirror Spot', player), lambda state: state.has_Mirror(player))
set_rule(world.get_entrance('Fairy Ascension Mirror Spot', player), lambda state: state.has_Mirror(player) and state.has_Pearl(player)) # need to lift flowers
set_rule(world.get_entrance('Fairy Ascension Mirror Spot', player), lambda state: state.has_Mirror(player))
set_rule(world.get_entrance('Bumper Cave Ledge Mirror Spot', player), lambda state: state.has_Mirror(player))
set_rule(world.get_entrance('Bumper Cave Entrance Mirror Spot', player), lambda state: state.has_Mirror(player))
set_rule(world.get_entrance('Graveyard Ledge Mirror Spot', player), lambda state: state.has_Mirror(player))
@@ -995,6 +995,7 @@ def ow_bunny_rules(world, player):
add_bunny_rule(world.get_entrance('Desert Ledge Rocks (Outer)', player), player)
add_bunny_rule(world.get_entrance('Desert Ledge Rocks (Inner)', player), player)
add_bunny_rule(world.get_entrance('East Dark Death Mountain Bushes', player), player)
add_bunny_rule(world.get_entrance('Bumper Cave Entrance Rock', player), player)
add_bunny_rule(world.get_entrance('Dark Witch Rock (North)', player), player)
add_bunny_rule(world.get_entrance('Dark Witch Rock (South)', player), player)

1
source/overworld/EntranceShuffle2.py
View File

@@ -1949,6 +1949,7 @@ mandatory_connections = [('Links House S&Q', 'Links House'),
('Desert Ledge Rocks (Inner)', 'Desert Ledge'),
('Skull Woods Forest', 'Skull Woods Forest'),
('East Dark Death Mountain Bushes', 'East Dark Death Mountain (Bushes)'),
('Bumper Cave Entrance Rock', 'Bumper Cave Entrance'),
('Dark Witch Rock (North)', 'Northeast Dark World'),
('Dark Witch Rock (South)', 'Catfish Area'),