*Add Scripts for Ingvar the Plunderer Event

--HG--
branch : trunk

10 files changed, 504 insertions, 10 deletions

diff --git a/sql/updates/1727_world.sql b/sql/updates/1727_world.sql
new file mode 100644
index 00000000000..0d041f2efb0
--- /dev/null
+++ b/sql/updates/1727_world.sql
@@ -0,0 +1 @@
+insert into spell_script_target values (42857,1,23954);
\ No newline at end of file
diff --git a/sql/updates/1727_world_script.sql b/sql/updates/1727_world_script.sql
new file mode 100644
index 00000000000..670ea52ec33
--- /dev/null
+++ b/sql/updates/1727_world_script.sql
@@ -0,0 +1,3 @@
+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;
\ No newline at end of file
diff --git a/src/bindings/scripts/CMakeLists.txt b/src/bindings/scripts/CMakeLists.txt
index d16c2df2b0a..0204845523d 100644
--- a/src/bindings/scripts/CMakeLists.txt
+++ b/src/bindings/scripts/CMakeLists.txt
@@ -349,6 +349,7 @@ SET(trinityscript_LIB_SRCS
    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/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.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 28b05a1c1e8..81a1761101a 100644
--- a/src/bindings/scripts/Makefile.am
+++ b/src/bindings/scripts/Makefile.am
@@ -382,6 +382,7 @@ 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/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.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 290843ac312..39ddedecb9a 100644
--- a/src/bindings/scripts/ScriptMgr.cpp
+++ b/src/bindings/scripts/ScriptMgr.cpp
@@ -574,6 +574,7 @@ extern void AddSC_ungoro_crater();
 //Utgarde Keep
 extern void AddSC_boss_keleseth();
 extern void AddSC_boss_skarvald_dalronn();
+extern void AddSC_boss_ingvar_the_plunderer();
 extern void AddSC_instance_utgarde_keep();
 
 //Wailing caverns
@@ -1710,7 +1711,7 @@ void ScriptsInit()
 
     //Naxxramas
     AddSC_boss_anubrekhan();
-	AddSC_boss_faerlina();
+    AddSC_boss_faerlina();
     AddSC_boss_maexxna();
     AddSC_boss_patchwerk();
     AddSC_boss_razuvious();
@@ -1892,6 +1893,7 @@ void ScriptsInit()
     //Utgarde Keep
     AddSC_boss_keleseth();
     AddSC_boss_skarvald_dalronn();
+    AddSC_boss_ingvar_the_plunderer();
     AddSC_instance_utgarde_keep();
 
     //Wailing caverns
diff --git a/src/bindings/scripts/VC71/71ScriptDev2.vcproj b/src/bindings/scripts/VC71/71ScriptDev2.vcproj
index 23f09b1998d..b8df85fab45 100644
--- a/src/bindings/scripts/VC71/71ScriptDev2.vcproj
+++ b/src/bindings/scripts/VC71/71ScriptDev2.vcproj
@@ -2059,6 +2059,10 @@
 															>
 															</File>
 															<File
+															RelativePath="..\scripts\zone\utgarde_keep\utgarde_keep\boss_ingvar_the_plunderer.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 5036aac871a..2ebc38618cc 100644
--- a/src/bindings/scripts/VC80/80ScriptDev2.vcproj
+++ b/src/bindings/scripts/VC80/80ScriptDev2.vcproj
@@ -1165,6 +1165,10 @@
 															>
 															</File>
 															<File
+															RelativePath="..\scripts\zone\utgarde_keep\utgarde_keep\boss_ingvar_the_plunderer.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 6cca35950f7..232a1ff7ca6 100644
--- a/src/bindings/scripts/VC90/90ScriptDev2.vcproj
+++ b/src/bindings/scripts/VC90/90ScriptDev2.vcproj
@@ -854,6 +854,10 @@
 						Name="Utgarde Keep"
 						>
 						<File
+							RelativePath="..\scripts\zone\utgarde_keep\utgarde_keep\boss_ingvar_the_plunderer.cpp"
+							>
+						</File>
+						<File
 							RelativePath="..\scripts\zone\utgarde_keep\utgarde_keep\boss_keleseth.cpp"
 							>
 						</File>
diff --git a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp
new file mode 100644
index 00000000000..5d8295381f9
--- /dev/null
+++ b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp
@@ -0,0 +1,474 @@
+/*
+ * 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_Ingvar_The_Plunderer
+SD%Complete: 95
+SDComment: Some Problems with Annhylde Movement, Blizzlike Timers
+SDCategory: Udgarde Keep
+EndScriptData */
+
+#include "precompiled.h"
+#include "def_utgarde_keep.h"
+
+//Yells Ingvar
+#define YELL_AGGRO_1                        "I'll paint my face with your blood!"
+#define SOUND_AGGRO_1                       13207
+#define YELL_AGGRO_2                        "I return! A second chance to carve out your skull!"
+#define SOUND_AGGRO_2                       13209
+
+#define YELL_DEAD_1                         "My life for the... death god!"
+#define SOUND_DEAD_1                        13213
+#define YELL_DEAD_2                         "No! I can do... better! I can..."
+#define SOUND_DEAD_2                        13211
+
+#define YELL_KILL_1                         "Mjul orm agn gjor!"
+#define SOUND_KILL_1                        13212
+#define YELL_KILL_2                         "I am a warriorborn!"
+#define SOUND_KILL_2                        13214
+
+//Ingvar Spells human form
+#define MOB_INGVAR_HUMAN                            23954
+#define SPELL_CLEAVE                                42724
+#define SPELL_SMASH                                 42669
+#define H_SPELL_SMASH                               59706
+#define SPELL_STAGGERING_ROAR                       42708
+#define H_SPELL_STAGGERING_ROAR                     59708
+#define SPELL_ENRAGE                                42705
+#define H_SPELL_ENRAGE                              59707
+
+#define MOB_ANNHYLDE_THE_CALLER                     24068
+#define SPELL_INGVAR_FEIGN_DEATH                    42795
+#define SPELL_SUMMON_BANSHEE                        42912
+#define SPELL_SCOURG_RESURRECTION_EFFEKTSPAWN       42863 //Spawn resurrecteffekt around Ingvar
+
+#define MODEL_INGVAR_UNDEAD                         26351
+#define MODEL_INGVAR_HUMAN                          21953
+
+//Ingvar Spells undead form
+#define MOB_INGVAR_UNDEAD                           23980
+#define SPELL_DARK_SMASH                            42723
+#define SPELL_DREADFUL_ROAR                         42729
+#define H_SPELL_DREADFUL_ROAR                       59734
+#define SPELL_WOE_STRIKE                            42730
+#define H_SPELL_WOE_STRIKE                          59735
+
+#define ENTRY_THROW_TARGET                          23996
+#define SPELL_SHADOW_AXE_SUMMON                     42749
+
+struct TRINITY_DLL_DECL boss_ingvar_the_plundererAI : public ScriptedAI
+{
+    boss_ingvar_the_plundererAI(Creature *c) : ScriptedAI(c) 
+    {
+        pInstance = ((ScriptedInstance*)c->GetInstanceData());
+        HeroicMode = c->GetMap()->IsHeroic();
+        Reset();
+    }
+
+    ScriptedInstance* pInstance;
+
+    bool HeroicMode;
+    bool undead;
+    bool event_inProgress;
+
+    uint32 Cleave_Timer;
+    uint32 Smash_Timer;
+    uint32 Enrage_Timer;
+    uint32 Roar_Timer;
+    uint32 SpawnResTimer;
+    uint32 wait_Timer;
+
+
+    void Reset()
+    {
+        if(pInstance)
+            pInstance->SetData(DATA_INGVAR, NOT_STARTED);
+
+        if(undead) // Visual Hack
+            m_creature->SetUInt32Value(UNIT_FIELD_DISPLAYID, MODEL_INGVAR_HUMAN);
+
+        undead = false;
+        event_inProgress = false;
+
+        m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_ATTACKABLE_2);
+        m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+
+        Cleave_Timer = 2000;
+        Smash_Timer = 5000;
+        Enrage_Timer = 10000;
+        Roar_Timer = 15000;
+
+        SpawnResTimer = 3000;
+
+        wait_Timer = 0;
+    }
+
+    void DamageTaken(Unit *done_by, uint32 &damage) 
+    {
+        if( damage >= m_creature->GetHealth() && !undead)
+        {
+            //DoCast(m_creature,SPELL_INGVAR_FEIGN_DEATH,true);  // Dont work ???
+            // visuel hack
+            m_creature->SetHealth(0);
+            m_creature->InterruptNonMeleeSpells(true);
+            m_creature->RemoveAllAuras();
+            m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_ATTACKABLE_2);
+            m_creature->GetMotionMaster()->MovementExpired(false);
+            m_creature->GetMotionMaster()->MoveIdle();
+            m_creature->SetStandState(UNIT_STAND_STATE_DEAD);
+            // visuel hack end
+            
+            event_inProgress = true;
+            undead = true;
+
+            DoYell(YELL_DEAD_1,LANG_UNIVERSAL,NULL);
+            DoPlaySoundToSet(m_creature,SOUND_DEAD_1);
+        }
+
+        if(event_inProgress)
+        {
+            damage = 0;
+        }
+    }
+
+    void StartZombiePhase()
+    {
+        undead = true;
+        event_inProgress = false;
+        m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_ATTACKABLE_2);
+        m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
+        m_creature->AI()->AttackStart(m_creature->getVictim());
+
+        DoYell(YELL_AGGRO_2,LANG_UNIVERSAL,NULL);
+        DoPlaySoundToSet(m_creature,SOUND_AGGRO_2);
+    }
+
+    void Aggro(Unit *who)
+    {
+        if(pInstance)
+            pInstance->SetData(DATA_INGVAR, IN_PROGRESS);
+
+        DoYell(YELL_AGGRO_1,LANG_UNIVERSAL,NULL);
+        DoPlaySoundToSet(m_creature,SOUND_AGGRO_1);
+    }
+
+    void JustDied(Unit* killer)  
+    {
+        if(pInstance)
+            pInstance->SetData(DATA_INGVAR, DONE);
+
+        DoYell(YELL_DEAD_2,LANG_UNIVERSAL,NULL);
+        DoPlaySoundToSet(m_creature,SOUND_DEAD_2);
+    }
+
+    void KilledUnit(Unit *victim)
+    {
+        if(undead)
+        {
+            DoYell(YELL_KILL_1,LANG_UNIVERSAL,NULL);
+            DoPlaySoundToSet(m_creature,SOUND_KILL_1);
+        }
+        else
+        {
+            DoYell(YELL_KILL_2,LANG_UNIVERSAL,NULL);
+            DoPlaySoundToSet(m_creature,SOUND_KILL_2);
+        }
+    }
+
+
+    void UpdateAI(const uint32 diff)
+    {
+        if (!UpdateVictim())
+            return;
+
+        if(event_inProgress)
+        {
+            if(SpawnResTimer)
+                if(SpawnResTimer< diff)
+                {
+                    DoCast(m_creature,SPELL_SUMMON_BANSHEE); // Summons direktly on caster position 
+                    //DoCast(m_creature,SPELL_SCOURG_RESURRECTION_EFFEKTSPAWN); // Dont needet ?
+                    SpawnResTimer = 0;
+                }else SpawnResTimer -= diff;
+
+            return;
+        }
+
+        // This is used for a spell queue ... the spells should not castet if one spell is already casting
+        if(wait_Timer)
+            if(wait_Timer < diff)
+            {
+                wait_Timer = 0;
+            }else wait_Timer -= diff;
+
+        if(Cleave_Timer < diff)
+        {
+            if(!wait_Timer)
+            {
+                if(undead)
+                    DoCast(m_creature->getVictim(),HeroicMode ? H_SPELL_WOE_STRIKE : SPELL_WOE_STRIKE);
+                else
+                    DoCast(m_creature->getVictim(),SPELL_CLEAVE);
+                Cleave_Timer = rand()%5000 + 2000;
+
+                wait_Timer = 1000;
+            }
+        }else Cleave_Timer -= diff;
+
+        if(Smash_Timer < diff)
+        {
+            if(!wait_Timer)
+            {
+                if(undead)
+                    DoCast(m_creature->getVictim(), SPELL_DARK_SMASH);
+                else
+                    DoCast(m_creature->getVictim(),HeroicMode ? H_SPELL_SMASH : SPELL_SMASH);
+                Smash_Timer = 10000;
+
+                wait_Timer = 5000;
+            }
+        }else Smash_Timer -= diff;
+
+        if(!undead)
+        {
+            if(Enrage_Timer < diff)
+            {
+                DoCast(m_creature,HeroicMode ? H_SPELL_ENRAGE : SPELL_ENRAGE);
+                Enrage_Timer = 10000;
+            }else Enrage_Timer -= diff;
+        }else // In Undead form used to summon weapon
+        {
+            if(Enrage_Timer < diff)
+            {
+                if(!wait_Timer)
+                {
+                    // Spawn target for Axe
+                    Unit* target = SelectUnit(SELECT_TARGET_TOPAGGRO, 1);
+                    if(target)
+                    {
+                        Creature* temp = m_creature->SummonCreature(ENTRY_THROW_TARGET,target->GetPositionX(),target->GetPositionY(),target->GetPositionZ(),0,TEMPSUMMON_TIMED_DESPAWN,2000);
+
+                        DoCast(m_creature,SPELL_SHADOW_AXE_SUMMON);
+                    }
+                    Enrage_Timer = 30000;
+                }
+            }else Enrage_Timer -= diff;
+        }
+
+
+        if(Roar_Timer < diff)
+        {
+            if(!wait_Timer)
+            {
+                if(undead)
+                    DoCast(m_creature,HeroicMode ? H_SPELL_DREADFUL_ROAR : SPELL_DREADFUL_ROAR);
+                else
+                    DoCast(m_creature,HeroicMode ? H_SPELL_STAGGERING_ROAR : SPELL_STAGGERING_ROAR);
+                Roar_Timer = 10000;
+
+                wait_Timer = 5000;
+            }
+        }else Roar_Timer -= diff;
+
+        DoMeleeAttackIfReady();
+    }
+};
+
+CreatureAI* GetAI_boss_ingvar_the_plunderer(Creature *_Creature)
+{
+    return new boss_ingvar_the_plundererAI (_Creature);
+}
+
+#define YELL_RESSURECT                      "Ingvar! Your pathetic failure will serve as a warning to all... you are damned! Arise and carry out the master's will!"
+#define SOUND_RESSURECT                     13754
+
+//Spells for Annhylde
+#define SPELL_SCOURG_RESURRECTION_HEAL              42704 //Heal Max + DummyAura
+#define SPELL_SCOURG_RESURRECTION_BEAM              42857 //Channeling Beam of Annhylde
+#define SPELL_SCOURG_RESURRECTION_DUMMY             42862 //Some Emote Dummy?
+#define SPELL_INGVAR_TRANSFORM                      42796
+
+struct TRINITY_DLL_DECL mob_annhylde_the_callerAI : public ScriptedAI
+{
+    mob_annhylde_the_callerAI(Creature *c) : ScriptedAI(c) 
+    {
+        pInstance = ((ScriptedInstance*)c->GetInstanceData());
+        Reset();
+    }
+
+    float x,y,z;
+    ScriptedInstance* pInstance;
+    uint32 Resurect_Timer;
+    uint32 Resurect_Phase;
+
+    void Reset()
+    {
+        m_creature->AddUnitMovementFlag(MOVEMENTFLAG_FLYING + MOVEMENTFLAG_FLYING2);
+        m_creature->SetSpeed(MOVE_SWIM , 0.1f);
+        m_creature->SetSpeed(MOVE_RUN , 0.1f);
+        m_creature->SetSpeed(MOVE_WALK , 0.1f);
+        m_creature->SetSpeed(MOVE_FLIGHT , 0.1f);
+
+        m_creature->GetPosition(x,y,z);
+        DoTeleportTo(x+1,y,z+30);
+
+        Unit* ingvar = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_INGVAR));
+        if(ingvar)
+        {
+            m_creature->GetMotionMaster()->MovePoint(1,x,y,z+15);
+
+            DoYell(YELL_RESSURECT,LANG_UNIVERSAL,NULL);
+            DoPlaySoundToSet(m_creature,SOUND_RESSURECT);
+        }
+    }
+
+    void MovementInform(uint32 type, uint32 id)
+    {
+        if(type != POINT_MOTION_TYPE)
+            return;
+        Unit* ingvar = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_INGVAR));
+        if(ingvar)
+        {
+            switch (id)
+            {
+            case 1:
+                ingvar->RemoveAura(SPELL_SUMMON_BANSHEE,1);
+                ingvar->CastSpell(ingvar,SPELL_SCOURG_RESURRECTION_DUMMY,true);
+                DoCast(ingvar,SPELL_SCOURG_RESURRECTION_BEAM);
+                Resurect_Timer = 8000;
+                Resurect_Phase = 1;
+                break;
+            case 2:
+                m_creature->DealDamage(m_creature,m_creature->GetHealth());
+                m_creature->RemoveCorpse();
+                break;
+            }
+        }
+    }
+
+    void AttackStart(Unit* who) {}
+    void MoveInLineOfSight(Unit* who) {}
+    void Aggro(Unit *who) {}
+    void UpdateAI(const uint32 diff)
+    {
+        if(Resurect_Timer)
+            if(Resurect_Timer < diff)
+            {
+                if(Resurect_Phase == 1)
+                {
+                    Unit* ingvar = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_INGVAR));
+                    if(ingvar)
+                    {
+                        ingvar->SetStandState(UNIT_STAND_STATE_STAND);
+                        ingvar->CastSpell(ingvar,SPELL_SCOURG_RESURRECTION_HEAL,false);
+                    }
+                    Resurect_Timer = 3000;
+                    Resurect_Phase = 2;
+                }else if (Resurect_Phase == 2)
+                {
+                    Unit* ingvar = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_INGVAR));
+                    if(ingvar)
+                    {
+                        ingvar->RemoveAurasDueToSpell(SPELL_SCOURG_RESURRECTION_DUMMY);
+                        //ingvar->CastSpell(ingvar,SPELL_INGVAR_TRANSFORM,false);
+                        ingvar->SetUInt32Value(UNIT_FIELD_DISPLAYID, MODEL_INGVAR_UNDEAD); // Visual Hack - when he dies he becomes human model -> wrong
+                        Creature* c_ingvar = (Creature*)ingvar;
+
+                        ((boss_ingvar_the_plundererAI*)(c_ingvar->AI()))->StartZombiePhase();
+
+                        m_creature->GetMotionMaster()->MovePoint(2,x+1,y,z+30);
+                        Resurect_Phase++;
+                    }
+                }
+                
+            }else Resurect_Timer -= diff;
+    }
+};
+
+CreatureAI* GetAI_mob_annhylde_the_caller(Creature *_Creature)
+{
+    return new mob_annhylde_the_callerAI (_Creature);
+}
+
+#define SPELL_SHADOW_AXE_DAMAGE                     42750
+#define H_SPELL_SHADOW_AXE_DAMAGE                   59719
+
+struct TRINITY_DLL_DECL mob_ingvar_throw_dummyAI : public ScriptedAI
+{
+    mob_ingvar_throw_dummyAI(Creature *c) : ScriptedAI(c) 
+    {
+        pInstance = ((ScriptedInstance*)c->GetInstanceData());
+        HeroicMode = c->GetMap()->IsHeroic();
+        Reset();
+    }
+
+    bool HeroicMode;
+    uint32 Despawn_Timer;
+
+    ScriptedInstance* pInstance;
+
+    void Reset()
+    {
+        Unit* target = FindCreature(ENTRY_THROW_TARGET,50,m_creature);
+        if(target)
+        {
+            DoCast(m_creature, HeroicMode ? H_SPELL_SHADOW_AXE_DAMAGE : SPELL_SHADOW_AXE_DAMAGE);
+            float x,y,z;
+            target->GetPosition(x,y,z);
+            m_creature->GetMotionMaster()->MovePoint(0,x,y,z);
+        }
+        Despawn_Timer = 7000;
+    }
+    void AttackStart(Unit* who) {}
+    void MoveInLineOfSight(Unit* who) {}
+    void Aggro(Unit *who) {}
+    void UpdateAI(const uint32 diff)
+    {
+        if(Despawn_Timer < diff)
+        {
+            m_creature->DealDamage(m_creature,m_creature->GetHealth());
+            m_creature->RemoveCorpse();
+            Despawn_Timer = 0;
+        }else Despawn_Timer -= diff;
+    }
+};
+
+CreatureAI* GetAI_mob_ingvar_throw_dummy(Creature *_Creature)
+{
+    return new mob_ingvar_throw_dummyAI (_Creature);
+}
+
+void AddSC_boss_ingvar_the_plunderer()
+{
+    Script *newscript;
+
+    newscript = new Script;
+    newscript->Name="boss_ingvar_the_plunderer";
+    newscript->GetAI = GetAI_boss_ingvar_the_plunderer;
+    newscript->RegisterSelf();
+
+    newscript = new Script;
+    newscript->Name="mob_annhylde_the_caller";
+    newscript->GetAI = GetAI_mob_annhylde_the_caller;
+    newscript->RegisterSelf();
+
+    newscript = new Script;
+    newscript->Name="mob_ingvar_throw_dummy";
+    newscript->GetAI = GetAI_mob_ingvar_throw_dummy;
+    newscript->RegisterSelf();
+}
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 4617b2129f3..1a709950b9f 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
@@ -156,16 +156,7 @@ struct TRINITY_DLL_DECL instance_utgarde_keep : public ScriptedInstance
 
         if (data == DONE)
         {
-            OUT_SAVE_INST_DATA;
-
-            std::ostringstream saveStream;
-            saveStream << "U K " << Encounters[0] << " " << Encounters[1] << " "
-                << Encounters[2];
-
-            str_data = saveStream.str();
-
             SaveToDB();
-            OUT_SAVE_INST_DATA_COMPLETE;
         }
     }
 
@@ -183,6 +174,15 @@ struct TRINITY_DLL_DECL instance_utgarde_keep : public ScriptedInstance
 
    const char* Save()
     {
+        OUT_SAVE_INST_DATA;
+
+        std::ostringstream saveStream;
+        saveStream << "U K " << Encounters[0] << " " << Encounters[1] << " "
+            << Encounters[2];
+
+        str_data = saveStream.str();
+
+        OUT_SAVE_INST_DATA_COMPLETE;
         return str_data.c_str();
     }