10 files changed, 173 insertions, 34 deletions

diff --git a/src/Mobs/CMakeLists.txt b/src/Mobs/CMakeLists.txt
index 53c265803..2c092c15f 100644
--- a/src/Mobs/CMakeLists.txt
+++ b/src/Mobs/CMakeLists.txt
@@ -4,9 +4,75 @@ project (MCServer)
 
 include_directories ("${PROJECT_SOURCE_DIR}/../")
 
-file(GLOB SOURCE
-    "*.cpp"
-    "*.h"
-)
+SET (SRCS
+	AggressiveMonster.cpp
+	Bat.cpp
+	Blaze.cpp
+	CaveSpider.cpp
+	Chicken.cpp
+	Cow.cpp
+	Creeper.cpp
+	EnderDragon.cpp
+	Enderman.cpp
+	Ghast.cpp
+	Giant.cpp
+	Horse.cpp
+	IronGolem.cpp
+	MagmaCube.cpp
+	Monster.cpp
+	Mooshroom.cpp
+	PassiveAggressiveMonster.cpp
+	PassiveMonster.cpp
+	Pig.cpp
+	Sheep.cpp
+	Skeleton.cpp
+	Slime.cpp
+	SnowGolem.cpp
+	Spider.cpp
+	Squid.cpp
+	Villager.cpp
+	Witch.cpp
+	Wither.cpp
+	Wolf.cpp
+	Zombie.cpp
+	ZombiePigman.cpp)
+	
+SET (HDRS
+	AggressiveMonster.h
+	Bat.h
+	Blaze.h
+	CaveSpider.h
+	Chicken.h
+	Cow.h
+	Creeper.h
+	EnderDragon.h
+	Enderman.h
+	Ghast.h
+	Giant.h
+	Horse.h
+	IncludeAllMonsters.h
+	IronGolem.h
+	MagmaCube.h
+	Monster.h
+	Mooshroom.h
+	Ocelot.h
+	PassiveAggressiveMonster.h
+	PassiveMonster.h
+	Pig.h
+	Sheep.h
+	Silverfish.h
+	Skeleton.h
+	Slime.h
+	SnowGolem.h
+	Spider.h
+	Squid.h
+	Villager.h
+	Witch.h
+	Wither.h
+	Wolf.h
+	Zombie.h
+	ZombiePigman.h)
 
-add_library(Mobs ${SOURCE})
+if(NOT MSVC)
+	add_library(Mobs ${SRCS} ${HDRS})
+endif()
diff --git a/src/Mobs/Monster.cpp b/src/Mobs/Monster.cpp
index 78ac36f91..622a67816 100644
--- a/src/Mobs/Monster.cpp
+++ b/src/Mobs/Monster.cpp
@@ -126,7 +126,7 @@ void cMonster::TickPathFinding()
 		{ 1, 0},
 		{-1, 0},
 		{ 0, 1},
-		{ 0,-1},
+		{ 0, -1},
 	} ;
 	
 	if ((PosY - 1 < 0) || (PosY + 2 > cChunkDef::Height) /* PosY + 1 will never be true if PosY + 2 is not */)
@@ -281,7 +281,7 @@ void cMonster::Tick(float a_Dt, cChunk & a_Chunk)
 		}
 
 		Vector3f Distance = m_Destination - GetPosition();
