From d47f01657659e533ad33645067de81b625aadb65 Mon Sep 17 00:00:00 2001 From: ninjamask Date: Tue, 4 Feb 2020 21:36:59 +0100 Subject: [PATCH 1/4] TT Attic Hint --- Rom.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Rom.py b/Rom.py index a49c617e..bef3808f 100644 --- a/Rom.py +++ b/Rom.py @@ -1736,6 +1736,11 @@ def write_strings(rom, world, player, team): tt[hint_locations.pop(0)] = this_hint hint_count -= 1 + if world.doorShuffle[player] in ['crossed']: + attic_hint = world.get_location("Thieves' Town - Attic", player).parent_region.dungeon.name + this_hint = 'A cracked floor can be found in ' + attic_hint + '.' + tt[hint_locations.pop(0)] = this_hint + # All remaining hint slots are filled with junk hints. It is done this way to ensure the same junk hint isn't selected twice. junk_hints = junk_texts.copy() random.shuffle(junk_hints) From a3682262e10e2a0607a091624475fe1a745d7650 Mon Sep 17 00:00:00 2001 From: ninjamask Date: Tue, 4 Feb 2020 21:44:58 +0100 Subject: [PATCH 2/4] TT Attic Hint --- Rom.py | 1 + 1 file changed, 1 insertion(+) diff --git a/Rom.py b/Rom.py index bef3808f..a3506273 100644 --- a/Rom.py +++ b/Rom.py @@ -1736,6 +1736,7 @@ def write_strings(rom, world, player, team): tt[hint_locations.pop(0)] = this_hint hint_count -= 1 + # Adding a hint for the Thieves' Town Attic location in Crossed Doorshufle. if world.doorShuffle[player] in ['crossed']: attic_hint = world.get_location("Thieves' Town - Attic", player).parent_region.dungeon.name this_hint = 'A cracked floor can be found in ' + attic_hint + '.' From 4cd63196f9e2b62776ad196d81d5bb7628f6b89c Mon Sep 17 00:00:00 2001 From: Michael Fleischer Date: Tue, 4 Feb 2020 22:07:55 +0100 Subject: [PATCH 3/4] Disallow hint to be in the attic --- Rom.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Rom.py b/Rom.py index a3506273..be2b70bb 100644 --- a/Rom.py +++ b/Rom.py @@ -1740,7 +1740,10 @@ def write_strings(rom, world, player, team): if world.doorShuffle[player] in ['crossed']: attic_hint = world.get_location("Thieves' Town - Attic", player).parent_region.dungeon.name this_hint = 'A cracked floor can be found in ' + attic_hint + '.' - tt[hint_locations.pop(0)] = this_hint + if hint_locations[0] == 'telepathic_tile_turtle_rock': + tt[hint_locations.pop(1)] = this_hint + else: + tt[hint_locations.pop(0)] = this_hint # All remaining hint slots are filled with junk hints. It is done this way to ensure the same junk hint isn't selected twice. junk_hints = junk_texts.copy() From 4780cf18b542b16f3b664731b5814c88c2eddfed Mon Sep 17 00:00:00 2001 From: Michael Fleischer Date: Tue, 4 Feb 2020 22:12:19 +0100 Subject: [PATCH 4/4] oops a little debug mistake --- Rom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rom.py b/Rom.py index be2b70bb..38b5448f 100644 --- a/Rom.py +++ b/Rom.py @@ -1740,7 +1740,7 @@ def write_strings(rom, world, player, team): if world.doorShuffle[player] in ['crossed']: attic_hint = world.get_location("Thieves' Town - Attic", player).parent_region.dungeon.name this_hint = 'A cracked floor can be found in ' + attic_hint + '.' - if hint_locations[0] == 'telepathic_tile_turtle_rock': + if hint_locations[0] == 'telepathic_tile_thieves_town_upstairs': tt[hint_locations.pop(1)] = this_hint else: tt[hint_locations.pop(0)] = this_hint