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

Renamed regions and exits related to Mountain Entry

Browse Source
This commit is contained in:
codemann8
2021-05-25 20:29:53 -05:00
parent a56db37d6f
commit 6bdd63be45
4 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
EntranceShuffle.py
View File

@@ -3131,7 +3131,7 @@ default_connections = [('Links House', 'Links House'),
('Old Man Cave (West)', 'Old Man Cave Ledge'),
('Old Man Cave (East)', 'Old Man Cave'),
('Old Man Cave Exit (West)', 'Death Mountain Entrance'),
('Old Man Cave Exit (West)', 'Mountain Entry Entrance'),
('Old Man Cave Exit (East)', 'West Death Mountain (Bottom)'),
('Old Man House (Bottom)', 'Old Man House'),
('Old Man House Exit (Bottom)', 'West Death Mountain (Bottom)'),
@@ -3139,7 +3139,7 @@ default_connections = [('Links House', 'Links House'),
('Old Man House Exit (Top)', 'West Death Mountain (Bottom)'),
('Death Mountain Return Cave (East)', 'Death Mountain Return Cave'),
('Death Mountain Return Cave (West)', 'Death Mountain Return Cave'),
('Death Mountain Return Cave Exit (West)', 'Death Mountain Return Ledge'),
('Death Mountain Return Cave Exit (West)', 'Mountain Entry Ledge'),
('Death Mountain Return Cave Exit (East)', 'West Death Mountain (Bottom)'),
('Spectacle Rock Cave Peak', 'Spectacle Rock Cave (Peak)'),
('Spectacle Rock Cave (Bottom)', 'Spectacle Rock Cave (Bottom)'),
@@ -3219,12 +3219,12 @@ inverted_default_connections = [('Old Man Cave (West)', 'Bumper Cave'),
('Dark Death Mountain Fairy', 'Old Man Cave'),
('Bumper Cave (Bottom)', 'Old Man Cave Ledge'),
('Bumper Cave (Top)', 'Dark Death Mountain Healer Fairy'),
('Bumper Cave Exit (Top)', 'Death Mountain Return Ledge'),
('Bumper Cave Exit (Bottom)', 'Mountain Entry Entrance'),
('Death Mountain Return Cave (West)', 'Bumper Cave'),
('Death Mountain Return Cave (East)', 'Death Mountain Return Cave'),
('Death Mountain Return Cave Exit (West)', 'West Death Mountain (Bottom)'),
('Death Mountain Return Cave Exit (East)', 'West Death Mountain (Bottom)'),
('Bumper Cave Exit (Top)', 'Mountain Entry Ledge'),
('Links House', 'Big Bomb Shop'),
('Links House Exit', 'Big Bomb Shop Area'),

7
OverworldShuffle.py
View File

@@ -330,9 +330,10 @@ mandatory_connections = [('Flute Away', 'Flute Sky'),
('TR Pegs Ledge Entry', 'Death Mountain TR Pegs Ledge'), #mitts
('TR Pegs Ledge Leave', 'Death Mountain TR Pegs'), #mitts
('TR Pegs Ledge Drop', 'Death Mountain TR Pegs'),
('Death Mountain Entrance Rock', 'Death Mountain Entrance'), #glove
('Death Mountain Entrance Drop', 'Mountain Entry Area'),
('Death Mountain Return Drop', 'Mountain Entry Area'),
('Mountain Entry Entrance Rock (West)', 'Mountain Entry Entrance'), #glove
('Mountain Entry Entrance Rock (East)', 'Mountain Entry Area'), #glove
('Mountain Entry Entrance Ledge Drop', 'Mountain Entry Area'),
('Mountain Entry Ledge Drop', 'Mountain Entry Area'),
('Zora Waterfall Landing', 'Zora Waterfall Area'),
('Zora Waterfall Water Drop', 'Zora Waterfall Water'), #flippers
('Zora Waterfall Water Entry', 'Zora Waterfall Water'), #flippers

6
Regions.py
View File

@@ -26,9 +26,9 @@ def create_regions(world, player):
create_lw_region(player, 'Death Mountain Floating Island', ['Floating Island'], ['Floating Island Bridge (West)', 'Dark Floating Island Mirror Spot']),
create_lw_region(player, 'Death Mountain TR Pegs', None, ['TR Pegs Ledge Entry', 'Turtle Rock Mirror Spot', 'Death Mountain TR Pegs WN']),
create_lw_region(player, 'Death Mountain TR Pegs Ledge', None, ['TR Pegs Ledge Leave', 'TR Pegs Ledge Drop', 'Turtle Rock Ledge Mirror Spot', 'TR Pegs Teleporter']),
create_lw_region(player, 'Mountain Entry Area', None, ['Death Mountain Entrance Rock', 'Bumper Cave Area Mirror Spot', 'Mountain Entry NW', 'Mountain Entry SE']),
create_lw_region(player, 'Death Mountain Entrance', None, ['Death Mountain Entrance Drop', 'Old Man Cave (West)', 'Bumper Cave Entry Mirror Spot']),
create_lw_region(player, 'Death Mountain Return Ledge', None, ['Death Mountain Return Drop', 'Death Mountain Return Cave (West)', 'Bumper Cave Ledge Mirror Spot']),
create_lw_region(player, 'Mountain Entry Area', None, ['Mountain Entry Entrance Rock (West)', 'Bumper Cave Area Mirror Spot', 'Mountain Entry NW', 'Mountain Entry SE']),
create_lw_region(player, 'Mountain Entry Entrance', None, ['Mountain Entry Entrance Rock (East)', 'Mountain Entry Entrance Ledge Drop', 'Old Man Cave (West)', 'Bumper Cave Entry Mirror Spot']),
create_lw_region(player, 'Mountain Entry Ledge', None, ['Mountain Entry Ledge Drop', 'Death Mountain Return Cave (West)', 'Bumper Cave Ledge Mirror Spot']),
create_lw_region(player, 'Zora Waterfall Area', None, ['Zora Waterfall Water Entry', 'Catfish Mirror Spot', 'Zora Waterfall SE', 'Zora Waterfall NE']),
create_lw_region(player, 'Zora Waterfall Water', None, ['Waterfall of Wishing Cave Entry', 'Zora Waterfall Landing', 'Zora Whirlpool']),
create_lw_region(player, 'Waterfall of Wishing Cave', None, ['Zora Waterfall Water Drop', 'Waterfall of Wishing']),

6
Rules.py
View File

@@ -747,7 +747,8 @@ def default_rules(world, player):
set_rule(world.get_entrance('Fairy Ascension Rocks (South)', player), lambda state: state.can_lift_heavy_rocks(player))
set_rule(world.get_entrance('TR Pegs Ledge Entry', player), lambda state: state.can_lift_heavy_rocks(player))
set_rule(world.get_entrance('TR Pegs Ledge Leave', player), lambda state: state.can_lift_heavy_rocks(player))
set_rule(world.get_entrance('Death Mountain Entrance Rock', player), lambda state: state.can_lift_rocks(player))
set_rule(world.get_entrance('Mountain Entry Entrance Rock (West)', player), lambda state: state.can_lift_rocks(player))
set_rule(world.get_entrance('Mountain Entry Entrance Rock (East)', player), lambda state: state.can_lift_rocks(player))
set_rule(world.get_entrance('Kings Grave Outer Rocks', player), lambda state: state.can_lift_heavy_rocks(player))
set_rule(world.get_entrance('Kings Grave Inner Rocks', player), lambda state: state.can_lift_heavy_rocks(player))
set_rule(world.get_entrance('Potion Shop Rock (South)', player), lambda state: state.can_lift_rocks(player))
@@ -1258,7 +1259,8 @@ def ow_bunny_rules(world, player):
add_bunny_rule(world.get_entrance('DM Broken Bridge (West)', player), player)
add_bunny_rule(world.get_entrance('DM Broken Bridge (East)', player), player)
add_bunny_rule(world.get_entrance('TR Pegs Ledge Entry', player), player)
add_bunny_rule(world.get_entrance('Death Mountain Entrance Rock', player), player)
add_bunny_rule(world.get_entrance('Mountain Entry Entrance Rock (West)', player), player)
add_bunny_rule(world.get_entrance('Mountain Entry Entrance Rock (East)', player), player)
add_bunny_rule(world.get_entrance('Kings Grave Outer Rocks', player), player)
add_bunny_rule(world.get_entrance('Kings Grave Inner Rocks', player), player)
add_bunny_rule(world.get_entrance('Potion Shop Rock (South)', player), player)