*Fixed factions for escort quests

--HG--
branch : trunk

9 files changed, 10 insertions, 6 deletions

diff --git a/src/bindings/scripts/scripts/zone/arathi_highlands/arathi_highlands.cpp b/src/bindings/scripts/scripts/zone/arathi_highlands/arathi_highlands.cpp
index ad43b63b5f3..7aff80c0d02 100644
--- a/src/bindings/scripts/scripts/zone/arathi_highlands/arathi_highlands.cpp
+++ b/src/bindings/scripts/scripts/zone/arathi_highlands/arathi_highlands.cpp
@@ -111,6 +111,7 @@ bool QuestAccept_npc_professor_phizzlethorpe(Player* player, Creature* creature,
     {
 		creature->Say(SAY_PROGRESS_1, LANG_UNIVERSAL, player->GetGUID());
         ((npc_escortAI*)(creature->AI()))->Start(false, false, false, player->GetGUID());
+		creature->setFaction(113);
     }
     return true;
 }
diff --git a/src/bindings/scripts/scripts/zone/ashenvale_forest/ashenvale.cpp b/src/bindings/scripts/scripts/zone/ashenvale_forest/ashenvale.cpp
index 49935651cb6..9ef0ca6a15d 100644
--- a/src/bindings/scripts/scripts/zone/ashenvale_forest/ashenvale.cpp
+++ b/src/bindings/scripts/scripts/zone/ashenvale_forest/ashenvale.cpp
@@ -140,6 +140,7 @@ bool QuestAccept_npc_torek(Player* player, Creature* creature, Quest const* ques
 		//TODO: find companions, make them follow Torek, at any time (possibly done by mangos/database in future?)
 		((npc_escortAI*)(creature->AI()))->Start(true, true, true, player->GetGUID());
 		DoScriptText(SAY_READY, creature, player);
+		creature->setFaction(113);
 	}
    
 	return true;
