diff options
| author | megamage <none@none> | 2009-03-05 18:50:26 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-03-05 18:50:26 -0600 |
| commit | bb75a8a21ad3224f95d8710b8b06c4494dd2091d (patch) | |
| tree | 055499a57050c5ab10e93e13bebea8ab7541b215 /src/game/Unit.cpp | |
| parent | 635faad2bccb05397380737c26d61d71e1a8bcfb (diff) | |
| parent | 2f20a832dc1481117e1db9f7d8c5d82886493f18 (diff) | |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Unit.cpp')
| -rw-r--r-- | src/game/Unit.cpp | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index e52f15250e8..3354eab3af8 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -5539,6 +5539,14 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu { switch(dummySpell->Id) { + // Leader of the Pack + case 24932: + { + if (triggerAmount == 0) + return false; + basepoints0 = triggerAmount * GetMaxHealth() / 100; + trigger_spell_id = 34299; + } // Healing Touch (Dreamwalker Raiment set) case 28719: { @@ -5636,6 +5644,12 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu basepoints0 = triggerAmount * damage / 100; break; } + // Improved leader of the pack + else if (dummySpell->SpellIconID == 312 && !dummySpell->SpellFamilyFlags) + { + triggered_spell_id = 60889; + basepoints0 = triggerAmount * GetMaxPower(POWER_MANA) / 100; + } break; } case SPELLFAMILY_ROGUE: @@ -6705,14 +6719,6 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, Aura* triggeredB } //else if (auraSpellInfo->Id==40363)// Entangling Roots () // trigger_spell_id = ????; - // Leader of the Pack - else if (auraSpellInfo->Id == 24932) - { - if (triggerAmount == 0) - return false; - basepoints0 = triggerAmount * GetMaxHealth() / 100; - trigger_spell_id = 34299; - } break; } case SPELLFAMILY_HUNTER: |