nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Add shop item and price parsing

Browse Source
This commit is contained in:
aMannus
2025-10-17 00:12:32 +02:00
parent ab00eb9a8c
commit 786f0fec4c
1 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
soh/soh/Enhancements/randomizer/context.cpp
View File

@@ -753,6 +753,7 @@ void Context::ParseArchipelagoOptions() {
void Context::ParseArchipelagoItemsLocations(const std::vector<ArchipelagoClient::ApItem>& scouted_items) {
const std::string SlotName = ArchipelagoClient::GetInstance().GetSlotName();
nlohmann::json slotData = ArchipelagoClient::GetInstance().GetSlotData();
// Zero out the location table first
for (int rc = 1; rc < RC_MAX; rc++) {
@@ -760,13 +761,12 @@ void Context::ParseArchipelagoItemsLocations(const std::vector<ArchipelagoClient
}
for (const ArchipelagoClient::ApItem& ap_item : scouted_items) {
// const RandomizerCheck rc = StaticData::APcheckToSoh.find(ap_item.locationName)->second;
const RandomizerCheck rc = StaticData::locationNameToEnum[ap_item.locationName];
itemLocationTable[rc].SetCustomPrice(10);
if (SlotName == ap_item.playerName) {
// our item
// Our item
SPDLOG_TRACE("Populated item {} at location {}", ap_item.itemName, ap_item.locationName);
const RandomizerGet item = StaticData::itemNameToEnum[ap_item.itemName];
itemLocationTable[rc].SetPlacedItem(item);
@@ -785,6 +785,25 @@ void Context::ParseArchipelagoItemsLocations(const std::vector<ArchipelagoClient
}
}
// Place vanilla shop items
nlohmann::json vanillaShopItems = slotData["shop_vanilla_items"];
for (auto it = vanillaShopItems.begin(); it != vanillaShopItems.end(); it++) {
std::string location = it.key();
std::string itemName = it.value();
const RandomizerCheck rc = StaticData::locationNameToEnum[location];
const RandomizerGet item = StaticData::itemNameToEnum[itemName];
itemLocationTable[rc].SetPlacedItem(item);
}
// Set all shop item prices
nlohmann::json shopPrices = slotData["shop_prices"];
for (auto it = shopPrices.begin(); it != shopPrices.end(); it++) {
std::string location = it.key();
uint16_t price = it.value();
const RandomizerCheck rc = StaticData::locationNameToEnum[location];
itemLocationTable[rc].SetCustomPrice(price);
}
itemLocationTable[RC_ZR_MAGIC_BEAN_SALESMAN].SetCustomPrice(60);
itemLocationTable[RC_KAK_GRANNYS_SHOP].SetCustomPrice(100);
itemLocationTable[RC_WASTELAND_BOMBCHU_SALESMAN].SetCustomPrice(200);