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

trust -129

Browse source
This commit is contained in:
Demur Rumed 2025-06-13 02:27:36 +00:00
commit 67668fd603
1 changed files with 7 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

21
soh/soh/Enhancements/randomizer/randomizer.cpp
View file

@ -3749,20 +3749,13 @@ TreeIdentity Randomizer::IdentifyTree(s32 sceneNum, s32 posX, s32 posZ) {
sceneNum = SCENE_MARKET_DAY;
}
for (int x = -1; x <= 1; x++) {
for (int z = -1; z <= 1; z++) {
s32 actorParams = TWO_ACTOR_PARAMS(posX + x, posZ + z);
Rando::Location* location = GetCheckObjectFromActor(ACTOR_EN_WOOD02, sceneNum, actorParams);
if (location->GetRandomizerCheck() != RC_UNKNOWN_CHECK) {
if (location->GetRCType() == RCTYPE_NLTREE &&
CVarGetInteger(CVAR_RANDOMIZER_SETTING("LogicRules"), RO_LOGIC_GLITCHLESS) != RO_LOGIC_NO_LOGIC) {
break;
}
treeIdentity.randomizerInf = rcToRandomizerInf[location->GetRandomizerCheck()];
treeIdentity.randomizerCheck = location->GetRandomizerCheck();
return treeIdentity;
}
}
s32 actorParams = TWO_ACTOR_PARAMS(posX, posZ);
Rando::Location* location = GetCheckObjectFromActor(ACTOR_EN_WOOD02, sceneNum, actorParams);
if (location->GetRandomizerCheck() != RC_UNKNOWN_CHECK &&
(location->GetRCType() != RCTYPE_NLTREE || GetRandoSettingValue(RSK_LOGIC_RULES) == RO_LOGIC_NO_LOGIC)) {
treeIdentity.randomizerInf = rcToRandomizerInf[location->GetRandomizerCheck()];
treeIdentity.randomizerCheck = location->GetRandomizerCheck();
return treeIdentity;
}
treeIdentity.randomizerInf = RAND_INF_MAX;