-
Notifications
You must be signed in to change notification settings - Fork 233
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Option to allow progressive items to give all the upgrades at once #2108
base: Dev
Are you sure you want to change the base?
Changes from 36 commits
de6b3bb
c49f09c
d8f5845
88fd7fa
553c1bc
007ed82
622d603
3b65fde
5d6bd3e
6461238
d4a3fe3
00d5b4d
8f5c2c7
0544e6e
824a699
5c38195
9e363f7
002f573
356f9ea
6d94b46
3f7c926
21b2812
7eee920
f1407b9
4041518
5c60da3
c5bd519
9610848
06d4170
1d3c4d4
4adcc38
a4e4d9c
b9c18f0
45502bf
ef08c80
9961082
9f1191d
7e816f9
211f4f8
c4dc491
2c4a263
57d7a47
111c7c2
5cf21fa
6254814
0d6d936
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
#ifndef SHOP_H | ||
#define SHOP_H | ||
|
||
#include <stdint.h> | ||
|
||
extern uint8_t CFG_SHOPSANITY_ENABLED; | ||
|
||
#endif |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -525,6 +525,19 @@ def tokens_required_by_settings(world: World) -> int: | |
'Ocarina C left Button': (["a somewhat high note"], "the Ocarina C left Button", 'item'), | ||
'Ocarina C right Button': (["a middle note"], "the Ocarina C right Button", 'item'), | ||
|
||
'Max Upgrade Hookshot': (["Water Tenple's keepsake", "the largest Grapple Beam", "the BOINGEST! chain"], "a Max Upgrade Hookshot", 'item'), | ||
'Max Upgrade Strength': (["power gloves", "metal mittens", "the heavy lifty"], "a Max Upgrade Strength", 'item'), | ||
'Max Upgrade Bomb Bag': (["biggest explosive container", "a huge blast bag"], "a Max Upgrade Bomb Bag", 'item'), | ||
'Max Upgrade Bow': (["a fully archery enabler", "a very danger dart launcher"], "a Max Upgrade Bow", 'item'), | ||
'Max Upgrade Slingshot': (["a seed shooter", "a rubberband", "a child's catapult"], "a Max Upgrade Slingshot", 'item'), | ||
'Max Upgrade Wallet': (["the biggest mo' money holder", "a big gem purse", "a huge portable bank"], "a Max Upgrade Wallet", 'item'), | ||
'Max Upgrade Scale': (["the deepest dive", "a piece of Zora"], "a Max Upgrade Zora Scale", 'item'), | ||
'Max Upgrade Nut': (["even more nuts", "the largest flashbang storage"], "Max Upgrade Deku Nut Capacity", 'item'), | ||
'Max Upgrade Stick': (["tons of lumber rack", "even more flammable twigs"], "Max Upgrade Deku Stick Capacity", 'item'), | ||
'Max Upgrade Bombchu': (["tons of mice bombs", "tons of proximity mice", "tons of wall crawlers", "tons of trail blazers"], "Max Upgrade Bombchus", 'item'), | ||
'Max Upgrade Magic': (["ultimate mystic training", "lots of pixie dust", "the largest green rectangle"], "a Max Upgrade Magic Meter", 'item'), | ||
'Max Upgrade Ocarina': (["a time flute"], "a Max Upgrade Ocarina", 'item'), | ||
|
||
Comment on lines
+540
to
+552
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'm not sure if the max upgrade items should have separate hints from the normal ones. I guess if you're on random settings, it's a good way to tell what items are set to max upgrade, though. I could see it being either way There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. iirc it was suggested to me over discord to add individual hints for those items. I tried to look up the convo about it but I suck at using Discord's search feature, sorry. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Note to self: Take a closer look at the cryptic hints at some point. |
||
'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'), | ||
|
||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does this need to be a separate item? It seems to be identical in behavior to a pack of 20 chus. It also seems to be missing the upgrade to a chu bag.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
iirc I added this one for completeness sake and as a placeholder in case the bombchu pack logic changed in the future.
I can remove it if prefered.