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

Conflicts:
	src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp
	src/server/scripts/Northrend/zone_dalaran.cpp
	src/server/shared/Cryptography/Authentication/WorldPacketCrypt.cpp

3 files changed, 193 insertions, 95 deletions

diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp
index f415eeacc78..d4dc5efb6d5 100644
--- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp
@@ -17,6 +17,7 @@
 
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
+#include "SpellAuras.h"
 #include "SpellScript.h"
 #include "ahnkahet.h"
 
@@ -31,14 +32,16 @@ enum Yells
 
 enum Spells
 {
+    // Elder Nadox
     SPELL_BROOD_PLAGUE          = 56130,
     H_SPELL_BROOD_RAGE          = 59465,
     SPELL_ENRAGE                = 26662, // Enraged if too far away from home
     SPELL_SUMMON_SWARMERS       = 56119, // 2x 30178  -- 2x every 10secs
-    SPELL_SUMMON_SWARM_GUARD    = 56120, // 1x 30176  -- every 25%
-    // Spells Adds
-    SPELL_SPRINT                = 56354,
-    SPELL_GUARDIAN_AURA         = 56151
+    SPELL_SUMMON_SWARM_GUARD    = 56120, // 1x 30176
+
+    // Adds
+    SPELL_SWARM_BUFF            = 56281,
+    SPELL_SPRINT                = 56354
 };
 
 enum Events
@@ -63,7 +66,7 @@ class boss_elder_nadox : public CreatureScript
             void Reset() override
             {
                 _Reset();
-                AmountHealthModifier = 1;
+                GuardianSummoned = false;
                 GuardianDied = false;
             }
 
@@ -128,6 +131,7 @@ class boss_elder_nadox : public CreatureScript
                             events.ScheduleEvent(EVENT_RAGE, urand(10 * IN_MILLISECONDS, 50 * IN_MILLISECONDS));
                             break;
                         case EVENT_SUMMON_SWARMER:
+                            /// @todo: summoned by egg
                             DoCast(me, SPELL_SUMMON_SWARMERS);
                             if (urand(1, 3) == 3) // 33% chance of dialog
                                 Talk(SAY_EGG_SAC);
@@ -145,19 +149,20 @@ class boss_elder_nadox : public CreatureScript
                     }
                 }
 
-                if (me->HealthBelowPct(100 - AmountHealthModifier* 25))
+                if (!GuardianSummoned && me->HealthBelowPct(50))
                 {
+                    /// @todo: summoned by egg
                     Talk(EMOTE_HATCHES, me);
                     DoCast(me, SPELL_SUMMON_SWARM_GUARD);
-                    ++AmountHealthModifier;
+                    GuardianSummoned = true;
                 }
 
                 DoMeleeAttackIfReady();
             }
 
         private:
+            bool GuardianSummoned;
             bool GuardianDied;
-            uint8 AmountHealthModifier;
         };
 
         CreatureAI* GetAI(Creature* creature) const override
@@ -175,20 +180,10 @@ class npc_ahnkahar_nerubian : public CreatureScript
         {
             npc_ahnkahar_nerubianAI(Creature* creature) : ScriptedAI(creature) { }
 
-            EventMap events;
-
             void Reset() override
             {
-                if (me->GetEntry() == NPC_AHNKAHAR_GUARDIAN)
-                    DoCast(me, SPELL_GUARDIAN_AURA, true);
-
-                events.ScheduleEvent(EVENT_SPRINT, 13 * IN_MILLISECONDS);
-            }
-
-            void JustDied(Unit* /*killer*/) override
-            {
-                if (me->GetEntry() == NPC_AHNKAHAR_GUARDIAN)
-                    me->RemoveAurasDueToSpell(SPELL_GUARDIAN_AURA);
+                _events.Reset();
+                _events.ScheduleEvent(EVENT_SPRINT, 13 * IN_MILLISECONDS);
             }
 
             void UpdateAI(uint32 diff) override
@@ -196,23 +191,27 @@ class npc_ahnkahar_nerubian : public CreatureScript
                 if (!UpdateVictim())
                     return;
 
-                events.Update(diff);
+                _events.Update(diff);
 
                 if (me->HasUnitState(UNIT_STATE_CASTING))
                     return;
 
-                while (uint32 eventId = events.ExecuteEvent())
+                while (uint32 eventId = _events.ExecuteEvent())
                 {
                     switch (eventId)
                     {
-                    case EVENT_SPRINT:
-                        DoCast(me, SPELL_SPRINT);
-                        events.ScheduleEvent(EVENT_SPRINT, 20 * IN_MILLISECONDS);
-                        break;
+                        case EVENT_SPRINT:
+                            DoCast(me, SPELL_SPRINT);
+                            _events.ScheduleEvent(EVENT_SPRINT, 20 * IN_MILLISECONDS);
+                            break;
                     }
                 }
+
                 DoMeleeAttackIfReady();
             }
