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

Add BurnsInDaylight to Lua API and Monsters.ini (#4295)

Browse Source 
* Monster.h: Export SetBurnsInDaylight

This commit also adds BurnsInDaylight to check if the Monster burns in daylight
or not.

Closes https://github.com/cuberite/cuberite/issues/4294

* MonsterConfig.cpp: Add BurnsInDaylight

Closes https://github.com/cuberite/cuberite/issues/4294
This commit is contained in:
Muhammad Kaisar Arkhan 2018-09-25 03:32:47 +07:00 committed by Alexander Harkness
parent ee84197014
commit 73689024f0
6 changed files with 40 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Server/Plugins/APIDump/APIDesc.lua
View File

@ -8771,6 +8771,16 @@ a_Player:OpenWindow(Window);
]], ]],
Functions = Functions =
{ {
BurnsInDaylight =
{
Returns =
{
{
Type = "boolean",
},
},
Notes = "Returns whether the mob burns in daylight.",
},
CanBeLeashed = CanBeLeashed =
{ {
Returns = Returns =
@ -8990,6 +9000,17 @@ a_Player:OpenWindow(Window);
}, },
Notes = "Sets the age of the monster", Notes = "Sets the age of the monster",
}, },
SetBurnsInDaylight =
{
Params =
{
{
Name = "BurnsInDaylight",
Type = "boolean",
},
},
Notes = "Sets whether the mob burns in daylight. Only evaluated at next burn-decision tick",
},
SetCanBeLeashed = SetCanBeLeashed =
{ {
Params = Params =

2
Server/monsters.ini
View File

@ -147,6 +147,7 @@ AttackRange=15.0
AttackRate=1 AttackRate=1
MaxHealth=20 MaxHealth=20
SightDistance=40.0 SightDistance=40.0
BurnsInDaylight=1
[Slime] [Slime]
AttackDamage=4.0 AttackDamage=4.0
@ -203,6 +204,7 @@ AttackRange=2.0
AttackRate=1 AttackRate=1
MaxHealth=20 MaxHealth=20
SightDistance=25.0 SightDistance=25.0
BurnsInDaylight=1
[ZombiePigman] [ZombiePigman]
AttackDamage=7.0 AttackDamage=7.0

4
src/Mobs/Monster.h
View File

@ -136,8 +136,8 @@ public:
void SetCanPickUpLoot(bool a_CanPickUpLoot) { m_CanPickUpLoot = a_CanPickUpLoot; } void SetCanPickUpLoot(bool a_CanPickUpLoot) { m_CanPickUpLoot = a_CanPickUpLoot; }
void ResetAttackCooldown(); void ResetAttackCooldown();
/** Sets whether the mob burns in daylight. Only evaluated at next burn-decision tick */ void SetBurnsInDaylight(bool a_BurnsInDaylight) { m_BurnsInDaylight = a_BurnsInDaylight; } // tolua_export
void SetBurnsInDaylight(bool a_BurnsInDaylight) { m_BurnsInDaylight = a_BurnsInDaylight; } bool BurnsInDaylight() const { return m_BurnsInDaylight; } // tolua_export
double GetRelativeWalkSpeed(void) const { return m_RelativeWalkSpeed; } // tolua_export double GetRelativeWalkSpeed(void) const { return m_RelativeWalkSpeed; } // tolua_export
void SetRelativeWalkSpeed(double a_WalkSpeed) { m_RelativeWalkSpeed = a_WalkSpeed; } // tolua_export void SetRelativeWalkSpeed(double a_WalkSpeed) { m_RelativeWalkSpeed = a_WalkSpeed; } // tolua_export

1
src/Mobs/Skeleton.cpp
View File

@ -13,7 +13,6 @@ cSkeleton::cSkeleton(bool IsWither) :
super("Skeleton", mtSkeleton, "entity.skeleton.hurt", "entity.skeleton.death", 0.6, 1.8), super("Skeleton", mtSkeleton, "entity.skeleton.hurt", "entity.skeleton.death", 0.6, 1.8),
m_bIsWither(IsWither) m_bIsWither(IsWither)
{ {
SetBurnsInDaylight(true);
} }

1
src/Mobs/Zombie.cpp
View File

@ -14,7 +14,6 @@ cZombie::cZombie(bool a_IsVillagerZombie) :
m_IsVillagerZombie(a_IsVillagerZombie), m_IsVillagerZombie(a_IsVillagerZombie),
m_IsConverting(false) m_IsConverting(false)
{ {
SetBurnsInDaylight(true);
} }

27
src/MonsterConfig.cpp
View File

@ -18,6 +18,7 @@ struct cMonsterConfig::sAttributesStruct
double m_AttackRate; double m_AttackRate;
int m_MaxHealth; int m_MaxHealth;
bool m_IsFireproof; bool m_IsFireproof;
bool m_BurnsInDaylight;
}; };
@ -69,12 +70,13 @@ void cMonsterConfig::Initialize()
sAttributesStruct Attributes; sAttributesStruct Attributes;
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.GetValueI(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.GetValueI(Name, "MaxHealth", 1); Attributes.m_MaxHealth = MonstersIniFile.GetValueI(Name, "MaxHealth", 1);
Attributes.m_IsFireproof = MonstersIniFile.GetValueB(Name, "IsFireproof", false); Attributes.m_IsFireproof = MonstersIniFile.GetValueB(Name, "IsFireproof", false);
Attributes.m_BurnsInDaylight = MonstersIniFile.GetValueB(Name, "BurnsInDaylight", false);
m_pState->AttributesList.push_front(Attributes); m_pState->AttributesList.push_front(Attributes);
} // for i - SplitList[] } // for i - SplitList[]
} }
@ -90,12 +92,13 @@ void cMonsterConfig::AssignAttributes(cMonster * a_Monster, const AString & a_Na
{ {
if (itr->m_Name.compare(a_Name) == 0) if (itr->m_Name.compare(a_Name) == 0)
{ {
a_Monster->SetAttackDamage (itr->m_AttackDamage); a_Monster->SetAttackDamage (itr->m_AttackDamage);
a_Monster->SetAttackRange (itr->m_AttackRange); a_Monster->SetAttackRange (itr->m_AttackRange);
a_Monster->SetSightDistance(itr->m_SightDistance); a_Monster->SetSightDistance (itr->m_SightDistance);
a_Monster->SetAttackRate (static_cast<float>(itr->m_AttackRate)); a_Monster->SetAttackRate (static_cast<float>(itr->m_AttackRate));
a_Monster->SetMaxHealth (itr->m_MaxHealth); a_Monster->SetMaxHealth (itr->m_MaxHealth);
a_Monster->SetIsFireproof (itr->m_IsFireproof); a_Monster->SetIsFireproof (itr->m_IsFireproof);
a_Monster->SetBurnsInDaylight(itr->m_BurnsInDaylight);
return; return;
} }
} // for itr - m_pState->AttributesList[] } // for itr - m_pState->AttributesList[]