Changeset 115

Timestamp:

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

Author:

yumileroy

Message:

[svn] SD2 Merge, rev 700 - addition of script_texts to various c++ scripts. Patch provided by SLG.

Original author: megamage
Date: 2008-10-26 20:59:39-05:00

Location:

trunk

Files:

• sql/trinityscript_script_texts.txt (added)
• sql/updates/123_world.sql (added)
• src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_exarch_maladaar.cpp (modified) (16 diffs)
• src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_nexusprince_shaffar.cpp (modified) (6 diffs)
• src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_pandemonius.cpp (modified) (5 diffs)
• src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_darkweaver_syth.cpp (modified) (9 diffs)
• src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_tailonking_ikiss.cpp (modified) (12 diffs)
• src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp (modified) (14 diffs)
• src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp (modified) (10 diffs)
• src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp (modified) (6 diffs)
• src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_murmur.cpp (modified) (9 diffs)

trunk/src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_exarch_maladaar.cpp

@@ -53 +53 @@
 
     void Aggro(Unit *who)
-        { }
+    { }
 
     void SetMyClass(uint8 myclass)
@@ -65 +65 @@
             return;
 
-        if( Class_Timer < diff )
-        {
-            switch( myClass )
+        if (Class_Timer < diff)
+        {
+            switch (myClass)
             {
                 case CLASS_WARRIOR:
@@ -106 +106 @@
                     break;
             }
-        }else Class_Timer -= diff;
+        } else Class_Timer -= diff;
 
         DoMeleeAttackIfReady();
@@ -117 +117 @@
 }
 
-#define SAY_INTRO                   "You have defiled the resting place of our ancestors. For this offense, there can be but one punishment. It is fitting that you have come to a place of the dead... for you will soon be joining them."
-#define SOUND_INTRO                 10509
-#define SAY_SUMMON                  "Rise my fallen brothers. Take form and fight!"
-#define SOUND_SUMMON                10512
-
-#define SAY_AGGRO_1                 "You will pay with your life!"
-#define SOUND_AGGRO_1               10513
-#define SAY_AGGRO_2                 "There's no turning back now!"
-#define SOUND_AGGRO_2               10514
-#define SAY_AGGRO_3                 "Serve your penitence!"
-#define SOUND_AGGRO_3               10515
-
-#define SAY_ROAR                    "Let your mind be clouded."
-#define SOUND_ROAR                  10510
-#define SAY_SOUL_CLEAVE             "Stare into the darkness of your soul."
-#define SOUND_SOUL_CLEAVE           10511
-
-#define SAY_SLAY_1                  "These walls will be your doom."
-#define SOUND_SLAY_1                10516
-#define SAY_SLAY_2                  "<laugh> Now, you'll stay for eternity!"
-#define SOUND_SLAY_2                10517
-
-#define SAY_DEATH                   "This is... where.. I belong..."
-#define SOUND_DEATH                 10518
+#define SAY_INTRO                   -1558000
+#define SAY_SUMMON                  -1558001
+
+#define SAY_AGGRO_1                 -1558002
+#define SAY_AGGRO_2                 -1558003
+#define SAY_AGGRO_3                 -1558004
+
+#define SAY_ROAR                    -1558005
+#define SAY_SOUL_CLEAVE             -1558006
+
+#define SAY_SLAY_1                  -1558007
+#define SAY_SLAY_2                  -1558008
+
+#define SAY_DEATH                   -1558009
 
 #define SPELL_RIBBON_OF_SOULS       32422
