From e00467c2a299623f630d5a3e68f35bc56ccaa8aa Mon Sep 17 00:00:00 2001 From: Silent <110704408+silent-destroyer@users.noreply.github.com> Date: Wed, 5 Mar 2025 18:18:27 -0500 Subject: [PATCH] TUNIC: Update logic for chest in fortress dark area (#4691) * Update logic for beneath the vault chest * use helper method instead so that it checks the lanternless option --- worlds/tunic/er_rules.py | 8 ++------ worlds/tunic/rules.py | 3 ++- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/worlds/tunic/er_rules.py b/worlds/tunic/er_rules.py index 1d3ede21..fe01337c 100644 --- a/worlds/tunic/er_rules.py +++ b/worlds/tunic/er_rules.py @@ -1697,7 +1697,8 @@ def set_er_location_rules(world: "TunicWorld") -> None: # Beneath the Vault set_rule(world.get_location("Beneath the Fortress - Bridge"), - lambda state: has_melee(state, player) or state.has_any((laurels, fire_wand, ice_dagger, gun), player)) + lambda state: has_lantern(state, world) and + (has_melee(state, player) or state.has_any((laurels, fire_wand, ice_dagger, gun), player))) # Quarry set_rule(world.get_location("Quarry - [Central] Above Ladder Dash Chest"), @@ -1877,11 +1878,6 @@ def set_er_location_rules(world: "TunicWorld") -> None: combat_logic_to_loc("West Garden - [Central Highlands] Holy Cross (Blue Lines)", "West Garden") combat_logic_to_loc("West Garden - [Central Highlands] Behind Guard Captain", "West Garden") - # with combat logic on, I presume the player will want to be able to see to avoid the spiders - set_rule(world.get_location("Beneath the Fortress - Bridge"), - lambda state: has_lantern(state, world) - and (state.has_any({laurels, fire_wand, "Gun"}, player) or has_melee(state, player))) - combat_logic_to_loc("Eastern Vault Fortress - [West Wing] Candles Holy Cross", "Eastern Vault Fortress", dagger=True) diff --git a/worlds/tunic/rules.py b/worlds/tunic/rules.py index 63f76ac9..b58ad730 100644 --- a/worlds/tunic/rules.py +++ b/worlds/tunic/rules.py @@ -328,7 +328,8 @@ def set_location_rules(world: "TunicWorld") -> None: # Beneath the Vault set_rule(world.get_location("Beneath the Fortress - Bridge"), - lambda state: has_melee(state, player) or state.has_any((laurels, fire_wand, ice_dagger, gun), player)) + lambda state: has_lantern(state, world) and + (has_melee(state, player) or state.has_any((laurels, fire_wand, ice_dagger, gun), player))) set_rule(world.get_location("Beneath the Fortress - Obscured Behind Waterfall"), lambda state: has_melee(state, player) and has_lantern(state, world))