From f8e427eae76b996408ded283b3a797430304e912 Mon Sep 17 00:00:00 2001 From: Kara Alexandra Date: Sun, 11 Aug 2024 22:16:33 -0500 Subject: [PATCH] Quick fix for has_beam_sword failures --- Bosses.py | 6 +++--- UnderworldGlitchRules.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Bosses.py b/Bosses.py index 130fe2b8..3f07059b 100644 --- a/Bosses.py +++ b/Bosses.py @@ -90,7 +90,7 @@ def IceBlindDefeatRule(state, player): return ( ( # weapon - state.has_beam_sword(player) or + state.has_sword(player, 2) or state.has('Cane of Somaria', player) or (state.has('Cane of Byrna', player) and state.can_extend_magic(player, 16)) ) and @@ -136,7 +136,7 @@ def IceKholdstareDefeatRule(state, player): ) ) 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 # FIXME: this actually only works for the vanilla location for swordless ( @@ -157,7 +157,7 @@ def VitreousDefeatRule(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): diff --git a/UnderworldGlitchRules.py b/UnderworldGlitchRules.py index c01e242f..23e4498b 100644 --- a/UnderworldGlitchRules.py +++ b/UnderworldGlitchRules.py @@ -103,7 +103,7 @@ def dungeon_reentry_rules(world, player, clip: Entrance, dungeon_region: str, du Rules.add_rule( clip, 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), )