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

Fixed issue with Big Bomb Shop ending up at Pyramid Fairy entrance

Browse Source
This commit is contained in:
codemann8
2024-05-30 22:58:37 -05:00
parent 6b84306b9f
commit bcac25fd7d
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/overworld/EntranceShuffle2.py
View File

@@ -304,9 +304,12 @@ def do_main_shuffle(entrances, exits, avail, mode_def):
if not avail.world.is_bombshop_start(avail.player): if not avail.world.is_bombshop_start(avail.player):
bomb_shop = 'Big Bomb Shop' bomb_shop = 'Big Bomb Shop'
if bomb_shop in rem_exits: if bomb_shop in rem_exits:
bomb_shop_options = [x for x in rem_entrances] bomb_shop_forbidden = []
if avail.world.logic[avail.player] in ['noglitches', 'minorglitches']:
bomb_shop_forbidden.append('Pyramid Fairy')
if avail.world.is_tile_swapped(0x03, avail.player): if avail.world.is_tile_swapped(0x03, avail.player):
bomb_shop_options = [x for x in bomb_shop_options if x not in ['Spectacle Rock Cave', 'Spectacle Rock Cave (Bottom)']] bomb_shop_forbidden.extend(['Spectacle Rock Cave', 'Spectacle Rock Cave (Bottom)'])
bomb_shop_options = [x for x in rem_entrances if x not in bomb_shop_forbidden]
if avail.swapped and len(bomb_shop_options) > 1: if avail.swapped and len(bomb_shop_options) > 1:
bomb_shop_options = [x for x in bomb_shop_options if x != 'Big Bomb Shop'] bomb_shop_options = [x for x in bomb_shop_options if x != 'Big Bomb Shop']