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

Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Instances/InstanceScript.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/WorldSession.h
	src/server/scripts/Spells/spell_priest.cpp
	src/server/scripts/Spells/spell_rogue.cpp

6 files changed, 266 insertions, 65 deletions

diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp
index e72e6dff9cf..cfc35b676ea 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp
@@ -16,25 +16,59 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ObjectMgr.h"
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
+#include "Player.h"
 #include "ruins_of_ahnqiraj.h"
 
 enum Spells
 {
-    SPELL_STINGERSPRAY          =  25749,
-    SPELL_POISONSTINGER         =  25748, // Only used in phase 1
+    SPELL_STINGER_SPRAY         =  25749,
+    SPELL_POISON_STINGER        =  25748,
     SPELL_PARALYZE              =  25725,
     SPELL_TRASH                 =  3391,
-    SPELL_FRENZY                =  8269,  // Not used
+    SPELL_FRENZY                =  8269,
     SPELL_LASH                  =  25852,
-    SPELL_FEED                  =  25721,
+    SPELL_FEED                  =  25721
 };
 
-enum Says
+enum Events
 {
-    EMOTE_FRENZY                =  0 // Not used
+    EVENT_STINGER_SPRAY         = 0,
+    EVENT_POISON_STINGER        = 1,
+    EVENT_SUMMON_SWARMER        = 2,
+    EVENT_SWARMER_ATTACK        = 3,
+    EVENT_PARALYZE              = 4,
+    EVENT_LASH                  = 5,
+    EVENT_TRASH                 = 6
+};
+
+enum Emotes
+{
+    EMOTE_FRENZY                =  0
+};
+
+enum Phases
+{
+    PHASE_AIR                   = 0,
+    PHASE_GROUND                = 1
+};
+
+enum Points
+{
+    POINT_AIR                   = 0,
+    POINT_GROUND                = 1,
+    POINT_PARALYZE              = 2
+};
+
+const Position AyamissAirPos =  { -9689.292f, 1547.912f, 48.02729f, 0.0f };
+const Position AltarPos =       { -9717.18f, 1517.72f, 27.4677f, 0.0f };
+// TODO: These below are probably incorrect, taken from SD2
+const Position SwarmerPos =     { -9647.352f, 1578.062f, 55.32f, 0.0f };
+const Position LarvaPos[2] =
+{
+    { -9674.4707f, 1528.4133f, 22.457f, 0.0f },
+    { -9701.6005f, 1566.9993f, 24.118f, 0.0f }
 };
 
 class boss_ayamiss : public CreatureScript
@@ -42,27 +76,72 @@ class boss_ayamiss : public CreatureScript
     public:
         boss_ayamiss() : CreatureScript("boss_ayamiss") { }
 
-        struct boss_ayamissAI : public ScriptedAI
+        struct boss_ayamissAI : public BossAI
         {
-            boss_ayamissAI(Creature* creature) : ScriptedAI(creature)
+            boss_ayamissAI(Creature* creature) : BossAI(creature, DATA_AYAMISS)
             {
-                instance = creature->GetInstanceScript();
             }
 
-            uint32 STINGERSPRAY_Timer;
-            uint32 POISONSTINGER_Timer;
-            uint32 SUMMONSWARMER_Timer;
-            uint32 phase;
+            void Reset()
+            {
+                _Reset();
+                _phase = PHASE_AIR;
+                _enraged = false;
+                SetCombatMovement(false);
+            }
 
-            InstanceScript* instance;
+            void JustSummoned(Creature* who)
+            {
+                switch (who->GetEntry())
+                {
+                    case NPC_SWARMER:
+                        _swarmers.push_back(who->GetGUID());
+                        break;
+                    case NPC_LARVA:
+                        who->GetMotionMaster()->MovePoint(POINT_PARALYZE, AltarPos);
+                        break;
+                    case NPC_HORNET:
+                        if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM))
+                            who->AI()->AttackStart(target);
+                        break;
+                }
+            }
 
