[8190] Update killing quest objectives base at creature_template KillCredit fields. Author: GriffonHeart

    Note: for avoid double counting must be removed C++ scripts and EventAI scripts that do same thing in old way.

    Signed-off-by: VladimirMangos <vladimir@getmangos.com>

    Also implement KillCreditN field check at loading.

--HG--
branch : trunk

14 files changed, 22 insertions, 22 deletions

diff --git a/src/bindings/scripts/scripts/zone/alterac_mountains/alterac_mountains.cpp b/src/bindings/scripts/scripts/zone/alterac_mountains/alterac_mountains.cpp
index 128583163ae..46be478f939 100644
--- a/src/bindings/scripts/scripts/zone/alterac_mountains/alterac_mountains.cpp
+++ b/src/bindings/scripts/scripts/zone/alterac_mountains/alterac_mountains.cpp
@@ -41,7 +41,7 @@ struct TRINITY_DLL_DECL npc_ravenholdtAI : public ScriptedAI
     {
         if( who->GetTypeId() == TYPEID_PLAYER )
             if( CAST_PLR(who)->GetQuestStatus(6681) == QUEST_STATUS_INCOMPLETE )
-                CAST_PLR(who)->KilledMonster(m_creature->GetEntry(),m_creature->GetGUID() );
+                CAST_PLR(who)->KilledMonsterCredit(m_creature->GetEntry(),m_creature->GetGUID() );
     }
 
     void EnterCombat(Unit* who) { }
diff --git a/src/bindings/scripts/scripts/zone/barrens/the_barrens.cpp b/src/bindings/scripts/scripts/zone/barrens/the_barrens.cpp
index b13881a02ee..986f4a78f21 100644
--- a/src/bindings/scripts/scripts/zone/barrens/the_barrens.cpp
+++ b/src/bindings/scripts/scripts/zone/barrens/the_barrens.cpp
@@ -52,7 +52,7 @@ bool GossipSelect_npc_beaten_corpse(Player *player, Creature *_Creature, uint32
     if(action == GOSSIP_ACTION_INFO_DEF +1)
     {
         player->SEND_GOSSIP_MENU(3558, _Creature->GetGUID());
-        player->KilledMonster( 10668,_Creature->GetGUID() );
+        player->KilledMonsterCredit( 10668,_Creature->GetGUID() );
     }
     return true;
 }
diff --git a/src/bindings/scripts/scripts/zone/blades_edge_mountains/blades_edge_mountains.cpp b/src/bindings/scripts/scripts/zone/blades_edge_mountains/blades_edge_mountains.cpp
index dc38bb3268a..9cf6d18b26f 100644
--- a/src/bindings/scripts/scripts/zone/blades_edge_mountains/blades_edge_mountains.cpp
+++ b/src/bindings/scripts/scripts/zone/blades_edge_mountains/blades_edge_mountains.cpp
@@ -61,7 +61,7 @@ struct TRINITY_DLL_DECL mobs_bladespire_ogreAI : public ScriptedAI
     void JustDied(Unit* Killer)
     {
         if (Killer->GetTypeId() == TYPEID_PLAYER)
-            CAST_PLR(Killer)->KilledMonster(19995, m_creature->GetGUID());
+            CAST_PLR(Killer)->KilledMonsterCredit(19995, m_creature->GetGUID());
     }
 };
 CreatureAI* GetAI_mobs_bladespire_ogre(Creature *_Creature)
@@ -261,7 +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)->KilledMonster(21511, m_creature->GetGUID());
+                CAST_PLR(who)->KilledMonsterCredit(21511, m_creature->GetGUID());
                 CAST_PLR(who)->RemoveAurasDueToSpell(36904);
             }
         }
diff --git a/src/bindings/scripts/scripts/zone/bloodmyst_isle/bloodmyst_isle.cpp b/src/bindings/scripts/scripts/zone/bloodmyst_isle/bloodmyst_isle.cpp
index 34fc8e02057..42104776d6c 100644
--- a/src/bindings/scripts/scripts/zone/bloodmyst_isle/bloodmyst_isle.cpp
+++ b/src/bindings/scripts/scripts/zone/bloodmyst_isle/bloodmyst_isle.cpp
@@ -56,7 +56,7 @@ struct TRINITY_DLL_DECL mob_webbed_creatureAI : public ScriptedAI
             case 0:
                 spawnCreatureID = 17681;
                 if (Killer->GetTypeId() == TYPEID_PLAYER)
