From a1f9971c12ab1f940b876422a189ce626e3ad72e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20Dub=C3=A9?= Date: Sat, 27 Dec 2025 11:17:02 +0000 Subject: [PATCH] RT_BIG_SKULLTULA_PAUSE_LIFT (#6014) --- soh/soh/Enhancements/randomizer/logic.cpp | 3 ++- soh/soh/Enhancements/randomizer/randomizerTypes.h | 1 + soh/soh/Enhancements/randomizer/settings.cpp | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/soh/soh/Enhancements/randomizer/logic.cpp b/soh/soh/Enhancements/randomizer/logic.cpp index 1d7b52b3e..445851cbd 100644 --- a/soh/soh/Enhancements/randomizer/logic.cpp +++ b/soh/soh/Enhancements/randomizer/logic.cpp @@ -848,7 +848,8 @@ bool Logic::CanPassEnemy(RandomizerEnemy enemy, EnemyDistance distance, bool wal return HasItem(RG_GERUDO_MEMBERSHIP_CARD) || CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT); case RE_BIG_SKULLTULA: // hammer jumpslash can pass, but only on flat land where you can kill with hammer swing - return CanUse(RG_NUTS) || CanUse(RG_BOOMERANG); + return CanUse(RG_NUTS) || CanUse(RG_BOOMERANG) || + (ctx->GetTrickOption(RT_BIG_SKULLTULA_PAUSE_LIFT) && wallOrFloor && distance == ED_CLOSE); case RE_LIKE_LIKE: return CanUse(RG_HOOKSHOT) || CanUse(RG_BOOMERANG); case RE_GIBDO: diff --git a/soh/soh/Enhancements/randomizer/randomizerTypes.h b/soh/soh/Enhancements/randomizer/randomizerTypes.h index 4664c4230..1a19cab25 100644 --- a/soh/soh/Enhancements/randomizer/randomizerTypes.h +++ b/soh/soh/Enhancements/randomizer/randomizerTypes.h @@ -4020,6 +4020,7 @@ typedef enum { RT_SPIRIT_BK_SKIP, RT_ACUTE_ANGLE_CLIP, RT_ADVANCED_CLIPS, + RT_BIG_SKULLTULA_PAUSE_LIFT, RT_BLANK_A, RT_CUTSCENE_DIVE, RT_DAMAGE_BOOST, diff --git a/soh/soh/Enhancements/randomizer/settings.cpp b/soh/soh/Enhancements/randomizer/settings.cpp index b600c81aa..13b1882ea 100644 --- a/soh/soh/Enhancements/randomizer/settings.cpp +++ b/soh/soh/Enhancements/randomizer/settings.cpp @@ -421,6 +421,10 @@ void Settings::CreateOptions() { "- Retrieving DMT Gold Skulltula beside bomb flower\n" "- Hitting switch through wall in Spirit Temple's big mirror room with Bow, Slingshot, or Hookshot\n" "- Hitting switch through wall in Spirit Trial with Bow or Slingshot"); + OPT_TRICK(RT_BIG_SKULLTULA_PAUSE_LIFT, RCQUEST_BOTH, RA_NONE, { Tricks::Tag::NOVICE, Tricks::Tag::GLITCH }, + "Lift Big Skulltulas with Pausing", + "Pausing while a big skulltula is bobbing upwards slightly lifts it,\n" + "eventually allowing passage without any items."); OPT_TRICK(RT_GROUND_JUMP, RCQUEST_BOTH, RA_NONE, { Tricks::Tag::NOVICE, Tricks::Tag::GLITCH }, "Ground Jump", "Enables requiring ground jumps."); OPT_TRICK(RT_GROUND_JUMP_HARD, RCQUEST_BOTH, RA_NONE, { Tricks::Tag::INTERMEDIATE, Tricks::Tag::GLITCH },