Skip to content

Commit

Permalink
TUNIC: Fix minor logic bug in upper Zig (#3576)
Browse files Browse the repository at this point in the history
* Add note about bushes to logic section of readme

* Fix missing logic on bridge switch chest in upper zig

* Revise upper zig rule change to account for ER
  • Loading branch information
ScipioWright authored Jun 27, 2024
1 parent 77304a8 commit b8f78af
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
4 changes: 3 additions & 1 deletion worlds/tunic/er_rules.py
Original file line number Diff line number Diff line change
Expand Up @@ -1464,8 +1464,10 @@ def set_er_location_rules(world: "TunicWorld", ability_unlocks: Dict[str, int])
lambda state: state.has(laurels, player))

# Ziggurat
# if ER is off, you still need to get past the Admin or you'll get stuck in lower zig
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(fire_wand, player) and (state.has(laurels, player)
or options.entrance_rando)))
set_rule(multiworld.get_location("Rooted Ziggurat Lower - After Guarded Fuse", player),
lambda state: has_sword(state, player) and has_ability(state, player, prayer, options, ability_unlocks))

Expand Down
2 changes: 2 additions & 0 deletions worlds/tunic/rules.py
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,8 @@ def set_location_rules(world: "TunicWorld", ability_unlocks: Dict[str, int]) ->
# Quarry
set_rule(multiworld.get_location("Quarry - [Central] Above Ladder Dash Chest", player),
lambda state: state.has(laurels, player))
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))
# 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) or (state.has(grapple, player) and options.logic_rules))
Expand Down

0 comments on commit b8f78af

Please sign in to comment.