josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*Send overkill messages to client.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
QAston
2009-04-19 15:44:11 +02:00
parent 568879e109
commit 73749e13fe
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/SpellAuras.cpp
+3 -3
View File
@@ -5883,6 +5883,8 @@ void AuraEffect::PeriodicTick()
sLog.outDetail("PeriodicTick: %u (TypeId: %u) heal of %u (TypeId: %u) for %u health inflicted by %u", sLog.outDetail("PeriodicTick: %u (TypeId: %u) heal of %u (TypeId: %u) for %u health inflicted by %u",
GUID_LOPART(GetCasterGUID()), GuidHigh2TypeId(GUID_HIPART(GetCasterGUID())), m_target->GetGUIDLow(), m_target->GetTypeId(), pdamage, GetId()); GUID_LOPART(GetCasterGUID()), GuidHigh2TypeId(GUID_HIPART(GetCasterGUID())), m_target->GetGUIDLow(), m_target->GetTypeId(), pdamage, GetId());
int32 gain = m_target->ModifyHealth(pdamage);
WorldPacket data(SMSG_PERIODICAURALOG, (21+16));// we guess size WorldPacket data(SMSG_PERIODICAURALOG, (21+16));// we guess size
data.append(m_target->GetPackGUID()); data.append(m_target->GetPackGUID());
data.appendPackGUID(GetCasterGUID()); data.appendPackGUID(GetCasterGUID());
@@ -5890,11 +5892,9 @@ void AuraEffect::PeriodicTick()
data << uint32(1); data << uint32(1);
data << uint32(m_auraName); data << uint32(m_auraName);
data << (uint32)pdamage; data << (uint32)pdamage;
data << uint32(0); // wotlk data << uint32(pdamage - gain); // wotlk
m_target->SendMessageToSet(&data,true); m_target->SendMessageToSet(&data,true);
int32 gain = m_target->ModifyHealth(pdamage);
// add HoTs to amount healed in bgs // add HoTs to amount healed in bgs
if( pCaster->GetTypeId() == TYPEID_PLAYER ) if( pCaster->GetTypeId() == TYPEID_PLAYER )
if( BattleGround *bg = ((Player*)pCaster)->GetBattleGround() ) if( BattleGround *bg = ((Player*)pCaster)->GetBattleGround() )
src/game/Unit.cpp
+10 -8
View File
@@ -4442,7 +4442,7 @@ void Unit::SendSpellNonMeleeDamageLog(SpellNonMeleeDamage *log)
data.append(log->attacker->GetPackGUID()); data.append(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(0); data << uint32(int32 (log->target->GetHealth()-log->damage ) >0 ? 0 : log->damage - log->target->GetHealth());
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
@@ -4461,8 +4461,9 @@ void Unit::SendSpellNonMeleeDamageLog(Unit *target,uint32 SpellID,uint32 Damage,
data.append(target->GetPackGUID()); data.append(target->GetPackGUID());
data.append(GetPackGUID()); data.append(GetPackGUID());
data << uint32(SpellID); data << uint32(SpellID);
data << uint32(Damage-AbsorbedDamage-Resist-Blocked); int32 damageDone = Damage-AbsorbedDamage-Resist-Blocked;
data << uint32(0); // wotlk data << uint32(damageDone);
data << uint32(int32 (target->GetHealth()-damageDone ) >0 ? 0 : damageDone - target->GetHealth());// wotlk
data << uint8(damageSchoolMask); // spell school data << uint8(damageSchoolMask); // spell school
data << uint32(AbsorbedDamage); // AbsorbedDamage data << uint32(AbsorbedDamage); // AbsorbedDamage
data << uint32(Resist); // resist data << uint32(Resist); // resist
@@ -4507,7 +4508,7 @@ void Unit::SendAttackStateUpdate(CalcDamageInfo *damageInfo)
data.append(GetPackGUID()); data.append(GetPackGUID());
data.append(damageInfo->target->GetPackGUID()); data.append(damageInfo->target->GetPackGUID());
data << (uint32)(damageInfo->damage); // Full damage data << (uint32)(damageInfo->damage); // Full damage
data << uint32(0); // overkill value data << uint32(int32 (damageInfo->target->GetHealth()-damageInfo->damage ) >0 ? 0 : damageInfo->damage - damageInfo->target->GetHealth()); // Overkill
data << (uint8)count; // Sub damage count data << (uint8)count; // Sub damage count
@@ -4570,15 +4571,16 @@ void Unit::SendAttackStateUpdate(uint32 HitInfo, Unit *target, uint8 SwingType,
data << uint32(HitInfo); // flags data << uint32(HitInfo); // flags
data.append(GetPackGUID()); data.append(GetPackGUID());
data.append(target->GetPackGUID()); data.append(target->GetPackGUID());
data << uint32(Damage-AbsorbDamage-Resist-BlockedAmount);// damage int32 damageDone = Damage-AbsorbDamage-Resist-BlockedAmount;
data << uint32(0); // overkill value data << uint32(damageDone);// damage
data << uint32(int32 (target->GetHealth()-damageDone ) >0 ? 0 : damageDone - target->GetHealth()); // Overkill
data << (uint8)SwingType; // count? data << (uint8)SwingType; // count?
// for(i = 0; i < SwingType; ++i) // for(i = 0; i < SwingType; ++i)
data << (uint32)damageSchoolMask; data << (uint32)damageSchoolMask;
data << (float)(Damage-AbsorbDamage-Resist-BlockedAmount); data << (float)(damageDone);
data << (uint32)(Damage-AbsorbDamage-Resist-BlockedAmount); data << (uint32)(damageDone);
// end loop // end loop
if(HitInfo & (HITINFO_ABSORB | HITINFO_ABSORB2)) if(HitInfo & (HITINFO_ABSORB | HITINFO_ABSORB2))