[svn] Update black temple boss 1, 2 script.

--HG--
branch : trunk

6 files changed, 50 insertions, 171 deletions

diff --git a/sql/updates/146_world.sql b/sql/updates/146_world.sql
index adb426336d6..67de357f841 100644
--- a/sql/updates/146_world.sql
+++ b/sql/updates/146_world.sql
@@ -17,26 +17,6 @@ VALUES
 INSERT INTO spell_linked_spell

    (`spell_trigger`, `spell_effect`, `type`, `comment`)

 VALUES

-   (42052, 40118, 0, 'Volcanic Geyser Visual');

-

-INSERT INTO spell_linked_spell

-   (`spell_trigger`, `spell_effect`, `type`, `comment`)

-VALUES

-   (-41914, 41915, 0, 'Summon Parasitic Shadowfiend\r\n');

-

-INSERT INTO spell_linked_spell

-   (`spell_trigger`, `spell_effect`, `type`, `comment`)

-VALUES

-   (46021, 44852, 1, 'Spectral Realm Aura');

-

-INSERT INTO spell_linked_spell

-   (`spell_trigger`, `spell_effect`, `type`, `comment`)

-VALUES

-   (-46021, 44867, 0, 'Spectral Exhaustion');

-

-INSERT INTO spell_linked_spell

-   (`spell_trigger`, `spell_effect`, `type`, `comment`)

-VALUES

    (-30410, 44032, 0, 'Manticron Cube Mind Exhaustion');

 

 INSERT INTO spell_linked_spell

diff --git a/sql/updates/163_world.sql b/sql/updates/163_world.sql
new file mode 100644
index 00000000000..da0b03c9a04
--- /dev/null
+++ b/sql/updates/163_world.sql
@@ -0,0 +1,7 @@
+DELETE FROM spell_linked_spell WHERE `spell_trigger` IN (39992, 39835, 42052, -41914, 41126);

