Feature/split songs

soh/soh/Enhancements/debugconsole.cpp

@@ -13,6 +13,7 @@
 #include "soh/Enhancements/audio/AudioEditor.h"
 #include "soh/Enhancements/randomizer/logic.h"
 #include "soh/Enhancements/randomizer/randomizer.h"
+#include "soh/Enhancements/randomizer/split_songs.h"
 
 #define Path _Path
 #define PATH_HACK
@@ -404,6 +405,20 @@ static bool GiveItemHandler(std::shared_ptr<Ship::Console> Console, const std::v
     return 0;
 }
 
+static bool RandoGiveAllSplitSongPartsHandler(std::shared_ptr<Ship::Console> Console,
+                                              const std::vector<std::string> args, std::string* output) {
+    if (gPlayState == nullptr) {
+        ERROR_MESSAGE("No active game; load into gameplay first.");
+        return 1;
+    }
+    if (!IS_RANDO) {
+        ERROR_MESSAGE("Only works in Randomizer (load a rando save).");
+        return 1;
+    }
+    Rando::SplitSongs::DebugGiveAllSongParts(gPlayState);
+    return 0;
+}
+
 static bool EntranceHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args,
                             std::string* output) {
     if (args.size() < 2) {
@@ -1606,6 +1621,12 @@ void DebugConsole_Init(void) {
                                     { "giveItemID", Ship::ArgumentType::NUMBER },
                                 } });
 
