nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

RT_BIG_SKULLTULA_PAUSE_LIFT (#6014)

Browse Source
This commit is contained in:
Philip Dubé
2025-12-27 11:17:02 +00:00
committed by GitHub
parent 9c24ccec1a
commit a1f9971c12
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
soh/soh/Enhancements/randomizer/logic.cpp
View File

@@ -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); return HasItem(RG_GERUDO_MEMBERSHIP_CARD) || CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT);
case RE_BIG_SKULLTULA: case RE_BIG_SKULLTULA:
// hammer jumpslash can pass, but only on flat land where you can kill with hammer swing // 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: case RE_LIKE_LIKE:
return CanUse(RG_HOOKSHOT) || CanUse(RG_BOOMERANG); return CanUse(RG_HOOKSHOT) || CanUse(RG_BOOMERANG);
case RE_GIBDO: case RE_GIBDO:

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

@@ -4020,6 +4020,7 @@ typedef enum {
RT_SPIRIT_BK_SKIP, RT_SPIRIT_BK_SKIP,
RT_ACUTE_ANGLE_CLIP, RT_ACUTE_ANGLE_CLIP,
RT_ADVANCED_CLIPS, RT_ADVANCED_CLIPS,
RT_BIG_SKULLTULA_PAUSE_LIFT,
RT_BLANK_A, RT_BLANK_A,
RT_CUTSCENE_DIVE, RT_CUTSCENE_DIVE,
RT_DAMAGE_BOOST, RT_DAMAGE_BOOST,

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

@@ -421,6 +421,10 @@ void Settings::CreateOptions() {
"- Retrieving DMT Gold Skulltula beside bomb flower\n" "- 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 Temple's big mirror room with Bow, Slingshot, or Hookshot\n"
"- Hitting switch through wall in Spirit Trial with Bow or Slingshot"); "- 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", OPT_TRICK(RT_GROUND_JUMP, RCQUEST_BOTH, RA_NONE, { Tricks::Tag::NOVICE, Tricks::Tag::GLITCH }, "Ground Jump",
"Enables requiring ground jumps."); "Enables requiring ground jumps.");
OPT_TRICK(RT_GROUND_JUMP_HARD, RCQUEST_BOTH, RA_NONE, { Tricks::Tag::INTERMEDIATE, Tricks::Tag::GLITCH }, OPT_TRICK(RT_GROUND_JUMP_HARD, RCQUEST_BOTH, RA_NONE, { Tricks::Tag::INTERMEDIATE, Tricks::Tag::GLITCH },