diff options
| -rw-r--r-- | source/Mobs/Chicken.cpp | 37 | ||||
| -rw-r--r-- | source/Mobs/Chicken.h | 8 |
2 files changed, 39 insertions, 6 deletions
diff --git a/source/Mobs/Chicken.cpp b/source/Mobs/Chicken.cpp index 434a32f94..318f8a813 100644 --- a/source/Mobs/Chicken.cpp +++ b/source/Mobs/Chicken.cpp @@ -1,21 +1,46 @@ - #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules #include "Chicken.h" +#include "../World.h" + -// TODO: Drop egg every 5-10 minutes +cChicken::cChicken(void) : + super("Chicken", mtChicken, "mob.chicken.hurt", "mob.chicken.hurt", 0.3, 0.4), + m_EggDropTimer(0) +{ +} -cChicken::cChicken(void) : - super("Chicken", mtChicken, "mob.chicken.hurt", "mob.chicken.hurt", 0.3, 0.4) + +void cChicken::Tick(float a_Dt, cChunk & a_Chunk) { + super::Tick(a_Dt, a_Chunk); + + if (m_EggDropTimer == 6000 && m_World->GetTickRandomNumber(1) == 0) + { + cItems Drops; + m_EggDropTimer = 0; + Drops.push_back(cItem(E_ITEM_EGG, 1)); + m_World->SpawnItemPickups(Drops, GetPosX(), GetPosY(), GetPosZ(), 10); + } + else if (m_EggDropTimer == 12000) + { + cItems Drops; + m_EggDropTimer = 0; + Drops.push_back(cItem(E_ITEM_EGG, 1)); + m_World->SpawnItemPickups(Drops, GetPosX(), GetPosY(), GetPosZ(), 10); + } + else + { + m_EggDropTimer++; + } } @@ -31,3 +56,7 @@ void cChicken::GetDrops(cItems & a_Drops, cEntity * a_Killer) + + + + diff --git a/source/Mobs/Chicken.h b/source/Mobs/Chicken.h index 2f674e908..979c4d8a0 100644 --- a/source/Mobs/Chicken.h +++ b/source/Mobs/Chicken.h @@ -1,4 +1,3 @@ - #pragma once #include "PassiveMonster.h" @@ -18,8 +17,13 @@ public: CLASS_PROTODEF(cChicken); virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override; -} ; + virtual void Tick(float a_Dt, cChunk & a_Chunk) override; + +private: + int m_EggDropTimer; +} ; + |