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

Fix incorrect references to world.shuffle_ganon

Browse Source
This commit is contained in:
codemann8
2022-11-13 16:28:23 -06:00
parent ff6bbbf1fc
commit ab409baec1
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
EntranceShuffle.py
View File

@@ -289,7 +289,7 @@ def link_entrances(world, player):
else: else:
caves.append(tuple(random.sample(['Hyrule Castle Exit (South)', 'Hyrule Castle Exit (West)', 'Hyrule Castle Exit (East)'], 3))) caves.append(tuple(random.sample(['Hyrule Castle Exit (South)', 'Hyrule Castle Exit (West)', 'Hyrule Castle Exit (East)'], 3)))
if not world.shuffle_ganon: if not world.shuffle_ganon[player]:
connect_two_way(world, 'Ganons Tower' if not world.is_atgt_swapped(player) else 'Agahnims Tower', 'Ganons Tower Exit', player) connect_two_way(world, 'Ganons Tower' if not world.is_atgt_swapped(player) else 'Agahnims Tower', 'Ganons Tower Exit', player)
else: else:
caves.append('Ganons Tower Exit') caves.append('Ganons Tower Exit')
@@ -362,7 +362,7 @@ def link_entrances(world, player):
else: else:
lw_dungeons.append(tuple(('Hyrule Castle Exit (West)', 'Hyrule Castle Exit (East)', 'Hyrule Castle Exit (South)'))) lw_dungeons.append(tuple(('Hyrule Castle Exit (West)', 'Hyrule Castle Exit (East)', 'Hyrule Castle Exit (South)')))
if not world.shuffle_ganon: if not world.shuffle_ganon[player]:
connect_two_way(world, 'Ganons Tower' if not world.is_atgt_swapped(player) else 'Agahnims Tower', 'Ganons Tower Exit', player) connect_two_way(world, 'Ganons Tower' if not world.is_atgt_swapped(player) else 'Agahnims Tower', 'Ganons Tower Exit', player)
else: else:
dw_dungeons.append('Ganons Tower Exit') dw_dungeons.append('Ganons Tower Exit')
@@ -448,7 +448,7 @@ def link_entrances(world, player):
else: else:
Dungeon_Exits.append(tuple(('Hyrule Castle Exit (West)', 'Hyrule Castle Exit (East)', 'Hyrule Castle Exit (South)'))) Dungeon_Exits.append(tuple(('Hyrule Castle Exit (West)', 'Hyrule Castle Exit (East)', 'Hyrule Castle Exit (South)')))
if not world.shuffle_ganon: if not world.shuffle_ganon[player]:
connect_two_way(world, 'Ganons Tower' if not world.is_atgt_swapped(player) else 'Agahnims Tower', 'Ganons Tower Exit', player) connect_two_way(world, 'Ganons Tower' if not world.is_atgt_swapped(player) else 'Agahnims Tower', 'Ganons Tower Exit', player)
else: else:
Dungeon_Exits.append('Ganons Tower Exit') Dungeon_Exits.append('Ganons Tower Exit')
@@ -498,7 +498,7 @@ def link_entrances(world, player):
else: else:
caves.append(tuple(random.sample(['Hyrule Castle Exit (South)', 'Hyrule Castle Exit (West)', 'Hyrule Castle Exit (East)'], 3))) caves.append(tuple(random.sample(['Hyrule Castle Exit (South)', 'Hyrule Castle Exit (West)', 'Hyrule Castle Exit (East)'], 3)))
if not world.shuffle_ganon: if not world.shuffle_ganon[player]:
connect_two_way(world, 'Ganons Tower' if not world.is_atgt_swapped(player) else 'Agahnims Tower', 'Ganons Tower Exit', player) connect_two_way(world, 'Ganons Tower' if not world.is_atgt_swapped(player) else 'Agahnims Tower', 'Ganons Tower Exit', player)
else: else:
caves.append('Ganons Tower Exit') caves.append('Ganons Tower Exit')
@@ -566,7 +566,7 @@ def link_entrances(world, player):
caves.append('Hyrule Castle Secret Entrance Exit') caves.append('Hyrule Castle Secret Entrance Exit')
caves.append(('Hyrule Castle Exit (South)', 'Hyrule Castle Exit (West)', 'Hyrule Castle Exit (East)')) caves.append(('Hyrule Castle Exit (South)', 'Hyrule Castle Exit (West)', 'Hyrule Castle Exit (East)'))
if not world.shuffle_ganon: if not world.shuffle_ganon[player]:
connect_two_way(world, 'Ganons Tower' if not world.is_atgt_swapped(player) else 'Agahnims Tower', 'Ganons Tower Exit', player) connect_two_way(world, 'Ganons Tower' if not world.is_atgt_swapped(player) else 'Agahnims Tower', 'Ganons Tower Exit', player)
connect_two_way(world, 'Pyramid Entrance' if not world.is_tile_swapped(0x1b, player) else 'Inverted Pyramid Entrance', 'Pyramid Exit', player) connect_two_way(world, 'Pyramid Entrance' if not world.is_tile_swapped(0x1b, player) else 'Inverted Pyramid Entrance', 'Pyramid Exit', player)
connect_entrance(world, 'Pyramid Hole' if not world.is_tile_swapped(0x1b, player) else 'Inverted Pyramid Hole', 'Pyramid', player) connect_entrance(world, 'Pyramid Hole' if not world.is_tile_swapped(0x1b, player) else 'Inverted Pyramid Hole', 'Pyramid', player)
@@ -1036,7 +1036,7 @@ def scramble_holes(world, player):
hole_entrances.append(('Hyrule Castle Secret Entrance Stairs', 'Hyrule Castle Secret Entrance Drop')) hole_entrances.append(('Hyrule Castle Secret Entrance Stairs', 'Hyrule Castle Secret Entrance Drop'))
hole_targets.append(('Hyrule Castle Secret Entrance Exit', 'Hyrule Castle Secret Entrance')) hole_targets.append(('Hyrule Castle Secret Entrance Exit', 'Hyrule Castle Secret Entrance'))
if world.shuffle_ganon: if world.shuffle_ganon[player]:
hole_entrances.append(('Pyramid Entrance', 'Pyramid Hole') if not world.is_tile_swapped(0x1b, player) else ('Inverted Pyramid Entrance', 'Inverted Pyramid Hole')) hole_entrances.append(('Pyramid Entrance', 'Pyramid Hole') if not world.is_tile_swapped(0x1b, player) else ('Inverted Pyramid Entrance', 'Inverted Pyramid Hole'))
hole_targets.append(('Pyramid Exit', 'Pyramid')) hole_targets.append(('Pyramid Exit', 'Pyramid'))
@@ -1078,7 +1078,7 @@ def scramble_holes(world, player):
hole_targets.append(('Sanctuary Exit', 'Sewer Drop')) hole_targets.append(('Sanctuary Exit', 'Sewer Drop'))
# place pyramid hole # place pyramid hole
if not world.shuffle_ganon: if not world.shuffle_ganon[player]:
exit, target = ('Pyramid Exit', 'Pyramid') exit, target = ('Pyramid Exit', 'Pyramid')
if not world.is_tile_swapped(0x1b, player): if not world.is_tile_swapped(0x1b, player):
connect_two_way(world, 'Pyramid Entrance', exit, player) connect_two_way(world, 'Pyramid Entrance', exit, player)
@@ -1112,7 +1112,7 @@ def simple_shuffle_dungeons(world, player):
dungeon_exits = ['Eastern Palace Exit', 'Tower of Hera Exit', 'Agahnims Tower Exit', 'Thieves Town Exit', 'Skull Woods Final Section Exit', 'Palace of Darkness Exit', 'Ice Palace Exit', 'Misery Mire Exit', 'Swamp Palace Exit'] dungeon_exits = ['Eastern Palace Exit', 'Tower of Hera Exit', 'Agahnims Tower Exit', 'Thieves Town Exit', 'Skull Woods Final Section Exit', 'Palace of Darkness Exit', 'Ice Palace Exit', 'Misery Mire Exit', 'Swamp Palace Exit']
if not invFlag: if not invFlag:
if not world.shuffle_ganon: if not world.shuffle_ganon[player]:
connect_two_way(world, 'Ganons Tower', 'Ganons Tower Exit', player) connect_two_way(world, 'Ganons Tower', 'Ganons Tower Exit', player)
else: else:
dungeon_entrances.append('Ganons Tower') dungeon_entrances.append('Ganons Tower')
@@ -1121,7 +1121,7 @@ def simple_shuffle_dungeons(world, player):
at_door = dungeon_exits.pop() at_door = dungeon_exits.pop()
else: else:
dungeon_entrances.append('Ganons Tower') dungeon_entrances.append('Ganons Tower')
if not world.shuffle_ganon: if not world.shuffle_ganon[player]:
at_door = 'Ganons Tower Exit' at_door = 'Ganons Tower Exit'
else: else:
dungeon_exits.append('Ganons Tower Exit') dungeon_exits.append('Ganons Tower Exit')
@@ -1234,7 +1234,7 @@ def full_shuffle_dungeons(world, Dungeon_Exits, player):
# must connect front of hyrule castle to do escape # must connect front of hyrule castle to do escape
connect_two_way(world, 'Hyrule Castle Entrance (South)', 'Hyrule Castle Exit (South)', player) connect_two_way(world, 'Hyrule Castle Entrance (South)', 'Hyrule Castle Exit (South)', player)
if not world.shuffle_ganon: if not world.shuffle_ganon[player]:
connect_two_way(world, 'Ganons Tower' if not world.is_atgt_swapped(player) else 'Agahnims Tower', 'Ganons Tower Exit', player) connect_two_way(world, 'Ganons Tower' if not world.is_atgt_swapped(player) else 'Agahnims Tower', 'Ganons Tower Exit', player)
else: else:
dungeon_exits.append('Ganons Tower Exit') dungeon_exits.append('Ganons Tower Exit')

