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

Villagers: Farmers now replant the crops.

Browse Source
This commit is contained in:
STRWarrior 2014-01-27 18:27:57 +01:00
parent 2cdd8f1961
commit 06c3bc1ea5
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Mobs/Villager.cpp
View File

@ -13,7 +13,8 @@
cVillager::cVillager(eVillagerType VillagerType) : cVillager::cVillager(eVillagerType VillagerType) :
super("Villager", mtVillager, "", "", 0.6, 1.8), super("Villager", mtVillager, "", "", 0.6, 1.8),
m_Type(VillagerType), m_Type(VillagerType),
m_DidFindCrops(false) m_DidFindCrops(false),
m_ActionCountDown(-1)
{ {
} }
@ -40,6 +41,19 @@ void cVillager::DoTakeDamage(TakeDamageInfo & a_TDI)
void cVillager::Tick(float a_Dt, cChunk & a_Chunk) void cVillager::Tick(float a_Dt, cChunk & a_Chunk)
{ {
super::Tick(a_Dt, a_Chunk); super::Tick(a_Dt, a_Chunk);
if (m_ActionCountDown > -1)
{
m_ActionCountDown--;
if (m_ActionCountDown == 0)
{
switch (m_Type)
{
case vtFarmer: m_World->SetBlock(m_CropsPos.x, m_CropsPos.y, m_CropsPos.z, E_BLOCK_CROPS, 0);
}
}
return;
}
if (m_DidFindCrops && !m_bMovingToDestination) if (m_DidFindCrops && !m_bMovingToDestination)
{ {
if ((GetPosition() - m_CropsPos).Length() < 2) if ((GetPosition() - m_CropsPos).Length() < 2)
@ -50,6 +64,7 @@ void cVillager::Tick(float a_Dt, cChunk & a_Chunk)
cBlockHandler * Handler = cBlockHandler::GetBlockHandler(CropBlock); cBlockHandler * Handler = cBlockHandler::GetBlockHandler(CropBlock);
Handler->DropBlock(m_World, this, m_CropsPos.x, m_CropsPos.y, m_CropsPos.z); Handler->DropBlock(m_World, this, m_CropsPos.x, m_CropsPos.y, m_CropsPos.z);
m_World->SetBlock(m_CropsPos.x, m_CropsPos.y, m_CropsPos.z, E_BLOCK_AIR, 0); m_World->SetBlock(m_CropsPos.x, m_CropsPos.y, m_CropsPos.z, E_BLOCK_AIR, 0);
m_ActionCountDown = 20;
} }
} }
m_DidFindCrops = false; m_DidFindCrops = false;

1
src/Mobs/Villager.h
View File

@ -38,6 +38,7 @@ public:
private: private:
int m_ActionCountDown;
int m_Type; int m_Type;
bool m_DidFindCrops; bool m_DidFindCrops;
Vector3i m_CropsPos; Vector3i m_CropsPos;