Shuffle silver rupees

soh/soh/Enhancements/debugger/debugSaveEditor.cpp

@@ -1685,6 +1685,30 @@ void ResetBaseOptions() {
         .Tooltip("");
 }
 
+void DrawRandomizerTab() {
+    auto ctx = OTRGlobals::Instance->gRandoContext;
+    ImGui::Text("Silver Rupee Counts");
+    if (ctx->GetOption(RSK_SHUFFLE_SILVER_RUPEES)) {
+        for (int32_t i = RG_SILVER_RUPEE_FIRST; i <= RG_SILVER_RUPEE_LAST; i++) {
+            RandomizerGet rgid = static_cast<RandomizerGet>(i);
+            int32_t collected = ctx->GetSilverRupeeCounter(rgid).GetCollected();
+            PushStyleSlider(THEME_COLOR);
+            if (UIWidgets::SliderInt(Rando::StaticData::RetrieveItem(rgid).GetName().GetEnglish().c_str(), &collected,
+                                     UIWidgets::IntSliderOptions()
+                                         .DefaultValue(0)
+                                         .Max(ctx->GetSilverRupeeCounter(rgid).GetTotal())
+                                         .Min(0)
+                                         .ShowButtons(true))) {
+                ctx->GetSilverRupeeCounter(rgid).SetCollected(collected);
+            }
+            PopStyleSlider();
+        }
+    } else {
+        ImGui::Text("Silver Rupees are not shuffled");
+    }
+    UIWidgets::PaddedSeparator();
+}
+
 void SaveEditorWindow::DrawElement() {
     PushStyleTabs(THEME_COLOR);
     ImGui::PushFont(OTRGlobals::Instance->fontMonoLarger);
@@ -1727,6 +1751,12 @@ void SaveEditorWindow::DrawElement() {
             ImGui::EndTabItem();
         }
 
+        ResetBaseOptions();
+        if (ImGui::BeginTabItem("Randomizer")) {
+            DrawRandomizerTab();
+            ImGui::EndTabItem();
+        }
+
         ImGui::EndTabBar();
     }
 

soh/soh/Enhancements/game-interactor/vanilla-behavior/GIVanillaBehavior.h

@@ -2257,6 +2257,27 @@ typedef enum {
 
     // #### `result`
     // ```c
+    // true
+    // ```
+    // #### `args`
+    // - `*EnGSwitch`
+    VB_SILVER_RUPEE_COLLECT,
+
+    // #### `result`
+    // ```c
+    // true
+    // ```
+    // #### `args`
+    // - `*EnGSwitch`
+    VB_SILVER_RUPEE_COUNT_CHECK,
+
+    // #### `result`
+    // ```c
+    // true
+    // ```
+    // #### `args`
+    // - `*EnGSwitch`
+    VB_SILVER_RUPEE_SETUP_DRAW,
     // CVarGetInteger(CVAR_ENHANCEMENT("3DSceneRender"), 0)
     // ```
     // #### `args`

soh/soh/Enhancements/item-tables/ItemTableTypes.h

@@ -27,6 +27,7 @@ typedef enum GetItemCategory {
     /* 0x03 */ ITEM_CATEGORY_SMALL_KEY,
     /* 0x04 */ ITEM_CATEGORY_SKULLTULA_TOKEN,
     /* 0x05 */ ITEM_CATEGORY_MAJOR,
+    /* 0x06 */ ITEM_CATEGORY_SILVER_RUPEE,
 } GetItemCategory;
 
 #define GET_ITEM(itemId, objectId, drawId, textId, field, chestAnim, itemCategory, modIndex, getItemId)                \

soh/soh/Enhancements/kaleido.cpp

@@ -18,6 +18,7 @@ extern PlayState* gPlayState;
 #include "textures/icon_item_static/icon_item_static.h"
 #include "consolevariablebridge.h"
 #include "soh/Enhancements/cosmetics/cosmeticsTypes.h"
+#include "soh/Enhancements/randomizer/dungeon.h"
 
 #include <sstream>
 
@@ -75,7 +76,7 @@ void KaleidoEntryIcon::Draw(PlayState* play, std::vector<Gfx>* mEntryDl) {
                                    G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW));
 
     // icon
