From 951778f11f76ded6f2f4e4ce1cce30507d37d858 Mon Sep 17 00:00:00 2001 From: Fabian Dill Date: Tue, 21 Apr 2020 21:40:15 +0200 Subject: [PATCH] looks like prog bow ganon hints got swapped and duped in a merge. --- Rom.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/Rom.py b/Rom.py index b6053c75..1b25f438 100644 --- a/Rom.py +++ b/Rom.py @@ -1746,17 +1746,13 @@ def write_strings(rom, world, player, team): progressive_silvers = world.difficulty_requirements[player].progressive_bow_limit >= 2 or world.swords[player] == 'swordless' if distinguished_prog_bow_loc: prog_bow_locs.remove(distinguished_prog_bow_loc) - silverarrow_hint = (' %s?' % hint_text(distinguished_prog_bow_loc).replace('Ganon\'s', 'my')) if progressive_silvers else '?\nI think not!' - tt['ganon_phase_3_no_silvers'] = 'Did you find the silver arrows%s' % silverarrow_hint - - if any(prog_bow_locs): - silverarrow_hint = (' %s?' % hint_text(random.choice(prog_bow_locs)).replace('Ganon\'s', 'my')) if progressive_silvers else '?\nI think not!' - tt['ganon_phase_3_no_silvers'] = 'Did you find the silver arrows%s' % silverarrow_hint + silverarrow_hint = (' %s?' % hint_text(distinguished_prog_bow_loc).replace('Ganon\'s', + 'my')) if progressive_silvers else '?\nI think not!' + tt['ganon_phase_3_no_silvers_alt'] = 'Did you find the silver arrows%s' % silverarrow_hint if any(prog_bow_locs): silverarrow_hint = (' %s?' % hint_text(random.choice(prog_bow_locs)).replace('Ganon\'s', 'my')) - tt['ganon_phase_3_no_silvers_alt'] = 'Did you find the silver arrows%s' % silverarrow_hint - + tt['ganon_phase_3_no_silvers'] = 'Did you find the silver arrows%s' % silverarrow_hint crystal5 = world.find_items('Crystal 5', player)[0] crystal6 = world.find_items('Crystal 6', player)[0]