monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Various hint updates/improvements 

This update makes the hint system work much better with simpler shuffles, fixes a bug by which two of the paradox cave entrances had reversed instructions in hints, and prevents the useless hint of there being a skull woods small key in the skull woods pinball room. Progressive Bow is added to the important item list for hints. Further tweaks to some hint language may still be incoming, but this should address the structure of the hint system pretty completely.
This commit is contained in:
AmazingAmpharos 2019-09-16 00:51:24 -05:00 committed by GitHub
parent a02f1e172d
commit 4246a8b876
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 123 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ER_hint_reference.txt
View File

@ -8,6 +8,21 @@ Hints will appear in the following ratios across the 15 telepathic tiles that ha
5 hints for valuable items. 5 hints for valuable items.
4 junk hints. 4 junk hints.
In the vanilla, dungeonssimple, and dungeonsfull shuffles, the following ratios will be used instead:
5 hints for inconvenient item locations.
8 hints for valuable items.
7 junk hints.
In the simple, restricted, and restricted legacy shuffles, these are the ratios:
2 hints for inconvenient entrances.
1 hint for an inconvenient dungeon entrance.
4 hints for random entrances (this can by coincidence pick inconvenient entrances that aren't used for the first set of hints).
3 hints for inconvenient item locations.
5 hints for valuable items.
5 junk hints.
These hints will use the following format: These hints will use the following format:
Entrance hints go "[Entrance on overworld] leads to [interior]". Entrance hints go "[Entrance on overworld] leads to [interior]".
@ -65,6 +80,11 @@ Spike Cave
Magic Bat Magic Bat
Sahasrahla (Green Pendant) Sahasrahla (Green Pendant)
In the vanilla, dungeonssimple, and dungeonsfull shuffles, the following two locations are added to the inconvenient locations list:
Graveyard Cave
Mimic Cave
Valuable Items are simply all items that are shown on the pause subscreen (Y, B, or A sections) minus Silver Arrows and plus Triforce Pieces, Magic Upgrades (1/2 or 1/4), and the Single Arrow. If keysanity is being used, you can additionally get hints for Small Keys or Big Keys but not hints for Maps or Compasses. Valuable Items are simply all items that are shown on the pause subscreen (Y, B, or A sections) minus Silver Arrows and plus Triforce Pieces, Magic Upgrades (1/2 or 1/4), and the Single Arrow. If keysanity is being used, you can additionally get hints for Small Keys or Big Keys but not hints for Maps or Compasses.
While the exact verbage of location names and item names can be found in the source code, here's a copy for reference: While the exact verbage of location names and item names can be found in the source code, here's a copy for reference:
@ -103,8 +123,8 @@ Death Mountain Return Cave (East): The westmost cave on west DM
Spectacle Rock Cave Peak: The highest 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: The right ledge on west DM
Spectacle Rock Cave (Bottom): The left 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 (Bottom): The right paired cave on east DM
Paradox Cave (Middle): The right paired cave on east DM Paradox Cave (Middle): The southmost cave on east DM
Paradox Cave (Top): The east DM summit cave Paradox Cave (Top): The east DM summit cave
Fairy Ascension Cave (Bottom): The east DM cave behind rocks Fairy Ascension Cave (Bottom): The east DM cave behind rocks
Fairy Ascension Cave (Top): The central ledge on east DM Fairy Ascension Cave (Top): The central ledge on east DM

157
Rom.py
View File

@ -1172,15 +1172,31 @@ def write_strings(rom, world, player):
# For hints, first we write hints about entrances, some from the inconvenient list others from all reasonable entrances. # For hints, first we write hints about entrances, some from the inconvenient list others from all reasonable entrances.
if world.hints: if world.hints:
tt['sign_north_of_links_house'] = '> Randomizer The telepathic tiles can have hints!' tt['sign_north_of_links_house'] = '> Randomizer The telepathic tiles can have hints!'
entrances_to_hint = {}
entrances_to_hint.update(InconvenientEntrances)
if world.shuffle_ganon:
entrances_to_hint.update({'Ganons Tower': 'Ganon\'s Tower'})
hint_locations = HintLocations.copy() hint_locations = HintLocations.copy()
random.shuffle(hint_locations) random.shuffle(hint_locations)
all_entrances = [entrance for entrance in world.get_entrances() if entrance.player == player] all_entrances = [entrance for entrance in world.get_entrances() if entrance.player == player]
random.shuffle(all_entrances) random.shuffle(all_entrances)
hint_count = 4 if world.shuffle != 'vanilla' else 0
#First we take care of the one inconvenient dungeon in the appropriately simple shuffles.
entrances_to_hint = {}
entrances_to_hint.update(InconvenientDungeonEntrances)
if world.shuffle_ganon:
entrances_to_hint.update({'Ganons Tower': 'Ganon\'s Tower'})
if world.shuffle in ['simple', 'restricted', 'restricted_legacy']:
for entrance in all_entrances:
if entrance.name in entrances_to_hint:
this_hint = entrances_to_hint[entrance.name] + ' leads to ' + hint_text(entrance.connected_region) + '.'
tt[hint_locations.pop(0)] = this_hint
entrances_to_hint = {}
break
#Now we write inconvenient locations for most shuffles and finish taking care of the less chaotic ones.
entrances_to_hint.update(InconvenientOtherEntrances)
if world.shuffle in ['vanilla', 'dungeonssimple', 'dungeonsfull']:
hint_count = 0
elif world.shuffle in ['simple', 'restricted', 'restricted_legacy']:
hint_count = 2
else:
hint_count = 4
for entrance in all_entrances: for entrance in all_entrances:
if entrance.name in entrances_to_hint: if entrance.name in entrances_to_hint:
if hint_count > 0: if hint_count > 0:
@ -1191,12 +1207,18 @@ def write_strings(rom, world, player):
else: else:
break break
#Next we handle hints for randomly selected other entrances, curating the selection intelligently based on shuffle.
if world.shuffle not in ['simple', 'restricted', 'restricted_legacy']:
entrances_to_hint.update(ConnectorEntrances)
entrances_to_hint.update(DungeonEntrances)
elif world.shuffle == 'restricted':
entrances_to_hint.update(ConnectorEntrances)
entrances_to_hint.update(OtherEntrances) entrances_to_hint.update(OtherEntrances)
if world.shuffle in ['insanity', 'madness_legacy', 'insanity_legacy']: if world.shuffle in ['insanity', 'madness_legacy', 'insanity_legacy']:
entrances_to_hint.update(InsanityEntrances) entrances_to_hint.update(InsanityEntrances)
if world.shuffle_ganon: if world.shuffle_ganon:
entrances_to_hint.update({'Pyramid Ledge': 'The pyramid ledge'}) entrances_to_hint.update({'Pyramid Ledge': 'The pyramid ledge'})
hint_count = 4 if world.shuffle != 'vanilla' else 0 hint_count = 4 if world.shuffle not in ['vanilla', 'dungeonssimple', 'dungeonsfull'] else 0
for entrance in all_entrances: for entrance in all_entrances:
if entrance.name in entrances_to_hint: if entrance.name in entrances_to_hint:
if hint_count > 0: if hint_count > 0:
@ -1209,8 +1231,10 @@ def write_strings(rom, world, player):
# Next we write a few hints for specific inconvenient locations. We don't make many because in entrance this is highly unpredictable. # 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() locations_to_hint = InconvenientLocations.copy()
if world.shuffle in ['vanilla', 'dungeonssimple', 'dungeonsfull']:
locations_to_hint.extend(InconvenientVanillaLocations)
random.shuffle(locations_to_hint) random.shuffle(locations_to_hint)
hint_count = 3 if world.shuffle != 'vanilla' else 4 hint_count = 3 if world.shuffle not in ['vanilla', 'dungeonssimple', 'dungeonsfull'] else 5
del locations_to_hint[hint_count:] del locations_to_hint[hint_count:]
for location in locations_to_hint: for location in locations_to_hint:
if location == 'Swamp Left': if location == 'Swamp Left':
@ -1246,8 +1270,14 @@ def write_strings(rom, world, player):
elif location == 'Eastern Palace - Big Key Chest': elif location == 'Eastern Palace - Big Key Chest':
this_hint = 'The antifairy guarded chest in Eastern Palace contains ' + hint_text(world.get_location(location, player).item) + '.' this_hint = 'The antifairy guarded chest in Eastern Palace contains ' + hint_text(world.get_location(location, player).item) + '.'
tt[hint_locations.pop(0)] = this_hint tt[hint_locations.pop(0)] = this_hint
elif location == 'Sahasrahla':
this_hint = 'Sahasrahla seeks a green pendant for ' + hint_text(world.get_location(location, player).item) + '.'
tt[hint_locations.pop(0)] = this_hint
elif location == 'Graveyard Cave':
this_hint = 'The cave north of the graveyard contains ' + hint_text(world.get_location(location, player).item) + '.'
tt[hint_locations.pop(0)] = this_hint
else: else:
this_hint = location + ' leads to ' + hint_text(world.get_location(location, player).item) + '.' this_hint = location + ' contains ' + hint_text(world.get_location(location, player).item) + '.'
tt[hint_locations.pop(0)] = this_hint tt[hint_locations.pop(0)] = this_hint
# Lastly we write hints to show where certain interesting items are. It is done the way it is to re-use the silver code and also to give one hint per each type of item regardless of how many exist. This supports many settings well. # Lastly we write hints to show where certain interesting items are. It is done the way it is to re-use the silver code and also to give one hint per each type of item regardless of how many exist. This supports many settings well.
@ -1255,11 +1285,15 @@ def write_strings(rom, world, player):
if world.keysanity: if world.keysanity:
items_to_hint.extend(KeysanityItems) items_to_hint.extend(KeysanityItems)
random.shuffle(items_to_hint) random.shuffle(items_to_hint)
hint_count = 5 if world.shuffle != 'vanilla' else 7 hint_count = 5 if world.shuffle not in ['vanilla', 'dungeonssimple', 'dungeonsfull'] else 8
while hint_count > 0: while hint_count > 0:
this_item = items_to_hint.pop(0) this_item = items_to_hint.pop(0)
this_location = world.find_items(this_item, player) this_location = world.find_items(this_item, player)
random.shuffle(this_location) random.shuffle(this_location)
#This looks dumb but prevents hints for Skull Woods Pinball Room's key safely with any item pool.
if this_location:
if this_location[0].name == 'Skull Woods - Pinball Room':
this_location.pop(0)
if this_location: if this_location:
this_hint = this_location[0].item.hint_text + ' can be found ' + hint_text(this_location[0]) + '.' this_hint = this_location[0].item.hint_text + ' can be found ' + hint_text(this_location[0]) + '.'
tt[hint_locations.pop(0)] = this_hint tt[hint_locations.pop(0)] = this_hint
@ -1607,54 +1641,60 @@ def patch_shuffled_dark_sanc(world, rom, player):
rom.write_int16s(0x180253, [vram_loc, scroll_y, scroll_x, link_y, link_x, camera_y, camera_x]) rom.write_int16s(0x180253, [vram_loc, scroll_y, scroll_x, link_y, link_x, camera_y, camera_x])
rom.write_bytes(0x180262, [unknown_1, unknown_2, 0x00]) rom.write_bytes(0x180262, [unknown_1, unknown_2, 0x00])
InconvenientEntrances = {'Turtle Rock': 'Turtle Rock Main', InconvenientDungeonEntrances = {'Turtle Rock': 'Turtle Rock Main',
'Misery Mire': 'Misery Mire', 'Misery Mire': 'Misery Mire',
'Ice Palace': 'Ice Palace', 'Ice Palace': 'Ice Palace',
'Skull Woods Final Section': 'The back of Skull Woods', 'Skull Woods Final Section': 'The back of Skull Woods',
'Death Mountain Return Cave (West)': 'The SW DM foothills cave', }
'Mimic Cave': 'Mimic Ledge',
'Dark World Hammer Peg Cave': 'The rows of pegs',
'Pyramid Fairy': 'The crack on the pyramid'
}
OtherEntrances = {'Eastern Palace': 'Eastern Palace', InconvenientOtherEntrances = {'Death Mountain Return Cave (West)': 'The SW DM foothills cave',
'Elder House (East)': 'Elder House', 'Mimic Cave': 'Mimic Ledge',
'Elder House (West)': 'Elder House', 'Dark World Hammer Peg Cave': 'The rows of pegs',
'Two Brothers House (East)': 'Eastern Quarreling Brothers\' house', 'Pyramid Fairy': 'The crack on the pyramid'
'Old Man Cave (West)': 'The lower DM entrance', }
'Hyrule Castle Entrance (South)': 'The ground level castle door',
'Thieves Town': 'Thieves\' Town', ConnectorEntrances = {'Elder House (East)': 'Elder House',
'Bumper Cave (Bottom)': 'The lower Bumper Cave', 'Elder House (West)': 'Elder House',
'Swamp Palace': 'Swamp Palace', 'Two Brothers House (East)': 'Eastern Quarreling Brothers\' house',
'Dark Death Mountain Ledge (West)': 'The East dark DM connector ledge', 'Old Man Cave (West)': 'The lower DM entrance',
'Dark Death Mountain Ledge (East)': 'The East dark DM connector ledge', 'Bumper Cave (Bottom)': 'The lower Bumper Cave',
'Superbunny Cave (Top)': 'The summit of dark DM cave', 'Superbunny Cave (Top)': 'The summit of dark DM cave',
'Superbunny Cave (Bottom)': 'The base of east dark DM', 'Superbunny Cave (Bottom)': 'The base of east dark DM',
'Hookshot Cave': 'The rock on dark DM', 'Hookshot Cave': 'The rock on dark DM',
'Desert Palace Entrance (South)': 'The book sealed passage', 'Two Brothers House (West)': 'The door near the race game',
'Tower of Hera': 'The Tower of Hera', 'Old Man Cave (East)': 'The SW-most cave on west DM',
'Two Brothers House (West)': 'The door near the race game', 'Old Man House (Bottom)': 'A cave with a door on west DM',
'Old Man Cave (East)': 'The SW-most cave on west DM', 'Old Man House (Top)': 'The eastmost cave on west DM',
'Old Man House (Bottom)': 'A cave with a door on west DM', 'Death Mountain Return Cave (East)': 'The westmost cave on west DM',
'Old Man House (Top)': 'The eastmost cave on west DM', 'Spectacle Rock Cave Peak': 'The highest cave on west DM',
'Death Mountain Return Cave (East)': 'The westmost cave on west DM', 'Spectacle Rock Cave': 'The right ledge on west DM',
'Spectacle Rock Cave Peak': 'The highest cave on west DM', 'Spectacle Rock Cave (Bottom)': 'The left ledge on west DM',
'Spectacle Rock Cave': 'The right ledge on west DM', 'Paradox Cave (Bottom)': 'The right paired cave on east DM',
'Spectacle Rock Cave (Bottom)': 'The left ledge on west DM', 'Paradox Cave (Middle)': 'The southmost cave on east DM',
'Paradox Cave (Bottom)': 'The southmost cave on east DM', 'Paradox Cave (Top)': 'The east DM summit cave',
'Paradox Cave (Middle)': 'The right paired cave on east DM', 'Fairy Ascension Cave (Bottom)': 'The east DM cave behind rocks',
'Paradox Cave (Top)': 'The east DM summit cave', 'Fairy Ascension Cave (Top)': 'The central ledge on east DM',
'Fairy Ascension Cave (Bottom)': 'The east DM cave behind rocks', 'Spiral Cave': 'The left ledge on east DM',
'Fairy Ascension Cave (Top)': 'The central ledge on east DM', 'Spiral Cave (Bottom)': 'The SWmost cave 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', DungeonEntrances = {'Eastern Palace': 'Eastern Palace',
'Hyrule Castle Entrance (West)': 'The left castle door', 'Hyrule Castle Entrance (South)': 'The ground level castle door',
'Hyrule Castle Entrance (East)': 'The right castle door', 'Thieves Town': 'Thieves\' Town',
'Agahnims Tower': 'The sealed castle door', 'Swamp Palace': 'Swamp Palace',
'Desert Palace Entrance (West)': 'The westmost building in the desert', 'Dark Death Mountain Ledge (West)': 'The East dark DM connector ledge',
'Desert Palace Entrance (North)': 'The northmost cave in the desert', 'Dark Death Mountain Ledge (East)': 'The East dark DM connector ledge',
'Blinds Hideout': 'Blind\'s old house', 'Desert Palace Entrance (South)': 'The book sealed passage',
'Tower of Hera': 'The Tower of Hera',
'Palace of Darkness': 'Palace of Darkness',
'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'
}
OtherEntrances = {'Blinds Hideout': 'Blind\'s old house',
'Lake Hylia Fairy': 'A cave NE of Lake Hylia', 'Lake Hylia Fairy': 'A cave NE of Lake Hylia',
'Light Hype Fairy': 'The cave south of your house', 'Light Hype Fairy': 'The cave south of your house',
'Desert Fairy': 'The cave near the desert', 'Desert Fairy': 'The cave near the desert',
@ -1769,7 +1809,12 @@ InconvenientLocations = ['Spike Cave',
'Ice Palace - Big Chest', 'Ice Palace - Big Chest',
'Ganons Tower - Big Chest', 'Ganons Tower - Big Chest',
'Magic Bat'] 'Magic Bat']
InconvenientVanillaLocations = ['Graveyard Cave',
'Mimic Cave']
RelevantItems = ['Bow', RelevantItems = ['Bow',
'Progressive Bow',
'Book of Mudora', 'Book of Mudora',
'Hammer', 'Hammer',
'Hookshot', 'Hookshot',