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

CAtomicAlpha: Fix DoUserAnimEvent, AggressionCheck

This commit is contained in:
Luke Street 2020-08-24 03:33:26 -04:00
parent 3f17c72b30
commit a224d27043
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Runtime/MP1/World/CAtomicAlpha.cpp
View File

@ -25,7 +25,7 @@ CAtomicAlpha::CAtomicAlpha(TUniqueId uid, std::string_view name, const CEntityIn
EMovementType::Flyer, EColliderType::One, EBodyType::Flyer, actParms, EKnockBackVariant::Medium) EMovementType::Flyer, EColliderType::One, EBodyType::Flyer, actParms, EKnockBackVariant::Medium)
, x568_25_invisible(invisible) , x568_25_invisible(invisible)
, x568_26_applyBeamAttraction(b2) , x568_26_applyBeamAttraction(b2)
, x56c_bomdDropDelay(bombDropDelay) , x56c_bombDropDelay(bombDropDelay)
, x570_bombReappearDelay(f2) , x570_bombReappearDelay(f2)
, x574_bombRappearTime(f3) , x574_bombRappearTime(f3)
, x580_pathFind(nullptr, 3, pInfo.GetPathfindingIndex(), 1.f, 1.f) , x580_pathFind(nullptr, 3, pInfo.GetPathfindingIndex(), 1.f, 1.f)
@ -65,6 +65,7 @@ void CAtomicAlpha::Render(CStateManager& mgr) {
x690_bombModel.Render(mgr, locatorXf, x90_actorLights.get(), flags); x690_bombModel.Render(mgr, locatorXf, x90_actorLights.get(), flags);
} }
} }
void CAtomicAlpha::AddToRenderer(const zeus::CFrustum& frustum, CStateManager& mgr) { void CAtomicAlpha::AddToRenderer(const zeus::CFrustum& frustum, CStateManager& mgr) {
if (mgr.GetPlayerState()->GetActiveVisor(mgr) != CPlayerState::EPlayerVisor::XRay && x568_25_invisible) { if (mgr.GetPlayerState()->GetActiveVisor(mgr) != CPlayerState::EPlayerVisor::XRay && x568_25_invisible) {
return; return;
@ -88,26 +89,29 @@ void CAtomicAlpha::DoUserAnimEvent(CStateManager& mgr, const CInt32POINode& node
if (type == EUserEventType::Projectile) { if (type == EUserEventType::Projectile) {
zeus::CVector3f origin = GetLctrTransform(node.GetLocatorName()).origin; zeus::CVector3f origin = GetLctrTransform(node.GetLocatorName()).origin;
zeus::CTransform xf = zeus::lookAt(origin, origin + zeus::skDown, zeus::skUp); zeus::CTransform xf = zeus::lookAt(origin, origin + zeus::skDown, zeus::skUp);
LaunchProjectile(xf, mgr, 4, EProjectileAttrib::None, false, {}, 0xFFFF, false, zeus::CVector3f(1.f)); LaunchProjectile(xf, mgr, 4, EProjectileAttrib::None, false, {}, 0xFFFF, false, zeus::skOne3f);
x578_bombTime = 0.f; x578_bombTime = 0.f;
x57c_curBomb = (x57c_curBomb + 1) & (x6dc_bombLocators.size() - 1); x6dc_bombLocators[x57c_curBomb].x14_scaleTime = 0.f;
x57c_curBomb = (x57c_curBomb + 1) % x6dc_bombLocators.size();
} else } else
CPatterned::DoUserAnimEvent(mgr, node, type, dt); CPatterned::DoUserAnimEvent(mgr, node, type, dt);
} }
bool CAtomicAlpha::Leash(CStateManager& mgr, float) { bool CAtomicAlpha::Leash(CStateManager& mgr, float) {
if ((mgr.GetPlayer().GetTranslation() - GetTranslation()).magSquared() <= return (mgr.GetPlayer().GetTranslation() - GetTranslation()).magSquared() >
x3cc_playerLeashRadius * x3cc_playerLeashRadius) x3cc_playerLeashRadius * x3cc_playerLeashRadius &&
return false; x3d4_curPlayerLeashTime > x3d0_playerLeashTime;
return x3d4_curPlayerLeashTime > x3d0_playerLeashTime;
} }
bool CAtomicAlpha::AggressionCheck(CStateManager& mgr, float) { bool CAtomicAlpha::AggressionCheck(CStateManager& mgr, float) {
const CPlayerGun* playerGun = mgr.GetPlayer().GetPlayerGun(); if (!x568_26_applyBeamAttraction) {
return false;
}
float factor = 0.f; float factor = 0.f;
if (x568_26_applyBeamAttraction && playerGun->IsCharging()) const CPlayerGun* playerGun = mgr.GetPlayer().GetPlayerGun();
if (playerGun->IsCharging()) {
factor = playerGun->GetChargeBeamFactor(); factor = playerGun->GetChargeBeamFactor();
}
return factor > 0.1f; return factor > 0.1f;
} }
@ -131,7 +135,7 @@ void CAtomicAlpha::Patrol(CStateManager& mgr, EStateMsg msg, float arg) {
x578_bombTime = 0.f; x578_bombTime = 0.f;
} else if (msg == EStateMsg::Update) { } else if (msg == EStateMsg::Update) {
if (x568_24_inRange) { if (x568_24_inRange) {
if (x578_bombTime >= x56c_bomdDropDelay && if (x578_bombTime >= x56c_bombDropDelay &&
x6dc_bombLocators[0].x14_scaleTime > (x570_bombReappearDelay + x574_bombRappearTime)) { x6dc_bombLocators[0].x14_scaleTime > (x570_bombReappearDelay + x574_bombRappearTime)) {
x450_bodyController->SetLocomotionType(x6dc_bombLocators[x57c_curBomb].x10_locomotionType); x450_bodyController->SetLocomotionType(x6dc_bombLocators[x57c_curBomb].x10_locomotionType);
} else { } else {

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

@ -20,7 +20,7 @@ class CAtomicAlpha : public CPatterned {
bool x568_24_inRange : 1 = false; bool x568_24_inRange : 1 = false;
bool x568_25_invisible : 1; bool x568_25_invisible : 1;
bool x568_26_applyBeamAttraction : 1; bool x568_26_applyBeamAttraction : 1;
float x56c_bomdDropDelay; float x56c_bombDropDelay;
float x570_bombReappearDelay; float x570_bombReappearDelay;
float x574_bombRappearTime; float x574_bombRappearTime;
float x578_bombTime = 0.f; float x578_bombTime = 0.f;