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

Removal of indirect connections

Browse Source
This commit is contained in:
codemann8
2022-11-21 11:10:10 -06:00
parent 4986821e92
commit 09f81d8b69
2 changed files with 0 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
BaseClasses.py
View File

@@ -641,15 +641,6 @@ class CollectionState(object):
queue.append((conn, new_crystal_state))
self.path[new_region] = (new_region.name, self.path.get(connection, None))
# Retry connections if the new region can unblock them
from EntranceShuffle import indirect_connections
if new_region.name in indirect_connections:
new_entrance = self.world.get_entrance(indirect_connections[new_region.name], player)
if new_entrance in bc and new_entrance.parent_region in rrp:
new_crystal_state = rrp[new_entrance.parent_region]
if (new_entrance, new_crystal_state) not in queue:
queue.append((new_entrance, new_crystal_state))
# else those connections that are not accessible yet
if self.is_small_door(connection):
door = connection.door if connection.door.smallKey else connection.door.controller

24
EntranceShuffle.py
View File

@@ -2296,30 +2296,6 @@ one_way_ledges = {
'Ice Lake Ledge (West)',
'Ice Lake Ledge (East)'}
}
indirect_connections = {
'Turtle Rock Ledge': 'Turtle Rock',
'Big Bomb Shop': 'Pyramid Crack',
#'East Dark World': 'Pyramid Fairy',
'Pyramid Area': 'Pyramid Crack', # HC Ledge/Courtyard
#'Dark Desert': 'Pyramid Fairy',
#'Misery Mire Area': 'Pyramid Fairy', # Desert/Checkerboard Ledge
#'West Dark World': 'Pyramid Fairy',
#'Dark Chapel Area': 'Pyramid Fairy', # Bonk Rocks
#'Dark Graveyard North': 'Pyramid Fairy', # Graveyard Ledge/Kings Tomb
#'South Dark World': 'Pyramid Fairy',
#'Dig Game Ledge': 'Pyramid Fairy', # Brother House Left
#'Stumpy Approach Area': 'Pyramid Fairy', # Cave 45
# Inverted Cases
#'Light World': 'Pyramid Fairy',
#'Lost Woods West Area': 'Pyramid Fairy', # Skull Woods Back
#'East Death Mountain (Top East)': 'Pyramid Fairy', # Floating Island
#'Blacksmith Area': 'Pyramid Fairy', # Hammerpegs
#'Forgotten Forest Area': 'Pyramid Fairy', # Shield Shop
#'Desert Area': 'Pyramid Fairy', # Mire Area
'Old Man Drop Off': 'Old Man S&Q',
'Old Man Cave': 'Old Man S&Q'
}
# format:
# Key=Name
# addr = (door_index, exitdata, ow_flag) # multiexit