*Delete 2 not needed scripts.

*Add the correct Utgarde Keep's SQL updates to wotlk_bosses.sql

--HG--
branch : trunk

3 files changed, 8 insertions, 197 deletions

diff --git a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_dalronn.cpp b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_dalronn.cpp
deleted file mode 100644
index 9512444458b..00000000000
--- a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_dalronn.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-/* Script Data Start
-SDName: Boss dalronn
-SDAuthor: LordVanMartin
-SD%Complete: 
-SDComment: 
-SDCategory: 
-Script Data End */
-
-/*** SQL START *** 
-update creature_template set scriptname = 'boss_dalronn' where entry = '';
-*** SQL END ***/
-#include "precompiled.h"
-
-//Spells
-#define SPELL_DEBILITATE                            43650
-#define SPELL_SHADOWBOLT                            43649
-#define SPELL_SHADOWBOLT_2                          59575
-#define SPELL_SUMMON_SKELETONS                      52611  //Trigger Spell: 52612, summons NPC (28878)
-#define SPELL_SKARVALD_GHOST                        48613 //When Skarvald dies
-
-//Yell
-#define SAY_AGGRO                                -1574005
-#define SAY_KILL                                 -1574006
-#define SAY_DEATH_1                              -1574007
-#define SAY_DEATH_2                              -1574008
-#define SAY_RAISES                               -1574009
-
-struct TRINITY_DLL_DECL boss_dalronnAI : public ScriptedAI
-{
-    boss_dalronnAI(Creature *c) : ScriptedAI(c) {}
-    
-    uint32 killed;
-    uint64 Skarvald;
-    
-    void Reset() 
-	{
-		Skarvald = 0;
-	}
-    void Aggro(Unit* who) 
-    {
-        DoScriptText(SAY_AGGRO, m_creature);
-    }
-    void AttackStart(Unit* who) {}
-    void MoveInLineOfSight(Unit* who) {}
-    void UpdateAI(const uint32 diff) 
-    {
-        //Return since we have no target
-        if(!UpdateVictim())
-            return; 
-		
-        if (Skarvald)
-        {
-            Creature* Skravald_m = (Unit::GetCreature((*m_creature), Skarvald));
-            if (Skravald_m)
-            {
-                if (!Skravald_m->isAlive())
-				{
-					DoCast(Skravald_m,SPELL_SKARVALD_GHOST);
-					DoScriptText(SAY_RAISES, m_creature);
-				}
-            }
-        }
-                
-        DoMeleeAttackIfReady();    
-    }
-    void JustDied(Unit* killer) 
-    {
-        killed++;
-        //On first death resurected instatly by Skarvald as a ghost, having the same abilities as when alive and is unatackable
-        //If Skarvald dies first,  Dalron resurects him and says "SAY_RAISES"
-        if(killed ==2)
-            DoScriptText(SAY_DEATH_2,m_creature);
-        else
-            DoScriptText(SAY_DEATH_1,m_creature);
-    }
-    void KilledUnit(Unit *victim)
-    {
-        if(victim == m_creature)
-            return;
-        DoScriptText(SAY_KILL, m_creature);
-    }
-};
-
-CreatureAI* GetAI_boss_dalronn(Creature *_Creature)
-{
-    return new boss_dalronnAI (_Creature);
-}
-
-void AddSC_boss_dalronn()
-{
-    Script *newscript;
-
-    newscript = new Script;
-    newscript->Name="boss_dalronn";
-    newscript->GetAI = GetAI_boss_dalronn;
-    newscript->RegisterSelf();
-}
diff --git a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_skarvald.cpp b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_skarvald.cpp
deleted file mode 100644
index 1fc9bc1c995..00000000000
--- a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_skarvald.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-/* Script Data Start
-SDName: Boss skarvald
-SDAuthor: LordVanMartin
-SD%Complete: 
-SDComment: 
-SDCategory: 
-Script Data End */
-
-/*** SQL START *** 
-update creature_template set scriptname = 'boss_skarvald' where entry = '';
-*** SQL END ***/
-#include "precompiled.h"
-
-//Spells
-#define SPELL_CHARGE                                 43651 //randomly charges anyone but tank WoWradio video 14s afer aggro, and then every 5s change target
-#define SPELL_ENRAGE                                 48193
-#define SPELL_STONE_STRIKE                           48583
-#define SPELL_DALRON_GHOST                           48612 //When Dalron dies
-
-//Yells
-#define SAY_AGGRO                                 -1574010
-#define SAY_KILL                                  -1574011
-#define SAY_DEATH_1                               -1574012
-#define SAY_DEATH_2                               -1574013
-#define SAY_RAISES                                -1574014
-
-struct TRINITY_DLL_DECL boss_skarvaldAI : public ScriptedAI
-{
-    boss_skarvaldAI(Creature *c) : ScriptedAI(c) {}
-
-    uint32 kiled;
-    uint64 Dalronn;
-    
-    void Reset() 
-	{
-		Dalronn = 0;
-	}
-    void Aggro(Unit* who) 
-    {
-        DoScriptText(SAY_AGGRO, m_creature);
-    }
-    void AttackStart(Unit* who) {}
-    void MoveInLineOfSight(Unit* who) {}
-    void UpdateAI(const uint32 diff) 
-    {
-        //Return since we have no target
-        if(!UpdateVictim())
-            return;
-
-        if (Dalronn)
-        {
-            Creature* Dalronn_m = (Unit::GetCreature((*m_creature), Dalronn));
-            if (Dalronn_m)
-            {
-                if (!Dalronn_m->isAlive())
-				{
-					DoCast(Dalronn_m,SPELL_DALRON_GHOST);
-					DoScriptText(SAY_RAISES, m_creature);
-				}
-            }
-        }
-			
-        DoMeleeAttackIfReady();    
-    }
-    void JustDied(Unit* killer) 
-    {
-        kiled++;
-        //On first death resurected instatly by Dalron as a ghost, having the same abilities as when alive and is unatackable
-        //If Dalron dies first,  Skarvald resurects him and says "SAY_RAISES"
-        if(kiled ==2)
-            DoScriptText(SAY_DEATH_2,m_creature);
-        else
-            DoScriptText(SAY_DEATH_1,m_creature);
-    }
-    void KilledUnit(Unit *victim)
-    {
-        if(victim == m_creature)
-            return;
-        DoScriptText(SAY_KILL, m_creature);
-    }
-};
-
-CreatureAI* GetAI_boss_skarvald(Creature *_Creature)
-{
-    return new boss_skarvaldAI (_Creature);
-}
-
-void AddSC_boss_skarvald()
-{
-    Script *newscript;
-
-    newscript = new Script;
-    newscript->Name="boss_skarvald";
-    newscript->GetAI = GetAI_boss_skarvald;
-    newscript->RegisterSelf();
-}
diff --git a/src/bindings/scripts/sql/WotLK/wotlk_bosses.sql b/src/bindings/scripts/sql/WotLK/wotlk_bosses.sql
index f8d10a64cf3..c58ba8dd606 100644
--- a/src/bindings/scripts/sql/WotLK/wotlk_bosses.sql
+++ b/src/bindings/scripts/sql/WotLK/wotlk_bosses.sql
@@ -95,11 +95,15 @@ UPDATE `creature_template` SET `ScriptName`='boss_sjonnir' WHERE `entry`='27978'
 /*  */
 
 /* UTGARDE KEEP */
