AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

CMetaree: Fix Halt delay

This commit is contained in:
Luke Street 2020-05-14 11:27:13 -04:00
parent 47d767c441
commit ff62fddc89
2 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
Runtime/MP1/World/CMetaree.cpp
View File

@ -15,7 +15,7 @@ CMetaree::CMetaree(TUniqueId uid, std::string_view name, EFlavorType flavor, con
: CPatterned(ECharacter::Metaree, uid, name, flavor, info, xf, std::move(mData), pInfo, EMovementType::Flyer, : CPatterned(ECharacter::Metaree, uid, name, flavor, info, xf, std::move(mData), pInfo, EMovementType::Flyer,
EColliderType::Zero, bodyType, aParms, EKnockBackVariant::Small) EColliderType::Zero, bodyType, aParms, EKnockBackVariant::Small)
, x568_delay(f3) , x568_delay(f3)
, x56c_(f4) , x56c_haltDelay(f4)
, x570_dropHeight(f1) , x570_dropHeight(f1)
, x574_offset(v1) , x574_offset(v1)
, x580_attackSpeed(f2) , x580_attackSpeed(f2)
@ -29,10 +29,11 @@ void CMetaree::Accept(IVisitor& visitor) { visitor.Visit(this); }
void CMetaree::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) { void CMetaree::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) {
CPatterned::AcceptScriptMsg(msg, uid, mgr); CPatterned::AcceptScriptMsg(msg, uid, mgr);
if (msg == EScriptObjectMessage::Start) if (msg == EScriptObjectMessage::Start) {
x5ca_25_started = true; x5ca_25_started = true;
else if (msg == EScriptObjectMessage::Registered) } else if (msg == EScriptObjectMessage::Registered) {
x450_bodyController->Activate(mgr); x450_bodyController->Activate(mgr);
}
} }
void CMetaree::Think(float dt, CStateManager& mgr) { void CMetaree::Think(float dt, CStateManager& mgr) {
@ -46,8 +47,9 @@ void CMetaree::Think(float dt, CStateManager& mgr) {
} }
void CMetaree::Explode(CStateManager& mgr, EStateMsg msg, float) { void CMetaree::Explode(CStateManager& mgr, EStateMsg msg, float) {
if (msg != EStateMsg::Activate) if (msg != EStateMsg::Activate) {
return; return;
}
mgr.ApplyDamage(GetUniqueId(), mgr.GetPlayer().GetUniqueId(), GetUniqueId(), x5ac_damageInfo, mgr.ApplyDamage(GetUniqueId(), mgr.GetPlayer().GetUniqueId(), GetUniqueId(), x5ac_damageInfo,
CMaterialFilter::MakeIncludeExclude({EMaterialTypes::Solid}, {}), {}); CMaterialFilter::MakeIncludeExclude({EMaterialTypes::Solid}, {}), {});
@ -55,12 +57,14 @@ void CMetaree::Explode(CStateManager& mgr, EStateMsg msg, float) {
} }
void CMetaree::Touch(CActor& act, CStateManager& mgr) { void CMetaree::Touch(CActor& act, CStateManager& mgr) {
if (!x400_25_alive) if (!x400_25_alive) {
return; return;
}
if (TCastToPtr<CGameProjectile> projectile = act) { if (TCastToPtr<CGameProjectile> projectile = act) {
if (projectile->GetOwnerId() != mgr.GetPlayer().GetUniqueId()) if (projectile->GetOwnerId() != mgr.GetPlayer().GetUniqueId()) {
return; return;
}
x400_24_hitByPlayerProjectile = true; x400_24_hitByPlayerProjectile = true;
x590_projectileDelta = projectile->GetTranslation() - projectile->GetPreviousPos(); x590_projectileDelta = projectile->GetTranslation() - projectile->GetPreviousPos();
@ -68,8 +72,9 @@ void CMetaree::Touch(CActor& act, CStateManager& mgr) {
} }
void CMetaree::CollidedWith(TUniqueId id, const CCollisionInfoList& colList, CStateManager& mgr) { void CMetaree::CollidedWith(TUniqueId id, const CCollisionInfoList& colList, CStateManager& mgr) {
if (!x400_25_alive || colList.GetCount() <= 0) if (!x400_25_alive || colList.GetCount() <= 0) {
return; return;
}
mgr.ApplyDamageToWorld(GetUniqueId(), *this, GetTranslation(), x5ac_damageInfo, mgr.ApplyDamageToWorld(GetUniqueId(), *this, GetTranslation(), x5ac_damageInfo,
CMaterialFilter::MakeInclude({EMaterialTypes::Player})); CMaterialFilter::MakeInclude({EMaterialTypes::Player}));
@ -79,15 +84,15 @@ void CMetaree::CollidedWith(TUniqueId id, const CCollisionInfoList& colList, CSt
void CMetaree::Flee(CStateManager& mgr, EStateMsg msg, float) { void CMetaree::Flee(CStateManager& mgr, EStateMsg msg, float) {
if (msg == EStateMsg::Activate) { if (msg == EStateMsg::Activate) {
ApplyImpulseWR(5.f * (GetMass() * (x590_projectileDelta * zeus::CVector3f{1.f, 1.f, 0.f})), ApplyImpulseWR(5.f * (GetMass() * (x590_projectileDelta * zeus::CVector3f{1.f, 1.f, 0.f})), zeus::CAxisAngle());
zeus::CAxisAngle());
SetMomentumWR({0.f, 0.f, -GetGravityConstant() * GetMass()}); SetMomentumWR({0.f, 0.f, -GetGravityConstant() * GetMass()});
SetTranslation(GetTranslation()); SetTranslation(GetTranslation());
x5a8_ = 0; x5a8_ = 0;
} else if (msg == EStateMsg::Update) { } else if (msg == EStateMsg::Update) {
if (x5a8_ != 0) if (x5a8_ != 0) {
return; return;
}
if (x450_bodyController->GetBodyStateInfo().GetCurrentStateId() == pas::EAnimationState::LieOnGround) { if (x450_bodyController->GetBodyStateInfo().GetCurrentStateId() == pas::EAnimationState::LieOnGround) {
x5a8_ = 1; x5a8_ = 1;
@ -99,8 +104,9 @@ void CMetaree::Flee(CStateManager& mgr, EStateMsg msg, float) {
} }
void CMetaree::Dead(CStateManager& mgr, EStateMsg msg, float) { void CMetaree::Dead(CStateManager& mgr, EStateMsg msg, float) {
if (msg != EStateMsg::Activate) if (msg != EStateMsg::Activate) {
return; return;
}
mgr.ApplyDamageToWorld(GetUniqueId(), *this, GetTranslation(), x5ac_damageInfo, mgr.ApplyDamageToWorld(GetUniqueId(), *this, GetTranslation(), x5ac_damageInfo,
CMaterialFilter::MakeIncludeExclude({EMaterialTypes::Player}, {})); CMaterialFilter::MakeIncludeExclude({EMaterialTypes::Player}, {}));
@ -116,9 +122,9 @@ void CMetaree::Attack(CStateManager&, EStateMsg msg, float) {
x450_bodyController->SetLocomotionType(pas::ELocomotionType::Combat); x450_bodyController->SetLocomotionType(pas::ELocomotionType::Combat);
x59c_velocity = x580_attackSpeed * dir; x59c_velocity = x580_attackSpeed * dir;
} else if (msg == EStateMsg::Update) { } else if (msg == EStateMsg::Update) {
if (x450_bodyController->GetPercentageFrozen() == 0.f) if (x450_bodyController->GetPercentageFrozen() == 0.f) {
SetVelocityWR(x59c_velocity); SetVelocityWR(x59c_velocity);
else { } else {
Stop(); Stop();
SetVelocityWR({}); SetVelocityWR({});
} }
@ -126,15 +132,17 @@ void CMetaree::Attack(CStateManager&, EStateMsg msg, float) {
} }
void CMetaree::Halt(CStateManager& mgr, EStateMsg msg, float) { void CMetaree::Halt(CStateManager& mgr, EStateMsg msg, float) {
if (msg != EStateMsg::Activate) if (msg != EStateMsg::Activate) {
return; return;
}
Stop(); Stop();
SetVelocityWR({}); SetVelocityWR(zeus::skZero3f);
SetMomentumWR({}); SetMomentumWR(zeus::skZero3f);
x450_bodyController->SetLocomotionType(pas::ELocomotionType::Lurk); x450_bodyController->SetLocomotionType(pas::ELocomotionType::Lurk);
x584_lookPos = x574_offset + mgr.GetPlayer().GetTranslation(); x584_lookPos = x574_offset + mgr.GetPlayer().GetTranslation();
SetTransform(zeus::lookAt(GetTranslation(), x584_lookPos)); SetTransform(zeus::lookAt(GetTranslation(), x584_lookPos));
x330_stateMachineState.SetDelay(x56c_haltDelay);
} }
void CMetaree::Active(CStateManager& mgr, EStateMsg msg, float) { void CMetaree::Active(CStateManager& mgr, EStateMsg msg, float) {
@ -153,8 +161,7 @@ void CMetaree::Active(CStateManager& mgr, EStateMsg msg, float) {
void CMetaree::InActive(CStateManager&, EStateMsg msg, float) { void CMetaree::InActive(CStateManager&, EStateMsg msg, float) {
if (msg == EStateMsg::Activate) { if (msg == EStateMsg::Activate) {
const auto locomotionType = x5ca_26_deactivated ? pas::ELocomotionType::Crouch const auto locomotionType = x5ca_26_deactivated ? pas::ELocomotionType::Crouch : pas::ELocomotionType::Relaxed;
: pas::ELocomotionType::Relaxed;
x450_bodyController->SetLocomotionType(locomotionType); x450_bodyController->SetLocomotionType(locomotionType);
} else if (msg == EStateMsg::Deactivate) { } else if (msg == EStateMsg::Deactivate) {
x5ca_26_deactivated = true; x5ca_26_deactivated = true;
@ -162,8 +169,9 @@ void CMetaree::InActive(CStateManager&, EStateMsg msg, float) {
} }
bool CMetaree::InRange(CStateManager& mgr, float arg) { bool CMetaree::InRange(CStateManager& mgr, float arg) {
if (x5ca_25_started) if (x5ca_25_started) {
return true; return true;
}
return CPatterned::InRange(mgr, arg); return CPatterned::InRange(mgr, arg);
} }

15
Runtime/MP1/World/CMetaree.hpp
View File

@ -10,7 +10,7 @@
namespace urde::MP1 { namespace urde::MP1 {
class CMetaree : public CPatterned { class CMetaree : public CPatterned {
float x568_delay; float x568_delay;
float x56c_; float x56c_haltDelay;
float x570_dropHeight; float x570_dropHeight;
zeus::CVector3f x574_offset; zeus::CVector3f x574_offset;
float x580_attackSpeed; float x580_attackSpeed;
@ -20,16 +20,9 @@ class CMetaree : public CPatterned {
u32 x5a8_ = 0; u32 x5a8_ = 0;
CDamageInfo x5ac_damageInfo; CDamageInfo x5ac_damageInfo;
u16 x5c8_attackSfx = SFXsfx0225; u16 x5c8_attackSfx = SFXsfx0225;
bool x5ca_24_ : 1;
struct { bool x5ca_25_started : 1;
struct { bool x5ca_26_deactivated : 1;
bool x5ca_24_ : 1;
bool x5ca_25_started : 1;
bool x5ca_26_deactivated : 1;
};
u16 _dummy;
};
u32 x5cc_; u32 x5cc_;
public: public: