Clearer song and sometimes hints

[alkalineace]

Partially fixes #1473

Wrote a lot of clearer hints considering the above-mentionned ticket and some new settings.

Below is the big list.

This is up to discussion, don't hesitate to submit better ideas.

Song hints :

• 'Song from Ocarina of Time': ("the #Ocarina of Time# teaches", "the #song teached by the Ocarina of Time# is", ['song', 'sometimes']),
• 'Song from Royal Familys Tomb': (["#ReDead in the royal tomb# guard", "the #Composer Brothers wrote#"], "the #song written in the royal tomb# is", ['song', 'sometimes']),
• 'Sheik in Forest': ("#in a meadow# Sheik teaches", "the #song teached by Sheik in Sacred Forest Meadow# is", ['song', 'sometimes']),
• 'Sheik at Temple': ("Sheik waits at a #monument to time# to teach", "the #song teached by Sheik in Temple of Time# is", ['song', 'sometimes']),
• 'Sheik in Crater': ("the #crater's melody# is", "the #song teached by Sheik in Death Mountain Crater# is", ['song', 'sometimes']),
• 'Sheik in Ice Cavern': ("the #frozen cavern# echoes with", "the #song teached by Sheik in Ice Cavern# is", ['song', 'sometimes']),
• 'Sheik in Kakariko': ("a #ravaged village# mourns with", "the #song teached by Sheik in Kakariko Village# is", ['song', 'sometimes']),
• 'Sheik at Colossus': ("a hero ventures #beyond the wasteland# to learn", "the #song teached by Sheik in Desert Colossus# is", ['song', 'sometimes']),

Sometimes hints :

• 'DMT Biggoron': ("#Biggoron# crafts", "trading the #Claim Check with Biggoron# rewards", ['overworld', 'sometimes']),
• 'Wasteland Chest': (["#deep in the wasteland# is", "beneath #the sands#, flames reveal"], "a chest spawned by #lighting flames in Haunted Wasteland# contains", ['overworld', 'sometimes']),
• 'Graveyard Royal Familys Tomb Chest': (["#flames in the royal tomb# reveal", "the #Composer Brothers hid#"], "#lighting flames in the royal tomb# rewards", ['overworld', 'sometimes']),
• 'ZF Bottom Freestanding PoH': ("#under the icy waters# lies", "at the #bottom of Zora's Fountain lake# lies", ['overworld', 'sometimes']),
• 'GC Pot Freestanding PoH': ("spinning #Goron pottery# contains", "putting a bomb in a #happy face Goron Pot# rewards", ['overworld', 'sometimes']),
• 'ZR Frogs in the Rain': ("#frogs in a storm# gift", "playing #Song of Storms to Frogs# rewards", ['overworld', 'sometimes']),
• 'LH Lab Dive': ("a #diving experiment# is rewarded with", "touching the #bottom of the lakeside lab# rewards", ['overworld', 'sometimes']),
• 'Gerudo Training Ground Underwater Silver Rupee Chest': (["those who seek #sunken silver rupees# will find", "the #thieves' underwater training# rewards"], "obtaining #silver rupees drowned in Gerudo Training Grounds# rewards", ['dungeon', 'sometimes']),
• 'Gerudo Training Ground MQ Underwater Silver Rupee Chest': (["those who seek #sunken silver rupees# will find", "the #thieves' underwater training# rewards"], "obtaining #silver rupees drowned in Gerudo Training Grounds# rewards", ['dungeon', 'sometimes']),
• 'Gerudo Training Ground Maze Path Final Chest': ("the final prize of #the thieves' training# is", "#Gerudo Training Grounds' center chest# contains", ['dungeon', 'sometimes']),
• 'Gerudo Training Ground MQ Ice Arrows Chest': ("the final prize of #the thieves' training# is", "#Gerudo Training Grounds' center chest# contains", ['dungeon', 'sometimes']),
• 'Shadow Temple MQ Bomb Flower Chest': ("shadows in an #invisible maze# guard", "the buried #Dead Hand with Bomb Flowers# guards", ['dungeon', 'sometimes']),