-            void Reset()
+            void MovementInform(uint32 type, uint32 id)
+            {
+                if (type == POINT_MOTION_TYPE)
+                {
+                    switch (id)
+                    {
+                        case POINT_AIR:
+                            me->AddUnitState(UNIT_STATE_ROOT);
+                            break;
+                        case POINT_GROUND:
+                            me->ClearUnitState(UNIT_STATE_ROOT);
+                            break;
+                    }
+                }
+            }
+
+            void EnterEvadeMode()
             {
-                STINGERSPRAY_Timer = 30000;
-                POISONSTINGER_Timer = 30000;
-                SUMMONSWARMER_Timer = 60000;
-                phase = 1;
+                me->ClearUnitState(UNIT_STATE_ROOT);
+                BossAI::EnterEvadeMode();
+            }
+
+            void EnterCombat(Unit* attacker)
+            {
+                BossAI::EnterCombat(attacker);
+
+                events.ScheduleEvent(EVENT_STINGER_SPRAY, urand(20000, 30000));
+                events.ScheduleEvent(EVENT_POISON_STINGER, 5000);
+                events.ScheduleEvent(EVENT_SUMMON_SWARMER, 5000);
+                events.ScheduleEvent(EVENT_SWARMER_ATTACK, 60000);
+                events.ScheduleEvent(EVENT_PARALYZE, 15000);
 
+                me->SetCanFly(true);
+                me->SetDisableGravity(true);
+                me->GetMotionMaster()->MovePoint(POINT_AIR, AyamissAirPos);
             }
 
             void UpdateAI(uint32 const diff)
@@ -70,37 +149,148 @@ class boss_ayamiss : public CreatureScript
                 if (!UpdateVictim())
                     return;
 
-                //If he is 70% start phase 2
-                if (phase == 1 && !HealthAbovePct(70) && !me->IsNonMeleeSpellCasted(false))
+                events.Update(diff);
+
+                if (_phase == PHASE_AIR && me->GetHealthPct() < 70.0f)
+                {
+                    _phase = PHASE_GROUND;
+                    SetCombatMovement(true);
+                    me->SetCanFly(false);
+                    Position VictimPos;
+                    me->getVictim()->GetPosition(&VictimPos);
+                    me->GetMotionMaster()->MovePoint(POINT_GROUND, VictimPos);
+                    DoResetThreat();
+                    events.ScheduleEvent(EVENT_LASH, urand(5000, 8000));
+                    events.ScheduleEvent(EVENT_TRASH, urand(3000, 6000));
+                    events.CancelEvent(EVENT_POISON_STINGER);
+                }
+                else
                 {
-                    phase=2;
+                    DoMeleeAttackIfReady();
                 }
 
-                //STINGERSPRAY_Timer (only in phase2)
-                if (phase == 2 && STINGERSPRAY_Timer <= diff)
+                if (!_enraged && me->GetHealthPct() < 20.0f)
                 {
-                    DoCast(me->getVictim(), SPELL_STINGERSPRAY);
-                    STINGERSPRAY_Timer = 30000;
-                } else STINGERSPRAY_Timer -= diff;
+                    DoCast(me, SPELL_FRENZY);
+                    Talk(EMOTE_FRENZY);
+                    _enraged = true;
+                }
 
