Merge pull request #299 from tonibm19/master
Saddles are dropped, chicken spawn out of thrown eggs.
This commit is contained in:
commit
a0c2981a3c
@ -474,8 +474,17 @@ cThrownEggEntity::cThrownEggEntity(cEntity * a_Creator, double a_X, double a_Y,
|
|||||||
|
|
||||||
void cThrownEggEntity::OnHitSolidBlock(const Vector3d & a_HitPos, char a_HitFace)
|
void cThrownEggEntity::OnHitSolidBlock(const Vector3d & a_HitPos, char a_HitFace)
|
||||||
{
|
{
|
||||||
// TODO: Random-spawn a chicken or four
|
if (m_World->GetTickRandomNumber(7) == 1)
|
||||||
|
{
|
||||||
|
m_World->SpawnMob(a_HitPos.x, a_HitPos.y, a_HitPos.z, cMonster::mtChicken);
|
||||||
|
}
|
||||||
|
else if (m_World->GetTickRandomNumber(32) == 1)
|
||||||
|
{
|
||||||
|
m_World->SpawnMob(a_HitPos.x, a_HitPos.y, a_HitPos.z, cMonster::mtChicken);
|
||||||
|
m_World->SpawnMob(a_HitPos.x, a_HitPos.y, a_HitPos.z, cMonster::mtChicken);
|
||||||
|
m_World->SpawnMob(a_HitPos.x, a_HitPos.y, a_HitPos.z, cMonster::mtChicken);
|
||||||
|
m_World->SpawnMob(a_HitPos.x, a_HitPos.y, a_HitPos.z, cMonster::mtChicken);
|
||||||
|
}
|
||||||
Destroy();
|
Destroy();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -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 "Horse.h"
|
#include "Horse.h"
|
||||||
@ -142,6 +141,10 @@ void cHorse::OnRightClicked(cPlayer & a_Player)
|
|||||||
void cHorse::GetDrops(cItems & a_Drops, cEntity * a_Killer)
|
void cHorse::GetDrops(cItems & a_Drops, cEntity * a_Killer)
|
||||||
{
|
{
|
||||||
AddRandomDropItem(a_Drops, 0, 2, E_ITEM_LEATHER);
|
AddRandomDropItem(a_Drops, 0, 2, E_ITEM_LEATHER);
|
||||||
|
if (m_bIsSaddled)
|
||||||
|
{
|
||||||
|
a_Drops.push_back(cItem(E_ITEM_SADDLE, 1));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -22,6 +22,10 @@ cPig::cPig(void) :
|
|||||||
void cPig::GetDrops(cItems & a_Drops, cEntity * a_Killer)
|
void cPig::GetDrops(cItems & a_Drops, cEntity * a_Killer)
|
||||||
{
|
{
|
||||||
AddRandomDropItem(a_Drops, 1, 3, IsOnFire() ? E_ITEM_COOKED_PORKCHOP : E_ITEM_RAW_PORKCHOP);
|
AddRandomDropItem(a_Drops, 1, 3, IsOnFire() ? E_ITEM_COOKED_PORKCHOP : E_ITEM_RAW_PORKCHOP);
|
||||||
|
if (m_bIsSaddled)
|
||||||
|
{
|
||||||
|
a_Drops.push_back(cItem(E_ITEM_SADDLE, 1));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user