From a4ad164908914d847c0dd1ec79b39440b2d34200 Mon Sep 17 00:00:00 2001 From: cyberbrest Date: Sat, 14 May 2011 17:38:04 +0700 Subject: Core/Spells: Fix Druid T10 Balance 2P Bonus Closes #261 & #484 & #768 --- src/server/game/Entities/Unit/Unit.cpp | 56 +++++++++++++++++++++------------- 1 file changed, 35 insertions(+), 21 deletions(-) (limited to 'src') diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index fb912541f7c..38e9ee7a548 100755 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -8235,32 +8235,46 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* trig } case SPELLFAMILY_DRUID: { - // Druid Forms Trinket - if (auraSpellInfo->Id == 37336) + switch (auraSpellInfo->Id) { - switch (GetShapeshiftForm()) + // Item - Druid T10 Balance 2P Bonus + case 16870: { - case FORM_NONE: trigger_spell_id = 37344;break; - case FORM_CAT: trigger_spell_id = 37341;break; - case FORM_BEAR: - case FORM_DIREBEAR: trigger_spell_id = 37340;break; - case FORM_TREE: trigger_spell_id = 37342;break; - case FORM_MOONKIN: trigger_spell_id = 37343;break; - default: - return false; + if (HasAura(70718)) + CastSpell(this, 70721, true); + break; } - } - // Druid T9 Feral Relic (Lacerate, Swipe, Mangle, and Shred) - else if (auraSpellInfo->Id == 67353) - { - switch (GetShapeshiftForm()) + // Druid Forms Trinket + case 37336: { - case FORM_CAT: trigger_spell_id = 67355; break; - case FORM_BEAR: - case FORM_DIREBEAR: trigger_spell_id = 67354; break; - default: - return false; + switch (GetShapeshiftForm()) + { + case FORM_NONE: trigger_spell_id = 37344; break; + case FORM_CAT: trigger_spell_id = 37341; break; + case FORM_BEAR: + case FORM_DIREBEAR: trigger_spell_id = 37340; break; + case FORM_TREE: trigger_spell_id = 37342; break; + case FORM_MOONKIN: trigger_spell_id = 37343; break; + default: + return false; + } + break; + } + // Druid T9 Feral Relic (Lacerate, Swipe, Mangle, and Shred) + case 67353: + { + switch (GetShapeshiftForm()) + { + case FORM_CAT: trigger_spell_id = 67355; break; + case FORM_BEAR: + case FORM_DIREBEAR: trigger_spell_id = 67354; break; + default: + return false; + } + break; } + default: + break; } break; } -- cgit v1.2.3