Core/Scripts: Cleanup and improve Fel Reaver script

Signed-off-by: click <clickvd@gonnamakeyou.com>

3 files changed, 128 insertions, 138 deletions

diff --git a/sql/scripts/world_script_texts.sql b/sql/scripts/world_script_texts.sql
index 1f4115039eb..39f9b04cf40 100644
--- a/sql/scripts/world_script_texts.sql
+++ b/sql/scripts/world_script_texts.sql
@@ -91,15 +91,6 @@ INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`
    (16295,-1000144,'Thank you for saving my life and bringing me back to safety, $N',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,0,'lilatha SAY_END1'),
    (16295,-1000145,'Captain Helios, I''ve been rescued from the Amani Catacombs. Reporting for duty, sir!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,0,'lilatha SAY_END2'),
    (16295,-1000146,'Liatha, get someone to look at those injuries. Thank you for bringing her back safely.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,0,'lilatha CAPTAIN_ANSWER'),
-   (20129,-1000159,'Do not proceed. You will be eliminated!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,11344,1,0,0,'doomwalker SAY_AGGRO'),
-   (20129,-1000160,'Tectonic disruption commencing.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,11345,1,0,0,'doomwalker SAY_EARTHQUAKE_1'),
-   (20129,-1000161,'Magnitude set. Release.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,11346,1,0,0,'doomwalker SAY_EARTHQUAKE_2'),
-   (20129,-1000162,'Trajectory locked.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,11347,1,0,0,'doomwalker SAY_OVERRUN_1'),
-   (20129,-1000163,'Engage maximum speed.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,11348,1,0,0,'doomwalker SAY_OVERRUN_2'),
-   (12429,-1000164,'Threat level zero.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,11349,1,0,0,'doomwalker SAY_SLAY_1'),
-   (12429,-1000165,'Directive accomplished.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,11350,1,0,0,'doomwalker SAY_SLAY_2'),
-   (12429,-1000166,'Target exterminated.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,11351,1,0,0,'doomwalker SAY_SLAY_3'),
-   (12429,-1000167,'System failure in five, f-o-u-r...',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,11352,1,0,0,'doomwalker SAY_DEATH'),
    (12429,-1000168,'Who dares awaken Aquementas?',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,'aquementas AGGRO_YELL_AQUE'),
    (12429,-1000169,'Muahahahaha! You fool! You''ve released me from my banishment in the interstices between space and time!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,'nether_drake SAY_NIHIL_1'),
    (12429,-1000170,'All of Draenor shall quick beneath my feet! I will destroy this world and reshape it in my image!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,'nether_drake SAY_NIHIL_2'),
diff --git a/sql/updates/world/2011_05_13_05_world_creature_text.sql b/sql/updates/world/2011_05_13_05_world_creature_text.sql
new file mode 100644
index 00000000000..d1cf27f7535
--- /dev/null
+++ b/sql/updates/world/2011_05_13_05_world_creature_text.sql
@@ -0,0 +1,12 @@
+DELETE FROM `script_texts` WHERE `npc_entry` IN (12429);
+DELETE FROM `creature_text` WHERE `entry`=18733;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`sound`,`comment`) VALUES
+(18733,0,0, 'Do not proceed. You will be eliminated!',1,11344,'doomwalker SAY_AGGRO'),
+(18733,1,0, 'Tectonic disruption commencing.',1,11345,'doomwalker SAY_EARTHQUAKE_1'),
+(18733,1,1, 'Magnitude set. Release.',1,11346,'doomwalker SAY_EARTHQUAKE_2'),
+(18733,2,0, 'Trajectory locked.',1,11347,'doomwalker SAY_OVERRUN_1'),
+(18733,2,1, 'Engage maximum speed.',1,11348,'doomwalker SAY_OVERRUN_2'),
+(18733,3,0, 'Threat level zero.',1,11349,'doomwalker SAY_SLAY_1'),
+(18733,3,1, 'Directive accomplished.',1,11350,'doomwalker SAY_SLAY_2'),
+(18733,3,2, 'Target exterminated.',1,11351,'doomwalker SAY_SLAY_3'),
+(18733,4,0, 'System failure in five, f-o-u-r...',1,11352,'doomwalker SAY_DEATH');
\ No newline at end of file
diff --git a/src/server/scripts/Outland/boss_doomwalker.cpp b/src/server/scripts/Outland/boss_doomwalker.cpp
index a794690f04e..28e267f1d4e 100644
--- a/src/server/scripts/Outland/boss_doomwalker.cpp
+++ b/src/server/scripts/Outland/boss_doomwalker.cpp
@@ -16,164 +16,151 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* ScriptData
-SDName: Boss_Doomwalker
-SD%Complete: 100
-SDComment:
-SDCategory: Shadowmoon Valley
-EndScriptData */
-
 #include "ScriptPCH.h"
 
-#define SAY_AGGRO                   -1000159
-#define SAY_EARTHQUAKE_1            -1000160
-#define SAY_EARTHQUAKE_2            -1000161
-#define SAY_OVERRUN_1               -1000162
-#define SAY_OVERRUN_2               -1000163
-#define SAY_SLAY_1                  -1000164
-#define SAY_SLAY_2                  -1000165
-#define SAY_SLAY_3                  -1000166
-#define SAY_DEATH                   -1000167
-
-#define SPELL_EARTHQUAKE            32686
-#define SPELL_SUNDER_ARMOR          33661
-#define SPELL_CHAIN_LIGHTNING       33665
-#define SPELL_OVERRUN               32636
-#define SPELL_ENRAGE                33653
-#define SPELL_MARK_DEATH            37128
-#define SPELL_AURA_DEATH            37131
-
-class boss_doomwalker : public CreatureScript
+enum Yells
 {
-public:
-    boss_doomwalker() : CreatureScript("boss_doomwalker") { }
-
-    CreatureAI* GetAI(Creature* pCreature) const
-    {
-        return new boss_doomwalkerAI (pCreature);
-    }
-
-    struct boss_doomwalkerAI : public ScriptedAI
-    {
-        boss_doomwalkerAI(Creature *c) : ScriptedAI(c) {}
-
-        uint32 Chain_Timer;
-        uint32 Enrage_Timer;
-        uint32 Overrun_Timer;
-        uint32 Quake_Timer;
-        uint32 Armor_Timer;
+    SAY_AGGRO       = 0,
+    SAY_EARTHQUAKE  = 1,
+    SAY_OVERRUN     = 2,
+    SAY_SLAY        = 3,
+    SAY_DEATH       = 4
+};
 
-        bool InEnrage;
+enum Spells
+{
+    SPELL_EARTHQUAKE        = 32686,
+    SPELL_SUNDER_ARMOR      = 33661,
+    SPELL_CHAIN_LIGHTNING   = 33665,
+    SPELL_OVERRUN           = 32636,
+    SPELL_ENRAGE            = 33653,
+    SPELL_MARK_DEATH        = 37128,
+    SPELL_AURA_DEATH        = 37131
+};
 
-        void Reset()
-        {
-            Enrage_Timer    = 0;
-            Armor_Timer     = 5000 + rand()%8000;
-            Chain_Timer     = 10000 + rand()%20000;
-            Quake_Timer     = 25000 + rand()%10000;
-            Overrun_Timer   = 30000 + rand()%15000;
+enum Events
+{
+    EVENT_ENRAGE    = 1,
+    EVENT_ARMOR     = 2,
+    EVENT_CHAIN     = 3,
+    EVENT_QUAKE     = 4,
+    EVENT_OVERRUN   = 5
+};
 
-            InEnrage = false;
-        }
+class boss_doomwalker : public CreatureScript
+{
+    public:
+        boss_doomwalker() : CreatureScript("boss_doomwalker") { }
 
-        void KilledUnit(Unit* Victim)
+        struct boss_doomwalkerAI : public ScriptedAI
         {
-            Victim->CastSpell(Victim, SPELL_MARK_DEATH, 0);
+            boss_doomwalkerAI(Creature* creature) : ScriptedAI(creature) 
+            {
+            }
 
-            if (rand()%5)
-                return;
+            void Reset()
+            {
+                _events.Reset();
+                _events.ScheduleEvent(EVENT_ENRAGE, 0);
+                _events.ScheduleEvent(EVENT_ARMOR, urand(5000, 13000));
+                _events.ScheduleEvent(EVENT_CHAIN, urand(10000, 30000));
+                _events.ScheduleEvent(EVENT_QUAKE, urand(25000, 35000));
+                _events.ScheduleEvent(EVENT_OVERRUN, urand(30000, 45000));
+                _inEnrage = false;
+            }
 
-            DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me);
-        }
+            void KilledUnit(Unit* victim)
+            {
+                victim->CastSpell(victim, SPELL_MARK_DEATH, 0);
 
-        void JustDied(Unit* /*Killer*/)
-        {
-            DoScriptText(SAY_DEATH, me);
-        }
+                if (urand(0, 4))
+                    return;
 
-        void EnterCombat(Unit * /*who*/)
-        {
-            DoScriptText(SAY_AGGRO, me);
-        }
+                Talk(SAY_SLAY);
+            }
 
-        void MoveInLineOfSight(Unit *who)
-        {
-            if (who && who->GetTypeId() == TYPEID_PLAYER && me->IsHostileTo(who))
+            void JustDied(Unit* /*Killer*/)
             {
-                if (who->HasAura(SPELL_MARK_DEATH, 0))
-                {
-                    who->CastSpell(who, SPELL_AURA_DEATH, 1);
-                }
+                Talk(SAY_DEATH);
             }
-        }
-
-        void UpdateAI(const uint32 diff)
-        {
-            if (!UpdateVictim())
-                return;
 
-            //Spell Enrage, when hp <= 20% gain enrage
-            if (!HealthAbovePct(20))
+            void EnterCombat(Unit* /*who*/)
             {
-                if (Enrage_Timer <= diff)
-                {
-                    DoCast(me, SPELL_ENRAGE);
-                    Enrage_Timer = 6000;
-                    InEnrage = true;
-                } else Enrage_Timer -= diff;
+                Talk(SAY_AGGRO);
             }
 
-            //Spell Overrun
-            if (Overrun_Timer <= diff)
+            void MoveInLineOfSight(Unit* who)
             {
-                DoScriptText(RAND(SAY_OVERRUN_1, SAY_OVERRUN_2), me);
-
-                DoCast(me->getVictim(), SPELL_OVERRUN);
-                Overrun_Timer = 25000 + rand()%15000;
-            } else Overrun_Timer -= diff;
+                if (who && who->GetTypeId() == TYPEID_PLAYER && me->IsHostileTo(who))
+                    if (who->HasAura(SPELL_MARK_DEATH, 0))
+                        who->CastSpell(who, SPELL_AURA_DEATH, 1);
+            }
 
-            //Spell Earthquake
-            if (Quake_Timer <= diff)
+            void UpdateAI(const uint32 diff)
             {
-                if (rand()%2)
+                if (!UpdateVictim())
                     return;
 
-                DoScriptText(RAND(SAY_EARTHQUAKE_1, SAY_EARTHQUAKE_2), me);
+                _events.Update(diff);
 
-                //remove enrage before casting earthquake because enrage + earthquake = 16000dmg over 8sec and all dead
-                if (InEnrage)
-                    me->RemoveAura(SPELL_ENRAGE);
-
-                DoCast(me, SPELL_EARTHQUAKE);
-                Quake_Timer = 30000 + rand()%25000;
-            } else Quake_Timer -= diff;
-
-            //Spell Chain Lightning
-            if (Chain_Timer <= diff)
-            {
-                Unit *pTarget = NULL;
-                pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1);
-
-                if (!pTarget)
-                    pTarget = me->getVictim();
-
-                if (pTarget)
-                    DoCast(pTarget, SPELL_CHAIN_LIGHTNING);
+                if (me->HasUnitState(UNIT_STAT_CASTING))
+                    return;
 
-                Chain_Timer = 7000 + rand()%20000;
-            } else Chain_Timer -= diff;
+                while(uint32 eventId = _events.ExecuteEvent())
+                {
+                    switch(eventId)
+                    {
+                        case EVENT_ENRAGE:
+                            if (!HealthAbovePct(20))
+                            {
+                                DoCast(me, SPELL_ENRAGE);
+                                _events.ScheduleEvent(EVENT_ENRAGE, 6000);
+                                _inEnrage = true;
+                            }
+                            break;
+                        case EVENT_OVERRUN:
+                            Talk(SAY_OVERRUN);
+                            DoCastVictim(SPELL_OVERRUN);
+                            _events.ScheduleEvent(EVENT_OVERRUN, urand(25000, 40000));
+                            break;
+                        case EVENT_QUAKE:
+                            if (urand(0, 1))
+                                return;
+
+                            Talk(SAY_EARTHQUAKE);
+
+                            //remove enrage before casting earthquake because enrage + earthquake = 16000dmg over 8sec and all dead
+                            if (_inEnrage)
+                                me->RemoveAurasDueToSpell(SPELL_ENRAGE);
+
+                            DoCast(me, SPELL_EARTHQUAKE);
+                            _events.ScheduleEvent(EVENT_QUAKE, urand(30000, 55000));
+                            break;
+                        case EVENT_CHAIN:
+                            if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true))
+                                DoCast(target, SPELL_CHAIN_LIGHTNING);
+                            _events.ScheduleEvent(EVENT_CHAIN, urand(7000, 27000));
+                            break;
+                        case EVENT_ARMOR:
+                            DoCastVictim(SPELL_SUNDER_ARMOR);
+                            _events.ScheduleEvent(EVENT_ARMOR, urand(10000, 25000));
+                            break;
+                        default:
+                            break;
+                    }
+                }
+                DoMeleeAttackIfReady();
+            }
 
-            //Spell Sunder Armor
-            if (Armor_Timer <= diff)
-            {
-                DoCast(me->getVictim(), SPELL_SUNDER_ARMOR);
-                Armor_Timer = 10000 + rand()%15000;
-            } else Armor_Timer -= diff;
+            private:
+                EventMap _events;
+                bool _inEnrage;
+        };
 
-            DoMeleeAttackIfReady();
+        CreatureAI* GetAI(Creature* creature) const
+        {
+            return new boss_doomwalkerAI (creature);
         }
-    };
-
 };
 
 void AddSC_boss_doomwalker()