-                    CAST_PLR(Killer)->KilledMonster(spawnCreatureID, m_creature->GetGUID());
+                    CAST_PLR(Killer)->KilledMonsterCredit(spawnCreatureID, m_creature->GetGUID());
                 break;
             case 1:
             case 2:
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp
index dc9946e468a..04490cf13a8 100644
--- a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp
+++ b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp
@@ -89,7 +89,7 @@ struct TRINITY_DLL_DECL instance_old_hillsbrad : public ScriptedInstance
                     player->SendUpdateWorldState(WORLD_STATE_OH,mBarrelCount);
 
                     if (mBarrelCount == 5)
-                        player->KilledMonster(LODGE_QUEST_TRIGGER,0);
+                        player->KilledMonsterCredit(LODGE_QUEST_TRIGGER,0);
                 }
             }
         }else
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp
index 9f7ba1ca7f6..80542b9a1db 100644
--- a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp
+++ b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp
@@ -347,7 +347,7 @@ struct TRINITY_DLL_DECL npc_thrall_old_hillsbradAI : public npc_escortAI
                         for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
                         {
                             if (Player* pPlayer = itr->getSource())
-                                pPlayer->KilledMonster(20156,m_creature->GetGUID());
+                                pPlayer->KilledMonsterCredit(20156,m_creature->GetGUID());
                         }
                     }
 
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 9b6610deb43..213e92f762d 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
@@ -634,7 +634,7 @@ struct TRINITY_DLL_DECL npc_unworthy_initiateAI : public ScriptedAI
     {
         if(m_creature->GetEntry() !=  29519)
             if(killer->GetTypeId() == TYPEID_PLAYER)
-                CAST_PLR(killer)->KilledMonster(29519,m_creature->GetGUID());
+                CAST_PLR(killer)->KilledMonsterCredit(29519,m_creature->GetGUID());
     }
 
     void AddEquipp()
@@ -1166,7 +1166,7 @@ struct TRINITY_DLL_DECL npc_dkc1_gothikAI : public ScriptedAI
                 {
                     if(CAST_PLR(owner)->GetQuestStatus(12698) == QUEST_STATUS_INCOMPLETE)
                     {
-                        CAST_PLR(owner)->KilledMonster(28845, me->GetGUID());
+                        CAST_PLR(owner)->KilledMonsterCredit(28845, me->GetGUID());
                         who->setDeathState(DEAD);
                     }
                 }
diff --git a/src/bindings/scripts/scripts/zone/isle_of_queldanas/isle_of_queldanas.cpp b/src/bindings/scripts/scripts/zone/isle_of_queldanas/isle_of_queldanas.cpp
index 1a79bead96c..d1c90c709d0 100644
--- a/src/bindings/scripts/scripts/zone/isle_of_queldanas/isle_of_queldanas.cpp
+++ b/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)->KilledMonster(25086, m_creature->GetGUID());
+                    CAST_PLR(plr)->KilledMonsterCredit(25086, m_creature->GetGUID());
             }
             DoCast(m_creature, ENRAGE);
             Unit* Myrmidon = me->FindNearestCreature(DM, 70);
diff --git a/src/bindings/scripts/scripts/zone/nagrand/nagrand.cpp b/src/bindings/scripts/scripts/zone/nagrand/nagrand.cpp
index d90c8b1d817..a89c0c3325a 100644
--- a/src/bindings/scripts/scripts/zone/nagrand/nagrand.cpp
+++ b/src/bindings/scripts/scripts/zone/nagrand/nagrand.cpp
@@ -547,7 +547,7 @@ struct TRINITY_DLL_DECL npc_creditmarker_visit_with_ancestorsAI : public Scripte
                 {
                     // 18840: Sunspring, 18841: Laughing, 18842: Garadar, 18843: Bleeding
                     if(!CAST_PLR(who)->GetReqKillOrCastCurrentCount(10085, creditMarkerId))
-                        CAST_PLR(who)->KilledMonster(creditMarkerId, m_creature->GetGUID());
+                        CAST_PLR(who)->KilledMonsterCredit(creditMarkerId, m_creature->GetGUID());
                 }
             }
         }
