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

Merge pull request #145 from lioncash/blood-collision 

CBloodFlower: Implement GetCollisionResponseType
This commit is contained in:
Phillip Stephens 2020-02-03 14:45:21 -08:00 committed by GitHub
parent 67e4c2e135 d1a714cf1a
commit 330a1bff76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Runtime/MP1/World/CBloodFlower.cpp
View File

@ -148,6 +148,17 @@ void CBloodFlower::Render(const CStateManager& mgr) const {
x574_podEffect->Render(GetActorLights());
}
EWeaponCollisionResponseTypes CBloodFlower::GetCollisionResponseType(const zeus::CVector3f&, const zeus::CVector3f&,
const CWeaponMode& weaponMode, EProjectileAttrib) const {
const auto* const damageVulnerability = GetDamageVulnerability();
if (damageVulnerability->WeaponHurts(weaponMode, false)) {
return EWeaponCollisionResponseTypes::Unknown28;
}
return EWeaponCollisionResponseTypes::Unknown78;
}
bool CBloodFlower::ShouldAttack(CStateManager& mgr, float arg) {
if (TooClose(mgr, 0.f))
return false;

3
Runtime/MP1/World/CBloodFlower.hpp
View File

@ -56,6 +56,9 @@ public:
void DoUserAnimEvent(CStateManager& mgr, const CInt32POINode& node, EUserEventType type, float dt) override;
void Render(const CStateManager& mgr) const override;
void Touch(CActor&, CStateManager&) override {}
EWeaponCollisionResponseTypes GetCollisionResponseType(const zeus::CVector3f& v1, const zeus::CVector3f& v2,
const CWeaponMode& weaponMode,
EProjectileAttrib attribute) const override;
CProjectileInfo* GetProjectileInfo() override { return &x590_projectileInfo; }
bool ShouldAttack(CStateManager&, float) override;