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

Fix issues with NPC that have nonphysical melee damage

Browse Source 
Remove Ranged attack from attackerstateupdate() children function (Ranged attacks are always done using spells)

--HG--
branch : trunk
This commit is contained in:
thenecromancer
2010-03-19 08:26:44 +01:00
parent 812874a55b
commit e67274392e
1 changed files with 11 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Unit.cpp
+11 -29
View File
@@ -1212,13 +1212,8 @@ void Unit::CalculateMeleeDamage(Unit *pVictim, uint32 damage, CalcDamageInfo *da
damageInfo->procVictim = PROC_FLAG_TAKEN_MELEE_HIT;//|PROC_FLAG_TAKEN_OFFHAND_HIT // not used damageInfo->procVictim = PROC_FLAG_TAKEN_MELEE_HIT;//|PROC_FLAG_TAKEN_OFFHAND_HIT // not used
damageInfo->HitInfo = HITINFO_LEFTSWING; damageInfo->HitInfo = HITINFO_LEFTSWING;
break; break;
case RANGED_ATTACK:
damageInfo->procAttacker = PROC_FLAG_SUCCESSFUL_RANGED_HIT;
damageInfo->procVictim = PROC_FLAG_TAKEN_RANGED_HIT;
damageInfo->HitInfo = HITINFO_UNK2;// test
break;
default: default:
break; return;
} }
// Physical Immune check // Physical Immune check
@@ -1235,21 +1230,18 @@ void Unit::CalculateMeleeDamage(Unit *pVictim, uint32 damage, CalcDamageInfo *da
damage += CalculateDamage(damageInfo->attackType, false, true); damage += CalculateDamage(damageInfo->attackType, false, true);
// Add melee damage bonus // Add melee damage bonus
MeleeDamageBonus(damageInfo->target, &damage, damageInfo->attackType); MeleeDamageBonus(damageInfo->target, &damage, damageInfo->attackType);
// Calculate armor reduction // Calculate armor reduction
damageInfo->damage = CalcArmorReducedDamage(damageInfo->target, damage, NULL , damageInfo->attackType); if (damageInfo->damageSchoolMask & SPELL_SCHOOL_MASK_NORMAL)
damageInfo->cleanDamage += damage - damageInfo->damage; {
damageInfo->damage = CalcArmorReducedDamage(damageInfo->target, damage, NULL , damageInfo->attackType);
damageInfo->cleanDamage += damage - damageInfo->damage;
}
else
damageInfo->damage = damage;
damageInfo->hitOutCome = RollMeleeOutcomeAgainst(damageInfo->target, damageInfo->attackType); damageInfo->hitOutCome = RollMeleeOutcomeAgainst(damageInfo->target, damageInfo->attackType);
// Disable parry or dodge for ranged attack
if (damageInfo->attackType == RANGED_ATTACK)
{
if (damageInfo->hitOutCome == MELEE_HIT_PARRY)
damageInfo->hitOutCome = MELEE_HIT_NORMAL;
else if (damageInfo->hitOutCome == MELEE_HIT_DODGE)
damageInfo->hitOutCome = MELEE_HIT_MISS;
}
switch (damageInfo->hitOutCome) switch (damageInfo->hitOutCome)
{ {
case MELEE_HIT_EVADE: case MELEE_HIT_EVADE:
@@ -1302,12 +1294,7 @@ void Unit::CalculateMeleeDamage(Unit *pVictim, uint32 damage, CalcDamageInfo *da
damageInfo->damage = int32((damageInfo->damage) * float((100.0f + mod)/100.0f)); damageInfo->damage = int32((damageInfo->damage) * float((100.0f + mod)/100.0f));
// Resilience - reduce crit damage // Resilience - reduce crit damage
uint32 resilienceReduction; uint32 resilienceReduction = pVictim->GetMeleeCritDamageReduction(damageInfo->damage);
if (attackType != RANGED_ATTACK)
resilienceReduction = pVictim->GetMeleeCritDamageReduction(damageInfo->damage);
else
resilienceReduction = pVictim->GetRangedCritDamageReduction(damageInfo->damage);
damageInfo->damage -= resilienceReduction; damageInfo->damage -= resilienceReduction;
damageInfo->cleanDamage += resilienceReduction; damageInfo->cleanDamage += resilienceReduction;
break; break;
@@ -1373,12 +1360,7 @@ void Unit::CalculateMeleeDamage(Unit *pVictim, uint32 damage, CalcDamageInfo *da
// only from players // only from players
if (GetTypeId() == TYPEID_PLAYER) if (GetTypeId() == TYPEID_PLAYER)
{ damage -= pVictim->GetMeleeDamageReduction(damage);
if (attackType != RANGED_ATTACK)
damage -= pVictim->GetMeleeDamageReduction(damage);
else
damage -= pVictim->GetRangedDamageReduction(damage);
}
// Calculate absorb resist // Calculate absorb resist
if (int32(damageInfo->damage) > 0) if (int32(damageInfo->damage) > 0)