From 797e0e7045d6fd4520d80de3b1c6cbd8b6ed8f33 Mon Sep 17 00:00:00 2001 From: viccie211 Date: Thu, 30 Apr 2026 16:30:09 +0200 Subject: [PATCH 1/3] Sets the spoiler checks of freestanding rupees to REVEALTYPE_ALWAYS if rupeesanity is off --- source/spoiler_log.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/source/spoiler_log.cpp b/source/spoiler_log.cpp index fe2efb02..3fde4c44 100644 --- a/source/spoiler_log.cpp +++ b/source/spoiler_log.cpp @@ -277,6 +277,10 @@ void WriteIngameSpoilerLog() { splrDatLoc->ItemLocations[spoilerItemIndex].CollectType = COLLECTTYPE_REPEATABLE; splrDatLoc->ItemLocations[spoilerItemIndex].RevealType = REVEALTYPE_ALWAYS; } + else if(loc->IsCategory(Category::cFreestandingRupee) && Settings::ShuffleRupees.Value() == false){ + splrDatLoc->ItemLocations[spoilerItemIndex].CollectType = COLLECTTYPE_REPEATABLE; + splrDatLoc->ItemLocations[spoilerItemIndex].RevealType = REVEALTYPE_ALWAYS; + } auto checkGroup = loc->GetCollectionCheckGroup(); splrDatLoc->ItemLocations[spoilerItemIndex].Group = checkGroup; From 460c9811f9d5378cbd899790ec057e8c869854cc Mon Sep 17 00:00:00 2001 From: viccie211 Date: Thu, 30 Apr 2026 16:41:08 +0200 Subject: [PATCH 2/3] Set COLLECTTYPE_REPEATABLE depending on whether the rupee is repeatable --- source/spoiler_log.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/spoiler_log.cpp b/source/spoiler_log.cpp index 3fde4c44..4ac4f492 100644 --- a/source/spoiler_log.cpp +++ b/source/spoiler_log.cpp @@ -278,7 +278,8 @@ void WriteIngameSpoilerLog() { splrDatLoc->ItemLocations[spoilerItemIndex].RevealType = REVEALTYPE_ALWAYS; } else if(loc->IsCategory(Category::cFreestandingRupee) && Settings::ShuffleRupees.Value() == false){ - splrDatLoc->ItemLocations[spoilerItemIndex].CollectType = COLLECTTYPE_REPEATABLE; + + splrDatLoc->ItemLocations[spoilerItemIndex].CollectType = loc->GetFlag() >= 0x20 ? COLLECTTYPE_REPEATABLE : COLLECTTYPE_NORMAL; splrDatLoc->ItemLocations[spoilerItemIndex].RevealType = REVEALTYPE_ALWAYS; } From be0e2b8dc3ea76235dead8a47bd38259d4a61c1f Mon Sep 17 00:00:00 2001 From: viccie211 <10045263+viccie211@users.noreply.github.com> Date: Thu, 30 Apr 2026 18:13:37 +0000 Subject: [PATCH 3/3] Auto-format code to match clang rules --- source/spoiler_log.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/source/spoiler_log.cpp b/source/spoiler_log.cpp index 4ac4f492..656e2fed 100644 --- a/source/spoiler_log.cpp +++ b/source/spoiler_log.cpp @@ -276,11 +276,11 @@ void WriteIngameSpoilerLog() { Settings::Scrubsanity.Is(SCRUBSANITY_OFF)) { splrDatLoc->ItemLocations[spoilerItemIndex].CollectType = COLLECTTYPE_REPEATABLE; splrDatLoc->ItemLocations[spoilerItemIndex].RevealType = REVEALTYPE_ALWAYS; - } - else if(loc->IsCategory(Category::cFreestandingRupee) && Settings::ShuffleRupees.Value() == false){ - - splrDatLoc->ItemLocations[spoilerItemIndex].CollectType = loc->GetFlag() >= 0x20 ? COLLECTTYPE_REPEATABLE : COLLECTTYPE_NORMAL; - splrDatLoc->ItemLocations[spoilerItemIndex].RevealType = REVEALTYPE_ALWAYS; + } else if (loc->IsCategory(Category::cFreestandingRupee) && Settings::ShuffleRupees.Value() == false) { + + splrDatLoc->ItemLocations[spoilerItemIndex].CollectType = + loc->GetFlag() >= 0x20 ? COLLECTTYPE_REPEATABLE : COLLECTTYPE_NORMAL; + splrDatLoc->ItemLocations[spoilerItemIndex].RevealType = REVEALTYPE_ALWAYS; } auto checkGroup = loc->GetCollectionCheckGroup();