mirror of
https://github.com/HarbourMasters/Shipwright.git
synced 2025-08-20 21:33:40 -07:00
Add Two New Tricks "Navi dive" (#5477)
* add navi dive bottom of the well * add kokiri sword logic for botw * Optimisation Logic * Add Navi Dive Lost Wood * Update Logic * Move IsChild in logic trick * Add brackets * Clang-Format * Tweak Text Tweak Text * Final Push ? * It's really the last push
This commit is contained in:
parent
99c3fa6006
commit
f2298c6a8e
4 changed files with 9 additions and 2 deletions
|
@ -66,7 +66,7 @@ void RegionTable_Init_Kakariko() {
|
||||||
Entrance(RR_KAK_WINDMILL, []{return logic->CanOpenOverworldDoor(RG_WINDMILL_KEY);}),
|
Entrance(RR_KAK_WINDMILL, []{return logic->CanOpenOverworldDoor(RG_WINDMILL_KEY);}),
|
||||||
Entrance(RR_KAK_BAZAAR, []{return logic->IsAdult && logic->AtDay && logic->CanOpenOverworldDoor(RG_KAK_BAZAAR_KEY);}),
|
Entrance(RR_KAK_BAZAAR, []{return logic->IsAdult && logic->AtDay && logic->CanOpenOverworldDoor(RG_KAK_BAZAAR_KEY);}),
|
||||||
Entrance(RR_KAK_SHOOTING_GALLERY, []{return logic->IsAdult && logic->AtDay && logic->CanOpenOverworldDoor(RG_KAK_SHOOTING_GALLERY_KEY);}),
|
Entrance(RR_KAK_SHOOTING_GALLERY, []{return logic->IsAdult && logic->AtDay && logic->CanOpenOverworldDoor(RG_KAK_SHOOTING_GALLERY_KEY);}),
|
||||||
Entrance(RR_KAK_WELL, []{return logic->IsAdult || logic->DrainWell || logic->CanUse(RG_IRON_BOOTS);}),
|
Entrance(RR_KAK_WELL, []{return logic->IsAdult || logic->DrainWell || logic->CanUse(RG_IRON_BOOTS) || (ctx->GetTrickOption(RT_BOTTOM_OF_THE_WELL_NAVI_DIVE) && logic->IsChild && logic->HasItem(RG_BRONZE_SCALE) && logic->CanJumpslash());}),
|
||||||
Entrance(RR_KAK_POTION_SHOP_FRONT, []{return (logic->AtDay || logic->IsChild) && logic->CanOpenOverworldDoor(RG_KAK_POTION_SHOP_KEY);}),
|
Entrance(RR_KAK_POTION_SHOP_FRONT, []{return (logic->AtDay || logic->IsChild) && logic->CanOpenOverworldDoor(RG_KAK_POTION_SHOP_KEY);}),
|
||||||
Entrance(RR_KAK_REDEAD_GROTTO, []{return logic->CanOpenBombGrotto();}),
|
Entrance(RR_KAK_REDEAD_GROTTO, []{return logic->CanOpenBombGrotto();}),
|
||||||
Entrance(RR_KAK_IMPAS_LEDGE, []{return (logic->IsChild && logic->AtDay) || (logic->IsAdult && ctx->GetTrickOption(RT_VISIBLE_COLLISION));}),
|
Entrance(RR_KAK_IMPAS_LEDGE, []{return (logic->IsChild && logic->AtDay) || (logic->IsAdult && ctx->GetTrickOption(RT_VISIBLE_COLLISION));}),
|
||||||
|
|
|
@ -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->IsChild && logic->HasItem(RG_BRONZE_SCALE) && logic->CanJumpslash()));}),
|
||||||
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();});}),
|
||||||
});
|
});
|
||||||
|
|
|
@ -3697,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,
|
||||||
|
|
|
@ -410,6 +410,8 @@ 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 Woods Navi dive",
|
||||||
|
"You need Deku Sticks or Kokiri Sword to dive with Navi for entering Zora's 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 "
|
||||||
|
@ -705,6 +707,9 @@ void Settings::CreateOptions() {
|
||||||
OPT_TRICK(RT_LENS_BOTW, RCQUEST_VANILLA, RA_BOTTOM_OF_THE_WELL, { Tricks::Tag::NOVICE },
|
OPT_TRICK(RT_LENS_BOTW, RCQUEST_VANILLA, RA_BOTTOM_OF_THE_WELL, { Tricks::Tag::NOVICE },
|
||||||
"Bottom of the Well without Lens of Truth",
|
"Bottom of the Well without Lens of Truth",
|
||||||
"Removes the requirements for the Lens of Truth in Bottom of the Well.");
|
"Removes the requirements for the Lens of Truth in Bottom of the Well.");
|
||||||
|
OPT_TRICK(RT_BOTTOM_OF_THE_WELL_NAVI_DIVE, RCQUEST_BOTH, RA_BOTTOM_OF_THE_WELL, { Tricks::Tag::NOVICE },
|
||||||
|
"Bottom of the Well Navi dive",
|
||||||
|
"You need Deku Sticks or Kokiri Sword to dive with Navi for entering Bottom of the Well.");
|
||||||
OPT_TRICK(RT_BOTW_CHILD_DEADHAND, RCQUEST_BOTH, RA_BOTTOM_OF_THE_WELL, { Tricks::Tag::NOVICE },
|
OPT_TRICK(RT_BOTW_CHILD_DEADHAND, RCQUEST_BOTH, RA_BOTTOM_OF_THE_WELL, { Tricks::Tag::NOVICE },
|
||||||
"Child Dead Hand without Kokiri Sword", "Requires 9 sticks or 5 jump slashes.");
|
"Child Dead Hand without Kokiri Sword", "Requires 9 sticks or 5 jump slashes.");
|
||||||
OPT_TRICK(RT_BOTW_BASEMENT, RCQUEST_VANILLA, RA_BOTTOM_OF_THE_WELL, { Tricks::Tag::NOVICE },
|
OPT_TRICK(RT_BOTW_BASEMENT, RCQUEST_VANILLA, RA_BOTTOM_OF_THE_WELL, { Tricks::Tag::NOVICE },
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue