flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Fifth round of fixes

Browse Source 
* Enumerated Villager spawning
This commit is contained in:
Tiger Wang 2013-10-11 20:57:22 +01:00
parent ee2df34d03
commit e2aaf202ab
3 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/Mobs/Villager.cpp
View File

@ -8,9 +8,9 @@
cVillager::cVillager(int Type) : cVillager::cVillager(eVillagerType VillagerType) :
super("Villager", 120, "", "", 0.6, 1.8), super("Villager", 120, "", "", 0.6, 1.8),
m_Type(Type) m_Type(VillagerType)
{ {
} }

15
source/Mobs/Villager.h
View File

@ -13,12 +13,23 @@ class cVillager :
typedef cPassiveMonster super; typedef cPassiveMonster super;
public: 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); CLASS_PROTODEF(cVillager);
virtual void DoTakeDamage(TakeDamageInfo & a_TDI) override; virtual void DoTakeDamage(TakeDamageInfo & a_TDI) override;
int GetVilType(void) const { return m_Type; } int GetVilType(void) const { return m_Type; }
private: private:

10
source/World.cpp
View File

@ -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 SlSize = GetTickRandomNumber(2) + 1; // 1 .. 3 - Slime
int ShColor = GetTickRandomNumber(15); // 0 .. 15 - Sheep int ShColor = GetTickRandomNumber(15); // 0 .. 15 - Sheep
bool SkType = GetDimension() == biNether; // Skeleton 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 HseType = GetTickRandomNumber(7); // 0 .. 7 - Horse Type (donkey, zombie, etc.)
int HseColor = GetTickRandomNumber(6); // 0 .. 6 - Horse int HseColor = GetTickRandomNumber(6); // 0 .. 6 - Horse
int HseStyle = GetTickRandomNumber(4); // 0 .. 4 - Horse int HseStyle = GetTickRandomNumber(4); // 0 .. 4 - Horse
int HseTameTimes = GetTickRandomNumber(6) + 1; // 1 .. 7 - Horse tame amount 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 if ((HseType == 5) || (HseType == 6) || (HseType == 7)) { HseType = 0; } // 5,6,7 = 0 because little chance of getting 0 with TickRand
switch (a_MonsterType) 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::mtSnowGolem: Monster = new cSnowGolem(); break;
case cMonster::mtSpider: Monster = new cSpider(); break; case cMonster::mtSpider: Monster = new cSpider(); break;
case cMonster::mtSquid: Monster = new cSquid(); 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::mtWitch: Monster = new cWitch(); break;
case cMonster::mtWither: Monster = new cWither(); break; case cMonster::mtWither: Monster = new cWither(); break;
case cMonster::mtWolf: Monster = new cWolf(); break; case cMonster::mtWolf: Monster = new cWolf(); break;