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

Bunny revive is not possible in Sanctuary.

Browse Source
This commit is contained in:
compiling
2020-04-27 21:01:58 +10:00
parent 0215254c89
commit f391f0a3c1
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OWGSets.py
View File

@@ -187,4 +187,5 @@ def get_invalid_bunny_revival_dungeons():
'Tower of Hera (Bottom)', 'Tower of Hera (Bottom)',
'Swamp Palace (Entrance)', 'Swamp Palace (Entrance)',
'Turtle Rock (Entrance)', 'Turtle Rock (Entrance)',
'Sanctuary'
] ]

4
Rules.py
View File

@@ -1645,7 +1645,7 @@ def set_bunny_rules(world, player):
if entrance.player == player and entrance.connected_region.is_dark_world: if entrance.player == player and entrance.connected_region.is_dark_world:
if world.logic == 'owglitches': if world.logic == 'owglitches':
if entrance.connected_region.type == RegionType.Dungeon: 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)) add_rule(entrance, get_rule_to_add(entrance.connected_region, None, entrance))
continue continue
if entrance.connected_region.name == 'Turtle Rock (Entrance)': 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 entrance.player == player and entrance.connected_region.is_light_world:
if world.logic == 'owglitches': if world.logic == 'owglitches':
if entrance.connected_region.type == RegionType.Dungeon: 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)) add_rule(entrance, get_rule_to_add(entrance.connected_region, None, entrance))
continue continue
if entrance.connected_region.name == 'Turtle Rock (Entrance)': if entrance.connected_region.name == 'Turtle Rock (Entrance)':