Moved cThrownEggEntity out of ProjectileEntity.h
This commit is contained in:
parent
477b3e7861
commit
de23a115a5
59
src/Entities/ProjectileEgg.cpp
Normal file
59
src/Entities/ProjectileEgg.cpp
Normal file
@ -0,0 +1,59 @@
|
|||||||
|
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
|
||||||
|
|
||||||
|
#include "ProjectileEgg.h"
|
||||||
|
#include "../World.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
cThrownEggEntity::cThrownEggEntity(cEntity * a_Creator, double a_X, double a_Y, double a_Z, const Vector3d & a_Speed) :
|
||||||
|
super(pkEgg, a_Creator, a_X, a_Y, a_Z, 0.25, 0.25)
|
||||||
|
{
|
||||||
|
SetSpeed(a_Speed);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
void cThrownEggEntity::OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace)
|
||||||
|
{
|
||||||
|
TrySpawnChicken(a_HitPos);
|
||||||
|
|
||||||
|
Destroy();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
void cThrownEggEntity::OnHitEntity(cEntity & a_EntityHit, const Vector3d & a_HitPos)
|
||||||
|
{
|
||||||
|
int TotalDamage = 0;
|
||||||
|
// TODO: If entity is Ender Crystal, destroy it
|
||||||
|
|
||||||
|
TrySpawnChicken(a_HitPos);
|
||||||
|
a_EntityHit.TakeDamage(dtRangedAttack, this, TotalDamage, 1);
|
||||||
|
|
||||||
|
Destroy(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
void cThrownEggEntity::TrySpawnChicken(const Vector3d & a_HitPos)
|
||||||
|
{
|
||||||
|
if (m_World->GetTickRandomNumber(7) == 1)
|
||||||
|
{
|
||||||
|
m_World->SpawnMob(a_HitPos.x, a_HitPos.y, a_HitPos.z, cMonster::mtChicken);
|
||||||
|
}
|
||||||
|
else if (m_World->GetTickRandomNumber(32) == 1)
|
||||||
|
{
|
||||||
|
m_World->SpawnMob(a_HitPos.x, a_HitPos.y, a_HitPos.z, cMonster::mtChicken);
|
||||||
|
m_World->SpawnMob(a_HitPos.x, a_HitPos.y, a_HitPos.z, cMonster::mtChicken);
|
||||||
|
m_World->SpawnMob(a_HitPos.x, a_HitPos.y, a_HitPos.z, cMonster::mtChicken);
|
||||||
|
m_World->SpawnMob(a_HitPos.x, a_HitPos.y, a_HitPos.z, cMonster::mtChicken);
|
||||||
|
}
|
||||||
|
}
|
39
src/Entities/ProjectileEgg.h
Normal file
39
src/Entities/ProjectileEgg.h
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
//
|
||||||
|
// ProjectileEgg.h
|
||||||
|
//
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "ProjectileEntity.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
class cThrownEggEntity :
|
||||||
|
public cProjectileEntity
|
||||||
|
{
|
||||||
|
typedef cProjectileEntity super;
|
||||||
|
|
||||||
|
public:
|
||||||
|
|
||||||
|
// tolua_end
|
||||||
|
|
||||||
|
CLASS_PROTODEF(cThrownEggEntity);
|
||||||
|
|
||||||
|
cThrownEggEntity(cEntity * a_Creator, double a_X, double a_Y, double a_Z, const Vector3d & a_Speed);
|
||||||
|
|
||||||
|
protected:
|
||||||
|
|
||||||
|
// tolua_end
|
||||||
|
|
||||||
|
// cProjectileEntity overrides:
|
||||||
|
virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) override;
|
||||||
|
virtual void OnHitEntity (cEntity & a_EntityHit, const Vector3d & a_HitPos) override;
|
||||||
|
|
||||||
|
// Randomly decides whether to spawn a chicken where the egg lands.
|
||||||
|
void TrySpawnChicken(const Vector3d & a_HitPos);
|
||||||
|
|
||||||
|
// tolua_begin
|
||||||
|
|
||||||
|
} ;
|
@ -14,6 +14,7 @@
|
|||||||
#include "../Chunk.h"
|
#include "../Chunk.h"
|
||||||
|
|
||||||
#include "ProjectileArrow.h"
|
#include "ProjectileArrow.h"
|
||||||
|
#include "ProjectileEgg.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -408,64 +409,6 @@ void cProjectileEntity::CollectedBy(cPlayer * a_Dest)
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
||||||
// cThrownEggEntity:
|
|
||||||
|
|
||||||
cThrownEggEntity::cThrownEggEntity(cEntity * a_Creator, double a_X, double a_Y, double a_Z, const Vector3d & a_Speed) :
|
|
||||||
super(pkEgg, a_Creator, a_X, a_Y, a_Z, 0.25, 0.25)
|
|
||||||
{
|
|
||||||
SetSpeed(a_Speed);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void cThrownEggEntity::OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace)
|
|
||||||
{
|
|
||||||
TrySpawnChicken(a_HitPos);
|
|
||||||
|
|
||||||
Destroy();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void cThrownEggEntity::OnHitEntity(cEntity & a_EntityHit, const Vector3d & a_HitPos)
|
|
||||||
{
|
|
||||||
int TotalDamage = 0;
|
|
||||||
// TODO: If entity is Ender Crystal, destroy it
|
|
||||||
|
|
||||||
TrySpawnChicken(a_HitPos);
|
|
||||||
a_EntityHit.TakeDamage(dtRangedAttack, this, TotalDamage, 1);
|
|
||||||
|
|
||||||
Destroy(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void cThrownEggEntity::TrySpawnChicken(const Vector3d & a_HitPos)
|
|
||||||
{
|
|
||||||
if (m_World->GetTickRandomNumber(7) == 1)
|
|
||||||
{
|
|
||||||
m_World->SpawnMob(a_HitPos.x, a_HitPos.y, a_HitPos.z, cMonster::mtChicken);
|
|
||||||
}
|
|
||||||
else if (m_World->GetTickRandomNumber(32) == 1)
|
|
||||||
{
|
|
||||||
m_World->SpawnMob(a_HitPos.x, a_HitPos.y, a_HitPos.z, cMonster::mtChicken);
|
|
||||||
m_World->SpawnMob(a_HitPos.x, a_HitPos.y, a_HitPos.z, cMonster::mtChicken);
|
|
||||||
m_World->SpawnMob(a_HitPos.x, a_HitPos.y, a_HitPos.z, cMonster::mtChicken);
|
|
||||||
m_World->SpawnMob(a_HitPos.x, a_HitPos.y, a_HitPos.z, cMonster::mtChicken);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
// cThrownEnderPearlEntity :
|
// cThrownEnderPearlEntity :
|
||||||
|
|
||||||
|
@ -101,38 +101,6 @@ protected:
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
class cThrownEggEntity :
|
|
||||||
public cProjectileEntity
|
|
||||||
{
|
|
||||||
typedef cProjectileEntity super;
|
|
||||||
|
|
||||||
public:
|
|
||||||
|
|
||||||
// tolua_end
|
|
||||||
|
|
||||||
CLASS_PROTODEF(cThrownEggEntity);
|
|
||||||
|
|
||||||
cThrownEggEntity(cEntity * a_Creator, double a_X, double a_Y, double a_Z, const Vector3d & a_Speed);
|
|
||||||
|
|
||||||
protected:
|
|
||||||
|
|
||||||
// tolua_end
|
|
||||||
|
|
||||||
// cProjectileEntity overrides:
|
|
||||||
virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) override;
|
|
||||||
virtual void OnHitEntity (cEntity & a_EntityHit, const Vector3d & a_HitPos) override;
|
|
||||||
|
|
||||||
// Randomly decides whether to spawn a chicken where the egg lands.
|
|
||||||
void TrySpawnChicken(const Vector3d & a_HitPos);
|
|
||||||
|
|
||||||
// tolua_begin
|
|
||||||
|
|
||||||
} ;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
class cThrownEnderPearlEntity :
|
class cThrownEnderPearlEntity :
|
||||||
public cProjectileEntity
|
public cProjectileEntity
|
||||||
{
|
{
|
||||||
|
@ -27,7 +27,6 @@
|
|||||||
#include "../BlockEntities/MobHeadEntity.h"
|
#include "../BlockEntities/MobHeadEntity.h"
|
||||||
#include "../BlockEntities/FlowerPotEntity.h"
|
#include "../BlockEntities/FlowerPotEntity.h"
|
||||||
|
|
||||||
|
|
||||||
#include "../Mobs/Monster.h"
|
#include "../Mobs/Monster.h"
|
||||||
#include "../Mobs/IncludeAllMonsters.h"
|
#include "../Mobs/IncludeAllMonsters.h"
|
||||||
|
|
||||||
@ -37,6 +36,7 @@
|
|||||||
#include "../Entities/Minecart.h"
|
#include "../Entities/Minecart.h"
|
||||||
#include "../Entities/Pickup.h"
|
#include "../Entities/Pickup.h"
|
||||||
#include "../Entities/ProjectileArrow.h"
|
#include "../Entities/ProjectileArrow.h"
|
||||||
|
#include "../Entities/ProjectileEgg.h"
|
||||||
#include "../Entities/TNTEntity.h"
|
#include "../Entities/TNTEntity.h"
|
||||||
#include "../Entities/ExpOrb.h"
|
#include "../Entities/ExpOrb.h"
|
||||||
#include "../Entities/HangingEntity.h"
|
#include "../Entities/HangingEntity.h"
|
||||||
|
Loading…
Reference in New Issue
Block a user