mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-12 19:37:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[10767] Show <overkill> value in combat logs.

Browse source 
Signed-off-by: Ambal <pogrebniak@gala.net>
This commit is contained in:
zergtmn 2010-11-21 10:51:29 +02:00 • committed by Ambal
parent 06e8d8c0ea
commit 272fa74854
4 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/game/SpellAuras.cpp
View file

@ -6569,7 +6569,8 @@ void Aura::PeriodicTick()
pdamage = (pdamage <= absorb + resist) ? 0 : (pdamage - absorb - resist); pdamage = (pdamage <= absorb + resist) ? 0 : (pdamage - absorb - resist);
SpellPeriodicAuraLogInfo pInfo(this, pdamage, 0, absorb, resist, 0.0f, isCrit); uint32 overkill = pdamage > target->GetHealth() ? pdamage - target->GetHealth() : 0;
SpellPeriodicAuraLogInfo pInfo(this, pdamage, overkill, absorb, resist, 0.0f, isCrit);
target->SendPeriodicAuraLog(&pInfo); target->SendPeriodicAuraLog(&pInfo);
if (pdamage) if (pdamage)
@ -6648,9 +6649,6 @@ void Aura::PeriodicTick()
target->CalculateDamageAbsorbAndResist(pCaster, GetSpellSchoolMask(spellProto), DOT, pdamage, &absorb, &resist, !(spellProto->AttributesEx2 & SPELL_ATTR_EX2_CANT_REFLECTED)); target->CalculateDamageAbsorbAndResist(pCaster, GetSpellSchoolMask(spellProto), DOT, pdamage, &absorb, &resist, !(spellProto->AttributesEx2 & SPELL_ATTR_EX2_CANT_REFLECTED));
if(target->GetHealth() < pdamage)
pdamage = uint32(target->GetHealth());
DETAIL_FILTER_LOG(LOG_FILTER_PERIODIC_AFFECTS, "PeriodicTick: %s health leech of %s for %u dmg inflicted by %u abs is %u", DETAIL_FILTER_LOG(LOG_FILTER_PERIODIC_AFFECTS, "PeriodicTick: %s health leech of %s for %u dmg inflicted by %u abs is %u",
GetCasterGuid().GetString().c_str(), target->GetObjectGuid().GetString().c_str(), pdamage, GetId(),absorb); GetCasterGuid().GetString().c_str(), target->GetObjectGuid().GetString().c_str(), pdamage, GetId(),absorb);

17
src/game/Unit.cpp
View file

