Core/CombatLog:
- Send more proper hitinfo values in SMSG_ATTACKERSTATEUPDATE (still lot of research todo) - Some renaming and commenting - Minor cleanup in Player::UpdateZone
This commit is contained in:
1 parent
fab1944ae4
commit
786c226b74
4 files changed
+71
-60
No files matched your search
@@ -110,23 +110,27 @@ m_damageType(DIRECT_DAMAGE), m_attackType(dmgInfo.attackType)
|
||||
m_resist = 0;
|
||||
m_block = 0;
|
||||
}
|
||||
|
||||
void DamageInfo::ModifyDamage(int32 amount)
|
||||
{
|
||||
amount = std::min(amount, int32(GetDamage()));
|
||||
m_damage += amount;
|
||||
}
|
||||
|
||||
void DamageInfo::AbsorbDamage(uint32 amount)
|
||||
{
|
||||
amount = std::min(amount, GetDamage());
|
||||
m_absorb += amount;
|
||||
m_damage -= amount;
|
||||
}
|
||||
|
||||
void DamageInfo::ResistDamage(uint32 amount)
|
||||
{
|
||||
amount = std::min(amount, GetDamage());
|
||||
m_resist += amount;
|
||||
m_damage -= amount;
|
||||
}
|
||||
|
||||
void DamageInfo::BlockDamage(uint32 amount)
|
||||
{
|
||||
amount = std::min(amount, GetDamage());
|
||||
@@ -1096,6 +1100,7 @@ void Unit::CalculateMeleeDamage(Unit* victim, uint32 damage, CalcDamageInfo* dam
|
||||
|
||||
if (!victim)
|
||||
return;
|
||||
|
||||
if (!isAlive() || !victim->isAlive())
|
||||
return;
|
||||
|
||||
@@ -1105,12 +1110,11 @@ void Unit::CalculateMeleeDamage(Unit* victim, uint32 damage, CalcDamageInfo* dam
|
||||
case BASE_ATTACK:
|
||||
damageInfo->procAttacker = PROC_FLAG_DONE_MELEE_AUTO_ATTACK | PROC_FLAG_DONE_MAINHAND_ATTACK;
|
||||
damageInfo->procVictim = PROC_FLAG_TAKEN_MELEE_AUTO_ATTACK;
|
||||
damageInfo->HitInfo = HITINFO_NORMALSWING2;
|
||||
break;
|
||||
case OFF_ATTACK:
|
||||
damageInfo->procAttacker = PROC_FLAG_DONE_MELEE_AUTO_ATTACK | PROC_FLAG_DONE_OFFHAND_ATTACK;
|
||||
damageInfo->procVictim = PROC_FLAG_TAKEN_MELEE_AUTO_ATTACK;
|
||||
damageInfo->HitInfo = HITINFO_LEFTSWING;
|
||||
damageInfo->HitInfo = HITINFO_OFFHAND;
|
||||
break;
|
||||
default:
|
||||
return;
|
||||
@@ -1146,29 +1150,29 @@ void Unit::CalculateMeleeDamage(Unit* victim, uint32 damage, CalcDamageInfo* dam
|
||||
switch (damageInfo->hitOutCome)
|
||||
{
|
||||
case MELEE_HIT_EVADE:
|
||||
damageInfo->HitInfo |= HITINFO_MISS|HITINFO_SWINGNOHITSOUND;
|
||||
damageInfo->TargetState = VICTIMSTATE_EVADES;
|
||||
damageInfo->procEx|=PROC_EX_EVADE;
|
||||
damageInfo->HitInfo |= HITINFO_MISS | HITINFO_SWINGNOHITSOUND;
|
||||
damageInfo->TargetState = VICTIMSTATE_EVADES;
|
||||
damageInfo->procEx |= PROC_EX_EVADE;
|
||||
damageInfo->damage = 0;
|
||||
damageInfo->cleanDamage = 0;
|
||||
return;
|
||||
case MELEE_HIT_MISS:
|
||||
damageInfo->HitInfo |= HITINFO_MISS;
|
||||
damageInfo->TargetState = VICTIMSTATE_INTACT;
|
||||
damageInfo->procEx |= PROC_EX_MISS;
|
||||
damageInfo->damage = 0;
|
||||
damageInfo->cleanDamage = 0;
|
||||
damageInfo->HitInfo |= HITINFO_MISS;
|
||||
damageInfo->TargetState = VICTIMSTATE_INTACT;
|
||||
damageInfo->procEx |= PROC_EX_MISS;
|
||||
damageInfo->damage = 0;
|
||||
damageInfo->cleanDamage = 0;
|
||||
break;
|
||||
case MELEE_HIT_NORMAL:
|
||||
damageInfo->TargetState = VICTIMSTATE_HIT;
|
||||
damageInfo->procEx|=PROC_EX_NORMAL_HIT;
|
||||
damageInfo->TargetState = VICTIMSTATE_HIT;
|
||||
damageInfo->procEx |= PROC_EX_NORMAL_HIT;
|
||||
break;
|
||||
case MELEE_HIT_CRIT:
|
||||
{
|
||||
damageInfo->HitInfo |= HITINFO_CRITICALHIT;
|
||||
damageInfo->TargetState = VICTIMSTATE_HIT;
|
||||
damageInfo->HitInfo |= HITINFO_CRITICALHIT;
|
||||
damageInfo->TargetState = VICTIMSTATE_HIT;
|
||||
|
||||
damageInfo->procEx |= PROC_EX_CRITICAL_HIT;
|
||||
damageInfo->procEx |= PROC_EX_CRITICAL_HIT;
|
||||
// Crit bonus calc
|
||||
damageInfo->damage += damageInfo->damage;
|
||||
float mod = 0.0f;
|
||||
@@ -1229,8 +1233,8 @@ void Unit::CalculateMeleeDamage(Unit* victim, uint32 damage, CalcDamageInfo* dam
|
||||
if (leveldif > 3)
|
||||
leveldif = 3;
|
||||
float reducePercent = 1 - leveldif * 0.1f;
|
||||
damageInfo->cleanDamage += damageInfo->damage-uint32(reducePercent * damageInfo->damage);
|
||||
damageInfo->damage = uint32(reducePercent * damageInfo->damage);
|
||||
damageInfo->cleanDamage += damageInfo->damage - uint32(reducePercent * damageInfo->damage);
|
||||
damageInfo->damage = uint32(reducePercent * damageInfo->damage);
|
||||
break;
|
||||
}
|
||||
case MELEE_HIT_CRUSHING:
|
||||
@@ -1244,6 +1248,10 @@ void Unit::CalculateMeleeDamage(Unit* victim, uint32 damage, CalcDamageInfo* dam
|
||||
break;
|
||||
}
|
||||
|
||||
// Always apply HITINFO_AFFECTS_VICTIM in case its not a miss
|
||||
if (!(damageInfo->HitInfo & HITINFO_MISS))
|
||||
damageInfo->HitInfo |= HITINFO_AFFECTS_VICTIM;
|
||||
|
||||
int32 resilienceReduction = damageInfo->damage;
|
||||
if (attackType != RANGED_ATTACK)
|
||||
ApplyResilience(victim, NULL, &resilienceReduction, (damageInfo->hitOutCome == MELEE_HIT_CRIT), CR_CRIT_TAKEN_MELEE);
|
||||
@@ -1259,14 +1267,17 @@ void Unit::CalculateMeleeDamage(Unit* victim, uint32 damage, CalcDamageInfo* dam
|
||||
damageInfo->procVictim |= PROC_FLAG_TAKEN_DAMAGE;
|
||||
// Calculate absorb & resists
|
||||
CalcAbsorbResist(damageInfo->target, SpellSchoolMask(damageInfo->damageSchoolMask), DIRECT_DAMAGE, damageInfo->damage, &damageInfo->absorb, &damageInfo->resist);
|
||||
damageInfo->damage -= damageInfo->absorb + damageInfo->resist;
|
||||
|
||||
if (damageInfo->absorb)
|
||||
{
|
||||
damageInfo->HitInfo |= HITINFO_ABSORB;
|
||||
damageInfo->HitInfo |= (damageInfo->damage - damageInfo->absorb == 0 ? HITINFO_FULL_ABSORB : HITINFO_PARTIAL_ABSORB);
|
||||
damageInfo->procEx |= PROC_EX_ABSORB;
|
||||
}
|
||||
|
||||
if (damageInfo->resist)
|
||||
damageInfo->HitInfo |= HITINFO_RESIST;
|
||||
damageInfo->HitInfo |= (damageInfo->damage - damageInfo->resist == 0 ? HITINFO_FULL_RESIST : HITINFO_PARTIAL_RESIST);
|
||||
|
||||
damageInfo->damage -= damageInfo->absorb + damageInfo->resist;
|
||||
}
|
||||
else // Impossible get negative result but....
|
||||
damageInfo->damage = 0;
|
||||
@@ -2157,8 +2168,8 @@ void Unit::SendMeleeAttackStop(Unit* victim)
|
||||
{
|
||||
WorldPacket data(SMSG_ATTACKSTOP, (8+8+4));
|
||||
data.append(GetPackGUID());
|
||||
data.append(victim ? victim->GetPackGUID() : 0); // can be 0x00...
|
||||
data << uint32(0); // can be 0x1
|
||||
data.append(victim ? victim->GetPackGUID() : 0);
|
||||
data << uint32(0); //! Can also take the value 0x01, which seems related to updating rotation
|
||||
SendMessageToSet(&data, true);
|
||||
sLog->outStaticDebug("WORLD: Sent SMSG_ATTACKSTOP");
|
||||
|
||||
@@ -2988,20 +2999,20 @@ bool Unit::IsNonMeleeSpellCasted(bool withDelayed, bool skipChanneled, bool skip
|
||||
(withDelayed || m_currentSpells[CURRENT_GENERIC_SPELL]->getState() != SPELL_STATE_DELAYED))
|
||||
{
|
||||
if (!isAutoshoot || !(m_currentSpells[CURRENT_GENERIC_SPELL]->m_spellInfo->AttributesEx2 & SPELL_ATTR2_NOT_RESET_AUTO_ACTIONS))
|
||||
return(true);
|
||||
return true;
|
||||
}
|
||||
// channeled spells may be delayed, but they are still considered casted
|
||||
else if (!skipChanneled && m_currentSpells[CURRENT_CHANNELED_SPELL] &&
|
||||
(m_currentSpells[CURRENT_CHANNELED_SPELL]->getState() != SPELL_STATE_FINISHED))
|
||||
{
|
||||
if (!isAutoshoot || !(m_currentSpells[CURRENT_CHANNELED_SPELL]->m_spellInfo->AttributesEx2 & SPELL_ATTR2_NOT_RESET_AUTO_ACTIONS))
|
||||
return(true);
|
||||
return true;
|
||||
}
|
||||
// autorepeat spells may be finished or delayed, but they are still considered casted
|
||||
else if (!skipAutorepeat && m_currentSpells[CURRENT_AUTOREPEAT_SPELL])
|
||||
return(true);
|
||||
return true;
|
||||
|
||||
return(false);
|
||||
return false;
|
||||
}
|
||||
|
||||
void Unit::InterruptNonMeleeSpells(bool withDelayed, uint32 spell_id, bool withInstant)
|
||||
@@ -4846,28 +4857,29 @@ void Unit::SendAttackStateUpdate(CalcDamageInfo* damageInfo)
|
||||
data << uint32(damageInfo->damage); // Sub Damage
|
||||
}
|
||||
|
||||
if (damageInfo->HitInfo & (HITINFO_ABSORB | HITINFO_ABSORB2))
|
||||
if (damageInfo->HitInfo & (HITINFO_FULL_ABSORB | HITINFO_PARTIAL_ABSORB))
|
||||
{
|
||||
for (uint32 i = 0; i < count; ++i)
|
||||
data << uint32(damageInfo->absorb); // Absorb
|
||||
}
|
||||
|
||||
if (damageInfo->HitInfo & (HITINFO_RESIST | HITINFO_RESIST2))
|
||||
if (damageInfo->HitInfo & (HITINFO_FULL_RESIST | HITINFO_PARTIAL_RESIST))
|
||||
{
|
||||
for (uint32 i = 0; i < count; ++i)
|
||||
data << uint32(damageInfo->resist); // Resist
|
||||
}
|
||||
|
||||
data << uint8(damageInfo->TargetState);
|
||||
data << uint32(0);
|
||||
data << uint32(0);
|
||||
data << uint32(0); // Unknown attackerstate
|
||||
data << uint32(0); // Melee spellid
|
||||
|
||||
if (damageInfo->HitInfo & HITINFO_BLOCK)
|
||||
data << uint32(damageInfo->blocked_amount);
|
||||
|
||||
if (damageInfo->HitInfo & HITINFO_UNK3)
|
||||
if (damageInfo->HitInfo & HITINFO_RAGE_GAIN)
|
||||
data << uint32(0);
|
||||
|
||||
//! Probably used for debugging purposes, as it is not known to appear on retail servers
|
||||
if (damageInfo->HitInfo & HITINFO_UNK1)
|
||||
{
|
||||
data << uint32(0);
|
||||
|
||||
Reference in new issue
Block a user