@@ -183 +173 @@
     void MoveInLineOfSight(Unit *who)
     {
-        if( !m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessablePlaceFor(m_creature) )
-        {
-            if( !HasTaunted && m_creature->IsWithinDistInMap(who, 150.0) )
+        if (!m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessablePlaceFor(m_creature))
+        {
+            if (!HasTaunted && m_creature->IsWithinDistInMap(who, 150.0))
             {
-                DoYell(SAY_INTRO, LANG_UNIVERSAL, NULL);
-                DoPlaySoundToSet(m_creature,SOUND_INTRO);
+                DoScriptText(SAY_INTRO, m_creature);
                 HasTaunted = true;
             }
@@ -196 +185 @@
 
             float attackRadius = m_creature->GetAttackDistance(who);
-            if( m_creature->IsWithinDistInMap(who, attackRadius) && m_creature->IsWithinLOSInMap(who) )
+            if (m_creature->IsWithinDistInMap(who, attackRadius) && m_creature->IsWithinLOSInMap(who))
             {
                 who->RemoveSpellsCausingAura(SPELL_AURA_MOD_STEALTH);
@@ -206 +195 @@
     void Aggro(Unit *who)
     {
-        switch(rand()%3)
-        {
-            case 0:
-                DoYell(SAY_AGGRO_1, LANG_UNIVERSAL, NULL);
-                DoPlaySoundToSet(m_creature,SOUND_AGGRO_1);
-                break;
-            case 1:
-                DoYell(SAY_AGGRO_2, LANG_UNIVERSAL, NULL);
-                DoPlaySoundToSet(m_creature,SOUND_AGGRO_2);
-                break;
-            case 2:
-                DoYell(SAY_AGGRO_3, LANG_UNIVERSAL, NULL);
-                DoPlaySoundToSet(m_creature,SOUND_AGGRO_3);
-                break;
+        switch (rand()%3)
+        {
+            case 0: DoScriptText(SAY_AGGRO_1, m_creature); break;
+            case 1: DoScriptText(SAY_AGGRO_2, m_creature); break;
+            case 2: DoScriptText(SAY_AGGRO_3, m_creature); break;
         }
     }
@@ -225 +205 @@
     void JustSummoned(Creature *summoned)
     {
-        if( summoned->GetEntry() == ENTRY_STOLEN_SOUL )
+        if (summoned->GetEntry() == ENTRY_STOLEN_SOUL)
         {
             //SPELL_STOLEN_SOUL_VISUAL has shapeshift effect, but not implemented feature in Trinity for this spell.
@@ -231 +211 @@
             summoned->CastSpell(summoned,SPELL_STOLEN_SOUL_VISUAL,false);
 
-            if( Unit *target = Unit::GetUnit(*m_creature,soulholder) )
+            if (Unit *target = Unit::GetUnit(*m_creature,soulholder))
                 summoned->AI()->AttackStart(target);
 
@@ -243 +223 @@
             return;
 
-        switch(rand()%2)
-        {
-            case 0:
-                DoYell(SAY_SLAY_1, LANG_UNIVERSAL, NULL);
-                DoPlaySoundToSet(m_creature,SOUND_SLAY_1);
-                break;
-            case 1:
-                DoYell(SAY_SLAY_2, LANG_UNIVERSAL, NULL);
-                DoPlaySoundToSet(m_creature,SOUND_SLAY_2);
-                break;
+        switch (rand()%2)
+        {
+            case 0: DoScriptText(SAY_SLAY_1, m_creature); break;
+            case 1: DoScriptText(SAY_SLAY_2, m_creature); break;
         }
     }
@@ -258 +232 @@
     void JustDied(Unit* Killer)
     {
-        DoYell(SAY_DEATH, LANG_UNIVERSAL, NULL);
-        DoPlaySoundToSet(m_creature,SOUND_DEATH);
-
+        DoScriptText(SAY_DEATH, m_creature);
         //When Exarch Maladar is defeated D'ore appear.
         DoSpawnCreature(19412,0,0,0,0, TEMPSUMMON_TIMED_DESPAWN, 600000);
@@ -270 +242 @@
             return;
 
-        if( !Avatar_summoned && ((m_creature->GetHealth()*100) / m_creature->GetMaxHealth() < 25) )
-        {
-            if( m_creature->IsNonMeleeSpellCasted(false) )
+        if (!Avatar_summoned && ((m_creature->GetHealth()*100) / m_creature->GetMaxHealth() < 25))
+        {
+            if (m_creature->IsNonMeleeSpellCasted(false))
                 m_creature->InterruptNonMeleeSpells(true);
 
-            DoYell(SAY_SUMMON, LANG_UNIVERSAL, NULL);
-            DoPlaySoundToSet(m_creature,SOUND_SUMMON);
+            DoScriptText(SAY_SUMMON, m_creature);
 
             DoCast(m_creature, SPELL_SUMMON_AVATAR);
@@ -283 +254 @@
         }
 
-        if( StolenSoul_Timer < diff )
-        {
-            if( Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0) )
+        if (StolenSoul_Timer < diff)
+        {
+            if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0))
             {
-                if( target->GetTypeId() == TYPEID_PLAYER )
+                if (target->GetTypeId() == TYPEID_PLAYER)
                 {
-                    if( m_creature->IsNonMeleeSpellCasted(false) )
+                    if (m_creature->IsNonMeleeSpellCasted(false))
                         m_creature->InterruptNonMeleeSpells(true);
 
                     uint32 i = urand(1,2);
-                    if( i == 1 )
-                    {
-                        DoYell(SAY_ROAR, LANG_UNIVERSAL, NULL);
-                        DoPlaySoundToSet(m_creature,SOUND_ROAR);
-                    }
+                    if (i == 1)
+                        DoScriptText(SAY_ROAR, m_creature);
                     else
-                    {
-                        DoYell(SAY_SOUL_CLEAVE, LANG_UNIVERSAL, NULL);
-                        DoPlaySoundToSet(m_creature,SOUND_SOUL_CLEAVE);
-                    }
+                        DoScriptText(SAY_SOUL_CLEAVE, m_creature);
 
                     soulmodel = target->GetDisplayId();
@@ -316 +281 @@
         }else StolenSoul_Timer -= diff;
 
-        if( Ribbon_of_Souls_timer < diff )
-        {
-            if( Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0) )
+        if (Ribbon_of_Souls_timer < diff)
+        {
+            if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0))
                 DoCast(target,SPELL_RIBBON_OF_SOULS);
 
@@ -324 +289 @@
         }else Ribbon_of_Souls_timer -= diff;
 
-        if( Fear_timer < diff )
+        if (Fear_timer < diff)
         {
             DoCast(m_creature,SPELL_SOUL_SCREAM);
@@ -362 +327 @@
             return;
 
-        if(Mortal_Strike_timer < diff)
+        if (Mortal_Strike_timer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_MORTAL_STRIKE);
             Mortal_Strike_timer = 10000 + rand()%20 * 1000;
-        }else Mortal_Strike_timer -= diff;
+        } else Mortal_Strike_timer -= diff;
 
         DoMeleeAttackIfReady();

trunk/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_nexusprince_shaffar.cpp

@@ -29 +29 @@
 #include "precompiled.h"
 
-#define SAY_INTRO           "What is this? You must forgive me, but I was not expecting company. As you can see, we are somewhat preoccupied right now. But no matter. As I am a gracious host, I will tend to you... personally."
-#define SOUND_INTRO         10539
-
-#define SAY_AGGRO_1         "We have not yet been properly introduced."
-#define SOUND_AGGRO_1       10541
-#define SAY_AGGRO_2         "An epic battle. How exciting!"
-#define SOUND_AGGRO_2       10542
-#define SAY_AGGRO_3         "I have longed for a good adventure."
-#define SOUND_AGGRO_3       10543
-
-#define SAY_SLAY_1          "It has been... entertaining."
-#define SOUND_SLAY_1        10544
-#define SAY_SLAY_2          "And now we part company."
-#define SOUND_SLAY_2        10545
-
-#define SAY_SUMMON          "I have such fascinating things to show you."
-#define SOUND_SUMMON        10540
-
-#define SAY_DEAD            "I must bid you... farewell."
-#define SOUND_DEAD          10546
+#define SAY_INTRO                       -1557000
+
+#define SAY_AGGRO_1                     -1557001
+#define SAY_AGGRO_2                     -1557002
+#define SAY_AGGRO_3                     -1557003
+
+#define SAY_SLAY_1                      -1557004
+#define SAY_SLAY_2                      -1557005
+
+#define SAY_SUMMON                      -1557006
+
+#define SAY_DEAD                        -1557007
 
 #define SPELL_BLINK                     34605
@@ -91 +83 @@
             if( !HasTaunted && m_creature->IsWithinDistInMap(who, 100.0) )
             {
-                DoYell(SAY_INTRO, LANG_UNIVERSAL, NULL);
-                DoPlaySoundToSet(m_creature,SOUND_INTRO);
+                DoScriptText(SAY_INTRO, m_creature);
                 HasTaunted = true;
             }
@@ -112 +103 @@
         switch(rand()%3)
         {
-            case 0:
-                DoYell(SAY_AGGRO_1, LANG_UNIVERSAL, NULL);
-                DoPlaySoundToSet(m_creature,SOUND_AGGRO_1);
-                break;
-            case 1:
-                DoYell(SAY_AGGRO_2, LANG_UNIVERSAL, NULL);
-                DoPlaySoundToSet(m_creature,SOUND_AGGRO_2);
-                break;
-            case 2:
-                DoYell(SAY_AGGRO_3, LANG_UNIVERSAL, NULL);
-                DoPlaySoundToSet(m_creature,SOUND_AGGRO_3);
-                break;
+            case 0: DoScriptText(SAY_AGGRO_1, m_creature); break;
+            case 1: DoScriptText(SAY_AGGRO_2, m_creature); break;
+            case 2: DoScriptText(SAY_AGGRO_3, m_creature); break;
         }
     }
@@ -142 +124 @@
         switch(rand()%2)
         {
-            case 0:
-                DoYell(SAY_SLAY_1, LANG_UNIVERSAL, NULL);
-                DoPlaySoundToSet(m_creature,SOUND_SLAY_1);
-                break;
-            case 1:
-                DoYell(SAY_SLAY_2, LANG_UNIVERSAL, NULL);
-                DoPlaySoundToSet(m_creature,SOUND_SLAY_2);
-                break;
+            case 0: DoScriptText(SAY_SLAY_1, m_creature); break;
+            case 1: DoScriptText(SAY_SLAY_2, m_creature); break;
         }
     }
@@ -155 +131 @@
     void JustDied(Unit* Killer)
     {
-        DoYell(SAY_DEAD, LANG_UNIVERSAL, NULL);
-        DoPlaySoundToSet(m_creature,SOUND_DEAD);
+        DoScriptText(SAY_DEAD, m_creature);
     }
 
@@ -205 +180 @@
 
             if( !urand(0,3) )
-            {
-                DoYell(SAY_SUMMON, LANG_UNIVERSAL, NULL);
-                DoPlaySoundToSet(m_creature,SOUND_SUMMON);
-            }
+                DoScriptText(SAY_SUMMON, m_creature);
+
             DoCast(m_creature,SPELL_ETHEREAL_BEACON);
 

trunk/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_pandemonius.cpp

@@ -24 +24 @@
 #include "precompiled.h"
 
-#define SAY_AGGRO_1                     "I will feed on your soul."
-#define SOUND_AGGRO_1                   10561
-#define SAY_AGGRO_2                     "So... full of life!"
-#define SOUND_AGGRO_2                   10562
-#define SAY_AGGRO_3                     "Do not... resist."
-#define SOUND_AGGRO_3                   10563
+#define SAY_AGGRO_1                     -1557008
+#define SAY_AGGRO_2                     -1557009
+#define SAY_AGGRO_3                     -1557010
 
-#define SAY_KILL_1                      "Yes! I am... empowered!"
-#define SOUND_KILL_1                    10564
-#define SAY_KILL_2                      "More... I must have more!"
-#define SOUND_KILL_2                    10565
+#define SAY_KILL_1                      -1557011
+#define SAY_KILL_2                      -1557012
 
-#define SAY_DEATH                       "To the void... once... more.."
-#define SOUND_DEATH                     10566
+#define SAY_DEATH                       -1557013
 
-#define EMOTE_DARK_SHELL                "shifts into the void..."
+#define EMOTE_DARK_SHELL                -1557014
 
 #define SPELL_VOID_BLAST                32325
@@ -68 +62 @@
     void JustDied(Unit* Killer)
     {
-        DoYell(SAY_DEATH, LANG_UNIVERSAL, NULL);
-        DoPlaySoundToSet(m_creature,SOUND_DEATH);
+        DoScriptText(SAY_DEATH, m_creature);
     }
 
@@ -76 +69 @@
         switch(rand()%2)
         {
-            case 0:
-                DoYell(SAY_KILL_1, LANG_UNIVERSAL, NULL);
-                DoPlaySoundToSet(m_creature,SOUND_KILL_1);
-                break;
-            case 1:
-                DoYell(SAY_KILL_2, LANG_UNIVERSAL, NULL);
-                DoPlaySoundToSet(m_creature,SOUND_KILL_2);
-                break;
+            case 0: DoScriptText(SAY_KILL_1, m_creature); break;
+            case 1: DoScriptText(SAY_KILL_2, m_creature); break;
         }
     }
@@ -91 +78 @@
         switch(rand()%3)
         {
-            case 0:
-                DoYell(SAY_AGGRO_1, LANG_UNIVERSAL, NULL);
-                DoPlaySoundToSet(m_creature,SOUND_AGGRO_1);
-                break;
-            case 1:
-                DoYell(SAY_AGGRO_2, LANG_UNIVERSAL, NULL);
-                DoPlaySoundToSet(m_creature,SOUND_AGGRO_2);
-                break;
-            case 2:
-                DoYell(SAY_AGGRO_3, LANG_UNIVERSAL, NULL);
-                DoPlaySoundToSet(m_creature,SOUND_AGGRO_3);
-                break;
+            case 0: DoScriptText(SAY_AGGRO_1, m_creature); break;
+            case 1: DoScriptText(SAY_AGGRO_2, m_creature); break;
+            case 2: DoScriptText(SAY_AGGRO_3, m_creature); break;
         }
 
@@ -135 +113 @@
                     m_creature->InterruptNonMeleeSpells(true);
 
-                DoTextEmote(EMOTE_DARK_SHELL,NULL,true);
+                DoScriptText(EMOTE_DARK_SHELL, m_creature);
+
                 DoCast(m_creature,HeroicMode ? H_SPELL_DARK_SHELL : SPELL_DARK_SHELL);
                 DarkShell_Timer = 20000;

trunk/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_darkweaver_syth.cpp

@@ -24 +24 @@
 #include "precompiled.h"
 
-#define SAY_SUMMON                  "I have pets..<squawk>..of my own!"
-#define SOUND_SUMMON                10502
-
-#define SAY_AGGRO_1                 "Hrrmm.. Time to.. hrrm.. make my move."
-#define SOUND_AGGRO_1               10503
-#define SAY_AGGRO_2                 "Nice pets..hrm.. Yes! <squawking>"
-#define SOUND_AGGRO_2               10504
-#define SAY_AGGRO_3                 "Nice pets have.. weapons. No so..<squawk>..nice."
-#define SOUND_AGGRO_3               10505
-
-#define SAY_SLAY_1                  "Death.. meeting life is.. <squawking>"
-#define SOUND_SLAY_1                10506
-#define SAY_SLAY_2                  "Uhn.. Be free..<squawk>"
-#define SOUND_SLAY_2                10507
-
-#define SAY_DEATH                   "No more life..hrm. No more pain. <squawks weakly>"
-#define SOUND_DEATH                 10508
+#define SAY_SUMMON                  -1556000
+
+#define SAY_AGGRO_1                 -1556001
+#define SAY_AGGRO_2                 -1556002
+#define SAY_AGGRO_3                 -1556003
+
+#define SAY_SLAY_1                  -1556004
+#define SAY_SLAY_2                  -1556005
+
+#define SAY_DEATH                   -1556006
 
 #define SPELL_FROST_SHOCK           37865
@@ -94 +87 @@
         switch(rand()%3)
         {
-            case 0:
-                DoYell(SAY_AGGRO_1, LANG_UNIVERSAL, NULL);
-                DoPlaySoundToSet(m_creature,SOUND_AGGRO_1);
-                break;
-            case 1:
-                DoYell(SAY_AGGRO_2, LANG_UNIVERSAL, NULL);
-                DoPlaySoundToSet(m_creature,SOUND_AGGRO_2);
-                break;
-            case 2:
-                DoYell(SAY_AGGRO_3, LANG_UNIVERSAL, NULL);
-                DoPlaySoundToSet(m_creature,SOUND_AGGRO_3);
-                break;
+            case 0: DoScriptText(SAY_AGGRO_1, m_creature); break;
+            case 1: DoScriptText(SAY_AGGRO_2, m_creature); break;
+            case 2: DoScriptText(SAY_AGGRO_3, m_creature); break;
         }
     }
@@ -111 +95 @@
     void JustDied(Unit* Killer)
     {
-        DoYell(SAY_DEATH, LANG_UNIVERSAL, NULL);
-        DoPlaySoundToSet(m_creature,SOUND_DEATH);
+        DoScriptText(SAY_DEATH, m_creature);
     }
 
@@ -122 +105 @@
         switch(rand()%2)
         {
-            case 0:
-                DoYell(SAY_SLAY_1, LANG_UNIVERSAL, NULL);
-                DoPlaySoundToSet(m_creature,SOUND_SLAY_1);
-                break;
-            case 1:
-                DoYell(SAY_SLAY_2, LANG_UNIVERSAL, NULL);
-                DoPlaySoundToSet(m_creature,SOUND_SLAY_2);
-                break;
+            case 0: DoScriptText(SAY_SLAY_1, m_creature); break;
+            case 1: DoScriptText(SAY_SLAY_2, m_creature); break;
         }
     }
@@ -135 +112 @@
     void JustSummoned(Creature *summoned)
     {
-        if( Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0) )
+        if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0))
             summoned->AI()->AttackStart(target);
-
     }
 
     void SythSummoning()
     {
-        DoYell(SAY_SUMMON, LANG_UNIVERSAL, NULL);
-        DoPlaySoundToSet(m_creature,SOUND_SUMMON);
-
-        if( m_creature->IsNonMeleeSpellCasted(false) )
+        DoScriptText(SAY_SUMMON, m_creature);
+
+        if (m_creature->IsNonMeleeSpellCasted(false))
             m_creature->InterruptNonMeleeSpells(false);
 
@@ -159 +134 @@
             return;
 
-        if( ((m_creature->GetHealth()*100) / m_creature->GetMaxHealth() < 90) && !summon90)
+        if (((m_creature->GetHealth()*100) / m_creature->GetMaxHealth() < 90) && !summon90)
         {
             SythSummoning();
@@ -165 +140 @@
         }
 
-        if( ((m_creature->GetHealth()*100) / m_creature->GetMaxHealth() < 50) && !summon50)
+        if (((m_creature->GetHealth()*100) / m_creature->GetMaxHealth() < 50) && !summon50)
         {
             SythSummoning();
@@ -171 +146 @@
         }
 
-        if( ((m_creature->GetHealth()*100) / m_creature->GetMaxHealth() < 10) && !summon10)
+        if (((m_creature->GetHealth()*100) / m_creature->GetMaxHealth() < 10) && !summon10)
         {
             SythSummoning();
@@ -177 +152 @@
         }
 
-        if( flameshock_timer < diff )
-        {
-            if( Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0) )
+        if (flameshock_timer < diff)
+        {
+            if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0))
                 DoCast(target,SPELL_FLAME_SHOCK);
 
             flameshock_timer = 10000 + rand()%5000;
