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

Change the conditional statement for Merciless Combat so it correctly applies extra damage when required. Fixes #860.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
p0wer
2010-02-28 14:46:15 -06:00
parent 4c16bff8e6
commit 1ceda14d54
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Unit.cpp
+2 -2
View File
@@ -9841,7 +9841,7 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3
// Merciless Combat // Merciless Combat
if ((*i)->GetSpellProto()->SpellIconID == 2656) if ((*i)->GetSpellProto()->SpellIconID == 2656)
{ {
if (pVictim->HasAuraState(AURA_STATE_HEALTHLESS_35_PERCENT, spellProto, this)) if ((pVictim->GetMaxHealth() * 35 / 100) >= pVictim->GetHealth())
DoneTotalMod *= (100.0f+(*i)->GetAmount())/100.0f; DoneTotalMod *= (100.0f+(*i)->GetAmount())/100.0f;
} }
// Tundra Stalker // Tundra Stalker
@@ -11044,7 +11044,7 @@ void Unit::MeleeDamageBonus(Unit *pVictim, uint32 *pdamage, WeaponAttackType att
// Merciless Combat // Merciless Combat
if ((*i)->GetSpellProto()->SpellIconID == 2656) if ((*i)->GetSpellProto()->SpellIconID == 2656)
{ {
if (pVictim->HasAuraState(AURA_STATE_HEALTHLESS_35_PERCENT, spellProto, this)) if ((pVictim->GetMaxHealth() * 35 / 100) >= pVictim->GetHealth())
DoneTotalMod *= (100.0f+(*i)->GetAmount())/100.0f; DoneTotalMod *= (100.0f+(*i)->GetAmount())/100.0f;
} }
// Tundra Stalker // Tundra Stalker