summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2013-10-11 21:57:22 +0200
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2013-10-11 21:57:22 +0200
commite2aaf202abf9d677b84efeb376f55ee976b52b8d (patch)
treeabb93c8bf233ffe877ba2d50c61be8768e9cc994 /source
parentFourth round of fixes (diff)
downloadcuberite-e2aaf202abf9d677b84efeb376f55ee976b52b8d.tar
cuberite-e2aaf202abf9d677b84efeb376f55ee976b52b8d.tar.gz
cuberite-e2aaf202abf9d677b84efeb376f55ee976b52b8d.tar.bz2
cuberite-e2aaf202abf9d677b84efeb376f55ee976b52b8d.tar.lz
cuberite-e2aaf202abf9d677b84efeb376f55ee976b52b8d.tar.xz
cuberite-e2aaf202abf9d677b84efeb376f55ee976b52b8d.tar.zst
cuberite-e2aaf202abf9d677b84efeb376f55ee976b52b8d.zip
Diffstat (limited to '')
-rw-r--r--source/Mobs/Villager.cpp4
-rw-r--r--source/Mobs/Villager.h15
-rw-r--r--source/World.cpp10
3 files changed, 22 insertions, 7 deletions
diff --git a/source/Mobs/Villager.cpp b/source/Mobs/Villager.cpp
index cb50d8cfc..97d6dc3ca 100644
--- a/source/Mobs/Villager.cpp
+++ b/source/Mobs/Villager.cpp
@@ -8,9 +8,9 @@
-cVillager::cVillager(int Type) :
+cVillager::cVillager(eVillagerType VillagerType) :
super("Villager", 120, "", "", 0.6, 1.8),
- m_Type(Type)
+ m_Type(VillagerType)
{
}
diff --git a/source/Mobs/Villager.h b/source/Mobs/Villager.h
index 5fcb519dd..86888d9eb 100644
--- a/source/Mobs/Villager.h
+++ b/source/Mobs/Villager.h
@@ -13,12 +13,23 @@ class cVillager :
typedef cPassiveMonster super;
public:
- cVillager(int Type);
+
+ enum eVillagerType
+ {
+ VILLAGER_TYPE_FARMER = 0,
+ VILLAGER_TYPE_LIBRARIAN = 1,
+ VILLAGER_TYPE_PRIEST = 2,
+ VILLAGER_TYPE_BLACKSMITH = 3,
+ VILLAGER_TYPE_BUTCHER = 4,
+ VILLAGER_TYPE_GENERIC = 5
+ } ;
+
+ cVillager(eVillagerType VillagerType);
CLASS_PROTODEF(cVillager);
virtual void DoTakeDamage(TakeDamageInfo & a_TDI) override;
- int GetVilType(void) const { return m_Type; }
+ int GetVilType(void) const { return m_Type; }
private:
diff --git a/source/World.cpp b/source/World.cpp
index 6346a7cb8..da9466bf8 100644
--- a/source/World.cpp
+++ b/source/World.cpp
@@ -2575,13 +2575,14 @@ int cWorld::SpawnMob(double a_PosX, double a_PosY, double a_PosZ, cMonster::eTyp
int SlSize = GetTickRandomNumber(2) + 1; // 1 .. 3 - Slime
int ShColor = GetTickRandomNumber(15); // 0 .. 15 - Sheep
bool SkType = GetDimension() == biNether; // Skeleton
- int VilType = GetTickRandomNumber(5); // 0 .. 5 - Villager
+
+ int VilType = GetTickRandomNumber(6); // 0 .. 5 - Villager
+ if (VilType == 6) { VilType = 0; } // Give farmers a better chance of spawning
int HseType = GetTickRandomNumber(7); // 0 .. 7 - Horse Type (donkey, zombie, etc.)
int HseColor = GetTickRandomNumber(6); // 0 .. 6 - Horse
int HseStyle = GetTickRandomNumber(4); // 0 .. 4 - Horse
int HseTameTimes = GetTickRandomNumber(6) + 1; // 1 .. 7 - Horse tame amount
-
if ((HseType == 5) || (HseType == 6) || (HseType == 7)) { HseType = 0; } // 5,6,7 = 0 because little chance of getting 0 with TickRand
switch (a_MonsterType)
@@ -2612,7 +2613,10 @@ int cWorld::SpawnMob(double a_PosX, double a_PosY, double a_PosZ, cMonster::eTyp
case cMonster::mtSnowGolem: Monster = new cSnowGolem(); break;
case cMonster::mtSpider: Monster = new cSpider(); break;
case cMonster::mtSquid: Monster = new cSquid(); break;
- case cMonster::mtVillager: Monster = new cVillager(VilType); break;
+ case cMonster::mtVillager:
+ {
+ Monster = new cVillager((cVillager::eVillagerType)VilType); break;
+ }
case cMonster::mtWitch: Monster = new cWitch(); break;
case cMonster::mtWither: Monster = new cWither(); break;
case cMonster::mtWolf: Monster = new cWolf(); break;