Merge remote-tracking branch 'origin/OverworldShuffle' into OverworldShuffle

This commit is contained in:
2022-01-01 15:34:17 -08:00
21 changed files with 425 additions and 260 deletions

View File

@@ -33,7 +33,7 @@ def LanmolasDefeatRule(state, player):
state.has('Fire Rod', player) or
state.has('Ice Rod', player) or
state.has('Cane of Somaria', player) or
state.has('Cane of Byrna', player) or
(state.has('Cane of Byrna', player) and state.can_kill_with_bombs(player)) or
state.can_shoot_arrows(player) or
state.has_special_weapon_level(player, 1)))
@@ -60,7 +60,7 @@ def ArrghusDefeatRule(state, player):
return True
return ((state.has('Fire Rod', player) and (state.can_shoot_arrows(player) or state.can_extend_magic(player, 12))) or #assuming mostly gitting two puff with one shot
(state.has('Ice Rod', player) and (state.can_shoot_arrows(player) or state.can_extend_magic(player, 16))))
(state.has('Ice Rod', player) and state.can_use_bombs(player) and (state.can_shoot_arrows(player) or state.can_extend_magic(player, 16))))
def MothulaDefeatRule(state, player):
@@ -103,8 +103,9 @@ def KholdstareDefeatRule(state, player):
def VitreousDefeatRule(state, player):
return (state.special_weapon_check(player, 2) and
(state.can_shoot_arrows(player) or state.has_blunt_weapon(player) or
state.has_special_weapon_level(player, 2)))
((state.can_shoot_arrows(player) and state.can_kill_with_bombs(player)) or
state.has_blunt_weapon(player) or
state.has_special_weapon_level(player, 2)))
def TrinexxDefeatRule(state, player):
if not (state.has('Fire Rod', player) and state.has('Ice Rod', player)):