From 40a2a444108d26c2eb608ef99755801d4188c4b0 Mon Sep 17 00:00:00 2001 From: JordanLongstaff Date: Sat, 9 Nov 2024 14:36:03 -0500 Subject: [PATCH] Remove "closed as child" option for rando setting --- .../3drando/location_access/locacc_zoras_domain.cpp | 2 +- soh/soh/Enhancements/randomizer/hook_handlers.cpp | 2 +- soh/soh/Enhancements/randomizer/option_descriptions.cpp | 8 ++------ soh/soh/Enhancements/randomizer/randomizerTypes.h | 3 +-- soh/soh/Enhancements/randomizer/settings.cpp | 2 -- 5 files changed, 5 insertions(+), 12 deletions(-) diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp index 4413dd56c..ea5e04d72 100644 --- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp @@ -43,7 +43,7 @@ void RegionTable_Init_ZorasDomain() { Entrance(RR_ZR_FAIRY_GROTTO, {[]{return Here(RR_ZORAS_RIVER, []{return logic->BlastOrSmash();});}}), Entrance(RR_THE_LOST_WOODS, {[]{return logic->HasItem(RG_SILVER_SCALE) || logic->CanUse(RG_IRON_BOOTS);}}), Entrance(RR_ZR_STORMS_GROTTO, {[]{return logic->CanOpenStormsGrotto();}}), - Entrance(RR_ZR_BEHIND_WATERFALL, {[]{return ctx->GetOption(RSK_SLEEPING_WATERFALL).Is(RO_WATERFALL_OPEN) || logic->CanUse(RG_ZELDAS_LULLABY) || (logic->IsChild && ctx->GetTrickOption(RT_ZR_CUCCO)) || (logic->IsAdult && (ctx->GetOption(RSK_SLEEPING_WATERFALL).Is(RO_WATERFALL_CLOSED_CHILD) || (logic->CanUse(RG_HOVER_BOOTS) && ctx->GetTrickOption(RT_ZR_HOVERS))));}}), + Entrance(RR_ZR_BEHIND_WATERFALL, {[]{return ctx->GetOption(RSK_SLEEPING_WATERFALL).Is(RO_WATERFALL_OPEN) || logic->CanUse(RG_ZELDAS_LULLABY) || (logic->IsChild && ctx->GetTrickOption(RT_ZR_CUCCO)) || (logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS) && ctx->GetTrickOption(RT_ZR_HOVERS));}}), }); areaTable[RR_ZR_BEHIND_WATERFALL] = Region("ZR Behind Waterfall", "Zora River", {RA_ZORAS_RIVER}, DAY_NIGHT_CYCLE, {}, {}, { diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp index aaa95889f..71940b9cc 100644 --- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp +++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp @@ -1766,7 +1766,7 @@ void RandomizerOnActorInitHandler(void* actorRef) { if (actor->id == ACTOR_BG_SPOT03_TAKI) { Rando::Option& waterfallOption = Rando::Context::GetInstance()->GetOption(RSK_SLEEPING_WATERFALL); - if (waterfallOption.Is(RO_WATERFALL_OPEN) || (waterfallOption.Is(RO_WATERFALL_CLOSED_CHILD) && LINK_IS_ADULT)) { + if (waterfallOption.Is(RO_WATERFALL_OPEN)) { static uint32_t bgSpot03UpdateHook = 0; static uint32_t bgSpot03KillHook = 0; diff --git a/soh/soh/Enhancements/randomizer/option_descriptions.cpp b/soh/soh/Enhancements/randomizer/option_descriptions.cpp index 9e2f12925..5f8090534 100644 --- a/soh/soh/Enhancements/randomizer/option_descriptions.cpp +++ b/soh/soh/Enhancements/randomizer/option_descriptions.cpp @@ -34,13 +34,9 @@ void Settings::CreateOptionDescriptions() { "Open - King Zora has already mweeped out of the way in both " "time periods. Ruto's Letter is removed from the item pool."; mOptionDescriptions[RSK_SLEEPING_WATERFALL] = "Closed - Sleeping Waterfall obstructs the entrance to Zora's " - "Domain. Zelda's Lullaby must be played in order to open it in " - "both time periods.\n" + "Domain. Zelda's Lullaby must be played in order to open it.\n" "\n" - "Closed as child - Zelda's Lullaby is only required to open " - "Sleeping Waterfall as child Link. It starts open as adult.\n" - "\n" - "Open - Sleeping Waterfall is always open in both time periods. " + "Open - Sleeping Waterfall is always open. " "Link may always enter Zora's Domain."; mOptionDescriptions[RSK_STARTING_AGE] = "Choose which age Link will start as.\n\n" diff --git a/soh/soh/Enhancements/randomizer/randomizerTypes.h b/soh/soh/Enhancements/randomizer/randomizerTypes.h index 0c36893f3..b27aa2ec6 100644 --- a/soh/soh/Enhancements/randomizer/randomizerTypes.h +++ b/soh/soh/Enhancements/randomizer/randomizerTypes.h @@ -4156,10 +4156,9 @@ typedef enum { RO_ZF_OPEN, } RandoOptionZorasFountain; -//Sleeping Waterfall settings (closed, closed as child, open) +//Sleeping Waterfall settings (closed, open) typedef enum { RO_WATERFALL_CLOSED, - RO_WATERFALL_CLOSED_CHILD, RO_WATERFALL_OPEN, } RandoOptionSleepingWaterfall; diff --git a/soh/soh/Enhancements/randomizer/settings.cpp b/soh/soh/Enhancements/randomizer/settings.cpp index e250ea0f3..70103290c 100644 --- a/soh/soh/Enhancements/randomizer/settings.cpp +++ b/soh/soh/Enhancements/randomizer/settings.cpp @@ -2584,8 +2584,6 @@ void Settings::ParseJson(nlohmann::json spoilerFileJson) { case RSK_SLEEPING_WATERFALL: if (it.value() == "Closed") { mOptions[index].SetSelectedIndex(RO_WATERFALL_CLOSED); - } else if (it.value() == "Closed as child") { - mOptions[index].SetSelectedIndex(RO_WATERFALL_CLOSED_CHILD); } else if (it.value() == "Open") { mOptions[index].SetSelectedIndex(RO_WATERFALL_OPEN); }