flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Improved knockback animation

Browse Source 
* Critical hits now actually increase damage
* Looking down at an entity and hitting them still produces upwards
motion (as per Vanilla experience)
* Reduced force to be more realistic
This commit is contained in:
Tiger Wang 2013-12-24 15:02:35 +00:00
parent 1014c737a4
commit 89f87f66a5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Entities/Entity.cpp
View File

@ -246,7 +246,7 @@ void cEntity::TakeDamage(eDamageType a_DamageType, cEntity * a_Attacker, int a_R
{ {
Heading = a_Attacker->GetLookVector() * (a_Attacker->IsSprinting() ? 10 : 8); Heading = a_Attacker->GetLookVector() * (a_Attacker->IsSprinting() ? 10 : 8);
} }
Heading.y += 3; Heading.y = 2;
TDI.Knockback = Heading * a_KnockbackAmount; TDI.Knockback = Heading * a_KnockbackAmount;
DoTakeDamage(TDI); DoTakeDamage(TDI);
@ -307,7 +307,7 @@ void cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
// IsOnGround() only is false if the player is moving downwards // IsOnGround() only is false if the player is moving downwards
if (!((cPlayer *)a_TDI.Attacker)->IsOnGround()) // TODO: Better damage increase, and check for enchantments (and use magic critical instead of plain) if (!((cPlayer *)a_TDI.Attacker)->IsOnGround()) // TODO: Better damage increase, and check for enchantments (and use magic critical instead of plain)
{ {
a_TDI.FinalDamage + 2; a_TDI.FinalDamage += 2;
m_World->BroadcastEntityAnimation(*this, 4); // Critical hit m_World->BroadcastEntityAnimation(*this, 4); // Critical hit
} }
} }
@ -321,7 +321,7 @@ void cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
m_Health = 0; m_Health = 0;
} }
AddSpeed(a_TDI.Knockback * 3); AddSpeed(a_TDI.Knockback * 2);
m_World->BroadcastEntityStatus(*this, ENTITY_STATUS_HURT); m_World->BroadcastEntityStatus(*this, ENTITY_STATUS_HURT);