Merge branch 'Entities'

src/Entities/Entity.cpp

@@ -1146,10 +1146,7 @@ void cEntity::SetMaxHealth(int a_MaxHealth)
 	m_MaxHealth = a_MaxHealth;
 
 	// Reset health, if too high:
-	if (m_Health > a_MaxHealth)
-	{
-		m_Health = a_MaxHealth;
-	}
+	m_Health = std::min(m_Health, a_MaxHealth);
 }
 
 

src/Mobs/Monster.cpp

@@ -842,13 +842,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:

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";
+	}
+}
+
+
+
+

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;
 } ;