diff options
| -rw-r--r-- | MCServer/monsters.ini | 65 | ||||
| -rw-r--r-- | source/World.cpp | 7 |
2 files changed, 57 insertions, 15 deletions
diff --git a/MCServer/monsters.ini b/MCServer/monsters.ini index 80a0c7dde..8289e0a0a 100644 --- a/MCServer/monsters.ini +++ b/MCServer/monsters.ini @@ -1,9 +1,9 @@ [Spider] AttackRange=5.0 AttackRate=1 -AttackDamage=1.0 +AttackDamage=2.0 SightDistance=25.0 -MaxHealth=10 +MaxHealth=16 [Chicken] AttackRange=5.0 @@ -50,7 +50,7 @@ MaxHealth=40 [Zombiepigman] AttackRange=5.0 AttackRate=1 -AttackDamage=5.0 +AttackDamage=7.0 SightDistance=25.0 MaxHealth=20 @@ -85,27 +85,70 @@ MaxHealth=8 [Skeleton] AttackRange=5.0 AttackRate=1 -AttackDamage=4.0 +AttackDamage=3.0 SightDistance=25.0 MaxHealth=20 [Slime] AttackRange=5.0 AttackRate=1 -AttackDamage=10.0 +AttackDamage=4.0 SightDistance=25.0 -MaxHealth=32 +MaxHealth=16 -[Spider] +[Zombie] AttackRange=5.0 AttackRate=1 -AttackDamage=2.0 +AttackDamage=4.0 SightDistance=25.0 -MaxHealth=16 +MaxHealth=20 -[Zombie] +[Wolf] AttackRange=5.0 AttackRate=1 AttackDamage=4.0 SightDistance=25.0 -MaxHealth=20
\ No newline at end of file +MaxHealth=20 + +[Blaze] +AttackRange=5.0 +AttackRate=1 +AttackDamage=6.0 +SightDistance=25.0 +MaxHealth=20 + +[Villager] +AttackRange=5.0 +AttackRate=1 +AttackDamage=0.0 +SightDistance=25.0 +MaxHealth=20 + +[Witch] +AttackRange=5.0 +AttackRate=1 +AttackDamage=0.0 +SightDistance=25.0 +MaxHealth=26 + + +[Ocelot] +AttackRange=5.0 +AttackRate=1 +AttackDamage=0.0 +SightDistance=25.0 +MaxHealth=10 + +[Mooshroom] +AttackRange=5.0 +AttackRate=1 +AttackDamage=0.0 +SightDistance=25.0 +MaxHealth=10 + +[Magmacube] +AttackRange=5.0 +AttackRate=1 +AttackDamage=6.0 +SightDistance=25.0 +MaxHealth=16 diff --git a/source/World.cpp b/source/World.cpp index 1ff5a5970..699767d5e 100644 --- a/source/World.cpp +++ b/source/World.cpp @@ -1,4 +1,3 @@ - #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules #include "BlockID.h" @@ -281,7 +280,7 @@ cWorld::cWorld(const AString & a_WorldName) : m_LastSave = 0; m_LastUnload = 0; - // preallocate some memory for ticking blocks so we don´t need to allocate that often + // preallocate some memory for ticking blocks so we don�t need to allocate that often m_BlockTickQueue.reserve(1000); m_BlockTickQueueCopy.reserve(1000); @@ -691,7 +690,6 @@ void cWorld::TickSpawnMobs(float a_Dt) { switch (nightRand) { - case 1: MobType = E_ENTITY_TYPE_ZOMBIE; break; // _X 2013_06_25: Really? Zombies in the Nether? case 5: MobType = E_ENTITY_TYPE_GHAST; break; case 6: MobType = E_ENTITY_TYPE_ZOMBIE_PIGMAN; break; } @@ -699,8 +697,9 @@ void cWorld::TickSpawnMobs(float a_Dt) else { switch (nightRand) - { + { case 0: MobType = E_ENTITY_TYPE_SPIDER; break; + case 1: MobType = E_ENTITY_TYPE_ZOMBIE; break; case 2: MobType = E_ENTITY_TYPE_ENDERMAN; break; case 3: MobType = E_ENTITY_TYPE_CREEPER; break; case 4: MobType = E_ENTITY_TYPE_CAVE_SPIDER; break; |