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

Knockback/Damage fixes

Browse Source
This commit is contained in:
Phillip Stephens
2021-06-13 03:06:09 -07:00
parent 12c38f57fa
commit ace87397d7
4 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Runtime/MP1/World/CMetroidPrimeEssence.cpp
View File

@@ -89,7 +89,7 @@ void CMetroidPrimeEssence::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId o
break;
case EScriptObjectMessage::Touched: {
if (TCastToPtr<CCollisionActor> colAct = mgr.ObjectById(other)) {
if (colAct->GetLastTouchedObject() == mgr.GetPlayer().GetUniqueId()) {
if (colAct->GetLastTouchedObject() == mgr.GetPlayer().GetUniqueId() && x420_curDamageRemTime <= 0.f) {
mgr.ApplyDamage(GetUniqueId(), mgr.GetPlayer().GetUniqueId(), GetUniqueId(), GetContactDamage(),
CMaterialFilter::MakeIncludeExclude({EMaterialTypes::Solid}, {}), zeus::skZero3f);
x420_curDamageRemTime = x424_damageWaitTime;