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

Sheep fixes.

Browse Source 
Now amount of wool you get when shearing a sheep is random.
Sheeps only spawn in white color (I will add sheep dying soon).
This commit is contained in:
tonibm19 2013-10-27 10:41:25 +01:00
parent 5d58457c9e
commit a42561cf5a
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
source/Mobs/Sheep.cpp
View File

@ -1,4 +1,3 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "Sheep.h" #include "Sheep.h"
@ -13,7 +12,7 @@
cSheep::cSheep(int a_Color) : cSheep::cSheep(int a_Color) :
super("Sheep", mtSheep, "mob.sheep.say", "mob.sheep.say", 0.6, 1.3), super("Sheep", mtSheep, "mob.sheep.say", "mob.sheep.say", 0.6, 1.3),
m_IsSheared(false), 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) void cSheep::OnRightClicked(cPlayer & a_Player)
{ {
if ((a_Player.GetEquippedItem().m_ItemType == E_ITEM_SHEARS) && (!m_IsSheared)) if ((a_Player.GetEquippedItem().m_ItemType == E_ITEM_SHEARS) && (!m_IsSheared))
@ -46,11 +46,26 @@ void cSheep::OnRightClicked(cPlayer & a_Player)
} }
cItems Drops; cItems Drops;
Drops.push_back(cItem(E_BLOCK_WOOL, 4, m_WoolColor)); int wooldrops = m_World->GetTickRandomNumber(2);
m_World->SpawnItemPickups(Drops, GetPosX(), GetPosY(), GetPosZ(), 10); 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);
}
} }
} }