*Add Script for Skarvald and Dalronn

--HG--
branch : trunk

9 files changed, 407 insertions, 6 deletions

diff --git a/sql/updates/1613_world_scripts.sql b/sql/updates/1613_world_scripts.sql
new file mode 100644
index 00000000000..84cfbf81c88
--- /dev/null
+++ b/sql/updates/1613_world_scripts.sql
@@ -0,0 +1,3 @@
+-- Script for Skarvald and Dalronn
+update creature_template set scriptname = 'boss_skarvald_the_constructor' where entry in (24200,27390);
+update creature_template set scriptname = 'boss_dalronn_the_controller' where entry in (24201,27389);
\ No newline at end of file
diff --git a/src/bindings/scripts/CMakeLists.txt b/src/bindings/scripts/CMakeLists.txt
index 80f21126ba3..d16c2df2b0a 100644
--- a/src/bindings/scripts/CMakeLists.txt
+++ b/src/bindings/scripts/CMakeLists.txt
@@ -348,6 +348,7 @@ SET(trinityscript_LIB_SRCS
    scripts/zone/ungoro_crater/ungoro_crater.cpp
    scripts/zone/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp
    scripts/zone/utgarde_keep/utgarde_keep/boss_keleseth.cpp
+   scripts/zone/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp
    scripts/zone/wailing_caverns/instance_wailing_caverns.cpp
    scripts/zone/western_plaguelands/western_plaguelands.cpp
    scripts/zone/westfall/westfall.cpp
diff --git a/src/bindings/scripts/Makefile.am b/src/bindings/scripts/Makefile.am
index d3f20e42994..28b05a1c1e8 100644
--- a/src/bindings/scripts/Makefile.am
+++ b/src/bindings/scripts/Makefile.am
@@ -381,6 +381,7 @@ scripts/zone/undercity/undercity.cpp \
 scripts/zone/ungoro_crater/ungoro_crater.cpp \
 scripts/zone/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp \
 scripts/zone/utgarde_keep/utgarde_keep/boss_keleseth.cpp \
+scripts/zone/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp \
 scripts/zone/wailing_caverns/instance_wailing_caverns.cpp \
 scripts/zone/western_plaguelands/western_plaguelands.cpp \
 scripts/zone/westfall/westfall.cpp \
diff --git a/src/bindings/scripts/ScriptMgr.cpp b/src/bindings/scripts/ScriptMgr.cpp
index f8e85b97333..290843ac312 100644
--- a/src/bindings/scripts/ScriptMgr.cpp
+++ b/src/bindings/scripts/ScriptMgr.cpp
@@ -573,6 +573,7 @@ extern void AddSC_ungoro_crater();
 
 //Utgarde Keep
 extern void AddSC_boss_keleseth();
+extern void AddSC_boss_skarvald_dalronn();
 extern void AddSC_instance_utgarde_keep();
 
 //Wailing caverns
@@ -1890,8 +1891,9 @@ void ScriptsInit()
 
     //Utgarde Keep
     AddSC_boss_keleseth();
+    AddSC_boss_skarvald_dalronn();
     AddSC_instance_utgarde_keep();
-	
+
     //Wailing caverns
 
     //Western plaguelands
diff --git a/src/bindings/scripts/VC71/71ScriptDev2.vcproj b/src/bindings/scripts/VC71/71ScriptDev2.vcproj
index e97fbaa8ed4..23f09b1998d 100644
--- a/src/bindings/scripts/VC71/71ScriptDev2.vcproj
+++ b/src/bindings/scripts/VC71/71ScriptDev2.vcproj
@@ -2055,6 +2055,10 @@
 														 	>
 														 	</File>
 														 	<File
+															RelativePath="..\scripts\zone\utgarde_keep\utgarde_keep\boss_skarvald_dalronn.cpp"
+															>
+															</File>
+															<File
 														 	RelativePath="..\scripts\zone\utgarde_keep\utgarde_keep\def_utgarde_keep.h"
 														 	>
 														 	</File>
diff --git a/src/bindings/scripts/VC80/80ScriptDev2.vcproj b/src/bindings/scripts/VC80/80ScriptDev2.vcproj
index 220ab002817..5036aac871a 100644
--- a/src/bindings/scripts/VC80/80ScriptDev2.vcproj
+++ b/src/bindings/scripts/VC80/80ScriptDev2.vcproj
@@ -1161,6 +1161,10 @@
 														 	>
 														 	</File>
 														 	<File
+															RelativePath="..\scripts\zone\utgarde_keep\utgarde_keep\boss_skarvald_dalronn.cpp"
+															>
+															</File>
+															<File
 														 	RelativePath="..\scripts\zone\utgarde_keep\utgarde_keep\def_utgarde_keep.h"
 														 	>
 														 	</File>
diff --git a/src/bindings/scripts/VC90/90ScriptDev2.vcproj b/src/bindings/scripts/VC90/90ScriptDev2.vcproj
index 679e14bc9c8..6cca35950f7 100644
--- a/src/bindings/scripts/VC90/90ScriptDev2.vcproj
+++ b/src/bindings/scripts/VC90/90ScriptDev2.vcproj
@@ -858,6 +858,10 @@
 							>
 						</File>
 						<File
+							RelativePath="..\scripts\zone\utgarde_keep\utgarde_keep\boss_skarvald_dalronn.cpp"
+							>
+						</File>
+						<File
 							RelativePath="..\scripts\zone\utgarde_keep\utgarde_keep\def_utgarde_keep.h"
 							>
 						</File>
diff --git a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp
new file mode 100644
index 00000000000..2996451c20c
--- /dev/null
+++ b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp
@@ -0,0 +1,383 @@
+/*
+ * Copyright (C) 2009 Trinity <http://www.trinitycore.org/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+/* ScriptData
+SDName: Boss_Skarvald_Dalronn
+SD%Complete: 95
+SDComment: Needs adjustments to blizzlike timers, 2 Missing Yell Textes, Yell Text + Sound to DB
+SDCategory: Utgarde Keep
+EndScriptData */
+
+#include "precompiled.h"
+#include "def_utgarde_keep.h"
+
+/*
+13202,10,"A_DalronnKill","DalronKill.wav","","","","","","","","","",1,1,1,1,1,1,1,1,1,1,"Sound\Creature\DalronnTheController",0.800000,0,8.000000,45.000000,0,
+13232,10,"A_SkarvaldKill","SkarvaldKill.wav","","","","","","","","","",1,1,1,1,1,1,1,1,1,1,"Sound\Creature\SkarvaldTheConstructor",0.800000,0,8.000000,45.000000,0,
+*/
+
+#define YELL_SKARVALD_AGGRO                         "Dalronn! See if you can muster the nerve to join my attack!"
+#define SOUND_SKARVALD_AGGRO                        13229
+#define YELL_DALRONN_AGGRO                          "By all means, don't assess the situation, you halfwit! Just jump into the fray!"
+#define SOUND_DALRONN_AGGRO                         13199
+
+#define YELL_DALRONN_DAL_DIEDFIRST                  "See... you... soon."
+#define SOUND_DALRONN_DAL_DIEDFIRST                 13200
+#define YELL_SKARVALD_DAL_DIEDFIRST                 "Pagh! What sort of necromancer lets death stop him? I knew you were worthless!"
+#define SOUND_SKARVALD_DAL_DIEDFIRST                13233
+#define YELL_SKARVALD_DAL_DIED                      "A warrior's death."
+#define SOUND_SKARVALD_DAL_DIED                     13231
+
+#define YELL_SKARVALD_SKA_DIEDFIRST                 "Not... over... yet."
+#define SOUND_SKARVALD_SKA_DIEDFIRST                13230
+#define YELL_DALRONN_SKA_DIEDFIRST                  "Skarvald, you incompetent slug! Return and make yourself useful!"
+#define SOUND_DALRONN_SKA_DIEDFIRST                 13203
+#define YELL_DALRONN_SKA_DIED                       "There's no... greater... glory."
+#define SOUND_DALRONN_SKA_DIED                      13201
+
+//Spells of Skarvald and his Ghost
+#define MOB_SKARVALD_THE_CONSTRUCTOR                24200
+#define SPELL_CHARGE                                43651
+#define SPELL_STONE_STRIKE                          48583
+#define SPELL_SUMMON_SKARVALD_GHOST                 48613
+#define MOB_SKARVALD_GHOST                          27390
+//Spells of Dalronn and his Ghost
+#define MOB_DALRONN_THE_CONTROLLER                  24201
+#define SPELL_SHADOW_BOLT                           43649
+#define H_SPELL_SHADOW_BOLT                         59575
+#define H_SPELL_SUMMON_SKELETONS                    52611
+#define SPELL_DEBILITATE                            43650
+#define SPELL_SUMMON_DALRONN_GHOST                  48612
+#define MOB_DALRONN_GHOST                           27389
+
+struct TRINITY_DLL_DECL boss_skarvald_the_constructorAI : public ScriptedAI
+{
+    boss_skarvald_the_constructorAI(Creature *c) : ScriptedAI(c) 
+    {
+        pInstance = ((ScriptedInstance*)c->GetInstanceData());
+        HeroicMode = m_creature->GetMap()->IsHeroic();
+        Reset();
+    }
+
+    ScriptedInstance* pInstance;
+
+    bool ghost;
+    bool HeroicMode;
+    uint32 Charge_Timer;
+    uint32 StoneStrike_Timer;
+    uint32 Response_Timer;
+    uint32 Check_Timer;
+    bool Dalronn_isDead;
+
+    void Reset()
+    {
+        Charge_Timer = 5000;
+        StoneStrike_Timer = 10000;
+        Dalronn_isDead = false;
+        Check_Timer = 5000;
+
+        ghost = (m_creature->GetEntry() == MOB_SKARVALD_GHOST);
+        if(!ghost)
+        {
+            pInstance->SetData(DATA_SKARVALD_DALRONN_EVENT,NOT_STARTED);
+
+            Unit* dalronn = Unit::GetUnit((*m_creature),pInstance->GetData64(DATA_DALRONN));
+            if(dalronn && dalronn->isDead())
+                ((Creature*)dalronn)->Respawn();
+        }
+    }
+
+    void Aggro(Unit *who)
+    {
+        if(!ghost)
+        {
+            DoYell(YELL_SKARVALD_AGGRO,LANG_UNIVERSAL,NULL);
+            DoPlaySoundToSet(m_creature,SOUND_SKARVALD_AGGRO);
+
+            pInstance->SetData(DATA_SKARVALD_DALRONN_EVENT,IN_PROGRESS);
+            Unit* dalronn = Unit::GetUnit((*m_creature),pInstance->GetData64(DATA_DALRONN));
+            if(dalronn && dalronn->isAlive() && !dalronn->getVictim())
+                dalronn->getThreatManager().addThreat(who,0.0f);
+        }
+    }
+
+    void JustDied(Unit* Killer)
+    {
+        if(!ghost)
+        {
+            Unit* dalronn = Unit::GetUnit((*m_creature),pInstance->GetData64(DATA_DALRONN));
+            if(dalronn)
+            {
+                if(dalronn->isDead())
+                {
+                    DoYell(YELL_SKARVALD_DAL_DIED,LANG_UNIVERSAL,NULL);
+                    DoPlaySoundToSet(m_creature,SOUND_SKARVALD_DAL_DIED);
+
+                    pInstance->SetData(DATA_SKARVALD_DALRONN_EVENT,DONE);
+                }
+                else
+                {
+                    DoYell(YELL_SKARVALD_SKA_DIEDFIRST,LANG_UNIVERSAL,NULL);
+                    DoPlaySoundToSet(m_creature,SOUND_SKARVALD_SKA_DIEDFIRST);
+
+                    m_creature->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);
+                    //DoCast(m_creature,SPELL_SUMMON_SKARVALD_GHOST,true);
+                    Creature* temp = m_creature->SummonCreature(MOB_SKARVALD_GHOST,m_creature->GetPositionX(),m_creature->GetPositionY(),m_creature->GetPositionZ(),0,TEMPSUMMON_CORPSE_DESPAWN,5000);
+                    temp->AI()->AttackStart(Killer);
+                }
+            }
+        }
+    }
+
+    void UpdateAI(const uint32 diff)
+    {
+        if(ghost)
+        {
+            if(pInstance->GetData(DATA_SKARVALD_DALRONN_EVENT) != IN_PROGRESS)
+            {
+                m_creature->DealDamage(m_creature, m_creature->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+            }
+        }
+
+        if(!UpdateVictim())
+            return;
+
+        if(!ghost)
+        {
+            if(Check_Timer)
+                if(Check_Timer < diff)
+                {
+                    Check_Timer = 5000;
+                    Unit* dalronn = Unit::GetUnit((*m_creature),pInstance->GetData64(DATA_DALRONN));
+                    if(dalronn && dalronn->isDead())
+                    {
+                        Dalronn_isDead = true;
+                        Response_Timer = 2000;
+                        Check_Timer = 0;
+                    }
+                }else Check_Timer -= diff;
+
+            if(Response_Timer) 
+                if(Dalronn_isDead)
+                    if(Response_Timer < diff)
+                    {
+                        DoYell(YELL_SKARVALD_DAL_DIEDFIRST,LANG_UNIVERSAL,NULL);
+                        DoPlaySoundToSet(m_creature,SOUND_SKARVALD_DAL_DIEDFIRST);
+
+                        Response_Timer = 0;
+                    }else Response_Timer -= diff;
+        }
+
+        if(Charge_Timer < diff)
+        {
+            DoCast(SelectUnit(SELECT_TARGET_RANDOM, 1), SPELL_CHARGE);
+            Charge_Timer = 5000+rand()%5000;
+        }else Charge_Timer -= diff;
+
+        if(StoneStrike_Timer < diff)
+        {
+            DoCast(m_creature->getVictim(), SPELL_STONE_STRIKE);
+            StoneStrike_Timer = 5000+rand()%5000;
+        }else StoneStrike_Timer -= diff;
+      
+        DoMeleeAttackIfReady();
+    }
+};
+
+CreatureAI* GetAI_boss_skarvald_the_constructor(Creature *_Creature)
+{
+    return new boss_skarvald_the_constructorAI (_Creature);
+}
+
+struct TRINITY_DLL_DECL boss_dalronn_the_controllerAI : public ScriptedAI
+{
+    boss_dalronn_the_controllerAI(Creature *c) : ScriptedAI(c) 
+    {
+        pInstance = ((ScriptedInstance*)c->GetInstanceData());
+        HeroicMode = m_creature->GetMap()->IsHeroic();
+        Reset();
+    }
+
+    ScriptedInstance* pInstance;
+
+    bool ghost;
+    bool HeroicMode;
+    uint32 ShadowBolt_Timer;
+    uint32 Debilitate_Timer;
+    uint32 Summon_Timer;
+
+    uint32 Response_Timer;
+    uint32 Check_Timer;
+    uint32 AggroYell_Timer;
+    bool Skarvald_isDead;
+
+
+    void Reset()
+    {
+        ShadowBolt_Timer = 1000;
+        Debilitate_Timer = 5000;
+        Summon_Timer = 10000;
+        Check_Timer = 5000;
+        Skarvald_isDead = false;
+        AggroYell_Timer = 0;
+
+        ghost = m_creature->GetEntry() == MOB_DALRONN_GHOST;
+        if(!ghost)
+        {
+            pInstance->SetData(DATA_SKARVALD_DALRONN_EVENT,NOT_STARTED);
+
+            Unit* skarvald = Unit::GetUnit((*m_creature),pInstance->GetData64(DATA_SKARVALD));
+            if(skarvald && skarvald->isDead())
+                ((Creature*)skarvald)->Respawn();
+        }
+    }
+    void Aggro(Unit *who)
+    {
+        if(!ghost)
+        {
+            pInstance->SetData(DATA_SKARVALD_DALRONN_EVENT,IN_PROGRESS);
+            Unit* skarvald = Unit::GetUnit((*m_creature),pInstance->GetData64(DATA_SKARVALD));
+            if(skarvald && skarvald->isAlive() && !skarvald->getVictim())
+                skarvald->getThreatManager().addThreat(who,0.0f);
+
+            AggroYell_Timer = 5000;
+        }
+    }
+
+    void JustDied(Unit* Killer)
+    {
+        if(!ghost)
+        {
+            Unit* skarvald = Unit::GetUnit((*m_creature),pInstance->GetData64(DATA_SKARVALD));
+            if(skarvald)
+                if(skarvald->isDead())
+                {
+                    DoYell(YELL_DALRONN_SKA_DIED,LANG_UNIVERSAL,NULL);
+                    DoPlaySoundToSet(m_creature,SOUND_DALRONN_SKA_DIED);
+
+                    pInstance->SetData(DATA_SKARVALD_DALRONN_EVENT,DONE);
+                }
+                else
+                {
+                    DoYell(YELL_DALRONN_DAL_DIEDFIRST,LANG_UNIVERSAL,NULL);
+                    DoPlaySoundToSet(m_creature,SOUND_DALRONN_DAL_DIEDFIRST);
+
+                    m_creature->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);
+                    //DoCast(m_creature,SPELL_SUMMON_DALRONN_GHOST,true);
+                    Creature* temp = m_creature->SummonCreature(MOB_DALRONN_GHOST,m_creature->GetPositionX(),m_creature->GetPositionY(),m_creature->GetPositionZ(),0,TEMPSUMMON_CORPSE_DESPAWN,5000);
+                    temp->AI()->AttackStart(Killer);
+                }
+        }
+    }
+
+    void UpdateAI(const uint32 diff)
+    {
+        if(ghost)
+        {
+            if(pInstance->GetData(DATA_SKARVALD_DALRONN_EVENT) != IN_PROGRESS)
+            {
+                m_creature->DealDamage(m_creature, m_creature->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);  
+            }
+        }
+
+        if(!UpdateVictim())
+            return;
+
+        if(AggroYell_Timer)
+            if(AggroYell_Timer < diff)
+            {
+                DoYell(YELL_DALRONN_AGGRO,LANG_UNIVERSAL,NULL);
+                DoPlaySoundToSet(m_creature,SOUND_DALRONN_AGGRO);
+
+                AggroYell_Timer = 0;
+            }else AggroYell_Timer -= diff;
+
+        if(!ghost)
+        {
+            if(Check_Timer)
+                if(Check_Timer < diff)
+                {
+                    Check_Timer = 5000;
+                    Unit* skarvald = Unit::GetUnit((*m_creature),pInstance->GetData64(DATA_SKARVALD));
+                    if(skarvald && skarvald->isDead())
+                    {
+                        Skarvald_isDead = true;
+                        Response_Timer = 2000;
+                        Check_Timer = 0;
+                    }
+                }else Check_Timer -= diff;
+
+            if(Response_Timer)
+                if(Skarvald_isDead)
+                    if(Response_Timer < diff)
+                    {
+                        DoYell(YELL_DALRONN_SKA_DIEDFIRST,LANG_UNIVERSAL,NULL);
+                        DoPlaySoundToSet(m_creature,SOUND_DALRONN_SKA_DIEDFIRST);
+
+                        Response_Timer = 0;
+                    }else Response_Timer -= diff;
+        }
+
+        if(ShadowBolt_Timer < diff)
+        {
+            if (!m_creature->IsNonMeleeSpellCasted(false))
+            {
+                DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0),HeroicMode ? H_SPELL_SHADOW_BOLT : SPELL_SHADOW_BOLT);
+                ShadowBolt_Timer = 1000;
+            }
+        }else ShadowBolt_Timer -= diff;
+
+        if(Debilitate_Timer < diff)
+        {
+            if (!m_creature->IsNonMeleeSpellCasted(false))
+             {
+                DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0),SPELL_DEBILITATE);
+                Debilitate_Timer = 5000+rand()%5000;
+            }
+        }else Debilitate_Timer -= diff;
+      
+        if(HeroicMode)
+            if(Summon_Timer < diff)
+            {
+                DoCast(m_creature,H_SPELL_SUMMON_SKELETONS);
+                Summon_Timer = (rand()%10000) + 20000;
+            }else Summon_Timer -= diff;
+
+        DoMeleeAttackIfReady();
+    }
+};
+
+CreatureAI* GetAI_boss_dalronn_the_controller(Creature *_Creature)
+{
+    return new boss_dalronn_the_controllerAI (_Creature);
+}
+
+void AddSC_boss_skarvald_dalronn()
+{
+    Script *newscript;
+
+    newscript = new Script;
+    newscript->Name="boss_skarvald_the_constructor";
+    newscript->GetAI = GetAI_boss_skarvald_the_constructor;
+    newscript->RegisterSelf();
+    
+    newscript = new Script;
+    newscript->Name="boss_dalronn_the_controller";
+    newscript->GetAI = GetAI_boss_dalronn_the_controller;
+    newscript->RegisterSelf();
+}
\ No newline at end of file
diff --git a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp
index f609c6285d3..4617b2129f3 100644
--- a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp
+++ b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp
@@ -103,8 +103,8 @@ struct TRINITY_DLL_DECL instance_utgarde_keep : public ScriptedInstance
         switch(creature->GetEntry())
         { 
             case 23953:    Keleseth = creature->GetGUID();             break;
-            case 24200:    Dalronn = creature->GetGUID();              break;
-            case 24201:    Skarvald = creature->GetGUID();             break;
+            case 24201:    Dalronn = creature->GetGUID();              break;
+            case 24200:    Skarvald = creature->GetGUID();             break;
             case 23954:    Ingvar = creature->GetGUID();               break;
         }
     }
@@ -122,7 +122,7 @@ struct TRINITY_DLL_DECL instance_utgarde_keep : public ScriptedInstance
         switch(identifier)
         {
         case DATA_PRINCEKELESETH:         return Keleseth;
-        case DATA_DALRONN:                 return Dalronn;
+        case DATA_DALRONN:                return Dalronn;
         case DATA_SKARVALD:               return Skarvald;
         case DATA_INGVAR:                 return Ingvar;
         }
@@ -174,8 +174,7 @@ struct TRINITY_DLL_DECL instance_utgarde_keep : public ScriptedInstance
         switch(type)
         {
         case DATA_PRINCEKELESETH:            return Encounters[0];
-        case DATA_DALRONN:                   return Encounters[1];
-        case DATA_SKARVALD:                  return Encounters[2];
+        case DATA_SKARVALD_DALRONN_EVENT:    return Encounters[1];
         case DATA_INGVAR:                    return Encounters[3];
         }