From 3633bdeeaf84821905b0c9cddc9c8a1401cf6df7 Mon Sep 17 00:00:00 2001 From: Josh Bodner Date: Wed, 20 Jul 2022 19:57:38 -0700 Subject: [PATCH 1/7] Fix Child Zelda Skip rando setting always on --- .../randomizer/3drando/spoiler_log.cpp | 2 +- .../Enhancements/randomizer/randomizer.cpp | 128 +++++++++--------- 2 files changed, 67 insertions(+), 63 deletions(-) diff --git a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp index 5deea4088..a253cf12d 100644 --- a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp @@ -373,7 +373,7 @@ static void WriteSettings(const bool printAll = false) { } // 3drando doesn't have a "skip child zelda" setting, manually add it to the spoilerfile - jsonData["settings"]["Skip Child Zelda"] = Settings::skipChildZelda; + jsonData["settings"]["Skip Child Zelda"] = std::format("{0}", Settings::skipChildZelda); } // spoilerLog.RootElement()->InsertEndChild(parentNode); diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp index 09704e867..aa9cb5611 100644 --- a/soh/soh/Enhancements/randomizer/randomizer.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer.cpp @@ -1530,64 +1530,64 @@ void Randomizer::ParseRandomizerSettingsFile(const char* spoilerFileName) { // this is annoying but the same strings are used in different orders // and i don't want the spoilerfile to just have numbers instead of // human readable settings values so it'll have to do for now - switch(gSaveContext.randoSettings[index].key) { + switch (gSaveContext.randoSettings[index].key) { case RSK_FOREST: - if(it.value() == "Closed") { - gSaveContext.randoSettings[index].value = 0; - } else if(it.value() == "Open") { + if (it.value() == "Closed") { + gSaveContext.randoSettings[index].value = 0; + } else if (it.value() == "Open") { gSaveContext.randoSettings[index].value = 1; - } else if(it.value() == "Closed Deku") { + } else if (it.value() == "Closed Deku") { gSaveContext.randoSettings[index].value = 2; } break; case RSK_KAK_GATE: - if(it.value() == "Closed") { - gSaveContext.randoSettings[index].value = 0; - } else if(it.value() == "Open") { + if (it.value() == "Closed") { + gSaveContext.randoSettings[index].value = 0; + } else if (it.value() == "Open") { gSaveContext.randoSettings[index].value = 1; } break; case RSK_DOOR_OF_TIME: - if(it.value() == "Open") { - gSaveContext.randoSettings[index].value = 0; - } else if(it.value() == "Closed") { + if (it.value() == "Open") { + gSaveContext.randoSettings[index].value = 0; + } else if (it.value() == "Closed") { gSaveContext.randoSettings[index].value = 1; - } else if(it.value() == "Intended") { + } else if (it.value() == "Intended") { gSaveContext.randoSettings[index].value = 2; } break; case RSK_ZORAS_FOUNTAIN: - if(it.value() == "Normal") { - gSaveContext.randoSettings[index].value = 0; - } else if(it.value() == "Adult") { + if (it.value() == "Normal") { + gSaveContext.randoSettings[index].value = 0; + } else if (it.value() == "Adult") { gSaveContext.randoSettings[index].value = 1; - } else if(it.value() == "Open") { + } else if (it.value() == "Open") { gSaveContext.randoSettings[index].value = 2; } break; case RSK_GERUDO_FORTRESS: - if(it.value() == "Normal") { - gSaveContext.randoSettings[index].value = 0; - } else if(it.value() == "Fast") { + if (it.value() == "Normal") { + gSaveContext.randoSettings[index].value = 0; + } else if (it.value() == "Fast") { gSaveContext.randoSettings[index].value = 1; - } else if(it.value() == "Open") { + } else if (it.value() == "Open") { gSaveContext.randoSettings[index].value = 2; } break; case RSK_RAINBOW_BRIDGE: - if(it.value() == "Open") { - gSaveContext.randoSettings[index].value = 0; - } else if(it.value() == "Vanilla") { + if (it.value() == "Open") { + gSaveContext.randoSettings[index].value = 0; + } else if (it.value() == "Vanilla") { gSaveContext.randoSettings[index].value = 1; - } else if(it.value() == "Stones") { + } else if (it.value() == "Stones") { gSaveContext.randoSettings[index].value = 2; - } else if(it.value() == "Medallions") { + } else if (it.value() == "Medallions") { gSaveContext.randoSettings[index].value = 3; - } else if(it.value() == "Rewards") { + } else if (it.value() == "Rewards") { gSaveContext.randoSettings[index].value = 4; - } else if(it.value() == "Dungeons") { + } else if (it.value() == "Dungeons") { gSaveContext.randoSettings[index].value = 5; - } else if(it.value() == "Tokens") { + } else if (it.value() == "Tokens") { gSaveContext.randoSettings[index].value = 6; } break; @@ -1603,82 +1603,86 @@ void Randomizer::ParseRandomizerSettingsFile(const char* spoilerFileName) { gSaveContext.randoSettings[index].value = std::stoi(numericValueString); break; case RSK_RANDOM_TRIALS: - if(it.value() == "Off") { - gSaveContext.randoSettings[index].value = 0; - } else if(it.value() == "On") { + if (it.value() == "Off") { + gSaveContext.randoSettings[index].value = 0; + } else if (it.value() == "On") { gSaveContext.randoSettings[index].value = 1; } break; case RSK_STARTING_MAPS_COMPASSES: - if(it.value() == "Own Dungeon") { - gSaveContext.randoSettings[index].value = 0; + if (it.value() == "Own Dungeon") { + gSaveContext.randoSettings[index].value = 0; } else if (it.value() == "Start With") { - gSaveContext.randoSettings[index].value = 1; + gSaveContext.randoSettings[index].value = 1; } break; case RSK_STARTING_DEKU_SHIELD: - if(it.value() == "Off") { - gSaveContext.randoSettings[index].value = 0; - } else if(it.value() == "On") { + if (it.value() == "Off") { + gSaveContext.randoSettings[index].value = 0; + } else if (it.value() == "On") { gSaveContext.randoSettings[index].value = 1; } break; case RSK_STARTING_KOKIRI_SWORD: - if(it.value() == "Off") { - gSaveContext.randoSettings[index].value = 0; - } else if(it.value() == "On") { + if (it.value() == "Off") { + gSaveContext.randoSettings[index].value = 0; + } else if (it.value() == "On") { gSaveContext.randoSettings[index].value = 1; } break; case RSK_STARTING_OCARINA: - if(it.value() == "Off") { - gSaveContext.randoSettings[index].value = 0; - } else if(it.value() == "Fairy Ocarina") { + if (it.value() == "Off") { + gSaveContext.randoSettings[index].value = 0; + } else if (it.value() == "Fairy Ocarina") { gSaveContext.randoSettings[index].value = 1; } break; case RSK_GOSSIP_STONE_HINTS: - if(it.value() == "No Hints") { - gSaveContext.randoSettings[index].value = 0; - } else if(it.value() == "Need Nothing") { + if (it.value() == "No Hints") { + gSaveContext.randoSettings[index].value = 0; + } else if (it.value() == "Need Nothing") { gSaveContext.randoSettings[index].value = 1; - } else if(it.value() == "Mask of Truth") { + } else if (it.value() == "Mask of Truth") { gSaveContext.randoSettings[index].value = 2; - } else if(it.value() == "Stone of Agony") { + } else if (it.value() == "Stone of Agony") { gSaveContext.randoSettings[index].value = 3; } break; case RSK_HINT_CLARITY: - if(it.value() == "Obscure") { - gSaveContext.randoSettings[index].value = 0; - } else if(it.value() == "Ambiguous") { + if (it.value() == "Obscure") { + gSaveContext.randoSettings[index].value = 0; + } else if (it.value() == "Ambiguous") { gSaveContext.randoSettings[index].value = 1; - } else if(it.value() == "Clear") { + } else if (it.value() == "Clear") { gSaveContext.randoSettings[index].value = 2; } break; case RSK_HINT_DISTRIBUTION: - if(it.value() == "Useless") { - gSaveContext.randoSettings[index].value = 0; - } else if(it.value() == "Balanced") { + if (it.value() == "Useless") { + gSaveContext.randoSettings[index].value = 0; + } else if (it.value() == "Balanced") { gSaveContext.randoSettings[index].value = 1; - } else if(it.value() == "Strong") { + } else if (it.value() == "Strong") { gSaveContext.randoSettings[index].value = 2; - } else if(it.value() == "Very Strong") { + } else if (it.value() == "Very Strong") { gSaveContext.randoSettings[index].value = 3; } break; case RSK_GANONS_BOSS_KEY: - if(it.value() == "Start With") { - gSaveContext.randoSettings[index].value = 0; - } else if(it.value() == "Vanilla") { + if (it.value() == "Start With") { + gSaveContext.randoSettings[index].value = 0; + } else if (it.value() == "Vanilla") { gSaveContext.randoSettings[index].value = 1; - } else if(it.value() == "Own Dungeon") { + } else if (it.value() == "Own Dungeon") { gSaveContext.randoSettings[index].value = 2; } break; case RSK_SKIP_CHILD_ZELDA: - gSaveContext.randoSettings[index].value = it.value(); + if (it.value() == "false") { + gSaveContext.randoSettings[index].value = 0; + } else if (it.value() == "true") { + gSaveContext.randoSettings[index].value = 1; + } break; case RSK_STARTING_CONSUMABLES: case RSK_FULL_WALLETS: From 795ee54f2b9ccd7110d51021310dab3be0bf80c6 Mon Sep 17 00:00:00 2001 From: Josh Bodner Date: Wed, 20 Jul 2022 21:44:32 -0700 Subject: [PATCH 2/7] Remove use of std::format since Jenkins doesn't like it --- soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp | 2 +- soh/soh/Enhancements/randomizer/randomizer.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp index a253cf12d..d41a8a11f 100644 --- a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp @@ -373,7 +373,7 @@ static void WriteSettings(const bool printAll = false) { } // 3drando doesn't have a "skip child zelda" setting, manually add it to the spoilerfile - jsonData["settings"]["Skip Child Zelda"] = std::format("{0}", Settings::skipChildZelda); + jsonData["settings"]["Skip Child Zelda"] = Settings::skipChildZelda ? "On" : "Off"; } // spoilerLog.RootElement()->InsertEndChild(parentNode); diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp index aa9cb5611..d77163456 100644 --- a/soh/soh/Enhancements/randomizer/randomizer.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer.cpp @@ -1678,9 +1678,9 @@ void Randomizer::ParseRandomizerSettingsFile(const char* spoilerFileName) { } break; case RSK_SKIP_CHILD_ZELDA: - if (it.value() == "false") { + if (it.value() == "No") { gSaveContext.randoSettings[index].value = 0; - } else if (it.value() == "true") { + } else if (it.value() == "Yes") { gSaveContext.randoSettings[index].value = 1; } break; From 75a4d2cf9987d30dcb27818da9eea4821d2316ce Mon Sep 17 00:00:00 2001 From: Josh Bodner Date: Wed, 20 Jul 2022 21:50:55 -0700 Subject: [PATCH 3/7] Actually use the same strings everywhere lol --- soh/soh/Enhancements/randomizer/randomizer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp index d77163456..d2894622d 100644 --- a/soh/soh/Enhancements/randomizer/randomizer.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer.cpp @@ -1678,9 +1678,9 @@ void Randomizer::ParseRandomizerSettingsFile(const char* spoilerFileName) { } break; case RSK_SKIP_CHILD_ZELDA: - if (it.value() == "No") { + if (it.value() == "Off") { gSaveContext.randoSettings[index].value = 0; - } else if (it.value() == "Yes") { + } else if (it.value() == "On") { gSaveContext.randoSettings[index].value = 1; } break; From 17b3f65276b64153bd10e2c6d8164a8c848ab962 Mon Sep 17 00:00:00 2001 From: Josh Bodner Date: Wed, 20 Jul 2022 22:57:18 -0700 Subject: [PATCH 4/7] Fix the issue for real --- soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp index d41a8a11f..b182d8dca 100644 --- a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp @@ -42,7 +42,7 @@ static RandomizerHash randomizerHash; static SpoilerData spoilerData; void GenerateHash() { - for (size_t i = 0; i < Settings::seed.size(); i++) { + for (size_t i = 0; i < Settings::hashIconIndexes.size(); i++) { int number = Settings::seed[i] - '0'; Settings::hashIconIndexes[i] = number; } From cddca2700a2e9d133bbffea0956bb09d35ef735a Mon Sep 17 00:00:00 2001 From: Josh Bodner Date: Wed, 20 Jul 2022 23:08:57 -0700 Subject: [PATCH 5/7] Move Child Zelda spoiler write out of for loop so it's not repeatedly hit --- soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp index b182d8dca..8010bad06 100644 --- a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp @@ -371,10 +371,11 @@ static void WriteSettings(const bool printAll = false) { // } // } } - - // 3drando doesn't have a "skip child zelda" setting, manually add it to the spoilerfile - jsonData["settings"]["Skip Child Zelda"] = Settings::skipChildZelda ? "On" : "Off"; } + + // 3drando doesn't have a "skip child zelda" setting, manually add it to the spoilerfile + jsonData["settings"]["Skip Child Zelda"] = Settings::skipChildZelda ? "On" : "Off"; + // spoilerLog.RootElement()->InsertEndChild(parentNode); // for (const uint32_t key : allLocations) { From 2edc81ee2d4171a0c977f6ae9f33954ee56446d9 Mon Sep 17 00:00:00 2001 From: Josh Bodner Date: Thu, 21 Jul 2022 11:03:28 -0700 Subject: [PATCH 6/7] Attempt to restore formatting of randomizer.cpp --- .../Enhancements/randomizer/randomizer.cpp | 128 +++++++++--------- 1 file changed, 62 insertions(+), 66 deletions(-) diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp index d2894622d..09704e867 100644 --- a/soh/soh/Enhancements/randomizer/randomizer.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer.cpp @@ -1530,64 +1530,64 @@ void Randomizer::ParseRandomizerSettingsFile(const char* spoilerFileName) { // this is annoying but the same strings are used in different orders // and i don't want the spoilerfile to just have numbers instead of // human readable settings values so it'll have to do for now - switch (gSaveContext.randoSettings[index].key) { + switch(gSaveContext.randoSettings[index].key) { case RSK_FOREST: - if (it.value() == "Closed") { - gSaveContext.randoSettings[index].value = 0; - } else if (it.value() == "Open") { + if(it.value() == "Closed") { + gSaveContext.randoSettings[index].value = 0; + } else if(it.value() == "Open") { gSaveContext.randoSettings[index].value = 1; - } else if (it.value() == "Closed Deku") { + } else if(it.value() == "Closed Deku") { gSaveContext.randoSettings[index].value = 2; } break; case RSK_KAK_GATE: - if (it.value() == "Closed") { - gSaveContext.randoSettings[index].value = 0; - } else if (it.value() == "Open") { + if(it.value() == "Closed") { + gSaveContext.randoSettings[index].value = 0; + } else if(it.value() == "Open") { gSaveContext.randoSettings[index].value = 1; } break; case RSK_DOOR_OF_TIME: - if (it.value() == "Open") { - gSaveContext.randoSettings[index].value = 0; - } else if (it.value() == "Closed") { + if(it.value() == "Open") { + gSaveContext.randoSettings[index].value = 0; + } else if(it.value() == "Closed") { gSaveContext.randoSettings[index].value = 1; - } else if (it.value() == "Intended") { + } else if(it.value() == "Intended") { gSaveContext.randoSettings[index].value = 2; } break; case RSK_ZORAS_FOUNTAIN: - if (it.value() == "Normal") { - gSaveContext.randoSettings[index].value = 0; - } else if (it.value() == "Adult") { + if(it.value() == "Normal") { + gSaveContext.randoSettings[index].value = 0; + } else if(it.value() == "Adult") { gSaveContext.randoSettings[index].value = 1; - } else if (it.value() == "Open") { + } else if(it.value() == "Open") { gSaveContext.randoSettings[index].value = 2; } break; case RSK_GERUDO_FORTRESS: - if (it.value() == "Normal") { - gSaveContext.randoSettings[index].value = 0; - } else if (it.value() == "Fast") { + if(it.value() == "Normal") { + gSaveContext.randoSettings[index].value = 0; + } else if(it.value() == "Fast") { gSaveContext.randoSettings[index].value = 1; - } else if (it.value() == "Open") { + } else if(it.value() == "Open") { gSaveContext.randoSettings[index].value = 2; } break; case RSK_RAINBOW_BRIDGE: - if (it.value() == "Open") { - gSaveContext.randoSettings[index].value = 0; - } else if (it.value() == "Vanilla") { + if(it.value() == "Open") { + gSaveContext.randoSettings[index].value = 0; + } else if(it.value() == "Vanilla") { gSaveContext.randoSettings[index].value = 1; - } else if (it.value() == "Stones") { + } else if(it.value() == "Stones") { gSaveContext.randoSettings[index].value = 2; - } else if (it.value() == "Medallions") { + } else if(it.value() == "Medallions") { gSaveContext.randoSettings[index].value = 3; - } else if (it.value() == "Rewards") { + } else if(it.value() == "Rewards") { gSaveContext.randoSettings[index].value = 4; - } else if (it.value() == "Dungeons") { + } else if(it.value() == "Dungeons") { gSaveContext.randoSettings[index].value = 5; - } else if (it.value() == "Tokens") { + } else if(it.value() == "Tokens") { gSaveContext.randoSettings[index].value = 6; } break; @@ -1603,86 +1603,82 @@ void Randomizer::ParseRandomizerSettingsFile(const char* spoilerFileName) { gSaveContext.randoSettings[index].value = std::stoi(numericValueString); break; case RSK_RANDOM_TRIALS: - if (it.value() == "Off") { - gSaveContext.randoSettings[index].value = 0; - } else if (it.value() == "On") { + if(it.value() == "Off") { + gSaveContext.randoSettings[index].value = 0; + } else if(it.value() == "On") { gSaveContext.randoSettings[index].value = 1; } break; case RSK_STARTING_MAPS_COMPASSES: - if (it.value() == "Own Dungeon") { - gSaveContext.randoSettings[index].value = 0; + if(it.value() == "Own Dungeon") { + gSaveContext.randoSettings[index].value = 0; } else if (it.value() == "Start With") { - gSaveContext.randoSettings[index].value = 1; + gSaveContext.randoSettings[index].value = 1; } break; case RSK_STARTING_DEKU_SHIELD: - if (it.value() == "Off") { - gSaveContext.randoSettings[index].value = 0; - } else if (it.value() == "On") { + if(it.value() == "Off") { + gSaveContext.randoSettings[index].value = 0; + } else if(it.value() == "On") { gSaveContext.randoSettings[index].value = 1; } break; case RSK_STARTING_KOKIRI_SWORD: - if (it.value() == "Off") { - gSaveContext.randoSettings[index].value = 0; - } else if (it.value() == "On") { + if(it.value() == "Off") { + gSaveContext.randoSettings[index].value = 0; + } else if(it.value() == "On") { gSaveContext.randoSettings[index].value = 1; } break; case RSK_STARTING_OCARINA: - if (it.value() == "Off") { - gSaveContext.randoSettings[index].value = 0; - } else if (it.value() == "Fairy Ocarina") { + if(it.value() == "Off") { + gSaveContext.randoSettings[index].value = 0; + } else if(it.value() == "Fairy Ocarina") { gSaveContext.randoSettings[index].value = 1; } break; case RSK_GOSSIP_STONE_HINTS: - if (it.value() == "No Hints") { - gSaveContext.randoSettings[index].value = 0; - } else if (it.value() == "Need Nothing") { + if(it.value() == "No Hints") { + gSaveContext.randoSettings[index].value = 0; + } else if(it.value() == "Need Nothing") { gSaveContext.randoSettings[index].value = 1; - } else if (it.value() == "Mask of Truth") { + } else if(it.value() == "Mask of Truth") { gSaveContext.randoSettings[index].value = 2; - } else if (it.value() == "Stone of Agony") { + } else if(it.value() == "Stone of Agony") { gSaveContext.randoSettings[index].value = 3; } break; case RSK_HINT_CLARITY: - if (it.value() == "Obscure") { - gSaveContext.randoSettings[index].value = 0; - } else if (it.value() == "Ambiguous") { + if(it.value() == "Obscure") { + gSaveContext.randoSettings[index].value = 0; + } else if(it.value() == "Ambiguous") { gSaveContext.randoSettings[index].value = 1; - } else if (it.value() == "Clear") { + } else if(it.value() == "Clear") { gSaveContext.randoSettings[index].value = 2; } break; case RSK_HINT_DISTRIBUTION: - if (it.value() == "Useless") { - gSaveContext.randoSettings[index].value = 0; - } else if (it.value() == "Balanced") { + if(it.value() == "Useless") { + gSaveContext.randoSettings[index].value = 0; + } else if(it.value() == "Balanced") { gSaveContext.randoSettings[index].value = 1; - } else if (it.value() == "Strong") { + } else if(it.value() == "Strong") { gSaveContext.randoSettings[index].value = 2; - } else if (it.value() == "Very Strong") { + } else if(it.value() == "Very Strong") { gSaveContext.randoSettings[index].value = 3; } break; case RSK_GANONS_BOSS_KEY: - if (it.value() == "Start With") { - gSaveContext.randoSettings[index].value = 0; - } else if (it.value() == "Vanilla") { + if(it.value() == "Start With") { + gSaveContext.randoSettings[index].value = 0; + } else if(it.value() == "Vanilla") { gSaveContext.randoSettings[index].value = 1; - } else if (it.value() == "Own Dungeon") { + } else if(it.value() == "Own Dungeon") { gSaveContext.randoSettings[index].value = 2; } break; case RSK_SKIP_CHILD_ZELDA: - if (it.value() == "Off") { - gSaveContext.randoSettings[index].value = 0; - } else if (it.value() == "On") { - gSaveContext.randoSettings[index].value = 1; - } + gSaveContext.randoSettings[index].value = it.value(); break; case RSK_STARTING_CONSUMABLES: case RSK_FULL_WALLETS: From 1d208c7dc21c717376b0240d987737e75d76e6e9 Mon Sep 17 00:00:00 2001 From: Josh Bodner Date: Thu, 21 Jul 2022 11:04:37 -0700 Subject: [PATCH 7/7] Revert to using boolean in json --- soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp index 8010bad06..c64134fbc 100644 --- a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp @@ -374,7 +374,7 @@ static void WriteSettings(const bool printAll = false) { } // 3drando doesn't have a "skip child zelda" setting, manually add it to the spoilerfile - jsonData["settings"]["Skip Child Zelda"] = Settings::skipChildZelda ? "On" : "Off"; + jsonData["settings"]["Skip Child Zelda"] = Settings::skipChildZelda; // spoilerLog.RootElement()->InsertEndChild(parentNode);