+
+        private:
+            EventMap _events;
         };
 
         CreatureAI* GetAI(Creature* creature) const override
@@ -221,95 +220,81 @@ class npc_ahnkahar_nerubian : public CreatureScript
         }
 };
 
-//HACK: No, AI. Replace with proper db content?
-class npc_nadox_eggs : public CreatureScript
+// 56159 - Swarm
+class spell_ahn_kahet_swarm : public SpellScriptLoader
 {
-public:
-    npc_nadox_eggs() : CreatureScript("npc_nadox_eggs") { }
+    public:
+        spell_ahn_kahet_swarm() : SpellScriptLoader("spell_ahn_kahet_swarm") { }
 
-    struct npc_nadox_eggsAI : public ScriptedAI
-    {
-        npc_nadox_eggsAI(Creature* creature) : ScriptedAI(creature)
+        class spell_ahn_kahet_swarm_SpellScript : public SpellScript
         {
-            creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE);
-        }
+            PrepareSpellScript(spell_ahn_kahet_swarm_SpellScript);
 
-        void Reset() override { }
-        void EnterCombat(Unit* /*who*/) override { }
-        void AttackStart(Unit* /*victim*/) override { }
-        void MoveInLineOfSight(Unit* /*who*/) override { }
-
-        void UpdateAI(uint32 /*diff*/) override { }
-    };
+            bool Validate(SpellInfo const* /*spellInfo*/) override
+            {
+                if (!sSpellMgr->GetSpellInfo(SPELL_SWARM_BUFF))
+                    return false;
+                return true;
+            }
 
-    CreatureAI* GetAI(Creature* creature) const override
-    {
-        return new npc_nadox_eggsAI(creature);
-    }
-};
+            bool Load() override
+            {
+                _targetCount = 0;
+                return true;
+            }
 
-class GuardianCheck
-{
-public:
-    bool operator()(const WorldObject* target) const
-    {
-        if (target->GetEntry() == NPC_AHNKAHAR_GUARDIAN)
-            return true;
-
-        return false;
-    }
-};
+            void CountTargets(std::list<WorldObject*>& targets)
+            {
+                _targetCount = targets.size();
+            }
 
