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

Added splash potion functionality

Browse Source
This commit is contained in:
archshift
2014-06-07 21:56:01 -07:00
parent 5803094d7d
commit 58f35af6e7
6 changed files with 123 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/Entities/SplashPotionEntity.cpp
View File

@@ -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);
// TODO: Apply potion effect to entity and others nearby
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
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)
{
}
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;
}