Changeset 82

Timestamp:

11/19/08 13:32:37 (17 years ago)

Author:

yumileroy

Message:

[svn] Add Alar script.
Update Magtheridon script.
Update Vorpil script. Patch provided by BroodWyrm?.
Add sunwell boss scripts into scriptmgr.cpp (forgot to do so in previous revs).

Original author: megamage
Date: 2008-10-20 14:02:13-05:00

Location:

trunk/src/bindings/scripts

Files:

• Makefile.am (modified) (1 diff)
• ScriptMgr.cpp (modified) (4 diffs)
• VC71/71ScriptDev2.vcproj (modified) (1 diff)
• VC80/80ScriptDev2.vcproj (modified) (1 diff)
• VC90/90ScriptDev2.vcproj (modified) (1 diff)
• scripts/zone/aunchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp (modified) (4 diffs)
• scripts/zone/aunchindoun/shadow_labyrinth/def_shadow_labyrinth.h (modified) (1 diff)
• scripts/zone/aunchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp (modified) (1 diff)
• scripts/zone/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp (modified) (9 diffs)
• scripts/zone/hellfire_citadel/magtheridons_lair/def_magtheridons_lair.h (modified) (1 diff)
• scripts/zone/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp (modified) (3 diffs)
• scripts/zone/tempest_keep/the_eye/boss_alar.cpp (added)
• scripts/zone/tempest_keep/the_eye/def_the_eye.h (modified) (1 diff)
• scripts/zone/tempest_keep/the_eye/instance_the_eye.cpp (modified) (7 diffs)
• sql/Updates/r86_trinity.sql (added)

trunk/src/bindings/scripts/Makefile.am

@@ -338 +338 @@
 scripts/zone/tempest_keep/botanica/boss_laj.cpp \
 scripts/zone/tempest_keep/botanica/boss_warp_splinter.cpp \
+scripts/zone/tempest_keep/the_eye/boss_alar.cpp \
 scripts/zone/tempest_keep/the_eye/boss_astromancer.cpp \
 scripts/zone/tempest_keep/the_eye/boss_kaelthas.cpp \

trunk/src/bindings/scripts/ScriptMgr.cpp

@@ -496 +496 @@
 
 //Sunken Temple
+//Sunwell Plateau
+extern void AddSC_instance_sunwell_plateau();
+extern void AddSC_boss_kalecgos();
+extern void AddSC_boss_brutallus();
+extern void AddSC_boss_felmyst();
+extern void AddSC_boss_eredar_twins();
+
 //Tanaris
 extern void AddSC_tanaris();
@@ -512 +519 @@
 
 //--The Eye
+extern void AddSC_boss_alar();
 extern void AddSC_boss_kaelthas();
 extern void AddSC_boss_void_reaver();
@@ -1678 +1686 @@
 
     //Sunken Temple
+        //Sunwell Plateau
+    AddSC_instance_sunwell_plateau();
+    AddSC_boss_kalecgos();
+        AddSC_boss_brutallus();
+    AddSC_boss_felmyst();
+    AddSC_boss_eredar_twins();
+
     //Tanaris
     AddSC_tanaris();
@@ -1694 +1709 @@
 
     //--The Eye
+    AddSC_boss_alar();
     AddSC_boss_kaelthas();
     AddSC_boss_void_reaver();

trunk/src/bindings/scripts/VC71/71ScriptDev2.vcproj

@@ -1521 +1521 @@
                                                 Name="The Eye"
                                                 >
+                                                <File
+                                                        RelativePath="..\scripts\zone\tempest_keep\the_eye\boss_alar.cpp"
+                                                        >
+                                                </File>                                                 
                                                 <File
                                                         RelativePath="..\scripts\zone\tempest_keep\the_eye\boss_astromancer.cpp"

trunk/src/bindings/scripts/VC80/80ScriptDev2.vcproj

@@ -1754 +1754 @@
                                                 Name="The Eye"
                                                 >
+                                                <File
+                                                        RelativePath="..\scripts\zone\tempest_keep\the_eye\boss_alar.cpp"
+                                                        >
+                                                </File>                                                 
                                                 <File
                                                         RelativePath="..\scripts\zone\tempest_keep\the_eye\boss_astromancer.cpp"

trunk/src/bindings/scripts/VC90/90ScriptDev2.vcproj

@@ -1752 +1752 @@
                                                 Name="The Eye"
                                                 >
+                                                <File
+                                                        RelativePath="..\scripts\zone\tempest_keep\the_eye\boss_alar.cpp"
+                                                        >
+                                                </File>                                         
                                                 <File
                                                         RelativePath="..\scripts\zone\tempest_keep\the_eye\boss_astromancer.cpp"

trunk/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp

@@ -17 +17 @@
 /* ScriptData
 SDName: Boss_Grandmaster_Vorpil
-SD%Complete: 75
-SDComment: Despawn all summoned on death not implemented. Void Traveler effects not implemented.
+SD%Complete: 100
+SDComment: 
 SDCategory: Auchindoun, Shadow Labyrinth
 EndScriptData */
@@ -25 +25 @@
 #include "def_shadow_labyrinth.h"
 
