From 1944b68d19a3af007d58e9aec06430e22a372c33 Mon Sep 17 00:00:00 2001 From: briaguya Date: Wed, 20 Jul 2022 23:36:39 -0400 Subject: [PATCH] fix starting inventory --- .../Enhancements/randomizer/3drando/spoiler_log.cpp | 10 +++++----- soh/soh/Enhancements/randomizer/randomizer.cpp | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp index 5deea4088..d640d934a 100644 --- a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp @@ -425,11 +425,11 @@ static void WriteStartingInventory() { // doesn't work, and because it'd be bad to set every single possible starting // inventory item as "false" in the json, we're just going to check // to see if the name is one of the 3 we're using rn - if(setting->GetName() == "Deku Shield" || setting->GetName() == "Kokiri Sword" || setting->GetName() == "Ocarina") { - jsonData["settings"]["Start With " + setting->GetName()] = setting->GetSelectedOptionText(); - } - - if (setting->GetName() == "Start with Consumables" || setting->GetName() == "Start with Max Rupees") { + if (setting->GetName() == "Start with Consumables" || + setting->GetName() == "Start with Max Rupees" || + setting->GetName() == "Start with Fairy Ocarina" || + setting->GetName() == "Start with Kokiri Sword" || + setting->GetName() == "Start with Deku Shield") { jsonData["settings"][setting->GetName()] = setting->GetSelectedOptionText(); } } diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp index bdbe54b93..d15ccb7d4 100644 --- a/soh/soh/Enhancements/randomizer/randomizer.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer.cpp @@ -1395,9 +1395,9 @@ std::unordered_map SpoilerfileSettingNameToEn { "Open Settings:Token Count", RSK_RAINBOW_BRIDGE_TOKEN_COUNT }, { "Open Settings:Random Ganon's Trials", RSK_RANDOM_TRIALS }, { "Open Settings:Trial Count", RSK_TRIAL_COUNT }, - { "Start With Deku Shield", RSK_STARTING_DEKU_SHIELD }, - { "Start With Kokiri Sword", RSK_STARTING_KOKIRI_SWORD }, - { "Start With Ocarina", RSK_STARTING_OCARINA }, + { "Start with Deku Shield", RSK_STARTING_DEKU_SHIELD }, + { "Start with Kokiri Sword", RSK_STARTING_KOKIRI_SWORD }, + { "Start with Fairy Ocarina", RSK_STARTING_OCARINA }, { "Shuffle Dungeon Items:Maps/Compasses", RSK_STARTING_MAPS_COMPASSES }, { "Shuffle Dungeon Items:Ganon's Boss Key", RSK_GANONS_BOSS_KEY }, { "Misc Settings:Gossip Stone Hints", RSK_GOSSIP_STONE_HINTS },