From ae17e572a07c0f3604c6d9e50a08d5ff69b5350b Mon Sep 17 00:00:00 2001 From: aMannus Date: Mon, 30 Jun 2025 00:13:03 +0200 Subject: [PATCH] Hard code custom prices for scrubs/shops for now --- soh/soh/Enhancements/randomizer/context.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/soh/soh/Enhancements/randomizer/context.cpp b/soh/soh/Enhancements/randomizer/context.cpp index db8f38c6e..37b701598 100644 --- a/soh/soh/Enhancements/randomizer/context.cpp +++ b/soh/soh/Enhancements/randomizer/context.cpp @@ -521,8 +521,8 @@ void Context::ParseArchipelagoOptions(const std::map& slot_dat mOptions[RSK_SHUFFLE_TOKENS].Set(slotData["shuffle_tokens"]); mOptions[RSK_SHOPSANITY].Set(slotData["shuffle_shops"]); mOptions[RSK_SHOPSANITY_COUNT].Set(4); - mOptions[RSK_SHOPSANITY_PRICES].Set(0); - mOptions[RSK_SHOPSANITY_PRICES_FIXED_PRICE].Set(0); + mOptions[RSK_SHOPSANITY_PRICES].Set(RO_PRICE_FIXED); + mOptions[RSK_SHOPSANITY_PRICES_FIXED_PRICE].Set(1); mOptions[RSK_SHOPSANITY_PRICES_RANGE_1].Set(0); mOptions[RSK_SHOPSANITY_PRICES_RANGE_2].Set(0); mOptions[RSK_SHOPSANITY_PRICES_NO_WALLET_WEIGHT].Set(0); @@ -536,8 +536,8 @@ void Context::ParseArchipelagoOptions(const std::map& slot_dat } else { mOptions[RSK_SHUFFLE_SCRUBS].Set(RO_SCRUBS_OFF); } - mOptions[RSK_SCRUBS_PRICES].Set(0); - mOptions[RSK_SCRUBS_PRICES_FIXED_PRICE].Set(0); + mOptions[RSK_SCRUBS_PRICES].Set(RO_PRICE_FIXED); + mOptions[RSK_SCRUBS_PRICES_FIXED_PRICE].Set(1); mOptions[RSK_SCRUBS_PRICES_RANGE_1].Set(0); mOptions[RSK_SCRUBS_PRICES_RANGE_2].Set(0); mOptions[RSK_SCRUBS_PRICES_NO_WALLET_WEIGHT].Set(0); @@ -715,6 +715,8 @@ void Context::ParseArchipelagoItemsLocations(const std::vectorsecond; const RandomizerCheck rc = StaticData::locationNameToEnum[ap_item.locationName]; + itemLocationTable[rc].SetCustomPrice(10); + if(SlotName == ap_item.playerName) { // our item SPDLOG_TRACE("Populated item {} at location {}", ap_item.itemName, ap_item.locationName);