github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-22 06:13:45 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add RT_ZR_OCARINA_ITEMS_GLITCH_WATERFALL

Browse source
This commit is contained in:
TheLynk 2025-05-24 17:58:53 +02:00
commit 23868a7480
3 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
soh/soh/Enhancements/randomizer/location_access/overworld/zoras_river.cpp
View file

@ -68,7 +68,7 @@ void RegionTable_Init_ZoraRiver() {
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) || Here(RR_ZORAS_RIVER, []{return logic->CanUse(RG_ZELDAS_LULLABY);}) || (logic->IsChild && ctx->GetTrickOption(RT_ZR_CUCCO)) || (logic->IsAdult && 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) || Here(RR_ZORAS_RIVER, []{return logic->CanUse(RG_ZELDAS_LULLABY);}) || (logic->IsChild && ctx->GetTrickOption(RT_ZR_CUCCO)) || (logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS) && ctx->GetTrickOption(RT_ZR_HOVERS)) || (ctx->GetTrickOption(RT_ZR_OCARINA_ITEMS_GLITCH_WATERFALL) && logic->OcarinaItemGlitchZeldasLullaby());}),
});
areaTable[RR_ZR_BEHIND_WATERFALL] = Region("ZR Behind Waterfall", "Zora River", {RA_ZORAS_RIVER}, DAY_NIGHT_CYCLE, {}, {}, {

1
soh/soh/Enhancements/randomizer/randomizerTypes.h
View file

@ -3528,6 +3528,7 @@ typedef enum {
RT_ZR_UPPER,
RT_ZR_HOVERS,
RT_ZR_CUCCO,
RT_ZR_OCARINA_ITEMS_GLITCH_WATERFALL,
RT_ZD_KING_ZORA_SKIP,
RT_ZD_GS,
RT_ZF_GREAT_FAIRY_WITHOUT_EXPLOSIVES,

3
soh/soh/Enhancements/randomizer/settings.cpp
View file

@ -546,6 +546,9 @@ void Settings::CreateOptions() {
"Zora\'s Domain Entry with Hover Boots", "Can hover behind the waterfall as adult.");
OPT_TRICK(RT_ZR_CUCCO, RCQUEST_BOTH, RA_ZORAS_RIVER, { Tricks::Tag::NOVICE }, "Zora\'s Domain Entry with Cucco",
"You can fly behind the waterfall with a Cucco as child.");
OPT_TRICK(RT_ZR_OCARINA_ITEMS_GLITCH_WATERFALL, RCQUEST_BOTH, RA_ZORAS_RIVER, { Tricks::Tag::NOVICE },
"Zora\'s Domain Entry with Ocarina Items Glitch",
"With the Ocarina Items Glitch allows you to open the waterfall.");
OPT_TRICK(RT_ZD_KING_ZORA_SKIP, RCQUEST_BOTH, RA_ZORAS_DOMAIN, { Tricks::Tag::INTERMEDIATE },
"Skip King Zora as Adult with Nothing",
"With a precise jump as adult, it is possible to get on the fence next to King Zora from the front to "