Removing the possibility for double AT/GT hints

This commit is contained in:
codemann8
2022-12-04 01:42:44 -06:00
parent e5afe70bcb
commit c861cb5b3d

17
Rom.py
View File

@@ -2145,10 +2145,12 @@ def write_strings(rom, world, player, team):
entrances_to_hint = {}
entrances_to_hint.update(InconvenientDungeonEntrances)
if world.shuffle_ganon[player]:
if world.is_atgt_swapped(player):
entrances_to_hint.update({'Agahnims Tower': 'The sealed castle door'})
else:
entrances_to_hint.update({'Ganons Tower': 'Ganon\'s Tower'})
entrances_to_hint.update({'Agahnims Tower': 'The sealed castle door'})
entrances_to_hint.update({'Ganons Tower': 'The dark mountain tower'})
elif world.is_atgt_swapped(player):
entrances_to_hint.update({'Ganons Tower': 'The dark mountain tower'})
else:
entrances_to_hint.update({'Agahnims Tower': 'The sealed castle door'})
if world.shuffle[player] in ['simple', 'restricted']:
for entrance in all_entrances:
if entrance.name in entrances_to_hint:
@@ -2179,13 +2181,6 @@ def write_strings(rom, world, player, team):
if world.shuffle[player] not in ['simple', 'restricted']:
entrances_to_hint.update(ConnectorEntrances)
entrances_to_hint.update(DungeonEntrances)
if world.shuffle_ganon[player]:
entrances_to_hint.update({'Agahnims Tower': 'The sealed castle door'})
entrances_to_hint.update({'Ganons Tower': 'The dark mountain tower'})
elif world.is_atgt_swapped(player):
entrances_to_hint.update({'Ganons Tower': 'The dark mountain tower'})
else:
entrances_to_hint.update({'Agahnims Tower': 'The sealed castle door'})
elif world.shuffle[player] == 'restricted':
entrances_to_hint.update(ConnectorEntrances)
if world.shuffle[player] in ['lite', 'lean']: