Fix playthrough items for in-game spoiler log (#761)

gamestabled · Feb 22, 2025 · 0f3624c · 0f3624c
1 parent eb9e209
commit 0f3624c
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/source/spoiler_log.cpp b/source/spoiler_log.cpp
@@ -157,16 +157,13 @@ void WriteIngameSpoilerLog() {
         if (loc->IsExcluded()) {
             continue;
         }
-        // Master Sword
-        else if (!Settings::ShuffleMasterSword && key == TOT_MASTER_SWORD) {
-            continue;
-        }
         // Cows
         else if (!Settings::ShuffleCows && loc->IsCategory(Category::cCow)) {
             continue;
         }
         // Merchants
-        else if (Settings::ShuffleMerchants.Is(SHUFFLEMERCHANTS_OFF) && loc->IsCategory(Category::cMerchant)) {
+        else if (Settings::ShuffleMerchants.Is(SHUFFLEMERCHANTS_OFF) && loc->IsCategory(Category::cMerchant) &&
+                 key != WASTELAND_BOMBCHU_SALESMAN) { // The bombchu salesman is handled below
             continue;
         }
         // Adult Trade
@@ -243,6 +240,9 @@ void WriteIngameSpoilerLog() {
             splrDatLoc->ItemLocations[spoilerItemIndex].RevealType  = REVEALTYPE_ALWAYS;
         } else if (key == ZR_MAGIC_BEAN_SALESMAN && !Settings::ShuffleMagicBeans) {
             splrDatLoc->ItemLocations[spoilerItemIndex].RevealType = REVEALTYPE_ALWAYS;
+        } else if (key == WASTELAND_BOMBCHU_SALESMAN && Settings::ShuffleMerchants.Is(SHUFFLEMERCHANTS_OFF)) {
+            splrDatLoc->ItemLocations[spoilerItemIndex].CollectType = COLLECTTYPE_REPEATABLE;
+            splrDatLoc->ItemLocations[spoilerItemIndex].RevealType  = REVEALTYPE_ALWAYS;
         }
         // Shops
         else if (loc->IsShop()) {