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

Merge branch 'OverworldShuffleDev' into OverworldShuffle

Browse Source
This commit is contained in:
codemann8
2021-07-28 21:19:24 -05:00
parent b06d868c5b e9957d87dd
commit e28d2c331d
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
BaseClasses.py
View File

@@ -722,6 +722,7 @@ class CollectionState(object):
'Swamp Nook Area', 'Swamp Nook Area',
'Dark South Pass Area'] 'Dark South Pass Area']
bonk_bombs = ['Kakariko Fortune Area', 'Dark Graveyard Area'] #TODO: Flute Boy Approach Area and Bonk Rock Ledge are available post-Aga bonk_bombs = ['Kakariko Fortune Area', 'Dark Graveyard Area'] #TODO: Flute Boy Approach Area and Bonk Rock Ledge are available post-Aga
bomb_caves = ['Graveyard Cave', 'Light World Bomb Hut']
# TODO: Possibly use tree pulls also in the future, bush crabs also if enemizer is disabled # TODO: Possibly use tree pulls also in the future, bush crabs also if enemizer is disabled
tree_pulls = ['Lost Woods East Area', tree_pulls = ['Lost Woods East Area',
@@ -738,7 +739,7 @@ class CollectionState(object):
region = self.world.get_region(regionname, player) region = self.world.get_region(regionname, player)
return region.can_reach(self) and ((self.world.mode[player] != 'inverted' and region.is_light_world) or (self.world.mode[player] == 'inverted' and region.is_dark_world) or self.has('Pearl', player)) return region.can_reach(self) and ((self.world.mode[player] != 'inverted' and region.is_light_world) or (self.world.mode[player] == 'inverted' and region.is_dark_world) or self.has('Pearl', player))
for region in bush_bombs: for region in bush_bombs + bomb_caves:
if can_reach_non_bunny(region): if can_reach_non_bunny(region):
return True return True