mirror
/
Shipwright
mirror of https://github.com/HarbourMasters/Shipwright.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use randomizerMerchantPrices

This commit is contained in:
Garrett Cox 2022-09-02 11:04:45 -05:00
parent 67a890ed1e
commit 32ea5ef564
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
soh/soh/Enhancements/randomizer/randomizer.cpp
View File

@ -734,7 +734,7 @@ void Randomizer::LoadShopMessages(const char* spoilerFileName) {
for (int index = 0; index < shopItemRandomizerChecks.size(); ++index) {
RandomizerCheck shopItemCheck = shopItemRandomizerChecks[index];
std::string shopItemName = GetEnumToSpoilerfileName[this->itemLocations[shopItemCheck]];
u16 shopItemPrice = scrubPrices[shopItemCheck];
u16 shopItemPrice = randomizerMerchantPrices[shopItemCheck];
CustomMessageManager::Instance->CreateMessage(
Randomizer::shopMessageTableID, index, { TEXTBOX_TYPE_BLACK, TEXTBOX_POS_VARIABLE,
"\x08%r" + shopItemName + ": " + std::to_string(shopItemPrice) + " Rupees&%wSpecial deal! ONE LEFT!&Get it while it lasts!\x0A\x02",
@ -2299,8 +2299,8 @@ ShopItemIdentity Randomizer::IdentifyShopItem(s32 sceneNum, s32 actorParams) {
break;
}
if (scrubPrices.find(shopItemIdentity.randomizerCheck) != scrubPrices.end()) {
shopItemIdentity.itemPrice = scrubPrices[shopItemIdentity.randomizerCheck];
if (randomizerMerchantPrices.find(shopItemIdentity.randomizerCheck) != randomizerMerchantPrices.end()) {
shopItemIdentity.itemPrice = randomizerMerchantPrices[shopItemIdentity.randomizerCheck];
}
return shopItemIdentity;