diff --git a/src/bindings/scripts/scripts/zone/netherstorm/netherstorm.cpp b/src/bindings/scripts/scripts/zone/netherstorm/netherstorm.cpp
index 500e1251fce..1a8a41649e0 100644
--- a/src/bindings/scripts/scripts/zone/netherstorm/netherstorm.cpp
+++ b/src/bindings/scripts/scripts/zone/netherstorm/netherstorm.cpp
@@ -255,7 +255,7 @@ struct TRINITY_DLL_DECL npc_manaforge_control_consoleAI : public ScriptedAI
                     {
                         Unit* u = Unit::GetUnit((*m_creature),someplayer);
                         if( u && u->GetTypeId() == TYPEID_PLAYER )
-                            CAST_PLR(u)->KilledMonster(m_creature->GetEntry(),m_creature->GetGUID());
+                            CAST_PLR(u)->KilledMonsterCredit(m_creature->GetEntry(),m_creature->GetGUID());
                         DoCast(m_creature,SPELL_DISABLE_VISUAL);
                     }
                     if( goConsole )
diff --git a/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp b/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp
index ca40ff16322..251d6f0441a 100644
--- a/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp
+++ b/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp
@@ -139,7 +139,7 @@ struct TRINITY_DLL_DECL mob_mature_netherwing_drakeAI : public ScriptedAI
                     DoScriptText(SAY_JUST_EATEN, m_creature);
 
                     if (Player* pPlr = Unit::GetPlayer(uiPlayerGUID))
-                        pPlr->KilledMonster(NPC_EVENT_PINGER, m_creature->GetGUID());
+                        pPlr->KilledMonsterCredit(NPC_EVENT_PINGER, m_creature->GetGUID());
 
                     Reset();
                     m_creature->GetMotionMaster()->Clear();
@@ -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->KilledMonster(22316, m_creature->GetGUID());
+                        plr->KilledMonsterCredit(22316, m_creature->GetGUID());
                         /*
                         float x,y,z;
                         m_creature->GetPosition(x,y,z);
@@ -366,7 +366,7 @@ struct TRINITY_DLL_DECL mob_dragonmaw_peonAI : public ScriptedAI
             {
                 Player* plr = Unit::GetPlayer(PlayerGUID);
                 if(plr && plr->GetQuestStatus(11020) == QUEST_STATUS_INCOMPLETE)
-                    plr->KilledMonster(23209, m_creature->GetGUID());
+                    plr->KilledMonsterCredit(23209, m_creature->GetGUID());
             }
             PoisonTimer = 0;
             m_creature->DealDamage(m_creature, m_creature->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
@@ -1681,13 +1681,13 @@ CreatureAI* GetAI_mob_torloth_the_magnificent(Creature* c)
 #define ENTRY_ENRAGED_AIRY_SOUL 21116
 #define ENTRY_ENRAGED_WATERY_SOUL 21109  // wrong model
 
-/* SPELL KILLCREDIT - not working!?! - using KilledMonster */
+/* SPELL KILLCREDIT - not working!?! - using KilledMonsterCredit */
 #define SPELL_EARTHEN_SOUL_CAPTURED_CREDIT 36108
 #define SPELL_FIERY_SOUL_CAPTURED_CREDIT 36117
 #define SPELL_AIRY_SOUL_CAPTURED_CREDIT 36182
 #define SPELL_WATERY_SOUL_CAPTURED_CREDIT 36171
 
-/* KilledMonster Workaround */
+/* KilledMonsterCredit Workaround */
 #define CREDIT_FIRE 21094
 #define CREDIT_WATER 21095
 #define CREDIT_AIR 21096
