Skip to content

Commit

Permalink
Start Queen.cpp
Browse files Browse the repository at this point in the history
  • Loading branch information
@HeartPiece44
HeartPiece44 committed Sep 8, 2023
1 parent 1411d83 commit 19abfb2
Show file tree
Hide file tree
Showing 5 changed files with 284 additions and 2,444 deletions.
6 changes: 3 additions & 3 deletions docs/recommended_todo.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,11 +147,11 @@
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectNishimuraU/ImomushiState.cpp">ImomushiState.cpp</a> | 19863 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectNishimuraU/UjiaState.cpp">UjiaState.cpp</a> | 20924 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectNishimuraU/RumbleMgr.cpp">RumbleMgr.cpp</a> | 21534 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectNishimuraU/Rock.cpp">Rock.cpp</a> | 21671 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectNishimuraU/ElecHiba.cpp">ElecHiba.cpp</a> | 21823 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectNishimuraU/Frog.cpp">Frog.cpp</a> | 22143 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectNishimuraU/QueenState.cpp">QueenState.cpp</a> | 22549 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectNishimuraU/Ujia.cpp">Ujia.cpp</a> | 22940 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectNishimuraU/Ujib.cpp">Ujib.cpp</a> | 23626 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectNishimuraU/ElecBug.cpp">ElecBug.cpp</a> | 24345 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectNishimuraU/QueenState.cpp">QueenState.cpp</a> | 22514 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectNishimuraU/Ujia.cpp">Ujia.cpp</a> | 22940 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectNishimuraU/Ujib.cpp">Ujib.cpp</a> | 23602 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectNishimuraU/ElecBug.cpp">ElecBug.cpp</a> | 24345 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectNishimuraU/ArmorState.cpp">ArmorState.cpp</a> | 24714 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectNishimuraU/SaraiState.cpp">SaraiState.cpp</a> | 24923 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectNishimuraU/TobiState.cpp">TobiState.cpp</a> | 24962 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectNishimuraU/UjibState.cpp">UjibState.cpp</a> | 25505 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectNishimuraU/Armor.cpp">Armor.cpp</a> | 25767 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectNishimuraU/Tobi.cpp">Tobi.cpp</a> | 25912 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectNishimuraU/Armor.cpp">Armor.cpp</a> | 25767 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectNishimuraU/Tobi.cpp">Tobi.cpp</a> | 25937 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectNishimuraU/TankState.cpp">TankState.cpp</a> | 29293 |

