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

Tweak attack ranges

This commit is contained in:
mathiascode 2020-03-30 20:09:06 +03:00 committed by Mattes D
parent 59e38d1a46
commit d5c58c6b17
3 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
Server/monsters.ini
View File

@ -1,6 +1,6 @@
[Bat] [Bat]
AttackDamage=0.0 AttackDamage=0.0
AttackRange=2.0 AttackRange=1.0
AttackRate=1.0 AttackRate=1.0
MaxHealth=6 MaxHealth=6
SightDistance=25.0 SightDistance=25.0
@ -15,21 +15,21 @@ SightDistance=25.0
[CaveSpider] [CaveSpider]
AttackDamage=2.0 AttackDamage=2.0
AttackRange=2.0 AttackRange=1.0
AttackRate=1.0 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=1.0
AttackRate=1.0 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=1.0
AttackRate=1.0 AttackRate=1.0
MaxHealth=10 MaxHealth=10
SightDistance=25.0 SightDistance=25.0
@ -50,7 +50,7 @@ SightDistance=25.0
[Enderman] [Enderman]
AttackDamage=4.0 AttackDamage=4.0
AttackRange=2.0 AttackRange=1.0
AttackRate=1.0 AttackRate=1.0
MaxHealth=40 MaxHealth=40
SightDistance=64.0 SightDistance=64.0
@ -65,21 +65,21 @@ SightDistance=50.0
[Giant] [Giant]
AttackDamage=6.0 AttackDamage=6.0
AttackRange=2.0 AttackRange=1.0
AttackRate=1.0 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=1.0
AttackRate=1.0 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=1.0
AttackRate=1.0 AttackRate=1.0
MaxHealth=30 MaxHealth=30
SightDistance=25.0 SightDistance=25.0
@ -93,7 +93,7 @@ SightDistance=25.0
[MagmaCube] [MagmaCube]
AttackDamage=6.0 AttackDamage=6.0
AttackRange=2.0 AttackRange=1.0
AttackRate=1.0 AttackRate=1.0
IsFireproof=1 IsFireproof=1
MaxHealth=16 MaxHealth=16
@ -101,42 +101,42 @@ SightDistance=25.0
[Mooshroom] [Mooshroom]
AttackDamage=0.0 AttackDamage=0.0
AttackRange=2.0 AttackRange=1.0
AttackRate=1.0 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=1.0
AttackRate=1.0 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=1.0
AttackRate=1.0 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=0.75
AttackRate=1.0 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=1.0
AttackRate=1.0 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=0.75
AttackRate=1.0 AttackRate=1.0
MaxHealth=8 MaxHealth=8
SightDistance=25.0 SightDistance=25.0
@ -150,35 +150,35 @@ BurnsInDaylight=1
[Slime] [Slime]
AttackDamage=4.0 AttackDamage=4.0
AttackRange=2.0 AttackRange=1.0
AttackRate=1.0 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=1.0
AttackRate=1.0 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=1.0
AttackRate=1.0 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=1.0
AttackRate=1.0 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=1.0
AttackRate=1.0 AttackRate=1.0
MaxHealth=20 MaxHealth=20
SightDistance=25.0 SightDistance=25.0
@ -192,14 +192,14 @@ SightDistance=25.0
[Wolf] [Wolf]
AttackDamage=8.0 AttackDamage=8.0
AttackRange=2.0 AttackRange=1.0
AttackRate=1.0 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=1.0
AttackRate=1.0 AttackRate=1.0
MaxHealth=20 MaxHealth=20
SightDistance=25.0 SightDistance=25.0
@ -207,7 +207,7 @@ BurnsInDaylight=1
[ZombiePigman] [ZombiePigman]
AttackDamage=7.0 AttackDamage=7.0
AttackRange=2.0 AttackRange=1.0
AttackRate=1.0 AttackRate=1.0
IsFireproof=1 IsFireproof=1
MaxHealth=20 MaxHealth=20

10
src/Mobs/Monster.h
View File

@ -116,9 +116,9 @@ public:
virtual void InStateChasing (std::chrono::milliseconds a_Dt, cChunk & a_Chunk); virtual void InStateChasing (std::chrono::milliseconds a_Dt, cChunk & a_Chunk);
virtual void InStateEscaping(std::chrono::milliseconds a_Dt, cChunk & a_Chunk); virtual void InStateEscaping(std::chrono::milliseconds a_Dt, cChunk & a_Chunk);
int GetAttackRate() { return static_cast<int>(m_AttackRate); } double GetAttackRate() { return m_AttackRate; }
void SetAttackRate(float a_AttackRate) { m_AttackRate = a_AttackRate; } void SetAttackRate(double a_AttackRate) { m_AttackRate = a_AttackRate; }
void SetAttackRange(int a_AttackRange) { m_AttackRange = a_AttackRange; } void SetAttackRange(double a_AttackRange) { m_AttackRange = a_AttackRange; }
void SetAttackDamage(int a_AttackDamage) { m_AttackDamage = a_AttackDamage; } void SetAttackDamage(int a_AttackDamage) { m_AttackDamage = a_AttackDamage; }
void SetSightDistance(int a_SightDistance) { m_SightDistance = a_SightDistance; } void SetSightDistance(int a_SightDistance) { m_SightDistance = a_SightDistance; }
@ -269,9 +269,9 @@ protected:
AString m_SoundDeath; AString m_SoundDeath;
AString m_SoundAmbient; AString m_SoundAmbient;
float m_AttackRate; double m_AttackRate;
int m_AttackDamage; int m_AttackDamage;
int m_AttackRange; double m_AttackRange;
int m_AttackCoolDownTicksLeft; int m_AttackCoolDownTicksLeft;
int m_SightDistance; int m_SightDistance;

4
src/MonsterConfig.cpp
View File

@ -14,7 +14,7 @@ struct cMonsterConfig::sAttributesStruct
AString m_Name; AString m_Name;
int m_SightDistance; int m_SightDistance;
int m_AttackDamage; int m_AttackDamage;
int m_AttackRange; double m_AttackRange;
double m_AttackRate; double m_AttackRate;
double m_MaxHealth; double m_MaxHealth;
bool m_IsFireproof; bool m_IsFireproof;
@ -71,7 +71,7 @@ void cMonsterConfig::Initialize()
AString Name = MonstersIniFile.GetKeyName(i); AString Name = MonstersIniFile.GetKeyName(i);
Attributes.m_Name = Name; Attributes.m_Name = Name;
Attributes.m_AttackDamage = MonstersIniFile.GetValueI(Name, "AttackDamage", 0); Attributes.m_AttackDamage = MonstersIniFile.GetValueI(Name, "AttackDamage", 0);
Attributes.m_AttackRange = MonstersIniFile.GetValueI(Name, "AttackRange", 0); Attributes.m_AttackRange = MonstersIniFile.GetValueF(Name, "AttackRange", 0);
Attributes.m_SightDistance = MonstersIniFile.GetValueI(Name, "SightDistance", 0); Attributes.m_SightDistance = MonstersIniFile.GetValueI(Name, "SightDistance", 0);
Attributes.m_AttackRate = MonstersIniFile.GetValueF(Name, "AttackRate", 0); Attributes.m_AttackRate = MonstersIniFile.GetValueF(Name, "AttackRate", 0);
Attributes.m_MaxHealth = MonstersIniFile.GetValueF(Name, "MaxHealth", 1); Attributes.m_MaxHealth = MonstersIniFile.GetValueF(Name, "MaxHealth", 1);