diff options
| -rw-r--r-- | Server/monsters.ini | 61 | ||||
| -rw-r--r-- | src/Mobs/Monster.cpp | 2 |
2 files changed, 31 insertions, 32 deletions
diff --git a/Server/monsters.ini b/Server/monsters.ini index ea6b68fba..be78b3ad1 100644 --- a/Server/monsters.ini +++ b/Server/monsters.ini @@ -1,14 +1,14 @@ [Bat] AttackDamage=0.0 AttackRange=2.0 -AttackRate=1 +AttackRate=1.0 MaxHealth=6 SightDistance=25.0 [Blaze] AttackDamage=6.0 AttackRange=15.0 -AttackRate=1 +AttackRate=6.0 IsFireproof=1 MaxHealth=20 SightDistance=25.0 @@ -16,50 +16,49 @@ SightDistance=25.0 [CaveSpider] AttackDamage=2.0 AttackRange=2.0 -AttackRate=1 +AttackRate=1.0 MaxHealth=12 SightDistance=25.0 [Chicken] AttackDamage=0.0 AttackRange=2.0 -AttackRate=1 +AttackRate=1.0 MaxHealth=4 SightDistance=25.0 [Cow] AttackDamage=0.0 AttackRange=2.0 -AttackRate=1 +AttackRate=1.0 MaxHealth=10 SightDistance=25.0 [Creeper] AttackDamage=0.0 AttackRange=3.0 -AttackRate=1 +AttackRate=1.0 MaxHealth=20 SightDistance=25.0 [EnderDragon] AttackDamage=6.0 AttackRange=2.0 -AttackRate=1 +AttackRate=1.0 MaxHealth=200 SightDistance=25.0 [Enderman] AttackDamage=4.0 AttackRange=2.0 -AttackRate=1 +AttackRate=1.0 MaxHealth=40 SightDistance=64.0 - [Ghast] AttackDamage=0.0 AttackRange=50.0 -AttackRate=1 +AttackRate=3.0 IsFireproof=1 MaxHealth=10 SightDistance=50.0 @@ -67,35 +66,35 @@ SightDistance=50.0 [Giant] AttackDamage=6.0 AttackRange=2.0 -AttackRate=1 +AttackRate=1.0 MaxHealth=100 SightDistance=25.0 [Guardian] AttackDamage=9.0 AttackRange=2.0 -AttackRate=1 +AttackRate=1.0 MaxHealth=30 SightDistance=25.0 [Horse] AttackDamage=6.0 AttackRange=2.0 -AttackRate=1 +AttackRate=1.0 MaxHealth=30 SightDistance=25.0 [IronGolem] AttackDamage=6.0 AttackRange=2.0 -AttackRate=1 +AttackRate=1.0 MaxHealth=100 SightDistance=25.0 [MagmaCube] AttackDamage=6.0 AttackRange=2.0 -AttackRate=1 +AttackRate=1.0 IsFireproof=1 MaxHealth=16 SightDistance=25.0 @@ -103,48 +102,48 @@ SightDistance=25.0 [Mooshroom] AttackDamage=0.0 AttackRange=2.0 -AttackRate=1 +AttackRate=1.0 MaxHealth=10 SightDistance=25.0 [Ocelot] AttackDamage=0.0 AttackRange=2.0 -AttackRate=1 +AttackRate=1.0 MaxHealth=10 SightDistance=25.0 [Pig] AttackDamage=0.0 AttackRange=2.0 -AttackRate=1 +AttackRate=1.0 MaxHealth=10 SightDistance=25.0 [Rabbit] AttackDamage=0.0 AttackRange=2.0 -AttackRate=1 +AttackRate=1.0 MaxHealth=10 SightDistance=25.0 [Sheep] AttackDamage=0.0 AttackRange=2.0 -AttackRate=1 +AttackRate=1.0 MaxHealth=8 SightDistance=25.0 [Silverfish] AttackDamage=1.0 AttackRange=2.0 -AttackRate=1 +AttackRate=1.0 MaxHealth=8 SightDistance=25.0 [Skeleton] AttackRange=15.0 -AttackRate=1 +AttackRate=3.0 MaxHealth=20 SightDistance=40.0 BurnsInDaylight=1 @@ -152,56 +151,56 @@ BurnsInDaylight=1 [Slime] AttackDamage=4.0 AttackRange=2.0 -AttackRate=1 +AttackRate=1.0 MaxHealth=16 SightDistance=25.0 [SnowGolem] AttackDamage=0.0 AttackRange=2.0 -AttackRate=1 +AttackRate=1.0 MaxHealth=4 SightDistance=25.0 [Spider] AttackDamage=2.0 AttackRange=2.0 -AttackRate=1 +AttackRate=1.0 MaxHealth=16 SightDistance=25.0 [Squid] AttackDamage=0.0 AttackRange=2.0 -AttackRate=1 +AttackRate=1.0 MaxHealth=10 SightDistance=25.0 [Villager] AttackDamage=0.0 AttackRange=2.0 -AttackRate=1 +AttackRate=1.0 MaxHealth=20 SightDistance=25.0 [Witch] AttackDamage=0.0 AttackRange=2.0 -AttackRate=1 +AttackRate=1.0 MaxHealth=26 SightDistance=25.0 [Wolf] AttackDamage=8.0 AttackRange=2.0 -AttackRate=1 +AttackRate=1.0 MaxHealth=20 SightDistance=25.0 [Zombie] AttackDamage=4.0 AttackRange=2.0 -AttackRate=1 +AttackRate=1.0 MaxHealth=20 SightDistance=25.0 BurnsInDaylight=1 @@ -209,7 +208,7 @@ BurnsInDaylight=1 [ZombiePigman] AttackDamage=7.0 AttackRange=2.0 -AttackRate=1 +AttackRate=1.0 IsFireproof=1 MaxHealth=20 SightDistance=25.0 diff --git a/src/Mobs/Monster.cpp b/src/Mobs/Monster.cpp index 7c57e4f2d..233ca70b3 100644 --- a/src/Mobs/Monster.cpp +++ b/src/Mobs/Monster.cpp @@ -883,7 +883,7 @@ void cMonster::InStateEscaping(std::chrono::milliseconds a_Dt, cChunk & a_Chunk) void cMonster::ResetAttackCooldown() { - m_AttackCoolDownTicksLeft = static_cast<int>(3 * 20 * m_AttackRate); // A second has 20 ticks, an attack rate of 1 means 1 hit every 3 seconds + m_AttackCoolDownTicksLeft = static_cast<int>(20 * m_AttackRate); // A second has 20 ticks, an attack rate of 1 means 1 hit every second } |