summaryrefslogtreecommitdiffstats
path: root/src/Entities/SplashPotionEntity.cpp
diff options
context:
space:
mode:
authorarchshift <admin@archshift.com>2014-06-08 06:56:01 +0200
committerarchshift <admin@archshift.com>2014-06-17 20:39:20 +0200
commit58f35af6e71f11844b9c6c1d1ebd2d7390439cca (patch)
treeba93d854c83bebfc32f691be795564c975a734cc /src/Entities/SplashPotionEntity.cpp
parentEntity: only fire critical hit if damage type is physical (diff)
downloadcuberite-58f35af6e71f11844b9c6c1d1ebd2d7390439cca.tar
cuberite-58f35af6e71f11844b9c6c1d1ebd2d7390439cca.tar.gz
cuberite-58f35af6e71f11844b9c6c1d1ebd2d7390439cca.tar.bz2
cuberite-58f35af6e71f11844b9c6c1d1ebd2d7390439cca.tar.lz
cuberite-58f35af6e71f11844b9c6c1d1ebd2d7390439cca.tar.xz
cuberite-58f35af6e71f11844b9c6c1d1ebd2d7390439cca.tar.zst
cuberite-58f35af6e71f11844b9c6c1d1ebd2d7390439cca.zip
Diffstat (limited to '')
-rw-r--r--src/Entities/SplashPotionEntity.cpp58
1 files changed, 52 insertions, 6 deletions
diff --git a/src/Entities/SplashPotionEntity.cpp b/src/Entities/SplashPotionEntity.cpp
index c6be2baf7..5dcea2385 100644
--- a/src/Entities/SplashPotionEntity.cpp
+++ b/src/Entities/SplashPotionEntity.cpp
@@ -1,14 +1,17 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "SplashPotionEntity.h"
-#include "../World.h"
+#include "Player.h"
-cSplashPotionEntity::cSplashPotionEntity(cEntity * a_Creator, double a_X, double a_Y, double a_Z, const Vector3d & a_Speed) :
-super(pkSplashPotion, a_Creator, a_X, a_Y, a_Z, 0.25, 0.25)
+cSplashPotionEntity::cSplashPotionEntity(cEntity * a_Creator, double a_X, double a_Y, double a_Z, const Vector3d & a_Speed, cEntityEffect::eType a_EntityEffectType, cEntityEffect a_EntityEffect, int a_PotionName) :
+ super(pkSplashPotion, a_Creator, a_X, a_Y, a_Z, 0.25, 0.25),
+ m_EntityEffectType(a_EntityEffectType),
+ m_EntityEffect(a_EntityEffect),
+ m_PotionName(a_PotionName)
{
SetSpeed(a_Speed);
}
@@ -19,7 +22,7 @@ super(pkSplashPotion, a_Creator, a_X, a_Y, a_Z, 0.25, 0.25)
void cSplashPotionEntity::OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace)
{
- // TODO: Apply potion effect to entities nearby
+ Splash(a_HitPos);
Destroy();
}
@@ -30,8 +33,51 @@ void cSplashPotionEntity::OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace
void cSplashPotionEntity::OnHitEntity(cEntity & a_EntityHit, const Vector3d & a_HitPos)
{
a_EntityHit.TakeDamage(dtRangedAttack, this, 0, 1);
+ Splash(a_HitPos);
+ Destroy(true);
+}
+
+
+
+
+
+void cSplashPotionEntity::Splash(const Vector3d & a_HitPos)
+{
+ cSplashPotionCallback Callback(a_HitPos, m_EntityEffectType, m_EntityEffect);
+ m_World->ForEachPlayer(Callback);
+ // TODO: Should be for each pawn
- // TODO: Apply potion effect to entity and others nearby
+ m_World->BroadcastSoundParticleEffect(2002, a_HitPos.x, a_HitPos.y, a_HitPos.z, m_PotionName);
+}
+
+
+
+
+
+cSplashPotionEntity::cSplashPotionCallback::cSplashPotionCallback(const Vector3d & a_HitPos, cEntityEffect::eType &a_EntityEffectType, cEntityEffect &a_EntityEffect):
+ m_HitPos(a_HitPos),
+ m_EntityEffectType(a_EntityEffectType),
+ m_EntityEffect(a_EntityEffect)
+{
- Destroy(true);
+}
+
+
+
+
+
+bool cSplashPotionEntity::cSplashPotionCallback::Item(cPlayer * a_Player)
+{
+ double distance_splash = (a_Player->GetPosition() - m_HitPos).Length();
+ if (distance_splash < 20)
+ {
+ // y = -0.25x + 1, where x is the distance from the player. Approximation for potion splash.
+ // TODO: better equation
+ double reduction = -0.25 * distance_splash + 1.0;
+ if (reduction < 0) reduction = 0;
+
+ m_EntityEffect.SetDistanceModifier(reduction);
+ a_Player->AddEntityEffect(m_EntityEffectType, m_EntityEffect);
+ }
+ return false;
}