mirror of https://github.com/AxioDL/metaforce.git
CMetroid: Implement SuckEnergyFromTarget
This commit is contained in:
parent
6ad1aa79ab
commit
3cafee2abd
|
@ -1,6 +1,7 @@
|
||||||
#include "Runtime/MP1/World/CMetroid.hpp"
|
#include "Runtime/MP1/World/CMetroid.hpp"
|
||||||
|
|
||||||
#include "Runtime/CStateManager.hpp"
|
#include "Runtime/CStateManager.hpp"
|
||||||
|
#include "Runtime/Camera/CFirstPersonCamera.hpp"
|
||||||
#include "Runtime/Character/CPASAnimParmData.hpp"
|
#include "Runtime/Character/CPASAnimParmData.hpp"
|
||||||
#include "Runtime/Collision/CGameCollision.hpp"
|
#include "Runtime/Collision/CGameCollision.hpp"
|
||||||
#include "Runtime/Weapon/CGameProjectile.hpp"
|
#include "Runtime/Weapon/CGameProjectile.hpp"
|
||||||
|
@ -47,12 +48,18 @@ constexpr CDamageVulnerability skNormalDamageVulnerability{
|
||||||
};
|
};
|
||||||
|
|
||||||
constexpr auto skPirateSuckJoint = "Head_1"sv;
|
constexpr auto skPirateSuckJoint = "Head_1"sv;
|
||||||
|
|
||||||
|
constexpr std::array skJointNameList = {
|
||||||
|
"Head_1"sv, "L_ankle"sv, "L_elbow"sv, "L_hip"sv, "L_knee"sv, "L_shoulder"sv,
|
||||||
|
"L_varias2_SDK"sv, "L_wrist"sv, "Pelvis"sv, "R_ankle"sv, "R_elbow"sv, "R_hip"sv,
|
||||||
|
"R_knee"sv, "R_shoulder"sv, "R_varias2_SDK"sv, "Spine_1"sv, "Spine_2"sv,
|
||||||
|
};
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|
||||||
CMetroidData::CMetroidData(CInputStream& in)
|
CMetroidData::CMetroidData(CInputStream& in)
|
||||||
: x0_frozenVulnerability(in)
|
: x0_frozenVulnerability(in)
|
||||||
, x68_energyDrainVulnerability(in)
|
, x68_energyDrainVulnerability(in)
|
||||||
, xd0_(in.readFloatBig())
|
, xd0_energyDrainPerSec(in.readFloatBig())
|
||||||
, xd4_maxEnergyDrainAllowed(in.readFloatBig())
|
, xd4_maxEnergyDrainAllowed(in.readFloatBig())
|
||||||
, xd8_telegraphAttackTime(in.readFloatBig())
|
, xd8_telegraphAttackTime(in.readFloatBig())
|
||||||
, xdc_stage2GrowthScale(in.readFloatBig())
|
, xdc_stage2GrowthScale(in.readFloatBig())
|
||||||
|
@ -162,7 +169,7 @@ EWeaponCollisionResponseTypes CMetroid::GetCollisionResponseType(const zeus::CVe
|
||||||
|
|
||||||
const CDamageVulnerability* CMetroid::GetDamageVulnerability() const {
|
const CDamageVulnerability* CMetroid::GetDamageVulnerability() const {
|
||||||
if (IsSuckingEnergy()) {
|
if (IsSuckingEnergy()) {
|
||||||
if (x9c0_24_) {
|
if (x9c0_24_isPlayerMorphed) {
|
||||||
return &x56c_data.GetEnergyDrainVulnerability();
|
return &x56c_data.GetEnergyDrainVulnerability();
|
||||||
}
|
}
|
||||||
return &skNormalDamageVulnerability;
|
return &skNormalDamageVulnerability;
|
||||||
|
@ -338,7 +345,74 @@ bool CMetroid::IsAttackInProgress(CStateManager& mgr) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void CMetroid::SuckEnergyFromTarget(CStateManager& mgr, float dt) {
|
void CMetroid::SuckEnergyFromTarget(CStateManager& mgr, float dt) {
|
||||||
// TODO
|
x9c0_24_isPlayerMorphed = false;
|
||||||
|
if (x7b0_attackTarget == kInvalidUniqueId) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (x7c8_ == EUnknown::One) {
|
||||||
|
InterpolateToPosRot(mgr, 0.4f);
|
||||||
|
CPlayer& player = mgr.GetPlayer();
|
||||||
|
if (x7b0_attackTarget == player.GetUniqueId()) {
|
||||||
|
x402_28_isMakingBigStrike = true;
|
||||||
|
x504_damageDur = 0.2f;
|
||||||
|
mgr.SendScriptMsg(&player, GetUniqueId(), EScriptObjectMessage::Damage);
|
||||||
|
}
|
||||||
|
x7c0_ = 0.f;
|
||||||
|
} else if (x7c8_ == EUnknown::Two) {
|
||||||
|
CPlayer& player = mgr.GetPlayer();
|
||||||
|
if (TCastToPtr<CActor> actor = mgr.ObjectById(x7b0_attackTarget)) {
|
||||||
|
CHealthInfo* healthInfo = actor->HealthInfo(mgr);
|
||||||
|
if (healthInfo != nullptr) {
|
||||||
|
const float damage = dt * x56c_data.GetEnergyDrainPerSec() * GetDamageMultiplier();
|
||||||
|
x7bc_ += damage;
|
||||||
|
if (x7b0_attackTarget == player.GetUniqueId()) {
|
||||||
|
player.SetNoDamageLoopSfx(true);
|
||||||
|
constexpr auto filter = CMaterialFilter::MakeInclude({EMaterialTypes::Solid});
|
||||||
|
constexpr CWeaponMode mode{EWeaponType::PoisonWater};
|
||||||
|
CDamageInfo info{mode, damage, 0.f, 0.f};
|
||||||
|
info.SetNoImmunity(true);
|
||||||
|
mgr.ApplyDamage(GetUniqueId(), x7b0_attackTarget, GetUniqueId(), info, filter, zeus::skZero3f);
|
||||||
|
player.SetNoDamageLoopSfx(false);
|
||||||
|
x9c0_24_isPlayerMorphed = player.GetMorphballTransitionState() == CPlayer::EPlayerMorphBallState::Morphed;
|
||||||
|
} else {
|
||||||
|
x9c0_24_isPlayerMorphed = true;
|
||||||
|
constexpr auto filter = CMaterialFilter::MakeInclude({EMaterialTypes::Solid});
|
||||||
|
constexpr CWeaponMode mode{EWeaponType::Power};
|
||||||
|
CDamageInfo info{mode, damage, 0.f, 0.f};
|
||||||
|
info.SetNoImmunity(true);
|
||||||
|
mgr.ApplyDamage(GetUniqueId(), x7b0_attackTarget, GetUniqueId(), info, filter, zeus::skZero3f);
|
||||||
|
}
|
||||||
|
if (GetGrowthStage() <= 2.f) {
|
||||||
|
TakeDamage(zeus::skZero3f, 0.f);
|
||||||
|
} else {
|
||||||
|
ApplyGrowth(damage);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
float arg = 0.95f;
|
||||||
|
if (x7b0_attackTarget == player.GetUniqueId()) {
|
||||||
|
auto morphBallState = player.GetMorphballTransitionState();
|
||||||
|
if (morphBallState != CPlayer::EPlayerMorphBallState::Unmorphed &&
|
||||||
|
morphBallState != CPlayer::EPlayerMorphBallState::Morphed) {
|
||||||
|
arg = 0.4f;
|
||||||
|
}
|
||||||
|
if (morphBallState == CPlayer::EPlayerMorphBallState::Unmorphed) {
|
||||||
|
const float magnitude = std::clamp(std::abs(std::sin(zeus::degToRad(90.f) * x7c0_)), 0.f, 1.f);
|
||||||
|
mgr.GetPlayerState()->GetStaticInterference().AddSource(GetUniqueId(), magnitude, 0.2f);
|
||||||
|
if (player.GetStaticTimer() < 0.2f) {
|
||||||
|
player.SetHudDisable(0.2f, 0.5f, 2.5f);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
x402_28_isMakingBigStrike = true;
|
||||||
|
x504_damageDur = 0.2f;
|
||||||
|
}
|
||||||
|
InterpolateToPosRot(mgr, arg);
|
||||||
|
x7c0_ += dt;
|
||||||
|
} else if (x7c8_ == EUnknown::Three) {
|
||||||
|
const zeus::CQuaternion zRot = zeus::CQuaternion::fromAxisAngle({0.0f, 0.0f, 1.0f}, GetYaw());
|
||||||
|
const zeus::CQuaternion rot = zeus::CQuaternion::slerpShort(GetTransform().basis, zRot, 0.95f);
|
||||||
|
SetRotation(rot.normalized());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void CMetroid::RestoreSolidCollision(CStateManager& mgr) {
|
void CMetroid::RestoreSolidCollision(CStateManager& mgr) {
|
||||||
|
@ -951,7 +1025,6 @@ bool CMetroid::InAttackPosition(CStateManager& mgr, float arg) {
|
||||||
if (attackDir.canBeNormalized()) {
|
if (attackDir.canBeNormalized()) {
|
||||||
constexpr auto filter = CMaterialFilter::MakeInclude({EMaterialTypes::Solid, EMaterialTypes::AIBlock});
|
constexpr auto filter = CMaterialFilter::MakeInclude({EMaterialTypes::Solid, EMaterialTypes::AIBlock});
|
||||||
float mag = attackDir.magnitude();
|
float mag = attackDir.magnitude();
|
||||||
// TODO double check boolean
|
|
||||||
return mgr.RayStaticIntersection(pos, (1.f / mag) * attackDir, mag, filter).IsInvalid();
|
return mgr.RayStaticIntersection(pos, (1.f / mag) * attackDir, mag, filter).IsInvalid();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1015,4 +1088,99 @@ void CMetroid::TelegraphAttack(CStateManager& mgr, EStateMsg msg, float dt) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void CMetroid::InterpolateToPosRot(CStateManager& mgr, float dt) {
|
||||||
|
zeus::CVector3f pos;
|
||||||
|
zeus::CQuaternion rot;
|
||||||
|
ComputeSuckTargetPosRot(mgr, pos, rot);
|
||||||
|
const float oneMinusDt = 1.f - dt;
|
||||||
|
const auto posInterp = GetTranslation() * oneMinusDt + pos * dt;
|
||||||
|
const auto quatInterp = zeus::CQuaternion::slerpShort(GetTransform().basis, rot, dt);
|
||||||
|
SetTransform(quatInterp.toTransform(posInterp));
|
||||||
|
}
|
||||||
|
|
||||||
|
void CMetroid::ComputeSuckTargetPosRot(CStateManager& mgr, zeus::CVector3f& outPos, zeus::CQuaternion& outRot) {
|
||||||
|
const auto xf = GetTransform();
|
||||||
|
outPos = xf.origin;
|
||||||
|
outRot = xf.basis;
|
||||||
|
if (x7b0_attackTarget == mgr.GetPlayer().GetUniqueId()) {
|
||||||
|
ComputeSuckPlayerPosRot(mgr, outPos, outRot);
|
||||||
|
} else {
|
||||||
|
ComputeSuckPiratePosRot(mgr, outPos, outRot);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void CMetroid::ComputeSuckPlayerPosRot(CStateManager& mgr, zeus::CVector3f& outPos, zeus::CQuaternion& outRot) {
|
||||||
|
CPlayer& player = mgr.GetPlayer();
|
||||||
|
const zeus::CTransform playerXf = player.GetTransform();
|
||||||
|
outPos = playerXf.origin;
|
||||||
|
const auto& scale = GetModelData()->GetScale();
|
||||||
|
const auto morphBallState = player.GetMorphballTransitionState();
|
||||||
|
if (morphBallState == CPlayer::EPlayerMorphBallState::Morphing) {
|
||||||
|
outPos += zeus::CVector3f{0.f, 0.f, 0.4f + ComputeMorphingPlayerSuckZPos(player)};
|
||||||
|
outPos += 0.5f * playerXf.frontVector() - player.GetMorphBall()->GetBallRadius() * GetTransform().upVector();
|
||||||
|
const auto xRot = zeus::CQuaternion::fromAxisAngle(zeus::skRight, zeus::degToRad(-90.f));
|
||||||
|
const auto yRot = zeus::CQuaternion::fromAxisAngle(zeus::skForward, 0.f);
|
||||||
|
const auto zRot = zeus::CQuaternion::fromAxisAngle(zeus::skUp, M_PIF);
|
||||||
|
outRot = zeus::CQuaternion{playerXf.basis} * (zRot * xRot * yRot);
|
||||||
|
} else if (morphBallState == CPlayer::EPlayerMorphBallState::Unmorphed) {
|
||||||
|
const zeus::CQuaternion camRot = mgr.GetCameraManager()->GetFirstPersonCamera()->GetTransform().basis;
|
||||||
|
outRot = camRot * zeus::CQuaternion::fromAxisAngle(zeus::skUp, M_PIF);
|
||||||
|
const zeus::CMatrix3f camMtx = camRot.toTransform().basis;
|
||||||
|
const zeus::CVector3f forward = camMtx * zeus::skForward;
|
||||||
|
const zeus::CVector3f up = (-0.6f * scale.y()) * (camMtx * zeus::skUp);
|
||||||
|
outPos += zeus::CVector3f{0.f, 0.f, player.GetEyeHeight()} + up + forward;
|
||||||
|
} else if (morphBallState == CPlayer::EPlayerMorphBallState::Morphed) {
|
||||||
|
const float ballRadius = player.GetMorphBall()->GetBallRadius();
|
||||||
|
outPos += (2.f * ballRadius + 0.25f) * zeus::skUp;
|
||||||
|
outPos -= ballRadius * (scale.y() * GetTransform().upVector());
|
||||||
|
const auto xRot = zeus::CQuaternion::fromAxisAngle(zeus::skRight, zeus::degToRad(-90.f));
|
||||||
|
const auto yRot = zeus::CQuaternion::fromAxisAngle(zeus::skForward, 0.f);
|
||||||
|
const auto zRot = zeus::CQuaternion::fromAxisAngle(zeus::skUp, GetYaw());
|
||||||
|
outRot = zRot * xRot * yRot;
|
||||||
|
} else if (morphBallState == CPlayer::EPlayerMorphBallState::Unmorphing) {
|
||||||
|
outPos += zeus::CVector3f{0.f, 0.f, 0.4f + ComputeMorphingPlayerSuckZPos(player)};
|
||||||
|
outPos += 0.5f * playerXf.frontVector() - player.GetMorphBall()->GetBallRadius() * GetTransform().upVector();
|
||||||
|
const auto xRot = zeus::CQuaternion::fromAxisAngle(zeus::skRight, zeus::degToRad(-90.f));
|
||||||
|
const auto yRot = zeus::CQuaternion::fromAxisAngle(zeus::skForward, 0.f);
|
||||||
|
const auto zRot = zeus::CQuaternion::fromAxisAngle(zeus::skUp, M_PIF);
|
||||||
|
outRot = zeus::CQuaternion{playerXf.basis} * (zRot * xRot * yRot);
|
||||||
|
|
||||||
|
float morphT = 0.f;
|
||||||
|
if (player.GetMorphDuration() != 0.f) {
|
||||||
|
morphT = std::clamp(player.GetMorphTime() / player.GetMorphDuration(), 0.f, 1.f);
|
||||||
|
}
|
||||||
|
if (morphT > 0.75f) {
|
||||||
|
const zeus::CQuaternion camRot = mgr.GetCameraManager()->GetFirstPersonCamera()->GetTransform().basis;
|
||||||
|
const zeus::CQuaternion rot = camRot * zeus::CQuaternion::fromAxisAngle(zeus::skUp, M_PIF);
|
||||||
|
const zeus::CMatrix3f camMtx = camRot.toTransform().basis;
|
||||||
|
const zeus::CVector3f forward = camMtx * zeus::skForward;
|
||||||
|
const zeus::CVector3f up = (-0.6f * scale.y()) * (camMtx * zeus::skUp);
|
||||||
|
const zeus::CVector3f pos = playerXf.origin + zeus::CVector3f{0.f, 0.f, player.GetEyeHeight()} + up + forward;
|
||||||
|
const float t = (morphT - 0.75f) / 0.25f;
|
||||||
|
outRot = zeus::CQuaternion::slerpShort(outRot, rot, t);
|
||||||
|
outPos = zeus::CVector3f::lerp(outPos, pos, t); // outPos * (1.f - t) + (pos * t);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void CMetroid::ComputeSuckPiratePosRot(CStateManager& mgr, zeus::CVector3f& outPos, zeus::CQuaternion& outRot) {
|
||||||
|
// TODO
|
||||||
|
}
|
||||||
|
|
||||||
|
float CMetroid::ComputeMorphingPlayerSuckZPos(const CPlayer& player) const {
|
||||||
|
float ret = 0.f;
|
||||||
|
const CModelData* modelData = player.GetModelData();
|
||||||
|
const float scaleZ = modelData->GetScale().z();
|
||||||
|
if (modelData != nullptr && modelData->GetAnimationData() != nullptr && modelData->GetNormalModel()) {
|
||||||
|
for (const auto& joint : skJointNameList) {
|
||||||
|
const zeus::CTransform xf = player.GetLocatorTransform(joint);
|
||||||
|
const float z = xf.origin.z() * scaleZ;
|
||||||
|
if (z > ret) {
|
||||||
|
ret = z;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
} // namespace urde::MP1
|
} // namespace urde::MP1
|
||||||
|
|
|
@ -18,7 +18,7 @@ private:
|
||||||
static constexpr u32 skNumProperties = 20;
|
static constexpr u32 skNumProperties = 20;
|
||||||
CDamageVulnerability x0_frozenVulnerability;
|
CDamageVulnerability x0_frozenVulnerability;
|
||||||
CDamageVulnerability x68_energyDrainVulnerability;
|
CDamageVulnerability x68_energyDrainVulnerability;
|
||||||
float xd0_;
|
float xd0_energyDrainPerSec;
|
||||||
float xd4_maxEnergyDrainAllowed;
|
float xd4_maxEnergyDrainAllowed;
|
||||||
float xd8_telegraphAttackTime;
|
float xd8_telegraphAttackTime;
|
||||||
float xdc_stage2GrowthScale;
|
float xdc_stage2GrowthScale;
|
||||||
|
@ -35,6 +35,7 @@ public:
|
||||||
static u32 GetNumProperties() { return skNumProperties; }
|
static u32 GetNumProperties() { return skNumProperties; }
|
||||||
const CDamageVulnerability& GetFrozenVulnerability() const { return x0_frozenVulnerability; }
|
const CDamageVulnerability& GetFrozenVulnerability() const { return x0_frozenVulnerability; }
|
||||||
const CDamageVulnerability& GetEnergyDrainVulnerability() const { return x68_energyDrainVulnerability; }
|
const CDamageVulnerability& GetEnergyDrainVulnerability() const { return x68_energyDrainVulnerability; }
|
||||||
|
float GetEnergyDrainPerSec() const { return xd0_energyDrainPerSec; }
|
||||||
float GetMaxEnergyDrainAllowed() const { return xd4_maxEnergyDrainAllowed; }
|
float GetMaxEnergyDrainAllowed() const { return xd4_maxEnergyDrainAllowed; }
|
||||||
float GetTelegraphAttackTime() const { return xd8_telegraphAttackTime; }
|
float GetTelegraphAttackTime() const { return xd8_telegraphAttackTime; }
|
||||||
float GetStage2GrowthScale() const { return xdc_stage2GrowthScale; }
|
float GetStage2GrowthScale() const { return xdc_stage2GrowthScale; }
|
||||||
|
@ -100,7 +101,7 @@ private:
|
||||||
bool x9bf_29_isAttacking : 1 = false;
|
bool x9bf_29_isAttacking : 1 = false;
|
||||||
bool x9bf_30_ : 1 = false;
|
bool x9bf_30_ : 1 = false;
|
||||||
bool x9bf_31_ : 1 = false;
|
bool x9bf_31_ : 1 = false;
|
||||||
bool x9c0_24_ : 1 = false;
|
bool x9c0_24_isPlayerMorphed : 1 = false;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
DEFINE_PATTERNED(Metroid)
|
DEFINE_PATTERNED(Metroid)
|
||||||
|
@ -174,12 +175,12 @@ private:
|
||||||
bool IsPlayerUnderwater(CStateManager& mgr);
|
bool IsPlayerUnderwater(CStateManager& mgr);
|
||||||
bool IsHunterAttacking(CStateManager& mgr);
|
bool IsHunterAttacking(CStateManager& mgr);
|
||||||
bool IsAttackInProgress(CStateManager& mgr);
|
bool IsAttackInProgress(CStateManager& mgr);
|
||||||
void ComputeSuckPiratePosRot(CStateManager& mgr, zeus::CVector3f& outVec, zeus::CQuaternion& outQuat);
|
void ComputeSuckPiratePosRot(CStateManager& mgr, zeus::CVector3f& outPos, zeus::CQuaternion& outRot);
|
||||||
EGammaType GetRandomGammaType(CStateManager& mgr, EGammaType previous);
|
EGammaType GetRandomGammaType(CStateManager& mgr, EGammaType previous);
|
||||||
void SpawnGammaMetroid(CStateManager& mgr);
|
void SpawnGammaMetroid(CStateManager& mgr);
|
||||||
bool ShouldSpawnGammaMetroid();
|
bool ShouldSpawnGammaMetroid();
|
||||||
void ComputeSuckPlayerPosRot(CStateManager& mgr, zeus::CVector3f& outVec, zeus::CQuaternion& outQuat);
|
void ComputeSuckPlayerPosRot(CStateManager& mgr, zeus::CVector3f& outPos, zeus::CQuaternion& outRot);
|
||||||
void ComputeSuckTargetPosRot(CStateManager& mgr, zeus::CVector3f& outVec, zeus::CQuaternion& outQuat);
|
void ComputeSuckTargetPosRot(CStateManager& mgr, zeus::CVector3f& outPos, zeus::CQuaternion& outRot);
|
||||||
void InterpolateToPosRot(CStateManager& mgr, float dt);
|
void InterpolateToPosRot(CStateManager& mgr, float dt);
|
||||||
void SuckEnergyFromTarget(CStateManager& mgr, float dt);
|
void SuckEnergyFromTarget(CStateManager& mgr, float dt);
|
||||||
bool ShouldReleaseFromTarget(CStateManager& mgr);
|
bool ShouldReleaseFromTarget(CStateManager& mgr);
|
||||||
|
|
|
@ -12,7 +12,7 @@ CDamageInfo::CDamageInfo(const DataSpec::SShotParam& other)
|
||||||
, xc_radiusDamage(other.radiusDamage)
|
, xc_radiusDamage(other.radiusDamage)
|
||||||
, x10_radius(other.radius)
|
, x10_radius(other.radius)
|
||||||
, x14_knockback(other.knockback)
|
, x14_knockback(other.knockback)
|
||||||
, x18_noImmunity(other.noImmunity) {}
|
, x18_24_noImmunity(other.noImmunity) {}
|
||||||
|
|
||||||
CDamageInfo& CDamageInfo::operator=(const DataSpec::SShotParam& other) {
|
CDamageInfo& CDamageInfo::operator=(const DataSpec::SShotParam& other) {
|
||||||
x0_weaponMode = CWeaponMode(EWeaponType(other.weaponType), other.charged, other.combo, other.instaKill);
|
x0_weaponMode = CWeaponMode(EWeaponType(other.weaponType), other.charged, other.combo, other.instaKill);
|
||||||
|
@ -20,7 +20,7 @@ CDamageInfo& CDamageInfo::operator=(const DataSpec::SShotParam& other) {
|
||||||
xc_radiusDamage = other.radiusDamage;
|
xc_radiusDamage = other.radiusDamage;
|
||||||
x10_radius = other.radius;
|
x10_radius = other.radius;
|
||||||
x14_knockback = other.knockback;
|
x14_knockback = other.knockback;
|
||||||
x18_noImmunity = other.noImmunity;
|
x18_24_noImmunity = other.noImmunity;
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -52,6 +52,6 @@ CDamageInfo::CDamageInfo(const CDamageInfo& other, float dt) {
|
||||||
xc_radiusDamage = x8_damage;
|
xc_radiusDamage = x8_damage;
|
||||||
x10_radius = other.x10_radius;
|
x10_radius = other.x10_radius;
|
||||||
x14_knockback = other.x14_knockback;
|
x14_knockback = other.x14_knockback;
|
||||||
x18_noImmunity = true;
|
x18_24_noImmunity = true;
|
||||||
}
|
}
|
||||||
} // namespace urde
|
} // namespace urde
|
||||||
|
|
|
@ -16,7 +16,7 @@ class CDamageInfo {
|
||||||
float xc_radiusDamage = 0.f;
|
float xc_radiusDamage = 0.f;
|
||||||
float x10_radius = 0.f;
|
float x10_radius = 0.f;
|
||||||
float x14_knockback = 0.f;
|
float x14_knockback = 0.f;
|
||||||
bool x18_noImmunity = false;
|
bool x18_24_noImmunity : 1 = false;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
constexpr CDamageInfo() = default;
|
constexpr CDamageInfo() = default;
|
||||||
|
@ -53,8 +53,8 @@ public:
|
||||||
float GetRadiusDamage() const { return xc_radiusDamage; }
|
float GetRadiusDamage() const { return xc_radiusDamage; }
|
||||||
void SetRadiusDamage(float r) { xc_radiusDamage = r; }
|
void SetRadiusDamage(float r) { xc_radiusDamage = r; }
|
||||||
float GetRadiusDamage(const CDamageVulnerability& dVuln) const;
|
float GetRadiusDamage(const CDamageVulnerability& dVuln) const;
|
||||||
bool NoImmunity() const { return x18_noImmunity; }
|
bool NoImmunity() const { return x18_24_noImmunity; }
|
||||||
void SetNoImmunity(bool b) { x18_noImmunity = b; }
|
void SetNoImmunity(bool b) { x18_24_noImmunity = b; }
|
||||||
void MultiplyDamage(float m) {
|
void MultiplyDamage(float m) {
|
||||||
x8_damage *= m;
|
x8_damage *= m;
|
||||||
xc_radiusDamage *= m;
|
xc_radiusDamage *= m;
|
||||||
|
|
|
@ -619,5 +619,6 @@ public:
|
||||||
const zeus::CVector3f& GetOrbitPoint() const { return x314_orbitPoint; }
|
const zeus::CVector3f& GetOrbitPoint() const { return x314_orbitPoint; }
|
||||||
float GetAverageSpeed() const;
|
float GetAverageSpeed() const;
|
||||||
bool IsInWaterMovement() const { return x9c4_31_inWaterMovement; }
|
bool IsInWaterMovement() const { return x9c4_31_inWaterMovement; }
|
||||||
|
void SetNoDamageLoopSfx(bool val) { x9c7_24_noDamageLoopSfx = val; }
|
||||||
};
|
};
|
||||||
} // namespace urde
|
} // namespace urde
|
||||||
|
|
Loading…
Reference in New Issue