From 4d7695549a8f22e0f83472e6e131275dabb8f362 Mon Sep 17 00:00:00 2001 From: tonibm19 Date: Fri, 8 Nov 2013 14:04:00 +0100 Subject: Now chickens can drop eggs. They drop an egg every 5 or 10 minutes. --- source/Mobs/Chicken.cpp | 36 +++++++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) (limited to 'source') 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,20 +2,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_DropEggCount(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_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++; + } } @@ -31,3 +57,7 @@ void cChicken::GetDrops(cItems & a_Drops, cEntity * a_Killer) + + + + -- cgit v1.2.3 From 20d9886847ead593b66bbef779bb4ddda3a3abdd Mon Sep 17 00:00:00 2001 From: tonibm19 Date: Fri, 8 Nov 2013 14:04:41 +0100 Subject: Now chicken drop eggs --- source/Mobs/Chicken.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'source') diff --git a/source/Mobs/Chicken.h b/source/Mobs/Chicken.h index 2f674e908..6505a4788 100644 --- a/source/Mobs/Chicken.h +++ b/source/Mobs/Chicken.h @@ -18,8 +18,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_DropEggCount; +} ; + -- cgit v1.2.3 From 2cf93b8e25c00f2fcedd691747499a6e88ca1411 Mon Sep 17 00:00:00 2001 From: tonibm19 Date: Fri, 8 Nov 2013 17:15:28 +0100 Subject: Changed variable name --- source/Mobs/Chicken.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'source') diff --git a/source/Mobs/Chicken.h b/source/Mobs/Chicken.h index 6505a4788..979c4d8a0 100644 --- a/source/Mobs/Chicken.h +++ b/source/Mobs/Chicken.h @@ -1,4 +1,3 @@ - #pragma once #include "PassiveMonster.h" @@ -23,7 +22,7 @@ public: private: - int m_DropEggCount; + int m_EggDropTimer; } ; -- cgit v1.2.3 From 705e6c13016cc00952ccba9f537dd71b7c666c74 Mon Sep 17 00:00:00 2001 From: tonibm19 Date: Fri, 8 Nov 2013 17:16:36 +0100 Subject: Changed variable name --- source/Mobs/Chicken.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'source') diff --git a/source/Mobs/Chicken.cpp b/source/Mobs/Chicken.cpp index ec9edb961..318f8a813 100644 --- a/source/Mobs/Chicken.cpp +++ b/source/Mobs/Chicken.cpp @@ -1,4 +1,3 @@ - #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules #include "Chicken.h" @@ -13,7 +12,7 @@ cChicken::cChicken(void) : super("Chicken", mtChicken, "mob.chicken.hurt", "mob.chicken.hurt", 0.3, 0.4), - m_DropEggCount(0) + m_EggDropTimer(0) { } @@ -24,23 +23,23 @@ void cChicken::Tick(float a_Dt, cChunk & a_Chunk) { super::Tick(a_Dt, a_Chunk); - if (m_DropEggCount == 6000 && m_World->GetTickRandomNumber(1) == 0) + if (m_EggDropTimer == 6000 && m_World->GetTickRandomNumber(1) == 0) { cItems Drops; - m_DropEggCount = 0; + m_EggDropTimer = 0; Drops.push_back(cItem(E_ITEM_EGG, 1)); m_World->SpawnItemPickups(Drops, GetPosX(), GetPosY(), GetPosZ(), 10); } - else if (m_DropEggCount == 12000) + else if (m_EggDropTimer == 12000) { cItems Drops; - m_DropEggCount = 0; + m_EggDropTimer = 0; Drops.push_back(cItem(E_ITEM_EGG, 1)); m_World->SpawnItemPickups(Drops, GetPosX(), GetPosY(), GetPosZ(), 10); } else { - m_DropEggCount++; + m_EggDropTimer++; } } -- cgit v1.2.3