diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp index 040835979..d6cfa515b 100644 --- a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp @@ -2838,7 +2838,7 @@ void HintTable_Init() { /*spanish*/ "Para aquel que se convierta en el héroe...&La puerta al futuro está a su disposición..." }, }); - hintTable[CHILD_ALTAR_TEXT_END_DOTCLOSED] = HintText::Altar({ + hintTable[CHILD_ALTAR_TEXT_END_DOTSONGONLY] = HintText::Altar({ // obscure text Text{ "Ye who may become a Hero...&Stand with the Ocarina and&play the Song of Time.", @@ -2846,7 +2846,7 @@ void HintTable_Init() { /*spanish*/ "Para aquel que se convierta en el héroe...&Tome la ocarina y&entone la Canción del Tiempo." }, }); - hintTable[CHILD_ALTAR_TEXT_END_DOTINTENDED] = HintText::Altar({ + hintTable[CHILD_ALTAR_TEXT_END_DOTCLOSED] = HintText::Altar({ // obscure text Text{ "Ye who may become a Hero...&Offer the spiritual stones and&play the Song of Time.", /*french*/ diff --git a/soh/soh/Enhancements/randomizer/3drando/hints.cpp b/soh/soh/Enhancements/randomizer/3drando/hints.cpp index 9b30bc5a6..2b700d4a8 100644 --- a/soh/soh/Enhancements/randomizer/3drando/hints.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/hints.cpp @@ -555,13 +555,13 @@ static Text BuildDoorOfTimeText() { itemObtained = "$o"; doorOfTimeText = Hint(CHILD_ALTAR_TEXT_END_DOTOPEN).GetText(); - } else if (OpenDoorOfTime.Is(OPENDOOROFTIME_CLOSED)) { + } else if (OpenDoorOfTime.Is(OPENDOOROFTIME_SONGONLY)) { itemObtained = "$c"; - doorOfTimeText = Hint(CHILD_ALTAR_TEXT_END_DOTCLOSED).GetText(); + doorOfTimeText = Hint(CHILD_ALTAR_TEXT_END_DOTSONGONLY).GetText(); - } else if (OpenDoorOfTime.Is(OPENDOOROFTIME_INTENDED)) { + } else if (OpenDoorOfTime.Is(OPENDOOROFTIME_CLOSED)) { itemObtained = "$i"; - doorOfTimeText = Hint(CHILD_ALTAR_TEXT_END_DOTINTENDED).GetText(); + doorOfTimeText = Hint(CHILD_ALTAR_TEXT_END_DOTCLOSED).GetText(); } return Text()+itemObtained+doorOfTimeText; diff --git a/soh/soh/Enhancements/randomizer/3drando/keys.hpp b/soh/soh/Enhancements/randomizer/3drando/keys.hpp index 92bf0a432..07714145b 100644 --- a/soh/soh/Enhancements/randomizer/3drando/keys.hpp +++ b/soh/soh/Enhancements/randomizer/3drando/keys.hpp @@ -1742,8 +1742,8 @@ typedef enum { SPIRITUAL_STONE_TEXT_START, CHILD_ALTAR_TEXT_END_DOTOPEN, + CHILD_ALTAR_TEXT_END_DOTSONGONLY, CHILD_ALTAR_TEXT_END_DOTCLOSED, - CHILD_ALTAR_TEXT_END_DOTINTENDED, ADULT_ALTAR_TEXT_START, ADULT_ALTAR_TEXT_END, diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp index 7df38c193..172cca45d 100644 --- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp @@ -56,8 +56,8 @@ void AreaTable_Init_CastleTown() { }, { //Exits Entrance(TOT_ENTRANCE, {[]{return true;}}), - Entrance(TOT_BEYOND_DOOR_OF_TIME, {[]{return OpenDoorOfTime.Is(OPENDOOROFTIME_OPEN) || (CanPlay(SongOfTime) && (OpenDoorOfTime.Is(OPENDOOROFTIME_CLOSED) || (HasAllStones && OcarinaOfTime)));}, - /*Glitched*/[]{return SongOfTime && OpenDoorOfTime.Is(OPENDOOROFTIME_CLOSED) && (CanDoGlitch(GlitchType::IndoorBombOI, GlitchDifficulty::ADVANCED) || + Entrance(TOT_BEYOND_DOOR_OF_TIME, {[]{return OpenDoorOfTime.Is(OPENDOOROFTIME_OPEN) || (CanPlay(SongOfTime) && (OpenDoorOfTime.Is(OPENDOOROFTIME_SONGONLY) || (HasAllStones && OcarinaOfTime)));}, + /*Glitched*/[]{return SongOfTime && OpenDoorOfTime.Is(OPENDOOROFTIME_SONGONLY) && (CanDoGlitch(GlitchType::IndoorBombOI, GlitchDifficulty::ADVANCED) || ((Bugs || Fish) && Bombs && (CanSurviveDamage || (Fairy && NumBottles >= 2)) && CanShield && CanDoGlitch(GlitchType::QPA, GlitchDifficulty::ADVANCED) && CanDoGlitch(GlitchType::RestrictedItems, GlitchDifficulty::NOVICE)));}}), }); diff --git a/soh/soh/Enhancements/randomizer/3drando/setting_descriptions.cpp b/soh/soh/Enhancements/randomizer/3drando/setting_descriptions.cpp index aa0c4637b..e3bafb31f 100644 --- a/soh/soh/Enhancements/randomizer/3drando/setting_descriptions.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/setting_descriptions.cpp @@ -63,9 +63,9 @@ string_view kakGateClosed = "The gate and the Happy Mask Shop both r ------------------------------*/ // string_view doorOfTimeOpen = "The Door of Time starts opened instead of needing\n" "to play the Song of Time."; // -string_view doorOfTimeClosed = "Only an Ocarina and the Song of Time need to be\n"// +string_view doorOfTimeSongOnly = "Only an Ocarina and the Song of Time need to be\n"// "found to open the Door of Time."; // -string_view doorOfTimeIntended = "The Ocarina of Time, the Song of Time, and\n" // +string_view doorOfTimeClosed = "The Ocarina of Time, the Song of Time, and\n" // "all Spiritual Stones need to be found to\n" // "open the Door of Time."; // /*------------------------------ // diff --git a/soh/soh/Enhancements/randomizer/3drando/setting_descriptions.hpp b/soh/soh/Enhancements/randomizer/3drando/setting_descriptions.hpp index 224563d5e..6b9df1712 100644 --- a/soh/soh/Enhancements/randomizer/3drando/setting_descriptions.hpp +++ b/soh/soh/Enhancements/randomizer/3drando/setting_descriptions.hpp @@ -22,8 +22,8 @@ extern string_view kakGateOpen; extern string_view kakGateClosed; extern string_view doorOfTimeOpen; +extern string_view doorOfTimeSongOnly; extern string_view doorOfTimeClosed; -extern string_view doorOfTimeIntended; extern string_view fountainNormal; extern string_view fountainAdult; diff --git a/soh/soh/Enhancements/randomizer/3drando/settings.cpp b/soh/soh/Enhancements/randomizer/3drando/settings.cpp index 41a83dd33..c4abd2266 100644 --- a/soh/soh/Enhancements/randomizer/3drando/settings.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/settings.cpp @@ -55,7 +55,7 @@ namespace Settings { Option RandomizeOpen = Option::Bool("Randomize Settings", {"No","Yes"}, {openRandomize}, OptionCategory::Toggle); Option OpenForest = Option::U8 ("Forest", {"Closed", "Closed Deku", "Open"}, {forestClosed, forestClosedDeku, forestOpen}, OptionCategory::Setting, OPENFOREST_CLOSED); Option OpenKakariko = Option::U8 ("Kakariko Gate", {"Closed", "Open"}, {kakGateClosed, kakGateOpen}); - Option OpenDoorOfTime = Option::U8 ("Door of Time", {"Closed", "Song only", "Open"}, {doorOfTimeIntended, doorOfTimeClosed, doorOfTimeOpen}); + Option OpenDoorOfTime = Option::U8 ("Door of Time", {"Closed", "Song only", "Open"}, {doorOfTimeClosed, doorOfTimeSongOnly, doorOfTimeOpen}); Option ZorasFountain = Option::U8 ("Zora's Fountain", {"Closed", "Closed as child", "Open"}, {fountainNormal, fountainAdult, fountainOpen}); Option GerudoFortress = Option::U8 ("Gerudo Fortress", {"Normal", "Fast", "Open"}, {gerudoNormal, gerudoFast, gerudoOpen}); Option Bridge = Option::U8 ("Rainbow Bridge", {"Vanilla", "Always open", "Stones", "Medallions", "Dungeon rewards", "Dungeons", "Tokens"}, {bridgeVanilla, bridgeOpen, bridgeStones, bridgeMedallions, bridgeRewards, bridgeDungeons, bridgeTokens}, OptionCategory::Setting, RAINBOWBRIDGE_VANILLA); @@ -1864,7 +1864,7 @@ namespace Settings { //Adult is also not compatible with the following combination: //DoT:Intended, ShuffleOcarinas:false, Logic:Glitchless - if (OpenDoorOfTime.Is(OPENDOOROFTIME_INTENDED) && !ShuffleOcarinas && + if (OpenDoorOfTime.Is(OPENDOOROFTIME_CLOSED) && !ShuffleOcarinas && Logic.Is(LOGIC_GLITCHLESS)) { StartingAge.SetSelectedIndex(AGE_CHILD); StartingAge.Lock(); diff --git a/soh/soh/Enhancements/randomizer/3drando/settings.hpp b/soh/soh/Enhancements/randomizer/3drando/settings.hpp index 6e23ca571..bb89f5a35 100644 --- a/soh/soh/Enhancements/randomizer/3drando/settings.hpp +++ b/soh/soh/Enhancements/randomizer/3drando/settings.hpp @@ -44,8 +44,8 @@ typedef enum { } OpenKakarikoSetting; typedef enum { - OPENDOOROFTIME_INTENDED, OPENDOOROFTIME_CLOSED, + OPENDOOROFTIME_SONGONLY, OPENDOOROFTIME_OPEN, } OpenDoorOfTimeSetting;