Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4

1 files changed, 12 insertions, 3 deletions

diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp
index 4bbb4c1a5ed..b17c471c81b 100644
--- a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp
+++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp
@@ -34,9 +34,12 @@ enum Events
 
 enum Says
 {
-    SAY_AGGRO = 0,
-    SAY_ENRAGE = 1,
-    SAY_DEATH = 2
+    SAY_SPAWN           = 0,
+    SAY_AGGRO           = 1,
+    SAY_ENRAGE          = 2,
+    SAY_KILL            = 3,
+    SAY_DEATH           = 4,
+    SAY_SHIELD          = 5,
 };
 
 enum Spells
@@ -101,6 +104,11 @@ public:
             DoAction(ACTION_SET_NORMAL_EVENTS);
         }
 
+        void KilledUnit(Unit* /*victim*/)
+        {
+            Talk(SAY_KILL);
+        }
+
         void EnterCombat(Unit* /*who*/)
         {
             _EnterCombat();
@@ -176,6 +184,7 @@ public:
                 events.Reset();
                 _phase = (me->GetHealthPct() < 60.0f  && me->GetHealthPct() > 20.0f) ? PHASE_FIRST_PLANAR : PHASE_SECOND_PLANAR;
 
+                Talk(SAY_SHIELD);
                 DoCast(SPELL_PLANAR_SHIFT);
 
                 // not sure about the amount, and if we should despawn previous spawns (dragon trashs)