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

Ignore certain rules when bk isn't available in contradiction checking

Browse Source
This commit is contained in:
aerinon
2021-08-04 13:46:30 -06:00
parent d7e326f71d
commit feb9177871
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
KeyDoorShuffle.py
View File

@@ -127,6 +127,10 @@ class PlacementRule(object):
rule_locations = rule.check_locations_wo_bk if rule_blocked else rule.check_locations_w_bk rule_locations = rule.check_locations_wo_bk if rule_blocked else rule.check_locations_w_bk
if check_locations is None or rule_locations is None: if check_locations is None or rule_locations is None:
return False return False
if not bk_blocked and big_key_loc not in check_locations: # bk is not available, so rule doesn't apply
return False
if not rule_blocked and big_key_loc not in rule_locations: # bk is not available, so rule doesn't apply
return False
check_locations = check_locations - {big_key_loc} check_locations = check_locations - {big_key_loc}
rule_locations = rule_locations - {big_key_loc} rule_locations = rule_locations - {big_key_loc}
threshold = self.needed_keys_wo_bk if bk_blocked else self.needed_keys_w_bk threshold = self.needed_keys_wo_bk if bk_blocked else self.needed_keys_w_bk