*Cleanup in The Endless Hunger script. - by Drethek.

--HG--
branch : trunk

2 files changed, 39 insertions, 65 deletions

diff --git a/src/bindings/scripts/scripts/zone/eastern_plaguelands/the_scarlet_enclave.cpp b/src/bindings/scripts/scripts/zone/eastern_plaguelands/the_scarlet_enclave.cpp
index 213e92f762d..1ae91c8983b 100644
--- a/src/bindings/scripts/scripts/zone/eastern_plaguelands/the_scarlet_enclave.cpp
+++ b/src/bindings/scripts/scripts/zone/eastern_plaguelands/the_scarlet_enclave.cpp
@@ -484,6 +484,7 @@ CreatureAI* GetAI_npc_a_special_surprise(Creature* pCreature)
 
 #define SPELL_SOUL_PRISON_CHAIN_SELF    54612
 #define SPELL_SOUL_PRISON_CHAIN         54613
+#define SPELL_DK_INITIATE_VISUAL        51519
 
 #define SPELL_ICY_TOUCH                 52372
 #define SPELL_PLAGUE_STRIKE             52373
@@ -541,54 +542,6 @@ enum initiate_phase
     Attacking
 };
 
-float modelid_dk_armor[20] =
-{
-    25432, // bloodelf female
-    25422, // bloodelf male
-    25412, // draenei female
-    25420, // draenei male
-    25406, // dwarf female
-    25414, // dwarf male
-    25438, // forsaken female
-    25426, // forsaken male
-    25408, // gnome female
-    25426, // gnome male
-    25404, // human female
-    25375, // human male
-    25410, // nightelf female
-    25418, // nightelf male
-    25436, // orc female
-    25424, // orc male
-    25440, // tauren female
-    25430, // tauren male
-    25434, // troll female
-    25428  // troll male
-};
-
-float modelid_dk_unworthy[20] =
-{
-    25369, // bloodelf female
-    25373, // bloodelf male
-    25363, // draenei female
-    25357, // draenei male
-    25361, // dwarf female
-    25356, // dwarf male
-    25372, // forsaken female
-    25367, // forsaken male
-    25362, // gnome female
-    25359, // gnome male
-    25355, // human female
-    25354, // human male
-    25360, // nightelf female
-    25358, // nightelf male
-    25368, // orc female
-    25364, // orc male
-    25371, // tauren female
-    25366, // tauren male
-    25370, // troll female
-    25365  // troll male
-};
-
 struct TRINITY_DLL_DECL npc_unworthy_initiateAI : public ScriptedAI
 {
     npc_unworthy_initiateAI(Creature *c) : ScriptedAI(c)
@@ -637,22 +590,6 @@ struct TRINITY_DLL_DECL npc_unworthy_initiateAI : public ScriptedAI
                 CAST_PLR(killer)->KilledMonsterCredit(29519,m_creature->GetGUID());
     }
 
-    void AddEquipp()
-    {
-        int model_counter = 0;
-        for(uint8 i = 0; i< 20; i++)
-        {
-            if(m_creature->GetDisplayId() == modelid_dk_unworthy[i])
-            {
-                model_counter = i;
-                break;
-            }
-        }
-
-        m_creature->SetDisplayId(modelid_dk_armor[model_counter]);
-        m_creature->LoadEquipment(m_creature->GetEquipmentId());
-    }
-
     void MovementInform(uint32 type, uint32 id)
     {
         if(type != POINT_MOTION_TYPE)
@@ -661,7 +598,7 @@ struct TRINITY_DLL_DECL npc_unworthy_initiateAI : public ScriptedAI
         if(id == 1)
         {
             wait_timer = 5000;
-            AddEquipp();
+            m_creature->CastSpell(m_creature,SPELL_DK_INITIATE_VISUAL,true);
 
             if(Unit* starter = Unit::GetUnit((*m_creature),event_starter))
                 DoScriptText(say_event_attack[rand()%9],m_creature,starter);
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index 1b13a6673db..e32673302af 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -5318,6 +5318,43 @@ void Spell::EffectScriptEffect(uint32 effIndex)
         {
             switch(m_spellInfo->Id)
             {
+                // Death Knight Initiate Visual
+                case 51519:
+                {
+                    if(!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT)
+                        return;
+
+                    uint32 iTmpSpellId = 0;
+                    switch (unitTarget->GetDisplayId())
+                    {
+                        case 25369: iTmpSpellId = 51552; break; // bloodelf female
+                        case 25373: iTmpSpellId = 51551; break; // bloodelf male
+                        case 25363: iTmpSpellId = 51542; break; // draenei female
+                        case 25357: iTmpSpellId = 51541; break; // draenei male
+                        case 25361: iTmpSpellId = 51537; break; // dwarf female
+                        case 25356: iTmpSpellId = 51538; break; // dwarf male
+                        case 25372: iTmpSpellId = 51550; break; // forsaken female
+                        case 25367: iTmpSpellId = 51549; break; // forsaken male
+                        case 25362: iTmpSpellId = 51540; break; // gnome female
+                        case 25359: iTmpSpellId = 51539; break; // gnome male
+                        case 25355: iTmpSpellId = 51534; break; // human female
+                        case 25354: iTmpSpellId = 51520; break; // human male
+                        case 25360: iTmpSpellId = 51536; break; // nightelf female
+                        case 25358: iTmpSpellId = 51535; break; // nightelf male
+                        case 25368: iTmpSpellId = 51544; break; // orc female
+                        case 25364: iTmpSpellId = 51543; break; // orc male
+                        case 25371: iTmpSpellId = 51548; break; // tauren female
+                        case 25366: iTmpSpellId = 51547; break; // tauren male
+                        case 25370: iTmpSpellId = 51545; break; // troll female
+                        case 25365: iTmpSpellId = 51546; break; // troll male
+                        default: return;
+                    }
+
+                    unitTarget->CastSpell(unitTarget, iTmpSpellId, true);
+                    Creature* npc = (Creature*)unitTarget;
+                    npc->LoadEquipment(npc->GetEquipmentId());
+                    return;
+                }
                 // Dreaming Glory
                 case 28698:
                 {