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

CDrone: TargetPlayer fixes

This commit is contained in:
Luke Street 2020-09-13 23:15:57 -04:00
parent 979b0278da
commit 8dc190b04d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -518,17 +518,19 @@ void CDrone::PathFind(CStateManager& mgr, EStateMsg msg, float dt) {
void CDrone::TargetPlayer(CStateManager& mgr, EStateMsg msg, float dt) { void CDrone::TargetPlayer(CStateManager& mgr, EStateMsg msg, float dt) {
if (msg == EStateMsg::Activate) { if (msg == EStateMsg::Activate) {
x3b8_turnSpeed = x5ec_turnSpeed; x3b8_turnSpeed = x5ec_turnSpeed;
x450_bodyController->SetTurnSpeed(x5ec_turnSpeed);
if (x450_bodyController->GetLocomotionType() != pas::ELocomotionType::Combat) if (x450_bodyController->GetLocomotionType() != pas::ELocomotionType::Combat)
x450_bodyController->SetLocomotionType(pas::ELocomotionType::Combat); x450_bodyController->SetLocomotionType(pas::ELocomotionType::Combat);
x450_bodyController->BodyStateInfo().SetMaximumPitch(zeus::degToRad(60.f));
SetDestPos(mgr.GetPlayer().GetAimPosition(mgr, 0.f)); SetDestPos(mgr.GetPlayer().GetAimPosition(mgr, 0.f));
x400_24_hitByPlayerProjectile = false; x400_24_hitByPlayerProjectile = false;
if (x3fc_flavor == EFlavorType::One) if (x3fc_flavor == EFlavorType::One)
x834_30_visible = true; x834_30_visible = true;
x330_stateMachineState.SetDelay(std::max(0.f, x624_)); x330_stateMachineState.SetDelay(std::max(0.3f, x624_));
} else if (msg == EStateMsg::Update) { } else if (msg == EStateMsg::Update) {
zeus::CVector3f target = (mgr.GetPlayer().GetAimPosition(mgr, 0.f) - GetTranslation()).normalized(); zeus::CVector3f target = (mgr.GetPlayer().GetAimPosition(mgr, 0.f) - GetTranslation()).normalized();
x450_bodyController->GetCommandMgr().DeliverCmd( x450_bodyController->GetCommandMgr().DeliverCmd(
CBCLocomotionCmd(FLT_EPSILON * GetTransform().basis[1], target, 1.f)); CBCLocomotionCmd(FLT_EPSILON * GetTransform().frontVector(), target, 1.f));
x450_bodyController->GetCommandMgr().DeliverTargetVector(target); x450_bodyController->GetCommandMgr().DeliverTargetVector(target);
StrafeFromCompanions(mgr); StrafeFromCompanions(mgr);
if (x630_ <= 0.f) if (x630_ <= 0.f)