AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-18 11:25:23 +00:00
Code Issues Projects Releases Wiki Activity

CMetroid: Implement UpdateVolume, IsPlayerUnderwater, IsHunterAttacking

Browse Source
This commit is contained in:
Luke Street
2020-05-22 03:34:48 -04:00
parent e0866ebdd4
commit de2996a941
2 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Runtime/MP1/World/CMetroid.cpp
View File

@@ -6,9 +6,11 @@
#include "Runtime/Collision/CGameCollision.hpp" #include "Runtime/Collision/CGameCollision.hpp"
#include "Runtime/Weapon/CGameProjectile.hpp" #include "Runtime/Weapon/CGameProjectile.hpp"
#include "Runtime/World/CPlayer.hpp" #include "Runtime/World/CPlayer.hpp"
#include "Runtime/World/CScriptWater.hpp"
#include "Runtime/World/CTeamAiMgr.hpp" #include "Runtime/World/CTeamAiMgr.hpp"
#include "Runtime/World/CWorld.hpp" #include "Runtime/World/CWorld.hpp"
#include "Runtime/World/ScriptLoader.hpp" #include "Runtime/World/ScriptLoader.hpp"
#include "Runtime/MP1/World/CMetroidBeta.hpp"
namespace urde::MP1 { namespace urde::MP1 {
namespace { namespace {
@@ -514,9 +516,7 @@ bool CMetroid::IsSuckingEnergy() const {
return x7c8_attackState == EAttackState::Draining && !x450_bodyController->IsFrozen(); return x7c8_attackState == EAttackState::Draining && !x450_bodyController->IsFrozen();
} }
void CMetroid::UpdateVolume() { void CMetroid::UpdateVolume() { SetVolume(0.25f * std::clamp(GetGrowthStage() - 1.f, 0.f, 1.f) + 0.75f); }
// TODO
}
void CMetroid::UpdateTouchBounds() { void CMetroid::UpdateTouchBounds() {
const zeus::CTransform locXf = GetLocatorTransform("lockon_target_LCTR"sv); const zeus::CTransform locXf = GetLocatorTransform("lockon_target_LCTR"sv);
@@ -656,6 +656,9 @@ void CMetroid::DisableSolidCollision(CMetroid* target) {
void CMetroid::SetupExitFaceHugDirection(CActor* actor, CStateManager& mgr, const zeus::CVector3f& vec, void CMetroid::SetupExitFaceHugDirection(CActor* actor, CStateManager& mgr, const zeus::CVector3f& vec,
const zeus::CTransform& xf) { const zeus::CTransform& xf) {
if (actor == nullptr || x7c8_attackState == EAttackState::Over) {
return;
}
// TODO // TODO
} }
@@ -665,12 +668,32 @@ bool CMetroid::PreDamageSpacePirate(CStateManager& mgr) {
} }
bool CMetroid::IsPlayerUnderwater(CStateManager& mgr) { bool CMetroid::IsPlayerUnderwater(CStateManager& mgr) {
// TODO CPlayer& player = mgr.GetPlayer();
if (player.GetFluidCounter() != 0) {
const TUniqueId fluidId = player.GetFluidId();
if (fluidId != kInvalidUniqueId) {
const zeus::CVector3f aimPos = player.GetAimPosition(mgr, 0.f);
if (TCastToConstPtr<CScriptWater> water = mgr.GetObjectById(fluidId)) {
const zeus::CAABox triggerBounds = water->GetTriggerBoundsWR();
return aimPos.z() < triggerBounds.max.z();
}
}
return true;
}
return false; return false;
} }
bool CMetroid::IsHunterAttacking(CStateManager& mgr) { bool CMetroid::IsHunterAttacking(CStateManager& mgr) {
// TODO if (TCastToConstPtr<CTeamAiMgr> aiMgr = mgr.GetObjectById(x698_teamAiMgrId)) {
if (!aiMgr->HasRangedAttackers()) {
return false;
}
for (const auto id : aiMgr->GetRangedAttackers()) {
if (CPatterned::CastTo<CMetroidBeta>(mgr.GetObjectById(id)) != nullptr) {
return true;
}
}
}
return false; return false;
} }

2
Runtime/World/CTeamAiMgr.hpp
View File

@@ -104,7 +104,9 @@ public:
void RemoveRangedAttacker(TUniqueId aiId); void RemoveRangedAttacker(TUniqueId aiId);
bool HasMeleeAttackers() const { return !x68_meleeAttackers.empty(); } bool HasMeleeAttackers() const { return !x68_meleeAttackers.empty(); }
const std::vector<TUniqueId>& GetMeleeAttackers() const { return x68_meleeAttackers; }
bool HasRangedAttackers() const { return !x78_rangedAttackers.empty(); } bool HasRangedAttackers() const { return !x78_rangedAttackers.empty(); }
const std::vector<TUniqueId>& GetRangedAttackers() const { return x78_rangedAttackers; }
s32 GetNumRoles() const { return x58_roles.size(); } s32 GetNumRoles() const { return x58_roles.size(); }
const std::vector<CTeamAiRole>& GetRoles() const { return x58_roles; } const std::vector<CTeamAiRole>& GetRoles() const { return x58_roles; }
s32 GetMaxMeleeAttackerCount() const { return x34_data.x10_maxMeleeAttackerCount; } s32 GetMaxMeleeAttackerCount() const { return x34_data.x10_maxMeleeAttackerCount; }