Fixing generation errors

Update rom for multiworld/vanilla sewers problems
This commit is contained in:
aerinon
2023-08-09 15:33:11 -06:00
parent f906633c2b
commit 1985139cb5
4 changed files with 5 additions and 5 deletions

2
Rom.py
View File

@@ -40,7 +40,7 @@ from source.enemizer.Enemizer import write_enemy_shuffle_settings
JAP10HASH = '03a63945398191337e896e5771f77173' JAP10HASH = '03a63945398191337e896e5771f77173'
RANDOMIZERBASEHASH = '465f19132309a103df2f2d802e863dd0' RANDOMIZERBASEHASH = '8c20d2bcccfc543a1201ff082e0ebe8e'
class JsonRom(object): class JsonRom(object):

Binary file not shown.

View File

@@ -81,13 +81,13 @@ def defeat_rule_multiple(world, player, enemy_sprite_region_pairs):
bombs_required = False bombs_required = False
for key, vln in vln_list.items(): for key, vln in vln_list.items():
if key[0] == EnemySprite.Terrorpin: if key[0].kind == EnemySprite.Terrorpin:
if not hammer_required: if not hammer_required:
required_rules.append(has('Hammer', player)) required_rules.append(has('Hammer', player))
hammer_required = True hammer_required = True
picky_enemies.append(key) picky_enemies.append(key)
continue continue
if key[0] == EnemySprite.StalfosKnight: if key[0].kind == EnemySprite.StalfosKnight:
if not bombs_required: if not bombs_required:
required_rules.append(bombs_rule(world, player, 1)) required_rules.append(bombs_rule(world, player, 1))
bombs_required = True bombs_required = True

View File

@@ -118,7 +118,7 @@ class RuleFactory(object):
rule_lambda = r.rule_lambda rule_lambda = r.rule_lambda
else: else:
rule_lambda = and_rule(rule_lambda, r.rule_lambda) 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 return rule
@staticmethod @staticmethod
@@ -142,7 +142,7 @@ class RuleFactory(object):
rule_lambda = r.rule_lambda rule_lambda = r.rule_lambda
else: else:
rule_lambda = or_rule(rule_lambda, r.rule_lambda) 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 return rule
@staticmethod @staticmethod