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

Add Navi Dive Lost Wood

Browse source
This commit is contained in:
TheLynk 2025-05-09 23:08:09 +02:00
commit fbf5281852
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -57,7 +57,7 @@ void RegionTable_Init_LostWoods() {
Entrance(RR_LW_FOREST_EXIT, []{return true;}), Entrance(RR_LW_FOREST_EXIT, []{return true;}),
Entrance(RR_GC_WOODS_WARP, []{return true;}), Entrance(RR_GC_WOODS_WARP, []{return true;}),
Entrance(RR_LW_BRIDGE, []{return logic->CanLeaveForest() && ((logic->IsAdult && (CanPlantBean(RR_THE_LOST_WOODS) || ctx->GetTrickOption(RT_LW_BRIDGE))) || logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_LONGSHOT));}), Entrance(RR_LW_BRIDGE, []{return logic->CanLeaveForest() && ((logic->IsAdult && (CanPlantBean(RR_THE_LOST_WOODS) || ctx->GetTrickOption(RT_LW_BRIDGE))) || logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_LONGSHOT));}),
Entrance(RR_ZORAS_RIVER, []{return logic->CanLeaveForest() && (logic->HasItem(RG_SILVER_SCALE) || logic->CanUse(RG_IRON_BOOTS));}), Entrance(RR_ZORAS_RIVER, []{return logic->CanLeaveForest() && (logic->HasItem(RG_SILVER_SCALE) || logic->CanUse(RG_IRON_BOOTS) || ctx->GetTrickOption(RT_BOTTOM_OF_THE_WELL_NAVI_DIVE) && logic->HasItem(RG_BRONZE_SCALE) && (logic->CanUse(RG_STICKS) || logic->CanUse(RG_KOKIRI_SWORD)));}),
Entrance(RR_LW_BEYOND_MIDO, []{return logic->IsChild || logic->CanUse(RG_SARIAS_SONG) || ctx->GetTrickOption(RT_LW_MIDO_BACKFLIP);}), Entrance(RR_LW_BEYOND_MIDO, []{return logic->IsChild || logic->CanUse(RG_SARIAS_SONG) || ctx->GetTrickOption(RT_LW_MIDO_BACKFLIP);}),
Entrance(RR_LW_NEAR_SHORTCUTS_GROTTO, []{return Here(RR_THE_LOST_WOODS, []{return logic->BlastOrSmash();});}), Entrance(RR_LW_NEAR_SHORTCUTS_GROTTO, []{return Here(RR_THE_LOST_WOODS, []{return logic->BlastOrSmash();});}),
}); });

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

@ -3566,7 +3566,6 @@ typedef enum {
RT_JABU_MQ_RANG_JUMP, RT_JABU_MQ_RANG_JUMP,
RT_JABU_MQ_SOT_GS, RT_JABU_MQ_SOT_GS,
RT_LENS_BOTW, RT_LENS_BOTW,
RT_BOTTOM_OF_THE_WELL_NAVI_DIVE,
RT_BOTW_CHILD_DEADHAND, RT_BOTW_CHILD_DEADHAND,
RT_BOTW_BASEMENT, RT_BOTW_BASEMENT,
RT_BOTW_MQ_PITS, RT_BOTW_MQ_PITS,
@ -3698,6 +3697,8 @@ typedef enum {
RT_MEGASIDEHOP_BOMB, RT_MEGASIDEHOP_BOMB,
RT_MEGASIDEHOP_BOMBCHU, RT_MEGASIDEHOP_BOMBCHU,
RT_NAVI_DIVE, RT_NAVI_DIVE,
RT_BOTTOM_OF_THE_WELL_NAVI_DIVE,
RT_LOST_WOOD_NAVI_DIVE,
RT_OCARINA_ITEMS, RT_OCARINA_ITEMS,
RT_OCARINA_ITEMS_BOMB, RT_OCARINA_ITEMS_BOMB,
RT_OCARINA_ITEMS_ESS, RT_OCARINA_ITEMS_ESS,

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

@ -410,6 +410,9 @@ void Settings::CreateOptions() {
"Hover Boots, or Bean."); "Hover Boots, or Bean.");
OPT_TRICK(RT_LW_MIDO_BACKFLIP, RCQUEST_BOTH, RA_THE_LOST_WOODS, { Tricks::Tag::NOVICE }, OPT_TRICK(RT_LW_MIDO_BACKFLIP, RCQUEST_BOTH, RA_THE_LOST_WOODS, { Tricks::Tag::NOVICE },
"Backflip over Mido as Adult", "With a specific position and angle, you can backflip over Mido."); "Backflip over Mido as Adult", "With a specific position and angle, you can backflip over Mido.");
OPT_TRICK(RT_LOST_WOOD_NAVI_DIVE, RCQUEST_BOTH, RA_THE_LOST_WOODS, { Tricks::Tag::NOVICE },
"Lost Wood Navi dive",
"You need deku sticks or kokiri sword to dive with Navi for entering Zoras River.");
OPT_TRICK(RT_LW_GS_BEAN, RCQUEST_BOTH, RA_THE_LOST_WOODS, { Tricks::Tag::INTERMEDIATE }, OPT_TRICK(RT_LW_GS_BEAN, RCQUEST_BOTH, RA_THE_LOST_WOODS, { Tricks::Tag::INTERMEDIATE },
"Lost Woods Adult GS without Bean", "Lost Woods Adult GS without Bean",
"You can collect the token with a precise Hookshot use, as long as you can kill the Skulltula somehow " "You can collect the token with a precise Hookshot use, as long as you can kill the Skulltula somehow "