morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 20:21:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into breaking_changes

Browse Source 
# Conflicts:
#	MultiClient.py
#	Utils.py
#	worlds/alttp/ItemPool.py
#	worlds/alttp/Main.py
#	worlds/alttp/Shops.py
This commit is contained in:
Fabian Dill
2021-02-19 13:45:50 +01:00
parent 25bbfb2f3e b1cf1a80e6
commit 122e360ec8
46 changed files with 10942 additions and 6539 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
worlds/alttp/Text.py
View File

@@ -1443,7 +1443,7 @@ class TextTable(object):
'zora_meeting',
'zora_tells_cost',
'zora_get_flippers',
#'zora_no_cash',
'zora_no_cash',
'zora_no_buy_item',
'agahnim_zelda_teleport',
'agahnim_magic_running_away',
@@ -1725,7 +1725,7 @@ class TextTable(object):
text['game_race_boy_already_won'] = CompressedTextMapper.convert("You already have your prize, dingus!")
# D0
text['game_race_boy_sneaky'] = CompressedTextMapper.convert("Thought you could sneak in, eh?")
text['bottle_vendor_choice'] = CompressedTextMapper.convert("I gots bottles.\nYous gots 100 rupees?\n ≥ I want\n no way!")
text['bottle_vendor_choice'] = CompressedTextMapper.convert("I gots bottles.\nYous gots 100 rupees?\n ≥ I want\n no way!\n{CHOICE}")
text['bottle_vendor_get'] = CompressedTextMapper.convert("Nice! Hold it up son! Show the world what you got!")
text['bottle_vendor_no'] = CompressedTextMapper.convert("Fine! I didn't want your money anyway.")
text['bottle_vendor_already_collected'] = CompressedTextMapper.convert("Dude! You already have it.")