Changeset 108 for trunk/src/bindings/scripts

Timestamp:

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

Author:

yumileroy

Message:

[svn] Continue the work of rewriting spell target selection functions (warning: this may cause some spells broken).
Add some spell_script_target.
Delete some workaround in scripts (since core provides spell support now).

Original author: megamage
Date: 2008-10-25 10:37:28-05:00

Location:

trunk/src/bindings/scripts/scripts/zone/black_temple

Files:

• boss_illidan.cpp (modified) (4 diffs)
• illidari_council.cpp (modified) (1 diff)

trunk/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp

@@ -97 +97 @@
 //Phase Normal spells
 #define SPELL_FLAME_CRASH_EFFECT        40836 // Firey blue ring of circle that the other flame crash summons
+#define SPELL_SUMMON_SHADOWDEMON        41117 // Summon four shadowfiends
 #define SPELL_SHADOWFIEND_PASSIVE       41913 // Passive aura for shadowfiends
 #define SPELL_SHADOW_DEMON_PASSIVE      41079 // Adds the "shadowform" aura to Shadow Demons.
@@ -386 +387 @@
     void Reset();
 
-    void JustSummoned(Creature* summon)//, TempSummonType type)
-    {
-        if(summon->GetCreatureInfo()->Entry == FLAME_CRASH)
-        {
-        //    type = TEMPSUMMON_TIMED_DESPAWN;
-        }
-        //error_log("justsummoned %d %d", summon->GetCreatureInfo()->Entry, summon->GetGUID());
+    void JustSummoned(Creature* summon)
+    {
+        if(summon->GetCreatureInfo()->Entry == SHADOW_DEMON)
+        {
+            Unit *target = SelectUnit(SELECT_TARGET_RANDOM, 0);
+            if(target && target->GetTypeId() == TYPEID_PLAYER) // only on players.
+            {
+                summon->AddThreat(target, 5000000.0f);
+                summon->AI()->AttackStart(target);
+            }
+            DoZoneInCombat(summon);
+        }
     }
 
@@ -559 +565 @@
     void SummonFlamesOfAzzinoth();
     void SummonMaiev();
-    void SummonShadowDemon()
-    {
-        Creature* ShadowDemon = NULL;
-        Unit* target = NULL;
-        for(uint8 i = 0; i < 4; i++)
-        {
-            ShadowDemon = DoSpawnCreature(SHADOW_DEMON, 0,0,0,0,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,25000);
-            if(ShadowDemon)
-            {
-                target = SelectUnit(SELECT_TARGET_RANDOM, 0);
-                if(target && target->GetTypeId() == TYPEID_PLAYER) // only on players.
-                {
-                    ShadowDemon->AddThreat(target, 5000000.0f);
-                    ShadowDemon->AI()->AttackStart(target);
-                }
-                DoZoneInCombat(ShadowDemon);
-            }
-        }
-    }
     void HandleTalkSequence();
     void HandleFlightSequence()
@@ -944 +931 @@
                         break;
                     case EVENT_SHADOWDEMON:
-                        SummonShadowDemon();
+                        DoCast(m_creature, SPELL_SUMMON_SHADOWDEMON);
                         Timer[EVENT_SHADOWDEMON] = 0;
                         Timer[EVENT_FLAME_BURST] += 10000;

trunk/src/bindings/scripts/scripts/zone/black_temple/illidari_council.cpp

@@ -696 +696 @@
         if(CircleOfHealingTimer < diff)
         {
-            //Currently bugged and puts Malande on the threatlist of the other council members. It also heals players.
-            //DoCast(m_creature, SPELL_CIRCLE_OF_HEALING);
+            DoCast(m_creature, SPELL_CIRCLE_OF_HEALING);
             CircleOfHealingTimer = 60000;
         }else CircleOfHealingTimer -= diff;