-                //POISONSTINGER_Timer (only in phase1)
-                if (phase == 1 && POISONSTINGER_Timer <= diff)
+                while (uint32 eventId = events.ExecuteEvent())
                 {
-                    DoCast(me->getVictim(), SPELL_POISONSTINGER);
-                    POISONSTINGER_Timer = 30000;
-                } else POISONSTINGER_Timer -= diff;
+                    switch (eventId)
+                    {
+                        case EVENT_STINGER_SPRAY:
+                            DoCast(me, SPELL_STINGER_SPRAY);
+                            events.ScheduleEvent(EVENT_STINGER_SPRAY, urand(15000, 20000));
+                            break;
+                        case EVENT_POISON_STINGER:
+                            DoCastVictim(SPELL_POISON_STINGER);
+                            events.ScheduleEvent(EVENT_POISON_STINGER, urand(2000, 3000));
+                            break;
+                        case EVENT_PARALYZE:
+                            if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0, true))
+                            {
+                                DoCast(target, SPELL_PARALYZE);
+                                instance->SetData64(DATA_PARALYZED, target->GetGUID());
+                                uint8 Index = urand(0, 1);
+                                me->SummonCreature(NPC_LARVA, LarvaPos[Index], TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 30000);
+                            }
+                            events.ScheduleEvent(EVENT_PARALYZE, 15000);
+                            break;
+                        case EVENT_SWARMER_ATTACK:
+                            for (std::list<uint64>::iterator i = _swarmers.begin(); i != _swarmers.end(); ++i)
+                                if (Creature* swarmer = me->GetMap()->GetCreature(*i))
+                                    if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM))
+                                        swarmer->AI()->AttackStart(target);
+
+                            _swarmers.clear();
+                            events.ScheduleEvent(EVENT_SWARMER_ATTACK, 60000);
+                            break;
+                        case EVENT_SUMMON_SWARMER:
+                            Position Pos;
+                            me->GetRandomPoint(SwarmerPos, 80.0f, Pos);
+                            me->SummonCreature(NPC_SWARMER, Pos);
+                            events.ScheduleEvent(EVENT_SUMMON_SWARMER, 5000);
+                            break;
+                        case EVENT_TRASH:
+                            DoCastVictim(SPELL_TRASH);
+                            events.ScheduleEvent(EVENT_TRASH, urand(5000, 7000));
+                            break;
+                        case EVENT_LASH:
+                            DoCastVictim(SPELL_LASH);
+                            events.ScheduleEvent(EVENT_LASH, urand(8000, 15000));
+                            break;
+                    }
+                }
+            }
+        private:
+            std::list<uint64> _swarmers;
+            uint8 _phase;
+            bool _enraged;
+        };
+
+        CreatureAI* GetAI(Creature* creature) const
+        {
+            return new boss_ayamissAI(creature);
+        }
+};
+
+class npc_hive_zara_larva : public CreatureScript
+{
+    public:
+        npc_hive_zara_larva() : CreatureScript("npc_hive_zara_larva") { }
+
+        struct npc_hive_zara_larvaAI : public ScriptedAI
+        {
+            npc_hive_zara_larvaAI(Creature* creature) : ScriptedAI(creature)
+            {
+                _instance = me->GetInstanceScript();
+            }
+
+            void MovementInform(uint32 type, uint32 id)
+            {
+                if (type == POINT_MOTION_TYPE)
+                    if (id == POINT_PARALYZE)
+                        if (Player* target = ObjectAccessor::GetPlayer(*me, _instance->GetData64(DATA_PARALYZED)))
+                            DoCast(target, SPELL_FEED); // Omnomnom
+            }
+
+            void MoveInLineOfSight(Unit* who)
+            {
+                if (_instance->GetBossState(DATA_AYAMISS) == IN_PROGRESS)
+                    return;
+
+                ScriptedAI::MoveInLineOfSight(who);
+            }
+
+            void AttackStart(Unit* victim)
+            {
+                if (_instance->GetBossState(DATA_AYAMISS) == IN_PROGRESS)
+                    return;
+
+                ScriptedAI::AttackStart(victim);
+            }
+
+            void UpdateAI(uint32 const diff)
+            {
+                if (_instance->GetBossState(DATA_AYAMISS) == IN_PROGRESS)
+                    return;
 
-                DoMeleeAttackIfReady();
+                ScriptedAI::UpdateAI(diff);
             }
+        private:
+            InstanceScript* _instance;
         };
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new boss_ayamissAI (creature);
+            return new npc_hive_zara_larvaAI(creature);
         }
 };
 
 void AddSC_boss_ayamiss()
 {
     new boss_ayamiss();
+    new npc_hive_zara_larva();
 }
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
index e26cba9cb6e..285d893fe41 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
@@ -70,11 +70,11 @@ class boss_buru : public CreatureScript
             boss_buruAI(Creature* creature) : BossAI(creature, DATA_BURU)
             {
             }
-            
+
             void EnterEvadeMode()
             {
                 BossAI::EnterEvadeMode();
-                
+
                 for (std::list<uint64>::iterator i = Eggs.begin(); i != Eggs.end(); ++i)
                     if (Creature* egg = me->GetMap()->GetCreature(*Eggs.begin()))
                         egg->Respawn();
@@ -101,7 +101,7 @@ class boss_buru : public CreatureScript
                     if (_phase == PHASE_EGG)
                         me->DealDamage(me, 45000);
             }
