github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-20 13:23:45 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

revert adult deku being unlocked in forest without showing mido sword/shield

Browse source
This commit is contained in:
Demur Rumed 2025-06-28 19:52:24 +00:00
commit c66a818a7a
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
soh/soh/Enhancements/randomizer/hook_handlers.cpp
View file

@ -1993,7 +1993,9 @@ void RandomizerOnActorInitHandler(void* actorRef) {
} }
if (actor->id == ACTOR_BG_TREEMOUTH && LINK_IS_ADULT && if (actor->id == ACTOR_BG_TREEMOUTH && LINK_IS_ADULT &&
RAND_GET_OPTION(RSK_SHUFFLE_DUNGEON_ENTRANCES) != RO_DUNGEON_ENTRANCE_SHUFFLE_OFF) { RAND_GET_OPTION(RSK_SHUFFLE_DUNGEON_ENTRANCES) != RO_DUNGEON_ENTRANCE_SHUFFLE_OFF &&
(RAND_GET_OPTION(RSK_FOREST) == RO_CLOSED_FOREST_OFF ||
Flags_GetEventChkInf(EVENTCHKINF_SHOWED_MIDO_SWORD_SHIELD))) {
BgTreemouth* bgTreemouth = static_cast<BgTreemouth*>(actorRef); BgTreemouth* bgTreemouth = static_cast<BgTreemouth*>(actorRef);
bgTreemouth->unk_168 = 1.0f; bgTreemouth->unk_168 = 1.0f;
} }

2
soh/soh/Enhancements/randomizer/location_access/overworld/kokiri_forest.cpp
View file

@ -104,7 +104,7 @@ void RegionTable_Init_KokiriForest() {
LOCATION(RC_KF_DEKU_TREE_RIGHT_GOSSIP_STONE, true), LOCATION(RC_KF_DEKU_TREE_RIGHT_GOSSIP_STONE, true),
}, { }, {
//Exits //Exits
Entrance(RR_DEKU_TREE_ENTRYWAY, []{return logic->IsChild || ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).IsNot(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF);}), Entrance(RR_DEKU_TREE_ENTRYWAY, []{return logic->IsChild || (ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).IsNot(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF) && (ctx->GetOption(RSK_FOREST).Is(RO_CLOSED_FOREST_OFF) || logic->ShowedMidoSwordAndShield));}),
Entrance(RR_KOKIRI_FOREST, []{return (logic->IsAdult && (logic->CanPassEnemy(RE_BIG_SKULLTULA) || logic->ForestTempleClear)) || ctx->GetOption(RSK_FOREST).Is(RO_CLOSED_FOREST_OFF) || logic->ShowedMidoSwordAndShield;}), Entrance(RR_KOKIRI_FOREST, []{return (logic->IsAdult && (logic->CanPassEnemy(RE_BIG_SKULLTULA) || logic->ForestTempleClear)) || ctx->GetOption(RSK_FOREST).Is(RO_CLOSED_FOREST_OFF) || logic->ShowedMidoSwordAndShield;}),
}); });