-        }else flameshock_timer -= diff;
-
-        if( arcaneshock_timer < diff )
-        {
-            if( Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0) )
+        } else flameshock_timer -= diff;
+
+        if (arcaneshock_timer < diff)
+        {
+            if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0))
                 DoCast(target,SPELL_ARCANE_SHOCK);
 
             arcaneshock_timer = 10000 + rand()%5000;
-        }else arcaneshock_timer -= diff;
-
-        if( frostshock_timer < diff )
-        {
-            if( Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0) )
+        } else arcaneshock_timer -= diff;
+
+        if (frostshock_timer < diff)
+        {
+            if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0))
                 DoCast(target,SPELL_FROST_SHOCK);
 
             frostshock_timer = 10000 + rand()%5000;
-        }else frostshock_timer -= diff;
-
-        if( shadowshock_timer < diff )
-        {
-            if( Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0) )
+        } else frostshock_timer -= diff;
+
+        if (shadowshock_timer < diff)
+        {
+            if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0))
                 DoCast(target,SPELL_SHADOW_SHOCK);
 
             shadowshock_timer = 10000 + rand()%5000;
-        }else shadowshock_timer -= diff;
-
-        if( chainlightning_timer < diff )
-        {
-            if( Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0) )
+        } else shadowshock_timer -= diff;
+
+        if (chainlightning_timer < diff)
+        {
+            if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0))
                 DoCast(target,SPELL_CHAIN_LIGHTNING);
 
             chainlightning_timer = 25000;
