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

RT_BARINADE_POTS (#6102)

Browse Source
This commit is contained in:
Philip Dubé
2026-01-05 17:49:44 +00:00
committed by GitHub
parent 3f8aa32d12
commit da5f28afd8
4 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/dungeons/jabujabus_belly.cpp
View File

@@ -556,7 +556,7 @@ void RegionTable_Init_JabuJabusBelly() {
}); });
areaTable[RR_JABU_JABUS_BELLY_BOSS_ROOM] = Region("Jabu Jabus Belly Boss Room", SCENE_JABU_JABU_BOSS, { areaTable[RR_JABU_JABUS_BELLY_BOSS_ROOM] = Region("Jabu Jabus Belly Boss Room", SCENE_JABU_JABU_BOSS, {
//Events //todo: add pot kill trick //Events
EventAccess(LOGIC_JABU_JABUS_BELLY_CLEAR, []{return logic->CanKillEnemy(RE_BARINADE);}), EventAccess(LOGIC_JABU_JABUS_BELLY_CLEAR, []{return logic->CanKillEnemy(RE_BARINADE);}),
}, { }, {
//Locations //Locations

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

@@ -751,7 +751,8 @@ bool Logic::CanKillEnemy(RandomizerEnemy enemy, EnemyDistance distance, bool wal
(CanUse(RG_BOMB_BAG) || HasItem(RG_GORONS_BRACELET) || (CanUse(RG_BOMB_BAG) || HasItem(RG_GORONS_BRACELET) ||
(ctx->GetTrickOption(RT_DC_DODONGO_CHU) && IsAdult && CanUse(RG_BOMBCHU_5))); (ctx->GetTrickOption(RT_DC_DODONGO_CHU) && IsAdult && CanUse(RG_BOMBCHU_5)));
case RE_BARINADE: case RE_BARINADE:
return HasBossSoul(RG_BARINADE_SOUL) && CanUse(RG_BOOMERANG) && CanJumpslashExceptHammer(); return HasBossSoul(RG_BARINADE_SOUL) && CanUse(RG_BOOMERANG) &&
(CanJumpslashExceptHammer() || ctx->GetTrickOption(RT_JABU_BARINADE_POTS));
case RE_PHANTOM_GANON: case RE_PHANTOM_GANON:
return HasBossSoul(RG_PHANTOM_GANON_SOUL) && CanUseSword() && return HasBossSoul(RG_PHANTOM_GANON_SOUL) && CanUseSword() &&
(CanUse(RG_HOOKSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT)); (CanUse(RG_HOOKSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT));

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

@@ -4192,6 +4192,7 @@ typedef enum {
RT_LENS_JABU_MQ, RT_LENS_JABU_MQ,
RT_JABU_MQ_RANG_JUMP, RT_JABU_MQ_RANG_JUMP,
RT_JABU_MQ_SOT_GS, RT_JABU_MQ_SOT_GS,
RT_JABU_BARINADE_POTS,
RT_LENS_BOTW, RT_LENS_BOTW,
RT_BOTW_CHILD_DEADHAND, RT_BOTW_CHILD_DEADHAND,
RT_BOTW_BASEMENT, RT_BOTW_BASEMENT,

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

@@ -1729,6 +1729,8 @@ void Settings::CreateOptions() {
OPT_TRICK(RT_JABU_MQ_SOT_GS, RCQUEST_MQ, RA_JABU_JABUS_BELLY, { Tricks::Tag::INTERMEDIATE }, OPT_TRICK(RT_JABU_MQ_SOT_GS, RCQUEST_MQ, RA_JABU_JABUS_BELLY, { Tricks::Tag::INTERMEDIATE },
"Jabu MQ Song of Time Block GS with Boomerang", "Jabu MQ Song of Time Block GS with Boomerang",
"Allow the Boomerang to return to you through the Song of Time block to grab the token."); "Allow the Boomerang to return to you through the Song of Time block to grab the token.");
OPT_TRICK(RT_JABU_BARINADE_POTS, RCQUEST_BOTH, RA_JABU_JABUS_BELLY, { Tricks::Tag::ADVANCED },
"Jabu Barinade with Pots", "Barinade can be damaged with pots, requiring only boomerang to defeat.");
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.");