[ETR-BTF]

"teached" --> "taught"?

putting a bomb in a #happy face Goron Pot# rewards

"a bomb" --> "an explosive"?

touching the #bottom of the lakeside lab# rewards

"touching the bottom" is misleading because Iron Boots by themselves don't work even tho they let you touch the bottom. I think the original hint text is fine if the words "Lakeside Lab" are added.

#Gerudo Training Grounds' center chest# contains

The Ice Arrows chest actually isn't in the center in MQ. :P The center contains a hammer switch that spawns the chest in the room above (the "scarecrow chest" in vanilla).

the buried #Dead Hand with Bomb Flowers# guards

I think "the #Dead Hand buried with Bomb Flowers#" reads better.

[r0bd0g]

You just show the claim check to Biggoron, there's no trade exactly.

The fountain one's wording seems awkward. Maybe either "at the bottom of the Zora's Fountain lake" or "at bottom of the Zora's Fountain's lake" or "at the bottom of the lake in Zora's Fountain"?

The chest in MQ GTG isn't in the centre. It was worded the way it was to not give away MQ/Vanilla info. I think these two checks are similar enough that it would be better to continue to not give away that information.

The MQ Shadow one was worded the way it was to not give away MQ/Vanilla info. I think the floormaster chest was removed as a sometimes, though? So simply the existence of the hint the way it's worded currently would give away that info, but only if you know what is or isn't available as sometimes hints... which I think is not acceptable? I'm not sure when that change was made or how it slipped by without my complaining about it. My opinion is that you should change the wording on the non-clearer hints as well, and for both the MQ and unused vanilla hints for those locations, to make it absolutely clear which version of the dungeon those hints are for.

[alkalineace]

Rewriting for song hints, i separated the colors to make it more clear.

• 'Song from Ocarina of Time': ("the #Ocarina of Time# teaches", "the #song# taught by the #Ocarina of Time# is", ['song', 'sometimes']),
• 'Song from Royal Familys Tomb': (["#ReDead in the royal tomb# guard", "the #Composer Brothers wrote#"], "the #song# written in the #royal tomb# is", ['song', 'sometimes']),
• 'Sheik in Forest': ("#in a meadow# Sheik teaches", "the #song# Sheik teaches in #Sacred Forest Meadow# is", ['song', 'sometimes']),
• 'Sheik at Temple': ("Sheik waits at a #monument to time# to teach", "the #song# Sheik teaches in #Temple of Time# is", ['song', 'sometimes']),
• 'Sheik in Crater': ("the #crater's melody# is", "the #song# Sheik teaches in #Death Mountain Crater# is", ['song', 'sometimes']),
• 'Sheik in Ice Cavern': ("the #frozen cavern# echoes with", "the #song# Sheik teaches in #Ice Cavern# is", ['song', 'sometimes']),
• 'Sheik in Kakariko': ("a #ravaged village# mourns with", "the #song# Sheik teaches in #Kakariko Village# is", ['song', 'sometimes']),
• 'Sheik at Colossus': ("a hero ventures #beyond the wasteland# to learn", "the #song# Sheik teaches in #Desert Colossus# is", ['song', 'sometimes']),

Looks like this - tell me if it works.
Song hints will all follow this pattern :
-> song written in red
-> location written in green
-> item written in green

Rewrite taking in account some of the remarks :

• 'DMT Biggoron': ("#Biggoron# crafts", "showing the #Claim Check to Biggoron# rewards", ['overworld', 'sometimes']),
• 'ZF Bottom Freestanding PoH': ("#under the icy waters# lies", "at the #bottom of the lake in Zora's Fountain# lies", ['overworld', 'sometimes']),
• 'GC Pot Freestanding PoH': ("spinning #Goron pottery# contains", "putting an explosive in a #happy face Goron Pot# rewards", ['overworld', 'sometimes']),
• 'LH Lab Dive': ("a #diving experiment# is rewarded with", "a #lakeside lab diving experiment# rewards", ['overworld', 'sometimes']),
• 'Gerudo Training Ground Maze Path Final Chest': ("the final prize of #the thieves' training# is", "#Gerudo Training Grounds' final reward# contains", ['dungeon', 'sometimes']),
• 'Gerudo Training Ground MQ Ice Arrows Chest': ("the final prize of #the thieves' training# is", "#Gerudo Training Grounds' final reward# contains", ['dungeon', 'sometimes']),