-            
+
             void KilledUnit(Unit* victim)
             {
                 if (victim->GetTypeId() == TYPEID_PLAYER)
@@ -112,12 +112,12 @@ class boss_buru : public CreatureScript
             {
                 if (_phase != PHASE_EGG)
                     return;
-                
+
                 me->RemoveAurasDueToSpell(SPELL_FULL_SPEED);
                 me->RemoveAurasDueToSpell(SPELL_GATHERING_SPEED);
                 events.ScheduleEvent(EVENT_GATHERING_SPEED, 9000);
                 events.ScheduleEvent(EVENT_FULL_SPEED, 60000);
-                
+
                 if (Unit* victim = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true))
                 {
                     DoResetThreat();
@@ -125,21 +125,21 @@ class boss_buru : public CreatureScript
                     Talk(EMOTE_TARGET, victim->GetGUID());
                 }
             }
-            
+
             void ManageRespawn(uint64 EggGUID)
             {
                 ChaseNewVictim();
                 Eggs.push_back(EggGUID);
                 events.ScheduleEvent(EVENT_RESPAWN_EGG, 100000);
             }
-            
+
             void UpdateAI(uint32 const diff)
             {
                 if (!UpdateVictim())
                     return;
 
                 events.Update(diff);
-                
+
                 while (uint32 eventId = events.ExecuteEvent())
                 {
                     switch (eventId)
@@ -170,7 +170,7 @@ class boss_buru : public CreatureScript
                             break;
                     }
                 }
-                
+
                 if (me->GetHealthPct() < 20.0f && _phase == PHASE_EGG)
                 {
                     DoCast(me, SPELL_BURU_TRANSFORM); // Enrage
@@ -178,7 +178,7 @@ class boss_buru : public CreatureScript
                     me->RemoveAurasDueToSpell(SPELL_THORNS);
                     _phase = PHASE_TRANSFORM;
                 }
-                
+
                 DoMeleeAttackIfReady();
             }
         private:
@@ -203,14 +203,14 @@ class npc_buru_egg : public CreatureScript
             {
                 _instance = me->GetInstanceScript();
             }
-            
+
             void EnterCombat(Unit* attacker)
             {
                 if (Creature* buru = me->GetMap()->GetCreature(_instance->GetData64(DATA_BURU)))
                     if (!buru->isInCombat())
                         buru->AI()->AttackStart(attacker);
             }
-            
+
             void JustSummoned(Creature* who)
             {
                 if (who->GetEntry() == NPC_HATCHLING)
@@ -218,7 +218,7 @@ class npc_buru_egg : public CreatureScript
                         if (Unit* target = buru->AI()->SelectTarget(SELECT_TARGET_RANDOM))
                             who->AI()->AttackStart(target);
             }
-            
+
             void JustDied(Unit* /*killer*/)
             {
                 DoCastAOE(SPELL_EXPLODE, true);
@@ -247,13 +247,13 @@ class spell_egg_explosion : public SpellScriptLoader
         class spell_egg_explosion_SpellScript : public SpellScript
         {
             PrepareSpellScript(spell_egg_explosion_SpellScript);
-            
+
             void HandleAfterCast()
             {
                 if (Creature* buru = GetCaster()->FindNearestCreature(NPC_BURU, 5.f))
                     buru->AI()->DoAction(ACTION_EXPLODE);
             }
-            
+
             void HandleDummyHitTarget(SpellEffIndex /*effIndex*/)
             {
                 if (Unit* target = GetHitUnit())
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
index fcb6364244e..20c0dd035a4 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
@@ -89,7 +89,6 @@ class boss_ossirian : public CreatureScript
             boss_ossirianAI(Creature* creature) : BossAI(creature, DATA_OSSIRIAN)
             {
                 SaidIntro = false;
-                Reset();
             }
 
             uint64 TriggerGUID;
@@ -121,13 +120,9 @@ class boss_ossirian : public CreatureScript
             void DoAction(const int32 action)
             {
                 if (action == ACTION_TRIGGER_WEAKNESS)
-                {
                     if (Creature* Trigger = me->GetMap()->GetCreature(TriggerGUID))
-                    {
                         if (!Trigger->HasUnitState(UNIT_STATE_CASTING))
                             Trigger->CastSpell(Trigger, SpellWeakness[urand(0, 4)], false);
-                    }
-                }
             }
 
             void EnterCombat(Unit* /*who*/)
@@ -172,7 +167,7 @@ class boss_ossirian : public CreatureScript
             {
                 Cleanup();
                 summons.DespawnAll();
-                ScriptedAI::EnterEvadeMode();
+                BossAI::EnterEvadeMode();
             }
 
             void JustDied(Unit* /*killer*/)
@@ -207,13 +202,14 @@ class boss_ossirian : public CreatureScript
                 }
             }
 
-            void MoveInLineOfSight(Unit* /*who*/)
+            void MoveInLineOfSight(Unit* who)
             {
                 if (!SaidIntro)
                 {
                     Talk(SAY_INTRO);
                     SaidIntro = true;
                 }
+                BossAI::MoveInLineOfSight(who);
             }
 
             void UpdateAI(uint32 const diff)
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp
index 6dbeaed9e5d..658528f1fb4 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp
@@ -36,6 +36,7 @@ class instance_ruins_of_ahnqiraj : public InstanceMapScript
                 _buruGUID       = 0;
                 _ayamissGUID    = 0;
                 _ossirianGUID   = 0;
+                _paralyzedGUID  = 0;
             }
 
             void OnCreatureCreate(Creature* creature)
