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

CFlaahgra: Finish SpecialAttack implementation

This commit is contained in:
Luke Street 2020-08-17 03:04:40 -04:00
parent a3484facf8
commit 970aac39a5
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Runtime/MP1/World/CFlaahgra.cpp
View File

@ -1222,6 +1222,7 @@ void CFlaahgra::Cover(CStateManager& mgr, EStateMsg msg, float) {
x7b0_ ^= 1; x7b0_ ^= 1;
} }
} }
void CFlaahgra::SpecialAttack(CStateManager& mgr, EStateMsg msg, float) { void CFlaahgra::SpecialAttack(CStateManager& mgr, EStateMsg msg, float) {
if (msg == EStateMsg::Activate) { if (msg == EStateMsg::Activate) {
x568_ = 0; x568_ = 0;
@ -1238,10 +1239,22 @@ void CFlaahgra::SpecialAttack(CStateManager& mgr, EStateMsg msg, float) {
CBCProjectileAttackCmd(pas::ESeverity::Eight, mgr.GetPlayer().GetTranslation(), false)); CBCProjectileAttackCmd(pas::ESeverity::Eight, mgr.GetPlayer().GetTranslation(), false));
} }
} else if (x568_ == 2) { } else if (x568_ == 2) {
if (x450_bodyController->GetBodyStateInfo().GetCurrentStateId() != pas::EAnimationState::ProjectileAttack) {} if (x450_bodyController->GetBodyStateInfo().GetCurrentStateId() == pas::EAnimationState::ProjectileAttack) {
x450_bodyController->GetCommandMgr().DeliverTargetVector(mgr.GetPlayer().GetTranslation() - GetTranslation());
} else {
x568_ = 4;
}
}
} else if (msg == EStateMsg::Deactivate) {
x7c0_ = (x308_attackTimeVariation * mgr.GetActiveRandom()->Float() + x304_averageAttackTime) / (1.f + x788_);
x8e4_30_ = false;
x7b4_ = -1;
if (x450_bodyController->GetCurrentStateId() == pas::EAnimationState::ProjectileAttack) {
x450_bodyController->GetCommandMgr().DeliverCmd(CBodyStateCmd(EBodyStateCmd::NextState));
} }
} }
} }
bool CFlaahgra::CoverCheck(CStateManager& mgr, float) { bool CFlaahgra::CoverCheck(CStateManager& mgr, float) {
if (x7f8_ <= 0 && x7bc_ > 0.f) if (x7f8_ <= 0 && x7bc_ > 0.f)
return false; return false;