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

Decrease attack cooldown for monsters (#4542)

Browse Source 
* Decrease attack cooldown for monsters

* Nerf some mobs

* Decimal points
This commit is contained in:
Mat 2020-03-26 20:11:43 +02:00 committed by GitHub
parent 84f86a467e
commit 2b32bb0b19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
Server/monsters.ini
View File

@ -1,14 +1,14 @@
[Bat] [Bat]
AttackDamage=0.0 AttackDamage=0.0
AttackRange=2.0 AttackRange=2.0
AttackRate=1 AttackRate=1.0
MaxHealth=6 MaxHealth=6
SightDistance=25.0 SightDistance=25.0
[Blaze] [Blaze]
AttackDamage=6.0 AttackDamage=6.0
AttackRange=15.0 AttackRange=15.0
AttackRate=1 AttackRate=6.0
IsFireproof=1 IsFireproof=1
MaxHealth=20 MaxHealth=20
SightDistance=25.0 SightDistance=25.0
@ -16,50 +16,49 @@ SightDistance=25.0
[CaveSpider] [CaveSpider]
AttackDamage=2.0 AttackDamage=2.0
AttackRange=2.0 AttackRange=2.0
AttackRate=1 AttackRate=1.0
MaxHealth=12 MaxHealth=12
SightDistance=25.0 SightDistance=25.0
[Chicken] [Chicken]
AttackDamage=0.0 AttackDamage=0.0
AttackRange=2.0 AttackRange=2.0
AttackRate=1 AttackRate=1.0
MaxHealth=4 MaxHealth=4
SightDistance=25.0 SightDistance=25.0
[Cow] [Cow]
AttackDamage=0.0 AttackDamage=0.0
AttackRange=2.0 AttackRange=2.0
AttackRate=1 AttackRate=1.0
MaxHealth=10 MaxHealth=10
SightDistance=25.0 SightDistance=25.0
[Creeper] [Creeper]
AttackDamage=0.0 AttackDamage=0.0
AttackRange=3.0 AttackRange=3.0
AttackRate=1 AttackRate=1.0
MaxHealth=20 MaxHealth=20
SightDistance=25.0 SightDistance=25.0
[EnderDragon] [EnderDragon]
AttackDamage=6.0 AttackDamage=6.0
AttackRange=2.0 AttackRange=2.0
AttackRate=1 AttackRate=1.0
MaxHealth=200 MaxHealth=200
SightDistance=25.0 SightDistance=25.0
[Enderman] [Enderman]
AttackDamage=4.0 AttackDamage=4.0
AttackRange=2.0 AttackRange=2.0
AttackRate=1 AttackRate=1.0
MaxHealth=40 MaxHealth=40
SightDistance=64.0 SightDistance=64.0
[Ghast] [Ghast]
AttackDamage=0.0 AttackDamage=0.0
AttackRange=50.0 AttackRange=50.0
AttackRate=1 AttackRate=3.0
IsFireproof=1 IsFireproof=1
MaxHealth=10 MaxHealth=10
SightDistance=50.0 SightDistance=50.0
@ -67,35 +66,35 @@ SightDistance=50.0
[Giant] [Giant]
AttackDamage=6.0 AttackDamage=6.0
AttackRange=2.0 AttackRange=2.0
AttackRate=1 AttackRate=1.0
MaxHealth=100 MaxHealth=100
SightDistance=25.0 SightDistance=25.0
[Guardian] [Guardian]
AttackDamage=9.0 AttackDamage=9.0
AttackRange=2.0 AttackRange=2.0
AttackRate=1 AttackRate=1.0
MaxHealth=30 MaxHealth=30
SightDistance=25.0 SightDistance=25.0
[Horse] [Horse]
AttackDamage=6.0 AttackDamage=6.0
AttackRange=2.0 AttackRange=2.0
AttackRate=1 AttackRate=1.0
MaxHealth=30 MaxHealth=30
SightDistance=25.0 SightDistance=25.0
[IronGolem] [IronGolem]
AttackDamage=6.0 AttackDamage=6.0
AttackRange=2.0 AttackRange=2.0
AttackRate=1 AttackRate=1.0
MaxHealth=100 MaxHealth=100
SightDistance=25.0 SightDistance=25.0
[MagmaCube] [MagmaCube]
AttackDamage=6.0 AttackDamage=6.0
AttackRange=2.0 AttackRange=2.0
AttackRate=1 AttackRate=1.0
IsFireproof=1 IsFireproof=1
MaxHealth=16 MaxHealth=16
SightDistance=25.0 SightDistance=25.0
@ -103,48 +102,48 @@ SightDistance=25.0
[Mooshroom] [Mooshroom]
AttackDamage=0.0 AttackDamage=0.0
AttackRange=2.0 AttackRange=2.0
AttackRate=1 AttackRate=1.0
MaxHealth=10 MaxHealth=10
SightDistance=25.0 SightDistance=25.0
[Ocelot] [Ocelot]
AttackDamage=0.0 AttackDamage=0.0
AttackRange=2.0 AttackRange=2.0
AttackRate=1 AttackRate=1.0
MaxHealth=10 MaxHealth=10
SightDistance=25.0 SightDistance=25.0
[Pig] [Pig]
AttackDamage=0.0 AttackDamage=0.0
AttackRange=2.0 AttackRange=2.0
AttackRate=1 AttackRate=1.0
MaxHealth=10 MaxHealth=10
SightDistance=25.0 SightDistance=25.0
[Rabbit] [Rabbit]
AttackDamage=0.0 AttackDamage=0.0
AttackRange=2.0 AttackRange=2.0
AttackRate=1 AttackRate=1.0
MaxHealth=10 MaxHealth=10
SightDistance=25.0 SightDistance=25.0
[Sheep] [Sheep]
AttackDamage=0.0 AttackDamage=0.0
AttackRange=2.0 AttackRange=2.0
AttackRate=1 AttackRate=1.0
MaxHealth=8 MaxHealth=8
SightDistance=25.0 SightDistance=25.0
[Silverfish] [Silverfish]
AttackDamage=1.0 AttackDamage=1.0
AttackRange=2.0 AttackRange=2.0
AttackRate=1 AttackRate=1.0
MaxHealth=8 MaxHealth=8
SightDistance=25.0 SightDistance=25.0
[Skeleton] [Skeleton]
AttackRange=15.0 AttackRange=15.0
AttackRate=1 AttackRate=3.0
MaxHealth=20 MaxHealth=20
SightDistance=40.0 SightDistance=40.0
BurnsInDaylight=1 BurnsInDaylight=1
@ -152,56 +151,56 @@ BurnsInDaylight=1
[Slime] [Slime]
AttackDamage=4.0 AttackDamage=4.0
AttackRange=2.0 AttackRange=2.0
AttackRate=1 AttackRate=1.0
MaxHealth=16 MaxHealth=16
SightDistance=25.0 SightDistance=25.0
[SnowGolem] [SnowGolem]
AttackDamage=0.0 AttackDamage=0.0
AttackRange=2.0 AttackRange=2.0
AttackRate=1 AttackRate=1.0
MaxHealth=4 MaxHealth=4
SightDistance=25.0 SightDistance=25.0
[Spider] [Spider]
AttackDamage=2.0 AttackDamage=2.0
AttackRange=2.0 AttackRange=2.0
AttackRate=1 AttackRate=1.0
MaxHealth=16 MaxHealth=16
SightDistance=25.0 SightDistance=25.0
[Squid] [Squid]
AttackDamage=0.0 AttackDamage=0.0
AttackRange=2.0 AttackRange=2.0
AttackRate=1 AttackRate=1.0
MaxHealth=10 MaxHealth=10
SightDistance=25.0 SightDistance=25.0
[Villager] [Villager]
AttackDamage=0.0 AttackDamage=0.0
AttackRange=2.0 AttackRange=2.0
AttackRate=1 AttackRate=1.0
MaxHealth=20 MaxHealth=20
SightDistance=25.0 SightDistance=25.0
[Witch] [Witch]
AttackDamage=0.0 AttackDamage=0.0
AttackRange=2.0 AttackRange=2.0
AttackRate=1 AttackRate=1.0
MaxHealth=26 MaxHealth=26
SightDistance=25.0 SightDistance=25.0
[Wolf] [Wolf]
AttackDamage=8.0 AttackDamage=8.0
AttackRange=2.0 AttackRange=2.0
AttackRate=1 AttackRate=1.0
MaxHealth=20 MaxHealth=20
SightDistance=25.0 SightDistance=25.0
[Zombie] [Zombie]
AttackDamage=4.0 AttackDamage=4.0
AttackRange=2.0 AttackRange=2.0
AttackRate=1 AttackRate=1.0
MaxHealth=20 MaxHealth=20
SightDistance=25.0 SightDistance=25.0
BurnsInDaylight=1 BurnsInDaylight=1
@ -209,7 +208,7 @@ BurnsInDaylight=1
[ZombiePigman] [ZombiePigman]
AttackDamage=7.0 AttackDamage=7.0
AttackRange=2.0 AttackRange=2.0
AttackRate=1 AttackRate=1.0
IsFireproof=1 IsFireproof=1
MaxHealth=20 MaxHealth=20
SightDistance=25.0 SightDistance=25.0

2
src/Mobs/Monster.cpp
View File

@ -883,7 +883,7 @@ void cMonster::InStateEscaping(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
void cMonster::ResetAttackCooldown() 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
} }