Merge pull request #11165 from untaught/master

Fix quest ... Or Maybe We Don't (12138) and remove the core script

1 files changed, 0 insertions, 82 deletions

diff --git a/src/server/scripts/Northrend/zone_grizzly_hills.cpp b/src/server/scripts/Northrend/zone_grizzly_hills.cpp
index 6bf791417ab..9ea3023de01 100644
--- a/src/server/scripts/Northrend/zone_grizzly_hills.cpp
+++ b/src/server/scripts/Northrend/zone_grizzly_hills.cpp
@@ -508,87 +508,6 @@ public:
     }
 };
 
-/*Lightning Sentry - if you kill it when you have your Minion with you, you will get a quest credit*/
-enum Sentry
-{
-    //Creature
-    NPC_LIGHTNING_SENTRY                   = 26407,
-    NPC_WAR_GOLEM                          = 27017,
-    // Quest
-    QUEST_OR_MAYBE_WE_DONT_A               = 12138,
-    QUEST_OR_MAYBE_WE_DONT_H               = 12198,
-    // Spell
-    SPELL_CHARGED_SENTRY_TOTEM             = 52703,
-    SPELL_WAR_GOLEM_CHARGE_CREDIT          = 47797,
-};
-
-enum SentryEvents
-{
-    EVENT_SENTRY                           = 1
-};
-
-class npc_lightning_sentry : public CreatureScript
-{
-public:
-    npc_lightning_sentry() : CreatureScript("npc_lightning_sentry") { }
-
-    struct npc_lightning_sentryAI : public ScriptedAI
-    {
-        npc_lightning_sentryAI(Creature* creature) : ScriptedAI(creature) { }
-
-        void Reset() OVERRIDE
-        {
-            _events.ScheduleEvent(EVENT_SENTRY, urand(10000, 12000));
-        }
-
-        void UpdateAI(uint32 diff) OVERRIDE
-        {
-            if (!UpdateVictim())
-                return;
-
-            _events.Update(diff);
-
-            while (uint32 eventId = _events.ExecuteEvent())
-            {
-                switch (eventId)
-                {
-                    case EVENT_SENTRY:
-                        DoCast(SPELL_CHARGED_SENTRY_TOTEM);
-                        _events.ScheduleEvent(EVENT_SENTRY, urand(10000, 12000));
-                        break;
-                    default:
-                        break;
-                }
-            }
-
-            if (!UpdateVictim())
-                return;
-
-            DoMeleeAttackIfReady();
-        }
-
-        void JustDied(Unit* killer) OVERRIDE
-        {
-            if (killer->ToPlayer() && killer->ToPlayer()->GetTypeId() == TYPEID_PLAYER)
-            {
-                if (me->FindNearestCreature(NPC_WAR_GOLEM, 10.0f, true))
-                {
-                    if (killer->ToPlayer()->GetQuestStatus(QUEST_OR_MAYBE_WE_DONT_A) == QUEST_STATUS_INCOMPLETE ||
-                        killer->ToPlayer()->GetQuestStatus(QUEST_OR_MAYBE_WE_DONT_H) == QUEST_STATUS_INCOMPLETE)
-                        DoCast(killer, SPELL_WAR_GOLEM_CHARGE_CREDIT);
-                }
-            }
-        }
-        private:
-            EventMap _events;
-    };
-
-    CreatureAI* GetAI(Creature* creature) const OVERRIDE
-    {
-        return new npc_lightning_sentryAI(creature);
-    }
-};
-
 /*Venture co. Straggler - when you cast Smoke Bomb, he will yell and run away*/
 enum SmokeEmOut
 {
@@ -838,7 +757,6 @@ void AddSC_grizzly_hills()
     new npc_tallhorn_stag();
     new npc_amberpine_woodsman();
     new npc_wounded_skirmisher();
-    new npc_lightning_sentry();
     new npc_venture_co_straggler();
     new npc_lake_frog();
 }