diff --git a/BaseClasses.py b/BaseClasses.py index dc596d22..dfe71b27 100644 --- a/BaseClasses.py +++ b/BaseClasses.py @@ -474,14 +474,14 @@ class CollectionState(object): return spot.can_reach(self) - def sweep_for_crystal_access(self): - for player, rrp in self.reachable_regions.items(): - dungeon_regions = [x for x in rrp if x.type == RegionType.Dungeon] - ccr = self.colored_regions[player] - for region in dungeon_regions: - if region in ccr.keys(): - self.spread_crystal_access(region, ccr[region], rrp, ccr, player) - self.stale[player] = True + # def sweep_for_crystal_access(self): + # for player, rrp in self.reachable_regions.items(): + # dungeon_regions = [x for x in rrp if x.type == RegionType.Dungeon] + # ccr = self.colored_regions[player] + # for region in dungeon_regions: + # if region in ccr.keys(): + # self.spread_crystal_access(region, ccr[region], rrp, ccr, player) + # self.stale[player] = True def sweep_for_events(self, key_only=False, locations=None): # this may need improvement @@ -500,8 +500,8 @@ class CollectionState(object): self.collect(event.item, True, event) new_locations = len(reachable_events) > checked_locations checked_locations = len(reachable_events) - if new_locations: - self.sweep_for_crystal_access() + #if new_locations: + # self.sweep_for_crystal_access() def can_reach_blue(self, region, player): if region not in self.colored_regions[player].keys(): diff --git a/Main.py b/Main.py index 1b0bcde9..bf39881c 100644 --- a/Main.py +++ b/Main.py @@ -363,7 +363,7 @@ def create_playthrough(world): logging.getLogger('').debug('Building up collection spheres.') while sphere_candidates: state.sweep_for_events(key_only=True) - state.sweep_for_crystal_access() + #state.sweep_for_crystal_access() sphere = [] # build up spheres of collection radius. Everything in each sphere is independent from each other in dependencies and only depends on lower spheres @@ -425,7 +425,7 @@ def create_playthrough(world): collection_spheres = [] while required_locations: state.sweep_for_events(key_only=True) - state.sweep_for_crystal_access() + #state.sweep_for_crystal_access() sphere = list(filter(lambda loc: state.can_reach(loc) and state.not_flooding_a_key(world, loc), required_locations))