About the Shadow hint part - i took the non-clear hint of Dead Hand in the well :

• 'Shadow Temple MQ Bomb Flower Chest': ("a grasping ghoul in an #invisible maze# guards", "the buried #Dead Hand with Bomb Flowers# guards", ['dungeon', 'sometimes']),
• 'Shadow Temple Invisible Floormaster Chest': ("a singular hand in an #invisible maze# guards", "a #floormaster at the end of Shadow Temple# guards", 'exclude'),

@ETR-BTF @r0bd0g tell me if that's better !

[ETR-BTF]

It was worded the way it was to not give away MQ/Vanilla info.

I don't really see why we should do this when other things already give away MQ/Vanilla info, including other hints (e.g. the example you mentioned).

About the Shadow hint part - i took the non-clear hint of Dead Hand in the well :

I like the cryptic hint, but I still think "the buried Dead Hand with Bomb Flowers" is weird phrasing. Maybe ditch the "buried" entirely (that's the initial state of all Dead Hands so it doesn't add any info) and go with something like "the Dead Hand surrounded by Bomb Flowers" or "the Dead Hand in de deepest parts of the Shadow Temple".

[r0bd0g]

I think 'grasping ghoul' could probably be interpreted as either version of shadow (hands are involved either way), so it should probably be changed still. Honestly I wish we'd thought of it to use back when they were both hintable lol, it'd have been way better like that. The "cryptic hints" aren't supposed to be cryptic, just have a little flavour. But you can just have that hint be clear too if you want and just say Floormaster, maybe just instead of Shadow Temple you can use the dungeon's hint name, the 'house of the dead'. I'm not sure if Floormaster is supposed to be capitalized. Did we capitalize other enemies? I think we said "ReDead" for example...

I don't think that updated clearer hint is clear enough in MQ shadow.

[alkalineace]

Further updates taking in account comments :

• 'Shadow Temple MQ Bomb Flower Chest': ("a #grasping ghoul surrounded by Bomb Flowers# guards", "the #Dead Hand surrounded by Bomb Flowers# guards", ['dungeon', 'sometimes']),
• 'Shadow Temple Invisible Floormaster Chest': ("a #Floormaster in the house of the dead# guards", "a #Floormaster in the Shadow Temple# guards", 'exclude'),

[alkalineace]

Changes for song hints to make locations appear in Red, as per @fenhl suggestion :

No regression for dual hints :

No regression for sometimes/item hints :

[fenhl]

I feel like this should be handled in the function generating the hint text for Sometimes hints instead of here, as other text boxes might need a different behavior.

[alkalineace]

I'll check that out once I have a little more time.
I think it's fine to handle it here to have a default in case we got out of bounds for colors like I accidentally did ; but to also handle it directly in the sometimes themselves for a more controlled concept.

Hard to decide.

[fenhl]

We already have a default: It keeps using the last color for extra placeholders. I don't think there's a good reason to change it to behaving this way other than for Sometimes hints.

[alkalineace]

If we have a default then i have no objections, i'll change that later.

[cjohnson57]

Great work on this, but some comments. You don't have to take all my suggestions exactly as I wrote them, like the original PR these are open for discussion and changes

[alkalineace]

@fenhl @cjohnson57 pushed changes taking in account all of the reviews, i'll let you resolve the comments if you're fine with that.

[cjohnson57]

Great work, thanks for your responsiveness to the changes. One final thing and this should be good to go

[cjohnson57]

Oop, my bad, this slipped my mind

[cjohnson57]

Thank you! Sorry for the lapse between your last update and now