-#define SPELL_DRAW_SHADOWS              33563
-#define SPELL_VOID_PORTAL_A             33566               //spell only summon one unit, but we use it for the visual effect and summon the 4 other portals manual way(only one spell exist)
-#define SPELL_VOID_PORTAL_VISUAL        33569
-#define SPELL_SHADOW_BOLT_VOLLEY        32963
-#define SPELL_SUMMON_VOIDWALKER_A       33582
-#define SPELL_SUMMON_VOIDWALKER_B       33583
-#define SPELL_SUMMON_VOIDWALKER_C       33584
-#define SPELL_SUMMON_VOIDWALKER_D       33585
-#define SPELL_SUMMON_VOIDWALKER_E       33586
-#define SPELL_RAIN_OF_FIRE              33617
-#define H_SPELL_RAIN_OF_FIRE            39363
-#define H_SPELL_BANISH                  38791
-
-#define SAY_INTRO               "Keep your minds focused for the days of reckoning are close at hand. Soon, the destroyer of worlds will return to make good on his promise. Soon the destruction of all that is will begin!"
-#define SAY_AGGRO1              "I'll make an offering of your blood!"
-#define SAY_AGGRO2              "You'll be a fine example, for the others."
-#define SAY_AGGRO3              "Good, a worthy sacrifice."
-#define SAY_HELP                "Come to my aid, heed your master now!"
-#define SAY_SLAY1               "I serve with pride."
-#define SAY_SLAY2               "Your death is for the greater cause!"
-#define SAY_DEATH               "I give my life... Gladly."
-
-#define SOUND_INTRO             10522
-#define SOUND_AGGRO1            10524
-#define SOUND_AGGRO2            10525
-#define SOUND_AGGRO3            10526
-#define SOUND_HELP              10523
-#define SOUND_SLAY1             10527
-#define SOUND_SLAY2             10528
-#define SOUND_DEATH             10529
-
-#define ENTRY_VOID_PORTAL       19224
-#define ENTRY_VOID_TRAVELER     19226
-
-#define LOCX                    -253.06f
-#define LOCY                    -264.02f
-#define LOCZ                    17.08
+#define SAY_INTRO                "Keep your minds focused for the days of reckoning are close at hand. Soon, the destroyer of worlds will return to make good on his promise. Soon the destruction of all that is will begin!"
+#define SAY_AGGRO1               "I'll make an offering of your blood!"
+#define SAY_AGGRO2               "You'll be a fine example, for the others."
+#define SAY_AGGRO3               "Good, a worthy sacrifice."
+#define SAY_HELP                 "Come to my aid, heed your master now!"
+#define SAY_SLAY1                "I serve with pride."
+#define SAY_SLAY2                "Your death is for the greater cause!"
+#define SAY_DEATH                "I give my life... Gladly."
+
+#define SOUND_INTRO              10522
+#define SOUND_AGGRO1             10524
+#define SOUND_AGGRO2             10525
+#define SOUND_AGGRO3             10526
+#define SOUND_HELP               10523
+#define SOUND_SLAY1              10527
+#define SOUND_SLAY2              10528
+#define SOUND_DEATH              10529
+
+#define SPELL_RAIN_OF_FIRE          33617
+#define H_SPELL_RAIN_OF_FIRE        39363
+
+#define SPELL_DRAWN_SHADOWS         33563
+#define SPELL_SHADOWBOLT_VOLLEY     33841
+
+#define MOB_VOID_TRAVELER           19226
+#define SPELL_SACRIFICE             33587
+#define SPELL_SHADOW_NOVA           33846
+#define SPELL_HEALVORPIL            33783
+#define H_SPELL_HEALVORPIL          39364
+
+#define MOB_VOID_PORTAL             19224
+#define SPELL_VOID_PORTAL_VISUAL    33569
+
+float VorpilPosition[1][3] =
+{
+    {-252.8820,-264.3030,17.1}
+};
+
+float VoidPortalCoords[5][3] = 
+{
+    {-283.5894, -239.5718, 12.7},
+    {-306.5853, -258.4539, 12.7},
+    {-295.8789, -269.0899, 12.7},
+    {-209.3401, -262.7564, 17.1},
+    {-261.4533, -297.3298, 17.1}
+};
 
 struct TRINITY_DLL_DECL boss_grandmaster_vorpilAI : public ScriptedAI
 {
     boss_grandmaster_vorpilAI(Creature *c) : ScriptedAI(c)
+    {
+        pInstance = ((ScriptedInstance*)c->GetInstanceData());
+        Intro = false;
+        Reset();
+    }
+
+    ScriptedInstance *pInstance;
+    bool Intro;
+    bool sumportals;
+    bool HeroicMode;
+   
+    uint32 ShadowBoltVolley_Timer;
+    uint32 DrawnShadows_Timer;
+    uint32 sumportals_Timer;
+    uint32 summonTraveler_Timer;
+    uint64 PortalsGuid[5]; 
+
+    void summonPortals()
+    {
+        for (int i = 0;i<5;i++)
+        {
+            Creature *Portal = NULL;
+            Portal = m_creature->SummonCreature(MOB_VOID_PORTAL,VoidPortalCoords[i][0],VoidPortalCoords[i][1],VoidPortalCoords[i][2],0,TEMPSUMMON_CORPSE_DESPAWN,3000000);
+            PortalsGuid[i] = Portal->GetGUID();
+            Portal->CastSpell(Portal,SPELL_VOID_PORTAL_VISUAL,false);
+        }
+        sumportals = true;
+        summonTraveler_Timer = 5000;
+    }
+
+    void destroyPortals()
+    {
+        for (int i = 0;i < 5; i ++)
+        {
+            Unit *Portal = Unit::GetUnit((*m_creature), PortalsGuid[i]);
+            if (Portal)
+                if (Portal->isAlive())
+                    Portal->DealDamage(Portal, Portal->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+            PortalsGuid[i] = 0;
+        }     
+    }
+
+    void spawnVoidTraveler()
+    {
+        srand( (unsigned) time(NULL) ) ; 
+        int pos = rand()%5;
+        Creature *traveler;
+        traveler = m_creature->SummonCreature(MOB_VOID_TRAVELER,VoidPortalCoords[pos][0],VoidPortalCoords[pos][1],VoidPortalCoords[pos][2],0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,10000);
+    }
+
+    void Reset()
+    {
+        HeroicMode = m_creature->GetMap()->IsHeroic();
+        if( HeroicMode )
+            debug_log("SD2: creature %u is in heroic mode",m_creature->GetEntry());
+
+        ShadowBoltVolley_Timer = 15000;
+        DrawnShadows_Timer = 45000;
+        sumportals_Timer = 10000;
+        summonTraveler_Timer = 90000;
+
+        InCombat = false;
+        sumportals = false;
+        destroyPortals();
+
+        if(pInstance)
+            pInstance->SetData(DATA_GRANDMASTERVORPILEVENT, NOT_STARTED);
+    }
+
+    void KilledUnit(Unit *victim)
+    {
+        switch(rand()%2)
+        {
+            case 0:
+            DoYell(SAY_SLAY1, LANG_UNIVERSAL, NULL);
+            DoPlaySoundToSet(m_creature, SOUND_SLAY1);
+            break;
+
+            case 1:
+            DoYell(SAY_SLAY2, LANG_UNIVERSAL, NULL);
+            DoPlaySoundToSet(m_creature, SOUND_SLAY2);
+            break;
+        }
+    }
+
+    void JustDied(Unit *victim)
+    {
+        DoYell(SAY_DEATH, LANG_UNIVERSAL, NULL);
+        DoPlaySoundToSet(m_creature, SOUND_DEATH);
+        destroyPortals();
+        if(pInstance)
+            pInstance->SetData(DATA_GRANDMASTERVORPILEVENT, DONE);
+    }
+
+    void StartEvent()
+    {
+        switch(rand()%3)
+        {
+            case 0:
+            DoYell(SAY_AGGRO1, LANG_UNIVERSAL, NULL);
+            DoPlaySoundToSet(m_creature, SOUND_AGGRO1);
+            break;
+
+            case 1:
+            DoYell(SAY_AGGRO2, LANG_UNIVERSAL, NULL);
+            DoPlaySoundToSet(m_creature, SOUND_AGGRO2);
+            break;
+
+            case 2:
+            DoYell(SAY_AGGRO3, LANG_UNIVERSAL, NULL);
+            DoPlaySoundToSet(m_creature, SOUND_AGGRO3);
+            break;
+        }
+
+        if(pInstance)
+            pInstance->SetData(DATA_GRANDMASTERVORPILEVENT, IN_PROGRESS);
+    }
+
+    void Aggro(Unit *who)
+    {
+        if(!InCombat)
+        {   
+            InCombat = true;
+            StartEvent();
+        }
+    }
+
+    void MoveInLineOfSight(Unit *who)
+    {
+        if (!who || m_creature->getVictim())
+            return;
+
+        if (who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who))
+        {
+            float attackRadius = m_creature->GetAttackDistance(who);
+            if (m_creature->IsWithinDistInMap(who, attackRadius) && m_creature->GetDistanceZ(who) <= CREATURE_Z_ATTACK_RANGE && m_creature->IsWithinLOSInMap(who))
+            {
+                if(who->HasStealthAura())
+                    who->RemoveSpellsCausingAura(SPELL_AURA_MOD_STEALTH);
+
+                DoStartAttackAndMovement(who);
+                Aggro(who);
+            }
+        }
+        else if (!Intro && m_creature->IsWithinLOSInMap(who)&& m_creature->IsWithinDistInMap(who, 100) ) //not sure about right radius
+        {
+            DoYell(SAY_INTRO, LANG_UNIVERSAL, NULL);
+            DoPlaySoundToSet(m_creature, SOUND_INTRO);
+            Intro = true;
+        }
+
+    }
+   
+    void UpdateAI(const uint32 diff)
+    {
+
+        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+            return;
+        
+        if (!sumportals)
+        if (sumportals_Timer < diff)
+        {
+            DoYell(SAY_HELP, LANG_UNIVERSAL, NULL);
+            DoPlaySoundToSet(m_creature, SOUND_HELP);
+            summonPortals();
+            sumportals_Timer = 1000000;
+                    
+        }else sumportals_Timer -= diff;
+
+        if (ShadowBoltVolley_Timer < diff)
+        {
+            DoCast(m_creature,SPELL_SHADOWBOLT_VOLLEY);
+            ShadowBoltVolley_Timer = 15000;
+        }else ShadowBoltVolley_Timer -= diff;
+
+        if ( DrawnShadows_Timer < diff)
+        {
+            Map *map = m_creature->GetMap();
+            if(map->IsDungeon())
+            {
+                InstanceMap::PlayerList const &PlayerList = ((InstanceMap*)map)->GetPlayers();
+                for (InstanceMap::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
+                {
+                    if((*i)->isAlive())
+                    {
+                        (*i)->TeleportTo(555,VorpilPosition[0][0],VorpilPosition[0][1],VorpilPosition[0][2],0);
+                    }
+                }
+            }
+            m_creature->Relocate(VorpilPosition[0][0],VorpilPosition[0][1],VorpilPosition[0][2],0);
+            DoCast(m_creature,SPELL_DRAWN_SHADOWS,true);
+
+            if(!HeroicMode) DoCast(m_creature,SPELL_RAIN_OF_FIRE);
+            else DoCast(m_creature,H_SPELL_RAIN_OF_FIRE);
+
+            ShadowBoltVolley_Timer = 6000;
+            DrawnShadows_Timer = 45000;    
+        }else DrawnShadows_Timer -= diff;
+
+        if ( summonTraveler_Timer < diff)
+        {
+            spawnVoidTraveler();
+            summonTraveler_Timer = 10000;
+        }else summonTraveler_Timer -=diff;
+
+        DoMeleeAttackIfReady();
+    }
+};
+CreatureAI* GetAI_boss_grandmaster_vorpil(Creature *_Creature)
+{
+    return new boss_grandmaster_vorpilAI (_Creature);
+}
+
+struct TRINITY_DLL_DECL mob_voidtravelerAI : public ScriptedAI
+{
+    mob_voidtravelerAI(Creature *c) : ScriptedAI(c)
     {
         pInstance = ((ScriptedInstance*)c->GetInstanceData());
@@ -71 +296 @@
     }
 
-    ScriptedInstance* pInstance;
+    ScriptedInstance *pInstance;
+    uint32 VorpilCheck_Timer;
+    uint32 eventCheck_Timer;
+    bool sacrifice;
+    bool sacrificed;
+    bool oneTarget;
     bool HeroicMode;
 
-    uint32 ShadowBoltVolley_Timer;
-    uint32 DrawShadows_Timer;
-    uint32 Teleport_Timer;
-    uint32 VoidTraveler_Timer;
-    uint32 Banish_Timer;
-    bool Intro;
-    bool Teleport;
+    uint32 target_timer;
 
     void Reset()
     {
         HeroicMode = m_creature->GetMap()->IsHeroic();
-
-        ShadowBoltVolley_Timer = 15000;
-        DrawShadows_Timer = 40000;
-        Teleport_Timer = 1000;
-        VoidTraveler_Timer = 20000;
-        Banish_Timer = 25000;
-        Intro = false;
-        Teleport = false;
-
-        if( pInstance )
-            pInstance->SetData(DATA_GRANDMASTERVORPILEVENT, NOT_STARTED);
-    }
-
-    void MoveInLineOfSight(Unit *who)
-    {
-        if( !m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessablePlaceFor(m_creature) )
-        {
-            //not sure about right radius
-            if(!Intro && m_creature->IsWithinDistInMap(who, 50))
+        if( HeroicMode )
+            debug_log("SD2: creature %u is in heroic mode",m_creature->GetEntry());
+
+        VorpilCheck_Timer = 5000;
+        eventCheck_Timer = 1000;
+        target_timer = 2000;
+        oneTarget = false;
+        sacrificed = false;
+        sacrifice = false;       
+    }
+    void EnterEvadeMode(){}
+    void Aggro(Unit *who) {}
+    void AttackStart(Unit *who){}
+    void MoveInLineOfSight(Unit *who){}
+
+    void UpdateAI(const uint32 diff)
+    {
+        if (eventCheck_Timer < diff)
+        {
+            if(pInstance)
             {
-                DoYell(SAY_INTRO, LANG_UNIVERSAL, NULL);
-                DoPlaySoundToSet(m_creature, SOUND_INTRO);
-                DoCast(m_creature, SPELL_VOID_PORTAL_A,true);
-                m_creature->SummonCreature(ENTRY_VOID_PORTAL,-262.40,-229.57,17.08,0,TEMPSUMMON_CORPSE_DESPAWN,0);
-                m_creature->SummonCreature(ENTRY_VOID_PORTAL,-260.35,-297.56,17.08,0,TEMPSUMMON_CORPSE_DESPAWN,0);
-                m_creature->SummonCreature(ENTRY_VOID_PORTAL,-292.05,-270.37,12.68,0,TEMPSUMMON_CORPSE_DESPAWN,0);
-                m_creature->SummonCreature(ENTRY_VOID_PORTAL,-301.64,-255.97,12.68,0,TEMPSUMMON_CORPSE_DESPAWN,0);
-                Intro = true;
-            }
-
-            if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE)
-                return;
-
-            float attackRadius = m_creature->GetAttackDistance(who);
-            if( m_creature->IsWithinDistInMap(who, attackRadius) && m_creature->IsWithinLOSInMap(who) )
-            {
-                DoStartAttackAndMovement(who);
-                who->RemoveSpellsCausingAura(SPELL_AURA_MOD_STEALTH);
-
-                if (!InCombat)
+                Unit *Vorpil = Unit::GetUnit((*m_creature),pInstance->GetData64(DATA_GRANDMASTERVORPIL));
+                if (Vorpil)
                 {
-                    InCombat = true;
-                    Aggro(who);
+                    if (Vorpil->isDead())
+                    {
+                         m_creature->DealDamage(m_creature, m_creature->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+                    }
+
+                    if (Vorpil->getVictim())
+                    {    
+                        if((*m_creature).GetMotionMaster()->GetCurrentMovementGeneratorType() != TARGETED_MOTION_TYPE)
+                            (*m_creature).GetMotionMaster()->MoveFollow(Vorpil,1,0);
+                    }
+                }  
+                if(pInstance->GetData(DATA_GRANDMASTERVORPILEVENT) != IN_PROGRESS)
+                {
+                    m_creature->DealDamage(m_creature, m_creature->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
                 }
             }
-        }
-    }
-
-    void Aggro(Unit *who)
-    {
-        switch(rand()%3)
-        {
-            case 0:
-                DoYell(SAY_AGGRO1, LANG_UNIVERSAL, NULL);
-                DoPlaySoundToSet(m_creature, SOUND_AGGRO1);
-                break;
-            case 1:
-                DoYell(SAY_AGGRO2, LANG_UNIVERSAL, NULL);
-                DoPlaySoundToSet(m_creature, SOUND_AGGRO2);
-                break;
-            case 2:
-                DoYell(SAY_AGGRO3, LANG_UNIVERSAL, NULL);
-                DoPlaySoundToSet(m_creature, SOUND_AGGRO3);
-                break;
-        }
-
-        if( pInstance )
-            pInstance->SetData(DATA_GRANDMASTERVORPILEVENT, IN_PROGRESS);
-    }
-
-    void KilledUnit(Unit *victim)
-    {
-        switch(rand()%2)
-        {
-            case 0:
-                DoYell(SAY_SLAY1, LANG_UNIVERSAL, NULL);
-                DoPlaySoundToSet(m_creature, SOUND_SLAY1);
-                break;
-            case 1:
-                DoYell(SAY_SLAY2, LANG_UNIVERSAL, NULL);
-                DoPlaySoundToSet(m_creature, SOUND_SLAY2);
-                break;
-        }
-    }
-
-    void JustSummoned(Creature *summoned)
-    {
-        if( summoned->GetEntry() == ENTRY_VOID_TRAVELER )
-        {
-            summoned->GetMotionMaster()->MoveChase(m_creature);
-            summoned->SetSpeed(MOVE_WALK,0.8,true);
-        }
-
-        if( summoned->GetEntry() == ENTRY_VOID_PORTAL )
-            summoned->CastSpell(summoned,SPELL_VOID_PORTAL_VISUAL,true);
-    }
-
-    void JustDied(Unit *victim)
-    {
-        DoYell(SAY_DEATH, LANG_UNIVERSAL, NULL);
-        DoPlaySoundToSet(m_creature, SOUND_DEATH);
-
-        if( pInstance )
-            pInstance->SetData(DATA_GRANDMASTERVORPILEVENT, DONE);
-    }
-
-    void UpdateAI(const uint32 diff)
-    {
-        //Return since we have no target
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
-            return;
-
-        if( Teleport )
-        {
-            if( Teleport_Timer <= diff )
+            eventCheck_Timer = 5000;
+        }else eventCheck_Timer -=diff;
+
+        if (VorpilCheck_Timer < diff)
+        {
+            if (pInstance)
             {
-                m_creature->Relocate(LOCX,LOCY,LOCZ);
-                m_creature->SendMonsterMove(LOCX,LOCY,LOCZ,0,true,0);
-
-                float ranX = LOCX;
-                float ranY = LOCY;
-                float ranZ = LOCZ;
-
-                std::list<HostilReference *> t_list = m_creature->getThreatManager().getThreatList();
-                for( std::list<HostilReference *>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr )
+                if (!sacrificed)
                 {
-                    Unit* target = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid());
-                    if( target && target->GetTypeId() == TYPEID_PLAYER )
+                    if (!sacrifice)
                     {
-                        target->GetRandomPoint(LOCX,LOCY,LOCZ,3.0,ranX,ranY,ranZ);
-                        DoTeleportPlayer(target,ranX,ranY,ranZ,m_creature->GetAngle(m_creature->GetPositionX(),m_creature->GetPositionY()));
+                        Unit *Vorpil = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_GRANDMASTERVORPIL));
+                        if (Vorpil)
+                            if (Vorpil->isAlive())
+                            {
+                                if (m_creature->IsWithinDistInMap(Vorpil, 2))
+                                {
+                                    sacrifice = true;
+                                    DoCast(m_creature,SPELL_SACRIFICE);
+                                    VorpilCheck_Timer = 2000;
+                                }
+                            }
+
+                        if (!sacrifice)
+                            VorpilCheck_Timer = 3000;
+                    }
+                    else
+                    { 
+                        Unit *Vorpil = Unit::GetUnit((*m_creature),pInstance->GetData64(DATA_GRANDMASTERVORPIL));
+                        if (Vorpil)
+                            if (Vorpil->isAlive())
+                            {
+                                if(!HeroicMode) Vorpil->CastSpell(Vorpil,SPELL_HEALVORPIL,true);
+                                else Vorpil->CastSpell(Vorpil,H_SPELL_HEALVORPIL,true);
+                            };
+                        DoCast(m_creature,SPELL_SHADOW_NOVA); 
+                        sacrificed = true;
+                        m_creature->DealDamage(m_creature, m_creature->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+                        VorpilCheck_Timer = 100000;
                     }
                 }
-                Teleport = false;
-
-                if( HeroicMode ) DoCast(m_creature->getVictim(), H_SPELL_RAIN_OF_FIRE);
-                else DoCast(m_creature->getVictim(), SPELL_RAIN_OF_FIRE);
-
-                Teleport_Timer = 1000;
-            }else Teleport_Timer -= diff;
-        }
-
-        if( ShadowBoltVolley_Timer < diff )
-        {
-            DoCast(m_creature->getVictim(), SPELL_SHADOW_BOLT_VOLLEY);
-            ShadowBoltVolley_Timer = 30000;
-        }else ShadowBoltVolley_Timer -= diff;
-
-        if( DrawShadows_Timer < diff )
-        {
-            DoCast(m_creature,SPELL_DRAW_SHADOWS);
-            DrawShadows_Timer = 35000;
-            Teleport = true;
-        }else DrawShadows_Timer -= diff;
-
-        if( VoidTraveler_Timer < diff )
-        {
-            DoYell(SAY_HELP, LANG_UNIVERSAL, NULL);
-            DoPlaySoundToSet(m_creature, SOUND_HELP);
-
-            switch(rand()%5)
-            {
-                case 0:
-                    DoCast(m_creature,SPELL_SUMMON_VOIDWALKER_A,true);
-                    break;
-                case 1:
-                    DoCast(m_creature,SPELL_SUMMON_VOIDWALKER_B,true);
-                    break;
-                case 2:
-                    DoCast(m_creature,SPELL_SUMMON_VOIDWALKER_C,true);
-                    break;
-                case 3:
-                    DoCast(m_creature,SPELL_SUMMON_VOIDWALKER_D,true);
-                    break;
-                case 4:
-                    DoCast(m_creature,SPELL_SUMMON_VOIDWALKER_E,true);
-                    break;
             }
-            //faster rate when below (X) health?
-            VoidTraveler_Timer = 35000;
-        }else VoidTraveler_Timer -= diff;
-
-        if( HeroicMode )
-        {
-            if( Banish_Timer < diff )
-            {
-                if( Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 1) )
-                    DoCast(target,H_SPELL_BANISH);
-                Banish_Timer = 35000;
-            }else Banish_Timer -= diff;
-        }
-
-        DoMeleeAttackIfReady();
+         }else VorpilCheck_Timer -= diff;
     }
 };
