diff --git a/soh/soh/Enhancements/randomizer/location_access/overworld/death_mountain_trail.cpp b/soh/soh/Enhancements/randomizer/location_access/overworld/death_mountain_trail.cpp index 7cb55cf83..fcf69ff1a 100644 --- a/soh/soh/Enhancements/randomizer/location_access/overworld/death_mountain_trail.cpp +++ b/soh/soh/Enhancements/randomizer/location_access/overworld/death_mountain_trail.cpp @@ -30,13 +30,14 @@ void RegionTable_Init_DeathMountainTrail() { ENTRANCE(RR_DMT_STORMS_GROTTO, logic->CanOpenStormsGrotto()), }); - areaTable[RR_DEATH_MOUNTAIN_ROCKFALL] = Region("Death Mountain Avalanche", SCENE_DEATH_MOUNTAIN_TRAIL, {}, { + areaTable[RR_DEATH_MOUNTAIN_ROCKFALL] = Region("Death Mountain Rockfall", SCENE_DEATH_MOUNTAIN_TRAIL, {}, { //Locations LOCATION(RC_DMT_GS_FALLING_ROCKS_PATH, logic->IsAdult && logic->CanGetNightTimeGS() && (logic->CanUse(RG_MEGATON_HAMMER) || (ctx->GetTrickOption(RT_DMT_UPPER_GS) && (logic->CanJumpslash() || logic->HasExplosives() || ((ctx->GetTrickOption(RT_DISTANT_BOULDER_COLLISION) || ctx->GetTrickOption(RT_HOOKSHOT_EXTENSION)) && (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT))))) || (ctx->GetTrickOption(RT_DISTANT_BOULDER_COLLISION) && logic->CanUse(RG_LONGSHOT)))), }, { //Exits ENTRANCE(RR_DEATH_MOUNTAIN_TRAIL, true), - ENTRANCE(RR_DEATH_MOUNTAIN_SUMMIT, logic->HasItem(RG_CLIMB)), + ENTRANCE(RR_DEATH_MOUNTAIN_SUMMIT, logic->HasItem(RG_CLIMB) && + (logic->IsAdult || ctx->GetTrickOption(RT_DMT_SHIELDLESS_CLIMB) || logic->CanUse(RG_HYLIAN_SHIELD) || logic->CanUse(RG_NAYRUS_LOVE))), ENTRANCE(RR_DMT_COW_GROTTO, AnyAgeTime([]{return logic->BlastOrSmash();})), }); diff --git a/soh/soh/Enhancements/randomizer/randomizerEnums/RandomizerTrick.h b/soh/soh/Enhancements/randomizer/randomizerEnums/RandomizerTrick.h index 772bea678..5baf64b4a 100644 --- a/soh/soh/Enhancements/randomizer/randomizerEnums/RandomizerTrick.h +++ b/soh/soh/Enhancements/randomizer/randomizerEnums/RandomizerTrick.h @@ -44,6 +44,7 @@ RANDO_ENUM_ITEM(RT_KAK_ROOFTOP_GS) RANDO_ENUM_ITEM(RT_GY_POH) RANDO_ENUM_ITEM(RT_GY_CHILD_DAMPE_RACE_POH) RANDO_ENUM_ITEM(RT_GY_SHADOW_FIRE_ARROWS) +RANDO_ENUM_ITEM(RT_DMT_SHIELDLESS_CLIMB) RANDO_ENUM_ITEM(RT_DMT_SOIL_GS) RANDO_ENUM_ITEM(RT_DMT_BOMBABLE) RANDO_ENUM_ITEM(RT_DMT_HOVERS_LOWER_GS) diff --git a/soh/soh/Enhancements/randomizer/settings.cpp b/soh/soh/Enhancements/randomizer/settings.cpp index 19ab928d5..657a7b718 100644 --- a/soh/soh/Enhancements/randomizer/settings.cpp +++ b/soh/soh/Enhancements/randomizer/settings.cpp @@ -1522,6 +1522,10 @@ void Settings::CreateOptions() { "Shadow Temple Entry with Fire Arrows", "FAEntry", "It is possible to light all of the torches to open the Shadow Temple entrance with just Fire Arrows, " "but you must be very quick, precise, and strategic with how you take your shots."); + OPT_TRICK(RT_DMT_SHIELDLESS_CLIMB, RCQUEST_BOTH, RA_DEATH_MOUNTAIN_TRAIL, { Tricks::Tag::NOVICE }, + "Death Mountain Trail Child Climb Without Shield", "DMTCWoS", + "Child can make it past the eruption to reach DMT Summit without a Hylian Shield or Nayru's Love" + "by backwalking or simply taking damage."); OPT_TRICK(RT_DMT_SOIL_GS, RCQUEST_BOTH, RA_DEATH_MOUNTAIN_TRAIL, { Tricks::Tag::INTERMEDIATE }, "Death Mountain Trail Soil GS without Destroying Boulder", "DMTSoil", "Bugs will go into the soft soil even while the boulder is still blocking the entrance. Then, using a "