From 264e4e3db3a0c1aa1ed5968f2bd3c76a537f6166 Mon Sep 17 00:00:00 2001 From: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com> Date: Sat, 26 Apr 2025 19:25:56 +0100 Subject: [PATCH] why constructor no work --- soh/soh/Enhancements/randomizer/location_access.h | 5 +++++ .../randomizer/location_access/dungeons/spirit_temple.cpp | 5 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/soh/soh/Enhancements/randomizer/location_access.h b/soh/soh/Enhancements/randomizer/location_access.h index ffee32e2f..6afafb9c8 100644 --- a/soh/soh/Enhancements/randomizer/location_access.h +++ b/soh/soh/Enhancements/randomizer/location_access.h @@ -128,6 +128,11 @@ struct SpiritLogicData { ConditionFn adultAccess; // The area access condition to reach this region from the boss door, ConditionFn reverseAccess; + + SpiritLogicData(uint8_t childKeys_, uint8_t childReverseKeys_, uint8_t adultKeys_, + ConditionFn childAccess_, ConditionFn adultAccess_, ConditionFn reverseAccess_) + : childKeys(childKeys_), childReverseKeys(childReverseKeys_), adultKeys(adultKeys_), + childAccess(childAccess_), adultAccess(adultAccess_), reverseAccess(reverseAccess_) {} }; class Region { diff --git a/soh/soh/Enhancements/randomizer/location_access/dungeons/spirit_temple.cpp b/soh/soh/Enhancements/randomizer/location_access/dungeons/spirit_temple.cpp index 8eeefb041..b32439c98 100644 --- a/soh/soh/Enhancements/randomizer/location_access/dungeons/spirit_temple.cpp +++ b/soh/soh/Enhancements/randomizer/location_access/dungeons/spirit_temple.cpp @@ -161,8 +161,6 @@ void RegionTable_Init_SpiritTemple() { }, { //Exits Entrance(RR_SPIRIT_TEMPLE_ABOVE_BOULDERS, []{return true/*CanClimb()*/;}), - //Jump slash is possible as child, but pretty tight. Jumpslash as late as you can - //A damage boost off the boulder is also possible, but you need Entrance(RR_SPIRIT_TEMPLE_PAST_BOULDERS, []{return logic->SpiritBouldersSilvers;}), }); @@ -286,7 +284,8 @@ void RegionTable_Init_SpiritTemple() { //Spawning the chest to get here is accounted for in movement logic, so we only need to confirm it can be spawned here LOCATION(RC_SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST, SpiritShared(RR_SPIRIT_TEMPLE_SUN_BLOCK_SOUTH_LEDGE, []{return logic->HasFireSource() || - (logic->SpiritSunBlockTorch && (logic->CanUse(RG_STICKS) || (ctx->GetTrickOption(RT_SPIRIT_SUN_CHEST) && logic->CanUse(RG_FAIRY_BOW))));})), + (logic->SpiritSunBlockTorch && //Possible without str0 by timing a shot during a backflip from the ledge, but it's probably a separate trick + (logic->CanUse(RG_STICKS) || (ctx->GetTrickOption(RT_SPIRIT_SUN_CHEST) && logic->CanUse(RG_FAIRY_BOW)/* && str0*/)));})), }, { //Exits Entrance(RR_SPIRIT_TEMPLE_SUN_BLOCK_ROOM, []{return true;}),