Quick fix for has_beam_sword failures

This commit is contained in:
2024-08-11 22:16:33 -05:00
parent 3d1246d279
commit f8e427eae7
2 changed files with 4 additions and 4 deletions

View File

@@ -90,7 +90,7 @@ def IceBlindDefeatRule(state, player):
return ( return (
( (
# weapon # weapon
state.has_beam_sword(player) or state.has_sword(player, 2) or
state.has('Cane of Somaria', player) or state.has('Cane of Somaria', player) or
(state.has('Cane of Byrna', player) and state.can_extend_magic(player, 16)) (state.has('Cane of Byrna', player) and state.can_extend_magic(player, 16))
) and ) and
@@ -136,7 +136,7 @@ def IceKholdstareDefeatRule(state, player):
) )
) and ) and
( (
state.has_beam_sword(player) or state.has_sword(player, 2) or
(state.has('Fire Rod', player) and state.can_extend_magic(player, 20)) or (state.has('Fire Rod', player) and state.can_extend_magic(player, 20)) or
# FIXME: this actually only works for the vanilla location for swordless # FIXME: this actually only works for the vanilla location for swordless
( (
@@ -157,7 +157,7 @@ def VitreousDefeatRule(state, player):
def IceVitreousDefeatRule(state, player): def IceVitreousDefeatRule(state, player):
return (state.can_shoot_arrows(player) and state.can_use_bombs(player)) or state.has_beam_sword(player) return (state.can_shoot_arrows(player) and state.can_use_bombs(player)) or state.has_sword(player, 2)
def TrinexxDefeatRule(state, player): def TrinexxDefeatRule(state, player):

View File

@@ -103,7 +103,7 @@ def dungeon_reentry_rules(world, player, clip: Entrance, dungeon_region: str, du
Rules.add_rule( Rules.add_rule(
clip, clip,
lambda state: state.has("Cape", player) lambda state: state.has("Cape", player)
or state.has_beam_sword(player) or state.has_sword(player, 2)
or state.has("Beat Agahnim 1", player), or state.has("Beat Agahnim 1", player),
) )