### <section id="plugProjectOgawaU">plugProjectOgawaU</section>
Expand Down
46 changes: 23 additions & 23 deletions include/Game/Entities/Queen.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ struct Obj : public EnemyBase {

// _00 = VTBL
// _00-_2BC = EnemyBase
u8 _2BC[0x4]; // _2BC, probably FSM*?
FSM* mFsm; // _2BC
bool mCanCreateLarva; // _2C0
u8 _2C1; // _2C1
u8 _2C2; // _2C2
Expand All @@ -113,18 +113,18 @@ struct Obj : public EnemyBase {
StateID mNextState; // _2D4
QueenShadowMgr* mShadowMgr; // _2D8
Sys::MatLoopAnimator* mMatLoopAnimator; // _2DC
efx::TQueenLay* _2E0; // _2E0
efx::TQueenRollCR* _2E4; // _2E4
efx::TQueenRollCL* _2E8; // _2E8
efx::TQueenRoll* _2EC; // _2EC
efx::TQueenCrashR* _2F0; // _2F0
efx::TQueenCrashL* _2F4; // _2F4
efx::TQueenCrashRock* _2F8; // _2F8
efx::TQueenDamage* _2FC; // _2FC
efx::TQueenFlick* _300; // _300
efx::TQueenDead* _304; // _304
efx::TQueenWakeup* _308; // _308
efx::TQueenHanacho* _30C; // _30C
efx::TQueenLay* mEfxLay; // _2E0
efx::TQueenRollCR* mEfxRollCR; // _2E4
efx::TQueenRollCL* mEfxRollCL; // _2E8
efx::TQueenRoll* mEfxRoll; // _2EC
efx::TQueenCrashR* mEfxCrashR; // _2F0
efx::TQueenCrashL* mEfxCrashL; // _2F4
efx::TQueenCrashRock* mEfxCrashRock; // _2F8
efx::TQueenDamage* mEfxDamage; // _2FC
efx::TQueenFlick* mEfxFlick; // _300
efx::TQueenDead* mEfxDead; // _304
efx::TQueenWakeup* mEfxWakeup; // _308
efx::TQueenHanacho* mEfxHanacho; // _30C
// _310 = PelletView
};

Expand Down Expand Up @@ -159,19 +159,19 @@ struct Parms : public EnemyParmsBase {
struct ProperParms : public Parameters {
inline ProperParms()
: Parameters(nullptr, "QueenParms")
, mFp01(this, 'fp01', "ローリング時間", 10.0f, 0.0f, 100.0f) // 'rolling time'
, mFp02(this, 'fp02', "出産間隔 ( sec )", 0.0f, 0.0f, 10.0f) // 'birth interval ( sec )'
, mFp11(this, 'fp11', "Forest 1 Life", 2500.0f, 0.0f, 10000.0f) // (Hole of Beasts Life)
, mIp01(this, 'ip01', "出産数 ( Max )", 50, 0, 50) // 'number of births ( Max )'
, mIp02(this, 'ip02', "出産数 ( Min )", 25, 0, 50) // 'number of births ( Min )'
, mRollingTime(this, 'fp01', "ローリング時間", 10.0f, 0.0f, 100.0f) // 'rolling time'
, mBirthInterval(this, 'fp02', "出産間隔 ( sec )", 0.0f, 0.0f, 10.0f) // 'birth interval ( sec )'
, mHoBHealth(this, 'fp11', "Forest 1 Life", 2500.0f, 0.0f, 10000.0f) // (Hole of Beasts Life)
, mMaxBirths(this, 'ip01', "出産数 ( Max )", 50, 0, 50) // 'number of births ( Max )'
, mMinBirths(this, 'ip02', "出産数 ( Min )", 25, 0, 50) // 'number of births ( Min )'
{
}

Parm<f32> mFp01; // _804
Parm<f32> mFp02; // _82C
Parm<f32> mFp11; // _854
Parm<int> mIp01; // _87C
Parm<int> mIp02; // _8A4
Parm<f32> mRollingTime; // _804, fp01
Parm<f32> mBirthInterval; // _82C, fp02
Parm<f32> mHoBHealth; // _854, fp11
Parm<int> mMaxBirths; // _87C, ip01
Parm<int> mMinBirths; // _8A4, ip02
};

Parms() { }
Expand Down
36 changes: 18 additions & 18 deletions include/efx/TQueen.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

namespace efx {
struct TQueenCrashL : public TChasePosYRot {
inline TQueenCrashL()
: TChasePosYRot(nullptr, nullptr, PID_QueenCrashL)
inline TQueenCrashL(Vector3f* pos, f32* rot)
: TChasePosYRot(pos, rot, PID_QueenCrashL)
{
}

Expand All @@ -18,8 +18,8 @@ struct TQueenCrashL : public TChasePosYRot {
};

struct TQueenCrashR : public TChasePosYRot {
inline TQueenCrashR()
: TChasePosYRot(nullptr, nullptr, PID_QueenCrashR)
inline TQueenCrashR(Vector3f* pos, f32* rot)
: TChasePosYRot(pos, rot, PID_QueenCrashR)
{
}

Expand All @@ -30,8 +30,8 @@ struct TQueenCrashR : public TChasePosYRot {
};

struct TQueenCrashRock : public TChasePosYRot {
inline TQueenCrashRock()
: TChasePosYRot(nullptr, nullptr, PID_QueenCrashRock)
inline TQueenCrashRock(Vector3f* pos, f32* rot)
: TChasePosYRot(pos, rot, PID_QueenCrashRock)
{
}

Expand All @@ -42,8 +42,8 @@ struct TQueenCrashRock : public TChasePosYRot {
};

struct TQueenDamage : public TChasePosYRot {
inline TQueenDamage()
: TChasePosYRot(nullptr, nullptr, PID_QueenDamage)
inline TQueenDamage(Vector3f* pos, f32* rot)
: TChasePosYRot(pos, rot, PID_QueenDamage)
{
}

Expand All @@ -64,8 +64,8 @@ struct TQueenDead : public TChaseMtx4 {
};

struct TQueenFlick : public TChasePosYRot2 {
inline TQueenFlick()
: TChasePosYRot2(nullptr, nullptr, PID_QueenFlick_1, PID_QueenFlick_2)
inline TQueenFlick(Vector3f* pos, f32* rot)
: TChasePosYRot2(pos, rot, PID_QueenFlick_1, PID_QueenFlick_2)
{
}

Expand Down Expand Up @@ -98,8 +98,8 @@ struct TQueenLay : public TChaseMtx {
};

struct TQueenRoll : public TChasePosYRot2 {
inline TQueenRoll()
: TChasePosYRot2(nullptr, nullptr, PID_QueenRoll_1, PID_QueenRoll_2)
inline TQueenRoll(Vector3f* pos, f32* rot)
: TChasePosYRot2(pos, rot, PID_QueenRoll_1, PID_QueenRoll_2)
{
}

Expand All @@ -108,8 +108,8 @@ struct TQueenRoll : public TChasePosYRot2 {
};

struct TQueenRollCL : public TChasePosYRot3 {
inline TQueenRollCL()
: TChasePosYRot3(nullptr, nullptr, PID_QueenRollCL_1, PID_QueenRollCL_2, PID_QueenRollCL_3)
inline TQueenRollCL(Vector3f* pos, f32* rot)
: TChasePosYRot3(pos, rot, PID_QueenRollCL_1, PID_QueenRollCL_2, PID_QueenRollCL_3)
{
}

Expand All @@ -118,8 +118,8 @@ struct TQueenRollCL : public TChasePosYRot3 {
};

struct TQueenRollCR : public TChasePosYRot3 {
inline TQueenRollCR()
: TChasePosYRot3(nullptr, nullptr, PID_QueenRollCR_1, PID_QueenRollCR_2, PID_QueenRollCR_3)
inline TQueenRollCR(Vector3f* pos, f32* rot)
: TChasePosYRot3(pos, rot, PID_QueenRollCR_1, PID_QueenRollCR_2, PID_QueenRollCR_3)
{
}

Expand All @@ -128,8 +128,8 @@ struct TQueenRollCR : public TChasePosYRot3 {
};

struct TQueenWakeup : public TChasePosYRot {
inline TQueenWakeup()
: TChasePosYRot(nullptr, nullptr, PID_QueenWakeup)
inline TQueenWakeup(Vector3f* pos, f32* rot)
: TChasePosYRot(pos, rot, PID_QueenWakeup)
{
}

Expand Down
Loading

0 comments on commit 19abfb2

Please sign in to comment.