morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 20:21:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

TUNIC: Update logic for chest in fortress dark area (#4691)

Browse Source 
* Update logic for beneath the vault chest

* use helper method instead

so that it checks the lanternless option
This commit is contained in:
Silent
2025-03-05 18:18:27 -05:00
committed by GitHub
parent 0eb6150e95
commit e00467c2a2
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
worlds/tunic/er_rules.py
View File

@@ -1697,7 +1697,8 @@ def set_er_location_rules(world: "TunicWorld") -> None:
# Beneath the Vault # Beneath the Vault
set_rule(world.get_location("Beneath the Fortress - Bridge"), 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 # Quarry
set_rule(world.get_location("Quarry - [Central] Above Ladder Dash Chest"), 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] Holy Cross (Blue Lines)", "West Garden")
combat_logic_to_loc("West Garden - [Central Highlands] Behind Guard Captain", "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", combat_logic_to_loc("Eastern Vault Fortress - [West Wing] Candles Holy Cross", "Eastern Vault Fortress",
dagger=True) dagger=True)

3
worlds/tunic/rules.py
View File

@@ -328,7 +328,8 @@ def set_location_rules(world: "TunicWorld") -> None:
# Beneath the Vault # Beneath the Vault
set_rule(world.get_location("Beneath the Fortress - Bridge"), 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"), set_rule(world.get_location("Beneath the Fortress - Obscured Behind Waterfall"),
lambda state: has_melee(state, player) and has_lantern(state, world)) lambda state: has_melee(state, player) and has_lantern(state, world))