Skip to content

Commit 3e6b590

Browse files
PABesseroserprex
andauthored
Added new trick (#5972)
* Added new trick Skip Dodongo Cavern by using Bombchus to light the eyes * Update soh/soh/Enhancements/randomizer/location_access/dungeons/dodongos_cavern.cpp Co-authored-by: Philip Dubé <serprex@users.noreply.github.com> * Update soh/soh/Enhancements/randomizer/location_access/dungeons/dodongos_cavern.cpp Co-authored-by: Philip Dubé <serprex@users.noreply.github.com> --------- Co-authored-by: Philip Dubé <serprex@users.noreply.github.com>
1 parent 4aebdab commit 3e6b590

File tree

3 files changed

+11
-1
lines changed

3 files changed

+11
-1
lines changed

soh/soh/Enhancements/randomizer/location_access/dungeons/dodongos_cavern.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ void RegionTable_Init_DodongosCavern() {
2525
areaTable[RR_DODONGOS_CAVERN_LOBBY] = Region("Dodongos Cavern Lobby", SCENE_DODONGOS_CAVERN, {
2626
//Events
2727
EventAccess(LOGIC_GOSSIP_STONE_FAIRY, []{return (Here(RR_DODONGOS_CAVERN_LOBBY, []{return logic->CanBreakMudWalls();}) || logic->HasItem(RG_GORONS_BRACELET)) && logic->CallGossipFairy();}),
28+
EventAccess(LOGIC_DC_EYES_LIT, []{return ctx->GetTrickOption(RT_DC_EYES_CHU) && logic->CanUse(RG_BOMBCHU_5);}),
2829
}, {
2930
//Locations
3031
LOCATION(RC_DODONGOS_CAVERN_MAP_CHEST, logic->CanBreakMudWalls() || logic->HasItem(RG_GORONS_BRACELET);),
@@ -282,7 +283,10 @@ void RegionTable_Init_DodongosCavern() {
282283
Entrance(RR_DODONGOS_CAVERN_MQ_LOBBY, []{return Here(RR_DODONGOS_CAVERN_MQ_BEGINNING, []{return logic->CanBreakMudWalls() || logic->HasItem(RG_GORONS_BRACELET);});}),
283284
});
284285

285-
areaTable[RR_DODONGOS_CAVERN_MQ_LOBBY] = Region("Dodongos Cavern MQ Lobby", SCENE_DODONGOS_CAVERN, {}, {
286+
areaTable[RR_DODONGOS_CAVERN_MQ_LOBBY] = Region("Dodongos Cavern MQ Lobby", SCENE_DODONGOS_CAVERN, {
287+
//Events
288+
EventAccess(LOGIC_DC_EYES_LIT, []{return ctx->GetTrickOption(RT_DC_EYES_CHU) && logic->CanUse(RG_BOMBCHU_5);}),
289+
}, {
286290
//Locations
287291
LOCATION(RC_DODONGOS_CAVERN_MQ_MAP_CHEST, logic->CanBreakMudWalls() || logic->HasItem(RG_GORONS_BRACELET)),
288292
LOCATION(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR, logic->CanStunDeku()),

soh/soh/Enhancements/randomizer/randomizerTypes.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3867,6 +3867,7 @@ typedef enum {
38673867
RT_DC_MQ_CHILD_EYES,
38683868
RT_DC_MQ_ADULT_EYES,
38693869
RT_DC_DODONGO_CHU,
3870+
RT_DC_EYES_CHU,
38703871
RT_JABU_ALCOVE_JUMP_DIVE,
38713872
RT_JABU_BOSS_HOVER,
38723873
RT_JABU_NEAR_BOSS_RANGED,

soh/soh/Enhancements/randomizer/settings.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -706,6 +706,11 @@ void Settings::CreateOptions() {
706706
RT_DC_MQ_ADULT_EYES, RCQUEST_MQ, RA_DODONGOS_CAVERN, { Tricks::Tag::ADVANCED },
707707
"Dodongo\'s Cavern MQ Light the Eyes with Strength as Adult",
708708
"If you move very quickly, it is possible to use the bomb flower at the top of the room to light the eyes.");
709+
OPT_TRICK(
710+
RT_DC_EYES_CHU, RCQUEST_BOTH, RA_DODONGOS_CAVERN, { Tricks::Tag::ADVANCED },
711+
"Dodongo\'s Cavern Light the Eyes with Bombchus",
712+
"You can light the dodongo head's eyes with bombchus from the main room, allowing instant access to the end "
713+
"of the dungeon.");
709714
OPT_TRICK(RT_JABU_ALCOVE_JUMP_DIVE, RCQUEST_BOTH, RA_JABU_JABUS_BELLY, { Tricks::Tag::NOVICE },
710715
"Jabu Underwater Alcove as Adult with Jump Dive",
711716
"Standing above the underwater tunnel leading to the scrub, jump down and swim through the tunnel. This "

0 commit comments

Comments
 (0)