From 1ced152e8d2738963fcd4ca8100ef03b70cb02eb Mon Sep 17 00:00:00 2001 From: Scipio Wright Date: Tue, 30 Jul 2024 17:36:21 -0400 Subject: [PATCH] Update per Medic's suggestion --- worlds/tunic/er_rules.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/worlds/tunic/er_rules.py b/worlds/tunic/er_rules.py index a459e2ca39..49ab9844f8 100644 --- a/worlds/tunic/er_rules.py +++ b/worlds/tunic/er_rules.py @@ -1654,17 +1654,14 @@ def set_er_location_rules(world: "TunicWorld") -> None: # laurel means you can dodge the enemies freely with the laurels if set_instead: set_rule(multiworld.get_location(loc_name, player), - # someome tell me if you actually need to do the p=player and c=combat_req_area, lambdas scary - lambda state, p=player, c=combat_req_area, d=dagger, la=laurel: - has_combat_reqs(c, state, p) - or (state.has(ice_dagger, player) if d else False) - or (state.has(laurels, player) if la else False)) + lambda state: has_combat_reqs(combat_req_area, state, player) + or (dagger and state.has(ice_dagger, player)) + or (laurel and state.has(laurels, player))) else: add_rule(multiworld.get_location(loc_name, player), - lambda state, p=player, c=combat_req_area, d=dagger, la=laurel: - has_combat_reqs(c, state, p) - or (state.has(ice_dagger, player) if d else True) - or (state.has(laurels, player) if la else False)) + lambda state: has_combat_reqs(combat_req_area, state, player) + or (dagger and state.has(ice_dagger, player)) + or (laurel and state.has(laurels, player))) if world.options.combat_logic >= CombatLogic.option_bosses_only: # garden knight is in the regions part above