Skip to content

Commit

Permalink
Merge 'Clearer Hints part 2' (#2104)
Browse files Browse the repository at this point in the history
  • Loading branch information
@cjohnson57
cjohnson57 committed Oct 3, 2023
2 parents 6c664b9 + 40542a5 commit 068f85e
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 21 deletions.
28 changes: 14 additions & 14 deletions HintList.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -528,18 +528,18 @@ def tokens_required_by_settings(world: World) -> int:
'ZR Frogs Ocarina Game': (["an #amphibian feast# yields", "the #croaking choir's magnum opus# awards", "the #froggy finale# yields"], "the final reward from the #Frogs of Zora's River# is", ['overworld', 'sometimes']),
'KF Links House Cow': ("the #bovine bounty of a horseback hustle# gifts", "#Malon's obstacle course# leads to", 'always'),

'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']),
'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", "in the #Sacred Forest Meadow#, Sheik teaches", ['song', 'sometimes']),
'Sheik at Temple': ("Sheik waits at a #monument to time# to teach", "the #Temple of Time# chimes with the music of", ['song', 'sometimes']),
'Sheik in Crater': ("the #crater's melody# is", "Sheik waits in the #Death Mountain Crater# to teach", ['song', 'sometimes']),
'Sheik in Ice Cavern': ("the #frozen cavern# echoes with", "the #Ice Cavern# corridors ring with", ['song', 'sometimes']),
'Sheik in Kakariko': ("a #ravaged village# mourns with", "amidst flames in #Kakariko Village#, Sheik gives", ['song', 'sometimes']),
'Sheik at Colossus': ("a hero ventures #beyond the wasteland# to learn", "the #Desert Colossus# sands echo with", ['song', 'sometimes']),

'Market 10 Big Poes': ("#ghost hunters# will be rewarded with", "catching #Big Poes# leads to", ['overworld', 'sometimes']),
'Deku Theater Skull Mask': ("the #Skull Mask# yields", None, ['overworld', 'sometimes']),
'Deku Theater Mask of Truth': ("showing a #truthful eye to the crowd# rewards", "the #Mask of Truth# yields", ['overworld', 'sometimes']),
'Deku Theater Skull Mask': ("the #Skull Mask# yields", "wearing the #Skull Mask in the Deku Theater# rewards", ['overworld', 'sometimes']),
'Deku Theater Mask of Truth': ("showing a #truthful eye to the crowd# rewards", "showing the #Mask of Truth in the Deku Theater# rewards", ['overworld', 'sometimes']),
'HF Ocarina of Time Item': ("the #treasure thrown by Princess Zelda# is", None, ['overworld', 'sometimes']),
'DMT Biggoron': ("#Biggoron# crafts", "showing the #Claim Check to Biggoron# rewards", ['overworld', 'sometimes']),
'Kak 50 Gold Skulltula Reward': (["#50 bug badges# rewards", "#50 spider souls# yields", "#50 auriferous arachnids# lead to"], "slaying #50 Gold Skulltulas# reveals", ['overworld', 'sometimes']),
Expand All @@ -550,7 +550,7 @@ def tokens_required_by_settings(world: World) -> int:
'GC Darunias Joy': ("a #groovin' goron# gifts", "#Darunia's dance# leads to", ['overworld', 'sometimes']),
'LW Skull Kid': ("the #Skull Kid# grants", None, ['overworld', 'sometimes']),
'LH Sun': ("staring into #the sun# grants", "shooting #the sun# grants", ['overworld', 'sometimes']),
'Market Treasure Chest Game Reward': (["#gambling# grants", "there is a #1/32 chance# to win"], "the #treasure chest game# grants", ['overworld', 'sometimes']),
'Market Treasure Chest Game Reward': (["#gambling in the market# grants", "there is a #1/32 chance# to win"], "winning the #treasure chest game# rewards", ['overworld', 'sometimes']),
'GF HBA 1500 Points': ("mastery of #horseback archery# grants", "scoring 1500 in #horseback archery# grants", ['overworld', 'sometimes']),
'Graveyard Heart Piece Grave Chest': ("playing #Sun's Song# in a grave spawns", None, ['overworld', 'sometimes']),
'GC Maze Left Chest': ("in #Goron City# the hammer unlocks", None, ['overworld', 'sometimes']),
Expand All @@ -560,13 +560,13 @@ def tokens_required_by_settings(world: World) -> int:
'HF GS Cow Grotto': ("a #spider behind webs# in a grotto holds", None, ['overworld', 'sometimes']),
'HF Cow Grotto Cow': ("the #cobwebbed cow# gifts", "a #cow behind webs# in a grotto gifts", ['overworld', 'sometimes']),
'ZF GS Hidden Cave': ("a spider high #above the icy waters# holds", None, ['overworld', 'sometimes']),
'Wasteland Chest': (["#deep in the wasteland# is", "beneath #the sands#, flames reveal"], "a chest spawned by #lighting flames in the Haunted Wasteland# contains", ['overworld', 'sometimes']),
'Wasteland Chest': (["#deep in the wasteland# is", "beneath #the sands#, flames reveal"], "the #Haunted Wasteland torches# reveal", ['overworld', 'sometimes']),
'Wasteland GS': ("a #spider in the wasteland# holds", None, ['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 the lake in Zora's Fountain# lies", ['overworld', 'sometimes']),
'ZF Bottom Freestanding PoH': ("#under the icy waters# lies", "at the #bottom of Zora's Fountain# lies", ['overworld', 'sometimes']),
'GC Pot Freestanding PoH': ("spinning #Goron pottery# contains", "the #Goron Pot's happy face# spits out", ['overworld', 'sometimes']),
'ZD King Zora Thawed': ("a #defrosted dignitary# gifts", "unfreezing #King Zora# grants", ['overworld', 'sometimes']),
'DMC Deku Scrub': ("a single #scrub in the crater# sells", None, ['overworld', 'sometimes']),
'DMC Deku Scrub': ("a single #scrub in the crater# sells", "a lone #scrub in Death Mountain Crater# sells", ['overworld', 'sometimes']),
'DMC GS Crate': ("a spider under a #crate in the crater# holds", None, ['overworld', 'sometimes']),
'LW Target in Woods': ("shooting a #target in the woods# grants", None, ['overworld', 'sometimes']),
'ZR Frogs in the Rain': ("#frogs in a storm# gift", "playing #Song of Storms to Frogs# rewards", ['overworld', 'sometimes']),
Expand Down
7 changes: 1 addition & 6 deletions Hints.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -987,12 +987,7 @@ def get_specific_hint(spoiler: Spoiler, world: World, checked: set[str], hint_ty
location_text = '#%s#' % location_text
item_text = get_hint(get_item_generic_name(location.item), world.settings.clearer_hints).text

colors = ['Red']
while location_text.count('#') > 2 * len(colors):
colors.append('Red')
colors.append('Green')

return GossipText('%s #%s#.' % (location_text, item_text), colors, [location.name], [location.item.name]), [location]
return GossipText('%s #%s#.' % (location_text, item_text), ['Red', 'Green'], [location.name], [location.item.name]), [location]


def get_sometimes_hint(spoiler: Spoiler, world: World, checked: set[str]) -> HintReturn:
Expand Down
2 changes: 1 addition & 1 deletion version.py
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = '7.1.197'
__version__ = '7.1.198'

# This is a supplemental version number for branches based off of main dev.
supplementary_version = 0
Expand Down

0 comments on commit 068f85e

Please sign in to comment.