Fix ZD beehives and some small cleanup.#5353
Fix ZD beehives and some small cleanup.#5353leggettc18 merged 2 commits intoHarbourMasters:develop-blairfrom
Conversation
| EventAccess(&logic->DeliverLetter, []{return logic->DeliverLetter || (logic->CanUse(RG_RUTOS_LETTER) && logic->IsChild && ctx->GetOption(RSK_ZORAS_FOUNTAIN).IsNot(RO_ZF_OPEN));}), | ||
| EventAccess(&logic->StickPot, []{return logic->IsChild;}), | ||
| EventAccess(&logic->FishGroup, []{return logic->IsChild;}), | ||
| EventAccess(&logic->KingZoraThawed, []{return logic->IsAdult && logic->BlueFire();}), |
There was a problem hiding this comment.
What did removing these self-references here actually accomplish? It was standard practice from 3DS, are we going to move away from that because the checks are so lightweight now?
There was a problem hiding this comment.
There is also this #5216 which is a large scope of that kind of change. I'd rather defer the changes here for the other PR instead of being duplicative.
Blair should be bug fixes, and refactors towards develop
There was a problem hiding this comment.
What did removing these self-references here actually accomplish? It was standard practice from 3DS, are we going to move away from that because the checks are so lightweight now?
Events don't even get checked if they are true anymore. It's optimisation and cleanup
There is also this #5216 which is a large scope of that kind of change. I'd rather defer the changes here for the other PR instead of being duplicative.
I forgot about that other PR, I just have a personal policy of continuous clean up in the logic code so I don't end up in a situation where I have nothing but renames and cleanup at some point and subsequently go insane, and seeing that triggered it. I'll revert that part to avoid a conflict.
* clean up zora domain logic * revert useless short circuits
Fixes a logical oversight where beehives in ZD didn't check if the user is child. I also removed some 3DS short circuiting and make the KingZoraThawed events better reflect reality.
Build Artifacts