-        }else chainlightning_timer -= diff;
+        } else chainlightning_timer -= diff;
 
         DoMeleeAttackIfReady();

trunk/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_tailonking_ikiss.cpp

@@ -25 +25 @@
 #include "def_sethekk_halls.h"
 
-#define SAY_INTRO                   "<squawk>..Trinkets yes pretty Trinkets..<squawk>..power, great power.<squawk>..power in Trinkets..<squawk>"
-#define SOUND_INTRO                 10557
-
-#define SAY_AGGRO_1                 "You make war on Ikiss?..<squawk>"
-#define SOUND_AGGRO_1               10554
-#define SAY_AGGRO_2                 "Ikiss cut you pretty..<squawk>..slice you. Yes!"
-#define SOUND_AGGRO_2               10555
-#define SAY_AGGRO_3                 "No escape for..<squawk>..for you"
-#define SOUND_AGGRO_3               10556
-
-#define SAY_SLAY_1                  "You die..<squawk>..stay away from Trinkets"
-#define SOUND_SLAY_1                10558
-#define SAY_SLAY_2                  "<squawk>"
-#define SOUND_SLAY_2                10559
-
-#define SAY_DEATH                   "Ikiss will not..<squawk>..die"
-#define SOUND_DEATH                 10560
-
-#define EMOTE_ARCANE_EXP            "begins to channel arcane energy..."
+#define SAY_INTRO                   -1556007
+
+#define SAY_AGGRO_1                 -1556008
+#define SAY_AGGRO_2                 -1556009
+#define SAY_AGGRO_3                 -1556010
+
+#define SAY_SLAY_1                  -1556011
+#define SAY_SLAY_2                  -1556012
+
+#define SAY_DEATH                   -15560013
+
+#define EMOTE_ARCANE_EXP            -15560014
 
 #define SPELL_BLINK                 38194
@@ -101 +94 @@
             {
                 Intro = true;
-                DoYell(SAY_INTRO, LANG_UNIVERSAL, NULL);
-                DoPlaySoundToSet(m_creature,SOUND_INTRO);
+                DoScriptText(SAY_INTRO, m_creature);
             }
 
@@ -121 +113 @@
         switch(rand()%3)
         {
-            case 0:
-                DoYell(SAY_AGGRO_1, LANG_UNIVERSAL, NULL);
-                DoPlaySoundToSet(m_creature,SOUND_AGGRO_1);
-                break;
-
-            case 1:
-                DoYell(SAY_AGGRO_2, LANG_UNIVERSAL, NULL);
-                DoPlaySoundToSet(m_creature,SOUND_AGGRO_2);
-                break;
-
-            case 2:
-                DoYell(SAY_AGGRO_3, LANG_UNIVERSAL, NULL);
-                DoPlaySoundToSet(m_creature,SOUND_AGGRO_3);
-                break;
+            case 0: DoScriptText(SAY_AGGRO_1, m_creature); break;
+            case 1: DoScriptText(SAY_AGGRO_2, m_creature); break;
+            case 2: DoScriptText(SAY_AGGRO_3, m_creature); break;
         }
     }
@@ -140 +121 @@
     void JustDied(Unit* Killer)
     {
-        DoYell(SAY_DEATH, LANG_UNIVERSAL, NULL);
-        DoPlaySoundToSet(m_creature,SOUND_DEATH);
-
-        if( pInstance )
+        DoScriptText(SAY_DEATH, m_creature);
+
+        if (pInstance)
             pInstance->SetData(DATA_IKISSDOOREVENT, DONE);
     }
@@ -151 +131 @@
         switch(rand()%2)
         {
-            case 0:
-                DoYell(SAY_SLAY_1, LANG_UNIVERSAL, NULL);
-                DoPlaySoundToSet(m_creature,SOUND_SLAY_1);
-                break;
-
-            case 1:
-                DoYell(SAY_SLAY_2, LANG_UNIVERSAL, NULL);
-                DoPlaySoundToSet(m_creature,SOUND_SLAY_2);
-                break;
+            case 0: DoScriptText(SAY_SLAY_1, m_creature); break;
+            case 1: DoScriptText(SAY_SLAY_2, m_creature); break;
         }
     }
@@ -168 +141 @@
             return;
 
