From 0e07e231a219fb810c100e1cd823ef7585f7e2ff Mon Sep 17 00:00:00 2001 From: Mat Date: Thu, 19 Mar 2020 19:13:41 +0200 Subject: Improvements to knockback (#4504) * Improvements to knockback * SetSpeed for explosions * Improve code consistency --- src/Entities/ArrowEntity.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/Entities/ArrowEntity.cpp') diff --git a/src/Entities/ArrowEntity.cpp b/src/Entities/ArrowEntity.cpp index 249ff42d0..6fef2c7ee 100644 --- a/src/Entities/ArrowEntity.cpp +++ b/src/Entities/ArrowEntity.cpp @@ -115,9 +115,13 @@ void cArrowEntity::OnHitEntity(cEntity & a_EntityHit, Vector3d a_HitPos) Damage += ExtraDamage; } + double Knockback = 10; + unsigned int PunchLevel = m_CreatorData.m_Enchantments.GetLevel(cEnchantments::enchPunch); - double KnockbackAmount = 11 + 10 * PunchLevel; - a_EntityHit.TakeDamage(dtRangedAttack, GetCreatorUniqueID(), Damage, KnockbackAmount); + unsigned int PunchLevelMultiplier = 8; + + Knockback += PunchLevelMultiplier * PunchLevel; + a_EntityHit.TakeDamage(dtRangedAttack, GetCreatorUniqueID(), Damage, Knockback); if (IsOnFire() && !a_EntityHit.IsInWater()) { -- cgit v1.2.3