Skip to content

Commit

Permalink
TUNIC: Add an ER static connection, modify an nmg rule (ArchipelagoMW…
Browse files Browse the repository at this point in the history
…#2802)

* Add laurels connection at monastery front

* Removed an entrance rule to prevent people from being expected to softlock themselves
  • Loading branch information
ScipioWright authored and Jouramie committed Feb 28, 2024
1 parent c999df0 commit 53e7822
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 3 deletions.
7 changes: 7 additions & 0 deletions worlds/tunic/er_rules.py
Original file line number Diff line number Diff line change
Expand Up @@ -444,6 +444,13 @@ def set_er_region_rules(world: "TunicWorld", ability_unlocks: Dict[str, int], re
regions["Quarry"].connect(
connecting_region=regions["Quarry Monastery Entry"])

regions["Quarry Monastery Entry"].connect(
connecting_region=regions["Quarry Back"],
rule=lambda state: state.has(laurels, player))
regions["Quarry Back"].connect(
connecting_region=regions["Quarry Monastery Entry"],
rule=lambda state: state.has(laurels, player))

regions["Monastery Rope"].connect(
connecting_region=regions["Quarry Back"])

Expand Down
3 changes: 2 additions & 1 deletion worlds/tunic/options.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,9 @@ class LogicRules(Choice):
"""Set which logic rules to use for your world.
Restricted: Standard logic, no glitches.
No Major Glitches: Ice grapples through doors, shooting the west bell, and boss quick kills are included in logic.
* Ice grappling through the Ziggurat door is not in logic since you will get stuck in there without Prayer
Unrestricted: Logic in No Major Glitches, as well as ladder storage to get to certain places early.
*Special Shop is not in logic without the Hero's Laurels in Unrestricted due to soft lock potential.
*Special Shop is not in logic without the Hero's Laurels due to soft lock potential.
*Using Ladder Storage to get to individual chests is not in logic to avoid tedium.
*Getting knocked out of the air by enemies during Ladder Storage to reach places is not in logic, except for in
Rooted Ziggurat Lower. This is so you're not punished for playing with enemy rando on."""
Expand Down
3 changes: 1 addition & 2 deletions worlds/tunic/rules.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,7 @@ def set_region_rules(world: "TunicWorld", ability_unlocks: Dict[str, int]) -> No
multiworld.get_entrance("Quarry -> Lower Quarry", player).access_rule = \
lambda state: has_mask(state, player, options)
multiworld.get_entrance("Lower Quarry -> Rooted Ziggurat", player).access_rule = \
lambda state: (state.has(grapple, player) and has_ability(state, player, prayer, options, ability_unlocks)) \
or has_ice_grapple_logic(False, state, player, options, ability_unlocks)
lambda state: state.has(grapple, player) and has_ability(state, player, prayer, options, ability_unlocks)
multiworld.get_entrance("Quarry -> Rooted Ziggurat", player).access_rule = \
lambda state: has_ice_grapple_logic(False, state, player, options, ability_unlocks)
multiworld.get_entrance("Swamp -> Cathedral", player).access_rule = \
Expand Down

0 comments on commit 53e7822

Please sign in to comment.