@ -1755,12 +1755,15 @@ void Unit::DealMeleeDamage(CalcDamageInfo *damageInfo, bool durabilityLoss)
pVictim->DealDamageMods(this,damage,NULL); pVictim->DealDamageMods(this,damage,NULL);
uint32 targetHealth = GetHealth();
uint32 overkill = damage > targetHealth ? damage - targetHealth : 0;
WorldPacket data(SMSG_SPELLDAMAGESHIELD,(8+8+4+4+4+4)); WorldPacket data(SMSG_SPELLDAMAGESHIELD,(8+8+4+4+4+4));
data << pVictim->GetObjectGuid(); data << pVictim->GetObjectGuid();
data << GetObjectGuid(); data << GetObjectGuid();
data << uint32(i_spellProto->Id); data << uint32(i_spellProto->Id);
data << uint32(damage); // Damage data << uint32(damage); // Damage
data << uint32(0); // Overkill data << uint32(overkill); // Overkill
data << uint32(i_spellProto->SchoolMask); data << uint32(i_spellProto->SchoolMask);
pVictim->SendMessageToSet(&data, true ); pVictim->SendMessageToSet(&data, true );
@ -5072,12 +5075,15 @@ void Unit::RemoveAllGameObjects()
void Unit::SendSpellNonMeleeDamageLog(SpellNonMeleeDamage *log) void Unit::SendSpellNonMeleeDamageLog(SpellNonMeleeDamage *log)
{ {
uint32 targetHealth = log->target->GetHealth();
uint32 overkill = log->damage > targetHealth ? log->damage - targetHealth : 0;
WorldPacket data(SMSG_SPELLNONMELEEDAMAGELOG, (16+4+4+4+1+4+4+1+1+4+4+1)); // we guess size WorldPacket data(SMSG_SPELLNONMELEEDAMAGELOG, (16+4+4+4+1+4+4+1+1+4+4+1)); // we guess size
data << log->target->GetPackGUID(); data << log->target->GetPackGUID();
data << log->attacker->GetPackGUID(); data << log->attacker->GetPackGUID();
data << uint32(log->SpellID); data << uint32(log->SpellID);
data << uint32(log->damage); // damage amount data << uint32(log->damage); // damage amount
data << uint32(log->overkill); // overkill data << uint32(overkill); // overkill
data << uint8 (log->schoolMask); // damage school data << uint8 (log->schoolMask); // damage school
data << uint32(log->absorb); // AbsorbedDamage data << uint32(log->absorb); // AbsorbedDamage
data << uint32(log->resist); // resist data << uint32(log->resist); // resist
@ -5179,13 +5185,16 @@ void Unit::SendAttackStateUpdate(CalcDamageInfo *damageInfo)
{ {
DEBUG_FILTER_LOG(LOG_FILTER_COMBAT, "WORLD: Sending SMSG_ATTACKERSTATEUPDATE"); DEBUG_FILTER_LOG(LOG_FILTER_COMBAT, "WORLD: Sending SMSG_ATTACKERSTATEUPDATE");
uint32 targetHealth = damageInfo->target->GetHealth();
uint32 overkill = damageInfo->damage > targetHealth ? damageInfo->damage - targetHealth : 0;
uint32 count = 1; uint32 count = 1;
WorldPacket data(SMSG_ATTACKERSTATEUPDATE, 16 + 45); // we guess size WorldPacket data(SMSG_ATTACKERSTATEUPDATE, 16 + 45); // we guess size
data << uint32(damageInfo->HitInfo); data << uint32(damageInfo->HitInfo);
data << damageInfo->attacker->GetPackGUID(); data << damageInfo->attacker->GetPackGUID();
data << damageInfo->target->GetPackGUID(); data << damageInfo->target->GetPackGUID();
data << uint32(damageInfo->damage); // Full damage data << uint32(damageInfo->damage); // Full damage
data << uint32(0); // overkill value data << uint32(overkill); // overkill value
data << uint8(count); // Sub damage count data << uint8(count); // Sub damage count
for(uint32 i = 0; i < count; ++i) for(uint32 i = 0; i < count; ++i)
@ -10785,4 +10794,4 @@ bool Unit::IsAllowedDamageInArea(Unit* pVictim) const
return false; return false;
return true; return true;
} }

5
src/game/Unit.h
View file

@ -905,7 +905,7 @@ struct CalcDamageInfo
// Spell damage info structure based on structure sending in SMSG_SPELLNONMELEEDAMAGELOG opcode // Spell damage info structure based on structure sending in SMSG_SPELLNONMELEEDAMAGELOG opcode
struct SpellNonMeleeDamage{ struct SpellNonMeleeDamage{
SpellNonMeleeDamage(Unit *_attacker, Unit *_target, uint32 _SpellID, SpellSchoolMask _schoolMask) SpellNonMeleeDamage(Unit *_attacker, Unit *_target, uint32 _SpellID, SpellSchoolMask _schoolMask)
: target(_target), attacker(_attacker), SpellID(_SpellID), damage(0), overkill(0), schoolMask(_schoolMask), : target(_target), attacker(_attacker), SpellID(_SpellID), damage(0), schoolMask(_schoolMask),
absorb(0), resist(0), physicalLog(false), unused(false), blocked(0), HitInfo(0) absorb(0), resist(0), physicalLog(false), unused(false), blocked(0), HitInfo(0)
{} {}
@ -913,7 +913,6 @@ struct SpellNonMeleeDamage{
Unit *attacker; Unit *attacker;
uint32 SpellID; uint32 SpellID;
uint32 damage; uint32 damage;
uint32 overkill;
SpellSchoolMask schoolMask; SpellSchoolMask schoolMask;
uint32 absorb; uint32 absorb;
uint32 resist; uint32 resist;
@ -2134,4 +2133,4 @@ inline void Unit::SendMonsterMoveByPath(Path<Elem,Node> const& path, uint32 star
SendMessageToSet(&data, true); SendMessageToSet(&data, true);
} }
#endif #endif

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "10766" #define REVISION_NR "10767"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__