diff options
| author | sitton76 <58642183+sitton76@users.noreply.github.com> | 2026-01-31 08:21:23 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-01-31 09:21:23 -0500 |
| commit | 432d7d0ffd0c37b1db0bc1bb7ad195cc59bb57db (patch) | |
| tree | ecf8e0492a7de51f12758d4e1df228be3abbfba9 | |
| parent | 39a072ef4eb181209f4fedb7159d899fdc408d5f (diff) | |
[Rand] Factored Enemy Soul shuffle for Woodfall checks and navigation (#1526)
* Factored Enemy Soul shuffle for Woodfall checks and navigation
* Accounted for Fairy Fountain and alternative method for getting HP chest
| -rw-r--r-- | mm/2s2h/Rando/Logic/Regions/South.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mm/2s2h/Rando/Logic/Regions/South.cpp b/mm/2s2h/Rando/Logic/Regions/South.cpp index 1c2fbc648..c4916c721 100644 --- a/mm/2s2h/Rando/Logic/Regions/South.cpp +++ b/mm/2s2h/Rando/Logic/Regions/South.cpp @@ -502,8 +502,8 @@ static RegisterShipInitFunc initFunc([]() { Regions[RR_WOODFALL] = RandoRegion{ .sceneId = SCENE_21MITURINMAE, .checks = { CHECK(RC_WOODFALL_ENTRANCE_CHEST, CAN_BE_DEKU || (RANDO_EVENTS[RE_CLEARED_WOODFALL_TEMPLE] && (CAN_BE_ZORA || CAN_BE_GORON || CAN_USE_ABILITY(SWIM)))), - CHECK(RC_WOODFALL_PIECE_OF_HEART_CHEST, CAN_BE_DEKU), - CHECK(RC_WOODFALL_FREESTANDING_RUPEE, CAN_BE_DEKU), + CHECK(RC_WOODFALL_PIECE_OF_HEART_CHEST, CAN_BE_DEKU && (CanKillEnemy(ACTOR_EN_DEKUNUTS) || HAS_ITEM(ITEM_HOOKSHOT))), + CHECK(RC_WOODFALL_FREESTANDING_RUPEE, CAN_BE_DEKU && CanKillEnemy(ACTOR_EN_DEKUNUTS)), CHECK(RC_WOODFALL_GRASS_01, true), CHECK(RC_WOODFALL_GRASS_02, true), CHECK(RC_WOODFALL_GRASS_03, true), @@ -516,11 +516,11 @@ static RegisterShipInitFunc initFunc([]() { }, .exits = { // TO FROM EXIT(ENTRANCE(SOUTHERN_SWAMP_POISONED, 2), ENTRANCE(WOODFALL, 0), true), - EXIT(ENTRANCE(FAIRY_FOUNTAIN, 1), ENTRANCE(WOODFALL, 2), CAN_BE_DEKU), + EXIT(ENTRANCE(FAIRY_FOUNTAIN, 1), ENTRANCE(WOODFALL, 2), CAN_BE_DEKU && CanKillEnemy(ACTOR_EN_DEKUNUTS)), EXIT(ENTRANCE(WOODFALL_TEMPLE, 2), ENTRANCE(WOODFALL, 3), RANDO_EVENTS[RE_CLEARED_WOODFALL_TEMPLE]), }, .connections = { - CONNECTION(RR_WOODFALL_OWL_STATUE_PLATFORM, CAN_BE_DEKU), + CONNECTION(RR_WOODFALL_OWL_STATUE_PLATFORM, CAN_BE_DEKU && CanKillEnemy(ACTOR_EN_DEKUNUTS)), }, }; Regions[RR_WOODFALL_OWL_STATUE_PLATFORM] = RandoRegion{ .name = "Owl Statue Platform", .sceneId = SCENE_21MITURINMAE, |