@@ -258,7 +259,7 @@ bool QuestAccept_npc_ruul_snowhoof(Player* player, Creature* creature, Quest con
 {
     if (quest->GetQuestId() == QUEST_FREEDOM_TO_RUUL)
     {
-        creature->setFaction(1603);
+        creature->setFaction(113);
         ((npc_escortAI*)(creature->AI()))->Start(true, true, false, player->GetGUID());
     }
     return true;
diff --git a/src/bindings/scripts/scripts/zone/azuremyst_isle/azuremyst_isle.cpp b/src/bindings/scripts/scripts/zone/azuremyst_isle/azuremyst_isle.cpp
index b4eefc43ce1..8e94e1adc18 100644
--- a/src/bindings/scripts/scripts/zone/azuremyst_isle/azuremyst_isle.cpp
+++ b/src/bindings/scripts/scripts/zone/azuremyst_isle/azuremyst_isle.cpp
@@ -385,7 +385,7 @@ bool QuestAccept_npc_magwin(Player* player, Creature* creature, Quest const* que
 {
 	if (quest->GetQuestId() == QUEST_A_CRY_FOR_HELP)
 	{
-		creature->setFaction(10);
+		creature->setFaction(113);
 		((npc_escortAI*)(creature->AI()))->Start(true, true, false, player->GetGUID());
 	}
 	return true;
diff --git a/src/bindings/scripts/scripts/zone/ghostlands/ghostlands.cpp b/src/bindings/scripts/scripts/zone/ghostlands/ghostlands.cpp
index 6350040cfe4..acef59df670 100644
--- a/src/bindings/scripts/scripts/zone/ghostlands/ghostlands.cpp
+++ b/src/bindings/scripts/scripts/zone/ghostlands/ghostlands.cpp
@@ -237,7 +237,7 @@ bool QuestAccept_npc_ranger_lilatha(Player* player, Creature* creature, Quest co
 {
     if (quest->GetQuestId() == QUEST_ESCAPE_FROM_THE_CATACOMBS)
     {
-        creature->setFaction(1603);
+        creature->setFaction(113);
         ((npc_escortAI*)(creature->AI()))->Start(true, true, false, player->GetGUID());
     }
     return true;
diff --git a/src/bindings/scripts/scripts/zone/razorfen_kraul/razorfen_kraul.cpp b/src/bindings/scripts/scripts/zone/razorfen_kraul/razorfen_kraul.cpp
index 2d70b503a77..45e95d1c407 100644
--- a/src/bindings/scripts/scripts/zone/razorfen_kraul/razorfen_kraul.cpp
+++ b/src/bindings/scripts/scripts/zone/razorfen_kraul/razorfen_kraul.cpp
@@ -131,6 +131,7 @@ bool QuestAccept_npc_willix(Player* player, Creature* creature, Quest const* que
 	{
 		((npc_escortAI*)(creature->AI()))->Start(true, true, false, player->GetGUID());
 		DoScriptText(SAY_READY, creature, player);
+		creature->setFaction(113);
 	}
 
 	return true;
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 be29cf79f0e..38f84f5ca7a 100644
--- a/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp
+++ b/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp
@@ -1271,7 +1271,7 @@ bool QuestAccept_npc_earthmender_wilda(Player* player, Creature* creature, Quest
 {
     if (quest->GetQuestId() == QUEST_ESCAPE_FROM_COILSKAR_CISTERN)
     {
-        creature->setFaction(1725);
+        creature->setFaction(113);
         ((npc_escortAI*)(creature->AI()))->Start(true, true, false, player->GetGUID());
     }
     return true;
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 47ba4a33e1d..81268dd5cea 100644
--- a/src/bindings/scripts/scripts/zone/terokkar_forest/terokkar_forest.cpp
+++ b/src/bindings/scripts/scripts/zone/terokkar_forest/terokkar_forest.cpp
@@ -441,6 +441,7 @@ bool QuestAccept_npc_isla_starmane(Player* player, Creature* creature, Quest con
 	if (quest->GetQuestId() == QUEST_EFTW_H || quest->GetQuestId() == QUEST_EFTW_A)
     {
         ((npc_escortAI*)(creature->AI()))->Start(true, true, false, player->GetGUID());
+		creature->setFaction(113);
     }
     return true;
 }
diff --git a/src/bindings/scripts/scripts/zone/thousand_needles/thousand_needles.cpp b/src/bindings/scripts/scripts/zone/thousand_needles/thousand_needles.cpp
index 6d230a49e3b..91b1e0ae3e5 100644
--- a/src/bindings/scripts/scripts/zone/thousand_needles/thousand_needles.cpp
+++ b/src/bindings/scripts/scripts/zone/thousand_needles/thousand_needles.cpp
@@ -102,7 +102,7 @@ bool QuestAccept_npc_swiftmountain(Player* player, Creature* creature, Quest con
         ((npc_escortAI*)(creature->AI()))->Start(true, true, false, player->GetGUID());
         DoScriptText(SAY_READY, creature, player);
         // Change faction so mobs attack
-        creature->setFaction(775);
+        creature->setFaction(113);
     }
 
     return true;
diff --git a/src/bindings/scripts/scripts/zone/zangarmarsh/zangarmarsh.cpp b/src/bindings/scripts/scripts/zone/zangarmarsh/zangarmarsh.cpp
index 6f3ca0149bb..6fb19c15a65 100644
--- a/src/bindings/scripts/scripts/zone/zangarmarsh/zangarmarsh.cpp
+++ b/src/bindings/scripts/scripts/zone/zangarmarsh/zangarmarsh.cpp
@@ -332,7 +332,7 @@ bool QuestAccept_npc_kayra_longmane(Player* player, Creature* creature, Quest co
 	if (quest->GetQuestId() == QUEST_EFU)
     {
         ((npc_escortAI*)(creature->AI()))->Start(true, true, false, player->GetGUID());
-		creature->setFaction(775);
+		creature->setFaction(113);
     }
     return true;
 }