+--INSERT INTO spell_linked_spell (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES (39992, 39835, 1, 'Needle Spine');

+INSERT INTO spell_linked_spell (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES (39835, 39968, 1, 'Needle Spine');

+INSERT INTO spell_linked_spell (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES (-41914, 41915, 0, 'Summon Parasitic Shadowfiend');

+INSERT INTO spell_linked_spell (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES (41126, 41131, 1, 'Flame Crash');

+

+UPDATE creature_template SET flags_extra = 128, speed = 1.0 WHERE entry = 23095;
\ No newline at end of file
diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_supremus.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_supremus.cpp
index ca654e051fd..30570690540 100644
--- a/src/bindings/scripts/scripts/zone/black_temple/boss_supremus.cpp
+++ b/src/bindings/scripts/scripts/zone/black_temple/boss_supremus.cpp
@@ -25,13 +25,11 @@ EndScriptData */
 #include "def_black_temple.h"
 
 //Spells
+#define SPELL_MOLTEN_PUNCH          40126
 #define SPELL_HURTFUL_STRIKE        41926
-#define SPELL_DEMON_FIRE            40029
 #define SPELL_MOLTEN_FLAME          40253
-#define SPELL_VOLCANIC_ERUPTION     40276
-#define SPELL_VOLCANIC_FIREBALL     40118
-#define SPELL_VOLCANIC_GEYSER       42055
-#define SPELL_MOLTEN_PUNCH          40126
+#define SPELL_VOLCANIC_ERUPTION     40117
+#define SPELL_VOLCANIC_SUMMON       40276
 #define SPELL_BERSERK               45078
 
 #define CREATURE_VOLCANO            23085
@@ -41,108 +39,48 @@ struct TRINITY_DLL_DECL molten_flameAI : public ScriptedAI
 {
     molten_flameAI(Creature *c) : ScriptedAI(c)
     {
-        Reset();
+        FlameTimer = 0;
+        float x, y, z;
+        m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+        m_creature->GetNearPoint(m_creature, x, y, z, 1, 50, M_PI*2*rand_norm());
+        m_creature->GetMotionMaster()->MovePoint(0, x, y, z);
     }
 
-    uint64 SupremusGUID;
-    bool TargetLocked;
-    uint32 CheckTimer;
-
-    void Reset()
-    {
-        SupremusGUID = 0;
-        TargetLocked = false;
-
-        CheckTimer = 1000;
-    }
+    uint32 FlameTimer;
 
+    void Reset() {}
     void Aggro(Unit *who) {}
     void AttackStart(Unit* who) {}
-    void MoveInLineOfSight(Unit *who)
-    {
-        if(TargetLocked)
-            return;                                         // stop it from aggroing players who move in LOS if we have a target.
-        if(who && (who != m_creature) && (m_creature->IsWithinDistInMap(who, 10)))
-            StalkTarget(who);
-    }
-
-    void SetSupremusGUID(uint64 GUID) { SupremusGUID = GUID; }
-
-    void StalkTarget(Unit* target)
-    {
-        if(!target) return;
-
-        m_creature->AddThreat(target, 50000000.0f);
-        m_creature->GetMotionMaster()->MoveChase(target);
-        DoCast(m_creature, SPELL_DEMON_FIRE, true);
-        // DoCast(m_creature, SPELL_MOLTEN_FLAME, true); // This spell damages self, so disabled for now
-        TargetLocked = true;
-    }
-
+    void MoveInLineOfSight(Unit *who) {}
     void UpdateAI(const uint32 diff)
     {
-        if (!m_creature->SelectHostilTarget())
-            return;
-
-        if(m_creature->getVictim() && m_creature->isAlive())
+        if(FlameTimer < diff)
         {
-            if(CheckTimer < diff)
-            {
-                if(SupremusGUID)
-                {
-                    Unit* Supremus = NULL;
-                    Supremus = Unit::GetUnit((*m_creature), SupremusGUID);
-                    if(Supremus && (!Supremus->isAlive()))
-                        m_creature->DealDamage(m_creature, m_creature->GetHealth(), 0, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
-                }
-                CheckTimer = 2000;
-            }else CheckTimer -= diff;
-        }
+            m_creature->CastSpell(m_creature, SPELL_MOLTEN_FLAME, true);
+            FlameTimer = 1000;
+        }else FlameTimer -= diff;
     }
 };
 
 struct TRINITY_DLL_DECL npc_volcanoAI : public ScriptedAI
 {
-    npc_volcanoAI(Creature *c) : ScriptedAI(c) {Reset();}
-
-    uint32 CheckTimer;
-    uint64 SupremusGUID;
-    uint32 FireballTimer;
-    uint32 GeyserTimer;
-
-    void Reset()
+    npc_volcanoAI(Creature *c) : ScriptedAI(c)
     {
-        CheckTimer = 1000;
-        SupremusGUID = 0;
-        FireballTimer = 500;
-        GeyserTimer = 0;
+        m_creature->CastSpell(m_creature, SPELL_VOLCANIC_ERUPTION, false);
         m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE);
         m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
     }
 
+    void Reset() {}
     void Aggro(Unit *who) {}
     void AttackStart(Unit* who) {}
     void MoveInLineOfSight(Unit* who) {}
-
-    void UpdateAI(const uint32 diff)
-    {
-        if(GeyserTimer < diff)
-        {
-            DoCast(m_creature, SPELL_VOLCANIC_GEYSER);
-            GeyserTimer = 18000;
-        }else GeyserTimer -= diff;
-
-        if(FireballTimer < diff)
-        {
-            DoCast(m_creature, SPELL_VOLCANIC_FIREBALL, true);
-            FireballTimer = 1000;
-        }else FireballTimer -= diff;
-    }
+    void UpdateAI(const uint32 diff) {}
 };
 
 struct TRINITY_DLL_DECL boss_supremusAI : public ScriptedAI
 {
-    boss_supremusAI(Creature *c) : ScriptedAI(c)
+    boss_supremusAI(Creature *c) : ScriptedAI(c), summons(m_creature)
     {
         pInstance = ((ScriptedInstance*)c->GetInstanceData());
         Reset();
@@ -159,6 +97,8 @@ struct TRINITY_DLL_DECL boss_supremusAI : public ScriptedAI
 
     bool Phase1;
 
+    SummonList summons;
+
     void Reset()
     {
         if(pInstance)
@@ -179,6 +119,7 @@ struct TRINITY_DLL_DECL boss_supremusAI : public ScriptedAI
         BerserkTimer = 900000;                              // 15 minute enrage
 
         Phase1 = true;
+        summons.DespawnAll();
     }
 
     void Aggro(Unit *who)
@@ -205,35 +146,11 @@ struct TRINITY_DLL_DECL boss_supremusAI : public ScriptedAI
             pInstance->SetData(DATA_SUPREMUSEVENT, DONE);
             ToggleDoors(false);
         }
+        summons.DespawnAll();
     }
 
-    float CalculateRandomCoord(float initial)
-    {
-        float coord = 0;
-
-        switch(rand()%2)
-        {
-            case 0: coord = initial + 20 + rand()%20; break;
-            case 1: coord = initial - 20 - rand()%20; break;
-        }
-
-        return coord;
-    }
-
-    Creature* SummonCreature(uint32 entry, Unit* target)
-    {
-        if(target && entry)
-        {
-            Creature* Summon = m_creature->SummonCreature(entry, CalculateRandomCoord(target->GetPositionX()), CalculateRandomCoord(target->GetPositionY()), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 20000);
-            if(Summon)
-            {
-                Summon->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
-                Summon->setFaction(m_creature->getFaction());
-                return Summon;
-            }
-        }
-        return NULL;
-    }
+    void JustSummoned(Creature *summon) {summons.Summon(summon);}
+    void SummonedCreatureDespawn(Creature *summon) {summons.Despawn(summon);}
 
     Unit* CalculateHurtfulStrikeTarget()
     {
@@ -270,32 +187,15 @@ struct TRINITY_DLL_DECL boss_supremusAI : public ScriptedAI
 
         if(SummonFlameTimer < diff)
         {
-            Unit* target = NULL;
-            target = SelectUnit(SELECT_TARGET_RANDOM, 1);
-
-            if(!target)                                     // someone is trying to solo, set target as current victim.
-                target = m_creature->getVictim();
-
-            if(target)
-            {
-                Creature* MoltenFlame = SummonCreature(CREATURE_STALKER, target);
-                if(MoltenFlame)
-                {
-                    // Invisible model
-                    MoltenFlame->SetUInt32Value(UNIT_FIELD_DISPLAYID, 11686);
-                    ((molten_flameAI*)MoltenFlame->AI())->SetSupremusGUID(m_creature->GetGUID());
-                    ((molten_flameAI*)MoltenFlame->AI())->StalkTarget(target);
-                    SummonFlameTimer = 20000;
-                }
-            }
+            DoCast(m_creature, SPELL_MOLTEN_PUNCH);
+            SummonFlameTimer = 20000;
         }else SummonFlameTimer -= diff;
 
         if(Phase1)
         {
             if(HurtfulStrikeTimer < diff)
             {
-                Unit* target = CalculateHurtfulStrikeTarget();
-                if(target)
+                if(Unit* target = CalculateHurtfulStrikeTarget())
                 {
                     DoCast(target, SPELL_HURTFUL_STRIKE);
                     HurtfulStrikeTimer = 5000;
@@ -307,27 +207,20 @@ struct TRINITY_DLL_DECL boss_supremusAI : public ScriptedAI
         {
             if(SwitchTargetTimer < diff)
             {
-                Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0);
-                if(target)
+                if(Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 1, 100, true))
                 {
                     DoResetThreat();
                     m_creature->AddThreat(target, 5000000.0f);
                     DoTextEmote("acquires a new target!", NULL);
                     SwitchTargetTimer = 10000;
                 }
-
             }else SwitchTargetTimer -= diff;
 
             if(SummonVolcanoTimer < diff)
             {
-                Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 1);
-
-                if(!target)
-                    target = m_creature->getVictim();
-
-                if(target)
+                if(Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0, 999, true))
                 {
-                    DoCast(target, SPELL_VOLCANIC_ERUPTION);
+                    DoCast(target, SPELL_VOLCANIC_SUMMON);
                     DoTextEmote("roars and the ground begins to crack open!", NULL);
                     SummonVolcanoTimer = 10000;
                 }
@@ -341,7 +234,7 @@ struct TRINITY_DLL_DECL boss_supremusAI : public ScriptedAI
                 Phase1 = true;
                 DoResetThreat();
                 PhaseSwitchTimer = 60000;
-                m_creature->SetSpeed(MOVE_RUN, 1.0f);
+                m_creature->SetSpeed(MOVE_RUN, 1.2f);
                 DoZoneInCombat();
             }
             else
diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_warlord_najentus.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_warlord_najentus.cpp
index 685810151c6..f49c2ef17c7 100644
--- a/src/bindings/scripts/scripts/zone/black_temple/boss_warlord_najentus.cpp
+++ b/src/bindings/scripts/scripts/zone/black_temple/boss_warlord_najentus.cpp
@@ -58,8 +58,7 @@ EndScriptData */
 #define SOUND_DEATH     11459
 
 //Spells
-#define SPELL_NEEDLE_SPINE             39835
-#define SPELL_NEEDLE_AOE               39968
+#define SPELL_NEEDLE_SPINE             39992
 #define SPELL_TIDAL_BURST              39878
 #define SPELL_TIDAL_SHIELD             39872
 #define SPELL_IMPALING_SPINE           39837
@@ -180,15 +179,14 @@ struct TRINITY_DLL_DECL boss_najentusAI : public ScriptedAI
             EnrageTimer = 600000;
         }else EnrageTimer -= diff;
 
-        // Needle
         if(NeedleSpineTimer < diff)
         {
-            for(uint8 i = 0; i < 3; ++i)
-            {
-                if(Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) 
-                    m_creature->CastSpell(target, SPELL_NEEDLE_SPINE, true);
-            }
-            NeedleSpineTimer = 30000;
+            //m_creature->CastSpell(m_creature, SPELL_NEEDLE_SPINE, true);
+            std::list<Unit*> target;
+            SelectUnitList(target, 3, SELECT_TARGET_RANDOM, 80, true);
+            for(std::list<Unit*>::iterator i = target.begin(); i != target.end(); ++i)
+                m_creature->CastSpell(*i, 39835, true);
+            NeedleSpineTimer = 20000+rand()%5000;
         }else NeedleSpineTimer -= diff;
 
         if(SpecialYellTimer < diff)
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index 45830146e67..d0aa63305c3 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -4853,11 +4853,11 @@ void Spell::EffectScriptEffect(uint32 effIndex)
         // Dreaming Glory
         case 28698: unitTarget->CastSpell(unitTarget, 28694, true); break;
         // Needle Spine
-        case 39835: unitTarget->CastSpell(unitTarget, 39968, true); break;
+        //case 39835: unitTarget->CastSpell(unitTarget, 39968, true); break;
         // Draw Soul
         case 40904: unitTarget->CastSpell(m_caster, 40903, true); break;
         // Flame Crash
-        case 41126: unitTarget->CastSpell(unitTarget, 41131, true); break;
+        //case 41126: unitTarget->CastSpell(unitTarget, 41131, true); break;
         case 41931:
         {
             int bag=19;
diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp
index 2922208b963..48cae6c2663 100644
--- a/src/game/SpellMgr.cpp
+++ b/src/game/SpellMgr.cpp
@@ -2031,6 +2031,7 @@ void SpellMgr::LoadSpellExtraAttr()
     }
     tempAttr.attr[SPELL_EXTRA_ATTR_MAX_TARGETS] = 3;
     mSpellExtraAttrMap[41376] = tempAttr;   //Spite
+    mSpellExtraAttrMap[39992] = tempAttr;   //Needle Spine
     tempAttr.attr[SPELL_EXTRA_ATTR_MAX_TARGETS] = 0;
 
     //hack here, only for those strange exceptions!