Some random Mixed OWR fixes
This commit is contained in:
@@ -1537,7 +1537,7 @@ def check_entrance_fixes(world, player):
|
||||
'Turtle Rock': 'tr',
|
||||
'Ganons Tower': 'gt',
|
||||
}
|
||||
if world.mode[player] == 'inverted':
|
||||
if world.is_atgt_swapped(player):
|
||||
del checks['Ganons Tower']
|
||||
for ent_name, key in checks.items():
|
||||
entrance = world.get_entrance(ent_name, player)
|
||||
|
||||
@@ -1142,7 +1142,7 @@ def simple_shuffle_dungeons(world, player):
|
||||
|
||||
# shuffle multi-entrance dungeons
|
||||
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'
|
||||
random.shuffle(multi_dungeons)
|
||||
else:
|
||||
|
||||
@@ -1162,8 +1162,8 @@ def create_shops(world, player):
|
||||
world.shops[player] = []
|
||||
for region_name, (room_id, type, shopkeeper, custom, locked, inventory, sram) in shop_table.items():
|
||||
if world.mode[player] == 'inverted':
|
||||
if (0x35 not in world.owswaps[player][0] and region_name == 'Dark Lake Hylia Shop') \
|
||||
or (0x35 in world.owswaps[player][0] and region_name == 'Lake Hylia Shop'):
|
||||
if (not world.is_tile_swapped(0x35, player) and region_name == 'Dark Lake Hylia Shop') \
|
||||
or (not world.is_tile_swapped(0x35, player) and region_name == 'Lake Hylia Shop'):
|
||||
locked = True
|
||||
inventory = [('Blue Potion', 160), ('Blue Shield', 50), ('Bombs (10)', 50)]
|
||||
custom = True
|
||||
|
||||
Reference in New Issue
Block a user