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

Fixing Death Knight T8 Melee 4P Bonus (darkruned set). tibbi

Browse Source
This commit is contained in:
Faq
2012-06-14 22:36:56 +03:00
parent aae45460ed
commit d77a8568b7
2 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Spells/SpellEffects.cpp
+16 -3
View File
@@ -3388,7 +3388,11 @@ void Spell::EffectWeaponDmg(SpellEffIndex effIndex)
// Blood Strike // Blood Strike
if (m_spellInfo->SpellFamilyFlags[0] & 0x400000) if (m_spellInfo->SpellFamilyFlags[0] & 0x400000)
{ {
AddPctF(totalDamagePercentMod, m_spellInfo->Effects[EFFECT_2].CalcValue() * unitTarget->GetDiseasesByCaster(m_caster->GetGUID()) / 2.0f); float bonusPct = m_spellInfo->Effects[EFFECT_2].CalcValue() * unitTarget->GetDiseasesByCaster(m_caster->GetGUID()) / 2.0f;
// Death Knight T8 Melee 4P Bonus
if (AuraEffect const* aurEff = m_caster->GetAuraEffect(64736, EFFECT_0))
AddPctF(bonusPct, aurEff->GetAmount());
AddPctF(totalDamagePercentMod, bonusPct);
// Glyph of Blood Strike // Glyph of Blood Strike
if (m_caster->GetAuraEffect(59332, EFFECT_0)) if (m_caster->GetAuraEffect(59332, EFFECT_0))
@@ -3415,7 +3419,11 @@ void Spell::EffectWeaponDmg(SpellEffIndex effIndex)
if (roll_chance_i(aurEff->GetAmount())) if (roll_chance_i(aurEff->GetAmount()))
consumeDiseases = false; consumeDiseases = false;
AddPctF(totalDamagePercentMod, m_spellInfo->Effects[EFFECT_2].CalcValue() * unitTarget->GetDiseasesByCaster(m_caster->GetGUID(), consumeDiseases) / 2.0f); float bonusPct = m_spellInfo->Effects[EFFECT_2].CalcValue() * unitTarget->GetDiseasesByCaster(m_caster->GetGUID(), consumeDiseases) / 2.0f;
// Death Knight T8 Melee 4P Bonus
if (AuraEffect const* aurEff = m_caster->GetAuraEffect(64736, EFFECT_0))
AddPctF(bonusPct, aurEff->GetAmount());
AddPctF(totalDamagePercentMod, bonusPct);
break; break;
} }
// Blood-Caked Strike - Blood-Caked Blade // Blood-Caked Strike - Blood-Caked Blade
@@ -3427,7 +3435,12 @@ void Spell::EffectWeaponDmg(SpellEffIndex effIndex)
// Heart Strike // Heart Strike
if (m_spellInfo->SpellFamilyFlags[0] & 0x1000000) if (m_spellInfo->SpellFamilyFlags[0] & 0x1000000)
{ {
AddPctN(totalDamagePercentMod, m_spellInfo->Effects[EFFECT_2].CalcValue() * unitTarget->GetDiseasesByCaster(m_caster->GetGUID())); float bonusPct = m_spellInfo->Effects[EFFECT_2].CalcValue() * unitTarget->GetDiseasesByCaster(m_caster->GetGUID());
// Death Knight T8 Melee 4P Bonus
if (AuraEffect const* aurEff = m_caster->GetAuraEffect(64736, EFFECT_0))
AddPctF(bonusPct, aurEff->GetAmount());
AddPctF(totalDamagePercentMod, bonusPct);
break; break;
} }
break; break;
src/server/scripts/Spells/spell_dk.cpp
+5
View File
@@ -400,7 +400,12 @@ class spell_dk_scourge_strike : public SpellScriptLoader
{ {
Unit* caster = GetCaster(); Unit* caster = GetCaster();
if (Unit* unitTarget = GetHitUnit()) if (Unit* unitTarget = GetHitUnit())
{
multiplier = (GetEffectValue() * unitTarget->GetDiseasesByCaster(caster->GetGUID()) / 100.f); multiplier = (GetEffectValue() * unitTarget->GetDiseasesByCaster(caster->GetGUID()) / 100.f);
// Death Knight T8 Melee 4P Bonus
if (AuraEffect const* aurEff = caster->GetAuraEffect(64736, EFFECT_0))
AddPctF(multiplier, aurEff->GetAmount());
}
} }
void HandleAfterHit() void HandleAfterHit()