mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-26 03:12:18 -05:00
Code Issues Projects Releases Wiki Activity

Remove "closed as child" option for rando setting

Browse Source
This commit is contained in:
JordanLongstaff 2024-11-09 14:36:03 -05:00
parent 30f9c7057a
commit 40a2a44410
5 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp
View File

@ -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, {}, {}, {

2
soh/soh/Enhancements/randomizer/hook_handlers.cpp
View File

@ -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;

8
soh/soh/Enhancements/randomizer/option_descriptions.cpp
View File

@ -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"

3
soh/soh/Enhancements/randomizer/randomizerTypes.h
View File

@ -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;

2
soh/soh/Enhancements/randomizer/settings.cpp
View File

@ -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);
}