@@ -1758,7 +1758,7 @@ struct TRINITY_DLL_DECL npc_enraged_spiritAI : public ScriptedAI
                  Unit* Owner = totemOspirits->GetOwner();
                  if (Owner && Owner->GetTypeId() == TYPEID_PLAYER)
                      // DoCast(Owner, credit); -- not working!
-                     CAST_PLR(Owner)->KilledMonster(credit, Summoned->GetGUID());
+                     CAST_PLR(Owner)->KilledMonsterCredit(credit, Summoned->GetGUID());
                  DoCast(totemOspirits,SPELL_SOUL_CAPTURED);
              }
         }
diff --git a/src/bindings/scripts/scripts/zone/silithus/silithus.cpp b/src/bindings/scripts/scripts/zone/silithus/silithus.cpp
index b05fa68bbf6..e748f39eab9 100644
--- a/src/bindings/scripts/scripts/zone/silithus/silithus.cpp
+++ b/src/bindings/scripts/scripts/zone/silithus/silithus.cpp
@@ -168,7 +168,7 @@ bool GossipSelect_npcs_rutgar_and_frankal(Player *player, Creature *_Creature, u
         case GOSSIP_ACTION_INFO_DEF + 6:
             player->SEND_GOSSIP_MENU(7761, _Creature->GetGUID());
                                                             //'kill' our trigger to update quest status
-            player->KilledMonster( TRIGGER_RUTGAR, _Creature->GetGUID() );
+            player->KilledMonsterCredit( TRIGGER_RUTGAR, _Creature->GetGUID() );
             break;
 
         case GOSSIP_ACTION_INFO_DEF + 9:
@@ -194,7 +194,7 @@ bool GossipSelect_npcs_rutgar_and_frankal(Player *player, Creature *_Creature, u
         case GOSSIP_ACTION_INFO_DEF + 14:
             player->SEND_GOSSIP_MENU(7767, _Creature->GetGUID());
                                                             //'kill' our trigger to update quest status
-            player->KilledMonster( TRIGGER_FRANKAL, _Creature->GetGUID() );
+            player->KilledMonsterCredit( TRIGGER_FRANKAL, _Creature->GetGUID() );
             break;
     }
     return true;
diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_order_of_silver_hand.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_order_of_silver_hand.cpp
index 4405a50461b..4d6dc2a6b06 100644
--- a/src/bindings/scripts/scripts/zone/stratholme/boss_order_of_silver_hand.cpp
+++ b/src/bindings/scripts/scripts/zone/stratholme/boss_order_of_silver_hand.cpp
@@ -108,7 +108,7 @@ struct TRINITY_DLL_DECL boss_silver_hand_bossesAI : public ScriptedAI
                     break;
             }
             if(pInstance->GetData(TYPE_SH_QUEST) && Killer->GetTypeId() == TYPEID_PLAYER)
-                CAST_PLR(Killer)->KilledMonster(SH_QUEST_CREDIT,m_creature->GetGUID());
+                CAST_PLR(Killer)->KilledMonsterCredit(SH_QUEST_CREDIT,m_creature->GetGUID());
         }
     }
 
diff --git a/src/bindings/scripts/scripts/zone/terokkar_forest/terokkar_forest.cpp b/src/bindings/scripts/scripts/zone/terokkar_forest/terokkar_forest.cpp
index e70c060b6ac..4fb92eac739 100644
--- a/src/bindings/scripts/scripts/zone/terokkar_forest/terokkar_forest.cpp
+++ b/src/bindings/scripts/scripts/zone/terokkar_forest/terokkar_forest.cpp
@@ -220,7 +220,7 @@ struct TRINITY_DLL_DECL mob_netherweb_victimAI : public ScriptedAI
                 if( rand()%100 < 25 )
                 {
                     DoSpawnCreature(QUEST_TARGET,0,0,0,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,60000);
-                    CAST_PLR(Killer)->KilledMonster(QUEST_TARGET, m_creature->GetGUID());
+                    CAST_PLR(Killer)->KilledMonsterCredit(QUEST_TARGET, m_creature->GetGUID());
                 }else
                 DoSpawnCreature(netherwebVictims[rand()%6],0,0,0,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,60000);