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

Big enemizer updates

Browse Source 
Fix sheets
Health + damage rando
Logical kill rooms
This commit is contained in:
aerinon
2023-03-30 16:12:46 -06:00
parent d85a63ece1
commit a0b781521f
22 changed files with 2224 additions and 947 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/logic/Rule.py
View File

@@ -104,6 +104,8 @@ class RuleFactory(object):
rule = Rule(RuleType.Conjunction)
rule_lambda = None
for r in rules:
if r is None:
continue
if r.rule_type == RuleType.Conjunction:
rule.sub_rules.extend(r.sub_rules) # todo: this extension for the lambda calc
elif r.rule_type == RuleType.Static and r.principal: # remove static flag if unnecessary
@@ -126,6 +128,8 @@ class RuleFactory(object):
rule = Rule(RuleType.Disjunction)
rule_lambda = None
for r in rules:
if r is None:
continue
if r.rule_type == RuleType.Disjunction:
rule.sub_rules.extend(r.sub_rules) # todo: this extension for the lambda calc
elif r.rule_type == RuleType.Static and not r.principal: # remove static flag if unnecessary