alttpr-gwaa-kiwi/alttpr-python
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix OWG bunny rules

Browse Source
This commit is contained in:
compiling
2020-04-25 18:21:09 +10:00
parent c8a30bb749
commit 9c2dec9cec
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Rules.py
View File

@@ -1577,9 +1577,9 @@ def set_bunny_rules(world, player):
return lambda state: state.has_Mirror(player) or state.has_Pearl(player) return lambda state: state.has_Mirror(player) or state.has_Pearl(player)
if region.type == RegionType.Dungeon: if region.type == RegionType.Dungeon:
return lambda state: True return lambda state: True
if not any([ if (((location is None or location.name not in OWGSets.get_superbunny_accessible_locations())
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(), or (connecting_entrance is not None and connecting_entrance.name in OWGSets.get_invalid_bunny_revival_dungeons()))
not region.is_light_world]): and not region.is_light_world):
return lambda state: state.has_Pearl(player) return lambda state: state.has_Pearl(player)
else: else:
if not region.is_light_world: 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) return lambda state: state.has_Mirror(player) or state.has_Pearl(player)
if region.type == RegionType.Dungeon: if region.type == RegionType.Dungeon:
return lambda state: True return lambda state: True
if not any([ if (((location is None or location.name not in OWGSets.get_superbunny_accessible_locations())
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(), or (connecting_entrance is not None and connecting_entrance.name in OWGSets.get_invalid_bunny_revival_dungeons()))
not region.is_dark_world]): and not region.is_dark_world):
return lambda state: state.has_Pearl(player) return lambda state: state.has_Pearl(player)
else: else:
if not region.is_dark_world: if not region.is_dark_world: