Game-Decompilation/pikmin2
1
0
Fork 0
mirror of https://github.com/projectPiki/pikmin2.git synced 2025-01-31 19:04:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bit more pikistate
Some checks failed
Build / Build (GPVE01) (push) Has been cancelled
Details
Build / Build (GPVE01_D17) (push) Has been cancelled
Details
Build / Build (legacy) (GPVE01) (push) Has been cancelled
Details
Build / Build (legacy) (GPVE01_D17) (push) Has been cancelled
Details

Browse Source 
PikiFlyingState::exec and PikiDrownState::exec should now be logically equivalent
This commit is contained in:
PishPish 2024-12-23 16:08:48 -05:00
parent 1f4421da65
commit b48a51da51
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugProjectKandoU/pikiState.cpp
View File

@ -850,16 +850,14 @@ void PikiFountainonState::exec(Piki* piki)
// regswaps here
f32 p1 = mTargetDist * 0.4f;
f32 val = p1 * mTimer * mTimer;
f32 p2 = -50.0f / SQUARE(mTargetDist);
f32 otherFactor = 50.0f + val;
f32 otherFactor = 50.0f + p2 * SQUARE(mTimer);
if (mTimer >= p1) {
f32 factor = 50.0f + p2 * p1 * p1 + (mTimer - p1);
f32 factor = 50.0f + p2 * SQUARE(p1) + (mTimer - p1);
position = mPosDiff * p1 + mAvgPosition;
position.y += factor;
mTimer += sys->mDeltaTime * 400.0f;
} else {
position = mPosDiff * mTimer + mAvgPosition;
position.y += otherFactor;
@ -3745,7 +3743,8 @@ void PikiFlyingState::exec(Piki* piki)
mVelocityDirection.y = 0.0f;
mVelocityDirection.z = piki->mVelocity.z;
f32 throwMagnitude = landingTime * 0.5f / (-fallFactor + heightOffset) / flowerFallFactor;
f32 heightFactor = -fallFactor + heightOffset;
f32 throwMagnitude = landingTime * 0.5f / (heightFactor / flowerFallFactor);
mVelocityDirection.normalise();