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

CMetroid: More function implementations

Browse Source
This commit is contained in:
Luke Street
2020-05-09 02:51:02 -04:00
parent 78b364a445
commit e8ce4c2e27
11 changed files with 630 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
Runtime/MP1/World/CMetroid.hpp
View File

@@ -19,11 +19,11 @@ private:
CDamageVulnerability x0_frozenVulnerability;
CDamageVulnerability x68_energyDrainVulnerability;
float xd0_;
float xd4_;
float xd4_maxEnergyDrainAllowed;
float xd8_;
float xdc_;
float xe0_;
float xe4_;
float xdc_stage2GrowthScale;
float xe0_stage2GrowthEnergy;
float xe4_explosionGrowthEnergy;
std::optional<CAnimationParameters> xe8_animParms1;
std::optional<CAnimationParameters> xf8_animParms2;
std::optional<CAnimationParameters> x108_animParms3;
@@ -35,7 +35,11 @@ public:
static u32 GetNumProperties() { return skNumProperties; }
const CDamageVulnerability& GetFrozenVulnerability() const { return x0_frozenVulnerability; }
const CDamageVulnerability& GetEnergyDrainVulnerability() const { return x68_energyDrainVulnerability; }
bool GetStartsInWall() { return x128_24_startsInWall; }
float GetMaxEnergyDrainAllowed() const { return xd4_maxEnergyDrainAllowed; }
float GetStage2GrowthScale() const { return xdc_stage2GrowthScale; }
float GetStage2GrowthEnergy() const { return xe0_stage2GrowthEnergy; }
float GetExplosionGrowthEnergy() const { return xe4_explosionGrowthEnergy; }
bool GetStartsInWall() const { return x128_24_startsInWall; }
};
class CMetroid : public CPatterned {
@@ -128,36 +132,37 @@ public:
void Touch(CActor& act, CStateManager& mgr) override;
void Attack(CStateManager& mgr, EStateMsg msg, float dt) override;
void Dodge(CStateManager& mgr, EStateMsg msg, float dt) override;
void Death(CStateManager& mgr, const zeus::CVector3f& direction, EScriptObjectState state) override;
void Generate(CStateManager& mgr, EStateMsg msg, float arg) override;
void KnockBack(const zeus::CVector3f&, CStateManager&, const CDamageInfo& info, EKnockBackType type, bool inDeferred,
float magnitude) override;
// void Dodge(CStateManager& mgr, EStateMsg msg, float dt) override;
// void Death(CStateManager& mgr, const zeus::CVector3f& direction, EScriptObjectState state) override;
// void Generate(CStateManager& mgr, EStateMsg msg, float arg) override;
// void KnockBack(const zeus::CVector3f&, CStateManager&, const CDamageInfo& info, EKnockBackType type, bool
// inDeferred,
// float magnitude) override;
void PathFind(CStateManager& mgr, EStateMsg msg, float arg) override;
void Patrol(CStateManager& mgr, EStateMsg msg, float arg) override;
void TargetPatrol(CStateManager& mgr, EStateMsg msg, float dt) override;
void TelegraphAttack(CStateManager& mgr, EStateMsg msg, float dt) override;
void TurnAround(CStateManager& mgr, EStateMsg msg, float dt) override;
void WallHang(CStateManager& mgr, EStateMsg msg, float dt) override;
// void Patrol(CStateManager& mgr, EStateMsg msg, float arg) override;
// void TargetPatrol(CStateManager& mgr, EStateMsg msg, float dt) override;
// void TelegraphAttack(CStateManager& mgr, EStateMsg msg, float dt) override;
// void TurnAround(CStateManager& mgr, EStateMsg msg, float dt) override;
// void WallHang(CStateManager& mgr, EStateMsg msg, float dt) override;
bool AnimOver(CStateManager&, float arg) override { return x568_state == EState::Over; }
bool AggressionCheck(CStateManager& mgr, float arg) override;
bool Attacked(CStateManager& mgr, float arg) override;
bool AttackOver(CStateManager& mgr, float arg) override;
bool InAttackPosition(CStateManager& mgr, float arg) override;
bool InDetectionRange(CStateManager& mgr, float arg) override;
bool InPosition(CStateManager& mgr, float arg) override;
bool InRange(CStateManager& mgr, float arg) override;
bool Inside(CStateManager& mgr, float arg) override;
bool Leash(CStateManager& mgr, float arg) override;
bool LostInterest(CStateManager& mgr, float arg) override;
bool PatternShagged(CStateManager& mgr, float arg) override;
// bool Attacked(CStateManager& mgr, float arg) override;
// bool AttackOver(CStateManager& mgr, float arg) override;
// bool InAttackPosition(CStateManager& mgr, float arg) override;
// bool InDetectionRange(CStateManager& mgr, float arg) override;
// bool InPosition(CStateManager& mgr, float arg) override;
// bool InRange(CStateManager& mgr, float arg) override;
// bool Inside(CStateManager& mgr, float arg) override;
// bool Leash(CStateManager& mgr, float arg) override;
// bool LostInterest(CStateManager& mgr, float arg) override;
// bool PatternShagged(CStateManager& mgr, float arg) override;
bool ShotAt(CStateManager& mgr, float arg) override { return x9bf_26_shotAt; }
bool ShouldAttack(CStateManager& mgr, float arg) override;
bool ShouldDodge(CStateManager& mgr, float arg) override;
bool ShouldTurn(CStateManager& mgr, float arg) override;
// bool ShouldDodge(CStateManager& mgr, float arg) override;
// bool ShouldTurn(CStateManager& mgr, float arg) override;
bool ShouldWallHang(CStateManager& mgr, float arg) override { return x56c_data.GetStartsInWall(); }
bool SpotPlayer(CStateManager& mgr, float arg) override;
// bool SpotPlayer(CStateManager& mgr, float arg) override;
bool IsAttacking() const { return x9bf_29_isAttacking; }
@@ -181,7 +186,7 @@ private:
void DisableSolidCollision(CMetroid* target);
void RestoreSolidCollision(CStateManager& mgr);
void PreventWorldCollisions(CStateManager& mgr, float dt);
void SetupExitFaceHugDirection(CActor& actor, CStateManager& mgr, const zeus::CVector3f& vec,
void SetupExitFaceHugDirection(CActor* actor, CStateManager& mgr, const zeus::CVector3f& vec,
const zeus::CTransform& xf);
void DetachFromTarget(CStateManager& mgr);
bool AttachToTarget(CStateManager& mgr);