-		if(!ReachedDestination() && !ReachedFinalDestination())  // If we haven't reached any sort of destination, move
+		if (!ReachedDestination() && !ReachedFinalDestination())  // If we haven't reached any sort of destination, move
 		{
 			Distance.y = 0;
 			Distance.Normalize();
@@ -414,11 +414,7 @@ void cMonster::HandleFalling()
 int cMonster::FindFirstNonAirBlockPosition(double a_PosX, double a_PosZ)
 {
 	int PosY = POSY_TOINT;
-
-	if (PosY < 0)
-		PosY = 0;
-	else if (PosY > cChunkDef::Height)
-		PosY = cChunkDef::Height;
+	PosY = Clamp(PosY, 0, cChunkDef::Height);
 
 	if (!cBlockInfo::IsSolid(m_World->GetBlock((int)floor(a_PosX), PosY, (int)floor(a_PosZ))))
 	{
@@ -684,16 +680,6 @@ void cMonster::GetMonsterConfig(const AString & a_Name)
 
 bool cMonster::IsUndead(void)
 {
-	switch (GetMobType())
-	{
-		case mtZombie:
-		case mtZombiePigman:
-		case mtSkeleton:
-		case mtWither:
-		{
-			return true;
-		}
-	}
 	return false;
 }
 
@@ -842,13 +828,13 @@ cMonster * cMonster::NewMonsterFromType(cMonster::eType a_MobType)
 		}
 		case mtSlime:
 		{
-			toReturn = new cSlime(Random.NextInt(2) + 1);
+			toReturn = new cSlime(1 << Random.NextInt(3));  // Size 1, 2 or 4
 			break;
 		}
 		case mtSkeleton:
 		{
 			// TODO: Actual detection of spawning in Nether
-			toReturn = new cSkeleton(Random.NextInt(1) == 0 ? false : true);
+			toReturn = new cSkeleton((Random.NextInt(1) == 0) ? false : true);
 			break;
 		}
 		case mtVillager:
diff --git a/src/Mobs/Monster.h b/src/Mobs/Monster.h
index 4af7cf4f1..ffd078505 100644
--- a/src/Mobs/Monster.h
+++ b/src/Mobs/Monster.h
@@ -73,7 +73,7 @@ public:
 	// tolua_end
 	
 	enum MState{ATTACKING, IDLE, CHASING, ESCAPING} m_EMState;
-	enum MPersonality{PASSIVE,AGGRESSIVE,COWARDLY} m_EMPersonality;
+	enum MPersonality{PASSIVE, AGGRESSIVE, COWARDLY} m_EMPersonality;
 	
 	/** Creates the mob object.
 	If a_ConfigName is not empty, the configuration is loaded using GetMonsterConfig()
@@ -107,7 +107,7 @@ public:
 	void GetMonsterConfig(const AString & a_Name);
 	
 	/** Returns whether this mob is undead (skeleton, zombie, etc.) */
-	bool IsUndead(void);
+	virtual bool IsUndead(void);
 	
 	virtual void EventLosePlayer(void);
 	virtual void CheckEventLostPlayer(void);
diff --git a/src/Mobs/Skeleton.h b/src/Mobs/Skeleton.h
index efb670c83..9a121ef48 100644
--- a/src/Mobs/Skeleton.h
+++ b/src/Mobs/Skeleton.h
@@ -22,6 +22,8 @@ public:
 	virtual void Attack(float a_Dt) override;
 	virtual void SpawnOn(cClientHandle & a_ClientHandle) override;
 
+	virtual bool IsUndead(void) override { return true; }
+	
 	bool IsWither(void) const { return m_bIsWither; };
 
 private:
diff --git a/src/Mobs/Slime.cpp b/src/Mobs/Slime.cpp
index 52a52bb39..b709ec664 100644
--- a/src/Mobs/Slime.cpp
+++ b/src/Mobs/Slime.cpp
@@ -2,16 +2,25 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "Slime.h"
+#include "FastRandom.h"
+#include "World.h"
 
 
 
 
 
-/// Creates a slime of the specified size; size is 1 .. 3, with 1 being the smallest
 cSlime::cSlime(int a_Size) :
-	super("Slime", mtSlime, "mob.slime.attack", "mob.slime.attack", 0.6 * a_Size, 0.6 * a_Size),
+	super("Slime",
+		mtSlime,
+		Printf("mob.slime.%s", GetSizeName(a_Size).c_str()),
+		Printf("mob.slime.%s", GetSizeName(a_Size).c_str()),
+		0.6 * a_Size,
+		0.6 * a_Size
+	),
 	m_Size(a_Size)
 {
+	SetMaxHealth(a_Size * a_Size);
+	SetAttackDamage(a_Size);
 }
 
 
@@ -25,7 +34,9 @@ void cSlime::GetDrops(cItems & a_Drops, cEntity * a_Killer)
 	{
 		LootingLevel = a_Killer->GetEquippedWeapon().m_Enchantments.GetLevel(cEnchantments::enchLooting);
 	}
-	if (GetSize() == 1)
+
+	// Only slimes with the size 1 can drop slimeballs.
+	if (m_Size == 1)
 	{
 		AddRandomDropItem(a_Drops, 0, 2 + LootingLevel, E_ITEM_SLIMEBALL);
 	}
@@ -34,3 +45,62 @@ void cSlime::GetDrops(cItems & a_Drops, cEntity * a_Killer)
 
 
 
+
+void cSlime::Attack(float a_Dt)
+{
+	if (m_Size > 1)
+	{
+		// Only slimes larger than size 1 attack a player.
+		super::Attack(a_Dt);
+	}
+}
+
+
+
+
+
+void cSlime::KilledBy(TakeDamageInfo & a_TDI)
+{
+	if (GetHealth() > 0)
+	{
+		return;
+	}
+
+	if (m_Size != 1)
+	{
+		cFastRandom Random;
+		int SpawnAmount = 2 + Random.NextInt(3);
+
+		for (int i = 0; i < SpawnAmount; ++i)
+		{
+			double AddX = (i % 2 - 0.5) * m_Size / 4.0;
+			double AddZ = (i / 2 - 0.5) * m_Size / 4.0;
+
+			cSlime * NewSlime = new cSlime(m_Size / 2);
+			NewSlime->SetPosition(GetPosX() + AddX, GetPosY() + 0.5, GetPosZ() + AddZ);
+			NewSlime->SetYaw(Random.NextFloat(1.0f) * 360.0f);
+			m_World->SpawnMobFinalize(NewSlime);
+		}
+	}
+	super::KilledBy(a_TDI);
+}
+
+
+
+
+
+const AString cSlime::GetSizeName(int a_Size) const
+{
+	if (a_Size > 1)
+	{
+		return "big";
+	}
+	else
+	{
+		return "small";
+	}
+}
+
+
+
+
diff --git a/src/Mobs/Slime.h b/src/Mobs/Slime.h
index 782c3113f..15ae113dc 100644
--- a/src/Mobs/Slime.h
+++ b/src/Mobs/Slime.h
@@ -13,17 +13,26 @@ class cSlime :
 	typedef cAggressiveMonster super;
 	
 public:
-	/// Creates a slime of the specified size; size is 1 .. 3, with 1 being the smallest
+	/** Creates a slime of the specified size; size can be 1, 2 or 4, with 1 is the smallest and 4 is the tallest. */
 	cSlime(int a_Size);
 
 	CLASS_PROTODEF(cSlime);
 
+	// cAggressiveMonster overrides:
 	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
+	virtual void Attack(float a_Dt) override;
+	virtual void KilledBy(TakeDamageInfo & a_TDI) override;
+
 	int GetSize(void) const { return m_Size; }
 	
+	/** Returns the text describing the slime's size, as used by the client's resource subsystem for sounds.
+	Returns either "big" or "small". */
+	const AString GetSizeName(int a_Size) const;
+	
 protected:
 
-	/// Size of the slime, 1 .. 3, with 1 being the smallest
+	/** Size of the slime, with 1 being the smallest.
+	Vanilla uses sizes 1, 2 and 4 only. */
 	int m_Size;
 } ;
 
diff --git a/src/Mobs/SnowGolem.cpp b/src/Mobs/SnowGolem.cpp
index c1979a495..76334d970 100644
--- a/src/Mobs/SnowGolem.cpp
+++ b/src/Mobs/SnowGolem.cpp
@@ -30,7 +30,7 @@ void cSnowGolem::GetDrops(cItems & a_Drops, cEntity * a_Killer)
 void cSnowGolem::Tick(float a_Dt, cChunk & a_Chunk)
 {
 	super::Tick(a_Dt, a_Chunk);
-	if (IsBiomeNoDownfall(m_World->GetBiomeAt((int) floor(GetPosX()), (int) floor(GetPosZ())) ))
+	if (IsBiomeNoDownfall(m_World->GetBiomeAt((int) floor(GetPosX()), (int) floor(GetPosZ()))))
 	{
 		TakeDamage(*this);
 	}
diff --git a/src/Mobs/Wither.h b/src/Mobs/Wither.h
index 7d76f70f5..cc8d1459b 100644
--- a/src/Mobs/Wither.h
+++ b/src/Mobs/Wither.h
@@ -30,6 +30,8 @@ public:
 	virtual bool DoTakeDamage(TakeDamageInfo & a_TDI) override;
 	virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
 	virtual void KilledBy(TakeDamageInfo & a_TDI) override;
+	
+	virtual bool IsUndead(void) override { return true; }
 
 private:
 
diff --git a/src/Mobs/Zombie.h b/src/Mobs/Zombie.h
index c56409570..082573d8b 100644
--- a/src/Mobs/Zombie.h
+++ b/src/Mobs/Zombie.h
@@ -19,8 +19,10 @@ public:
 	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
 	virtual void MoveToPosition(const Vector3d & a_Position) override;
 
-	bool IsVillagerZombie(void) const {return m_IsVillagerZombie; }
-	bool IsConverting    (void) const {return m_IsConverting; }
+	virtual bool IsUndead(void) override { return true; }
+	
+	bool IsVillagerZombie(void) const { return m_IsVillagerZombie; }
+	bool IsConverting    (void) const { return m_IsConverting; }
 
 private:
 
diff --git a/src/Mobs/ZombiePigman.h b/src/Mobs/ZombiePigman.h
index a2ebc87cb..a4bad7efb 100644
--- a/src/Mobs/ZombiePigman.h
+++ b/src/Mobs/ZombiePigman.h
@@ -18,6 +18,8 @@ public:
 
 	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
 	virtual void KilledBy(TakeDamageInfo & a_TDI) override;
+	
+	virtual bool IsUndead(void) override { return true; }
 } ;