diff --git a/worlds/tloz_oos/data/logic/DungeonsLogic.py b/worlds/tloz_oos/data/logic/DungeonsLogic.py index 91903446f5ea..2a5ff4e41d4f 100644 --- a/worlds/tloz_oos/data/logic/DungeonsLogic.py +++ b/worlds/tloz_oos/data/logic/DungeonsLogic.py @@ -62,7 +62,7 @@ def make_d1_logic(player: int): oos_can_kill_stalfos(state, player) ])], - ["d1 stalfos chest", "d1 goriya chest", False, lambda state: any([ + ["d1 stalfos chest", "d1 goriya chest", False, lambda state: all([ oos_can_use_ember_seeds(state, player, True), oos_can_kill_normal_enemy(state, player, True) ])], @@ -107,11 +107,14 @@ def make_d2_logic(player: int): ["d2 torch room", "d2 rope drop", False, lambda state: oos_can_kill_normal_enemy(state, player)], ["d2 torch room", "d2 arrow room", False, lambda state: oos_can_use_ember_seeds(state, player, True)], - ["d2 arrow room", "d2 torch room", False, lambda state: any([ - # Backwards path is one-way if we don't have ember seeds, so ensure we have a way to warp out in case - # something goes wrong - oos_can_use_ember_seeds(state, player, True), - oos_can_warp(state, player) + ["d2 arrow room", "d2 torch room", False, lambda state: all([ + oos_can_kill_normal_enemy(state, player), + any([ + # Backwards path is one-way if we don't have ember seeds, so ensure we have a way to warp out in case + # something goes wrong + oos_can_use_ember_seeds(state, player, True), + oos_can_warp(state, player) + ]) ])], ["d2 arrow room", "d2 rupee room", False, lambda state: oos_has_bombs(state, player)], ["d2 arrow room", "d2 rope chest", False, lambda state: oos_can_kill_normal_enemy(state, player)],