Scripts/Pet: Baby Blizzard Bear & Egbert (#24349)

* Baby Blizzard Bear & Egbert

* SQL

* Update 9999_99_99_99_world.sql

SQL fix

* Rename 9999_99_99_99_world.sql to 2020_04_04_00_world.sql

Co-authored-by: Eridium <6587064+Killyana@users.noreply.github.com>
Co-authored-by: Giacomo Pozzoni <giacomopoz@gmail.com>
(cherry picked from commit 264a5839032257f9d65bfad3dd0075d263799d5c)

1 files changed, 0 insertions, 136 deletions

diff --git a/src/server/scripts/Pet/pet_generic.cpp b/src/server/scripts/Pet/pet_generic.cpp
index 0e5dfbca573..7aeb18a9787 100644
--- a/src/server/scripts/Pet/pet_generic.cpp
+++ b/src/server/scripts/Pet/pet_generic.cpp
@@ -21,15 +21,11 @@
  */
 
  /* ContentData
- npc_pet_gen_baby_blizzard_bear     100%    Baby Blizzard Bear sits down occasionally
- npc_pet_gen_egbert                 100%    Egbert run's around
  npc_pet_gen_pandaren_monk          100%    Pandaren Monk drinks and bows with you
  npc_pet_gen_mojo                   100%    Mojo follows you when you kiss it
  EndContentData */
 
 #include "ScriptMgr.h"
-#include "DB2Structure.h"
-#include "Map.h"
 #include "MotionMaster.h"
 #include "ObjectAccessor.h"
 #include "PassiveAI.h"
@@ -37,136 +33,6 @@
 #include "Player.h"
 #include "ScriptedCreature.h"
 
-enum BabyBlizzardBearMisc
-{
-    SPELL_BBB_PET_SIT = 61853,
-    EVENT_BBB_PET_SIT = 1,
-    EVENT_BBB_PET_SIT_INTER = 2
-};
-
-class npc_pet_gen_baby_blizzard_bear : public CreatureScript
-{
-public:
-    npc_pet_gen_baby_blizzard_bear() : CreatureScript("npc_pet_gen_baby_blizzard_bear") {}
-
-    struct npc_pet_gen_baby_blizzard_bearAI : public NullCreatureAI
-    {
-        npc_pet_gen_baby_blizzard_bearAI(Creature* creature) : NullCreatureAI(creature)
-        {
-            if (Unit* owner = me->GetCharmerOrOwner())
-                me->GetMotionMaster()->MoveFollow(owner, PET_FOLLOW_DIST, me->GetFollowAngle());
-            _events.ScheduleEvent(EVENT_BBB_PET_SIT, urandms(10, 30));
-        }
-
-        void UpdateAI(uint32 diff) override
-        {
-            _events.Update(diff);
-
-            if (Unit* owner = me->GetCharmerOrOwner())
-                if (!me->IsWithinDist(owner, 25.f))
-                    me->InterruptSpell(CURRENT_CHANNELED_SPELL);
-
-            while (uint32 eventId = _events.ExecuteEvent())
-            {
-                switch (eventId)
-                {
-                case EVENT_BBB_PET_SIT:
-                    me->CastSpell(me, SPELL_BBB_PET_SIT, false);
-                    _events.ScheduleEvent(EVENT_BBB_PET_SIT_INTER, urandms(15, 30));
-                    break;
-                case EVENT_BBB_PET_SIT_INTER:
-                    me->InterruptSpell(CURRENT_CHANNELED_SPELL);
-                    _events.ScheduleEvent(EVENT_BBB_PET_SIT, urandms(10, 30));
-                    break;
-                default:
-                    break;
-                }
-            }
-        }
-
-    private:
-        EventMap _events;
-    };
-
-    CreatureAI* GetAI(Creature* creature) const
-    {
-        return new npc_pet_gen_baby_blizzard_bearAI(creature);
-    }
-};
-
-enum EgbertMisc
-{
-    SPELL_EGBERT = 40669,
-    EVENT_RETURN = 3
-};
-
-class npc_pet_gen_egbert : public CreatureScript
-{
-public:
-    npc_pet_gen_egbert() : CreatureScript("npc_pet_gen_egbert") {}
-
-    struct npc_pet_gen_egbertAI : public NullCreatureAI
-    {
-        npc_pet_gen_egbertAI(Creature* creature) : NullCreatureAI(creature)
-        {
-            if (Unit* owner = me->GetCharmerOrOwner())
-                if (owner->GetMap()->GetEntry()->ExpansionID > 1)
-                    me->SetCanFly(true);
-        }
-
-        void Reset() override
-        {
-            _events.Reset();
-            if (Unit* owner = me->GetCharmerOrOwner())
-                me->GetMotionMaster()->MoveFollow(owner, PET_FOLLOW_DIST, me->GetFollowAngle());
-        }
-
-        void EnterEvadeMode(EvadeReason why) override
-        {
-            if (!_EnterEvadeMode(why))
-                return;
-
-            Reset();
-        }
-
-        void UpdateAI(uint32 diff) override
-        {
-            _events.Update(diff);
-
-            if (Unit* owner = me->GetCharmerOrOwner())
-            {
-                if (!me->IsWithinDist(owner, 40.f))
-                {
-                    me->RemoveAura(SPELL_EGBERT);
-                    me->GetMotionMaster()->MoveFollow(owner, PET_FOLLOW_DIST, me->GetFollowAngle());
-                }
-            }
-
-            if (me->HasAura(SPELL_EGBERT))
-                _events.ScheduleEvent(EVENT_RETURN, urandms(5, 20));
-
-            while (uint32 eventId = _events.ExecuteEvent())
-            {
-                switch (eventId)
-                {
-                case EVENT_RETURN:
-                    me->RemoveAura(SPELL_EGBERT);
-                    break;
-                default:
-                    break;
-                }
-            }
-        }
-    private:
-        EventMap _events;
-    };
-
-    CreatureAI* GetAI(Creature* creature) const
-    {
-        return new npc_pet_gen_egbertAI(creature);
-    }
-};
-
 enum PandarenMonkMisc
 {
     SPELL_PANDAREN_MONK = 69800,
@@ -351,8 +217,6 @@ struct npc_pet_gen_soul_trader : public ScriptedAI
 
 void AddSC_generic_pet_scripts()
 {
-    new npc_pet_gen_baby_blizzard_bear();
-    new npc_pet_gen_egbert();
     new npc_pet_gen_pandaren_monk();
     new npc_pet_gen_mojo();
     RegisterCreatureAI(npc_pet_gen_soul_trader);