-UPDATE `instance_template` SET `script`='instance_keep' WHERE `map`=206;
-UPDATE `creature_template` SET `ScriptName`='boss_dalronn' WHERE `entry`='24201';
-UPDATE `creature_template` SET `ScriptName`='boss_ingvar' WHERE `entry`='23954';
+UPDATE `instance_template` SET `script`='instance_utgarde_keep' WHERE `map`=206;
+UPDATE `creature_template` SET `ScriptName`='boss_dalronn_the_controller' WHERE `entry`='24201';
+UPDATE `creature_template` SET `ScriptName`='boss_ingvar_the_plunderer' WHERE `entry`='23954';
+UPDATE `creature_template` SET `ScriptName`='mob_annhylde_the_caller' WHERE `entry`=24068;
+UPDATE `creature_template` SET `ScriptName`='mob_ingvar_throw_dummy' WHERE `entry`=23997;
 UPDATE `creature_template` SET `ScriptName`='boss_keleseth' WHERE `entry`='23953';
-UPDATE `creature_template` SET `ScriptName`='boss_skarvald' WHERE `entry`='24200';
+UPDATE `creature_template` SET `scriptname` = 'mob_frost_tomb' WHERE `entry` = '23965';
+UPDATE `creature_template` SET `ScriptName`='mob_vrykul_skeleton' WHERE `entry`=23970;
+UPDATE `creature_template` SET `ScriptName`='boss_skarvald_the_constructor' WHERE `entry`='24200';
 
 /* UTGARDE PINNACLE */
 UPDATE `instance_template` SET `script`='instance_pinnacle' WHERE `map`=1196;