Game-Decompilation/pikmin2
1
0
Fork 0
mirror of https://github.com/projectPiki/pikmin2.git synced 2024-11-23 21:39:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

initGenerators down to regswaps (#208)

Browse Source 
guys just day >= 30 it's not that hard
This commit is contained in:
Drought-Ender 2024-05-17 23:08:31 -05:00 committed by GitHub
parent bd472b8e2e
commit 49ebd40bc1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugProjectKandoU/baseGameSection.cpp
View File

@ -732,6 +732,7 @@ void BaseGameSection::initGenerators()
limitGeneratorMgr->addMgr(currentNonloopMgr);
playData->mLimitGen[courseInfo->mCourseIndex].mNonLoops.setFlag(i);
}
}
@ -741,12 +742,23 @@ void BaseGameSection::initGenerators()
int day = gameSystem->mTimeMgr->mDayCount;
// int loopGenCount = courseInfo->mLoopGenInfo.mCount;
if (day % 30 == 0) {
int intervalDay = today % 30;
int intervalIterations = day / 30;
// effectively day > 30
if (intervalIterations >= 1) {
int floorDay = intervalIterations * 30;
for (int i = 0; i < courseInfo->mLoopGenInfo.mCount; i++) {
LimitGen* currentGen = static_cast<LimitGen*>(courseInfo->mLoopGenInfo.mOwner.getChildAt(i));
if (currentGen->mMinimumDay - 30 > day % 30 || day % 30 > currentGen->mMinimumDay - 30)
continue;
int intervalMin = currentGen->mMinimumDay % 30;
int intervalMax = currentGen->mMaximumDay % 30;
if (intervalMin > intervalDay || intervalDay > intervalMax)
continue;
bool loopLoaded = playData->mLimitGen[courseInfo->mCourseIndex].mLoops.isFlag(i);
@ -766,7 +778,7 @@ void BaseGameSection::initGenerators()
currentLoopMgr->mUnusedFlag = true; // is nonrepeating?
currentLoopMgr->read(loopTxt, false);
currentLoopMgr->setDayLimit(currentGen->mMaximumDay - 30);
currentLoopMgr->setDayLimit(floorDay + currentGen->mMaximumDay - 30);
currentLoopMgr->updateUseList();
generatorManagers[fileIdx] = currentLoopMgr;
@ -894,7 +906,7 @@ void BaseGameSection::initGenerators()
louie->mFaceDir = roundAng(mapRotation);
louie->setPosition(vec_0x1c24, false);
louie->setVelocity(vec_0x1c30);
if (!(playData->mDeadNaviID & 1)) {
if (!(playData->mDeadNaviID >> 1 & 1)) {
louie->mHealth = playData->mNaviLifeMax[1];
}
if (playData->mDeadNaviID & 2) {