From 1985139cb53e4e003ecc3c228c19073463e05d4c Mon Sep 17 00:00:00 2001
From: aerinon <randall.rupper@gmail.com>
Date: Wed, 9 Aug 2023 15:33:11 -0600
Subject: [PATCH]  Fixing generation errors  Update rom for multiworld/vanilla
 sewers problems

---
 Rom.py                        |   2 +-
 data/base2current.bps         | Bin 99601 -> 99616 bytes
 source/enemizer/EnemyLogic.py |   4 ++--
 source/logic/Rule.py          |   4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Rom.py b/Rom.py
index c0ead0f0..e4d8a072 100644
--- a/Rom.py
+++ b/Rom.py
@@ -40,7 +40,7 @@ from source.enemizer.Enemizer import write_enemy_shuffle_settings
 
 
 JAP10HASH = '03a63945398191337e896e5771f77173'
-RANDOMIZERBASEHASH = '465f19132309a103df2f2d802e863dd0'
+RANDOMIZERBASEHASH = '8c20d2bcccfc543a1201ff082e0ebe8e'
 
 
 class JsonRom(object):
diff --git a/data/base2current.bps b/data/base2current.bps
index 188882a8554a4430a8b24129087779ded6714278..14f6759aecf7644cc663c740b375fe5fe027a6f9 100644
GIT binary patch
delta 448
zcmV;x0YCnciUy#H29S;cDUpxU1bRb-ypv`DJptUaqyZ@c0qC>N1Kk4;QnaY6RUD0t
zii5W5h>3%fx(AX0w3AH;kU9XesOsvNl^(OGfC1_}h?OE3w5YHLmnkxVr3oTmv#1&(
z%b2I2l_FoVsOstzfsG=@)SyrefRQ3<lNSk90WPy`30eUN!L+FAxQ!yxgU<@L&k6xQ
z7Xje64<Z3S0TOM3$jE4DX!JwFYiqwS2Y&EbmtZ3SEF-Td2Y%2cq5$9;uphsDv8crW
z&=csteX*#80QzWX^w#+xmzSv{0UiNvm&hXlAQmlyg=k`rgq14=3ZH0Vql}3W$pH6)
zm-Qn7VGdeagMk^Vf{m{t2Y#C~mt-UXV*y~7$Rq(NG4r&jXlo*Y|DH&_fDXwd&>fTH
zfeMp?)dZ;|fDLF%^hLAu6o6bh(uQjye6^^@1z?vVB>^%4{+CrH0W|^emy0C<Isx#P
z#w7u222ZrBU?6FiHYNeF0dkk<CILbVC$@kRvxKq2AgR}vH75Z#0W6noCjmPFBe$t1
q0TfgTMt;_wc}tMPN0-KX0cHgaf3?Rew=sMH*a!%|)>f~yS}2Dx-ny#*

delta 408
zcmV;J0cZZ8iUyI229S;cA(4;M1g}O=xszrAJpt6SqyZ@c0pPRF1Kk4;O0=k}RUD0t
zii5W5h>3fXx(AX0tdmU$kUIFWsOsvNl@_z8fC1_}h?OD`w5YHLmnkxVr3oTev#1&(
z%b2I2l_FQNsOstzfsG=@)SyrefRQ3(lNSk90VcC;30eUNxwNS2xQ!ypgU<@L&k6xQ
z7XjF}4<Z3S0TNY$$jE4DX!JwFYiqwS2Y&EVmtZ3SEFGc%;2N+Wzjv{y#Q@L~=)ZTd
zsD%LfXlV4-`5=*(uOk5-0b-ZVBLN@{A%lfzVxNSCXks6LgqH*)0bveGT7!WZtAdTM
zA_sn(BbRd|0b>DBm)9f#DFN%30VM$+5k0f?6o6bh(uQjybhW6*bzhe;B>^%4_LpQO
z0W|^WmzpI3IsxdH)g=LH21m53U?5?aMJ55U0cw}`CILbVAGUxJvxKq2AgRxnL?;0^
z0UVcnCjmPFL$|mm0TfgTHh$Kgc}tMPH<#6W0cHgqf3?ROw?KRW*a!%D$=_I<oGDZR
CC#FIG

diff --git a/source/enemizer/EnemyLogic.py b/source/enemizer/EnemyLogic.py
index 05bcb5e4..4bb66d8f 100644
--- a/source/enemizer/EnemyLogic.py
+++ b/source/enemizer/EnemyLogic.py
@@ -81,13 +81,13 @@ def defeat_rule_multiple(world, player, enemy_sprite_region_pairs):
     bombs_required = False
 
     for key, vln in vln_list.items():
-        if key[0] == EnemySprite.Terrorpin:
+        if key[0].kind == EnemySprite.Terrorpin:
             if not hammer_required:
                 required_rules.append(has('Hammer', player))
                 hammer_required = True
             picky_enemies.append(key)
             continue
-        if key[0] == EnemySprite.StalfosKnight:
+        if key[0].kind == EnemySprite.StalfosKnight:
             if not bombs_required:
                 required_rules.append(bombs_rule(world, player, 1))
                 bombs_required = True
diff --git a/source/logic/Rule.py b/source/logic/Rule.py
index ff923b8d..970062bb 100644
--- a/source/logic/Rule.py
+++ b/source/logic/Rule.py
@@ -118,7 +118,7 @@ class RuleFactory(object):
                 rule_lambda = r.rule_lambda
             else:
                 rule_lambda = and_rule(rule_lambda, r.rule_lambda)
-        rule.rule_lambda = rule_lambda
+        rule.rule_lambda = rule_lambda if rule_lambda else lambda state: True
         return rule
 
     @staticmethod
@@ -142,7 +142,7 @@ class RuleFactory(object):
                 rule_lambda = r.rule_lambda
             else:
                 rule_lambda = or_rule(rule_lambda, r.rule_lambda)
-        rule.rule_lambda = rule_lambda
+        rule.rule_lambda = rule_lambda if rule_lambda else lambda state: True
         return rule
 
     @staticmethod