-class spell_elder_nadox_guardian : public SpellScriptLoader
-{
-public:
-    spell_elder_nadox_guardian() : SpellScriptLoader("spell_elder_nadox_guardian") { }
+            void HandleDummy(SpellEffIndex /*effIndex*/)
+            {
+                if (_targetCount)
+                {
+                    if (Aura* aura = GetCaster()->GetAura(SPELL_SWARM_BUFF))
+                    {
+                        aura->SetStackAmount(_targetCount);
+                        aura->RefreshDuration();
+                    }
+                    else
+                        GetCaster()->CastCustomSpell(SPELL_SWARM_BUFF, SPELLVALUE_AURA_STACK, _targetCount, GetCaster(), TRIGGERED_FULL_MASK);
+                }
+                else
+                    GetCaster()->RemoveAurasDueToSpell(SPELL_SWARM_BUFF);
+            }
 
-    class spell_elder_nadox_guardian_SpellScript : public SpellScript
-    {
-        PrepareSpellScript(spell_elder_nadox_guardian_SpellScript);
+            void Register() override
+            {
+                OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_ahn_kahet_swarm_SpellScript::CountTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY);
+                OnEffectHit += SpellEffectFn(spell_ahn_kahet_swarm_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
+            }
 
-        void FilterTargets(std::list<WorldObject*>& targets)
-        {
-            targets.remove_if (GuardianCheck());
-        }
+        private:
+            uint32 _targetCount;
+        };
 
-        void Register() override
+        SpellScript* GetSpellScript() const override
         {
-            OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_elder_nadox_guardian_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY);
-            OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_elder_nadox_guardian_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ALLY);
+            return new spell_ahn_kahet_swarm_SpellScript();
         }
-    };
-
-    SpellScript* GetSpellScript() const override
-    {
-        return new spell_elder_nadox_guardian_SpellScript();
-    }
 };
 
 class achievement_respect_your_elders : public AchievementCriteriaScript
 {
-public:
-    achievement_respect_your_elders() : AchievementCriteriaScript("achievement_respect_your_elders") { }
-
-    bool OnCheck(Player* /*player*/, Unit* target) override
-    {
-        if (!target)
-            return false;
-
-        if (Creature* Nadox = target->ToCreature())
-            if (Nadox->AI()->GetData(DATA_RESPECT_YOUR_ELDERS))
-                return true;
+    public:
+        achievement_respect_your_elders() : AchievementCriteriaScript("achievement_respect_your_elders") { }
 
-        return false;
-    }
+        bool OnCheck(Player* /*player*/, Unit* target) override
+        {
+            return target && target->GetAI()->GetData(DATA_RESPECT_YOUR_ELDERS);
+        }
 };
 
 void AddSC_boss_elder_nadox()
 {
     new boss_elder_nadox();
     new npc_ahnkahar_nerubian();
-    new npc_nadox_eggs();
-    new spell_elder_nadox_guardian();
+    new spell_ahn_kahet_swarm();
     new achievement_respect_your_elders();
 }
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
index 022c43f4395..d0ad42d38e1 100644
--- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
@@ -961,9 +961,11 @@ class npc_jaina_or_sylvanas_escape_hor : public CreatureScript
 
                             if (Creature* lichking = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_THE_LICH_KING_ESCAPE)))
                             {
+                                me->CastSpell(lichking, SPELL_TAUNT_ARTHAS, true);
+                                lichking->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_TAUNT, true);
+                                lichking->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_ATTACK_ME, true);
                                 AttackStart(lichking);
                                 lichking->AI()->AttackStart(me);
-                                me->CastSpell(lichking, SPELL_TAUNT_ARTHAS, true);
                             }
                             me->SetHealth(JAINA_SYLVANAS_MAX_HEALTH);
                             me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP | UNIT_NPC_FLAG_QUESTGIVER);
diff --git a/src/server/scripts/Northrend/zone_dalaran.cpp b/src/server/scripts/Northrend/zone_dalaran.cpp
index 2d5028bac05..0897131eaf8 100644
--- a/src/server/scripts/Northrend/zone_dalaran.cpp
+++ b/src/server/scripts/Northrend/zone_dalaran.cpp
@@ -128,7 +128,118 @@ public:
     }
 };
 
