From f391f0a3c190b18241160a620b2a68176efd5678 Mon Sep 17 00:00:00 2001 From: compiling <8335770+compiling@users.noreply.github.com> Date: Mon, 27 Apr 2020 21:01:58 +1000 Subject: [PATCH] Bunny revive is not possible in Sanctuary. --- OWGSets.py | 1 + Rules.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/OWGSets.py b/OWGSets.py index d75be1a4..da787582 100644 --- a/OWGSets.py +++ b/OWGSets.py @@ -187,4 +187,5 @@ def get_invalid_bunny_revival_dungeons(): 'Tower of Hera (Bottom)', 'Swamp Palace (Entrance)', 'Turtle Rock (Entrance)', + 'Sanctuary' ] diff --git a/Rules.py b/Rules.py index 76b2969f..1256fe3e 100644 --- a/Rules.py +++ b/Rules.py @@ -1645,7 +1645,7 @@ def set_bunny_rules(world, player): if entrance.player == player and entrance.connected_region.is_dark_world: if world.logic == 'owglitches': if entrance.connected_region.type == RegionType.Dungeon: - if entrance.connected_region.name in OWGSets.get_invalid_bunny_revival_dungeons(): + if entrance.parent_region.type != RegionType.Dungeon and entrance.connected_region.name in OWGSets.get_invalid_bunny_revival_dungeons(): add_rule(entrance, get_rule_to_add(entrance.connected_region, None, entrance)) continue if entrance.connected_region.name == 'Turtle Rock (Entrance)': @@ -1751,7 +1751,7 @@ def set_inverted_bunny_rules(world, player): if entrance.player == player and entrance.connected_region.is_light_world: if world.logic == 'owglitches': if entrance.connected_region.type == RegionType.Dungeon: - if entrance.connected_region.name in OWGSets.get_invalid_bunny_revival_dungeons(): + if entrance.parent_region.type != RegionType.Dungeon and entrance.connected_region.name in OWGSets.get_invalid_bunny_revival_dungeons(): add_rule(entrance, get_rule_to_add(entrance.connected_region, None, entrance)) continue if entrance.connected_region.name == 'Turtle Rock (Entrance)':