From 4d7695549a8f22e0f83472e6e131275dabb8f362 Mon Sep 17 00:00:00 2001 From: tonibm19 Date: Fri, 8 Nov 2013 14:04:00 +0100 Subject: [PATCH] Now chickens can drop eggs. They drop an egg every 5 or 10 minutes. --- source/Mobs/Chicken.cpp | 38 ++++++++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/source/Mobs/Chicken.cpp b/source/Mobs/Chicken.cpp index 434a32f94..ec9edb961 100644 --- a/source/Mobs/Chicken.cpp +++ b/source/Mobs/Chicken.cpp @@ -2,25 +2,51 @@ #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) + super("Chicken", mtChicken, "mob.chicken.hurt", "mob.chicken.hurt", 0.3, 0.4), + m_DropEggCount(0) { } +void cChicken::Tick(float a_Dt, cChunk & a_Chunk) +{ + super::Tick(a_Dt, a_Chunk); + + if (m_DropEggCount == 6000 && m_World->GetTickRandomNumber(1) == 0) + { + cItems Drops; + m_DropEggCount = 0; + Drops.push_back(cItem(E_ITEM_EGG, 1)); + m_World->SpawnItemPickups(Drops, GetPosX(), GetPosY(), GetPosZ(), 10); + } + else if (m_DropEggCount == 12000) + { + cItems Drops; + m_DropEggCount = 0; + Drops.push_back(cItem(E_ITEM_EGG, 1)); + m_World->SpawnItemPickups(Drops, GetPosX(), GetPosY(), GetPosZ(), 10); + } + else + { + m_DropEggCount++; + } +} + + + + void cChicken::GetDrops(cItems & a_Drops, cEntity * a_Killer) { @@ -31,3 +57,7 @@ void cChicken::GetDrops(cItems & a_Drops, cEntity * a_Killer) + + + +