AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-15 16:46:10 +00:00
Code Issues Projects Releases Wiki Activity

CFlaahgra: Some member renaming

Browse Source
This commit is contained in:
Luke Street
2020-08-23 03:37:22 -04:00
parent 95fa99ce7a
commit 7513b7b9bc
2 changed files with 180 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
Runtime/MP1/World/CFlaahgra.hpp
View File

@@ -32,13 +32,13 @@ class CFlaahgraData {
float x0_;
float x4_;
float x8_;
float xc_;
float xc_faintDuration;
CDamageVulnerability x10_;
CAssetId x78_;
CDamageInfo x7c_;
CAssetId x98_;
CDamageInfo x9c_;
CAssetId xb8_;
CAssetId xb8_plantsParticleGenDescId;
CDamageInfo xbc_;
CActorParameters xd8_;
float x140_;
@@ -87,22 +87,28 @@ public:
};
class CFlaahgra : public CPatterned {
s32 x568_ = -1;
CFlaahgraData x56c_;
enum class EState {
Invalid = -1,
Zero,
One,
Two,
Over,
} x568_state = EState::Invalid;
CFlaahgraData x56c_data;
std::unique_ptr<CBoneTracking> x6cc_boneTracking; // Used to be an rstl::optional_object<CBoneTracking*>
TUniqueId x6d0_rendererId = kInvalidUniqueId;
TToken<CGenDescription> x6d4_;
CProjectileInfo x6dc_;
CProjectileInfo x704_;
s32 x72c_ = -1;
rstl::reserved_vector<zeus::CVector3f, 5> x730_;
TToken<CGenDescription> x6d4_plantsParticleGenDesc;
CProjectileInfo x6dc_normalProjectileInfo;
CProjectileInfo x704_bigStrikeProjectileInfo;
s32 x72c_projectilesCreated = -1;
rstl::reserved_vector<zeus::CVector3f, 5> x730_projectileDirs;
rstl::reserved_vector<TUniqueId, 4> x770_mirrorWaypoints;
TUniqueId x77c_ = kInvalidUniqueId;
TUniqueId x77c_targetMirrorWaypointId = kInvalidUniqueId;
u32 x780_ = 1;
u32 x784_ = 1;
u32 x788_ = 0;
u32 x788_stage = 0;
zeus::CVector3f x78c_;
pas::EAnimationState x798_animState = pas::EAnimationState::Invalid;
pas::EAnimationState x798_meleeInitialAnimState = pas::EAnimationState::Invalid;
std::unique_ptr<CCollisionActorManager> x79c_leftArmCollision;
std::unique_ptr<CCollisionActorManager> x7a0_rightArmCollision;
std::unique_ptr<CCollisionActorManager> x7a4_sphereCollision;
@@ -110,16 +116,16 @@ class CFlaahgra : public CPatterned {
bool x7ac_ = true; // Was an enum
u32 x7b0_ = 1;
s32 x7b4_ = -1;
float x7b8_ = 0.f;
float x7b8_dizzyTime = 0.f;
float x7bc_ = 0.f;
float x7c0_ = 0.f;
float x7c4_ = 0.f;
float x7c8_ = -4.f;
float x7cc_ = 0.f;
float x7d0_ = 0.f;
float x7d4_ = 0.f;
float x7c4_actionDuration = 0.f;
// float x7c8_ = -4.f;
float x7cc_generateEndCooldown = 0.f;
float x7d0_hitSomethingTime = 0.f;
float x7d4_faintTime = 0.f;
float x7d8_ = 0.f;
CDamageInfo x7dc_;
CDamageInfo x7dc_halfContactDamage;
u32 x7f8_ = 0;
rstl::reserved_vector<TUniqueId, 8> x7fc_sphereColliders;
TUniqueId x80c_headActor = kInvalidUniqueId;
@@ -127,7 +133,7 @@ class CFlaahgra : public CPatterned {
float x814_ = 0.f;
float x818_curHp = 0.f;
float x81c_ = 0.f;
zeus::CVector3f x820_;
zeus::CVector3f x820_aimPosition;
rstl::reserved_vector<zeus::CVector3f, 4> x82c_;
rstl::reserved_vector<zeus::CVector3f, 4> x860_;
zeus::CVector3f x894_fallDirection;
@@ -141,7 +147,7 @@ class CFlaahgra : public CPatterned {
bool x8e4_27_ : 1 = false;
bool x8e4_28_ : 1 = false;
bool x8e4_29_getup : 1 = false;
bool x8e4_30_ : 1 = false;
bool x8e4_30_bigStrike : 1 = false;
bool x8e4_31_ : 1 = false;
bool x8e5_24_ : 1 = false;
bool x8e5_25_ : 1 = false;
@@ -190,7 +196,7 @@ class CFlaahgra : public CPatterned {
public:
DEFINE_PATTERNED(Flaahgra);
CFlaahgra(TUniqueId, std::string_view, const CEntityInfo&, const zeus::CTransform&, const CAnimRes&,
const CPatternedInfo&, const CActorParameters&, CFlaahgraData );
const CPatternedInfo&, const CActorParameters&, CFlaahgraData);
void Accept(IVisitor& visitor) override;
void Think(float, CStateManager&) override;
@@ -198,19 +204,21 @@ public:
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override;
void AddToRenderer(const zeus::CFrustum&, CStateManager&) override;
bool CanRenderUnsorted(const CStateManager&) const override { return true; }
zeus::CVector3f GetAimPosition(const CStateManager&, float) const override { return x820_; }
zeus::CVector3f GetAimPosition(const CStateManager&, float) const override { return x820_aimPosition; }
void Death(CStateManager&, const zeus::CVector3f&, EScriptObjectState) override;
void DoUserAnimEvent(CStateManager&, const CInt32POINode&, EUserEventType, float dt) override;
CProjectileInfo* GetProjectileInfo() override { return x8e4_30_ ? &x704_ : &x6dc_; }
CProjectileInfo* GetProjectileInfo() override {
return x8e4_30_bigStrike ? &x704_bigStrikeProjectileInfo : &x6dc_normalProjectileInfo;
}
bool AnimOver(CStateManager&, float) override { return x568_ == 4; }
bool AnimOver(CStateManager&, float) override { return x568_state == EState::Over; }
bool AIStage(CStateManager&, float arg) override { return x780_ == u32(arg); }
bool HitSomething(CStateManager&, float arg) override { return x7d0_ > 0.f; }
bool HitSomething(CStateManager&, float arg) override { return x7d0_hitSomethingTime > 0.f; }
bool OffLine(CStateManager&, float) override { return (x8e5_29_ && x8e5_28_); }
bool ShouldTurn(CStateManager&, float) override;
bool ShouldAttack(CStateManager&, float) override;
bool BreakAttack(CStateManager&, float) override { return x7d4_ >= x56c_.xc_ && !x8e4_29_getup; }
bool BreakAttack(CStateManager&, float) override { return x7d4_faintTime >= x56c_data.xc_faintDuration && !x8e4_29_getup; }
bool IsDizzy(CStateManager&, float) override {
return x450_bodyController->GetBodyStateInfo().GetCurrentStateId() == pas::EAnimationState::LoopReaction;
}