-        if( Blink )
+        if (Blink)
         {
             DoCast(m_creature,HeroicMode ? H_SPELL_ARCANE_EXPLOSION : SPELL_ARCANE_EXPLOSION);
@@ -175 +148 @@
         }
 
-        if( ArcaneVolley_Timer < diff )
+        if (ArcaneVolley_Timer < diff)
         {
             DoCast(m_creature,HeroicMode ? H_SPELL_ARCANE_VOLLEY : SPELL_ARCANE_VOLLEY);
@@ -181 +154 @@
         }else ArcaneVolley_Timer -= diff;
 
-        if( Sheep_Timer < diff )
+        if (Sheep_Timer < diff)
         {
             //second top aggro target in normal, random target in heroic correct?
             Unit *target = NULL;
-            if( HeroicMode ? target = SelectUnit(SELECT_TARGET_RANDOM,0) : target = SelectUnit(SELECT_TARGET_TOPAGGRO,1) )
+            if (HeroicMode ? target = SelectUnit(SELECT_TARGET_RANDOM,0) : target = SelectUnit(SELECT_TARGET_TOPAGGRO,1))
                 DoCast(target,HeroicMode ? H_SPELL_POLYMORPH : SPELL_POLYMORPH);
             Sheep_Timer = 15000+rand()%2500;
@@ -191 +164 @@
 
         //may not be correct time to cast
-        if( !ManaShield && ((m_creature->GetHealth()*100) / m_creature->GetMaxHealth() < 20) )
+        if (!ManaShield && ((m_creature->GetHealth()*100) / m_creature->GetMaxHealth() < 20))
         {
             DoCast(m_creature,SPELL_MANA_SHIELD);
@@ -197 +170 @@
         }
 
-        if( HeroicMode )
-        {
-            if( Slow_Timer < diff )
+        if (HeroicMode)
+        {
+            if (Slow_Timer < diff)
             {
                 DoCast(m_creature,H_SPELL_SLOW);
@@ -206 +179 @@
         }
 
-        if( Blink_Timer < diff )
-        {
-            DoTextEmote(EMOTE_ARCANE_EXP,NULL,true);
-
-            if( Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0) )
-            {
-                if( m_creature->IsNonMeleeSpellCasted(false) )
+        if (Blink_Timer < diff)
+        {
+            DoScriptText(EMOTE_ARCANE_EXP, m_creature);
+
+            if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0))
+            {
+                if (m_creature->IsNonMeleeSpellCasted(false))
                     m_creature->InterruptNonMeleeSpells(false);
 
@@ -231 +204 @@
         }else Blink_Timer -= diff;
 
-        if( !Blink )
+        if (!Blink)
             DoMeleeAttackIfReady();
     }

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

@@ -25 +25 @@
 #include "def_shadow_labyrinth.h"
 
-#define SAY_INTRO       "Infidels have invaded the sanctuary! Sniveling pests...You have yet to learn the true meaning of agony!"
-#define SOUND_INTRO     10473
+#define SAY_INTRO       -1555000
 
-#define SAY_AGGRO1      "Pathetic mortals! You will pay dearly!"
-#define SOUND_AGGRO1    10475
-#define SAY_AGGRO2      "I will break you!"
-#define SOUND_AGGRO2    10476
-#define SAY_AGGRO3      "Finally! Something to relieve the tedium!"
-#define SOUND_AGGRO3    10477
+#define SAY_AGGRO1      -1555001
+#define SAY_AGGRO2      -1555002
+#define SAY_AGGRO3      -1555003
 
-#define SAY_HELP        "Aid me, you fools, before it's too late!"
-#define SOUND_HELP      10474
+#define SAY_HELP        -1555004
 
-#define SAY_SLAY1       "Do you fear death?"
-#define SOUND_SLAY1     10478
-#define SAY_SLAY2       "This is the part I enjoy most."
-#define SOUND_SLAY2     10479
+#define SAY_SLAY1       -1555005
+#define SAY_SLAY2       -1555006
 
-#define SAY_DEATH       "Do not...grow...overconfident, mortal."
-#define SOUND_DEATH     10480
+#define SAY_DEATH       -1555007
 
 #define SPELL_BANISH            30231
@@ -80 +72 @@
         IsBanished = false;
 
-        if( pInstance )
+        if (pInstance)
         {
-            if( pInstance->GetData(TYPE_HELLMAW) == NOT_STARTED )
+            if (pInstance->GetData(TYPE_HELLMAW) == NOT_STARTED)
             {
                 DoCast(m_creature,SPELL_BANISH);
@@ -89 +81 @@
             else pInstance->SetData(TYPE_HELLMAW,FAIL);
 
-            if( pInstance->GetData(TYPE_OVERSEER) == DONE )
+            if (pInstance->GetData(TYPE_OVERSEER) == DONE)
             {
-                if( m_creature->HasAura(SPELL_BANISH,0) )
+                if (m_creature->HasAura(SPELL_BANISH,0))
                     m_creature->RemoveAurasDueToSpell(SPELL_BANISH);
                 Intro = true;
@@ -100 +92 @@
     void MovementInform(uint32 type, uint32 id)
     {
-        if( type != POINT_MOTION_TYPE )
+        if (type != POINT_MOTION_TYPE)
             return;
     }
@@ -106 +98 @@
     void DoIntro()
     {
-        DoYell(SAY_INTRO, LANG_UNIVERSAL, NULL);
-        DoPlaySoundToSet(m_creature, SOUND_INTRO);
+        DoScriptText(SAY_INTRO, m_creature);
 
-        if( m_creature->HasAura(SPELL_BANISH,0) )
+        if (m_creature->HasAura(SPELL_BANISH,0))
             m_creature->RemoveAurasDueToSpell(SPELL_BANISH);
 
@@ -115 +106 @@
         Intro = true;
 
-        if( pInstance )
+        if (pInstance)
             pInstance->SetData(TYPE_HELLMAW, IN_PROGRESS);
     }
@@ -123 +114 @@
         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;
+            case 0: DoScriptText(SAY_AGGRO1, m_creature); break;
+            case 1: DoScriptText(SAY_AGGRO2, m_creature); break;
+            case 2: DoScriptText(SAY_AGGRO3, m_creature); break;
         }
     }
@@ -142 +124 @@
         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;
+            case 0: DoScriptText(SAY_SLAY1, m_creature); break;
+            case 1: DoScriptText(SAY_SLAY2, m_creature); break;
         }
     }
@@ -155 +131 @@
     void JustDied(Unit *victim)
     {
-        DoYell(SAY_DEATH, LANG_UNIVERSAL, NULL);
-        DoPlaySoundToSet(m_creature, SOUND_DEATH);
+        DoScriptText(SAY_DEATH, m_creature);
 
-        if( pInstance )
+        if (pInstance)
             pInstance->SetData(TYPE_HELLMAW, DONE);
     }
@@ -164 +139 @@
     void UpdateAI(const uint32 diff)
     {
-        if( !Intro )
+        if (!Intro)
         {
-            if( EventCheck_Timer < diff )
+            if (EventCheck_Timer < diff)
             {
-                if( pInstance )
+                if (pInstance)
                 {
-                    if( pInstance->GetData(TYPE_OVERSEER) == DONE )
+                    if (pInstance->GetData(TYPE_OVERSEER) == DONE)
                         DoIntro();
                 }
@@ -177 +152 @@
         }
 
-        if( !InCombat && !IsBanished )
+        if (!InCombat && !IsBanished)
         {
             //this is where we add MovePoint()
@@ -186 +161 @@
             return;
 
-        if( CorrosiveAcid_Timer < diff )
+        if (CorrosiveAcid_Timer < diff)
         {
             DoCast(m_creature,SPELL_CORROSIVE_ACID);
@@ -192 +167 @@
         }else CorrosiveAcid_Timer -= diff;
 
-        if( Fear_Timer < diff )
+        if (Fear_Timer < diff)
         {
             DoCast(m_creature,SPELL_FEAR);
@@ -198 +173 @@
         }else Fear_Timer -= diff;
 
-        /*if( HeroicMode )
+        /*if (HeroicMode)
         {
-            if( Enrage_Timer < diff )
+            if (Enrage_Timer < diff)
             {
                 DoCast(m_creature,SPELL_ENRAGE);

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

@@ -30 +30 @@
 #define SPELL_WAR_STOMP       33707
 
-#define SAY_AGGRO1            "You be dead people!"
-#define SAY_AGGRO2            "Time to kill!"
-#define SAY_AGGRO3            "I see dead people!"
-#define SAY_SLAY1             "No coming back for you!"
-#define SAY_SLAY2             "Nice try!"
-#define SAY_SLAY3             "Now you gone for good!"
-#define SAY_DEATH             "This...no...good.."
+#define SAY_INTRO1          -1555008
+#define SAY_INTRO2          -1555009
+#define SAY_INTRO3          -1555010
+#define SAY_AGGRO1          -1555011
+#define SAY_AGGRO2          -1555012
+#define SAY_AGGRO3          -1555013
+#define SAY_SLAY1           -1555014
+#define SAY_SLAY2           -1555015
+#define SAY_HELP            -1555016
+#define SAY_DEATH           -1555017
 
-#define SOUND_AGGRO1          10498
-#define SOUND_AGGRO2          10497
-#define SOUND_AGGRO3          10488
-#define SOUND_SLAY1           10489
-#define SOUND_SLAY2           10490
-#define SOUND_SLAY3           10499
-#define SOUND_DEATH           10491
+#define SAY2_INTRO1         -1555018
+#define SAY2_INTRO2         -1555019
+#define SAY2_INTRO3         -1555020
+#define SAY2_AGGRO1         -1555021
+#define SAY2_AGGRO2         -1555022
+#define SAY2_AGGRO3         -1555023
+#define SAY2_SLAY1          -1555024
+#define SAY2_SLAY2          -1555025
+#define SAY2_HELP           -1555026
+#define SAY2_DEATH          -1555027
 
 struct TRINITY_DLL_DECL boss_blackheart_the_inciterAI : public ScriptedAI
@@ -70 +76 @@
         Knockback_Timer = 15000;
 
-        if( pInstance )
+        if (pInstance)
             pInstance->SetData(DATA_BLACKHEARTTHEINCITEREVENT, NOT_STARTED);
     }
@@ -76 +82 @@
     void KilledUnit(Unit *victim)
     {
-        switch(rand()%3)
+        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;
-            case 2:
-                DoYell(SAY_SLAY3, LANG_UNIVERSAL, NULL);
-                DoPlaySoundToSet(m_creature, SOUND_SLAY3);
-                break;
+            case 0: DoScriptText(SAY_SLAY1, m_creature); break;
+            case 1: DoScriptText(SAY_SLAY2, m_creature); break;
         }
     }
@@ -95 +91 @@
     void JustDied(Unit *victim)
     {
-        DoYell(SAY_DEATH, LANG_UNIVERSAL, NULL);
-        DoPlaySoundToSet(m_creature, SOUND_DEATH);
+        DoScriptText(SAY_DEATH, m_creature);
 
         if( pInstance )
@@ -106 +101 @@
         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;
+            case 0: DoScriptText(SAY_AGGRO1, m_creature); break;
+            case 1: DoScriptText(SAY_AGGRO2, m_creature); break;
+            case 2: DoScriptText(SAY_AGGRO3, m_creature); break;
         }
 
-        if( pInstance )
+        if (pInstance)
             pInstance->SetData(DATA_BLACKHEARTTHEINCITEREVENT, IN_PROGRESS);
     }
@@ -130 +116 @@
             return;
 
-        if( InciteChaos )
+        if (InciteChaos)
         {
-            if( InciteChaosWait_Timer < diff )
+            if (InciteChaosWait_Timer < diff)
             {
                 InciteChaos = false;
@@ -141 +127 @@
         }
 
-        if( InciteChaos_Timer < diff )
+        if (InciteChaos_Timer < diff)
         {
             DoCast(m_creature, SPELL_INCITE_CHAOS);
@@ -149 +135 @@
             {
                 Unit* target = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid());
-                if( target && target->GetTypeId() == TYPEID_PLAYER )
+                if (target && target->GetTypeId() == TYPEID_PLAYER)
                     target->CastSpell(target,SPELL_INCITE_CHAOS_B,true);
             }
@@ -160 +146 @@
 
         //Charge_Timer
-        if( Charge_Timer < diff )
+        if (Charge_Timer < diff)
         {
-            if( Unit *target = SelectUnit(SELECT_TARGET_RANDOM, 0) )
+            if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM, 0))
                 DoCast(target, SPELL_CHARGE);
             Charge_Timer = 25000;
@@ -168 +154 @@
 
         //Knockback_Timer
-        if( Knockback_Timer < diff )
+        if (Knockback_Timer < diff)
         {
             DoCast(m_creature, SPELL_WAR_STOMP);

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

@@ -25 +25 @@
 #include "def_shadow_labyrinth.h"
 
-#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 SAY_INTRO                       -1555028
+#define SAY_AGGRO1                      -1555029
+#define SAY_AGGRO2                      -1555030
+#define SAY_AGGRO3                      -1555031
+#define SAY_HELP                        -1555032
+#define SAY_SLAY1                       -1555033
+#define SAY_SLAY2                       -1555034
+#define SAY_DEATH                       -1555035
 
 #define SPELL_RAIN_OF_FIRE          33617
@@ -148 +139 @@
         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;
+            case 0: DoScriptText(SAY_SLAY1, m_creature); break;
+            case 1: DoScriptText(SAY_SLAY2, m_creature); break;
         }
     }
@@ -162 +146 @@
     void JustDied(Unit *victim)
     {
-        DoYell(SAY_DEATH, LANG_UNIVERSAL, NULL);
-        DoPlaySoundToSet(m_creature, SOUND_DEATH);
+        DoScriptText(SAY_DEATH, m_creature);
         destroyPortals();
         if(pInstance)
@@ -173 +156 @@
         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;
+            case 0: DoScriptText(SAY_AGGRO1, m_creature); break;
+            case 1: DoScriptText(SAY_AGGRO2, m_creature); break;
+            case 2: DoScriptText(SAY_AGGRO3, m_creature); break;
         }
 
@@ -220 +192 @@
         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);
+            DoScriptText(SAY_INTRO, m_creature);
             Intro = true;
         }
@@ -236 +207 @@
         if (sumportals_Timer < diff)
         {
-            DoYell(SAY_HELP, LANG_UNIVERSAL, NULL);
-            DoPlaySoundToSet(m_creature, SOUND_HELP);
+            DoScriptText(SAY_HELP, m_creature);
             summonPortals();
             sumportals_Timer = 1000000;

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

@@ -24 +24 @@
 #include "precompiled.h"
 
-#define EMOTE_SONIC_BOOM            "draws energy from the air."
+#define EMOTE_SONIC_BOOM            -1555036
 
 #define SPELL_MAGNETIC_PULL         33689
@@ -57 +57 @@
         //database should have `RegenHealth`=0 to prevent regen
         uint32 hp = m_creature->GetMaxHealth()*0.4;
-        if( hp )
+        if (hp)
             m_creature->SetHealth(hp);
     }
@@ -70 +70 @@
 
         //SonicBoom_Timer
-        if(SonicBoom_Timer < diff)
+        if (SonicBoom_Timer < diff)
         {
-            if(CanSonicBoom)
+            if (CanSonicBoom)
             {
                 DoCast(m_creature, SPELL_SONIC_BOOM_CAST,true);
@@ -80 +80 @@
             else
             {
-                DoTextEmote(EMOTE_SONIC_BOOM,NULL);
+                DoScriptText(EMOTE_SONIC_BOOM, m_creature);
                 DoCast(m_creature,SPELL_SONIC_BOOM_PRE);
                 CanSonicBoom = true;
@@ -88 +88 @@
 
         //MurmursTouch_Timer
-        if(MurmursTouch_Timer < diff)
+        if (MurmursTouch_Timer < diff)
         {
             /*Unit* target = NULL;
@@ -99 +99 @@
 
         //Resonance_Timer
-        if(Resonance_Timer < diff)
+        if (Resonance_Timer < diff)
         {
-            if( !m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE) )
+            if (!m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
                 DoCast(m_creature->getVictim(), SPELL_RESONANCE);
             Resonance_Timer = 5000;
@@ -107 +107 @@
 
         //MagneticPull_Timer
-        if(MagneticPull_Timer < diff)
+        if (MagneticPull_Timer < diff)
         {
-            if( !CanShockWave )
+            if (!CanShockWave)
             {
-                if( Unit* temp = SelectUnit(SELECT_TARGET_RANDOM,0) )
+                if (Unit* temp = SelectUnit(SELECT_TARGET_RANDOM,0))
                 {
-                    if( temp->GetTypeId() == TYPEID_PLAYER )
+                    if (temp->GetTypeId() == TYPEID_PLAYER)
                     {
                         DoCast(temp, SPELL_MAGNETIC_PULL);
@@ -124 +124 @@
             else
             {
-                if( Unit* target = Unit::GetUnit(*m_creature,pTarget) )
+                if (Unit* target = Unit::GetUnit(*m_creature,pTarget))
                     target->CastSpell(target,SPELL_SHOCKWAVE,true);
 
@@ -134 +134 @@
 
         //no meele if preparing for sonic boom
-        if(!CanSonicBoom)
+        if (!CanSonicBoom)
             DoMeleeAttackIfReady();
     }