From 786f0fec4c2d12802e95d322e12406c7883ebc0c Mon Sep 17 00:00:00 2001
From: aMannus <mannusmenting@gmail.com>
Date: Fri, 17 Oct 2025 00:12:32 +0200
Subject: [PATCH] Add shop item and price parsing

---
 soh/soh/Enhancements/randomizer/context.cpp | 23 +++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/context.cpp b/soh/soh/Enhancements/randomizer/context.cpp
index 40131059a..60e3e5487 100644
--- a/soh/soh/Enhancements/randomizer/context.cpp
+++ b/soh/soh/Enhancements/randomizer/context.cpp
@@ -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);