[2794] Imporve [2791]

Thanks rsa for pointing
scriptdev2 · Feb 23, 2013 · bd3a0e0 · bd3a0e0
1 parent c822c6f
commit bd3a0e0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/scripts/northrend/ruby_sanctum/boss_saviana.cpp b/scripts/northrend/ruby_sanctum/boss_saviana.cpp
@@ -17,7 +17,7 @@
 /* ScriptData
 SDName: boss_saviana
 SD%Complete: 100
-SDComment: Timers
+SDComment:
 SDCategory: Ruby Sanctum
 EndScriptData */
 
@@ -31,12 +31,11 @@ enum
     SAY_SLAY_2                  = -1724017,
     SAY_SPECIAL                 = -1724018,
     SOUND_DEATH                 = 17531,                    // On death it has only a screaming sound
+    EMOTE_ENRAGE                = -1000003,
 
     SPELL_ENRAGE                = 78722,
     SPELL_FLAME_BREATH          = 74403,
-    SPELL_CONFLAGRATION_TARGET  = 74452,                    // sets target for 74453
-    //SPELL_FLAME_BEACON        = 74453,
-    //SPELL_CONFLAGRATION_DUMMY = 74454,                    // unk effect
+    SPELL_CONFLAGRATION         = 74452,                    // dummy targeting spell - effect handled in core
 
     PHASE_GROUND                = 1,
     PHASE_AIR                   = 2,
@@ -114,8 +113,9 @@ struct MANGOS_DLL_DECL boss_savianaAI : public ScriptedAI
         switch (uiPointId)
         {
             case POINT_AIR:
-                if (DoCastSpellIfCan(m_creature, SPELL_CONFLAGRATION_TARGET) == CAST_OK)
+                if (DoCastSpellIfCan(m_creature, SPELL_CONFLAGRATION) == CAST_OK)
                 {
+                    DoScriptText(SAY_SPECIAL, m_creature);
                     m_uiPhaseSwitchTimer = 6000;
                     m_uiPhase = PHASE_AIR;
                 }
@@ -157,7 +157,7 @@ struct MANGOS_DLL_DECL boss_savianaAI : public ScriptedAI
                 {
                     if (DoCastSpellIfCan(m_creature, SPELL_ENRAGE) == CAST_OK)
                     {
-                        DoScriptText(SAY_SPECIAL, m_creature);
+                        DoScriptText(EMOTE_ENRAGE, m_creature);
                         m_uiEnrageTimer = urand(20000, 25000);
                     }
                 }

diff --git a/sd2_revision_nr.h b/sd2_revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __SD2_REVISION_NR_H__
 #define __SD2_REVISION_NR_H__
- #define SD2_REVISION_NR "2793"
+ #define SD2_REVISION_NR "2794"
 #endif // __SD2_REVISION_NR_H__