+enum MinigobData
+{
+    ZONE_DALARAN            = 4395,
+
+    SPELL_MANABONKED        = 61834,
+    SPELL_TELEPORT_VISUAL   = 51347,
+    SPELL_IMPROVED_BLINK    = 61995,
+
+    EVENT_SELECT_TARGET     = 1,
+    EVENT_BLINK             = 2,
+    EVENT_DESPAWN_VISUAL    = 3,
+    EVENT_DESPAWN           = 4,
+
+    MAIL_MINIGOB_ENTRY      = 264,
+    MAIL_DELIVER_DELAY_MIN  = 5*MINUTE,
+    MAIL_DELIVER_DELAY_MAX  = 15*MINUTE
+};
+
+class npc_minigob_manabonk : public CreatureScript
+{
+    public:
+        npc_minigob_manabonk() : CreatureScript("npc_minigob_manabonk") {}
+
+        struct npc_minigob_manabonkAI : public ScriptedAI
+        {
+            npc_minigob_manabonkAI(Creature* creature) : ScriptedAI(creature)
+            {
+                me->setActive(true);
+            }
+
+            void Reset()
+            {
+                me->SetVisible(false);
+                events.ScheduleEvent(EVENT_SELECT_TARGET, IN_MILLISECONDS);
+            }
+
+            Player* SelectTargetInDalaran()
+            {
+                std::list<Player*> PlayerInDalaranList;
+                PlayerInDalaranList.clear();
+
+                Map::PlayerList const &players = me->GetMap()->GetPlayers();
+                for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
+                    if (Player* player = itr->GetSource()->ToPlayer())
+                        if (player->GetZoneId() == ZONE_DALARAN && !player->IsFlying() && !player->IsMounted() && !player->IsGameMaster())
+                            PlayerInDalaranList.push_back(player);
+
+                if (PlayerInDalaranList.empty())
+                    return NULL;
+                return Trinity::Containers::SelectRandomContainerElement(PlayerInDalaranList);
+            }
+
+            void SendMailToPlayer(Player* player)
+            {
+                SQLTransaction trans = CharacterDatabase.BeginTransaction();
+                int16 deliverDelay = irand(MAIL_DELIVER_DELAY_MIN, MAIL_DELIVER_DELAY_MAX);
+                MailDraft(MAIL_MINIGOB_ENTRY, true).SendMailTo(trans, MailReceiver(player), MailSender(MAIL_CREATURE, me->GetEntry()), MAIL_CHECK_MASK_NONE, deliverDelay);
+                CharacterDatabase.CommitTransaction(trans);
+            }
+
+            void UpdateAI(uint32 diff)
+            {
+                events.Update(diff);
+
+                while (uint32 eventId = events.ExecuteEvent())
+                {
+                    switch (eventId)
+                    {
+                        case EVENT_SELECT_TARGET:
+                            me->SetVisible(true);
+                            DoCast(me, SPELL_TELEPORT_VISUAL);
+                            if (Player* player = SelectTargetInDalaran())
+                            {
+                                me->NearTeleportTo(player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), 0.0f);
+                                DoCast(player, SPELL_MANABONKED);
+                                SendMailToPlayer(player);
+                            }
+                            events.ScheduleEvent(EVENT_BLINK, 3*IN_MILLISECONDS);
+                            break;
+                        case EVENT_BLINK:
+                        {
+                            DoCast(me, SPELL_IMPROVED_BLINK);
+                            Position pos = me->GetRandomNearPosition(frand(15, 40));
+                            me->GetMotionMaster()->MovePoint(0, pos.m_positionX, pos.m_positionY, pos.m_positionZ);
+                            events.ScheduleEvent(EVENT_DESPAWN, 3 * IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_DESPAWN_VISUAL, 2.5*IN_MILLISECONDS);
+                            break;
+                        }
+                        case EVENT_DESPAWN_VISUAL:
+                            DoCast(me, SPELL_TELEPORT_VISUAL);
+                            break;
+                        case EVENT_DESPAWN:
+                            me->DespawnOrUnsummon();
+                            break;
+                        default:
+                            break;
+                    }
+                }
+            }
+
+        private:
+            EventMap events;
+    };
+
+    CreatureAI* GetAI(Creature* creature) const
+    {
+        return new npc_minigob_manabonkAI(creature);
+    }
+};
+
 void AddSC_dalaran()
 {
-    new npc_mageguard_dalaran;
+    new npc_mageguard_dalaran();
+    new npc_minigob_manabonk();
 }