@@ -71,6 +72,12 @@ class instance_ruins_of_ahnqiraj : public InstanceMapScript
                 return true;
             }
 
+            void SetData64(uint32 type, uint64 data)
+            {
+                if (type == DATA_PARALYZED)
+                    _paralyzedGUID = data;
+            }
+
             uint64 GetData64(uint32 type) const
             {
                 switch (type)
@@ -87,6 +94,8 @@ class instance_ruins_of_ahnqiraj : public InstanceMapScript
                         return _ayamissGUID;
                     case DATA_OSSIRIAN:
                         return _ossirianGUID;
+                    case DATA_PARALYZED:
+                        return _paralyzedGUID;
                 }
 
                 return 0;
@@ -142,6 +151,7 @@ class instance_ruins_of_ahnqiraj : public InstanceMapScript
             uint64 _buruGUID;
             uint64 _ayamissGUID;
             uint64 _ossirianGUID;
+            uint64 _paralyzedGUID;
         };
 
         InstanceScript* GetInstanceScript(InstanceMap* map) const
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.h b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.h
index 6ece21f627b..419aaf1c303 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.h
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.h
@@ -26,7 +26,9 @@ enum DataTypes
     DATA_BURU               = 3,
     DATA_AYAMISS            = 4,
     DATA_OSSIRIAN           = 5,
-    NUM_ENCOUNTER           = 6
+    NUM_ENCOUNTER           = 6,
+
+    DATA_PARALYZED          = 7
 };
 
 enum Creatures
@@ -42,12 +44,15 @@ enum Creatures
     NPC_HIVEZARA_LARVA          = 15555,
     NPC_SAND_VORTEX             = 15428,
     NPC_OSSIRIAN_TRIGGER        = 15590,
-    NPC_HATCHLING               = 15521
+    NPC_HATCHLING               = 15521,
+    NPC_LARVA                   = 15555,
+    NPC_SWARMER                 = 15546,
+    NPC_HORNET                  = 15934
 };
 
 enum GameObjects
 {
-    GO_OSSIRIAN_CRYSTAL         = 180619,
+    GO_OSSIRIAN_CRYSTAL         = 180619
 };
 
 #endif
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
index 1186459218c..8030358a068 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
@@ -68,7 +68,7 @@ class boss_skeram : public CreatureScript
             {
                 Talk(SAY_SLAY);
             }
-            
+
             void EnterEvadeMode()
             {
                 ScriptedAI::EnterEvadeMode();
@@ -93,10 +93,10 @@ class boss_skeram : public CreatureScript
                     rand = urand(0, 2);
                 creature->CastSpell(creature, BlinkSpells[rand]);
                 _flag |= (1 << rand);
-                
+
                 if (_flag & (1 << 7))
                     _flag = 0;
-                
+
                 if (Unit* Target = SelectTarget(SELECT_TARGET_RANDOM))
                     creature->AI()->AttackStart(Target);
 
@@ -183,12 +183,12 @@ class boss_skeram : public CreatureScript
                     DoMeleeAttackIfReady();
                 }
             }
-        
+
         private:
             float _hpct;
             uint8 _flag;
         };
-    
+
     CreatureAI* GetAI(Creature* creature) const
     {
         return new boss_skeramAI(creature);