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

CElitePirate/CShockWave: Renaming

This commit is contained in:
Luke Street 2020-04-01 14:54:01 -04:00
parent 162b232979
commit bb7699be46
4 changed files with 183 additions and 181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

288
Runtime/MP1/World/CElitePirate.cpp
View File

@ -83,19 +83,19 @@ CElitePirate::CElitePirate(TUniqueId uid, std::string_view name, const CEntityIn
, x5d8_data(std::move(data)) , x5d8_data(std::move(data))
, x6f8_boneTracking(*GetModelData()->GetAnimationData(), "Head_1", zeus::degToRad(80.f), zeus::degToRad(180.f), , x6f8_boneTracking(*GetModelData()->GetAnimationData(), "Head_1", zeus::degToRad(80.f), zeus::degToRad(180.f),
EBoneTrackingFlags::None) EBoneTrackingFlags::None)
, x738_(GetBoundingBox(), GetMaterialList()) , x738_collisionAabb(GetBoundingBox(), GetMaterialList())
, x7a0_initialSpeed(x3b4_speed) , x7a0_initialSpeed(x3b4_speed)
, x7d0_pathFindSearch(nullptr, 1, pInfo.GetPathfindingIndex(), 1.f, 1.f) , x7d0_pathFindSearch(nullptr, 1, pInfo.GetPathfindingIndex(), 1.f, 1.f)
, x8c0_(5.f) , x8c0_(5.f)
, x988_24_damageOn(false) , x988_24_damageOn(false)
, x988_25_(false) , x988_25_attackingRightClaw(false)
, x988_26_(false) , x988_26_attackingLeftClaw(false)
, x988_27_shotAt(false) , x988_27_shotAt(false)
, x988_28_alert(false) , x988_28_alert(false)
, x988_29_(false) , x988_29_shockWaveAnim(false)
, x988_30_(false) , x988_30_calledForBackup(false)
, x988_31_(false) , x988_31_running(false)
, x989_24_(false) { , x989_24_onPath(false) {
if (x5d8_data.GetX20().IsValid()) { if (x5d8_data.GetX20().IsValid()) {
x760_energyAbsorbDesc = g_SimplePool->GetObj({SBIG('PART'), x5d8_data.GetX20()}); x760_energyAbsorbDesc = g_SimplePool->GetObj({SBIG('PART'), x5d8_data.GetX20()});
} }
@ -105,7 +105,7 @@ CElitePirate::CElitePirate(TUniqueId uid, std::string_view name, const CEntityIn
x460_knockBackController.SetEnableBurn(false); x460_knockBackController.SetEnableBurn(false);
x460_knockBackController.SetEnableExplodeDeath(false); x460_knockBackController.SetEnableExplodeDeath(false);
x460_knockBackController.SetEnableLaggedBurnDeath(false); x460_knockBackController.SetEnableLaggedBurnDeath(false);
sub_80229248(); SetupPathFindSearch();
} }
void CElitePirate::Accept(IVisitor& visitor) { visitor.Visit(this); } void CElitePirate::Accept(IVisitor& visitor) { visitor.Visit(this); }
@ -114,19 +114,19 @@ void CElitePirate::Think(float dt, CStateManager& mgr) {
if (GetActive()) { if (GetActive()) {
CPatterned::Think(dt, mgr); CPatterned::Think(dt, mgr);
x6f8_boneTracking.Update(dt); x6f8_boneTracking.Update(dt);
if (sub_802273a8()) { if (HasWeakPointHead()) {
x730_collisionActorMgr2->Update(dt, mgr, CCollisionActorManager::EUpdateOptions::ObjectSpace); x730_collisionActorMgrHead->Update(dt, mgr, CCollisionActorManager::EUpdateOptions::ObjectSpace);
} }
x5d4_collisionActorMgr1->Update(dt, mgr, CCollisionActorManager::EUpdateOptions::ObjectSpace); x5d4_collisionActorMgr->Update(dt, mgr, CCollisionActorManager::EUpdateOptions::ObjectSpace);
if (IsAttractingEnergy() && x5d8_data.GetX11F()) { if (IsAttractingEnergy() && x5d8_data.GetX11F()) {
x3b4_speed = 2.f * x7a0_initialSpeed; x3b4_speed = 2.f * x7a0_initialSpeed;
} else { } else {
x3b4_speed = x7a0_initialSpeed; x3b4_speed = x7a0_initialSpeed;
} }
UpdateTimers(dt); UpdateTimers(dt);
sub_80228798(); UpdatePositionHistory();
UpdateActorTransform(mgr, x772_launcherId, "grenadeLauncher_LCTR"sv); UpdateActorTransform(mgr, x772_launcherId, "grenadeLauncher_LCTR"sv);
sub_80228e84(mgr); UpdateHealthInfo(mgr);
x328_31_energyAttractor = IsAttractingEnergy(); x328_31_energyAttractor = IsAttractingEnergy();
} }
} }
@ -136,8 +136,8 @@ void CElitePirate::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CSta
switch (msg) { switch (msg) {
case EScriptObjectMessage::Activate: { case EScriptObjectMessage::Activate: {
if (sub_802273a8()) { if (HasWeakPointHead()) {
x730_collisionActorMgr2->SetActive(mgr, true); x730_collisionActorMgrHead->SetActive(mgr, true);
} }
if (CEntity* ent = mgr.ObjectById(x772_launcherId)) { if (CEntity* ent = mgr.ObjectById(x772_launcherId)) {
ent->SetActive(true); ent->SetActive(true);
@ -145,10 +145,10 @@ void CElitePirate::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CSta
break; break;
} }
case EScriptObjectMessage::Deactivate: { case EScriptObjectMessage::Deactivate: {
if (sub_802273a8()) { if (HasWeakPointHead()) {
x730_collisionActorMgr2->SetActive(mgr, false); x730_collisionActorMgrHead->SetActive(mgr, false);
} }
x5d4_collisionActorMgr1->SetActive(mgr, false); x5d4_collisionActorMgr->SetActive(mgr, false);
if (CEntity* ent = mgr.ObjectById(x772_launcherId)) { if (CEntity* ent = mgr.ObjectById(x772_launcherId)) {
ent->SetActive(false); ent->SetActive(false);
} }
@ -185,8 +185,8 @@ void CElitePirate::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CSta
} }
break; break;
} }
if ((!x988_25_ || !IsArmClawCollider(uid, x774_collisionRJointIds)) && if ((!x988_25_attackingRightClaw || !IsArmClawCollider(uid, x774_collisionRJointIds)) &&
(!x988_26_ || !IsArmClawCollider(uid, x788_collisionLJointIds))) { (!x988_26_attackingLeftClaw || !IsArmClawCollider(uid, x788_collisionLJointIds))) {
break; break;
} }
mgr.ApplyDamage(GetUniqueId(), mgr.GetPlayer().GetUniqueId(), GetUniqueId(), GetContactDamage(), mgr.ApplyDamage(GetUniqueId(), mgr.GetPlayer().GetUniqueId(), GetUniqueId(), GetContactDamage(),
@ -202,17 +202,17 @@ void CElitePirate::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CSta
CreateGrenadeLauncher(mgr, x772_launcherId); CreateGrenadeLauncher(mgr, x772_launcherId);
const auto& bodyStateInfo = x450_bodyController->GetBodyStateInfo(); const auto& bodyStateInfo = x450_bodyController->GetBodyStateInfo();
if (bodyStateInfo.GetMaxSpeed() > 0.f) { if (bodyStateInfo.GetMaxSpeed() > 0.f) {
x7a4_ = (0.99f * bodyStateInfo.GetLocomotionSpeed(pas::ELocomotionAnim::Walk)) / bodyStateInfo.GetMaxSpeed(); x7a4_steeringSpeed = (0.99f * bodyStateInfo.GetLocomotionSpeed(pas::ELocomotionAnim::Walk)) / bodyStateInfo.GetMaxSpeed();
} }
x450_bodyController->GetCommandMgr().SetSteeringBlendMode(ESteeringBlendMode::FullSpeed); x450_bodyController->GetCommandMgr().SetSteeringBlendMode(ESteeringBlendMode::FullSpeed);
x450_bodyController->GetCommandMgr().SetSteeringSpeedRange(x7a4_, x7a4_); x450_bodyController->GetCommandMgr().SetSteeringSpeedRange(x7a4_steeringSpeed, x7a4_steeringSpeed);
break; break;
} }
case EScriptObjectMessage::Deleted: case EScriptObjectMessage::Deleted:
if (sub_802273a8()) { if (HasWeakPointHead()) {
x730_collisionActorMgr2->Destroy(mgr); x730_collisionActorMgrHead->Destroy(mgr);
} }
x5d4_collisionActorMgr1->Destroy(mgr); x5d4_collisionActorMgr->Destroy(mgr);
mgr.FreeScriptObject(x772_launcherId); mgr.FreeScriptObject(x772_launcherId);
break; break;
case EScriptObjectMessage::InitializedInArea: case EScriptObjectMessage::InitializedInArea:
@ -262,7 +262,8 @@ void CElitePirate::PreRender(CStateManager& mgr, const zeus::CFrustum& frustum)
x6f8_boneTracking.PreRender(mgr, *modelData->GetAnimationData(), GetTransform(), modelData->GetScale(), x6f8_boneTracking.PreRender(mgr, *modelData->GetAnimationData(), GetTransform(), modelData->GetScale(),
*x450_bodyController); *x450_bodyController);
auto numMaterialSets = modelData->GetNumMaterialSets(); auto numMaterialSets = modelData->GetNumMaterialSets();
xb4_drawFlags.x1_matSetIdx = numMaterialSets - 1 < x7cc_activeMaterialSet ? numMaterialSets - 1 : x7cc_activeMaterialSet; xb4_drawFlags.x1_matSetIdx =
numMaterialSets - 1 < x7cc_activeMaterialSet ? numMaterialSets - 1 : x7cc_activeMaterialSet;
} }
const CDamageVulnerability* CElitePirate::GetDamageVulnerability() const { const CDamageVulnerability* CElitePirate::GetDamageVulnerability() const {
@ -278,10 +279,10 @@ zeus::CVector3f CElitePirate::GetOrbitPosition(const CStateManager& mgr) const {
if (x772_launcherId != kInvalidUniqueId && if (x772_launcherId != kInvalidUniqueId &&
mgr.GetPlayerState()->GetCurrentVisor() == CPlayerState::EPlayerVisor::Thermal) { mgr.GetPlayerState()->GetCurrentVisor() == CPlayerState::EPlayerVisor::Thermal) {
if (const auto* actor = static_cast<const CActor*>(mgr.GetObjectById(x772_launcherId))) { if (const auto* actor = static_cast<const CActor*>(mgr.GetObjectById(x772_launcherId))) {
return sub_80228864(actor); return GetLockOnPosition(actor);
} }
} }
if (sub_802273a8()) { if (HasWeakPointHead()) {
if (TCastToConstPtr<CCollisionActor> actor = mgr.GetObjectById(x770_collisionHeadId)) { if (TCastToConstPtr<CCollisionActor> actor = mgr.GetObjectById(x770_collisionHeadId)) {
return actor->GetTranslation(); return actor->GetTranslation();
} }
@ -291,7 +292,7 @@ zeus::CVector3f CElitePirate::GetOrbitPosition(const CStateManager& mgr) const {
zeus::CVector3f CElitePirate::GetAimPosition(const CStateManager& mgr, float) const { zeus::CVector3f CElitePirate::GetAimPosition(const CStateManager& mgr, float) const {
const std::shared_ptr<CPlayerState>& playerState = mgr.GetPlayerState(); const std::shared_ptr<CPlayerState>& playerState = mgr.GetPlayerState();
if (x5d4_collisionActorMgr1->GetActive() && playerState->IsFiringComboBeam() && if (x5d4_collisionActorMgr->GetActive() && playerState->IsFiringComboBeam() &&
playerState->GetCurrentBeam() == CPlayerState::EBeamId::Wave) { playerState->GetCurrentBeam() == CPlayerState::EBeamId::Wave) {
if (TCastToConstPtr<CCollisionActor> actor = mgr.GetObjectById(x79c_)) { if (TCastToConstPtr<CCollisionActor> actor = mgr.GetObjectById(x79c_)) {
return actor->GetTranslation(); return actor->GetTranslation();
@ -319,7 +320,7 @@ void CElitePirate::DoUserAnimEvent(CStateManager& mgr, const CInt32POINode& node
x988_24_damageOn = false; x988_24_damageOn = false;
break; break;
case EUserEventType::ScreenShake: case EUserEventType::ScreenShake:
sub_802273a8(); HasWeakPointHead();
handled = true; handled = true;
break; break;
case EUserEventType::BeginAction: { case EUserEventType::BeginAction: {
@ -332,16 +333,16 @@ void CElitePirate::DoUserAnimEvent(CStateManager& mgr, const CInt32POINode& node
origin.z(), origin.z(),
}); });
mgr.AddObject(new CShockWave(mgr.AllocateUniqueId(), "Shock Wave", {GetAreaIdAlways(), CEntity::NullConnectionList}, mgr.AddObject(new CShockWave(mgr.AllocateUniqueId(), "Shock Wave", {GetAreaIdAlways(), CEntity::NullConnectionList},
xf, GetUniqueId(), GetShockWaveData(), sub_802273b0() ? 2.f : 1.3f, xf, GetUniqueId(), GetShockWaveData(), IsElitePirate() ? 2.f : 1.3f,
sub_802273b0() ? 0.4f : 0.5f)); IsElitePirate() ? 0.4f : 0.5f));
handled = true; handled = true;
break; break;
} }
case EUserEventType::BecomeShootThrough: case EUserEventType::BecomeShootThrough:
if (sub_802273a8()) { if (HasWeakPointHead()) {
u32 numCollisionActors = x730_collisionActorMgr2->GetNumCollisionActors(); u32 numCollisionActors = x730_collisionActorMgrHead->GetNumCollisionActors();
for (u32 i = 0; i < numCollisionActors; i++) { for (u32 i = 0; i < numCollisionActors; i++) {
const auto& description = x730_collisionActorMgr2->GetCollisionDescFromIndex(i); const auto& description = x730_collisionActorMgrHead->GetCollisionDescFromIndex(i);
if (TCastToPtr<CCollisionActor> actor = mgr.ObjectById(description.GetCollisionActorId())) { if (TCastToPtr<CCollisionActor> actor = mgr.ObjectById(description.GetCollisionActorId())) {
actor->AddMaterial(EMaterialTypes::ProjectilePassthrough, mgr); actor->AddMaterial(EMaterialTypes::ProjectilePassthrough, mgr);
} }
@ -357,11 +358,11 @@ void CElitePirate::DoUserAnimEvent(CStateManager& mgr, const CInt32POINode& node
} }
} }
const CCollisionPrimitive* CElitePirate::GetCollisionPrimitive() const { return &x738_; } const CCollisionPrimitive* CElitePirate::GetCollisionPrimitive() const { return &x738_collisionAabb; }
void CElitePirate::KnockBack(const zeus::CVector3f& pos, CStateManager& mgr, const CDamageInfo& info, void CElitePirate::KnockBack(const zeus::CVector3f& pos, CStateManager& mgr, const CDamageInfo& info,
EKnockBackType type, bool inDeferred, float magnitude) { EKnockBackType type, bool inDeferred, float magnitude) {
if (!sub_80227430(info)) { if (!CanKnockBack(info)) {
return; return;
} }
CPatterned::KnockBack(pos, mgr, info, type, inDeferred, magnitude); CPatterned::KnockBack(pos, mgr, info, type, inDeferred, magnitude);
@ -376,19 +377,19 @@ void CElitePirate::Patrol(CStateManager& mgr, EStateMsg msg, float dt) {
if (msg == EStateMsg::Activate) { if (msg == EStateMsg::Activate) {
x450_bodyController->SetLocomotionType(pas::ELocomotionType::Relaxed); x450_bodyController->SetLocomotionType(pas::ELocomotionType::Relaxed);
x400_24_hitByPlayerProjectile = false; x400_24_hitByPlayerProjectile = false;
x989_24_ = false; x989_24_onPath = false;
} }
CPatterned::Patrol(mgr, msg, dt); CPatterned::Patrol(mgr, msg, dt);
} }
void CElitePirate::PathFind(CStateManager& mgr, EStateMsg msg, float dt) { void CElitePirate::PathFind(CStateManager& mgr, EStateMsg msg, float dt) {
if (msg == EStateMsg::Activate) { if (msg == EStateMsg::Activate) {
x989_24_ = true; x989_24_onPath = true;
x988_28_alert = false; x988_28_alert = false;
x450_bodyController->SetLocomotionType(pas::ELocomotionType::Relaxed); x450_bodyController->SetLocomotionType(pas::ELocomotionType::Relaxed);
x6f8_boneTracking.SetTarget(mgr.GetPlayer().GetUniqueId()); x6f8_boneTracking.SetTarget(mgr.GetPlayer().GetUniqueId());
x6f8_boneTracking.SetActive(true); x6f8_boneTracking.SetActive(true);
sub_80228634(mgr); UpdateDestPos(mgr);
CPatterned::PathFind(mgr, msg, dt); CPatterned::PathFind(mgr, msg, dt);
x7bc_tauntTimer = x5d8_data.GetTauntVariance() * mgr.GetActiveRandom()->Float() + x5d8_data.GetTauntInterval(); x7bc_tauntTimer = x5d8_data.GetTauntVariance() * mgr.GetActiveRandom()->Float() + x5d8_data.GetTauntInterval();
if (TooClose(mgr, 0.f)) { if (TooClose(mgr, 0.f)) {
@ -427,13 +428,13 @@ void CElitePirate::TargetPatrol(CStateManager& mgr, EStateMsg msg, float dt) {
} else { } else {
SetDestPos(x3a0_latestLeashPosition); SetDestPos(x3a0_latestLeashPosition);
} }
x8b4_ = x2e0_destPos; x8b4_targetDestPos = x2e0_destPos;
if (GetSearchPath() != nullptr) { if (GetSearchPath() != nullptr) {
CPatterned::PathFind(mgr, msg, dt); CPatterned::PathFind(mgr, msg, dt);
} }
} else if (msg == EStateMsg::Update) { } else if (msg == EStateMsg::Update) {
if (PathShagged(mgr, 0.f)) { if (PathShagged(mgr, 0.f)) {
const zeus::CVector3f& move = x45c_steeringBehaviors.Arrival(*this, x8b4_, 25.f); const zeus::CVector3f& move = x45c_steeringBehaviors.Arrival(*this, x8b4_targetDestPos, 25.f);
x450_bodyController->GetCommandMgr().DeliverCmd(CBCLocomotionCmd(move, zeus::skZero3f, 1.f)); x450_bodyController->GetCommandMgr().DeliverCmd(CBCLocomotionCmd(move, zeus::skZero3f, 1.f));
} else { } else {
CPatterned::PathFind(mgr, msg, dt); CPatterned::PathFind(mgr, msg, dt);
@ -446,7 +447,7 @@ void CElitePirate::TargetPatrol(CStateManager& mgr, EStateMsg msg, float dt) {
void CElitePirate::Halt(CStateManager& mgr, EStateMsg msg, float) { void CElitePirate::Halt(CStateManager& mgr, EStateMsg msg, float) {
if (msg == EStateMsg::Activate) { if (msg == EStateMsg::Activate) {
x450_bodyController->SetLocomotionType(pas::ELocomotionType::Lurk); x450_bodyController->SetLocomotionType(pas::ELocomotionType::Lurk);
x989_24_ = false; x989_24_onPath = false;
CMaterialFilter filter = GetMaterialFilter(); CMaterialFilter filter = GetMaterialFilter();
filter.ExcludeList().Add( filter.ExcludeList().Add(
{EMaterialTypes::Wall, EMaterialTypes::Ceiling, EMaterialTypes::AIBlock, EMaterialTypes::Character}); {EMaterialTypes::Wall, EMaterialTypes::Ceiling, EMaterialTypes::AIBlock, EMaterialTypes::Character});
@ -461,12 +462,12 @@ void CElitePirate::Halt(CStateManager& mgr, EStateMsg msg, float) {
void CElitePirate::Run(CStateManager& mgr, EStateMsg msg, float dt) { void CElitePirate::Run(CStateManager& mgr, EStateMsg msg, float dt) {
if (msg == EStateMsg::Activate) { if (msg == EStateMsg::Activate) {
x988_31_ = true; x988_31_running = true;
x450_bodyController->SetLocomotionType(pas::ELocomotionType::Relaxed); x450_bodyController->SetLocomotionType(pas::ELocomotionType::Relaxed);
x450_bodyController->GetCommandMgr().SetSteeringSpeedRange(1.f, 1.f); x450_bodyController->GetCommandMgr().SetSteeringSpeedRange(1.f, 1.f);
x6f8_boneTracking.SetTarget(mgr.GetPlayer().GetUniqueId()); x6f8_boneTracking.SetTarget(mgr.GetPlayer().GetUniqueId());
x6f8_boneTracking.SetActive(true); x6f8_boneTracking.SetActive(true);
sub_80228634(mgr); UpdateDestPos(mgr);
CPatterned::PathFind(mgr, msg, dt); CPatterned::PathFind(mgr, msg, dt);
} else if (msg == EStateMsg::Update) { } else if (msg == EStateMsg::Update) {
if (PathShagged(mgr, 0.f)) { if (PathShagged(mgr, 0.f)) {
@ -485,57 +486,57 @@ void CElitePirate::Run(CStateManager& mgr, EStateMsg msg, float dt) {
CPatterned::PathFind(mgr, msg, dt); CPatterned::PathFind(mgr, msg, dt);
} }
} else if (msg == EStateMsg::Deactivate) { } else if (msg == EStateMsg::Deactivate) {
x988_31_ = false; x988_31_running = false;
x6f8_boneTracking.SetActive(false); x6f8_boneTracking.SetActive(false);
x450_bodyController->GetCommandMgr().SetSteeringSpeedRange(x7a4_, x7a4_); x450_bodyController->GetCommandMgr().SetSteeringSpeedRange(x7a4_steeringSpeed, x7a4_steeringSpeed);
} }
} }
void CElitePirate::Generate(CStateManager& mgr, EStateMsg msg, float) { void CElitePirate::Generate(CStateManager& mgr, EStateMsg msg, float) {
if (msg == EStateMsg::Activate) { if (msg == EStateMsg::Activate) {
x568_ = EState::One; x568_state = EState::One;
} else if (msg == EStateMsg::Update) { } else if (msg == EStateMsg::Update) {
if (x568_ == EState::Zero) { if (x568_state == EState::Zero) {
if (x450_bodyController->GetCurrentStateId() == pas::EAnimationState::Generate) { if (x450_bodyController->GetCurrentStateId() == pas::EAnimationState::Generate) {
x568_ = EState::Two; x568_state = EState::Two;
} else { } else {
x450_bodyController->GetCommandMgr().DeliverCmd(CBCGenerateCmd(pas::EGenerateType::Zero)); x450_bodyController->GetCommandMgr().DeliverCmd(CBCGenerateCmd(pas::EGenerateType::Zero));
} }
} else if (x568_ == EState::One) { } else if (x568_state == EState::One) {
if (ShouldTurn(mgr, 0.f)) { if (ShouldTurn(mgr, 0.f)) {
const auto& face = mgr.GetPlayer().GetTranslation() - GetTranslation(); const auto& face = mgr.GetPlayer().GetTranslation() - GetTranslation();
if (face.canBeNormalized()) { if (face.canBeNormalized()) {
x450_bodyController->GetCommandMgr().DeliverCmd(CBCLocomotionCmd(zeus::skZero3f, face.normalized(), 1.f)); x450_bodyController->GetCommandMgr().DeliverCmd(CBCLocomotionCmd(zeus::skZero3f, face.normalized(), 1.f));
} }
} else { } else {
x568_ = EState::Zero; x568_state = EState::Zero;
} }
} else if (x568_ == EState::Two && x450_bodyController->GetCurrentStateId() != pas::EAnimationState::Generate) { } else if (x568_state == EState::Two && x450_bodyController->GetCurrentStateId() != pas::EAnimationState::Generate) {
x568_ = EState::Over; x568_state = EState::Over;
} }
} else if (msg == EStateMsg::Deactivate) { } else if (msg == EStateMsg::Deactivate) {
SetShotAt(false, mgr); SetShotAt(false, mgr);
sub_802289b0(mgr, true); SetLaunchersActive(mgr, true);
} }
} }
void CElitePirate::Attack(CStateManager& mgr, EStateMsg msg, float) { void CElitePirate::Attack(CStateManager& mgr, EStateMsg msg, float) {
if (msg == EStateMsg::Activate) { if (msg == EStateMsg::Activate) {
x568_ = EState::Zero; x568_state = EState::Zero;
ExtendTouchBounds(mgr, x774_collisionRJointIds, zeus::CVector3f(2.f)); ExtendTouchBounds(mgr, x774_collisionRJointIds, zeus::CVector3f(2.f));
if (x64_modelData->GetNumMaterialSets() > 1) { if (x64_modelData->GetNumMaterialSets() > 1) {
x7cc_activeMaterialSet = 1; x7cc_activeMaterialSet = 1;
} }
} else if (msg == EStateMsg::Update) { } else if (msg == EStateMsg::Update) {
if (x568_ == EState::Zero) { if (x568_state == EState::Zero) {
if (x450_bodyController->GetCurrentStateId() == pas::EAnimationState::MeleeAttack) { if (x450_bodyController->GetCurrentStateId() == pas::EAnimationState::MeleeAttack) {
x568_ = EState::One; x568_state = EState::One;
x988_25_ = true; x988_25_attackingRightClaw = true;
x7c8_currAnimId = x450_bodyController->GetCurrentAnimId(); x7c8_currAnimId = x450_bodyController->GetCurrentAnimId();
} else { } else {
x450_bodyController->GetCommandMgr().DeliverCmd(CBCMeleeAttackCmd(pas::ESeverity::One)); x450_bodyController->GetCommandMgr().DeliverCmd(CBCMeleeAttackCmd(pas::ESeverity::One));
} }
} else if (x568_ == EState::One) { } else if (x568_state == EState::One) {
if (x450_bodyController->GetCurrentStateId() == pas::EAnimationState::MeleeAttack) { if (x450_bodyController->GetCurrentStateId() == pas::EAnimationState::MeleeAttack) {
if (x7c8_currAnimId == x450_bodyController->GetCurrentAnimId()) { if (x7c8_currAnimId == x450_bodyController->GetCurrentAnimId()) {
x450_bodyController->GetCommandMgr().DeliverTargetVector(mgr.GetPlayer().GetTranslation() - GetTranslation()); x450_bodyController->GetCommandMgr().DeliverTargetVector(mgr.GetPlayer().GetTranslation() - GetTranslation());
@ -543,27 +544,27 @@ void CElitePirate::Attack(CStateManager& mgr, EStateMsg msg, float) {
x450_bodyController->GetCommandMgr().DeliverCmd(CBCMeleeAttackCmd(pas::ESeverity::Two)); x450_bodyController->GetCommandMgr().DeliverCmd(CBCMeleeAttackCmd(pas::ESeverity::Two));
} }
} else { } else {
x568_ = EState::Two; x568_state = EState::Two;
x988_25_ = false; x988_25_attackingRightClaw = false;
x988_26_ = true; x988_26_attackingLeftClaw = true;
ExtendTouchBounds(mgr, x774_collisionRJointIds, zeus::skZero3f); ExtendTouchBounds(mgr, x774_collisionRJointIds, zeus::skZero3f);
ExtendTouchBounds(mgr, x788_collisionLJointIds, zeus::CVector3f(2.f)); ExtendTouchBounds(mgr, x788_collisionLJointIds, zeus::CVector3f(2.f));
} }
} else { } else {
x568_ = EState::Over; x568_state = EState::Over;
} }
} else if (x568_ == EState::Two) { } else if (x568_state == EState::Two) {
if (x450_bodyController->GetCurrentStateId() == pas::EAnimationState::MeleeAttack) { if (x450_bodyController->GetCurrentStateId() == pas::EAnimationState::MeleeAttack) {
x450_bodyController->GetCommandMgr().DeliverTargetVector(mgr.GetPlayer().GetTranslation() - GetTranslation()); x450_bodyController->GetCommandMgr().DeliverTargetVector(mgr.GetPlayer().GetTranslation() - GetTranslation());
} else { } else {
x568_ = EState::Over; x568_state = EState::Over;
} }
} }
} else if (msg == EStateMsg::Deactivate) { } else if (msg == EStateMsg::Deactivate) {
sub_802285c4(mgr); CheckAttackChance(mgr);
x988_24_damageOn = false; x988_24_damageOn = false;
x988_26_ = false; x988_26_attackingLeftClaw = false;
x988_25_ = false; x988_25_attackingRightClaw = false;
x7c8_currAnimId = -1; x7c8_currAnimId = -1;
ExtendTouchBounds(mgr, x774_collisionRJointIds, zeus::skZero3f); ExtendTouchBounds(mgr, x774_collisionRJointIds, zeus::skZero3f);
ExtendTouchBounds(mgr, x788_collisionLJointIds, zeus::skZero3f); ExtendTouchBounds(mgr, x788_collisionLJointIds, zeus::skZero3f);
@ -575,67 +576,67 @@ void CElitePirate::Taunt(CStateManager& mgr, EStateMsg msg, float dt) { CAi::Tau
void CElitePirate::ProjectileAttack(CStateManager& mgr, EStateMsg msg, float) { void CElitePirate::ProjectileAttack(CStateManager& mgr, EStateMsg msg, float) {
if (msg == EStateMsg::Activate) { if (msg == EStateMsg::Activate) {
x568_ = EState::Zero; x568_state = EState::Zero;
} else if (msg == EStateMsg::Update) { } else if (msg == EStateMsg::Update) {
const zeus::CVector3f& playerPos = mgr.GetPlayer().GetTranslation(); const zeus::CVector3f& playerPos = mgr.GetPlayer().GetTranslation();
if (x568_ == EState::Zero) { if (x568_state == EState::Zero) {
if (x450_bodyController->GetCurrentStateId() == pas::EAnimationState::ProjectileAttack) { if (x450_bodyController->GetCurrentStateId() == pas::EAnimationState::ProjectileAttack) {
x568_ = EState::Two; x568_state = EState::Two;
} else { } else {
x450_bodyController->GetCommandMgr().DeliverCmd(CBCProjectileAttackCmd(pas::ESeverity::One, playerPos, false)); x450_bodyController->GetCommandMgr().DeliverCmd(CBCProjectileAttackCmd(pas::ESeverity::One, playerPos, false));
} }
} else if (x568_ == EState::Two) { } else if (x568_state == EState::Two) {
if (x450_bodyController->GetCurrentStateId() == pas::EAnimationState::ProjectileAttack) { if (x450_bodyController->GetCurrentStateId() == pas::EAnimationState::ProjectileAttack) {
x450_bodyController->GetCommandMgr().DeliverTargetVector(playerPos - GetTranslation()); x450_bodyController->GetCommandMgr().DeliverTargetVector(playerPos - GetTranslation());
} else { } else {
x568_ = EState::Over; x568_state = EState::Over;
} }
} }
} else if (msg == EStateMsg::Deactivate) { } else if (msg == EStateMsg::Deactivate) {
sub_802285c4(mgr); CheckAttackChance(mgr);
} }
} }
void CElitePirate::SpecialAttack(CStateManager& mgr, EStateMsg msg, float) { void CElitePirate::SpecialAttack(CStateManager& mgr, EStateMsg msg, float) {
if (msg == EStateMsg::Activate) { if (msg == EStateMsg::Activate) {
x568_ = EState::Zero; x568_state = EState::Zero;
} else if (msg == EStateMsg::Update) { } else if (msg == EStateMsg::Update) {
if (x568_ == EState::Zero) { if (x568_state == EState::Zero) {
if (x450_bodyController->GetCurrentStateId() == pas::EAnimationState::ProjectileAttack) { if (x450_bodyController->GetCurrentStateId() == pas::EAnimationState::ProjectileAttack) {
x568_ = EState::Two; x568_state = EState::Two;
x988_29_ = true; x988_29_shockWaveAnim = true;
} else { } else {
x450_bodyController->GetCommandMgr().DeliverCmd( x450_bodyController->GetCommandMgr().DeliverCmd(
CBCProjectileAttackCmd(pas::ESeverity::Two, mgr.GetPlayer().GetTranslation(), false)); CBCProjectileAttackCmd(pas::ESeverity::Two, mgr.GetPlayer().GetTranslation(), false));
} }
} else if (x568_ == EState::Two) { } else if (x568_state == EState::Two) {
if (x450_bodyController->GetCurrentStateId() == pas::EAnimationState::ProjectileAttack) { if (x450_bodyController->GetCurrentStateId() == pas::EAnimationState::ProjectileAttack) {
x450_bodyController->GetCommandMgr().DeliverTargetVector(mgr.GetPlayer().GetTranslation()); x450_bodyController->GetCommandMgr().DeliverTargetVector(mgr.GetPlayer().GetTranslation());
} else { } else {
x568_ = EState::Over; x568_state = EState::Over;
} }
} }
} else if (msg == EStateMsg::Deactivate) { } else if (msg == EStateMsg::Deactivate) {
sub_802285c4(mgr); CheckAttackChance(mgr);
x988_29_ = false; x988_29_shockWaveAnim = false;
} }
} }
void CElitePirate::CallForBackup(CStateManager& mgr, EStateMsg msg, float) { void CElitePirate::CallForBackup(CStateManager& mgr, EStateMsg msg, float) {
if (msg == EStateMsg::Activate) { if (msg == EStateMsg::Activate) {
x568_ = EState::Zero; x568_state = EState::Zero;
x988_30_ = true; x988_30_calledForBackup = true;
SetShotAt(false, mgr); SetShotAt(false, mgr);
} else if (msg == EStateMsg::Update) { } else if (msg == EStateMsg::Update) {
if (x568_ == EState::Zero) { if (x568_state == EState::Zero) {
if (x450_bodyController->GetCurrentStateId() == pas::EAnimationState::Generate) { if (x450_bodyController->GetCurrentStateId() == pas::EAnimationState::Generate) {
x568_ = EState::Two; x568_state = EState::Two;
} else { } else {
x450_bodyController->GetCommandMgr().DeliverCmd(CBCGenerateCmd(pas::EGenerateType::Five, zeus::skZero3f)); x450_bodyController->GetCommandMgr().DeliverCmd(CBCGenerateCmd(pas::EGenerateType::Five, zeus::skZero3f));
} }
} else if (x568_ == EState::Two) { } else if (x568_state == EState::Two) {
if (x450_bodyController->GetCurrentStateId() != pas::EAnimationState::Generate) { if (x450_bodyController->GetCurrentStateId() != pas::EAnimationState::Generate) {
x568_ = EState::Over; x568_state = EState::Over;
} }
} }
} else if (msg == EStateMsg::Deactivate) { } else if (msg == EStateMsg::Deactivate) {
@ -646,15 +647,15 @@ void CElitePirate::CallForBackup(CStateManager& mgr, EStateMsg msg, float) {
void CElitePirate::Cover(CStateManager& mgr, EStateMsg msg, float dt) { void CElitePirate::Cover(CStateManager& mgr, EStateMsg msg, float dt) {
if (msg == EStateMsg::Activate) { if (msg == EStateMsg::Activate) {
x450_bodyController->SetLocomotionType(pas::ELocomotionType::Crouch); x450_bodyController->SetLocomotionType(pas::ELocomotionType::Crouch);
if (sub_802273a8()) { if (HasWeakPointHead()) {
if (TCastToPtr<CCollisionActor> actor = mgr.ObjectById(x770_collisionHeadId)) { if (TCastToPtr<CCollisionActor> actor = mgr.ObjectById(x770_collisionHeadId)) {
actor->SetDamageVulnerability(CDamageVulnerability::ImmuneVulnerabilty()); actor->SetDamageVulnerability(CDamageVulnerability::ImmuneVulnerabilty());
} }
} }
x5d4_collisionActorMgr1->SetActive(mgr, true); x5d4_collisionActorMgr->SetActive(mgr, true);
x6f8_boneTracking.SetTarget(mgr.GetPlayer().GetUniqueId()); x6f8_boneTracking.SetTarget(mgr.GetPlayer().GetUniqueId());
x6f8_boneTracking.SetActive(true); x6f8_boneTracking.SetActive(true);
sub_80228634(mgr); UpdateDestPos(mgr);
CPatterned::PathFind(mgr, msg, dt); CPatterned::PathFind(mgr, msg, dt);
if (TooClose(mgr, 0.f)) { if (TooClose(mgr, 0.f)) {
x450_bodyController->GetCommandMgr().ClearLocomotionCmds(); x450_bodyController->GetCommandMgr().ClearLocomotionCmds();
@ -666,7 +667,7 @@ void CElitePirate::Cover(CStateManager& mgr, EStateMsg msg, float dt) {
x988_27_shotAt = false; x988_27_shotAt = false;
} }
} }
x7a8_ = PathShagged(mgr, 0.f) ? x7a8_ + dt : 0.f; x7a8_pathShaggedTime = PathShagged(mgr, 0.f) ? x7a8_pathShaggedTime + dt : 0.f;
if (!TooClose(mgr, 0.f) && !PathShagged(mgr, 0.f)) { if (!TooClose(mgr, 0.f) && !PathShagged(mgr, 0.f)) {
CPatterned::PathFind(mgr, msg, dt); CPatterned::PathFind(mgr, msg, dt);
} else if (PathShagged(mgr, 0.f)) { } else if (PathShagged(mgr, 0.f)) {
@ -683,16 +684,16 @@ void CElitePirate::Cover(CStateManager& mgr, EStateMsg msg, float dt) {
} }
} }
AttractProjectiles(mgr); AttractProjectiles(mgr);
sub_802277e0(mgr, dt); UpdateAbsorbBodyState(mgr, dt);
} else if (msg == EStateMsg::Deactivate) { } else if (msg == EStateMsg::Deactivate) {
x450_bodyController->SetLocomotionType(pas::ELocomotionType::Relaxed); x450_bodyController->SetLocomotionType(pas::ELocomotionType::Relaxed);
x6f8_boneTracking.SetActive(false); x6f8_boneTracking.SetActive(false);
if (sub_802273a8()) { if (HasWeakPointHead()) {
if (TCastToPtr<CCollisionActor> actor = mgr.ObjectById(x770_collisionHeadId)) { if (TCastToPtr<CCollisionActor> actor = mgr.ObjectById(x770_collisionHeadId)) {
actor->SetDamageVulnerability(x56c_vulnerability); actor->SetDamageVulnerability(x56c_vulnerability);
} }
} }
x5d4_collisionActorMgr1->SetActive(mgr, false); x5d4_collisionActorMgr->SetActive(mgr, false);
} }
} }
@ -708,7 +709,7 @@ bool CElitePirate::SpotPlayer(CStateManager& mgr, float arg) {
return x988_28_alert ? true : CPatterned::SpotPlayer(mgr, arg); return x988_28_alert ? true : CPatterned::SpotPlayer(mgr, arg);
} }
bool CElitePirate::AnimOver(CStateManager& mgr, float) { return x568_ == EState::Over; } bool CElitePirate::AnimOver(CStateManager& mgr, float) { return x568_state == EState::Over; }
bool CElitePirate::ShouldAttack(CStateManager& mgr, float) { bool CElitePirate::ShouldAttack(CStateManager& mgr, float) {
if ((mgr.GetPlayer().GetTranslation() - GetTranslation()).magSquared() > x2fc_minAttackRange * x2fc_minAttackRange) { if ((mgr.GetPlayer().GetTranslation() - GetTranslation()).magSquared() > x2fc_minAttackRange * x2fc_minAttackRange) {
@ -717,7 +718,9 @@ bool CElitePirate::ShouldAttack(CStateManager& mgr, float) {
return !ShouldTurn(mgr, 0.f); return !ShouldTurn(mgr, 0.f);
} }
bool CElitePirate::InPosition(CStateManager& mgr, float) { return (x8b4_ - GetTranslation()).magSquared() < 25.f; } bool CElitePirate::InPosition(CStateManager& mgr, float) {
return (x8b4_targetDestPos - GetTranslation()).magSquared() < 25.f;
}
bool CElitePirate::ShouldTurn(CStateManager& mgr, float) { bool CElitePirate::ShouldTurn(CStateManager& mgr, float) {
return zeus::CVector2f::getAngleDiff((mgr.GetPlayer().GetTranslation() - GetTranslation()).toVec2f(), return zeus::CVector2f::getAngleDiff((mgr.GetPlayer().GetTranslation() - GetTranslation()).toVec2f(),
@ -726,11 +729,11 @@ bool CElitePirate::ShouldTurn(CStateManager& mgr, float) {
bool CElitePirate::AggressionCheck(CStateManager& mgr, float arg) { bool CElitePirate::AggressionCheck(CStateManager& mgr, float arg) {
if (x772_launcherId == kInvalidUniqueId && !PathShagged(mgr, arg)) { if (x772_launcherId == kInvalidUniqueId && !PathShagged(mgr, arg)) {
if (!x988_31_) { if (x988_31_running) {
return 4.f * x300_maxAttackRange * x300_maxAttackRange < return true;
(mgr.GetPlayer().GetTranslation() - GetTranslation()).magSquared();
} }
return true; return 4.f * x300_maxAttackRange * x300_maxAttackRange <
(mgr.GetPlayer().GetTranslation() - GetTranslation()).magSquared();
} }
return false; return false;
} }
@ -762,7 +765,7 @@ CPathFindSearch* CElitePirate::GetSearchPath() { return &x7d0_pathFindSearch; }
void CElitePirate::SetupHealthInfo(CStateManager& mgr) { void CElitePirate::SetupHealthInfo(CStateManager& mgr) {
const CHealthInfo* const health = HealthInfo(mgr); const CHealthInfo* const health = HealthInfo(mgr);
x7b4_hp = health->GetHP(); x7b4_hp = health->GetHP();
if (sub_802273a8()) { if (HasWeakPointHead()) {
if (TCastToPtr<CCollisionActor> actor = mgr.ObjectById(x770_collisionHeadId)) { if (TCastToPtr<CCollisionActor> actor = mgr.ObjectById(x770_collisionHeadId)) {
auto actHealth = actor->HealthInfo(mgr); auto actHealth = actor->HealthInfo(mgr);
actHealth->SetHP(health->GetHP()); actHealth->SetHP(health->GetHP());
@ -770,24 +773,23 @@ void CElitePirate::SetupHealthInfo(CStateManager& mgr) {
actor->SetDamageVulnerability(x56c_vulnerability); actor->SetDamageVulnerability(x56c_vulnerability);
} }
} }
UpdateHealthInfo(mgr, x772_launcherId); SetupLauncherHealthInfo(mgr, x772_launcherId);
} }
void CElitePirate::sub_802289b0(CStateManager& mgr, bool b) { sub_80228920(mgr, b, x772_launcherId); } void CElitePirate::SetLaunchersActive(CStateManager& mgr, bool val) { SetLauncherActive(mgr, val, x772_launcherId); }
void CElitePirate::sub_80229248() { void CElitePirate::SetupPathFindSearch() {
float scale = 1.5f * GetModelData()->GetScale().y(); float scale = 1.5f * GetModelData()->GetScale().y();
float fVar1 = sub_802273b0() ? 5.f : 1.f; float fVar1 = IsElitePirate() ? 5.f : 1.f;
zeus::CAABox box{{-scale, -scale, 0.f}, {scale, scale, fVar1 * scale}}; zeus::CAABox box{{-scale, -scale, 0.f}, {scale, scale, fVar1 * scale}};
SetBoundingBox(box); SetBoundingBox(box);
x738_.SetBox(box); x738_collisionAabb.SetBox(box);
x7d0_pathFindSearch.SetCharacterRadius(scale); x7d0_pathFindSearch.SetCharacterRadius(scale);
x7d0_pathFindSearch.SetCharacterHeight(3.f * scale); x7d0_pathFindSearch.SetCharacterHeight(3.f * scale);
} }
// TODO rename?
void CElitePirate::SetShotAt(bool val, CStateManager& mgr) { void CElitePirate::SetShotAt(bool val, CStateManager& mgr) {
if (!sub_802273b0() || x7b4_hp <= 0.f || !val) { if (!IsElitePirate() || x7b4_hp <= 0.f || !val) {
x988_27_shotAt = val; x988_27_shotAt = val;
} else if (HealthInfo(mgr)->GetHP() / x7b4_hp <= x7b0_) { } else if (HealthInfo(mgr)->GetHP() / x7b4_hp <= x7b0_) {
x7b0_ -= 0.2f; x7b0_ -= 0.2f;
@ -839,10 +841,10 @@ void CElitePirate::SetupCollisionManager(CStateManager& mgr) {
AddCollisionList(skLeftArmJointList.data(), skLeftArmJointList.size(), joints); AddCollisionList(skLeftArmJointList.data(), skLeftArmJointList.size(), joints);
AddCollisionList(skRightArmJointList.data(), skLeftArmJointList.size(), joints); AddCollisionList(skRightArmJointList.data(), skLeftArmJointList.size(), joints);
AddSphereCollisionList(skSphereJointList.data(), skSphereJointList.size(), joints); AddSphereCollisionList(skSphereJointList.data(), skSphereJointList.size(), joints);
if (sub_802273a8()) { if (HasWeakPointHead()) {
x730_collisionActorMgr2 = x730_collisionActorMgrHead =
std::make_unique<CCollisionActorManager>(mgr, GetUniqueId(), GetAreaIdAlways(), joints, true); std::make_unique<CCollisionActorManager>(mgr, GetUniqueId(), GetAreaIdAlways(), joints, true);
x730_collisionActorMgr2->SetActive(mgr, GetActive()); x730_collisionActorMgrHead->SetActive(mgr, GetActive());
} }
x774_collisionRJointIds.clear(); x774_collisionRJointIds.clear();
x788_collisionLJointIds.clear(); x788_collisionLJointIds.clear();
@ -851,7 +853,7 @@ void CElitePirate::SetupCollisionManager(CStateManager& mgr) {
constexpr zeus::CVector3f bounds{4.f, 4.f, 2.f}; constexpr zeus::CVector3f bounds{4.f, 4.f, 2.f};
joints.emplace_back(CJointCollisionDescription::OBBCollision(animData->GetLocatorSegId("L_Palm_LCTR"sv), bounds, joints.emplace_back(CJointCollisionDescription::OBBCollision(animData->GetLocatorSegId("L_Palm_LCTR"sv), bounds,
zeus::skZero3f, "Shield"sv, 10.f)); zeus::skZero3f, "Shield"sv, 10.f));
x5d4_collisionActorMgr1 = x5d4_collisionActorMgr =
std::make_unique<CCollisionActorManager>(mgr, GetUniqueId(), GetAreaIdAlways(), joints, false); std::make_unique<CCollisionActorManager>(mgr, GetUniqueId(), GetAreaIdAlways(), joints, false);
SetupCollisionActorInfo(mgr); SetupCollisionActorInfo(mgr);
@ -864,9 +866,9 @@ void CElitePirate::SetupCollisionManager(CStateManager& mgr) {
} }
void CElitePirate::SetupCollisionActorInfo(CStateManager& mgr) { void CElitePirate::SetupCollisionActorInfo(CStateManager& mgr) {
if (sub_802273a8()) { if (HasWeakPointHead()) {
for (size_t i = 0; i < x730_collisionActorMgr2->GetNumCollisionActors(); ++i) { for (size_t i = 0; i < x730_collisionActorMgrHead->GetNumCollisionActors(); ++i) {
const auto& colDesc = x730_collisionActorMgr2->GetCollisionDescFromIndex(i); const auto& colDesc = x730_collisionActorMgrHead->GetCollisionDescFromIndex(i);
const TUniqueId& uid = colDesc.GetCollisionActorId(); const TUniqueId& uid = colDesc.GetCollisionActorId();
if (TCastToPtr<CCollisionActor> act = mgr.ObjectById(uid)) { if (TCastToPtr<CCollisionActor> act = mgr.ObjectById(uid)) {
if (colDesc.GetName() == "Head_1"sv) { if (colDesc.GetName() == "Head_1"sv) {
@ -883,16 +885,16 @@ void CElitePirate::SetupCollisionActorInfo(CStateManager& mgr) {
} }
} }
} }
x730_collisionActorMgr2->AddMaterial( x730_collisionActorMgrHead->AddMaterial(
mgr, {EMaterialTypes::AIJoint, EMaterialTypes::CameraPassthrough, EMaterialTypes::Immovable}); mgr, {EMaterialTypes::AIJoint, EMaterialTypes::CameraPassthrough, EMaterialTypes::Immovable});
} }
const CJointCollisionDescription& description = x5d4_collisionActorMgr1->GetCollisionDescFromIndex(0); const CJointCollisionDescription& description = x5d4_collisionActorMgr->GetCollisionDescFromIndex(0);
x79c_ = description.GetCollisionActorId(); x79c_ = description.GetCollisionActorId();
if (TCastToPtr<CCollisionActor> act = mgr.ObjectById(x79c_)) { if (TCastToPtr<CCollisionActor> act = mgr.ObjectById(x79c_)) {
act->SetWeaponCollisionResponseType(EWeaponCollisionResponseTypes::None); act->SetWeaponCollisionResponseType(EWeaponCollisionResponseTypes::None);
} }
x5d4_collisionActorMgr1->AddMaterial(mgr, {EMaterialTypes::AIJoint, EMaterialTypes::CameraPassthrough}); x5d4_collisionActorMgr->AddMaterial(mgr, {EMaterialTypes::AIJoint, EMaterialTypes::CameraPassthrough});
} }
bool CElitePirate::IsArmClawCollider(std::string_view name, std::string_view locator, const SJointInfo* info, bool CElitePirate::IsArmClawCollider(std::string_view name, std::string_view locator, const SJointInfo* info,
@ -923,7 +925,7 @@ void CElitePirate::CreateGrenadeLauncher(CStateManager& mgr, TUniqueId uid) {
} }
void CElitePirate::ApplyDamageToHead(CStateManager& mgr, TUniqueId uid) { void CElitePirate::ApplyDamageToHead(CStateManager& mgr, TUniqueId uid) {
if (!sub_802273a8()) { if (!HasWeakPointHead()) {
return; return;
} }
if (TCastToPtr<CWeapon> weapon = mgr.ObjectById(uid)) { if (TCastToPtr<CWeapon> weapon = mgr.ObjectById(uid)) {
@ -946,7 +948,7 @@ void CElitePirate::CreateEnergyAbsorb(CStateManager& mgr, const zeus::CTransform
x7ac_energyAbsorbCooldown = 0.25f; x7ac_energyAbsorbCooldown = 0.25f;
} }
void CElitePirate::UpdateHealthInfo(CStateManager& mgr, TUniqueId uid) { void CElitePirate::SetupLauncherHealthInfo(CStateManager& mgr, TUniqueId uid) {
const CHealthInfo* const health = HealthInfo(mgr); const CHealthInfo* const health = HealthInfo(mgr);
if (uid != kInvalidUniqueId) { if (uid != kInvalidUniqueId) {
if (TCastToPtr<CCollisionActor> actor = mgr.ObjectById(uid)) { if (TCastToPtr<CCollisionActor> actor = mgr.ObjectById(uid)) {
@ -958,35 +960,35 @@ void CElitePirate::UpdateHealthInfo(CStateManager& mgr, TUniqueId uid) {
} }
} }
void CElitePirate::sub_80228920(CStateManager& mgr, bool b, TUniqueId uid) { void CElitePirate::SetLauncherActive(CStateManager& mgr, bool val, TUniqueId uid) {
if (uid == kInvalidUniqueId) { if (uid == kInvalidUniqueId) {
return; return;
} }
if (auto entity = mgr.ObjectById(uid)) { if (auto entity = mgr.ObjectById(uid)) {
mgr.SendScriptMsg(entity, GetUniqueId(), b ? EScriptObjectMessage::Start : EScriptObjectMessage::Stop); mgr.SendScriptMsg(entity, GetUniqueId(), val ? EScriptObjectMessage::Start : EScriptObjectMessage::Stop);
} }
} }
zeus::CVector3f CElitePirate::sub_80228864(const CActor* actor) const { zeus::CVector3f CElitePirate::GetLockOnPosition(const CActor* actor) const {
const zeus::CTransform& targetTransform = actor->GetLocatorTransform("lockon_target_LCTR"); const zeus::CTransform& targetTransform = actor->GetLocatorTransform("lockon_target_LCTR"sv);
return actor->GetTranslation() + actor->GetTransform().rotate(targetTransform.origin); return actor->GetTranslation() + actor->GetTransform().rotate(targetTransform.origin);
} }
bool CElitePirate::sub_80227430(const CDamageInfo& info) const { bool CElitePirate::CanKnockBack(const CDamageInfo& info) const {
return !x400_25_alive || info.GetWeaponMode().IsComboed() || info.GetWeaponMode().GetType() != EWeaponType::Plasma; return !x400_25_alive || info.GetWeaponMode().IsComboed() || info.GetWeaponMode().GetType() != EWeaponType::Plasma;
} }
void CElitePirate::sub_80228634(CStateManager& mgr) { void CElitePirate::UpdateDestPos(CStateManager& mgr) {
x8b4_ = GetTranslation(); x8b4_targetDestPos = GetTranslation();
const zeus::CVector3f& playerPos = mgr.GetPlayer().GetTranslation(); const zeus::CVector3f& playerPos = mgr.GetPlayer().GetTranslation();
const zeus::CVector3f& dist = GetTranslation() - playerPos; const zeus::CVector3f& dist = GetTranslation() - playerPos;
if (dist.canBeNormalized() && dist.magSquared() > x2fc_minAttackRange * x2fc_minAttackRange) { if (dist.canBeNormalized() && dist.magSquared() > x2fc_minAttackRange * x2fc_minAttackRange) {
x2e0_destPos = playerPos + (x2fc_minAttackRange * dist.normalized()); x2e0_destPos = playerPos + (x2fc_minAttackRange * dist.normalized());
x8b4_ = x2e0_destPos; x8b4_targetDestPos = x2e0_destPos;
} }
} }
void CElitePirate::sub_802285c4(CStateManager& mgr) { void CElitePirate::CheckAttackChance(CStateManager& mgr) {
if (mgr.GetActiveRandom()->Float() > x5d8_data.GetAttackChance()) { if (mgr.GetActiveRandom()->Float() > x5d8_data.GetAttackChance()) {
x7b8_attackTimer = x308_attackTimeVariation * mgr.GetActiveRandom()->Float() + x304_averageAttackTime; x7b8_attackTimer = x308_attackTimeVariation * mgr.GetActiveRandom()->Float() + x304_averageAttackTime;
} }
@ -1051,12 +1053,12 @@ void CElitePirate::AttractProjectiles(CStateManager& mgr) {
} }
} }
void CElitePirate::sub_802277e0(CStateManager& mgr, float dt) { void CElitePirate::UpdateAbsorbBodyState(CStateManager& mgr, float dt) {
if (!x988_27_shotAt || x450_bodyController->IsFrozen()) { if (!x988_27_shotAt || x450_bodyController->IsFrozen()) {
return; return;
} }
x7c4_ += dt; x7c4_absorbUpdateTimer += dt;
if (x7c4_ < 3.f) { if (x7c4_absorbUpdateTimer < 3.f) {
return; return;
} }
if (x450_bodyController->GetCurrentStateId() != pas::EAnimationState::Turn && if (x450_bodyController->GetCurrentStateId() != pas::EAnimationState::Turn &&
@ -1065,7 +1067,7 @@ void CElitePirate::sub_802277e0(CStateManager& mgr, float dt) {
CBCAdditiveReactionCmd(pas::EAdditiveReactionType::Six, 1.f, false)); CBCAdditiveReactionCmd(pas::EAdditiveReactionType::Six, 1.f, false));
} else { } else {
bool b = false; bool b = false;
if (sub_802273a8()) { if (HasWeakPointHead()) {
if (TCastToConstPtr<CCollisionActor> actor = mgr.GetObjectById(x770_collisionHeadId)) { if (TCastToConstPtr<CCollisionActor> actor = mgr.GetObjectById(x770_collisionHeadId)) {
float z = actor->GetTranslation().z(); float z = actor->GetTranslation().z();
b = z - 0.5f * (z - GetTranslation().z()) <= mgr.GetPlayer().GetTranslation().z(); b = z - 0.5f * (z - GetTranslation().z()) <= mgr.GetPlayer().GetTranslation().z();
@ -1075,7 +1077,7 @@ void CElitePirate::sub_802277e0(CStateManager& mgr, float dt) {
x450_bodyController->GetCommandMgr().DeliverCmd( x450_bodyController->GetCommandMgr().DeliverCmd(
CBCAdditiveReactionCmd(b ? pas::EAdditiveReactionType::Seven : pas::EAdditiveReactionType::Five, 1.f, false)); CBCAdditiveReactionCmd(b ? pas::EAdditiveReactionType::Seven : pas::EAdditiveReactionType::Five, 1.f, false));
} }
x7c4_ = 0.f; x7c4_absorbUpdateTimer = 0.f;
} }
bool CElitePirate::IsAttractingEnergy() { bool CElitePirate::IsAttractingEnergy() {
@ -1095,7 +1097,7 @@ void CElitePirate::UpdateTimers(float dt) {
} }
} }
void CElitePirate::sub_80228798() { void CElitePirate::UpdatePositionHistory() {
const zeus::CVector3f& pos = GetTranslation(); const zeus::CVector3f& pos = GetTranslation();
if (x7d0_pathFindSearch.OnPath(pos) == CPathFindSearch::EResult::Success) { if (x7d0_pathFindSearch.OnPath(pos) == CPathFindSearch::EResult::Success) {
x8c0_.Clear(); x8c0_.Clear();
@ -1115,9 +1117,9 @@ void CElitePirate::UpdateActorTransform(CStateManager& mgr, TUniqueId& uid, std:
actor->SetTransform(GetLctrTransform(name)); actor->SetTransform(GetLctrTransform(name));
} }
void CElitePirate::sub_80228e84(CStateManager& mgr) { void CElitePirate::UpdateHealthInfo(CStateManager& mgr) {
float hp = HealthInfo(mgr)->GetHP(); float hp = HealthInfo(mgr)->GetHP();
if (sub_802273a8()) { if (HasWeakPointHead()) {
if (TCastToPtr<CCollisionActor> actor = mgr.ObjectById(x770_collisionHeadId)) { if (TCastToPtr<CCollisionActor> actor = mgr.ObjectById(x770_collisionHeadId)) {
float headHp = actor->HealthInfo(mgr)->GetHP(); float headHp = actor->HealthInfo(mgr)->GetHP();
HealthInfo(mgr)->SetHP(hp - (hp - headHp)); HealthInfo(mgr)->SetHP(hp - (hp - headHp));
@ -1151,7 +1153,7 @@ bool CElitePirate::ShouldFireFromLauncher(CStateManager& mgr, TUniqueId launcher
if (x300_maxAttackRange * x300_maxAttackRange > (aim - GetTranslation()).magSquared() || ShouldTurn(mgr, 0.f)) { if (x300_maxAttackRange * x300_maxAttackRange > (aim - GetTranslation()).magSquared() || ShouldTurn(mgr, 0.f)) {
return false; return false;
} }
const zeus::CVector3f& origin = sub_80228864(launcher); const zeus::CVector3f& origin = GetLockOnPosition(launcher);
if (IsPatternObstructed(mgr, origin, aim)) { if (IsPatternObstructed(mgr, origin, aim)) {
return false; return false;
} }
@ -1165,10 +1167,10 @@ bool CElitePirate::ShouldFireFromLauncher(CStateManager& mgr, TUniqueId launcher
} }
bool CElitePirate::ShouldCallForBackupFromLauncher(const CStateManager& mgr, TUniqueId uid) const { bool CElitePirate::ShouldCallForBackupFromLauncher(const CStateManager& mgr, TUniqueId uid) const {
if (!x988_30_ && uid == kInvalidUniqueId && x5d8_data.GetX11E()) { if (x988_30_calledForBackup || uid != kInvalidUniqueId || !x5d8_data.GetX11E()) {
return x7a8_ >= 3.f; return false;
} }
return false; return x7a8_pathShaggedTime >= 3.f;
} }
bool CElitePirate::IsClosestEnergyAttractor(const CStateManager& mgr, bool CElitePirate::IsClosestEnergyAttractor(const CStateManager& mgr,

54
Runtime/MP1/World/CElitePirate.hpp
View File

@ -98,14 +98,14 @@ private:
Over = 3, Over = 3,
}; };
EState x568_ = EState::Invalid; EState x568_state = EState::Invalid;
CDamageVulnerability x56c_vulnerability; CDamageVulnerability x56c_vulnerability;
std::unique_ptr<CCollisionActorManager> x5d4_collisionActorMgr1; std::unique_ptr<CCollisionActorManager> x5d4_collisionActorMgr;
CElitePirateData x5d8_data; CElitePirateData x5d8_data;
CBoneTracking x6f8_boneTracking; CBoneTracking x6f8_boneTracking;
std::unique_ptr<CCollisionActorManager> x730_collisionActorMgr2; std::unique_ptr<CCollisionActorManager> x730_collisionActorMgrHead;
// s32 x734_; // s32 x734_;
CCollidableAABox x738_; CCollidableAABox x738_collisionAabb;
std::optional<TLockedToken<CGenDescription>> x760_energyAbsorbDesc; std::optional<TLockedToken<CGenDescription>> x760_energyAbsorbDesc;
TUniqueId x770_collisionHeadId = kInvalidUniqueId; TUniqueId x770_collisionHeadId = kInvalidUniqueId;
TUniqueId x772_launcherId = kInvalidUniqueId; TUniqueId x772_launcherId = kInvalidUniqueId;
@ -113,29 +113,29 @@ private:
rstl::reserved_vector<TUniqueId, 7> x788_collisionLJointIds; rstl::reserved_vector<TUniqueId, 7> x788_collisionLJointIds;
TUniqueId x79c_ = kInvalidUniqueId; TUniqueId x79c_ = kInvalidUniqueId;
float x7a0_initialSpeed; float x7a0_initialSpeed;
float x7a4_ = 1.f; float x7a4_steeringSpeed = 1.f;
float x7a8_ = 0.f; float x7a8_pathShaggedTime = 0.f;
float x7ac_energyAbsorbCooldown = 0.f; float x7ac_energyAbsorbCooldown = 0.f;
float x7b0_ = 1.f; float x7b0_ = 1.f;
float x7b4_hp = 0.f; float x7b4_hp = 0.f;
float x7b8_attackTimer = 0.f; float x7b8_attackTimer = 0.f;
float x7bc_tauntTimer = 0.f; float x7bc_tauntTimer = 0.f;
float x7c0_shotAtTimer = 0.f; float x7c0_shotAtTimer = 0.f;
float x7c4_ = 0.f; float x7c4_absorbUpdateTimer = 0.f;
s32 x7c8_currAnimId = -1; s32 x7c8_currAnimId = -1;
u32 x7cc_activeMaterialSet = 0; u32 x7cc_activeMaterialSet = 0;
CPathFindSearch x7d0_pathFindSearch; CPathFindSearch x7d0_pathFindSearch;
zeus::CVector3f x8b4_; zeus::CVector3f x8b4_targetDestPos;
SUnknownStruct x8c0_; SUnknownStruct x8c0_;
bool x988_24_damageOn : 1; bool x988_24_damageOn : 1;
bool x988_25_ : 1; bool x988_25_attackingRightClaw : 1;
bool x988_26_ : 1; bool x988_26_attackingLeftClaw : 1;
bool x988_27_shotAt : 1; bool x988_27_shotAt : 1;
bool x988_28_alert : 1; bool x988_28_alert : 1;
bool x988_29_ : 1; bool x988_29_shockWaveAnim : 1;
bool x988_30_ : 1; bool x988_30_calledForBackup : 1;
bool x988_31_ : 1; bool x988_31_running : 1;
bool x989_24_ : 1; bool x989_24_onPath : 1;
public: public:
DEFINE_PATTERNED(ElitePirate) DEFINE_PATTERNED(ElitePirate)
@ -184,16 +184,16 @@ public:
bool ShouldSpecialAttack(CStateManager& mgr, float arg) override; bool ShouldSpecialAttack(CStateManager& mgr, float arg) override;
bool ShouldCallForBackup(CStateManager& mgr, float arg) override; bool ShouldCallForBackup(CStateManager& mgr, float arg) override;
CPathFindSearch* GetSearchPath() override; CPathFindSearch* GetSearchPath() override;
virtual bool sub_802273a8() const { return true; } virtual bool HasWeakPointHead() const { return true; }
virtual bool sub_802273b0() const { return true; } virtual bool IsElitePirate() const { return true; }
virtual void SetupHealthInfo(CStateManager& mgr); virtual void SetupHealthInfo(CStateManager& mgr);
virtual void sub_802289b0(CStateManager& mgr, bool b); virtual void SetLaunchersActive(CStateManager& mgr, bool val);
virtual SShockWaveData GetShockWaveData() const { virtual SShockWaveData GetShockWaveData() const {
return {x5d8_data.GetXF8(), x5d8_data.GetXFC(), x5d8_data.GetX118(), x5d8_data.GetX11C()}; return {x5d8_data.GetXF8(), x5d8_data.GetXFC(), x5d8_data.GetX118(), x5d8_data.GetX11C()};
} }
private: private:
void sub_80229248(); void SetupPathFindSearch();
void SetShotAt(bool val, CStateManager& mgr); void SetShotAt(bool val, CStateManager& mgr);
bool IsArmClawCollider(TUniqueId uid, const rstl::reserved_vector<TUniqueId, 7>& vec) const; bool IsArmClawCollider(TUniqueId uid, const rstl::reserved_vector<TUniqueId, 7>& vec) const;
void AddSphereCollisionList(const SSphereJointInfo* joints, size_t count, void AddSphereCollisionList(const SSphereJointInfo* joints, size_t count,
@ -206,19 +206,19 @@ private:
void CreateGrenadeLauncher(CStateManager& mgr, TUniqueId uid); void CreateGrenadeLauncher(CStateManager& mgr, TUniqueId uid);
void ApplyDamageToHead(CStateManager& mgr, TUniqueId uid); void ApplyDamageToHead(CStateManager& mgr, TUniqueId uid);
void CreateEnergyAbsorb(CStateManager& mgr, const zeus::CTransform& xf); void CreateEnergyAbsorb(CStateManager& mgr, const zeus::CTransform& xf);
void UpdateHealthInfo(CStateManager& mgr, TUniqueId uid); void SetupLauncherHealthInfo(CStateManager& mgr, TUniqueId uid);
void sub_80228920(CStateManager& mgr, bool b, TUniqueId uid); void SetLauncherActive(CStateManager& mgr, bool val, TUniqueId uid);
zeus::CVector3f sub_80228864(const CActor* actor) const; zeus::CVector3f GetLockOnPosition(const CActor* actor) const;
bool sub_80227430(const CDamageInfo& info) const; bool CanKnockBack(const CDamageInfo& info) const;
void sub_80228634(CStateManager& mgr); void UpdateDestPos(CStateManager& mgr);
void sub_802285c4(CStateManager& mgr); void CheckAttackChance(CStateManager& mgr);
void AttractProjectiles(CStateManager& mgr); void AttractProjectiles(CStateManager& mgr);
void sub_802277e0(CStateManager& mgr, float dt); void UpdateAbsorbBodyState(CStateManager& mgr, float dt);
bool IsAttractingEnergy(); bool IsAttractingEnergy();
void UpdateTimers(float dt); void UpdateTimers(float dt);
void sub_80228798(); void UpdatePositionHistory();
void UpdateActorTransform(CStateManager& mgr, TUniqueId& uid, std::string_view name); void UpdateActorTransform(CStateManager& mgr, TUniqueId& uid, std::string_view name);
void sub_80228e84(CStateManager& mgr); void UpdateHealthInfo(CStateManager& mgr);
void ExtendTouchBounds(const CStateManager& mgr, const rstl::reserved_vector<TUniqueId, 7>& uids, void ExtendTouchBounds(const CStateManager& mgr, const rstl::reserved_vector<TUniqueId, 7>& uids,
const zeus::CVector3f& vec) const; const zeus::CVector3f& vec) const;
bool ShouldFireFromLauncher(CStateManager& mgr, TUniqueId launcherId); bool ShouldFireFromLauncher(CStateManager& mgr, TUniqueId launcherId);

14
Runtime/MP1/World/CShockWave.cpp
View File

@ -14,7 +14,7 @@
namespace urde::MP1 { namespace urde::MP1 {
CShockWave::CShockWave(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf, CShockWave::CShockWave(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf,
TUniqueId parent, const SShockWaveData& data, float f1, float f2) TUniqueId parent, const SShockWaveData& data, float minActiveTime, float knockback)
: CActor(uid, true, name, info, xf, CModelData::CModelDataNull(), {EMaterialTypes::Projectile}, : CActor(uid, true, name, info, xf, CModelData::CModelDataNull(), {EMaterialTypes::Projectile},
CActorParameters::None(), kInvalidUniqueId) CActorParameters::None(), kInvalidUniqueId)
, xe8_id1(parent) , xe8_id1(parent)
@ -24,8 +24,8 @@ CShockWave::CShockWave(TUniqueId uid, std::string_view name, const CEntityInfo&
, x114_data(data) , x114_data(data)
, x150_(data.GetX24()) , x150_(data.GetX24())
, x154_(data.GetX2C()) , x154_(data.GetX2C())
, x15c_(f1) , x15c_minActiveTime(minActiveTime)
, x160_(f2) { , x160_knockback(knockback) {
if (data.GetWeaponDescId().IsValid()) { if (data.GetWeaponDescId().IsValid()) {
x974_electricDesc = g_SimplePool->GetObj({SBIG('ELSC'), data.GetWeaponDescId()}); x974_electricDesc = g_SimplePool->GetObj({SBIG('ELSC'), data.GetWeaponDescId()});
} }
@ -73,7 +73,7 @@ void CShockWave::Render(const CStateManager& mgr) const {
void CShockWave::Think(float dt, CStateManager& mgr) { void CShockWave::Think(float dt, CStateManager& mgr) {
if (GetActive()) { if (GetActive()) {
x110_elementGen->Update(dt); x110_elementGen->Update(dt);
x158_ += dt; x158_activeTime += dt;
x150_ += x154_ * dt; x150_ += x154_ * dt;
x154_ += dt * x114_data.GetX30(); x154_ += dt * x114_data.GetX30();
x110_elementGen->SetExternalVar(0, x150_); x110_elementGen->SetExternalVar(0, x150_);
@ -92,7 +92,7 @@ void CShockWave::Think(float dt, CStateManager& mgr) {
x16d_hitPlayer = false; x16d_hitPlayer = false;
} }
} }
if (x110_elementGen->IsSystemDeletable() && x15c_ > 0.f && x158_ >= x15c_) { if (x110_elementGen->IsSystemDeletable() && x15c_minActiveTime > 0.f && x158_activeTime >= x15c_minActiveTime) {
mgr.FreeScriptObject(GetUniqueId()); mgr.FreeScriptObject(GetUniqueId());
} else if (x980_id2 != kInvalidUniqueId) { } else if (x980_id2 != kInvalidUniqueId) {
if (TCastToPtr<CGameLight> light = mgr.ObjectById(x980_id2)) { if (TCastToPtr<CGameLight> light = mgr.ObjectById(x980_id2)) {
@ -104,7 +104,7 @@ void CShockWave::Think(float dt, CStateManager& mgr) {
} }
void CShockWave::Touch(CActor& actor, CStateManager& mgr) { void CShockWave::Touch(CActor& actor, CStateManager& mgr) {
if (x158_ >= x15c_) { if (x158_activeTime >= x15c_minActiveTime) {
return; return;
} }
@ -120,7 +120,7 @@ void CShockWave::Touch(CActor& actor, CStateManager& mgr) {
float mmin = mmax * x114_data.GetX28() * x114_data.GetX28(); float mmin = mmax * x114_data.GetX28() * x114_data.GetX28();
zeus::CVector3f dist = actor.GetTranslation() - GetTranslation(); zeus::CVector3f dist = actor.GetTranslation() - GetTranslation();
CDamageInfo damageInfo = xec_damageInfo; CDamageInfo damageInfo = xec_damageInfo;
float knockBackScale = std::max(0.f, 1.f - x160_ * x158_); float knockBackScale = std::max(0.f, 1.f - x160_knockback * x158_activeTime);
bool isPlayer = mgr.GetPlayer().GetUniqueId() == actor.GetUniqueId(); bool isPlayer = mgr.GetPlayer().GetUniqueId() == actor.GetUniqueId();
bool isPlayerInAir = isPlayer && mgr.GetPlayer().GetPlayerMovementState() != CPlayer::EPlayerMovementState::OnGround; bool isPlayerInAir = isPlayer && mgr.GetPlayer().GetPlayerMovementState() != CPlayer::EPlayerMovementState::OnGround;
float distXYMag = dist.toVec2f().magSquared(); float distXYMag = dist.toVec2f().magSquared();

8
Runtime/MP1/World/CShockWave.hpp
View File

@ -40,9 +40,9 @@ private:
SShockWaveData x114_data; SShockWaveData x114_data;
float x150_; float x150_;
float x154_; float x154_;
float x158_ = 0.f; float x158_activeTime = 0.f;
float x15c_; float x15c_minActiveTime;
float x160_; float x160_knockback;
float x164_timeSinceHitPlayerInAir = 0.f; float x164_timeSinceHitPlayerInAir = 0.f;
float x168_timeSinceHitPlayer = 0.f; float x168_timeSinceHitPlayer = 0.f;
bool x16c_hitPlayerInAir = false; bool x16c_hitPlayerInAir = false;
@ -53,7 +53,7 @@ private:
public: public:
CShockWave(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf, CShockWave(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf,
TUniqueId parent, const SShockWaveData& data, float f1, float f2); TUniqueId parent, const SShockWaveData& data, float minActiveTime, float knockback);
void Accept(IVisitor& visitor) override; void Accept(IVisitor& visitor) override;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override; void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override;