2
OverworldShuffle.py
View File

@@ -613,7 +613,7 @@ def shuffle_tiles(world, groups, result_list, do_grouped, player):
parity[5] += 1 parity[5] += 1
if 0x1b in group and world.mode[player] != 'standard': if 0x1b in group and world.mode[player] != 'standard':
parity[5] += 1 parity[5] += 1
if 0x1b in group and world.shuffle_ganon: if 0x1b in group and world.shuffle_ganon[player]:
parity[5] -= 1 parity[5] -= 1
group_parity[group[0]] = parity group_parity[group[0]] = parity

4
Rom.py
View File

@@ -2170,7 +2170,7 @@ def write_strings(rom, world, player, team):
# First we take care of the one inconvenient dungeon in the appropriately simple shuffles. # First we take care of the one inconvenient dungeon in the appropriately simple shuffles.
entrances_to_hint = {} entrances_to_hint = {}
entrances_to_hint.update(InconvenientDungeonEntrances) entrances_to_hint.update(InconvenientDungeonEntrances)
if world.shuffle_ganon: if world.shuffle_ganon[player]:
if world.is_atgt_swapped(player): if world.is_atgt_swapped(player):
entrances_to_hint.update({'Agahnims Tower': 'The sealed castle door'}) entrances_to_hint.update({'Agahnims Tower': 'The sealed castle door'})
else: else:
@@ -2230,7 +2230,7 @@ def write_strings(rom, world, player, team):
entrances_to_hint.update({'Dark Sanctuary Hint': 'The dark sanctuary cave'}) entrances_to_hint.update({'Dark Sanctuary Hint': 'The dark sanctuary cave'})
if world.shuffle[player] in ['insanity', 'madness_legacy', 'insanity_legacy']: if world.shuffle[player] in ['insanity', 'madness_legacy', 'insanity_legacy']:
entrances_to_hint.update(InsanityEntrances) entrances_to_hint.update(InsanityEntrances)
if world.shuffle_ganon: if world.shuffle_ganon[player]:
if world.is_tile_swapped(0x1b, player): if world.is_tile_swapped(0x1b, player):
entrances_to_hint.update({'Inverted Pyramid Entrance': 'The extra castle passage'}) entrances_to_hint.update({'Inverted Pyramid Entrance': 'The extra castle passage'})
else: else: