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

Key flood protection in sweep for events

Browse Source 
Better loop validation
Small key validation tweaks
This commit is contained in:
aerinon
2019-10-15 15:15:29 -06:00
parent ce626bd093
commit 4d35265e5c
2 changed files with 49 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
BaseClasses.py
View File

@@ -401,6 +401,7 @@ class CollectionState(object):
if locations is None:
locations = self.world.get_filled_locations()
reachable_events = [location for location in locations if location.event and (not key_only or location.item.key) and location.can_reach(self)]
reachable_events = self._do_not_flood_the_keys(reachable_events)
for event in reachable_events:
if (event.name, event.player) not in self.events:
self.events.append((event.name, event.player))
@@ -408,6 +409,17 @@ class CollectionState(object):
new_locations = len(reachable_events) > checked_locations
checked_locations = len(reachable_events)
def _do_not_flood_the_keys(self, reachable_events):
adjusted_checks = list(reachable_events)
for event in reachable_events:
if event.name == 'Trench 2 Switch' and self.world.get_location('Swamp Palace - Trench 2 Pot Key', event.player) not in reachable_events:
adjusted_checks.remove(event)
if event.name == 'Trench 1 Switch' and self.world.get_location('Swamp Palace - Trench 1 Pot Key', event.player) not in reachable_events:
adjusted_checks.remove(event)
if len(adjusted_checks) < len(reachable_events):
return adjusted_checks
return reachable_events
def has(self, item, player, count=1):
if count == 1:
return (item, player) in self.prog_items