Game-Decompilation/pikmin2
1
0
Fork 0
mirror of https://github.com/projectPiki/pikmin2.git synced 2024-12-01 01:00:33 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

More jigumoState progress

Browse Source
This commit is contained in:
HeartPiece 2023-02-07 13:18:34 +11:00
parent f196d9bef1
commit 3b72e09cb0
3 changed files with 286 additions and 1229 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/recommended_todo.md
View File

@ -142,7 +142,7 @@
| ---- | ---- | ---- | ---- |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/bomb.cpp">bomb.cpp</a> | 12903 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/tamagoMushiMgr.cpp">tamagoMushiMgr.cpp</a> | 13197 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/panModokiState.cpp">panModokiState.cpp</a> | 26323 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/hurryUp2D.cpp">hurryUp2D.cpp</a> | 27085 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/scrollList.cpp">scrollList.cpp</a> | 41187 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/jigumoState.cpp">jigumoState.cpp</a> | 60824 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/scrollList.cpp">scrollList.cpp</a> | 41187 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/jigumoState.cpp">jigumoState.cpp</a> | 41911 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/miulin.cpp">miulin.cpp</a> | 61717 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/tamagoMushi.cpp">tamagoMushi.cpp</a> | 72662 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/dayEndCount.cpp">dayEndCount.cpp</a> | 74917 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/tyre.cpp">tyre.cpp</a> | 83627 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/kingChappy.cpp">kingChappy.cpp</a> | 86610 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/shijimiChou.cpp">shijimiChou.cpp</a> | 99187 |

45
include/Game/Entities/Jigumo.h
View File

@ -42,9 +42,36 @@ enum StateID {
};
struct ConditionHeightCheckPiki : public Condition<Piki> {
virtual bool satisfy(Piki*); // _08 (weak)
virtual bool satisfy(Piki* piki) // _08 (weak)
{
if (!piki->isStickTo()) {
bool check = false;
Creature* jigumo = mCreature;
if (piki->isPikmin() && piki->mSticker != jigumo && !piki->isStickToMouth()) {
check = true;
}
if (check) {
Vector3f pikiPos = piki->getPosition();
if (pikiPos.y > mMaxHeight) {
return false;
}
if (pikiPos.y < mMinHeight) {
return false;
}
return true;
}
}
return false;
}
// _00 VTBL
Creature* mCreature; // _04
f32 mMinHeight; // _08
f32 mMaxHeight; // _0C
};
struct Obj : public EnemyBase {
@ -62,7 +89,7 @@ struct Obj : public EnemyBase {
virtual void collisionCallback(CollEvent& event); // _EC
virtual void getShadowParam(ShadowParam& settings); // _134
virtual bool needShadow(); // _138
virtual Vector3f getGoalPos(); // _198 (weak)
virtual Vector3f getGoalPos() { return mGoalPosition; } // _198 (weak)
virtual ~Obj() { } // _1BC (weak)
virtual void birth(Vector3f&, f32); // _1C0
virtual void setInitialSetting(EnemyInitialParamBase*); // _1C4 (weak)
@ -90,7 +117,7 @@ struct Obj : public EnemyBase {
virtual void setFSM(FSM*); // _2F8 (weak)
//////////////// VTABLE END
void getGoalDist();
f32 getGoalDist();
void walkFunc();
void calcBaseTrMatrix();
void revisionAnimPos(f32);
@ -122,7 +149,9 @@ struct Obj : public EnemyBase {
u8 _2F0[0x20]; // _2F0, unknown
Quat _310; // _310
Quat _320; // _320
u8 _330[0x30]; // _330, unknown
u8 _330[0x14]; // _330, unknown
f32 _344; // _344
u8 _348[0x18]; // _348, unknown
u16 _360; // _360
Vector3f _364; // _364
efx::TJgmAttack* mEfxAttack; // _370
@ -291,7 +320,8 @@ struct StateAttack : public State {
// _00 = VTBL
// _00-_10 = EnemyFSMState
u32 _10; // _10, unknown
u8 _10; // _10
u8 _11; // _11
};
struct StateCarry : public State {
@ -353,7 +383,7 @@ struct StateMiss : public State {
// _00 = VTBL
// _00-_10 = EnemyFSMState
u32 _10; // _10, unknown
u8 _10; // _10
};
struct StateReturn : public State {
@ -376,7 +406,8 @@ struct StateSAttack : public State {
// _00 = VTBL
// _00-_10 = EnemyFSMState
u32 _10; // _10, unknown
u8 _10; // _10
u8 _11; // _11
};
struct StateSearch : public State {

1468
src/plugProjectMorimuraU/jigumoState.cpp
View File

File diff suppressed because it is too large Load Diff