From 059c26f481a0e1aa4b78a90efa2b226b1c665cfd Mon Sep 17 00:00:00 2001 From: Scipio Wright Date: Sat, 29 Jun 2024 19:29:56 -0400 Subject: [PATCH] Fix merge conflict --- worlds/tunic/rules.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/worlds/tunic/rules.py b/worlds/tunic/rules.py index 8813aced5f..409df20dfb 100644 --- a/worlds/tunic/rules.py +++ b/worlds/tunic/rules.py @@ -132,10 +132,11 @@ def set_region_rules(world: "TunicWorld") -> None: lambda state: (state.has(laurels, player) and has_ability(prayer, state, world)) \ or has_ice_grapple_logic(False, IceGrappling.option_medium, state, world) multiworld.get_entrance("Overworld -> Spirit Arena", player).access_rule = \ - lambda state: (state.has(gold_hexagon, player, options.hexagon_goal.value) if options.hexagon_quest.value - else state.has_all({red_hexagon, green_hexagon, blue_hexagon}, player) and state.has_group_unique("Hero Relics", player, 6)) and \ - has_ability(state, player, prayer, options, ability_unlocks) and has_sword(state, player) and \ - state.has_any({lantern, laurels}, player) + lambda state: ((state.has(gold_hexagon, player, options.hexagon_goal.value) if options.hexagon_quest.value + else state.has_all({red_hexagon, green_hexagon, blue_hexagon}, player) + and state.has_group_unique("Hero Relics", player, 6)) + and has_ability(prayer, state, world) and has_sword(state, player) + and state.has_any({lantern, laurels}, player)) world.get_region("Quarry").connect(world.get_region("Rooted Ziggurat"), rule=lambda state: has_ice_grapple_logic(True, IceGrappling.option_hard, state, world)