merge

--HG--
branch : trunk

3 files changed, 30 insertions, 1 deletions

diff --git a/sql/FULL/world_scripts_full.sql b/sql/FULL/world_scripts_full.sql
index 1974aaac240..7f2667b88ef 100644
--- a/sql/FULL/world_scripts_full.sql
+++ b/sql/FULL/world_scripts_full.sql
@@ -102,6 +102,7 @@ UPDATE `creature_template` SET `ScriptName`='npc_salanar_the_horseman' WHERE `en
 UPDATE `creature_template` SET `ScriptName`='npc_dark_rider_of_acherus' WHERE `entry` =28654;
 UPDATE `creature_template` SET `ScriptName`='npc_ros_dark_rider' WHERE `entry`=28768;
 UPDATE `creature_template` SET `ScriptName`='npc_dkc1_gothik' WHERE `entry`=28658;
+UPDATE `creature_template` SET `ScriptName`='npc_scarlet_ghoul' WHERE `entry`=28845;
 UPDATE `creature_template` SET `ScriptName`='npc_a_special_surprise' WHERE `entry` IN (29032,29061,29065,29067,29068,29070,29074,29072,29073,29071);
 UPDATE `creature_template` SET `ScriptName`='npc_koltira_deathweaver' WHERE `entry`=28912;
 UPDATE `creature_template` SET `ScriptName`='mob_high_inquisitor_valroth' WHERE `entry`=29001;
diff --git a/sql/updates/5582_world_scripts_dk.sql b/sql/updates/5582_world_scripts_dk.sql
new file mode 100644
index 00000000000..84336ba266f
--- /dev/null
+++ b/sql/updates/5582_world_scripts_dk.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `ScriptName`='npc_scarlet_ghoul' WHERE `entry`=28845;
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp
index 4fea246e50a..b2fa7fc85fc 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp
@@ -688,7 +688,8 @@ struct TRINITY_DLL_DECL npc_dkc1_gothikAI : public ScriptedAI
                 {
                     if (CAST_PLR(owner)->GetQuestStatus(12698) == QUEST_STATUS_INCOMPLETE)
                     {
-                        CAST_CRE(who)->CastSpell(owner, 52517, true);
+                        //CAST_CRE(who)->CastSpell(owner, 52517, true);
+                        CAST_PLR(owner)->KilledMonsterCredit(28845, me->GetGUID());
                         CAST_CRE(who)->ForcedDespawn();
 
                         if (CAST_PLR(owner)->GetQuestStatus(12698) == QUEST_STATUS_COMPLETE)
@@ -705,6 +706,27 @@ CreatureAI* GetAI_npc_dkc1_gothik(Creature* pCreature)
     return new npc_dkc1_gothikAI(pCreature);
 }
 
+struct TRINITY_DLL_DECL npc_scarlet_ghoulAI : public ScriptedAI
+{
+    npc_scarlet_ghoulAI(Creature *c) : ScriptedAI(c) {}
+
+    void MoveInLineOfSight(Unit *target)
+    {
+        EnterEvadeMode();
+        return;
+    }
+    void Aggro(Unit *who)
+    {
+        EnterEvadeMode();
+        return;
+    }
+};
+
+CreatureAI* GetAI_npc_scarlet_ghoul(Creature* pCreature)
+{
+    return new npc_scarlet_ghoulAI(pCreature);
+}
+
 /*####
 ## npc_scarlet_miner_cart
 ####*/
@@ -961,6 +983,11 @@ void AddSC_the_scarlet_enclave_c1()
     newscript->GetAI = &GetAI_npc_dkc1_gothik;
     newscript->RegisterSelf();
 
+    newscript = new Script;
+    newscript->Name="npc_scarlet_ghoul";
+    newscript->GetAI = &GetAI_npc_scarlet_ghoul;
+    newscript->RegisterSelf();
+
     // Massacre At Light's Point
     newscript = new Script;
     newscript->Name="npc_scarlet_miner";