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

Some random Mixed OWR fixes

Browse Source
This commit is contained in:
codemann8
2024-05-11 14:39:05 -05:00
parent 1f66aa87fe
commit 8b295a74ad
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DoorShuffle.py
View File

@@ -1537,7 +1537,7 @@ def check_entrance_fixes(world, player):
'Turtle Rock': 'tr', 'Turtle Rock': 'tr',
'Ganons Tower': 'gt', 'Ganons Tower': 'gt',
} }
if world.mode[player] == 'inverted': if world.is_atgt_swapped(player):
del checks['Ganons Tower'] del checks['Ganons Tower']
for ent_name, key in checks.items(): for ent_name, key in checks.items():
entrance = world.get_entrance(ent_name, player) entrance = world.get_entrance(ent_name, player)

2
EntranceShuffle.py
View File

@@ -1142,7 +1142,7 @@ def simple_shuffle_dungeons(world, player):
# shuffle multi-entrance dungeons # shuffle multi-entrance dungeons
multi_dungeons = ['Desert Palace', 'Turtle Rock'] multi_dungeons = ['Desert Palace', 'Turtle Rock']
if world.mode[player] == 'standard' or (world.mode[player] == 'inverted' and not world.shuffle_ganon): if world.mode[player] == 'standard' or (world.is_atgt_swapped(player) and not world.shuffle_ganon):
hc_target = 'Hyrule Castle' hc_target = 'Hyrule Castle'
random.shuffle(multi_dungeons) random.shuffle(multi_dungeons)
else: else:

4
Regions.py
View File

@@ -1162,8 +1162,8 @@ def create_shops(world, player):
world.shops[player] = [] world.shops[player] = []
for region_name, (room_id, type, shopkeeper, custom, locked, inventory, sram) in shop_table.items(): for region_name, (room_id, type, shopkeeper, custom, locked, inventory, sram) in shop_table.items():
if world.mode[player] == 'inverted': if world.mode[player] == 'inverted':
if (0x35 not in world.owswaps[player][0] and region_name == 'Dark Lake Hylia Shop') \ if (not world.is_tile_swapped(0x35, player) and region_name == 'Dark Lake Hylia Shop') \
or (0x35 in world.owswaps[player][0] and region_name == 'Lake Hylia Shop'): or (not world.is_tile_swapped(0x35, player) and region_name == 'Lake Hylia Shop'):
locked = True locked = True
inventory = [('Blue Potion', 160), ('Blue Shield', 50), ('Bombs (10)', 50)] inventory = [('Blue Potion', 160), ('Blue Shield', 50), ('Bombs (10)', 50)]
custom = True custom = True