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

Keylock checks:

Browse Source 
Big Chest only available after the big key is found
Bosses are always required locations
Don't check for 100% locations - failure rate is too high
This commit is contained in:
compiling
2020-02-05 22:48:39 +11:00
parent 8ad28542a4
commit b321410e5a
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
KeyDoorShuffle.py
View File

@@ -1254,17 +1254,19 @@ def validate_key_placement(key_layout, world, player):
for counter in key_layout.key_counters.values(): for counter in key_layout.key_counters.values():
if len(counter.child_doors) == 0: if len(counter.child_doors) == 0:
continue continue
found_keys = sum(1 for i in counter.free_locations if i.item is not None and i.item.name == smallkey_name and i.item.player == player) + \ big_found = any(i.item == dungeon.big_key for i in counter.free_locations if "- Big Chest" not in i.name) or big_key_outside
found_locations = set(i for i in counter.free_locations if big_found or "- Big Chest" not in i.name)
found_keys = sum(1 for i in found_locations if i.item is not None and i.item.name == smallkey_name and i.item.player == player) + \
len(counter.key_only_locations) + keys_outside len(counter.key_only_locations) + keys_outside
big_found = any(i.item == dungeon.big_key for i in counter.free_locations) or big_key_outside can_progress = (not counter.big_key_opened and big_found and any(d.bigKey for d in counter.child_doors)) or \
can_progress = (not counter.big_key_opened and big_found) or found_keys > counter.used_keys and any(not d.bigKey for d in counter.child_doors) found_keys > counter.used_keys and any(not d.bigKey for d in counter.child_doors)
if not can_progress: if not can_progress:
missing_locations = set(max_counter.free_locations.keys()).difference(counter.free_locations.keys()) missing_locations = set(max_counter.free_locations.keys()).difference(found_locations)
missing_key_only = set(max_counter.key_only_locations.keys()).difference(counter.key_only_locations.keys()) missing_key_only = set(max_counter.key_only_locations.keys()).difference(counter.key_only_locations.keys())
if world.accessibility[player] == 'items': if world.accessibility[player] == 'items' or True: # locations is busted - just check items are accessible for now
# Maybe ok if only locking keys # Ok if only locking keys
missing_key_only = [] missing_key_only = []
missing_locations = [l for l in missing_locations if l.item is None or (l.item.name != smallkey_name and l.item != dungeon.big_key)] missing_locations = [l for l in missing_locations if l.item is None or (l.item.name != smallkey_name and l.item != dungeon.big_key) or "- Boss" in l.name]
if len(missing_locations) > 0 or len(missing_key_only) > 0: if len(missing_locations) > 0 or len(missing_key_only) > 0:
logging.getLogger('').error("Keylock - can't open locations: ") logging.getLogger('').error("Keylock - can't open locations: ")
for i in missing_locations: for i in missing_locations: