Improve Entrance Coupling Logic, Improve Entrance Shuffle Data, fix seed name

mods/randomizer/src/randomizer_context.cpp

@@ -867,17 +867,17 @@ void randomizer_checkAndOverrideEntranceData(const char*& stageName, s8& roomNo,
 
     // Debugging: Dump mEntranceOverrides
     // for (const auto& [key,val] : randomizer_GetContext().mEntranceOverrides) {
-    //     mods::log::debug("({},{},{},{}) -> ({},{},{},{})",key.stageId,key.roomNo,key.mapLayer,key.pointNo,val.stageId,val.roomNo,val.mapLayer,val.pointNo);
+    //     mods::log::info("({},{},{},{}) -> ({},{},{},{})",key.stageId,key.roomNo,key.mapLayer,key.pointNo,val.stageId,val.roomNo,val.mapLayer,val.pointNo);
     // }
 
-    // mods::log::debug("Original Stage:{}, {}, {}, {}",stageName,roomNo,pointNo,mapLayer);
+    // mods::log::info("Original Stage:{}, {}, {}, {}",stageName,roomNo,pointNo,mapLayer);
     if (randomizer_GetContext().mEntranceOverrides.contains(override)) {
         auto& newOverride = randomizer_GetContext().mEntranceOverrides[override];
         stageName = allStages[newOverride.stageId];
         pointNo = newOverride.pointNo;
         roomNo = newOverride.roomNo;
         mapLayer = newOverride.mapLayer;
-        // mods::log::debug("New Stage:{}, {}, {}, {}",stageName,roomNo,pointNo,mapLayer);
+        // mods::log::info("New Stage:{}, {}, {}, {}",stageName,roomNo,pointNo,mapLayer);
     }
 }
 
@@ -1751,7 +1751,6 @@ RandomizerContext WriteSeedData(randomizer::logic::world::World* world) {
     }
 
     // Apply entrance randomization
-    auto shuffleData = LOAD_EMBED_YAML(RANDO_DATA_PATH "entrance_shuffle_data.yaml");
     if (world->AnyEntranceRandomizerEnabled()) {
         for (const auto& entrance : world->GetShuffledEntrances()) {
             randomizer::logic::entrance::Entrance* replacesEntrance = entrance->GetReplaces();
@@ -1762,9 +1761,9 @@ RandomizerContext WriteSeedData(randomizer::logic::world::World* world) {
             }
             randoData.mEntranceOverrides[forward] = replaces;
 
-            // Set an override for the second door, if the entrance is coupled
-            if (entrance->getCoupledDoor() != -1) {
-                RandomizerContext::EntranceOverride coupled = {.stageId = entrance->GetStageId(), .roomNo = entrance->GetRoomNo(), .mapLayer = entrance->GetLayerNo(), .pointNo = entrance->getCoupledDoor()};
+            // Set overrides for all coupled entrances
+            for (const auto& point : entrance->getCoupledEntrances()) {
+                RandomizerContext::EntranceOverride coupled = {.stageId = entrance->GetStageId(), .roomNo = entrance->GetRoomNo(), .mapLayer = entrance->GetLayerNo(), .pointNo = point};
                 randoData.mEntranceOverrides[coupled] = replaces;
             }
         }

mods/randomizer/src/session.cpp

@@ -300,7 +300,7 @@ void registerStartingLocation() {
         return;
     }
 
-    // Check that we aren't playing only with the setting "Mirror Chamber Access") == "Closed"
+    // Check that we aren't playing only with the setting Mirror Chamber Access set to Closed
     bool isExclusivelyMirrorChamber = false;
     const auto& mirrorChamberIt = ctx.mEntranceOverrides.find(RandomizerContext::EntranceOverride{
         .stageId = StageIDs::Mirror_Chamber,
@@ -323,20 +323,10 @@ void registerStartingLocation() {
         return;
     }
 
-    constexpr std::array<std::string_view,9> kDungeonNames = {
-        "D_MN01","D_MN04","D_MN05","D_MN06","D_MN07","D_MN08","D_MN09","D_MN10","D_MN11"
-    };
-
     dSv_player_return_place_c& returnPlace = dComIfGs_getSaveData()->mPlayer.getPlayerReturnPlace();
-    bool isDungeon = false;
-    for (const auto& name : kDungeonNames) {
-        if (returnPlace.getName() == name) {
-            isDungeon = true;
-            break;
-        }
-    }
-
-    if (isDungeon) {
+    
+    // If we are loading into a dungeon, preserve our original return place
+    if (std::string(returnPlace.getName()).find("D_MN") == 0) {
         // Force-set the entrance without the override
         g_dComIfG_gameInfo.play.mNextStage.getStartStage()->set(returnPlace.getName(), returnPlace.getRoomNo(), returnPlace.mPlayerStatus, -1);
         return;
@@ -344,7 +334,6 @@ void registerStartingLocation() {
 
     // Set the spawn to outside of link's house, which will get overrided later if we are replacing it
     returnPlace.set("F_SP103",1,1);
-    // g_dComIfG_gameInfo.play.mNextStage.getStartStage()->set("F_SP103", 1, 1, -1);
     dComIfGp_setNextStage("F_SP103", 1, 1, -1);
 }
 

mods/randomizer/src/ui/rando_config.cpp

@@ -264,9 +264,11 @@ ModResult buildSeedManagementTab(ModContext* ctx, UiWindowHandle, UiElementHandl
     add_string_input(leftPane,
         "Seed String",
         "Current value of the seed used by the randomizer for generation. Leave blank for a random value.",
-        32,
+        31,
         [](ModContext*, void*, UiControlValue* out_value) {
-            out_value->string_value = GetRandomizerConfig().GetSeed().c_str();
+            static char buffer[32];
+            strncpy(buffer,GetRandomizerConfig().GetSeed().c_str(),31);
+            out_value->string_value = buffer;
         },
         [](ModContext*, void*, const UiControlValue* value) {
             GetRandomizerConfig().SetSeed(value->string_value);