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

Note to self: evaluate this big key rule implication after the big key sphere refactor

Browse Source
This commit is contained in:
aerinon
2021-01-11 10:28:50 -07:00
parent d64a4e63a2
commit 8c2ceecd28
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
KeyDoorShuffle.py
View File

@@ -374,15 +374,16 @@ def refine_placement_rules(key_layout, max_ctr):
rule.needed_keys_w_bk -= len(key_onlys) rule.needed_keys_w_bk -= len(key_onlys)
if rule.needed_keys_w_bk == 0: if rule.needed_keys_w_bk == 0:
rules_to_remove.append(rule) rules_to_remove.append(rule)
if rule.bk_relevant and len(rule.check_locations_w_bk) == rule.needed_keys_w_bk + 1: # todo: evaluate this usage
new_restricted = set(max_ctr.free_locations) - rule.check_locations_w_bk # if rule.bk_relevant and len(rule.check_locations_w_bk) == rule.needed_keys_w_bk + 1:
if len(new_restricted | key_logic.bk_restricted) < len(key_layout.all_chest_locations): # new_restricted = set(max_ctr.free_locations) - rule.check_locations_w_bk
if len(new_restricted - key_logic.bk_restricted) > 0: # if len(new_restricted | key_logic.bk_restricted) < len(key_layout.all_chest_locations):
key_logic.bk_restricted.update(new_restricted) # bk must be in one of the check_locations # if len(new_restricted - key_logic.bk_restricted) > 0:
changed = True # key_logic.bk_restricted.update(new_restricted) # bk must be in one of the check_locations
else: # changed = True
rules_to_remove.append(rule) # else:
changed = True # rules_to_remove.append(rule)
# changed = True
if rule.needed_keys_w_bk > key_layout.max_chests or len(rule.check_locations_w_bk) < rule.needed_keys_w_bk: if rule.needed_keys_w_bk > key_layout.max_chests or len(rule.check_locations_w_bk) < rule.needed_keys_w_bk:
logging.getLogger('').warning('Invalid rule - what went wrong here??') logging.getLogger('').warning('Invalid rule - what went wrong here??')
rules_to_remove.append(rule) rules_to_remove.append(rule)