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

Snipe skeleton achievment

master
Rorkh 2021-09-18 13:18:05 +05:00 committed by Tiger Wang
parent 028a5735c5
commit 798fdb0709
6 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Entities/Entity.cpp
View File

@ -396,7 +396,7 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
if (a_TDI.Attacker != nullptr)
{
a_TDI.Attacker->Killed(this);
a_TDI.Attacker->Killed(*this, a_TDI.DamageType);
}
return true;
@ -570,7 +570,7 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
if (a_TDI.Attacker != nullptr)
{
a_TDI.Attacker->Killed(this);
a_TDI.Attacker->Killed(*this, a_TDI.DamageType);
}
}
return true;

4
src/Entities/Entity.h
View File

@ -351,8 +351,8 @@ public:
// tolua_begin
/** Called when the entity kills another entity */
virtual void Killed(cEntity * a_Victim) {}
/** Called when the entity kills another entity. */
virtual void Killed(const cEntity & a_Victim, eDamageType a_DamageType) {}
/** Heals the specified amount of HPs */
virtual void Heal(int a_HitPoints);

21
src/Entities/Player.cpp
View File

@ -883,23 +883,36 @@ void cPlayer::KilledBy(TakeDamageInfo & a_TDI)
void cPlayer::Killed(cEntity * a_Victim)
void cPlayer::Killed(const cEntity & a_Victim, eDamageType a_DamageType)
{
cScoreboard & ScoreBoard = m_World->GetScoreBoard();
if (a_Victim->IsPlayer())
if (a_Victim.IsPlayer())
{
m_Stats.Custom[CustomStatistic::PlayerKills]++;
ScoreBoard.AddPlayerScore(GetName(), cObjective::otPlayerKillCount, 1);
}
else if (a_Victim->IsMob())
else if (a_Victim.IsMob())
{
if (static_cast<cMonster *>(a_Victim)->GetMobFamily() == cMonster::mfHostile)
const auto & Monster = static_cast<const cMonster &>(a_Victim);
if (Monster.GetMobFamily() == cMonster::mfHostile)
{
AwardAchievement(CustomStatistic::AchKillEnemy);
}
if ((Monster.GetMobType() == eMonsterType::mtSkeleton) && (a_DamageType == eDamageType::dtRangedAttack))
{
const double DistX = GetPosX() - Monster.GetPosX();
const double DistZ = GetPosZ() - Monster.GetPosZ();
if ((DistX * DistX + DistZ * DistZ) >= 2500.0)
{
AwardAchievement(CustomStatistic::AchSnipeSkeleton);
}
}
m_Stats.Custom[CustomStatistic::MobKills]++;
}

2
src/Entities/Player.h
View File

@ -410,7 +410,7 @@ public:
virtual void KilledBy(TakeDamageInfo & a_TDI) override;
virtual void Killed(cEntity * a_Victim) override;
virtual void Killed(const cEntity & a_Victim, eDamageType a_DamageType) override;
void Respawn(void); // tolua_export

4
src/Mobs/Skeleton.cpp
View File

@ -68,7 +68,3 @@ void cSkeleton::SpawnOn(cClientHandle & a_ClientHandle)
Super::SpawnOn(a_ClientHandle);
a_ClientHandle.SendEntityEquipment(*this, 0, cItem(E_ITEM_BOW));
}

4
src/Mobs/Skeleton.h
View File

@ -25,7 +25,3 @@ public:
virtual bool IsUndead(void) override { return true; }
} ;