From 6294d5f8319e64725daa4d8832a8de19e702f314 Mon Sep 17 00:00:00 2001 From: AmazingAmpharos Date: Thu, 21 Feb 2019 00:22:46 -0600 Subject: [PATCH] Fix bug with Swamp hint and remove some debug code --- EntranceShuffle.py | 6 ++---- Rom.py | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/EntranceShuffle.py b/EntranceShuffle.py index a60a605f..621a80cb 100644 --- a/EntranceShuffle.py +++ b/EntranceShuffle.py @@ -288,9 +288,8 @@ def link_entrances(world): try: caves.remove(old_man_house[0]) except ValueError: - print("Old man at desert") + pass else: #if the cave wasn't placed we get here - print("Normal Old Man") connect_caves(world, lw_entrances, [], old_man_house) connect_mandatory_exits(world, dw_entrances, caves, dw_must_exits) else: @@ -300,9 +299,8 @@ def link_entrances(world): try: caves.remove(old_man_house[0]) except ValueError: - print("Old man at desert") + pass else: #if the cave wasn't placed we get here - print("Normal Old Man") connect_caves(world, lw_entrances, [], old_man_house) if world.mode == 'standard': # rest of hyrule castle must be in light world diff --git a/Rom.py b/Rom.py index bdf97dd2..9d8aa729 100644 --- a/Rom.py +++ b/Rom.py @@ -1057,7 +1057,7 @@ def write_strings(rom, world): del locations_to_hint[hint_count:] for location in locations_to_hint: if location == 'Swamp Left': - this_hint = ('The westmost chests in Swamp Palace contain ' + (world.get_location('Swamp Palace - Compass Chest').item.pedestal_credit_text[4:] if world.get_location('Swamp Palace - Compass Chest').item.pedestal_credit_text[0] == 'a' else world.get_location('Swamp Palace - Compass Chest').item.pedestal_credit_text) + + this_hint = ('The westmost chests in Swamp Palace contain ' + (world.get_location('Swamp Palace - West Chest').item.pedestal_credit_text[4:] if world.get_location('Swamp Palace - West Chest').item.pedestal_credit_text[0] == 'a' else world.get_location('Swamp Palace - West Chest').item.pedestal_credit_text) + ' and ' + (world.get_location('Swamp Palace - Big Key Chest').item.pedestal_credit_text[4:] if world.get_location('Swamp Palace - Big Key Chest').item.pedestal_credit_text[0] == 'a' else world.get_location('Swamp Palace - Big Key Chest').item.pedestal_credit_text) + '.') tt[hint_locations.pop(0)] = this_hint elif location == 'Mire Left':