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

CDrone: Finish Attack

This commit is contained in:
Luke Street 2020-09-15 01:35:22 -04:00
parent 230a8ff946
commit ec83a227de
2 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Runtime/MP1/World/CDrone.cpp
View File

@ -225,7 +225,7 @@ void CDrone::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId sender, CStateM
} }
case EScriptObjectMessage::Deactivate: case EScriptObjectMessage::Deactivate:
case EScriptObjectMessage::Deleted: { case EScriptObjectMessage::Deleted: {
for (TUniqueId& unkId : x7d8_) { for (TUniqueId& unkId : x7d8_laserIds) {
if (unkId != kInvalidUniqueId) { if (unkId != kInvalidUniqueId) {
mgr.FreeScriptObject(unkId); mgr.FreeScriptObject(unkId);
unkId = kInvalidUniqueId; unkId = kInvalidUniqueId;
@ -568,14 +568,39 @@ void CDrone::Attack(CStateManager& mgr, EStateMsg msg, float dt) {
x7c8_ = 0; x7c8_ = 0;
x834_31_attackOver = false; x834_31_attackOver = false;
const auto playerAimPos = mgr.GetPlayer().GetAimPosition(mgr, 0.f); const auto playerAimPos = mgr.GetPlayer().GetAimPosition(mgr, 0.f);
const auto frontVec = GetTransform().frontVector(); const auto& xf = GetTransform();
const auto frontVec = xf.frontVector();
zeus::CVector3f out; zeus::CVector3f out;
if ((playerAimPos - GetTranslation()).normalized().dot(frontVec) >= 0.8f) { if ((playerAimPos - GetTranslation()).normalized().dot(frontVec) >= 0.8f) {
out = playerAimPos; out = playerAimPos;
} else { } else {
out = GetTranslation() + 10.f * frontVec; out = GetTranslation() + 10.f * frontVec;
} }
// TODO complete s32 state = mgr.GetActiveRandom()->Next() % 4;
if (state == 0) {
x7e0_[0] = out + (3.f * xf.rightVector()) - (4.f * xf.upVector());
x7fc_[0] = out - (3.f * xf.rightVector()) + (4.f * xf.upVector());
x7e0_[1] = out - (3.f * xf.rightVector()) - (4.f * xf.upVector());
x7fc_[1] = out + (3.f * xf.rightVector()) + (4.f * xf.upVector());
} else if (state == 1) {
x7e0_[0] = out + (3.f * xf.rightVector()) + (4.f * xf.upVector());
x7fc_[0] = out - (3.f * xf.rightVector()) - (4.f * xf.upVector());
x7e0_[1] = out - (3.f * xf.rightVector()) + (4.f * xf.upVector());
x7fc_[1] = out + (3.f * xf.rightVector()) - (4.f * xf.upVector());
} else if (state == 2) {
x7e0_[0] = out - (4.f * xf.rightVector()) - (3.f * xf.upVector());
x7fc_[0] = out + (4.f * xf.rightVector()) + (3.f * xf.upVector());
x7e0_[1] = out + (4.f * xf.rightVector()) - (3.f * xf.upVector());
x7fc_[1] = out - (4.f * xf.rightVector()) + (3.f * xf.upVector());
} else if (state == 3) {
x7e0_[0] = out - (4.f * xf.rightVector()) + (3.f * xf.upVector());
x7fc_[0] = out + (4.f * xf.rightVector()) - (3.f * xf.upVector());
x7e0_[1] = out + (4.f * xf.rightVector()) + (3.f * xf.upVector());
x7fc_[1] = out - (4.f * xf.rightVector()) - (3.f * xf.upVector());
}
x818_[0] = 0.f;
x818_[1] = 0.f;
x835_24_ = true;
} else if (msg == EStateMsg::Update) { } else if (msg == EStateMsg::Update) {
if (x7c8_ == 0) { if (x7c8_ == 0) {
if (GetBodyController()->GetCurrentStateId() == pas::EAnimationState::ProjectileAttack) { if (GetBodyController()->GetCurrentStateId() == pas::EAnimationState::ProjectileAttack) {
@ -962,11 +987,11 @@ void CDrone::RemoveFromTeam(CStateManager& mgr) const {
} }
void CDrone::UpdateLaser(CStateManager& mgr, u32 laserIdx, bool active) { void CDrone::UpdateLaser(CStateManager& mgr, u32 laserIdx, bool active) {
if (active && x7d8_[laserIdx] == kInvalidUniqueId) { if (active && x7d8_laserIds[laserIdx] == kInvalidUniqueId) {
x7d8_[laserIdx] = mgr.AllocateUniqueId(); x7d8_laserIds[laserIdx] = mgr.AllocateUniqueId();
mgr.AddObject(new CDroneLaser(x7d8_[laserIdx], GetAreaIdAlways(), GetTransform(), x568_laserParticlesId)); mgr.AddObject(new CDroneLaser(x7d8_laserIds[laserIdx], GetAreaIdAlways(), GetTransform(), x568_laserParticlesId));
} }
if (CEntity* ent = mgr.ObjectById(x7d8_[laserIdx])) { if (CEntity* ent = mgr.ObjectById(x7d8_laserIds[laserIdx])) {
mgr.SendScriptMsg(ent, GetUniqueId(), active ? EScriptObjectMessage::Activate : EScriptObjectMessage::Deactivate); mgr.SendScriptMsg(ent, GetUniqueId(), active ? EScriptObjectMessage::Activate : EScriptObjectMessage::Deactivate);
} }
} }

2
Runtime/MP1/World/CDrone.hpp
View File

@ -74,7 +74,7 @@ class CDrone : public CPatterned {
s32 x7c8_ = 0; s32 x7c8_ = 0;
s16 x7cc_; s16 x7cc_;
CSfxHandle x7d0_; CSfxHandle x7d0_;
rstl::reserved_vector<TUniqueId, 2> x7d8_ = {{kInvalidUniqueId, kInvalidUniqueId}}; rstl::reserved_vector<TUniqueId, 2> x7d8_laserIds = {{kInvalidUniqueId, kInvalidUniqueId}};
rstl::reserved_vector<zeus::CVector3f, 2> x7e0_ = {{zeus::skZero3f, zeus::skZero3f}}; rstl::reserved_vector<zeus::CVector3f, 2> x7e0_ = {{zeus::skZero3f, zeus::skZero3f}};
rstl::reserved_vector<zeus::CVector3f, 2> x7fc_ = {{zeus::skZero3f, zeus::skZero3f}}; rstl::reserved_vector<zeus::CVector3f, 2> x7fc_ = {{zeus::skZero3f, zeus::skZero3f}};
rstl::reserved_vector<float, 2> x818_ = {{0.f, 0.f}}; rstl::reserved_vector<float, 2> x818_ = {{0.f, 0.f}};