Merge pull request #14303 from danlapps/3.3.5

remove king jotum vehicule of code as per Killyana request

1 files changed, 0 insertions, 92 deletions

diff --git a/src/server/scripts/Northrend/zone_storm_peaks.cpp b/src/server/scripts/Northrend/zone_storm_peaks.cpp
index bfdea4a1435..bb1e88ce158 100644
--- a/src/server/scripts/Northrend/zone_storm_peaks.cpp
+++ b/src/server/scripts/Northrend/zone_storm_peaks.cpp
@@ -641,97 +641,6 @@ enum JokkumScriptcast
     EVENT_KROLMIR_9                  = 24,
 };
 
-class npc_king_jokkum_vehicle : public CreatureScript
-{
-public:
-    npc_king_jokkum_vehicle() : CreatureScript("npc_king_jokkum_vehicle") { }
-
-    struct npc_king_jokkum_vehicleAI : public VehicleAI
-    {
-        npc_king_jokkum_vehicleAI(Creature* creature) : VehicleAI(creature)
-        {
-            pathEnd = false;
-        }
-
-        void Reset() override
-        {
-            playerGUID.Clear();
-            pathEnd    = false;
-        }
-
-        void OnCharmed(bool /*apply*/) override { }
-
-        void PassengerBoarded(Unit* who, int8 /*seat*/, bool apply) override
-        {
-            if (apply)
-            {
-                playerGUID = who->GetGUID();
-                Talk(SAY_HOLD_ON, who);
-                me->CastSpell(who, SPELL_JOKKUM_KILL_CREDIT, true);
-                me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_NPC);
-                me->GetMotionMaster()->MovePath(PATH_JOKKUM, false);
-            }
-        }
-
-        void MovementInform(uint32 type, uint32 id) override
-        {
-            if (type != WAYPOINT_MOTION_TYPE)
-                return;
-
-            if (pathEnd)
-            {
-                if (id == 4)
-                {
-
-                }
-            }
-            else
-            {
-                if (id == 19)
-                {
-                    pathEnd = true;
-                    me->SetFacingTo(0.418879f);
-                    Talk(SAY_JOKKUM_1);
-                    if (Player* player = ObjectAccessor::GetPlayer(*me, playerGUID))
-                        me->CastSpell(player, SPELL_PLAYER_CAST_VERANUS_SUMMON);
-                    me->CastSpell(me, SPELL_EJECT_ALL_PASSENGERS);
-
-                }
-            }
-        }
-
-        void UpdateAI(uint32 diff) override
-        {
-            if (!pathEnd)
-                return;
-
-            events.Update(diff);
-
-            while (uint32 eventId = events.ExecuteEvent())
-            {
-                switch (eventId)
-                {
-                    case EVENT_KROLMIR_1:
-                        Talk(SAY_JOKKUM_2);
-                        events.ScheduleEvent(EVENT_KROLMIR_2, 4000);
-                        break;
-                }
-            }
-        }
-
-    private:
-        EventMap events;
-        ObjectGuid playerGUID;
-        bool pathEnd;
-
-    };
-
-    CreatureAI* GetAI(Creature* creature) const override
-    {
-        return new npc_king_jokkum_vehicleAI(creature);
-    }
-};
-
 class spell_jokkum_scriptcast : public SpellScriptLoader
 {
     public: spell_jokkum_scriptcast() : SpellScriptLoader("spell_jokkum_scriptcast") { }
@@ -855,7 +764,6 @@ void AddSC_storm_peaks()
     new npc_icefang();
     new npc_hyldsmeet_protodrake();
     new npc_brann_bronzebeard_keystone();
-    new npc_king_jokkum_vehicle();
     new spell_jokkum_scriptcast();
     new spell_veranus_summon();
     new spell_close_rift();