From a42561cf5a2e8cf86848cb1925097173787de808 Mon Sep 17 00:00:00 2001 From: tonibm19 Date: Sun, 27 Oct 2013 10:41:25 +0100 Subject: Sheep fixes. Now amount of wool you get when shearing a sheep is random. Sheeps only spawn in white color (I will add sheep dying soon). --- source/Mobs/Sheep.cpp | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) (limited to 'source/Mobs/Sheep.cpp') diff --git a/source/Mobs/Sheep.cpp b/source/Mobs/Sheep.cpp index 0d7d43e27..54cce9cbe 100644 --- a/source/Mobs/Sheep.cpp +++ b/source/Mobs/Sheep.cpp @@ -1,4 +1,3 @@ - #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules #include "Sheep.h" @@ -13,7 +12,7 @@ cSheep::cSheep(int a_Color) : super("Sheep", mtSheep, "mob.sheep.say", "mob.sheep.say", 0.6, 1.3), m_IsSheared(false), - m_WoolColor(a_Color) + m_WoolColor(0) { } @@ -33,6 +32,7 @@ void cSheep::GetDrops(cItems & a_Drops, cEntity * a_Killer) + void cSheep::OnRightClicked(cPlayer & a_Player) { if ((a_Player.GetEquippedItem().m_ItemType == E_ITEM_SHEARS) && (!m_IsSheared)) @@ -46,11 +46,26 @@ void cSheep::OnRightClicked(cPlayer & a_Player) } cItems Drops; - Drops.push_back(cItem(E_BLOCK_WOOL, 4, m_WoolColor)); - m_World->SpawnItemPickups(Drops, GetPosX(), GetPosY(), GetPosZ(), 10); + int wooldrops = m_World->GetTickRandomNumber(2); + if (wooldrops == 0) + { + Drops.push_back(cItem(E_BLOCK_WOOL, 1, m_WoolColor)); + m_World->SpawnItemPickups(Drops, GetPosX(), GetPosY(), GetPosZ(), 10); + } + if (wooldrops == 1) + { + Drops.push_back(cItem(E_BLOCK_WOOL, 2, m_WoolColor)); + m_World->SpawnItemPickups(Drops, GetPosX(), GetPosY(), GetPosZ(), 10); + } + if (wooldrops == 2) + { + Drops.push_back(cItem(E_BLOCK_WOOL, 3, m_WoolColor)); + m_World->SpawnItemPickups(Drops, GetPosX(), GetPosY(), GetPosZ(), 10); + } } } + -- cgit v1.2.3