From 9c2dec9cec3df3da197c370edd620bfdf4293cac Mon Sep 17 00:00:00 2001 From: compiling <8335770+compiling@users.noreply.github.com> Date: Sat, 25 Apr 2020 18:21:09 +1000 Subject: [PATCH] Fix OWG bunny rules --- Rules.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Rules.py b/Rules.py index d4c7204b..c1a75500 100644 --- a/Rules.py +++ b/Rules.py @@ -1577,9 +1577,9 @@ def set_bunny_rules(world, player): return lambda state: state.has_Mirror(player) or state.has_Pearl(player) if region.type == RegionType.Dungeon: return lambda state: True - if not any([ - None not in [location, connecting_entrance] and location.name in OWGSets.get_superbunny_accessible_locations() and connecting_entrance.name not in OWGSets.get_invalid_mirror_bunny_entrances_dw(), - not region.is_light_world]): + if (((location is None or location.name not in OWGSets.get_superbunny_accessible_locations()) + or (connecting_entrance is not None and connecting_entrance.name in OWGSets.get_invalid_bunny_revival_dungeons())) + and not region.is_light_world): return lambda state: state.has_Pearl(player) else: if not region.is_light_world: @@ -1679,9 +1679,9 @@ def set_inverted_bunny_rules(world, player): return lambda state: state.has_Mirror(player) or state.has_Pearl(player) if region.type == RegionType.Dungeon: return lambda state: True - if not any([ - None not in [location, connecting_entrance] and location.name in OWGSets.get_superbunny_accessible_locations() and connecting_entrance.name not in OWGSets.get_invalid_mirror_bunny_entrances_lw(), - not region.is_dark_world]): + if (((location is None or location.name not in OWGSets.get_superbunny_accessible_locations()) + or (connecting_entrance is not None and connecting_entrance.name in OWGSets.get_invalid_bunny_revival_dungeons())) + and not region.is_dark_world): return lambda state: state.has_Pearl(player) else: if not region.is_dark_world: