Functions Clean Up - by Drethek

--HG--
branch : trunk

src/bindings/scripts/scripts/zone/blades_edge_mountains/blades_edge_mountains.cpp

@@ -261,8 +261,7 @@ struct TRINITY_DLL_DECL npc_daranelleAI : public ScriptedAI
             {
                 DoScriptText(SAY_SPELL_INFLUENCE, m_creature, who);
                 //TODO: Move the below to updateAI and run if this statement == true
-                CAST_PLR(who)->KilledMonsterCredit(21511, m_creature->GetGUID());
+                DoCast(who,37028,true);
-                CAST_PLR(who)->RemoveAurasDueToSpell(36904);
             }
         }
 

src/bindings/scripts/scripts/zone/eastern_plaguelands/the_scarlet_enclave.cpp

@@ -1103,7 +1103,7 @@ struct TRINITY_DLL_DECL npc_dkc1_gothikAI : public ScriptedAI
                 {
                     if(CAST_PLR(owner)->GetQuestStatus(12698) == QUEST_STATUS_INCOMPLETE)
                     {
-                        CAST_PLR(owner)->KilledMonsterCredit(28845, me->GetGUID());
+                        DoCast(owner, 52517, true);
                         who->setDeathState(DEAD);
                     }
                 }

src/bindings/scripts/scripts/zone/isle_of_queldanas/isle_of_queldanas.cpp

@@ -114,7 +114,7 @@ struct TRINITY_DLL_DECL npc_greengill_slaveAI : public ScriptedAI
             {
                 Unit* plr = Unit::GetUnit((*m_creature), PlayerGUID);
                 if(plr && CAST_PLR(plr)->GetQuestStatus(QUESTG) == QUEST_STATUS_INCOMPLETE)
-                    CAST_PLR(plr)->KilledMonsterCredit(25086, m_creature->GetGUID());
+                    DoCast(plr, 45110, true);
             }
             DoCast(m_creature, ENRAGE);
             Unit* Myrmidon = me->FindNearestCreature(DM, 70);

src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp

@@ -269,7 +269,7 @@ struct TRINITY_DLL_DECL mob_enslaved_netherwing_drakeAI : public ScriptedAI
                     Player* plr = Unit::GetPlayer(PlayerGUID);
                     if(plr && plr->GetQuestStatus(10854) == QUEST_STATUS_INCOMPLETE)
                     {
-                        plr->KilledMonsterCredit(22316, m_creature->GetGUID());
+                        DoCast(plr, SPELL_FORCE_OF_NELTHARAKU, true);
                         /*
                         float x,y,z;
                         m_creature->GetPosition(x,y,z);

src/game/SpellEffects.cpp

@@ -4563,6 +4563,14 @@ void Spell::EffectScriptEffect(uint32 effIndex)
         {
             switch(m_spellInfo->Id)
             {
+                // Dispelling Analysis
+                case 37028:
+                {
+                    if (unitTarget->HasAura(36904))
+                        unitTarget->RemoveAurasDueToSpell(36904);
+
+                    return;
+                }
                 case 45204: // Clone Me!
                 case 41055: // Copy Weapon
                 case 45206: // Copy Off-hand Weapon