-CreatureAI* GetAI_boss_grandmaster_vorpil(Creature *_Creature)
-{
-    return new boss_grandmaster_vorpilAI (_Creature);
+
+CreatureAI* GetAI_mob_voidtraveler(Creature *_Creature)
+{
+    return new mob_voidtravelerAI (_Creature);
 }
 
@@ -292 +407 @@
     newscript->GetAI = GetAI_boss_grandmaster_vorpil;
     m_scripts[nrscripts++] = newscript;
+
+    newscript = new Script;
+    newscript->Name="mob_voidtraveler";
+    newscript->GetAI = GetAI_mob_voidtraveler;
+    m_scripts[nrscripts++] = newscript;
 }

trunk/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/def_shadow_labyrinth.h

@@ -11 +11 @@
 #define DATA_GRANDMASTERVORPILEVENT 4
 #define DATA_MURMUREVENT 5
+#define DATA_GRANDMASTERVORPIL 6
 #endif

trunk/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp

@@ -157 +157 @@
     uint64 GetData64(uint32 identifier)
     {
-        if(identifier  == DATA_GRANDMASTERVORPILEVENT)
+        if(identifier  == DATA_GRANDMASTERVORPIL)
             return GrandmasterVorpil;
 

trunk/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp

@@ -1 @@
-/* Copyright (C) 2006 - 2008 ScriptDev2 <https://scriptdev2.svn.sourceforge.net/>
- * 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
- */
+/* Copyright(C) 2006 - 2008 ScriptDev2 <https://scriptdev2.svn.sourceforge.net/>
+* 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
@@ -24 +24 @@
 #include "precompiled.h"
 #include "def_magtheridons_lair.h"
-#include "WorldPacket.h"
-
-//Phase 2 Spells
-#define SPELL_QUAKE_PROC            30571
-#define SPELL_QUAKE                 30576                   //must be cast with 30561 as the proc spell
-#define SPELL_BLASTNOVA             30616
+
+#define MOB_MAGTHERIDON     17257
+#define MOB_ROOM            17516
+#define MOB_CHANNELLER      17256
+#define MOB_ABYSSAL         17454
+
+#define SPELL_BLASTNOVA             30616  
 #define SPELL_CLEAVE                30619
+#define SPELL_QUAKE_TRIGGER         30576 // must be cast with 30561 as the proc spell
+#define SPELL_QUAKE_KNOCKBACK       30571
+#define SPELL_BLAZE_TARGET          30541 // core bug, does not support target 7
+#define SPELL_BLAZE_TRAP            30542
+#define SPELL_DEBRIS_KNOCKDOWN      36449
+#define SPELL_DEBRIS_VISUAL                     30632
+#define SPELL_DEBRIS_DAMAGE                     30631 // core bug, does not support target 8
+#define SPELL_CAMERA_SHAKE          36455
 #define SPELL_BERSERK               27680
-#define SPELL_DEBRIS                30631
-#define SPELL_CAMERA_SHAKE          36455
-
-//Banish
-#define SPELL_SHADOW_CAGE           30205
-
-//Player version of the banish
-#define SPELL_SHADOW_CAGE_2         30168
-
-//Spell that is cast on players from the cube
+
+#define SPELL_SHADOW_CAGE           30168
 #define SPELL_SHADOW_GRASP          30410
-#define SPELL_SHADOW_GRASP_UKN      30166
-#define SPELL_SHADOW_GRASP_VIS      30207
+#define SPELL_SHADOW_GRASP_VISUAL   30166
+#define SPELL_MIND_EXHAUSTION           44032   //Casted by the cubes when channeling ends
+
+#define SPELL_SHADOW_CAGE_C         30205
+#define SPELL_SHADOW_GRASP_C        30207
+
+#define SPELL_SHADOW_BOLT_VOLLEY    30510
+#define SPELL_DARK_MENDING          30528
+#define SPELL_FEAR                  30530 //39176
+#define SPELL_BURNING_ABYSSAL       30511
+#define SPELL_SOUL_TRANSFER         30531 // core bug, does not support target 7
+
+#define SPELL_FIRE_BLAST                        37110
 
 //Dialog
 #define SAY_AGGRO                   "Thank you for releasing me. Now...die!"
 #define SOUND_AGGRO                 10254
-
 #define SAY_BANISH                  "Not again...NOT AGAIN!"
 #define SOUND_BANISH                10256
-
 #define SAY_FREED                   "I...am...UNLEASHED!!!"
 #define SOUND_FREED                 10253
-
 #define SAY_CHAMBER_DESTROY         "I will not be taken so easily. Let the walls of this prison tremble...and FALL!!!"
 #define SOUND_CHAMBER_DESTROY       10257
-
 #define SAY_PLAYER_KILLED           "Did you think me weak? Soft? Who is the weak one now?!"
 #define SOUND_PLAYER_KILLED         10255
-
 #define SAY_DEATH                   "The Legion...will consume you...all...."
-#define SOUND_DEATH                 10258
-
+#define SOUND_DEATH                 10258 
 #define EMOTE_BERSERK               "becomes enraged!"
 #define EMOTE_BLASTNOVA             "begins to cast Blast Nova!"
 #define EMOTE_BEGIN                 "%s's bonds begin to weaken!"
 
-//Spawned objects
-#define SPELL_COLLAPSE              34233                   //This spell casted by the "cave in" type object
-
-#define SPELL_CONFLAGERATION        35840                   //Actually casted by a creature or object spawned on the ground
-
-//Cubes
-#define SPELL_MIND_EXHAUSTIOIN      30509                   //Casted by the cubes when channeling ends
-
-//Channeler spells
-//#define MOB_HELLFIRE_CHANNELLER    17256
-
-#define SPELL_SOUL_TRANSFER         30531
-#define SPELL_SHADOW_BOLT_VOLLEY    30510
-#define SPELL_DARK_MENDING          30528
-#define SPELL_HELLFIRE_CHANNELING   31059
-#define SPELL_HELLFIRE_CAST_VISUAL  24207
-#define SPELL_FEAR                  39176
-
-#define SPELL_BURNING_ABYSSAL       30511
+// count of clickers needed to interrupt blast nova
+#define CLICKERS_COUNT                          5
 
 // Unkown sounds
 uint32 RandomSound[] = {10247, 10248, 10249, 10250, 10251, 10252};
 
+typedef std::map<uint64, uint64> CubeMap;
+
+struct TRINITY_DLL_DECL mob_abyssalAI : public ScriptedAI
+{
+    mob_abyssalAI(Creature *c) : ScriptedAI(c)
+    {
+        trigger = 0;
+        Despawn_Timer = 60000;
+        Reset();
+    }
+
+    uint32 FireBlast_Timer;
+    uint32 Despawn_Timer;
+    uint32 trigger;
+
+    void Reset()
+    {
+        FireBlast_Timer = 6000;
+    }
+
+    void SpellHit(Unit*, const SpellEntry *spell)
+    {
+        if(trigger == 2 && spell->Id == SPELL_BLAZE_TARGET)
+        {
+            m_creature->CastSpell(m_creature, SPELL_BLAZE_TRAP, true);
+            m_creature->SetVisibility(VISIBILITY_OFF);
+            Despawn_Timer = 130000;
+        }
+    }
+
+    void SetTrigger(uint32 _trigger)
+    {
+        trigger = _trigger;
+        m_creature->SetDisplayId(11686);
+        if(trigger == 1) //debris
+        {
+            m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+            m_creature->CastSpell(m_creature, SPELL_DEBRIS_VISUAL, true);
+            FireBlast_Timer = 5000;
+            Despawn_Timer = 10000;     
+        }
+    }
+
+    void Aggro(Unit*) {DoZoneInCombat();}
+    void AttackStart(Unit *who) {if(!trigger) ScriptedAI::AttackStart(who);}
+    void MoveInLineOfSight(Unit *who) {if(!trigger) ScriptedAI::MoveInLineOfSight(who);}
+
+    void UpdateAI(const uint32 diff)
+    {
+        if(trigger)
+        {
+            if(trigger == 1)
+            {
+                if(FireBlast_Timer < diff)
+                {
+                    m_creature->CastSpell(m_creature, SPELL_DEBRIS_DAMAGE, true);
+                    trigger = 3;
+                }else FireBlast_Timer -= diff;
+            }
+            return;
+        }
+
+        if(Despawn_Timer < diff)
+        {
+            m_creature->SetVisibility(VISIBILITY_OFF);
+            m_creature->setDeathState(JUST_DIED);
+        }else Despawn_Timer -= diff;
+
+        if(!m_creature->SelectHostilTarget() && !m_creature->getVictim())
+            return;
+
+        if(FireBlast_Timer < diff)
+        {
+            DoCast(m_creature->getVictim(), SPELL_FIRE_BLAST);
+            FireBlast_Timer = 5000+rand()%10000;
+        }else FireBlast_Timer -= diff;
+
+        DoMeleeAttackIfReady();
+    }
+};
+
 struct TRINITY_DLL_DECL boss_magtheridonAI : public ScriptedAI
 {
-    boss_magtheridonAI(Creature *c) : ScriptedAI(c)
-    {
-        pInst = (ScriptedInstance*)m_creature->GetInstanceData();
+    boss_magtheridonAI(Creature *c) : ScriptedAI(c) 
+    {
+        pInstance =(ScriptedInstance*)m_creature->GetInstanceData();      
+        m_creature->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, 10);
+        m_creature->SetFloatValue(UNIT_FIELD_COMBATREACH, 10);
         Reset();
     }
 
-    ScriptedInstance* pInst;
-
-    uint32 Phase1_Timer;
+    CubeMap Cube;
+
+    ScriptedInstance* pInstance;
+
+    uint32 Berserk_Timer;
+    uint32 Quake_Timer;
     uint32 Cleave_Timer;
     uint32 BlastNova_Timer;
-    uint32 Quake_Timer;
-    uint32 QuakePhase;
-    uint32 Collapse_Timer;
-    uint32 Berserk_Timer;
-    bool Banished;
+    uint32 Blaze_Timer;
+    uint32 Debris_Timer;
+
     bool Phase3;
-
-    uint32 RandChat_Timer;
+    bool NeedCheckCube;
 
     void Reset()
-    {
-        RandChat_Timer = 90000;
-
-        Phase1_Timer = 0;
+    {   
+        if(pInstance)
+        {
+            pInstance->SetData(DATA_MAGTHERIDON_EVENT, NOT_STARTED);
+            pInstance->SetData(DATA_COLLAPSE, false);
+        }
+
+        Berserk_Timer = 1320000;
+        Quake_Timer = 40000;
+        Debris_Timer = 10000;
+        Blaze_Timer = 10000+rand()%20000;
+        BlastNova_Timer = 60000;
         Cleave_Timer = 15000;
-        Berserk_Timer = 1200000;                            //20 minutes
-        BlastNova_Timer = 60000;
-        Quake_Timer = 40000;
-        QuakePhase = 0;
-        Collapse_Timer = 0;
-        Banished = false;
-
-        m_creature->setFaction(35);
-        m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+
+        Phase3 = false;
+
+        m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
         m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
-        m_creature->CastSpell(m_creature, SPELL_SHADOW_CAGE, false);
-
-        if(pInst)
-            pInst->SetData(DATA_MAGTHERIDON_EVENT_ENDED, false);
+        m_creature->addUnitState(UNIT_STAT_STUNNED);
+        m_creature->CastSpell(m_creature, SPELL_SHADOW_CAGE_C, true);
+    }
+
+    void SetClicker(uint64 cubeGUID, uint64 clickerGUID)
+    {
+        // to avoid multiclicks from 1 cube
+        if(uint64 guid = Cube[cubeGUID])
+            DebuffClicker(Unit::GetUnit(*m_creature, guid));
+        Cube[cubeGUID] = clickerGUID;
+        NeedCheckCube = true;
+    }
+
+    //function to interrupt channeling and debuff clicker with mind exh(used if second person clicks with same cube or after dispeling/ending shadow grasp DoT)
+    void DebuffClicker(Unit *clicker)
+    {
+        if(!clicker || !clicker->isAlive())
+            return;
+
+        clicker->RemoveAurasDueToSpell(SPELL_SHADOW_GRASP); // cannot interrupt triggered spells
+        clicker->InterruptNonMeleeSpells(false);
+        clicker->CastSpell(clicker, SPELL_MIND_EXHAUSTION, true);
+    }
+
+    void NeedCheckCubeStatus()
+    {
+        uint32 ClickerNum = 0;
+        // now checking if every clicker has debuff from manticron(it is dispelable atm rev 6110 : S)
+        // if not - apply mind exhaustion and delete from clicker's list
+        for(CubeMap::iterator i = Cube.begin(); i != Cube.end(); ++i)
+        {
+            Unit *clicker = Unit::GetUnit(*m_creature, (*i).second);
+            if(!clicker || !clicker->HasAura(SPELL_SHADOW_GRASP, 1))
+            {
+                DebuffClicker(clicker);
+                (*i).second = 0;
+            }else ClickerNum++;
+        }
+
+        // if 5 clickers from other cubes apply shadow cage
+        if(ClickerNum >= CLICKERS_COUNT && !m_creature->HasAura(SPELL_SHADOW_CAGE, 0))
+        {
+            DoYell(SAY_BANISH, LANG_UNIVERSAL, NULL);
+            DoPlaySoundToSet(m_creature, SOUND_BANISH);  
+            m_creature->CastSpell(m_creature, SPELL_SHADOW_CAGE, true);
+        }
+        else if(ClickerNum < CLICKERS_COUNT && m_creature->HasAura(SPELL_SHADOW_CAGE, 0))
+            m_creature->RemoveAurasDueToSpell(SPELL_SHADOW_CAGE);
+
+        if(!ClickerNum) NeedCheckCube = false;
     }
 
@@ -144 +265 @@
     void JustDied(Unit* Killer)
     {
+        if(pInstance)
+            pInstance->SetData(DATA_MAGTHERIDON_EVENT, DONE);
+
         DoYell(SAY_DEATH,LANG_UNIVERSAL, NULL);
         DoPlaySoundToSet(m_creature, SOUND_DEATH);
     }
 
-    void Aggro(Unit *who) {}
-
-    void MoveInLineOfSight(Unit* who) {}
+    void MoveInLineOfSight(Unit*) {}
+
+    void AttackStart(Unit *who)
+    {
+        if(!m_creature->hasUnitState(UNIT_STAT_STUNNED))
+            ScriptedAI::AttackStart(who);
+    }
+
+    void Aggro(Unit *who)
+    {
+        if(pInstance)
+            pInstance->SetData(DATA_MAGTHERIDON_EVENT, IN_PROGRESS);
+        DoZoneInCombat();
+
+        m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+        m_creature->RemoveAurasDueToSpell(SPELL_SHADOW_CAGE_C);
+
+        DoYell(SAY_FREED, LANG_UNIVERSAL, NULL);
+        DoPlaySoundToSet(m_creature, SOUND_FREED);          
+   }
 
     void UpdateAI(const uint32 diff)
     {
-        if (!InCombat && !Phase1_Timer)
-            if (RandChat_Timer < diff)
-        {
-            DoPlaySoundToSet(m_creature, RandomSound[rand()%5]);
-
-            RandChat_Timer = 90000;
-        }else RandChat_Timer -= diff;
-
-        if (!InCombat && !Phase1_Timer && pInst && pInst->GetData64(DATA_EVENT_STARTER))
-        {
-            //Unbanish self after 2 minutes
-            Phase1_Timer = 120000;
-            DoTextEmote(EMOTE_BEGIN, NULL);
+        if(!m_creature->SelectHostilTarget() && !m_creature->getVictim())
             return;
-        }
-
-        //Phase timer
-        if (Phase1_Timer)
-            if (Phase1_Timer <= diff)
-        {
-            m_creature->setFaction(14);
-            m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
-            m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
-
-            DoYell(SAY_FREED, LANG_UNIVERSAL, NULL);
-            DoPlaySoundToSet(m_creature, SOUND_FREED);
-            m_creature->RemoveAurasDueToSpell(SPELL_SHADOW_CAGE);
-            AttackStart(Unit::GetUnit(*m_creature, pInst->GetData64(DATA_EVENT_STARTER)));
-
-            Phase1_Timer = 0;
-        }else
-        {
-            if (!Unit::GetUnit(*m_creature, pInst->GetData64(DATA_EVENT_STARTER)))
-            {
-                Phase1_Timer = 0;
-                return;
-            }
-
-            Phase1_Timer -= diff;
-            return;
-        }
-
-        //Return since we have no target
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim())
-            return;
-
-        //Interrupt Blast Nova
-        if (m_creature->HasAura(SPELL_SHADOW_GRASP_VIS, 0) && m_creature->HasAura(SPELL_BLASTNOVA, 0) && !Banished)
-        {
-            DoYell(SAY_BANISH, LANG_UNIVERSAL, NULL);
-            DoPlaySoundToSet(m_creature, SOUND_BANISH);
-            m_creature->RemoveAurasDueToSpell(SPELL_BLASTNOVA);
-            m_creature->InterruptNonMeleeSpells(false);
-            DoCast(m_creature, SPELL_SHADOW_CAGE_2);
-            Banished = true;
-        }
-
-        if (Banished && !m_creature->HasAura(SPELL_SHADOW_GRASP_VIS, 0))
-        {
-            Banished = false;
-            m_creature->RemoveAurasDueToSpell(SPELL_SHADOW_CAGE_2);
-        }
-
-        //Berserk_Timer
-        if (Berserk_Timer < diff)
-        {
-            DoCast(m_creature, SPELL_BERSERK);
+
+        if(NeedCheckCube) NeedCheckCubeStatus();
+
+        if(Berserk_Timer < diff)
+        {
+            m_creature->CastSpell(m_creature, SPELL_BERSERK, true);
             DoTextEmote(EMOTE_BERSERK, NULL);
-
-            Berserk_Timer = 300000;
+            Berserk_Timer = 60000;
         }else Berserk_Timer -= diff;
 
-        //Cleave_Timer
-        if (Cleave_Timer < diff)
+        if(Cleave_Timer < diff)
         {
             DoCast(m_creature->getVictim(),SPELL_CLEAVE);
@@ -233 +313 @@
         }else Cleave_Timer -= diff;
 
-        //Quake_Timer
-        if (Quake_Timer < diff)
-        {
-            int32 i = SPELL_QUAKE_PROC;
-            m_creature->CastCustomSpell(m_creature, SPELL_QUAKE, &i, 0, 0, false);
-
-            Quake_Timer = 40000;
+        if(BlastNova_Timer < diff)
+        {
+            // to avoid earthquake interruption
+            if(!m_creature->hasUnitState(UNIT_STAT_STUNNED))
+            {
+                DoTextEmote(EMOTE_BLASTNOVA, NULL);
+                DoCast(m_creature, SPELL_BLASTNOVA);
+                BlastNova_Timer = 60000;
+            }
+        }else BlastNova_Timer -= diff;
+
+        if(Quake_Timer < diff)
+        {
+            // to avoid blastnova interruption
+            if(!m_creature->IsNonMeleeSpellCasted(false))
+            {
+                int32 i = SPELL_QUAKE_KNOCKBACK;
+                m_creature->CastCustomSpell(m_creature, SPELL_QUAKE_TRIGGER, &i, 0, 0, false);
+                Quake_Timer = 50000;
+            }
         }else Quake_Timer -= diff;
 
-        //BlastNova_Timer
-        if (BlastNova_Timer < diff)
-        {
-            //Inturrupt Quake if it is casting
-            m_creature->InterruptNonMeleeSpells(false);
-
-            DoTextEmote(EMOTE_BLASTNOVA, NULL);
-            DoCast(m_creature, SPELL_BLASTNOVA);
-
-            BlastNova_Timer = 40000;
-        }else BlastNova_Timer -= diff;
-
-        //Phase3 if not already enraged and below 30%
-        if (!Phase3 && (m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 30)
-        {
+        if(Blaze_Timer < diff)
+        {
+            if(Unit *target = SelectUnit(SELECT_TARGET_RANDOM, 0))
+            {
+                float x, y, z;
+                target->GetPosition(x, y, z);
+                Creature *summon = m_creature->SummonCreature(MOB_ABYSSAL, x, y, z, 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
+                if(summon)
+                {
+                    ((mob_abyssalAI*)summon->AI())->SetTrigger(2);
+                    m_creature->CastSpell(summon, SPELL_BLAZE_TARGET, true);
+                    summon->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                }
+            }
+            Blaze_Timer = 20000 + rand()%20000;
+        }else Blaze_Timer -= diff;
+
+        if(!Phase3 && m_creature->GetHealth()*10 < m_creature->GetMaxHealth()*3 
+            && !m_creature->IsNonMeleeSpellCasted(false) // blast nova
+            && !m_creature->hasUnitState(UNIT_STAT_STUNNED)) // shadow cage and earthquake
+        {                        
             Phase3 = true;
-
             DoYell(SAY_CHAMBER_DESTROY, LANG_UNIVERSAL, NULL);
             DoPlaySoundToSet(m_creature, SOUND_CHAMBER_DESTROY);
-        }
-
-        //Melee
+            m_creature->CastSpell(m_creature, SPELL_CAMERA_SHAKE, true);
+            m_creature->CastSpell(m_creature, SPELL_DEBRIS_KNOCKDOWN, true);
+
+            if(pInstance)
+                pInstance->SetData(DATA_COLLAPSE, true);
+        }
+
+        if(Phase3)
+        {
+            if(Debris_Timer < diff)
+            {
+                if(Unit *target = SelectUnit(SELECT_TARGET_RANDOM, 0))
+                {
+                    float x, y, z;
+                    target->GetPosition(x, y, z);
+                    Creature *summon = m_creature->SummonCreature(MOB_ABYSSAL, x, y, z, 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
+                    if(summon) ((mob_abyssalAI*)summon->AI())->SetTrigger(1);
+                }
+                Debris_Timer = 10000;
+            }else Debris_Timer -= diff;
+        }
+
         DoMeleeAttackIfReady();
     }
@@ -272 +389 @@
     mob_hellfire_channelerAI(Creature *c) : ScriptedAI(c)
     {
-        pInst = (ScriptedInstance*)m_creature->GetInstanceData();
+        pInstance =(ScriptedInstance*)m_creature->GetInstanceData();
         Reset();
     }
 
-    ScriptedInstance* pInst;
+    ScriptedInstance* pInstance;
 
     uint32 ShadowBoltVolley_Timer;
@@ -283 +400 @@
     uint32 Infernal_Timer;
 
-    bool InfernalSpawned;
+    uint32 Check_Timer;
 
     void Reset()
     {
         ShadowBoltVolley_Timer = 8000 + rand()%2000;
-        DarkMending_Timer = 30000;
+        DarkMending_Timer = 10000;
         Fear_Timer = 15000 + rand()%5000;
-        Infernal_Timer = 20000 + rand()%5000;
-
-        InfernalSpawned = false;
-
-        //Suprisingly this works very well, but only if the channelers are spawned after magtheridon
-        DoCast(m_creature, SPELL_SHADOW_GRASP_VIS);
-        if(pInst)
-            pInst->SetData(DATA_MAGTHERIDON_EVENT_ENDED, false);
+        Infernal_Timer = 10000 + rand()%40000;
+
+        Check_Timer = 5000;
+
+        if(pInstance)
+            pInstance->SetData(DATA_CHANNELER_EVENT, NOT_STARTED);
+
+        m_creature->CastSpell(m_creature, SPELL_SHADOW_GRASP_C, false);
     }
 
     void Aggro(Unit *who)
     {
+        if(pInstance)
+            pInstance->SetData(DATA_CHANNELER_EVENT, IN_PROGRESS);
+
         m_creature->InterruptNonMeleeSpells(false);
-
-        if(!pInst || pInst->GetData64(DATA_EVENT_STARTER))
-            return;
-
-        pInst->SetData64(DATA_EVENT_STARTER, who->GetGUID());
-        pInst->SetData(DATA_MAGTHERIDON_EVENT_STARTED, true);
-    }
-
-    void MoveInLineOfSight(Unit*)
-    {
+        DoZoneInCombat();
+    }
+
+    void JustSummoned(Creature *summon) {summon->AI()->AttackStart(m_creature->getVictim());}
+
+    void MoveInLineOfSight(Unit*) {}
+
+    // bugged
+    /*void DamageTaken(Unit*, uint32 &damage)
+    {
+        if(damage >= m_creature->GetHealth())
+            m_creature->CastSpell(m_creature, SPELL_SOUL_TRANSFER, true);
+    }*/
+
+    void JustDied(Unit*)
+    {
+        if(pInstance)
+            pInstance->SetData(DATA_CHANNELER_EVENT, DONE);
     }
 
     void UpdateAI(const uint32 diff)
     {
-        if (!InCombat && pInst && pInst->GetData64(DATA_EVENT_STARTER))
-        {
-            m_creature->InterruptNonMeleeSpells(false);
-            AttackStart(Unit::GetUnit(*m_creature, pInst->GetData64(DATA_EVENT_STARTER)));
-            return;
-        }
-
-        //Return since we have no target
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
-            return;
-
-        //Shadow bolt volley
-        if (ShadowBoltVolley_Timer < diff)
-        {
-            DoCast(m_creature->getVictim(),SPELL_SHADOW_BOLT_VOLLEY);
-
-            ShadowBoltVolley_Timer = 10000 + (rand()%10000);
+        if(!m_creature->SelectHostilTarget() && !m_creature->getVictim())
+            return;    
+ 
+        if(ShadowBoltVolley_Timer < diff)
+        {
+            DoCast(m_creature, SPELL_SHADOW_BOLT_VOLLEY);
+            ShadowBoltVolley_Timer = 10000 + rand()%10000;
         }else ShadowBoltVolley_Timer -= diff;
 
-        //Dark Mending
-        if (DarkMending_Timer < diff)
-        {
-            if ((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 50)
-            {
-                //Cast on ourselves if we are lower then lowest hp friendly unit
-                /*if (pLowestHPTarget && LowestHP < m_creature->GetHealth())
-                    DoCast(pLowestHPTarget, SPELL_DARK_MENDING);
-                else*/
+        if(DarkMending_Timer < diff)
+        {
+            if((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 50)
                 DoCast(m_creature, SPELL_DARK_MENDING);
-            }
-
-            DarkMending_Timer = 10000 + (rand() % 10000);
+            DarkMending_Timer = 10000 +(rand() % 10000);
         }else DarkMending_Timer -= diff;
 
-        //Fear
-        if (Fear_Timer < diff)
-        {
-            Unit* target = NULL;
-            target = SelectUnit(SELECT_TARGET_RANDOM, 1);
-
-            if (target)
-                DoCast(target,SPELL_FEAR);
-
-            Fear_Timer = 25000 + (rand()%15000);
+        if(Fear_Timer < diff)
+        {
+            if(Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 1))
+                DoCast(target, SPELL_FEAR);
+            Fear_Timer = 25000 + rand()%15000;
         }else Fear_Timer -= diff;
 
-        //Infernal spawning
-        if (!InfernalSpawned && Infernal_Timer < diff)
-        {
-            Unit* target = NULL;
-            target = SelectUnit(SELECT_TARGET_RANDOM, 0);
-
-            if (target)
-                DoCast(target, SPELL_BURNING_ABYSSAL);
-
-            InfernalSpawned = true;
+        if(Infernal_Timer < diff)
+        {
+            if(Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
+                m_creature->CastSpell(target, SPELL_BURNING_ABYSSAL, true);
+            Infernal_Timer = 30000 + rand()%10000; 
         }else Infernal_Timer -= diff;
 
         DoMeleeAttackIfReady();
     }
-
 };
 
@@ -383 +482 @@
 bool GOHello_go_Manticron_Cube(Player *player, GameObject* _GO)
 {
-    ScriptedInstance* pInst = (ScriptedInstance*)_GO->GetInstanceData();
-
-    Unit* pUnit = NULL;
-    if(pInst)
-        pUnit = Unit::GetUnit(*_GO, pInst->GetData64(DATA_MAGTHERIDON));
-    else
-    {
-        _GO->TextEmote("Manticron Cube: NO INSTANCE", 0);
+    ScriptedInstance* pInstance =(ScriptedInstance*)_GO->GetInstanceData();
+    if(!pInstance) return true;
+    if(pInstance->GetData(DATA_MAGTHERIDON_EVENT) != IN_PROGRESS) return true;
+    Creature *Magtheridon =(Creature*)Unit::GetUnit(*_GO, pInstance->GetData64(DATA_MAGTHERIDON));
+    if(!Magtheridon || !Magtheridon->isAlive()) return true;
+
+    // if exhausted or already channeling return
+    if(player->HasAura(SPELL_MIND_EXHAUSTION, 0) || player->HasAura(SPELL_SHADOW_GRASP, 1))
         return true;
-    }
-
-    if (!pUnit || !pUnit->isAlive() || !player)
-    {
-        _GO->TextEmote("Mantricon Cube: NO TARGET", 0);
-        return true;
-    }
 
     player->InterruptNonMeleeSpells(false);
-    player->CastSpell(pUnit, SPELL_SHADOW_GRASP, true);
-    player->CastSpell(pUnit, SPELL_SHADOW_GRASP_VIS, false);
-
-    _GO->Say("Mantricon Cube Clicked", LANG_UNIVERSAL, 0);
+    player->CastSpell(player, SPELL_SHADOW_GRASP, true);
+    player->CastSpell(player, SPELL_SHADOW_GRASP_VISUAL, false);
+    ((boss_magtheridonAI*)Magtheridon->AI())->SetClicker(_GO->GetGUID(), player->GetGUID());
     return true;
 }
@@ -410 +501 @@
 CreatureAI* GetAI_boss_magtheridon(Creature *_Creature)
 {
-    return new boss_magtheridonAI (_Creature);
+    return new boss_magtheridonAI(_Creature);
 }
 
 CreatureAI* GetAI_mob_hellfire_channeler(Creature *_Creature)
 {
-    return new mob_hellfire_channelerAI (_Creature);
+    return new mob_hellfire_channelerAI(_Creature);
+}
+
+CreatureAI* GetAI_mob_abyssalAI(Creature *_Creature)
+{
+    return new mob_abyssalAI(_Creature);
 }
 
@@ -435 +531 @@
     newscript->pGOHello = &GOHello_go_Manticron_Cube;
     m_scripts[nrscripts++] = newscript;
+
+    newscript = new Script;
+    newscript->Name="mob_abyssal";
+    newscript->GetAI = GetAI_mob_abyssalAI;
+    m_scripts[nrscripts++] = newscript;
+
 }

trunk/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/def_magtheridons_lair.h

@@ -6 +6 @@
 #define DEF_MAGTHERIDONS_LAIR_H
 
-#define DATA_EVENT_STARTER 1
-#define DATA_MAGTHERIDON 2
-#define DATA_MAGTHERIDON_EVENT_ENDED 3
-#define DATA_MAGTHERIDON_EVENT_STARTED 4
-#define DATA_MAGTHERIDON_EVENT_STATUS 5
+#define DATA_MAGTHERIDON_EVENT          1
+#define DATA_MAGTHERIDON                                3
+#define DATA_CHANNELER_EVENT        2
+#define DATA_COLLAPSE                                   6
+#define DATA_CHANNELER                                  9
 #endif

trunk/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp

@@ -7 +7 @@
  * 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
+ * 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
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
@@ -25 +25 @@
 #include "def_magtheridons_lair.h"
 
+#define SPELL_SOUL_TRANSFER         30531 // core bug, does not support target 7
+#define SPELL_BLAZE_TARGET          30541 // core bug, does not support target 7
+#define SPELL_DEBRIS_DAMAGE                     30631 // core bug, does not support target 8
+#define SPELL_DEBRIS_KNOCKDOWN      36449 // core bug, does not support target 8
+
+#define CHAMBER_CENTER_X                        -15.14
+#define CHAMBER_CENTER_Y                          1.8
+#define CHAMBER_CENTER_Z                         -0.4
+
+#define ENCOUNTERS 2
+
 struct TRINITY_DLL_DECL instance_magtheridons_lair : public ScriptedInstance
 {
-    instance_magtheridons_lair(Map *Map) : ScriptedInstance(Map) {Initialize();};
-
-    bool EncounterInProgress;
-    uint64 Magtheridon;
-    uint64 EventStarter;
+    instance_magtheridons_lair(Map *Map) : ScriptedInstance(Map)
+    {
+        Initialize();
+        // target 7, random target with certain entry spell, need core fix
+        SpellEntry *TempSpell = (SpellEntry*)GetSpellStore()->LookupEntry(SPELL_BLAZE_TARGET);
+        if(TempSpell && TempSpell->EffectImplicitTargetA[0] != 6)
+        {
+            TempSpell->EffectImplicitTargetA[0] = 6;
+            TempSpell->EffectImplicitTargetB[0] = 0;
+        }
+        TempSpell = (SpellEntry*)GetSpellStore()->LookupEntry(SPELL_SOUL_TRANSFER);
+        if(TempSpell && TempSpell->EffectImplicitTargetB[0] != 30)
+        {
+            TempSpell->EffectImplicitTargetA[0] = 1;
+            TempSpell->EffectImplicitTargetA[1] = 1;
+            TempSpell->EffectImplicitTargetA[2] = 1;
+            TempSpell->EffectImplicitTargetB[0] = 0;
+            TempSpell->EffectImplicitTargetB[1] = 0;
+            TempSpell->EffectImplicitTargetB[2] = 0;
+        }
+        // target 8, but core only push back the caster
+        TempSpell = (SpellEntry*)GetSpellStore()->LookupEntry(SPELL_DEBRIS_DAMAGE);
+        if(TempSpell && TempSpell->EffectImplicitTargetA[0] != 53)
+        {
+            TempSpell->EffectImplicitTargetA[0] = 53;
+            TempSpell->EffectImplicitTargetB[0] = 16;
+        }  
+        TempSpell = (SpellEntry*)GetSpellStore()->LookupEntry(SPELL_DEBRIS_KNOCKDOWN);
+        if(TempSpell && TempSpell->EffectImplicitTargetA[0] != 53)
+        {
+            TempSpell->EffectImplicitTargetA[0] = 53;
+            TempSpell->EffectImplicitTargetB[0] = 16;
+            TempSpell->EffectImplicitTargetA[1] = 53;
+            TempSpell->EffectImplicitTargetB[1] = 16;
+        }  
+    }
+
+    uint32 Encounters[ENCOUNTERS];
+
+    uint64 MagtheridonGUID;
+    std::set<uint64> ChannelerGUID;
+    uint64 DoorGUID;
+    std::set<uint64> ColumnGUID;
+
+    uint32 CageTimer;
+    uint32 RespawnTimer;
 
     void Initialize()
     {
-        Magtheridon = 0;
-        EventStarter = 0;
-        EncounterInProgress = false;
+        for(uint8 i = 0; i < ENCOUNTERS; i++)
+            Encounters[i] = NOT_STARTED;
+
+        MagtheridonGUID = 0;
+        ChannelerGUID.clear();
+        DoorGUID = 0;
+        ColumnGUID.clear();      
+
+        CageTimer = 0;
+        RespawnTimer = 0;
     }
 
     bool IsEncounterInProgress() const
     {
-        return EncounterInProgress;
+        for(uint8 i = 0; i < ENCOUNTERS; i++)
+            if(Encounters[i] == IN_PROGRESS) return true;
+        return false;
     }
 
     void OnCreatureCreate(Creature *creature, uint32 creature_entry)
     {
-        if (creature_entry == 17257)
-            Magtheridon = creature->GetGUID();
-    }
-
-    uint64 GetData64(uint32 identifier)
-    {
-        switch(identifier)
-        {
-            case DATA_MAGTHERIDON:
-                return Magtheridon;
-
-            case DATA_EVENT_STARTER:
-                return EventStarter;
+        switch(creature->GetEntry())
+        {
+        case 17257:
+            MagtheridonGUID = creature->GetGUID();
+            break;
+        case 17256:
+            ChannelerGUID.insert(creature->GetGUID());
+            break;
+        }
+    }
+
+    void OnObjectCreate(GameObject *go)
+    {
+        switch(go->GetEntry())
+        {
+        case 181713:
+            go->SetUInt32Value(GAMEOBJECT_FLAGS, 0);
+            break;
+        case 183847:
+            DoorGUID = go->GetGUID();
+            break;
+        case 184653: // hall
+        case 184634: // six columns
+        case 184635:
+        case 184636:
+        case 184637:
+        case 184638:
+        case 184639:
+            ColumnGUID.insert(go->GetGUID());
+            break;
+        }
+    }
+
+    uint64 GetData64(uint32 type)
+    {
+        switch(type)
+        {
+        case DATA_MAGTHERIDON:
+            return MagtheridonGUID;
         }
         return 0;
     }
 
-    void SetData64(uint32 identifier, uint64 guid)
-    {
-        switch(identifier)
-        {
-            case DATA_MAGTHERIDON:
-                Magtheridon = guid;
-                break;
-
-            case DATA_EVENT_STARTER:
-                EventStarter = guid;
-                break;
-        }
-    }
-
     void SetData(uint32 type, uint32 data)
     {
+        Player *player = GetPlayer();
+        if(!player) return;
+
         switch(type)
         {
-            case DATA_MAGTHERIDON_EVENT_STARTED:
-                EncounterInProgress = true;
-                break;
-
-            case DATA_MAGTHERIDON_EVENT_ENDED:
-                EncounterInProgress = false;
-                EventStarter = 0;
-                break;
+        case DATA_MAGTHERIDON_EVENT:
+            Encounters[0] = data;
+            if(data == NOT_STARTED)
+                RespawnTimer = 10000;
+            if(data != IN_PROGRESS)
+            {
+                if(GameObject *Door = GameObject::GetGameObject(*player, DoorGUID))
+                    Door->SetGoState(0);
+            }
+            break;
+        case DATA_CHANNELER_EVENT:
+            switch(data)
+            {
+            case NOT_STARTED: // Reset all channelers once one is reset.
+                if(Encounters[1] != NOT_STARTED)
+                {
+                    Encounters[1] = NOT_STARTED;
+                    for(std::set<uint64>::iterator i = ChannelerGUID.begin(); i != ChannelerGUID.end(); ++i)
+                    {
+                        if(Creature *Channeler = (Creature*)Unit::GetUnit(*player, *i))
+                        {
+                            if(Channeler->isAlive())
+                                Channeler->AI()->EnterEvadeMode();
+                            else
+                                Channeler->Respawn();
+                        }
+                    }
+                    CageTimer = 0;
+                    if(GameObject *Door = GameObject::GetGameObject(*player, DoorGUID))
+                        Door->SetGoState(0);
+                }break;
+            case IN_PROGRESS: // Event start.
+                if(Encounters[1] != IN_PROGRESS)
+                {
+                    Encounters[1] = IN_PROGRESS;
+                    // Let all five channelers aggro.
+                    for(std::set<uint64>::iterator i = ChannelerGUID.begin(); i != ChannelerGUID.end(); ++i)
+                    {
+                        Creature *Channeler = (Creature*)Unit::GetUnit(*player, *i);
+                        if(Channeler && Channeler->isAlive())
+                        {
+                            //if(Unit *target = Channeler->SelectNearbyTarget())
+                            //always return true, do not know why
+                            AttackNearestTarget(Channeler);
+                        }
+                    }
+                    // Release Magtheridon after two minutes.
+                    Creature *Magtheridon = (Creature*)Unit::GetUnit(*player, MagtheridonGUID);
+                    if(Magtheridon && Magtheridon->isAlive())
+                    {
+                        Magtheridon->TextEmote("'s bonds begin to weaken!", 0);
+                        CageTimer = 120000;
+                    }
+                    if(GameObject *Door = GameObject::GetGameObject(*player, DoorGUID))
+                        Door->SetGoState(1);
+                }break;
+            case DONE: // Add buff and check if all channelers are dead.
+                for(std::set<uint64>::iterator i = ChannelerGUID.begin(); i != ChannelerGUID.end(); ++i)
+                {
+                    Unit *Channeler = Unit::GetUnit(*player, *i);
+                    if(Channeler && Channeler->isAlive())
+                    {
+                        Channeler->CastSpell(Channeler, SPELL_SOUL_TRANSFER, true);
+                        data = IN_PROGRESS;
+                    }
+                }break;
+            }
+            Encounters[1] = data;
+            break;
+        case DATA_COLLAPSE:
+            // true - collapse / false - reset
+            for(std::set<uint64>::iterator i = ColumnGUID.begin(); i != ColumnGUID.end(); ++i)
+            {
+                if(GameObject *Column = GameObject::GetGameObject(*player, *i))
+                    Column->SetGoState(!data);
+            }
+            break;
+        default:
+            break;
         }
     }
@@ -95 +242 @@
     uint32 GetData(uint32 type)
     {
-        if(type == DATA_MAGTHERIDON_EVENT_STATUS)
-            return EncounterInProgress;
-
+        if(type == DATA_MAGTHERIDON_EVENT)
+            return Encounters[0];
         return 0;
+    }
+
+    Player* GetPlayer()
+    {
+        if(((InstanceMap*)instance)->GetPlayers().size())
+            return ((InstanceMap*)instance)->GetPlayers().front();
+        return NULL;
+    }
+
+    void AttackNearestTarget(Creature *creature)
+    {
+        float minRange = 999.0f;
+        float range;
+        Player* target = NULL;
+        InstanceMap::PlayerList const &PlayerList = ((InstanceMap*)instance)->GetPlayers();
+        InstanceMap::PlayerList::const_iterator i;
+        for(i = PlayerList.begin(); i != PlayerList.end(); ++i)
+        {
+            if((*i)->isTargetableForAttack())
+            {
+                range = (*i)->GetDistance(creature);
+                if(range < minRange)
+                {
+                    minRange = range;
+                    target = *i;
+                }                
+            }
+        }
+        creature->AI()->AttackStart(target);
+    }
+
+    void Update(uint32 diff)
+    {
+        if(CageTimer)
+        {
+            if(CageTimer <= diff)
+            {
+                if(Player *player = GetPlayer())
+                {
+                    Creature *Magtheridon = (Creature*)Unit::GetUnit(*player, MagtheridonGUID);
+                    if(Magtheridon && Magtheridon->isAlive())
+                    {
+                        Magtheridon->clearUnitState(UNIT_STAT_STUNNED);
+                        AttackNearestTarget(Magtheridon);
+                    }
+                }
+                CageTimer = 0;
+            }else CageTimer -= diff;
+        }
+
+        if(RespawnTimer)
+        {
+            if(RespawnTimer <= diff)
+            {
+                if(Player *player = GetPlayer())
+                {
+                    for(std::set<uint64>::iterator i = ChannelerGUID.begin(); i != ChannelerGUID.end(); ++i)
+                    {
+                        if(Creature *Channeler = (Creature*)Unit::GetUnit(*player, *i))
+                        {
+                            if(Channeler->isAlive())
+                                Channeler->AI()->EnterEvadeMode();
+                            else
+                                Channeler->Respawn();
+                        }
+                    }
+                }
+                RespawnTimer = 0;
+            }else RespawnTimer -= diff;
+        }
     }
 };

trunk/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/def_the_eye.h

@@ -18 +18 @@
 #define DATA_THALADREDTHEDARKENER           11
 #define DATA_VOIDREAVEREVENT                12
+#define DATA_ALAR 13
 #endif

trunk/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/instance_the_eye.cpp

@@ -7 +7 @@
  * 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
+ * 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
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
@@ -44 +44 @@
     uint64 Kaelthas;
     uint64 Astromancer;
+    uint64 Alar;
 
     uint8 KaelthasEventPhase;
+    uint8 AlarEventPhase;
 
     bool Encounters[ENCOUNTERS];
@@ -57 +59 @@
         Kaelthas = 0;
         Astromancer = 0;
+        Alar = 0;
 
         KaelthasEventPhase = 0;
+        AlarEventPhase = 0;
 
         for(uint8 i = 0; i < ENCOUNTERS; i++)
@@ -82 +86 @@
             case 19622: Kaelthas = creature->GetGUID(); break;
             case 18805: Astromancer = creature->GetGUID(); break;
+
+            case 19514:
+                Alar = creature->GetGUID();
+                break;
         }
     }
@@ -106 +114 @@
             case DATA_ASTROMANCER:
                 return Astromancer;
+
+            case DATA_ALAR:
+                return Alar;
         }
 
@@ -116 +127 @@
         {
             case DATA_ALAREVENT:
+                AlarEventPhase = data;
                 Encounters[0] = (data) ? true : false;
                 break;
@@ -144 +156 @@
         {
             case DATA_ALAREVENT:
-                return Encounters[0];
+                return AlarEventPhase;
 
             case DATA_SOLARIANEVENT: