Skip to content

Shop fixes #207

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.

Sign up for GitHub

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

Merged
Tacoman369 merged 3 commits into from
Sep 22, 2026
Merged

Shop fixes #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cc66dc2
Update location_access.cpp
Tacoman369 Sep 19, 2026
bb52072
Update Setting Descriptions
pizza1398 Sep 20, 2026
3a346f7
Fix oversight in Barten translations
pizza1398 Sep 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions source/hints.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,15 +665,15 @@ void CreateShopMessages() {
u16 MilkBarMilkPrice = 20;// Location(E_CLOCK_TOWN_MILK_BAR_MILK)->GetPrice();
u16 MilkBarChateauPrice = 200;// Location(E_CLOCK_TOWN_MILK_BAR_CHATEAU)->GetPrice();
// {"English", "French", "Spanish", "German", }; // "Italian"
Text MilkBarIntro = {"What'll it be?&", "Qu'est-ce que ce s'ra?", "¿Qué quiere tomar?", "Was darf's sein?", // "Cosa prendi?",
Text MilkBarIntro = {"What'll it be?", "Qu'est-ce que ce s'ra?", "¿Qué quiere tomar?", "Was darf's sein?", // "Cosa prendi?",
"", "", "¿Qué va a ser?", };
Text MilkSplit = {": ##", " : ##", ": ##", ": ##", }; // " ##",
Text MilkNext = {" Rupees#&#", " Rubis#&#", " rupias#&#", " Rubine#&#", }; // " rupie#&#",
Text MilkLeave = MilkNext +
Text{"Nothing#", "Rien#", "Nada#", "Nichts#", }; // "Niente#",

CustomMessages::CreateMessageFromTextObject(0x2b0b, 0xFFFF, (0x3FF00000 | MilkBarMilkPrice | (MilkBarChateauPrice << 10)), 0xff1001,
MilkBarIntro+">3#"+MilkBarMilkItem+MilkSplit+std::to_string(MilkBarMilkPrice)+MilkNext+MilkBarChateauItem+MilkSplit+std::to_string(MilkBarChateauPrice)+MilkLeave,
MilkBarIntro+"&>3#"+MilkBarMilkItem+MilkSplit+std::to_string(MilkBarMilkPrice)+MilkNext+MilkBarChateauItem+MilkSplit+std::to_string(MilkBarChateauPrice)+MilkLeave,
{QM_GREEN, QM_MAGENTA, QM_GREEN, QM_MAGENTA, QM_GREEN}, {}, {}, 0x0, false, false, MESSAGE_END_NULL);
// CustomMessages::CreateMessage(0x614A, 0xFFFF, (0x3FFFFFFF), 0xff0000,
// {"With all due respect, sir, I think you've had enough of that."},
Expand Down
6 changes: 3 additions & 3 deletions source/location_access.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@ bool LocationAccess::CanBuy() const {
//Check if current walet is large enough
bool SufficientWallet = true;
if (Location(location)->GetPrice() > 500) {
SufficientWallet = Logic::ProgressiveWallet >= 2;
SufficientWallet = Logic::ProgressiveWallet >= 3;
}
else if (Location(location)->GetPrice() > 200) {
SufficientWallet = Logic::ProgressiveWallet >= 1;
SufficientWallet = Logic::ProgressiveWallet >= 2;
}
else if (Location(location)->GetPrice() > 99) {
SufficientWallet = Logic::ProgressiveWallet >= 0;
SufficientWallet = Logic::ProgressiveWallet >= 1;
}

bool OtherCondition = true;
Expand Down
20 changes: 14 additions & 6 deletions source/setting_descriptions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,10 +210,12 @@ string_view shuffleRewardsAnywhere = "Boss Remains can appear anywhere.\n";
/*------------------------------ //
| SHUFFLE MAGIC BEANS | //
------------------------------*/ //
string_view magicBeansDesc = "**OPTION CURRENTLY WIP**\n" //
"Enabling this adds a pack of 20 beans to the item\n"
"pool and changes the Magic Bean Salesman to sell a\n"
"random item at a price of 60 rupees."; //
string_view magicBeansDesc = //"**OPTION CURRENTLY WIP**\n" //
"Bean Seller's free sample bean will be randomized.\n\n"
"He will still sell refills, but only after\n" //
"a randomized bean has been found.\n\n" //
"Please note: every bean is worth 20 beans\n" //
"regardless of this being enabled."; //
/*------------------------------ //
| SHUFFLE KOKIRI SWORD | //
------------------------------*/ //
Expand Down Expand Up @@ -558,12 +560,18 @@ string_view shuffleOcaMusicDesc = "**OPTION CURRENTLY WIP**\n"
/*------------------------------ //
| RESTORATION OPTIONS | //
------------------------------*/ //
string_view fastZoraSwimDesc = "Enables Fast Zora Swimming without magic."; //
string_view fastZoraSwimDesc = "Enables Fast Zora Swimming without magic.\n\n" //
"Slow swimming can still by accessed by\n" //
"pressing dpad up, dpad down, ZL, or holding ZR."; //
string_view ocarinaDiveDesc = "Enables Ocarina Diving. This also patches\n" //
"walking with ocarina from gossip stones."; //
string_view dpadMaskDesc = "Enables using the 3 D-Pad buttons to use\n" //
"transformation masks. This option will also\n" //
"patch using Down A with Mask Storage."; //
"patch using Down A with Mask Storage.\n\n" //
"Down (south) = Deku\n" //
"Left (west) = Zora\n" //
"Up (north) = Goron\n" //
"ZR + Up (in boss room) = Fierce Deity"; //
string_view dpadOcarinaDesc = "Enables using D-Pad right to activate your\n" //
"ocarina."; //
string_view dpadArrowDesc = "Enables using D-Pad up to change your current\n" //
Expand Down
Loading