Merge branch 'beta' into pikit

This commit is contained in:
2026-06-07 01:35:50 -05:00

33
Text.py
View File

@@ -376,31 +376,30 @@ Sahasrahla_names = [
Kakariko_texts = ["{}'s homecoming"] Kakariko_texts = ["{}'s homecoming"]
Blacksmiths_texts = [ Blacksmiths_texts = [
'frogs for bread', "Frogs for bread",
'That\'s not a sword', "That's not a sword",
'The Rupeesmiths' "The rupeesmiths",
] * 1 + [ "The dwarven breadsmiths",
"the dwarven breadsmiths"
] ]
DeathMountain_texts = [ DeathMountain_texts = [
"the lost old man", "The lost old man",
"gary the old man", "Gary the old man",
"Your ad here" "Your ad here",
] ]
LostWoods_texts = [ LostWoods_texts = [
'thieves\' stump', "Thieves' stump",
] * 2 + [ "Thieves' stump",
"the forest thief", "The forest thief",
"dancing pickles", "Dancing pickles",
"flying crows", "Flying crows",
] ]
WishingWell_texts = [ WishingWell_texts = [
"venus. queen of faeries", "Venus, Queen of Faeries",
"Venus was her name", "Venus was her name",
"I'm your Venus", "I'm your Venus",
"Yeah, baby, shes got it", "Yeah, baby, she's got it",
"Venus, I'm your fire", "Venus, I'm your fire",
"Venus, At your desire", "Venus, at your desire",
"Venus Love Chain", "Venus Love Chain",
"Venus Crescent Beam", "Venus Crescent Beam",
] ]
@@ -1869,7 +1868,7 @@ class TextTable(object):
# 100 # 100
text['dark_sanctuary_no'] = CompressedTextMapper.convert("Then go away!") text['dark_sanctuary_no'] = CompressedTextMapper.convert("Then go away!")
text['dark_sanctuary_hint_1'] = CompressedTextMapper.convert("There is a thief in the desert, he can open creepy chests that follow you. But now that we have that out of the way, Do you like my hair? I've spent eons getting it this way.") text['dark_sanctuary_hint_1'] = CompressedTextMapper.convert("There is a thief in the desert, he can open creepy chests that follow you. But now that we have that out of the way, Do you like my hair? I've spent eons getting it this way.")
text['dark_sanctuary_yes'] = CompressedTextMapper.convert("With Crystals 5&6, you can find a great fairy in the pyramid.\n\nFlomp Flomp, Whizzle Whomp") text['dark_sanctuary_yes'] = CompressedTextMapper.convert("With crystals 5 and 6, you can find a great fairy in the pyramid.\n\nFlomp Flomp, Whizzle Whomp")
text['dark_sanctuary_hint_2'] = CompressedTextMapper.convert( text['dark_sanctuary_hint_2'] = CompressedTextMapper.convert(
"All I can say is that my life is pretty plain,\n" "All I can say is that my life is pretty plain,\n"
+ "I like watchin' the puddles gather rain,\n" + "I like watchin' the puddles gather rain,\n"