Drak'Tharon Keep, Trollgore: Remove stacked buff on Reset

Drak'Tharon Keep, Tharon'Ja: Fix Gift of Tharon'Ja + add skeletal morphing

--HG--
branch : trunk

2 files changed, 9 insertions, 13 deletions

diff --git a/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp b/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp
index 6ed0587166d..df2e25299a6 100644
--- a/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp
+++ b/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp
@@ -19,7 +19,7 @@
 /* Script Data Start
 SDName: Boss Tharon'ja
 SDAuthor: Tartalo
-SD%Complete:
+SD%Complete: 100
 SDComment:
 SDCategory:
 Script Data End */
@@ -73,7 +73,8 @@ enum Yells
 };
 enum Models
 {
-    MODEL_FLESH                                            = 27696
+    MODEL_FLESH                                            = 27696,
+    MODEL_SKELETON                                         = 27511
 };
 enum CombatPhase
 {
@@ -170,12 +171,8 @@ struct TRINITY_DLL_DECL boss_tharon_jaAI : public ScriptedAI
                         Unit *pTemp = Unit::GetUnit((*m_creature),(*itr)->getUnitGuid());
                         if (pTemp && pTemp->GetTypeId() == TYPEID_PLAYER)
                         {
-                            Player *pTarget = CAST_PLR(pTemp);
-                            DoCast(pTemp, SPELL_GIFT_OF_THARON_JA);
-                            pTarget->AddTemporarySpell(SPELL_PLAYER_PHASE2_BONE_ARMOR);
-                            pTarget->AddTemporarySpell(SPELL_PLAYER_PHASE2_SLAYING_STRIKE);
-                            pTarget->AddTemporarySpell(SPELL_PLAYER_PHASE2_TAUNT);
-                            pTarget->AddTemporarySpell(SPELL_PLAYER_PHASE2_TOUCH_OF_LIFE);
+                            m_creature->AddAura(SPELL_GIFT_OF_THARON_JA,pTemp);
+                            pTemp->SetDisplayId(MODEL_SKELETON);
                         }
                     }
                     uiPhaseTimer = 20000;
@@ -232,11 +229,7 @@ struct TRINITY_DLL_DECL boss_tharon_jaAI : public ScriptedAI
                         {
                             if (pTemp->HasAura(SPELL_GIFT_OF_THARON_JA))
                                 pTemp->RemoveAura(SPELL_GIFT_OF_THARON_JA);
-                            Player *pTarget = CAST_PLR(pTemp);
-                            pTarget->RemoveTemporarySpell(SPELL_PLAYER_PHASE2_BONE_ARMOR);
-                            pTarget->RemoveTemporarySpell(SPELL_PLAYER_PHASE2_SLAYING_STRIKE);
-                            pTarget->RemoveTemporarySpell(SPELL_PLAYER_PHASE2_TAUNT);
-                            pTarget->RemoveTemporarySpell(SPELL_PLAYER_PHASE2_TOUCH_OF_LIFE);
+                            pTemp->DeMorph();
                         }
                     }
                 } else uiPhaseTimer -= diff;
diff --git a/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_trollgore.cpp b/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_trollgore.cpp
index d4474258c89..5f67fc9976f 100644
--- a/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_trollgore.cpp
+++ b/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_trollgore.cpp
@@ -84,6 +84,9 @@ struct TRINITY_DLL_DECL boss_trollgoreAI : public ScriptedAI
         uiExplodeCorpseTimer = 3000;
 
         bAchiev = HeroicMode;
+
+        if (m_creature->HasAura(HEROIC(SPELL_CONSUME,H_SPELL_CONSUME)))
+            m_creature->RemoveAura(HEROIC(SPELL_CONSUME,H_SPELL_CONSUME));
         
         if (pInstance)
             pInstance->SetData(DATA_TROLLGORE_EVENT, NOT_STARTED);