From 0cd86c9a617356ebd4a1411d7c5d3f83fbd784d0 Mon Sep 17 00:00:00 2001 From: AmazingAmpharos Date: Wed, 10 Apr 2019 17:03:01 -0500 Subject: [PATCH] Updated hint text Hopefully these text changes will make the hints less cryptic for more users. --- Regions.py | 52 ++++++++++++++++++++++++++-------------------------- Rom.py | 52 ++++++++++++++++++++++++++++++++++------------------ 2 files changed, 60 insertions(+), 44 deletions(-) diff --git a/Regions.py b/Regions.py index c58c0a8e..320c4087 100644 --- a/Regions.py +++ b/Regions.py @@ -428,7 +428,7 @@ location_table = {'Mushroom': (0x180013, False, 'in the woods'), 'Kakariko Well - Bottom': (0xEA9A, False, 'in a well'), 'Blacksmith': (0x18002A, False, 'with the smith'), 'Magic Bat': (0x180015, False, 'with the bat'), - 'Sick Kid': (0x339CF, False, 'with the ill'), + 'Sick Kid': (0x339CF, False, 'with the sick'), 'Hobo': (0x33E7D, False, 'with the hobo'), 'Lost Woods Hideout': (0x180000, False, 'near a thief'), 'Lumberjack Tree': (0x180001, False, 'in a hole'), @@ -440,7 +440,7 @@ location_table = {'Mushroom': (0x180013, False, 'in the woods'), 'Mini Moldorm Cave - Right': (0xEB48, False, 'near Moldorms'), 'Mini Moldorm Cave - Far Right': (0xEB4B, False, 'near Moldorms'), 'Mini Moldorm Cave - Generous Guy': (0x180010, False, 'near Moldorms'), - 'Ice Rod Cave': (0xEB4E, False, 'on ice'), + 'Ice Rod Cave': (0xEB4E, False, 'in a frozen cave'), 'Bonk Rock Cave': (0xEB3F, False, 'alone in a cave'), 'Library': (0x180012, False, 'near books'), 'Potion Shop': (0x180014, False, 'near potions'), @@ -472,15 +472,15 @@ location_table = {'Mushroom': (0x180013, False, 'in the woods'), 'Castle Tower - Dark Maze': (0xEAB2, False, 'in Castle Tower'), 'Old Man': (0xF69FA, False, 'with the old man'), 'Spectacle Rock Cave': (0x180002, False, 'alone in a cave'), - 'Paradox Cave Lower - Far Left': (0xEB2A, False, 'in paradox cave'), - 'Paradox Cave Lower - Left': (0xEB2D, False, 'in paradox cave'), - 'Paradox Cave Lower - Right': (0xEB30, False, 'in paradox cave'), - 'Paradox Cave Lower - Far Right': (0xEB33, False, 'in paradox cave'), - 'Paradox Cave Lower - Middle': (0xEB36, False, 'in paradox cave'), - 'Paradox Cave Upper - Left': (0xEB39, False, 'in paradox cave'), - 'Paradox Cave Upper - Right': (0xEB3C, False, 'in paradox cave'), + 'Paradox Cave Lower - Far Left': (0xEB2A, False, 'in a cave with seven chests'), + 'Paradox Cave Lower - Left': (0xEB2D, False, 'in a cave with seven chests'), + 'Paradox Cave Lower - Right': (0xEB30, False, 'in a cave with seven chests'), + 'Paradox Cave Lower - Far Right': (0xEB33, False, 'in a cave with seven chests'), + 'Paradox Cave Lower - Middle': (0xEB36, False, 'in a cave with seven chests'), + 'Paradox Cave Upper - Left': (0xEB39, False, 'in a cave with seven chests'), + 'Paradox Cave Upper - Right': (0xEB3C, False, 'in a cave with seven chests'), 'Spiral Cave': (0xE9BF, False, 'in spiral cave'), - 'Ether Tablet': (0x180016, False, 'at a monument'), + 'Ether Tablet': (0x180016, False, 'at a monolith'), 'Spectacle Rock': (0x180140, False, 'atop a rock'), 'Tower of Hera - Basement Cage': (0x180162, False, 'in Tower of Hera'), 'Tower of Hera - Map Chest': (0xE9AD, False, 'in Tower of Hera'), @@ -489,15 +489,15 @@ location_table = {'Mushroom': (0x180013, False, 'in the woods'), 'Tower of Hera - Big Chest': (0xE9F8, False, 'in Tower of Hera'), 'Tower of Hera - Boss': (0x180152, False, 'with Moldorm'), 'Pyramid': (0x180147, False, 'on the pyramid'), - 'Catfish': (0xEE185, False, 'with a fish'), + 'Catfish': (0xEE185, False, 'with a catfish'), 'Stumpy': (0x330C7, False, 'with tree boy'), 'Digging Game': (0x180148, False, 'underground'), - 'Bombos Tablet': (0x180017, False, 'at a monument'), - 'Hype Cave - Top': (0xEB1E, False, 'near batman'), - 'Hype Cave - Middle Right': (0xEB21, False, 'near batman'), - 'Hype Cave - Middle Left': (0xEB24, False, 'near batman'), - 'Hype Cave - Bottom': (0xEB27, False, 'near batman'), - 'Hype Cave - Generous Guy': (0x180011, False, 'with batman'), + 'Bombos Tablet': (0x180017, False, 'at a monolith'), + 'Hype Cave - Top': (0xEB1E, False, 'near a bat-like man'), + 'Hype Cave - Middle Right': (0xEB21, False, 'near a bat-like man'), + 'Hype Cave - Middle Left': (0xEB24, False, 'near a bat-like man'), + 'Hype Cave - Bottom': (0xEB27, False, 'near a bat-like man'), + 'Hype Cave - Generous Guy': (0x180011, False, 'with a bat-like man'), 'Peg Cave': (0x180006, False, 'alone in a cave'), 'Pyramid Fairy - Left': (0xE980, False, 'near a fairy'), 'Pyramid Fairy - Right': (0xE983, False, 'near a fairy'), @@ -505,8 +505,8 @@ location_table = {'Mushroom': (0x180013, False, 'in the woods'), 'C-Shaped House': (0xE9EF, False, 'alone in a home'), 'Chest Game': (0xEDA8, False, 'as a prize'), 'Bumper Cave Ledge': (0x180146, False, 'on a ledge'), - 'Mire Shed - Left': (0xEA73, False, 'near a spark'), - 'Mire Shed - Right': (0xEA76, False, 'near a spark'), + 'Mire Shed - Left': (0xEA73, False, 'near sparks'), + 'Mire Shed - Right': (0xEA76, False, 'near sparks'), 'Superbunny Cave - Top': (0xEA7C, False, 'in a connection'), 'Superbunny Cave - Bottom': (0xEA7F, False, 'in a connection'), 'Spike Cave': (0xEA8B, False, 'beyond spikes'), @@ -515,7 +515,7 @@ location_table = {'Mushroom': (0x180013, False, 'in the woods'), 'Hookshot Cave - Bottom Right': (0xEB5A, False, 'across pits'), 'Hookshot Cave - Bottom Left': (0xEB57, False, 'across pits'), 'Floating Island': (0x180141, False, 'on an island'), - 'Mimic Cave': (0xE9C5, False, 'beyond Goriyas'), + 'Mimic Cave': (0xE9C5, False, 'in a cave of mimicry'), 'Swamp Palace - Entrance': (0xEA9D, False, 'in Swamp Palace'), 'Swamp Palace - Map Chest': (0xE986, False, 'in Swamp Palace'), 'Swamp Palace - Big Chest': (0xE989, False, 'in Swamp Palace'), @@ -584,10 +584,10 @@ location_table = {'Mushroom': (0x180013, False, 'in the woods'), 'Palace of Darkness - Big Chest': (0xEA40, False, 'in Palace of Darkness'), 'Palace of Darkness - Harmless Hellway': (0xEA46, False, 'in Palace of Darkness'), 'Palace of Darkness - Boss': (0x180153, False, 'with Helmasaur King'), - 'Ganons Tower - Bob\'s Torch': (0x180161, False, 'on Ganon\'s torch'), + 'Ganons Tower - Bob\'s Torch': (0x180161, False, 'in Ganon\'s Tower'), 'Ganons Tower - Hope Room - Left': (0xEAD9, False, 'in Ganon\'s Tower'), 'Ganons Tower - Hope Room - Right': (0xEADC, False, 'in Ganon\'s Tower'), - 'Ganons Tower - Tile Room': (0xEAE2, False, 'with Ganon\'s tiles'), + 'Ganons Tower - Tile Room': (0xEAE2, False, 'in Ganon\'s Tower'), 'Ganons Tower - Compass Room - Top Left': (0xEAE5, False, 'in Ganon\'s Tower'), 'Ganons Tower - Compass Room - Top Right': (0xEAE8, False, 'in Ganon\'s Tower'), 'Ganons Tower - Compass Room - Bottom Left': (0xEAEB, False, 'in Ganon\'s Tower'), @@ -603,10 +603,10 @@ location_table = {'Mushroom': (0x180013, False, 'in the woods'), 'Ganons Tower - Randomizer Room - Bottom Left': (0xEACA, False, 'in Ganon\'s Tower'), 'Ganons Tower - Randomizer Room - Bottom Right': (0xEACD, False, 'in Ganon\'s Tower'), 'Ganons Tower - Bob\'s Chest': (0xEADF, False, 'in Ganon\'s Tower'), - 'Ganons Tower - Big Chest': (0xEAD6, False, 'in Ganon\'s big chest'), - 'Ganons Tower - Big Key Room - Left': (0xEAF4, False, 'beyond Ganon\'s Armos'), - 'Ganons Tower - Big Key Room - Right': (0xEAF7, False, 'beyond Ganon\'s Armos'), - 'Ganons Tower - Big Key Chest': (0xEAF1, False, 'beyond Ganon\'s Armos'), + 'Ganons Tower - Big Chest': (0xEAD6, False, 'in Ganon\'s Tower'), + 'Ganons Tower - Big Key Room - Left': (0xEAF4, False, 'in Ganon\'s Tower'), + 'Ganons Tower - Big Key Room - Right': (0xEAF7, False, 'in Ganon\'s Tower'), + 'Ganons Tower - Big Key Chest': (0xEAF1, False, 'in Ganon\'s Tower'), 'Ganons Tower - Mini Helmasaur Room - Left': (0xEAFD, False, 'atop Ganon\'s Tower'), 'Ganons Tower - Mini Helmasaur Room - Right': (0xEB00, False, 'atop Ganon\'s Tower'), 'Ganons Tower - Pre-Moldorm Chest': (0xEB03, False, 'atop Ganon\'s Tower'), diff --git a/Rom.py b/Rom.py index b98aff0c..14e941b3 100644 --- a/Rom.py +++ b/Rom.py @@ -1053,7 +1053,7 @@ def write_strings(rom, world): # Next we write a few hints for specific inconvenient locations. We don't make many because in entrance this is highly unpredictable. locations_to_hint = InconvenientLocations.copy() random.shuffle(locations_to_hint) - hint_count = 2 + hint_count = 3 del locations_to_hint[hint_count:] for location in locations_to_hint: if location == 'Swamp Left': @@ -1077,6 +1077,18 @@ def write_strings(rom, world): elif location == 'Tower of Hera - Big Key Chest': this_hint = 'Waiting in the Tower of Hera basement leads to ' + world.get_location(location).item.hint_text + '.' tt[hint_locations.pop(0)] = this_hint + elif location == 'Ganons Tower - Big Chest': + this_hint = 'The big chest in Ganon\'s Tower contains ' + world.get_location(location).item.hint_text + '.' + tt[hint_locations.pop(0)] = this_hint + elif location == 'Thieves\' Town - Big Chest': + this_hint = 'The big chest in Thieves\' Tower contains ' + world.get_location(location).item.hint_text + '.' + tt[hint_locations.pop(0)] = this_hint + elif location == 'Ice Palace - Big Chest': + this_hint = 'The big chest in Ice Palace contains ' + world.get_location(location).item.hint_text + '.' + tt[hint_locations.pop(0)] = this_hint + elif location == 'Eastern Palace - Big Key Chest': + this_hint = 'The antifairy guarded chest in Eastern Palace contains ' + world.get_location(location).item.hint_text + '.' + tt[hint_locations.pop(0)] = this_hint else: this_hint = location + ' leads to ' + world.get_location(location).item.hint_text + '.' tt[hint_locations.pop(0)] = this_hint @@ -1211,23 +1223,23 @@ OtherEntrances = {'Eastern Palace': 'Eastern Palace', 'Desert Palace Entrance (South)': 'The book sealed passage', 'Tower of Hera': 'The Tower of Hera', 'Two Brothers House (West)': 'The door near the race game', - 'Old Man Cave (East)': 'A cave on west DM', - 'Old Man House (Bottom)': 'A cave on west DM', - 'Old Man House (Top)': 'A cave on west DM', - 'Death Mountain Return Cave (East)': 'A cave on west DM', - 'Spectacle Rock Cave Peak': 'A cave on west DM', - 'Spectacle Rock Cave': 'A cave on west DM', - 'Spectacle Rock Cave (Bottom)': 'A cave on west DM', - 'Paradox Cave (Bottom)': 'A cave on east DM', - 'Paradox Cave (Middle)': 'A cave on east DM', + 'Old Man Cave (East)': 'The SW-most cave on west DM', + 'Old Man House (Bottom)': 'A cave with a door on west DM', + 'Old Man House (Top)': 'The eastmost cave on west DM', + 'Death Mountain Return Cave (East)': 'The westmost cave on west DM', + 'Spectacle Rock Cave Peak': 'The highest cave on west DM', + 'Spectacle Rock Cave': 'The right ledge on west DM', + 'Spectacle Rock Cave (Bottom)': 'The left ledge on west DM', + 'Paradox Cave (Bottom)': 'The southmost cave on east DM', + 'Paradox Cave (Middle)': 'The right paired cave on east DM', 'Paradox Cave (Top)': 'The east DM summit cave', 'Fairy Ascension Cave (Bottom)': 'The east DM cave behind rocks', - 'Fairy Ascension Cave (Top)': 'The central east DM ledge', - 'Spiral Cave': 'The western east DM ledge', - 'Spiral Cave (Bottom)': 'A cave on east DM', + 'Fairy Ascension Cave (Top)': 'The central ledge on east DM', + 'Spiral Cave': 'The left ledge on east DM', + 'Spiral Cave (Bottom)': 'The SWmost cave on east DM', 'Palace of Darkness': 'Palace of Darkness', - 'Hyrule Castle Entrance (West)': 'An upper castle door', - 'Hyrule Castle Entrance (East)': 'An upper castle door', + 'Hyrule Castle Entrance (West)': 'The left castle door', + 'Hyrule Castle Entrance (East)': 'The right castle door', 'Agahnims Tower': 'The sealed castle door', 'Desert Palace Entrance (West)': 'The westmost building in the desert', 'Desert Palace Entrance (North)': 'The northmost cave in the desert', @@ -1236,8 +1248,8 @@ OtherEntrances = {'Eastern Palace': 'Eastern Palace', 'Light Hype Fairy': 'The cave south of your house', 'Desert Fairy': 'The cave near the desert', 'Chicken House': 'The chicken lady\'s house', - 'Aginahs Cave': 'The desert cave', - 'Sahasrahlas Hut': 'The building near armos', + 'Aginahs Cave': 'The open desert cave', + 'Sahasrahlas Hut': 'The house near armos', 'Cave Shop (Lake Hylia)': 'The cave NW Lake Hylia', 'Blacksmiths Hut': 'The old smithery', 'Sick Kids House': 'The central house in Kakariko', @@ -1269,7 +1281,7 @@ OtherEntrances = {'Eastern Palace': 'Eastern Palace', 'Cave 45': 'The ledge south of haunted grove', 'Kings Grave': 'The northeastmost grave', 'Bonk Fairy (Light)': 'The rock pile near your home', - 'Hookshot Fairy': 'A cave on east DM', + 'Hookshot Fairy': 'The left paired cave on east DM', 'Bonk Fairy (Dark)': 'The rock pile near the old bomb shop', 'Dark Sanctuary Hint': 'The dark sanctuary cave', 'Dark Lake Hylia Fairy': 'The cave NE dark Lake Hylia', @@ -1341,6 +1353,10 @@ InconvenientLocations = ['Spike Cave', 'Swamp Left', 'Mire Left', 'Tower of Hera - Big Key Chest', + 'Eastern Palace - Big Key Chest', + 'Thieves\' Town - Big Chest', + 'Ice Palace - Big Chest', + 'Ganons Tower - Big Chest', 'Magic Bat'] RelevantItems = ['Bow', 'Book of Mudora',