-    if (!mAchieved) {
+    if (mGrayscale) {
         mEntryDl->push_back(gsDPSetGrayscaleColor(109, 109, 109, 255));
         mEntryDl->push_back(gsSPGrayscale(true));
     }
@@ -146,6 +147,18 @@ Kaleido::Kaleido() {
             FlagType::FLAG_RANDOMIZER_INF, RAND_INF_GANON_SOUL, 0, yOffset, "Ganon's Soul"));
         yOffset += 18;
     }
+    if (ctx->GetOption(RSK_SHUFFLE_SILVER_RUPEES).Get() > RO_DUNGEON_ITEM_LOC_VANILLA) {
+        for (int i = RG_SILVER_RUPEE_FIRST; i <= RG_SILVER_RUPEE_LAST; i++) {
+            uint8_t dungeonId = ctx->GetSilverRupeeCounter(static_cast<RandomizerGet>(i)).DungeonID();
+            RandomizerCheckQuest dungeonQuest = ctx->GetDungeon(dungeonId)->IsMQ() ? RCQUEST_MQ : RCQUEST_VANILLA;
+            RandomizerCheckQuest rupeeQuest = ctx->GetSilverRupeeCounter(static_cast<RandomizerGet>(i)).Quest();
+            if (dungeonQuest == rupeeQuest) {
+                mEntries.push_back(
+                    std::make_shared<KaleidoEntrySilverRupeeCounter>(static_cast<RandomizerGet>(i), 0, yOffset));
+                yOffset += 18;
+            }
+        }
+    }
 }
 
 extern "C" {
@@ -260,21 +273,28 @@ KaleidoEntryIconFlag::KaleidoEntryIconFlag(const char* iconResourceName, int ico
 
 void KaleidoEntryIconFlag::Update(PlayState* play) {
     mAchieved = GameInteractor::RawAction::CheckFlag(mFlagType, static_cast<int16_t>(mFlag));
+    mGrayscale = !mAchieved;
 }
 
 KaleidoEntryIconCountRequired::KaleidoEntryIconCountRequired(const char* iconResourceName, int iconFormat, int iconSize,
                                                              int iconWidth, int iconHeight, Color_RGBA8 iconColor,
                                                              int16_t x, int16_t y, int* watch, int required, int total)
     : mWatch(watch), mRequired(required), mTotal(total),
       KaleidoEntryIcon(iconResourceName, iconFormat, iconSize, iconWidth, iconHeight, iconColor, x, y) {
-    mCount = *mWatch;
+    if (mWatch != nullptr) {
+        mCount = *mWatch;
+    }
+    mAchieved = mCount >= mRequired;
+    mGrayscale = mCount == 0;
     BuildText();
     BuildVertices();
 }
 
 void KaleidoEntryIconCountRequired::BuildText() {
     std::ostringstream totals;
-    totals << mCount;
+    if (mCount < mRequired) {
+        totals << mCount;
+    }
     if (mRequired != 0 && mCount < mRequired) {
         totals << '/' << mRequired;
     }
@@ -284,6 +304,49 @@ void KaleidoEntryIconCountRequired::BuildText() {
     mText = totals.str();
 }
 
+KaleidoEntrySilverRupeeCounter::KaleidoEntrySilverRupeeCounter(RandomizerGet rgid, int16_t x, int16_t y)
+    : mRgid(rgid), KaleidoEntryIconCountRequired(gRupeeCounterIconTex, G_IM_FMT_IA, G_IM_SIZ_8b, 16, 16,
+                                                 Color_RGBA8{ 255, 255, 255, 255 }, x, y) {
+    mCount = OTRGlobals::Instance->gRandoContext->GetSilverRupeeCounter(mRgid).GetCollected();
+    mRequired = OTRGlobals::Instance->gRandoContext->GetSilverRupeeCounter(mRgid).GetTotal();
+    mAchieved = mCount >= mRequired;
+    mGrayscale = mCount == 0;
+    BuildText();
+    BuildVertices();
+}
+
+void KaleidoEntrySilverRupeeCounter::BuildText() {
+    KaleidoEntryIconCountRequired::BuildText();
+    CustomMessage name = CustomMessage(Rando::StaticData::RetrieveItem(mRgid).GetName());
+    // Abbreviate Dungeon Names
+    name.Replace("Spirit Temple", "SpT");
+    name.Replace("Shadow Temple", "ShT");
+    name.Replace("Bottom of the Well", "BotW");
+    name.Replace("Gerudo Training Grounds", "GTG");
+    name.Replace("Dodongo's Cavern", "DC");
+    name.Replace("Ice Cavern", "IC");
+    name.Replace("Ganon's Castle", "GC");
+    // Remove MQ to make spoilers less prevalent
+    name.Replace("MQ", "");
+    // Remove "Silver Rupee" from the name
+    name.Replace("Silver Rupee", "");
+    if (!mText.empty()) {
+        mText += " ";
+    }
+    mText += name.GetForCurrentLanguage();
+}
+
+void KaleidoEntrySilverRupeeCounter::Update(PlayState* play) {
+    int newCount = OTRGlobals::Instance->gRandoContext->GetSilverRupeeCounter(mRgid).GetCollected();
+    if (mCount != newCount) {
+        mCount = newCount;
+        BuildText();
+        RebuildVertices();
+        mAchieved = mCount >= mRequired;
+        mGrayscale = mCount == 0;
+    }
+}
+
 void KaleidoEntryIcon::BuildVertices() {
     int offsetY = 0;
     int offsetX = 0;
@@ -294,6 +357,19 @@ void KaleidoEntryIcon::BuildVertices() {
     offsetX += 18;
     for (size_t i = 0; i < mText.length(); i++) {
         int charWidth = static_cast<int>(Ship_GetCharFontWidth(mText[i]));
+        if ((offsetX + charWidth) > 220) {
+            offsetX -= Ship_GetCharFontWidth(mText[i - 1]);
+            offsetX -= Ship_GetCharFontWidth(mText[i - 2]);
+            mText = mText.substr(0, i - 2) + "...";
+            int periodWidth = Ship_GetCharFontWidth('.');
+            Ship_CreateQuadVertexGroup(&(vertices)[(i - 1) * 4], offsetX, offsetY, periodWidth, 16, 0);
+            offsetX += periodWidth;
+            Ship_CreateQuadVertexGroup(&(vertices)[(i)*4], offsetX, offsetY, periodWidth, 16, 0);
+            offsetX += periodWidth;
+            Ship_CreateQuadVertexGroup(&(vertices)[(i + 1) * 4], offsetX, offsetY, periodWidth, 16, 0);
+            offsetX += periodWidth;
+            break;
+        }
         Ship_CreateQuadVertexGroup(&(vertices)[(i + 1) * 4], offsetX, offsetY, charWidth, 16, 0);
         offsetX += charWidth;
     }
@@ -326,6 +402,7 @@ void KaleidoEntryIconCountRequired::Update(PlayState* play) {
         BuildText();
         RebuildVertices();
         mAchieved = mCount >= mRequired;
+        mGrayscale = mCount == 0;
     }
 }
 
@@ -381,11 +458,13 @@ void KaleidoEntryOcarinaButtons::Update(PlayState* play) {
     mButtonCollected[4] = GameInteractor::RawAction::CheckFlag(FLAG_RANDOMIZER_INF, RAND_INF_HAS_OCARINA_C_RIGHT) > 0;
     CalculateColors();
     mAchieved = false;
+    mGrayscale = true;
     for (int i = 0; i < mButtonCollected.size(); i++) {
         if (!mButtonCollected[i]) {
             mButtonColors[i] = Color_RGBA8{ 109, 109, 109, 255 };
         } else {
             mAchieved = true;
+            mGrayscale = false;
         }
     }
 }
@@ -406,7 +485,7 @@ void KaleidoEntryOcarinaButtons::Draw(PlayState* play, std::vector<Gfx>* mEntryD
                                    G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW));
 
     // icon
-    if (!mAchieved) {
+    if (mGrayscale) {
         mEntryDl->push_back(gsDPSetGrayscaleColor(109, 109, 109, 255));
         mEntryDl->push_back(gsSPGrayscale(true));
     }

soh/soh/Enhancements/kaleido.h

@@ -39,6 +39,7 @@ class KaleidoEntry {
     Vtx* vtx;
     std::string mText;
     bool mAchieved = false;
+    bool mGrayscale = true;
 };
 
 /**
@@ -128,17 +129,28 @@ class KaleidoEntryIconCountRequired : public KaleidoEntryIcon {
      * @param total The amount of this collectible available in the seed. Set to 0 to not render.
      */
     KaleidoEntryIconCountRequired(const char* iconResourceName, int iconFormat, int iconSize, int iconWidth,
-                                  int iconHeight, Color_RGBA8 iconColor, int16_t x, int16_t y, int* watch,
+                                  int iconHeight, Color_RGBA8 iconColor, int16_t x, int16_t y, int* watch = nullptr,
                                   int required = 0, int total = 0);
     void Update(PlayState* play) override;
+    void BuildText();
+
+  protected:
+    int mRequired;
+    int mCount;
 
   private:
     int* mWatch;
-    int mRequired;
     int mTotal;
-    int mCount;
+};
 
+class KaleidoEntrySilverRupeeCounter : public KaleidoEntryIconCountRequired {
+  public:
+    KaleidoEntrySilverRupeeCounter(RandomizerGet rgid, int16_t x, int16_t y);
+    void Update(PlayState* play) override;
     void BuildText();
+
+  private:
+    RandomizerGet mRgid;
 };
 
 class KaleidoEntryOcarinaButtons : public KaleidoEntryIcon {

soh/soh/Enhancements/randomizer/3drando/fill.cpp

@@ -1066,6 +1066,13 @@ static void RandomizeOwnDungeon(const Rando::DungeonInfo* dungeon) {
         AddElementsToPool(dungeonItems, dungeonBossKey);
     }
 
+    // randomize Silver Rupees
+    if (ctx->GetOption(RSK_SHUFFLE_SILVER_RUPEES).Is(RO_DUNGEON_ITEM_LOC_OWN_DUNGEON)) {
+        auto dungeonSilverRupees = FilterAndEraseFromPool(
+            ItemPool, [dungeon](const RandomizerGet i) { return dungeon->ContainsSilverRupee(i); });
+        AddElementsToPool(dungeonItems, dungeonSilverRupees);
+    }
+
     // randomize boss key and small keys together for even distribution
     AssumedFill(dungeonItems, dungeonLocations);
 
@@ -1131,6 +1138,16 @@ static void RandomizeDungeonItems() {
                 FilterAndEraseFromPool(ItemPool, [](const auto i) { return i == RG_GANONS_CASTLE_BOSS_KEY; });
             AddElementsToPool(overworldItems, ganonBossKey);
         }
+
+        if (ctx->GetOption(RSK_SHUFFLE_SILVER_RUPEES).Is(RO_DUNGEON_ITEM_LOC_ANY_DUNGEON)) {
+            auto silverRupees = FilterAndEraseFromPool(
+                ItemPool, [dungeon](const RandomizerGet i) { return dungeon->ContainsSilverRupee(i); });
+            AddElementsToPool(anyDungeonItems, silverRupees);
+        } else if (ctx->GetOption(RSK_SHUFFLE_SILVER_RUPEES).Is(RO_DUNGEON_ITEM_LOC_OVERWORLD)) {
+            auto silverRupees = FilterAndEraseFromPool(
+                ItemPool, [dungeon](const RandomizerGet i) { return dungeon->ContainsSilverRupee(i); });
+            AddElementsToPool(overworldItems, silverRupees);
+        }
     }
 
     if (ctx->GetOption(RSK_GERUDO_KEYS).Is(RO_GERUDO_KEYS_ANY_DUNGEON)) {

soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_dungeon.cpp

@@ -2225,6 +2225,28 @@ void StaticData::HintTable_Init_Exclude_Dungeon() {
                                                          /*german*/ "Man erzählt sich, daß ein #Herz in Ganons Schloß# #[[1]]# verstecke.",
                                                          /*french*/ "Selon moi, un #coeur dans le Château de Ganon# cache #[[1]]#.", {QM_RED, QM_GREEN}));
 
+   hintTextTable[RHT_ICE_CAVERN_SPINNING_BLADES_SILVER_RUPEE] = HintText(CustomMessage("They say that #spinning blades in Ice Cavern# protect #[[1]]#.", {QM_RED, QM_GREEN}));
+   hintTextTable[RHT_ICE_CAVERN_SLIDING_SILVER_RUPEE] = HintText(CustomMessage("They say that a #freezing slippery room# hides #[[1]]#.", {QM_RED, QM_GREEN}));
+   hintTextTable[RHT_BOTTOM_OF_THE_WELL_BASEMENT_SILVER_RUPEE] = HintText(CustomMessage("They say that the #Bottom of the well acid pit# protects #[[1]]#.", {QM_RED, QM_GREEN}));
+   hintTextTable[RHT_GERUDO_TRAINING_GROUND_BOULDER_SILVER_RUPEE] = HintText(CustomMessage("They say that a #timed boulder maze# guards #[[1]]#.", {QM_RED, QM_GREEN}));
+   hintTextTable[RHT_GERUDO_TRAINING_GROUND_LAVA_SILVER_RUPEE] = HintText(CustomMessage("They say that #a pillar rising out of lava in the desert# holds #[[1]]#.", {QM_RED, QM_GREEN}));
+   hintTextTable[RHT_GERUDO_TRAINING_GROUND_TOILET_SILVER_RUPEE] = HintText(CustomMessage("They say that a #whirlpool in the desert# guards #[[1]]#.", {QM_RED, QM_GREEN}));
+   hintTextTable[RHT_SPIRIT_GATE_SILVER_RUPEE] = HintText(CustomMessage("They say that a #gate in the Spirit Temple# protects #[[1]]#.", {QM_RED, QM_GREEN}));
+   hintTextTable[RHT_SPIRIT_BEAMOS_SILVER_RUPEE] = HintText(CustomMessage("They say that #Beamos in the Spirit Temple# guard #[[1]]# from a #child#.", {QM_RED, QM_GREEN, QM_LBLUE}));
+   hintTextTable[RHT_SPIRIT_BOULDER_SILVER_RUPEE] = HintText(CustomMessage("They say that #boulders in the Spirit Temple# guard #[[1]]#.", {QM_RED, QM_GREEN}));
+   hintTextTable[RHT_SPIRIT_LOBBY_SILVER_RUPEE] = HintText(CustomMessage("They say that #in the first room of the Spirit Temple#, #[[1]]# can be found.", {QM_RED, QM_GREEN}));
+   hintTextTable[RHT_SHADOW_SPINNING_SCYTHE_SILVER_RUPEE] = HintText(CustomMessage("They say that #visible spinning scythes in the Shadow Temple# guard #[[1]]#.", {QM_RED, QM_GREEN}));
+   hintTextTable[RHT_SHADOW_OUTSIDE_SPIKE_RAIN_SILVER_RUPEE] = HintText(CustomMessage("They say that #outside the door to falling spikes in the Shadow Temple#, #[[1]]# can be found.", {QM_RED, QM_GREEN}));
+   hintTextTable[RHT_SHADOW_INVISIBLE_SPIKES_SILVER_RUPEE] = HintText(CustomMessage("They say that #invisible spikes in the Shadow Temple# guard #[[1]]#.", {QM_RED, QM_GREEN}));
+   hintTextTable[RHT_FOREST_TRIAL_SILVER_RUPEE] = HintText(CustomMessage("They say that #a trial of the forest# guards #[[1]]#.", {QM_RED, QM_GREEN}));
+   hintTextTable[RHT_FIRE_TRIAL_SILVER_RUPEE] = HintText(CustomMessage("They say that #a trial of fire# guards #[[1]]#.", {QM_RED, QM_GREEN}));
+   hintTextTable[RHT_WATER_TRIAL_SILVER_RUPEE] = HintText(CustomMessage("They say that #a trial of water# guards #[[1]]#.", {QM_RED, QM_GREEN}));
+   hintTextTable[RHT_SPIRIT_TRIAL_SILVER_RUPEE] = HintText(CustomMessage("They say that #a trial of the spirit# guards #[[1]]#.", {QM_RED, QM_GREEN}));
+   hintTextTable[RHT_SHADOW_TRIAL_SILVER_RUPEE] = HintText(CustomMessage("They say that #a trial of the shadows# guards #[[1]]#.", {QM_RED, QM_GREEN}));
+   hintTextTable[RHT_LIGHT_TRIAL_SILVER_RUPEE] = HintText(CustomMessage("They say that #a trial of light# guards #[[1]]#.", {QM_RED, QM_GREEN}));
+   hintTextTable[RHT_DODONGOS_CAVERN_SILVER_RUPEE] = HintText(CustomMessage("They say that #around a collapsible staircase#, #[[1]]# can be found.", {QM_RED, QM_GREEN}));
+   hintTextTable[RHT_SHADOW_INVISIBLE_SCYTHE_SILVER_RUPEE] = HintText(CustomMessage("They say that #invisible scythes in the Shadow Temple# guard #[[1]]#.", {QM_RED, QM_GREEN}));
+
     // clang-format on
 }
 } // namespace Rando

soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp

@@ -2117,6 +2117,16 @@ void StaticData::HintTable_Init_Item() {
 
     hintTextTable[RHT_WALLET_INF] = HintText(CustomMessage("an infinite Wallet", /*german*/"die unendliche Geldbörse", /*french*/"une Bourse sans fond"));
 
+    hintTextTable[RHT_DC_SILVER_RUPEE] = HintText(CustomMessage("a Dodongo's Cavern Silver Rupee"));
+    hintTextTable[RHT_BOTTOM_OF_THE_WELL_SILVER_RUPEE] = HintText(CustomMessage("a Bottom of the Well Silver Rupee"));
+    hintTextTable[RHT_ICE_CAVERN_SILVER_RUPEE] = HintText(CustomMessage("an Ice Cavern Silver Rupee"));
+    hintTextTable[RHT_BOTTOM_OF_THE_WELL] = HintText(CustomMessage("a Bottom of the Well Silver Rupee"));
+    hintTextTable[RHT_GERUDO_TRAINING_GROUND_SILVER_RUPEE] = HintText(CustomMessage("a Gerudo Training Ground Silver Rupee"));
+    hintTextTable[RHT_SPIRIT_TEMPLE_SILVER_RUPEE] = HintText(CustomMessage("a Spirit Temple Silver Rupee"));
+    hintTextTable[RHT_SHADOW_TEMPLE_SILVER_RUPEE] = HintText(CustomMessage("a Shadow Temple Silver Rupee"));
+    hintTextTable[RHT_GANONS_CASTLE_SILVER_RUPEE] = HintText(CustomMessage("a Ganon's Castle Silver Rupee"));
+    hintTextTable[RHT_BOTTOMLESS_SILVER_RUPEE_POUCH] = HintText(CustomMessage("a pouch full of Silver Rupees"));
+
     hintTextTable[RHT_EPONA] = HintText(CustomMessage("Epona", /*german*/"Epona", /*french*/"Epona"),
                                     // /*spanish*/a Epona
                                     {