Archive/Shipwright
0
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-04-28 13:17:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

why constructor no work

Browse source
This commit is contained in:
Pepper0ni 2025-04-26 19:25:56 +01:00
parent cad21e9547
commit 264e4e3db3
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
soh/soh/Enhancements/randomizer/location_access.h
View file

@ -128,6 +128,11 @@ struct SpiritLogicData {
ConditionFn adultAccess; ConditionFn adultAccess;
// The area access condition to reach this region from the boss door, // The area access condition to reach this region from the boss door,
ConditionFn reverseAccess; 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 { class Region {

5
soh/soh/Enhancements/randomizer/location_access/dungeons/spirit_temple.cpp
View file

@ -161,8 +161,6 @@ void RegionTable_Init_SpiritTemple() {
}, { }, {
//Exits //Exits
Entrance(RR_SPIRIT_TEMPLE_ABOVE_BOULDERS, []{return true/*CanClimb()*/;}), 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;}), 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 //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, LOCATION(RC_SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST, SpiritShared(RR_SPIRIT_TEMPLE_SUN_BLOCK_SOUTH_LEDGE,
[]{return logic->HasFireSource() || []{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 //Exits
Entrance(RR_SPIRIT_TEMPLE_SUN_BLOCK_ROOM, []{return true;}), Entrance(RR_SPIRIT_TEMPLE_SUN_BLOCK_ROOM, []{return true;}),