From 5b493f3e6eb2314b4a091d2bbc9af7820ac29921 Mon Sep 17 00:00:00 2001 From: Scipio Wright Date: Fri, 21 Jun 2024 19:08:49 -0400 Subject: [PATCH] Fix missing logic on bridge switch chest in upper zig --- worlds/tunic/er_rules.py | 3 +-- worlds/tunic/rules.py | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/worlds/tunic/er_rules.py b/worlds/tunic/er_rules.py index 72f39a58f0..34d59c7aa0 100644 --- a/worlds/tunic/er_rules.py +++ b/worlds/tunic/er_rules.py @@ -1278,7 +1278,7 @@ def set_er_location_rules(world: "TunicWorld") -> None: # Ziggurat set_rule(multiworld.get_location("Rooted Ziggurat Upper - Near Bridge Switch", player), - lambda state: has_sword(state, player) or state.has(fire_wand, player)) + lambda state: has_sword(state, player) or state.has_all({fire_wand, laurels}, player)) set_rule(multiworld.get_location("Rooted Ziggurat Lower - After Guarded Fuse", player), lambda state: has_sword(state, player) and has_ability(prayer, state, world)) @@ -1288,7 +1288,6 @@ def set_er_location_rules(world: "TunicWorld") -> None: set_rule(multiworld.get_location("Librarian - Hexagon Green", player), lambda state: (has_sword(state, player)) and has_ladder("Ladders in Library", state, world)) - # nmg - kill boss scav with orb + firecracker, or similar set_rule(multiworld.get_location("Rooted Ziggurat Lower - Hexagon Blue", player), lambda state: has_sword(state, player)) diff --git a/worlds/tunic/rules.py b/worlds/tunic/rules.py index c3f1e34f84..ca6f1137cd 100644 --- a/worlds/tunic/rules.py +++ b/worlds/tunic/rules.py @@ -315,8 +315,8 @@ def set_location_rules(world: "TunicWorld") -> None: # Quarry set_rule(multiworld.get_location("Quarry - [Central] Above Ladder Dash Chest", player), lambda state: state.has(laurels, player)) - - # nmg - kill boss scav with orb + firecracker, or similar + set_rule(multiworld.get_location("Rooted Ziggurat Upper - Near Bridge Switch", player), + lambda state: has_sword(state, player) or state.has_all({fire_wand, laurels}, player)) set_rule(multiworld.get_location("Rooted Ziggurat Lower - Hexagon Blue", player), lambda state: has_sword(state, player))