Sholazar Basin: Core support for quest Crocolisk Mastery: The Ambush .

--HG--
branch : trunk

3 files changed, 36 insertions, 0 deletions

diff --git a/sql/FULL/world_scripts_full.sql b/sql/FULL/world_scripts_full.sql
index 61cc29c2bd3..ac0797d568b 100644
--- a/sql/FULL/world_scripts_full.sql
+++ b/sql/FULL/world_scripts_full.sql
@@ -1001,6 +1001,7 @@ UPDATE `creature_template` SET `ScriptName`='npc_khadgar' WHERE `entry`=18166;
 UPDATE `creature_template` SET `ScriptName`='npc_injured_rainspeaker_oracle' WHERE `entry`=28217;
 UPDATE `creature_template` SET `ScriptName`='npc_vekjik' WHERE `entry`=28315;
 UPDATE `creature_template` SET `ScriptName`='npc_avatar_of_freya' WHERE `entry`=27801;
+UPDATE `creature_template` SET `ScriptName`='npc_bushwhacker' WHERE `entry`=28317;
 
 /* SILITHUS */
 UPDATE `creature_template` SET `ScriptName`='npcs_rutgar_and_frankal' WHERE `entry` IN (15170,15171);
diff --git a/sql/updates/6979_world_scriptnames.sql b/sql/updates/6979_world_scriptnames.sql
new file mode 100644
index 00000000000..c4fb669d47d
--- /dev/null
+++ b/sql/updates/6979_world_scriptnames.sql
@@ -0,0 +1,2 @@
+UPDATE `creature_template` SET `ScriptName`='npc_bushwhacker' WHERE `entry`=28317;
+
diff --git a/src/bindings/scripts/scripts/northrend/sholazar_basin.cpp b/src/bindings/scripts/scripts/northrend/sholazar_basin.cpp
index ec88aab38bc..adc6ff94e3e 100644
--- a/src/bindings/scripts/scripts/northrend/sholazar_basin.cpp
+++ b/src/bindings/scripts/scripts/northrend/sholazar_basin.cpp
@@ -265,6 +265,39 @@ bool GossipSelect_npc_avatar_of_freya(Player* pPlayer, Creature* pCreature, uint
     return true;
 }
 
+/*######
+## npc_geezle
+######*/
+
+struct TRINITY_DLL_DECL npc_bushwhackerAI : public ScriptedAI
+{
+    npc_bushwhackerAI(Creature* pCreature) : ScriptedAI(pCreature)
+    {
+        MoveToSummoner();
+    }
+
+    void MoveToSummoner()
+    {
+        if (m_creature->isSummon())
+            if (Unit* pSummoner = CAST_SUM(m_creature)->GetSummoner())
+                if (pSummoner)
+                    m_creature->GetMotionMaster()->MovePoint(0,pSummoner->GetPositionX(),pSummoner->GetPositionY(),pSummoner->GetPositionZ());
+    }
+
+    void UpdateAI(const uint32 uiDiff)
+    {
+        if (!UpdateVictim())
+            return;
+
+        DoMeleeAttackIfReady();
+    }
+};
+
+CreatureAI* GetAI_npc_bushwhacker(Creature* pCreature)
+{
+    return new npc_bushwhackerAI(pCreature);
+}
+
 void AddSC_sholazar_basin()
 {
     Script *newscript;