From 8438def87e40e43fd66d38dbf8cc287cea7de29b Mon Sep 17 00:00:00 2001
From: Bond-009 <bond.009@outlook.com>
Date: Sat, 3 Feb 2018 12:24:19 +0100
Subject: Add Zombie Villagers

---
 src/Mobs/Monster.cpp | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

(limited to 'src/Mobs/Monster.cpp')

diff --git a/src/Mobs/Monster.cpp b/src/Mobs/Monster.cpp
index 5e3026a57..d20afa589 100644
--- a/src/Mobs/Monster.cpp
+++ b/src/Mobs/Monster.cpp
@@ -69,6 +69,7 @@ static const struct
 	{mtWolf,           "wolf",           "Wolf",           "wolf"},
 	{mtZombie,         "zombie",         "Zombie",         "zombie"},
 	{mtZombiePigman,   "zombiepigman",   "PigZombie",      "zombie_pigman"},
+	{mtZombieVillager, "zombievillager", "ZombieVillager", "zombie_villager"},
 } ;
 
 
@@ -662,6 +663,7 @@ void cMonster::KilledBy(TakeDamageInfo & a_TDI)
 		case mtWitherSkeleton:
 		case mtZombie:
 		case mtZombiePigman:
+		case mtZombieVillager:
 		case mtSlime:
 		case mtMagmaCube:
 		{
@@ -1078,6 +1080,7 @@ cMonster::eFamily cMonster::FamilyFromType(eMonsterType a_Type)
 		case mtWolf:           return mfPassive;
 		case mtZombie:         return mfHostile;
 		case mtZombiePigman:   return mfHostile;
+		case mtZombieVillager: return mfHostile;
 
 		default:
 		{
@@ -1176,17 +1179,7 @@ std::unique_ptr<cMonster> cMonster::NewMonsterFromType(eMonsterType a_MobType)
 		{
 			return cpp14::make_unique<cSlime>(1 << Random.RandInt(2));  // Size 1, 2 or 4
 		}
-		case mtVillager:
-		{
-			int VillagerType = Random.RandInt(6);
-			if (VillagerType == 6)
-			{
-				// Give farmers a better chance of spawning
-				VillagerType = 0;
-			}
-
-			return cpp14::make_unique<cVillager>(static_cast<cVillager::eVillagerType>(VillagerType));
-		}
+		case mtVillager: return cpp14::make_unique<cVillager>(cVillager::GetRandomProfession());
 		case mtHorse:
 		{
 			// Horses take a type (species), a colour, and a style (dots, stripes, etc.)
@@ -1203,7 +1196,10 @@ std::unique_ptr<cMonster> cMonster::NewMonsterFromType(eMonsterType a_MobType)
 
 			return cpp14::make_unique<cHorse>(HorseType, HorseColor, HorseStyle, HorseTameTimes);
 		}
-
+		case mtZombieVillager:
+		{
+			return cpp14::make_unique<cZombieVillager>(cVillager::GetRandomProfession());
+		}
 		case mtBat:            return cpp14::make_unique<cBat>();
 		case mtBlaze:          return cpp14::make_unique<cBlaze>();
 		case mtCaveSpider:     return cpp14::make_unique<cCaveSpider>();
-- 
cgit v1.2.3