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

Ignore impossible key counters when checking key placement.

Browse Source
This commit is contained in:
compiling
2020-02-08 11:31:50 +11:00
parent ed3e2da663
commit 8fc9132746
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
KeyDoorShuffle.py
View File

@@ -1239,7 +1239,7 @@ def val_rule(rule, skn, allow=False, loc=None, askn=None, setCheck=None):
# Soft lock stuff # Soft lock stuff
def validate_key_placement(key_layout, world, player): def validate_key_placement(key_layout, world, player):
if world.retro[player] or world.accessibility[player] == 'none': if world.retro[player] or world.accessibility[player] == 'none':
return True # Can't keylock in retro. Expected if beatable only. return True # Can't keylock in retro. Expected if beatable only.
max_counter = find_max_counter(key_layout) max_counter = find_max_counter(key_layout)
keys_outside = 0 keys_outside = 0
big_key_outside = False big_key_outside = False
@@ -1255,6 +1255,8 @@ def validate_key_placement(key_layout, world, player):
if len(counter.child_doors) == 0: if len(counter.child_doors) == 0:
continue continue
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 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
if counter.big_key_opened and not big_found:
continue # Can't get to this state
found_locations = set(i for i in counter.free_locations if big_found or "- Big Chest" not in i.name) 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) + \ 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