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

Core: improve sweep_for_events efficiency (#1092)

This commit is contained in:
Alchav 2022-10-12 23:46:07 -04:00 committed by GitHub
parent f909576813
commit 0afb7096de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
BaseClasses.py
View File

@ -689,14 +689,14 @@ class CollectionState():
def sweep_for_events(self, key_only: bool = False, locations: Optional[Iterable[Location]] = None) -> None: def sweep_for_events(self, key_only: bool = False, locations: Optional[Iterable[Location]] = None) -> None:
if locations is None: if locations is None:
locations = self.world.get_filled_locations() locations = self.world.get_filled_locations()
new_locations = True reachable_events = True
# since the loop has a good chance to run more than once, only filter the events once # since the loop has a good chance to run more than once, only filter the events once
locations = {location for location in locations if location.event and locations = {location for location in locations if location.event and
not key_only or getattr(location.item, "locked_dungeon_item", False)} not key_only or getattr(location.item, "locked_dungeon_item", False)}
while new_locations: while reachable_events:
reachable_events = {location for location in locations if location.can_reach(self)} reachable_events = {location for location in locations if location.can_reach(self)}
new_locations = reachable_events - self.events locations -= reachable_events
for event in new_locations: for event in reachable_events:
self.events.add(event) self.events.add(event)
assert isinstance(event.item, Item), "tried to collect Event with no Item" assert isinstance(event.item, Item), "tried to collect Event with no Item"
self.collect(event.item, True, event) self.collect(event.item, True, event)