monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pokémon R/B: Door Shuffle efficiency improvement and crash fix (#2347) 

Sweep only current player's locations so that more players does not slow it down.
Fix a slight possibility of Full door shuffle crash by only sorting for outdoor dead ends only when connecting from a non-dead end.
This commit is contained in:
Alchav 2023-10-23 13:28:16 -04:00 committed by GitHub
parent 724999fc43
commit 195cf60e8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
worlds/pokemon_rb/regions.py
View File

@ -2267,9 +2267,12 @@ def create_regions(self):
"Defeat Viridian Gym Giovanni", "Defeat Viridian Gym Giovanni",
] ]
event_locations = self.multiworld.get_filled_locations(player)
def adds_reachable_entrances(entrances_copy, item): def adds_reachable_entrances(entrances_copy, item):
state_copy = state.copy() state_copy = state.copy()
state_copy.collect(item, False) state_copy.collect(item, True)
state.sweep_for_events(locations=event_locations)
ret = len([entrance for entrance in entrances_copy if entrance in reachable_entrances or ret = len([entrance for entrance in entrances_copy if entrance in reachable_entrances or
entrance.parent_region.can_reach(state_copy)]) > len(reachable_entrances) entrance.parent_region.can_reach(state_copy)]) > len(reachable_entrances)
return ret return ret
@ -2305,7 +2308,6 @@ def create_regions(self):
starting_entrances = len(entrances) starting_entrances = len(entrances)
dc_connected = [] dc_connected = []
event_locations = self.multiworld.get_filled_locations(player)
rock_tunnel_entrances = [entrance for entrance in entrances if "Rock Tunnel" in entrance.name] rock_tunnel_entrances = [entrance for entrance in entrances if "Rock Tunnel" in entrance.name]
entrances = [entrance for entrance in entrances if entrance not in rock_tunnel_entrances] entrances = [entrance for entrance in entrances if entrance not in rock_tunnel_entrances]
while entrances: while entrances:
@ -2330,10 +2332,6 @@ def create_regions(self):
if multiworld.door_shuffle[player] == "full" or len(entrances) != len(reachable_entrances): if multiworld.door_shuffle[player] == "full" or len(entrances) != len(reachable_entrances):
entrances.sort(key=lambda e: e.name not in entrance_only) entrances.sort(key=lambda e: e.name not in entrance_only)
if len(entrances) < 48 and multiworld.door_shuffle[player] == "full":
# Prevent a situation where the only remaining outdoor entrances are ones that cannot be reached
# except by connecting directly to it.
entrances.sort(key=lambda e: e.name in unreachable_outdoor_entrances)
# entrances list is empty while it's being sorted, must pass a copy to iterate through # entrances list is empty while it's being sorted, must pass a copy to iterate through
entrances_copy = entrances.copy() entrances_copy = entrances.copy()
if multiworld.door_shuffle[player] == "decoupled": if multiworld.door_shuffle[player] == "decoupled":
@ -2350,6 +2348,11 @@ def create_regions(self):
dead_end(entrances_copy, e) else 2) dead_end(entrances_copy, e) else 2)
if multiworld.door_shuffle[player] == "full": if multiworld.door_shuffle[player] == "full":
outdoor = outdoor_map(entrances[0].parent_region.name) outdoor = outdoor_map(entrances[0].parent_region.name)
if len(entrances) < 48 and not outdoor:
# Prevent a situation where the only remaining outdoor entrances are ones that cannot be reached
# except by connecting directly to it.
entrances.sort(key=lambda e: e.name in unreachable_outdoor_entrances)
entrances.sort(key=lambda e: outdoor_map(e.parent_region.name) != outdoor) entrances.sort(key=lambda e: outdoor_map(e.parent_region.name) != outdoor)
assert entrances[0] in reachable_entrances, \ assert entrances[0] in reachable_entrances, \
"Ran out of valid reachable entrances in Pokemon Red and Blue door shuffle" "Ran out of valid reachable entrances in Pokemon Red and Blue door shuffle"