+    CMD_REGISTER("rando_give_all_split_song_parts",
+                 { RandoGiveAllSplitSongPartsHandler,
+                   "Randomizer: grants all 12 ocarina songs via both split parts (tests Randomizer_Item_Give + "
+                   "completion). Rando save only.",
+                   {} });
+
     CMD_REGISTER("item", { ItemHandler,
                            "Sets item ID in arg 1 into slot arg 2. No boundary checks. Use with caution.",
                            {

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

@@ -8,6 +8,7 @@
 #include "random.hpp"
 #include "spoiler_log.hpp"
 #include "soh/Enhancements/randomizer/Traps.h"
+#include "soh/Enhancements/randomizer/split_songs.h"
 #include "z64item.h"
 #include <spdlog/spdlog.h>
 
@@ -156,6 +157,15 @@ void GenerateItemPool() {
     lesserPool.clear();
     int reservedSlots = 0;
 
+    if (ctx->GetOption(RSK_SHUFFLE_SONGS).Is(RO_SONG_SHUFFLE_ANYWHERE)) {
+        const bool split = static_cast<bool>(ctx->GetOption(RSK_SPLIT_OCARINA_SONGS));
+        std::vector<RandomizerGet> songTrapModels;
+        Rando::SplitSongs::AppendSongIceTrapModels(songTrapModels, split);
+        for (RandomizerGet rg : songTrapModels) {
+            ctx->possibleIceTrapModels.insert(rg);
+        }
+    }
+
     // clang-format off
     AddItemToPool(RG_BOOMERANG, 2, 1, 1, 1);
     AddItemToPool(RG_LENS_OF_TRUTH, 2, 1, 1, 1);
@@ -252,42 +262,38 @@ void GenerateItemPool() {
     // add extra songs only if song shuffle is anywhere
     if (ctx->GetOption(RSK_SHUFFLE_SONGS).IsNot(RO_SONG_SHUFFLE_OFF)) {
         bool songAnywhere = ctx->GetOption(RSK_SHUFFLE_SONGS).Is(RO_SONG_SHUFFLE_ANYWHERE);
-        if (!ctx->GetOption(RSK_STARTING_ZELDAS_LULLABY).Get()) {
-            AddItemToPool(RG_ZELDAS_LULLABY, songAnywhere ? 2 : 1, 1, 1, 1, songAnywhere);
-        }
-        if (!ctx->GetOption(RSK_STARTING_EPONAS_SONG).Get()) {
-            AddItemToPool(RG_EPONAS_SONG, songAnywhere ? 2 : 1, 1, 1, 1, songAnywhere);
-        }
-        if (!ctx->GetOption(RSK_STARTING_SARIAS_SONG).Get()) {
-            AddItemToPool(RG_SARIAS_SONG, songAnywhere ? 2 : 1, 1, 1, 1, songAnywhere);
-        }
-        if (!ctx->GetOption(RSK_STARTING_SUNS_SONG).Get()) {
-            AddItemToPool(RG_SUNS_SONG, songAnywhere ? 2 : 1, 1, 1, 1, songAnywhere);
-        }
-        if (!ctx->GetOption(RSK_STARTING_SONG_OF_TIME).Get()) {
-            AddItemToPool(RG_SONG_OF_TIME, songAnywhere ? 2 : 1, 1, 1, 1, songAnywhere);
-        }
-        if (!ctx->GetOption(RSK_STARTING_SONG_OF_STORMS).Get()) {
-            AddItemToPool(RG_SONG_OF_STORMS, songAnywhere ? 2 : 1, 1, 1, 1, songAnywhere);
-        }
-        if (!ctx->GetOption(RSK_STARTING_MINUET_OF_FOREST).Get()) {
-            AddItemToPool(RG_MINUET_OF_FOREST, songAnywhere ? 2 : 1, 1, 1, 1, songAnywhere);
-        }
-        if (!ctx->GetOption(RSK_STARTING_BOLERO_OF_FIRE).Get()) {
-            AddItemToPool(RG_BOLERO_OF_FIRE, songAnywhere ? 2 : 1, 1, 1, 1, songAnywhere);
-        }
-        if (!ctx->GetOption(RSK_STARTING_SERENADE_OF_WATER).Get()) {
-            AddItemToPool(RG_SERENADE_OF_WATER, songAnywhere ? 2 : 1, 1, 1, 1, songAnywhere);
-        }
-        if (!ctx->GetOption(RSK_STARTING_REQUIEM_OF_SPIRIT).Get()) {
-            AddItemToPool(RG_REQUIEM_OF_SPIRIT, songAnywhere ? 2 : 1, 1, 1, 1, songAnywhere);
-        }
-        if (!ctx->GetOption(RSK_STARTING_NOCTURNE_OF_SHADOW).Get()) {
-            AddItemToPool(RG_NOCTURNE_OF_SHADOW, songAnywhere ? 2 : 1, 1, 1, 1, songAnywhere);
-        }
-        if (!ctx->GetOption(RSK_STARTING_PRELUDE_OF_LIGHT).Get()) {
-            AddItemToPool(RG_PRELUDE_OF_LIGHT, songAnywhere ? 2 : 1, 1, 1, 1, songAnywhere);
-        }
+        const bool split = ctx->GetOption(RSK_SPLIT_OCARINA_SONGS) && songAnywhere;
+        const int defaultPlentiful = songAnywhere ? 2 : 1;
+        auto addShuffledSong = [&](RandomizerGet fullSong, RandomizerGet progressive, bool hasStarting) {
+            if (hasStarting) {
+                return;
+            }
+            if (!split) {
+                AddItemToPool(fullSong, defaultPlentiful, 1, 1, 1, songAnywhere);
+            } else {
+                AddItemToPool(progressive, 3, 2, 2, 2, songAnywhere);
+            }
+        };
+        addShuffledSong(RG_ZELDAS_LULLABY, RG_PROGRESSIVE_ZELDAS_LULLABY,
+                        ctx->GetOption(RSK_STARTING_ZELDAS_LULLABY).Get());
+        addShuffledSong(RG_EPONAS_SONG, RG_PROGRESSIVE_EPONAS_SONG, ctx->GetOption(RSK_STARTING_EPONAS_SONG).Get());
+        addShuffledSong(RG_SARIAS_SONG, RG_PROGRESSIVE_SARIAS_SONG, ctx->GetOption(RSK_STARTING_SARIAS_SONG).Get());
+        addShuffledSong(RG_SUNS_SONG, RG_PROGRESSIVE_SUNS_SONG, ctx->GetOption(RSK_STARTING_SUNS_SONG).Get());
+        addShuffledSong(RG_SONG_OF_TIME, RG_PROGRESSIVE_SONG_OF_TIME, ctx->GetOption(RSK_STARTING_SONG_OF_TIME).Get());
+        addShuffledSong(RG_SONG_OF_STORMS, RG_PROGRESSIVE_SONG_OF_STORMS,
+                        ctx->GetOption(RSK_STARTING_SONG_OF_STORMS).Get());
+        addShuffledSong(RG_MINUET_OF_FOREST, RG_PROGRESSIVE_MINUET_OF_FOREST,
+                        ctx->GetOption(RSK_STARTING_MINUET_OF_FOREST).Get());
+        addShuffledSong(RG_BOLERO_OF_FIRE, RG_PROGRESSIVE_BOLERO_OF_FIRE,
+                        ctx->GetOption(RSK_STARTING_BOLERO_OF_FIRE).Get());
+        addShuffledSong(RG_SERENADE_OF_WATER, RG_PROGRESSIVE_SERENADE_OF_WATER,
+                        ctx->GetOption(RSK_STARTING_SERENADE_OF_WATER).Get());
+        addShuffledSong(RG_REQUIEM_OF_SPIRIT, RG_PROGRESSIVE_REQUIEM_OF_SPIRIT,
+                        ctx->GetOption(RSK_STARTING_REQUIEM_OF_SPIRIT).Get());
+        addShuffledSong(RG_NOCTURNE_OF_SHADOW, RG_PROGRESSIVE_NOCTURNE_OF_SHADOW,
+                        ctx->GetOption(RSK_STARTING_NOCTURNE_OF_SHADOW).Get());
+        addShuffledSong(RG_PRELUDE_OF_LIGHT, RG_PROGRESSIVE_PRELUDE_OF_LIGHT,
+                        ctx->GetOption(RSK_STARTING_PRELUDE_OF_LIGHT).Get());
     } else {
         ctx->PlaceItemInLocation(RC_SHEIK_IN_FOREST, RG_MINUET_OF_FOREST, false, true);
         ctx->PlaceItemInLocation(RC_SHEIK_IN_CRATER, RG_BOLERO_OF_FIRE, false, true);

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

@@ -21,6 +21,7 @@ int Playthrough_Init(uint32_t seed, std::set<RandomizerCheck> excludedLocations,
     Random_Init(seed);
 
     auto ctx = Rando::Context::GetInstance();
+    ctx->SetSeedGenerated(false);
     ctx->overrides.clear();
     ctx->ItemReset();
     ctx->HintReset();