Core/Defines: define faction templates and replace magic numbers from scripts

24 files changed, 45 insertions, 73 deletions

diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
index f76c8bf6cac..3464d1b022e 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
@@ -923,7 +923,7 @@ void hyjalAI::HideNearPos(float x, float y)
         for (std::list<Creature*>::const_iterator itr = creatures.begin(); itr != creatures.end(); ++itr)
         {
             (*itr)->SetVisible(false);
-            (*itr)->SetFaction(35);//make them friendly so mobs won't attack them
+            (*itr)->SetFaction(FACTION_FRIENDLY);//make them friendly so mobs won't attack them
         }
     }
 }
@@ -1022,7 +1022,7 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff)
                     if ((*itr) && (*itr)->IsAlive())
                     {
                         (*itr)->CastSpell(*itr, SPELL_TELEPORT_VISUAL, true);
-                        (*itr)->SetFaction(35);//make them friendly so mobs won't attack them
+                        (*itr)->SetFaction(FACTION_FRIENDLY);//make them friendly so mobs won't attack them
                         (*itr)->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
                     }
                 }
diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp
index f839c252915..36514199010 100644
--- a/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp
+++ b/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp
@@ -82,7 +82,7 @@ public:
             if (Invisible && InvisibleTimer <= diff)
             {
                 //Become visible again
-                me->SetFaction(14);
+                me->SetFaction(FACTION_MONSTER);
                 me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                 //Noxxion model
                 me->SetDisplayId(11172);
@@ -122,7 +122,7 @@ public:
                 //Interrupt any spell casting
                 //me->m_canMove = true;
                 me->InterruptNonMeleeSpells(false);
-                me->SetFaction(35);
+                me->SetFaction(FACTION_FRIENDLY);
                 me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                 // Invisible Model
                 me->SetDisplayId(11686);
diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp
index 19a289485fc..02b395eb3b3 100644
--- a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp
@@ -58,8 +58,6 @@ enum Belnistrasz
     EVENT_FIREBALL               = 5,
     EVENT_FROST_NOVA             = 6,
 
-    FACTION_ESCORT               = 250,
-
     PATH_ESCORT                  = 871710,
     POINT_REACH_IDOL             = 17,
 
@@ -137,7 +135,7 @@ public:
                 eventInProgress = true;
                 Talk(SAY_QUEST_ACCEPTED);
                 me->RemoveFlag(UNIT_NPC_FLAGS, GOSSIP_OPTION_QUESTGIVER);
-                me->SetFaction(FACTION_ESCORT);
+                me->SetFaction(FACTION_ESCORTEE_N_NEUTRAL_ACTIVE);
                 me->GetMotionMaster()->MovePath(PATH_ESCORT, false);
             }
         }
diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
index 15843a9048b..c14383ffaa5 100644
--- a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
@@ -68,7 +68,7 @@ public:
             switch (go->GetEntry())
             {
                 case 21099: DoorWardGUID = go->GetGUID(); break;
-                case 20920: go->SetFaction(0); break; // big fat fugly hack
+                case 20920: go->SetFaction(FACTION_NONE); break; // big fat fugly hack
             }
         }
 
diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp
index 88a3b2b51fb..64feea50156 100644
--- a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp
@@ -57,7 +57,7 @@ public:
             {
                 Start(true, false, player->GetGUID());
                 Talk(SAY_READY, player);
-                me->SetFaction(113);
+                me->SetFaction(FACTION_ESCORTEE_N_NEUTRAL_PASSIVE);
             }
         }
 
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp
index 26276875861..2e8ee5f4259 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp
@@ -112,7 +112,7 @@ public:
                 //Cast
                 me->HandleEmoteCommand(EMOTE_ONESHOT_SUBMERGE);
                 me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
-                me->SetFaction(35);
+                me->SetFaction(FACTION_FRIENDLY);
                 DoCast(me, SPELL_DIRTMOUND_PASSIVE);
 
                 Submerged = true;
@@ -135,7 +135,7 @@ public:
             if (Submerged && Back_Timer <= diff)
             {
                 me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
-                me->SetFaction(14);
+                me->SetFaction(FACTION_MONSTER);
 
                 DoCastVictim(SPELL_GROUND_RUPTURE);
 
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
index 1e75ac94b6c..e48e74897da 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
@@ -332,7 +332,7 @@ struct boss_twinemperorsAI : public ScriptedAI
                 if (c->isDead())
                 {
                     c->Respawn();
-                    c->SetFaction(7);
+                    c->SetFaction(FACTION_CREATURE);
                     c->RemoveAllAuras();
                 }
                 if (c->IsWithinDistInMap(me, ABUSE_BUG_RANGE))
@@ -427,7 +427,7 @@ public:
 
         void CastSpellOnBug(Creature* target) override
         {
-            target->SetFaction(14);
+            target->SetFaction(FACTION_MONSTER);
             target->AI()->AttackStart(me->getThreatManager().getHostilTarget());
             target->AddAura(SPELL_MUTATE_BUG, target);
             target->SetFullHealth();
@@ -518,7 +518,7 @@ public:
 
         void CastSpellOnBug(Creature* target) override
         {
-            target->SetFaction(14);
+            target->SetFaction(FACTION_MONSTER);
             target->AddAura(SPELL_EXPLODEBUG, target);
             target->SetFullHealth();
         }
diff --git a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp
index fcbdfd547a6..23516577f44 100644
--- a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp
+++ b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp
@@ -328,7 +328,7 @@ public:
 
                 Talk(SAY_MAKE_PREPARATIONS);
 
-                me->SetFaction(250);
+                me->SetFaction(FACTION_ESCORTEE_N_NEUTRAL_ACTIVE);
                 me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
 
                 Start(false, false, player->GetGUID());
diff --git a/src/server/scripts/Kalimdor/ZulFarrak/boss_zum_rah.cpp b/src/server/scripts/Kalimdor/ZulFarrak/boss_zum_rah.cpp
index 8548045333b..2a7af38c1ab 100644
--- a/src/server/scripts/Kalimdor/ZulFarrak/boss_zum_rah.cpp
+++ b/src/server/scripts/Kalimdor/ZulFarrak/boss_zum_rah.cpp
@@ -47,11 +47,6 @@ enum Events
     EVENT_HEALING_WAVE          = 4
 };
 
-enum Faction
-{
-    ZUMRAH_FRIENDLY_FACTION     = 35
-};
-
 class boss_zum_rah : public CreatureScript
 {
 public:
@@ -73,7 +68,7 @@ public:
 
         void Reset() override
         {
-            me->SetFaction(ZUMRAH_FRIENDLY_FACTION); // areatrigger sets faction to enemy
+            me->SetFaction(FACTION_FRIENDLY); // areatrigger sets faction to enemy
             Initialize();
         }
 
diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp
index 9e014f7f6d9..87e4f8ba095 100644
--- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp
+++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp
@@ -39,13 +39,6 @@ EndContentData */
 ## npc_sergeant_bly
 ######*/
 
-enum blyAndCrewFactions
-{
-    FACTION_HOSTILE           = 14,
-    FACTION_FRIENDLY          = 35,  //while in cages (so the trolls won't attack them while they're caged)
-    FACTION_FREED             = 250  //after release (so they'll be hostile towards trolls)
-};
-
 enum blySays
 {
     SAY_1 = 0,
@@ -116,7 +109,7 @@ public:
                             Text_Timer = 5000;
                             break;
                         case 3:
-                            me->SetFaction(FACTION_HOSTILE);
+                            me->SetFaction(FACTION_MONSTER);
                             if (Player* target = ObjectAccessor::GetPlayer(*me, PlayerGUID))
                                 AttackStart(target);
 
@@ -161,7 +154,7 @@ public:
         {
            if (Creature* crew = ObjectAccessor::GetCreature(*me, instance->GetGuidData(entry)))
                if (crew->IsAlive())
-                   crew->SetFaction(FACTION_HOSTILE);
+                   crew->SetFaction(FACTION_MONSTER);
         }
 
         bool GossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override
@@ -235,7 +228,7 @@ public:
                 crew->SetWalk(true);
                 crew->SetHomePosition(x, y, z, 0);
                 crew->GetMotionMaster()->MovePoint(1, x, y, z);
-                crew->SetFaction(FACTION_FREED);
+                crew->SetFaction(FACTION_ESCORTEE_N_NEUTRAL_ACTIVE);
             }
         }
     };
diff --git a/src/server/scripts/Kalimdor/zone_ashenvale.cpp b/src/server/scripts/Kalimdor/zone_ashenvale.cpp
index 2b8f0550dd0..738e647bad0 100644
--- a/src/server/scripts/Kalimdor/zone_ashenvale.cpp
+++ b/src/server/scripts/Kalimdor/zone_ashenvale.cpp
@@ -44,7 +44,6 @@ enum RuulSnowhoof
     NPC_THISTLEFUR_TOTEMIC      = 3922,
     NPC_THISTLEFUR_PATHFINDER   = 3926,
     QUEST_FREEDOM_TO_RUUL       = 6482,
-    FACTION_QUEST               = 113,
     GO_CAGE                     = 178147
 };
 
@@ -84,7 +83,7 @@ public:
         {
             if (quest->GetQuestId() == QUEST_FREEDOM_TO_RUUL)
             {
-                me->SetFaction(FACTION_QUEST);
+                me->SetFaction(FACTION_ESCORTEE_N_NEUTRAL_PASSIVE);
                 npc_escortAI::Start(true, false, player->GetGUID());
             }
         }
@@ -227,7 +226,7 @@ public:
             if (quest->GetQuestId() == QUEST_VORSHA)
             {
                 Talk(SAY_MUG_START1);
-                me->SetFaction(FACTION_QUEST);
+                me->SetFaction(FACTION_ESCORTEE_N_NEUTRAL_PASSIVE);
                 npc_escortAI::Start(true, false, player->GetGUID());
             }
         }
diff --git a/src/server/scripts/Kalimdor/zone_azshara.cpp b/src/server/scripts/Kalimdor/zone_azshara.cpp
index 86ae2468a35..b6572c99f7d 100644
--- a/src/server/scripts/Kalimdor/zone_azshara.cpp
+++ b/src/server/scripts/Kalimdor/zone_azshara.cpp
@@ -357,7 +357,7 @@ public:
                 {
                     Talk(SAY_RIZZLE_FINAL);
                     me->SetUInt32Value(UNIT_NPC_FLAGS, 1);
-                    me->SetFaction(35);
+                    me->SetFaction(FACTION_FRIENDLY);
                     me->GetMotionMaster()->MoveIdle();
                     me->RemoveAurasDueToSpell(SPELL_PERIODIC_DEPTH_CHARGE);
                     Reached = true;
diff --git a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp
index 0a3f57ace8e..ac0311b6dcd 100644
--- a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp
+++ b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp
@@ -189,7 +189,6 @@ enum Overgrind
     AREA_COVE       = 3579,
     AREA_ISLE       = 3639,
     QUEST_GNOMERCY  = 9537,
-    FACTION_HOSTILE = 14,
     SPELL_DYNAMITE  = 7978
 };
 
@@ -234,7 +233,7 @@ public:
         bool GossipSelect(Player* player, uint32 /*menuId*/, uint32 /*gossipListId*/) override
         {
             CloseGossipMenuFor(player);
-            me->SetFaction(FACTION_HOSTILE);
+            me->SetFaction(FACTION_MONSTER);
             me->Attack(player, true);
             return false;
         }
@@ -340,8 +339,7 @@ enum Magwin
     EVENT_STAND                 = 3,
     EVENT_TALK_END              = 4,
     EVENT_COWLEN_TALK           = 5,
-    QUEST_A_CRY_FOR_HELP        = 9528,
-    FACTION_QUEST               = 113
+    QUEST_A_CRY_FOR_HELP        = 9528
 };
 
 class npc_magwin : public CreatureScript
@@ -406,7 +404,7 @@ public:
                     case EVENT_ACCEPT_QUEST:
                         if (Player* player = ObjectAccessor::GetPlayer(*me, _player))
                             Talk(SAY_START, player);
-                        me->SetFaction(FACTION_QUEST);
+                        me->SetFaction(FACTION_ESCORTEE_N_NEUTRAL_PASSIVE);
                         _events.ScheduleEvent(EVENT_START_ESCORT, Seconds(1));
                         break;
                     case EVENT_START_ESCORT:
diff --git a/src/server/scripts/Kalimdor/zone_darkshore.cpp b/src/server/scripts/Kalimdor/zone_darkshore.cpp
index 95790c11a15..990c266e041 100644
--- a/src/server/scripts/Kalimdor/zone_darkshore.cpp
+++ b/src/server/scripts/Kalimdor/zone_darkshore.cpp
@@ -193,7 +193,6 @@ enum Remtravel
     SAY_REM_REMEMBER            = 11,
     EMOTE_REM_END               = 12,
 
-    FACTION_ESCORTEE            = 10,
     QUEST_ABSENT_MINDED_PT2     = 731,
     NPC_GRAVEL_SCOUT            = 2158,
     NPC_GRAVEL_BONE             = 2159,
@@ -289,7 +288,7 @@ public:
             if (quest->GetQuestId() == QUEST_ABSENT_MINDED_PT2)
             {
                 Start(false, false, player->GetGUID());
-                me->SetFaction(FACTION_ESCORTEE);
+                me->SetFaction(FACTION_ESCORTEE_A_NEUTRAL_PASSIVE);
             }
         }
     };
@@ -309,8 +308,7 @@ enum Threshwackonator
     EMOTE_START             = 0,
     SAY_AT_CLOSE            = 0,
     QUEST_GYROMAST_REV      = 2078,
-    NPC_GELKAK              = 6667,
-    FACTION_HOSTILE         = 14
+    NPC_GELKAK              = 6667
 };
 
 #define GOSSIP_ITEM_INSERT_KEY  "[PH] Insert key"
@@ -343,7 +341,7 @@ public:
 
         void DoAtEnd()
         {
-            me->SetFaction(FACTION_HOSTILE);
+            me->SetFaction(FACTION_MONSTER);
 
             if (Player* pHolder = GetLeaderForFollower())
                 AttackStart(pHolder);
diff --git a/src/server/scripts/Kalimdor/zone_desolace.cpp b/src/server/scripts/Kalimdor/zone_desolace.cpp
index 3f31487885a..f32de9fef7b 100644
--- a/src/server/scripts/Kalimdor/zone_desolace.cpp
+++ b/src/server/scripts/Kalimdor/zone_desolace.cpp
@@ -221,7 +221,7 @@ public:
             if (quest->GetQuestId() == QUEST_RETURN_TO_VAHLARRIEL)
             {
                 Start(true, false, player->GetGUID());
-                me->SetFaction(113);
+                me->SetFaction(FACTION_ESCORTEE_N_NEUTRAL_PASSIVE);
             }
         }
     };
diff --git a/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp b/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp
index f6718dfe919..d743f8ff07d 100644
--- a/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp
+++ b/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp
@@ -101,7 +101,6 @@ enum Hendel
     EMOTE_SURRENDER             = 4,
 
     QUEST_MISSING_DIPLO_PT16    = 1324,
-    FACTION_HOSTILE             = 168,                      //guessed, may be different
 
     NPC_SENTRY                  = 5184,                     //helps hendel
     NPC_JAINA                   = 4968,                     //appears once hendel gives up
@@ -151,7 +150,7 @@ public:
         void QuestAccept(Player* /*player*/, Quest const* quest) override
         {
             if (quest->GetQuestId() == QUEST_MISSING_DIPLO_PT16)
-                me->SetFaction(FACTION_HOSTILE);
+                me->SetFaction(FACTION_ENEMY);
         }
     };
 
diff --git a/src/server/scripts/Kalimdor/zone_feralas.cpp b/src/server/scripts/Kalimdor/zone_feralas.cpp
index f8617314334..b9c2a20abf1 100644
--- a/src/server/scripts/Kalimdor/zone_feralas.cpp
+++ b/src/server/scripts/Kalimdor/zone_feralas.cpp
@@ -54,9 +54,7 @@ enum OOX
     NPC_WOODPAW_ALPHA       = 5258,
     NPC_WOODPAW_MYSTIC      = 5254,
 
-    QUEST_RESCUE_OOX22FE    = 2767,
-    FACTION_ESCORTEE_A      = 774,
-    FACTION_ESCORTEE_H      = 775
+    QUEST_RESCUE_OOX22FE    = 2767
 };
 
 class npc_oox22fe : public CreatureScript
@@ -130,10 +128,10 @@ public:
                 me->SetStandState(UNIT_STAND_STATE_STAND);
 
                 if (player->GetTeam() == ALLIANCE)
-                    me->SetFaction(FACTION_ESCORTEE_A);
+                    me->SetFaction(FACTION_ESCORTEE_A_PASSIVE);
 
                 if (player->GetTeam() == HORDE)
-                    me->SetFaction(FACTION_ESCORTEE_H);
+                    me->SetFaction(FACTION_ESCORTEE_H_PASSIVE);
 
                 Start(true, false, player->GetGUID());
             }
diff --git a/src/server/scripts/Kalimdor/zone_silithus.cpp b/src/server/scripts/Kalimdor/zone_silithus.cpp
index d0233e7d85e..5fca1e46ee7 100644
--- a/src/server/scripts/Kalimdor/zone_silithus.cpp
+++ b/src/server/scripts/Kalimdor/zone_silithus.cpp
@@ -50,9 +50,6 @@ enum EternalBoard
 {
     QUEST_A_PAWN_ON_THE_ETERNAL_BOARD = 8519,
 
-    FACTION_HOSTILE                   = 14,
-    FACTION_FRIENDLY                  = 35,
-
     EVENT_AREA_RADIUS                 = 65,     // 65yds
     EVENT_COOLDOWN                    = 500000, // in ms. appears after event completed or failed (should be = Adds despawn time)
 
@@ -982,7 +979,7 @@ public:
                         Merithra->SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_NONE);
                         Merithra->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
                         Merithra->SetUInt32Value(UNIT_FIELD_DISPLAYID, MERITHRA_NIGHT_ELF_FORM);
-                        Merithra->SetFaction(35);
+                        Merithra->SetFaction(FACTION_FRIENDLY);
                     }
 
                     if (Caelestrasz)
@@ -990,7 +987,7 @@ public:
                         Caelestrasz->SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_NONE);
                         Caelestrasz->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
                         Caelestrasz->SetUInt32Value(UNIT_FIELD_DISPLAYID, CAELESTRASZ_NIGHT_ELF_FORM);
-                        Caelestrasz->SetFaction(35);
+                        Caelestrasz->SetFaction(FACTION_FRIENDLY);
                     }
 
                     if (Arygos)
@@ -998,7 +995,7 @@ public:
                         Arygos->SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_NONE);
                         Arygos->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
                         Arygos->SetUInt32Value(UNIT_FIELD_DISPLAYID, ARYGOS_GNOME_FORM);
-                        Arygos->SetFaction(35);
+                        Arygos->SetFaction(FACTION_FRIENDLY);
                     }
 
                     if (Anachronos)
diff --git a/src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp b/src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
index 1fcefb7403f..470f848bcb9 100644
--- a/src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
+++ b/src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
@@ -86,7 +86,7 @@ public:
                 Start(true, false, player->GetGUID());
 
                 Talk(SAY_START);
-                me->SetFaction(113);
+                me->SetFaction(FACTION_ESCORTEE_N_NEUTRAL_PASSIVE);
                 me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
             }
         }
diff --git a/src/server/scripts/Kalimdor/zone_tanaris.cpp b/src/server/scripts/Kalimdor/zone_tanaris.cpp
index b8922038170..197221bddcf 100644
--- a/src/server/scripts/Kalimdor/zone_tanaris.cpp
+++ b/src/server/scripts/Kalimdor/zone_tanaris.cpp
@@ -93,7 +93,7 @@ public:
         void Reset() override
         {
             Initialize();
-            me->SetFaction(35);
+            me->SetFaction(FACTION_FRIENDLY);
         }
 
         void SendItem(Unit* receiver)
@@ -123,7 +123,7 @@ public:
             {
                 if (SwitchFactionTimer <= diff)
                 {
-                    me->SetFaction(91);
+                    me->SetFaction(FACTION_ELEMENTAL);
                     isFriendly = false;
                 } else SwitchFactionTimer -= diff;
             }
@@ -366,7 +366,7 @@ public:
         {
             if (quest->GetQuestId() == Q_OOX17)
             {
-                me->SetFaction(113);
+                me->SetFaction(FACTION_ESCORTEE_N_NEUTRAL_PASSIVE);
                 me->SetFullHealth();
                 me->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
                 me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
diff --git a/src/server/scripts/Kalimdor/zone_the_barrens.cpp b/src/server/scripts/Kalimdor/zone_the_barrens.cpp
index cf425fc804e..ab63bdbc19e 100644
--- a/src/server/scripts/Kalimdor/zone_the_barrens.cpp
+++ b/src/server/scripts/Kalimdor/zone_the_barrens.cpp
@@ -91,8 +91,7 @@ enum Gilthares
     SAY_GIL_FREED               = 7,
 
     QUEST_FREE_FROM_HOLD        = 898,
-    AREA_MERCHANT_COAST         = 391,
-    FACTION_ESCORTEE            = 232                       //guessed, possible not needed for this quest
+    AREA_MERCHANT_COAST         = 391
 };
 
 class npc_gilthares : public CreatureScript
@@ -154,7 +153,7 @@ public:
         {
             if (quest->GetQuestId() == QUEST_FREE_FROM_HOLD)
             {
-                me->SetFaction(FACTION_ESCORTEE);
+                me->SetFaction(FACTION_ESCORTEE_H_NEUTRAL_ACTIVE);
                 me->SetStandState(UNIT_STAND_STATE_STAND);
 
                 Talk(SAY_GIL_START, player);
diff --git a/src/server/scripts/Kalimdor/zone_thousand_needles.cpp b/src/server/scripts/Kalimdor/zone_thousand_needles.cpp
index f13a0fc31ce..dcbf970594c 100644
--- a/src/server/scripts/Kalimdor/zone_thousand_needles.cpp
+++ b/src/server/scripts/Kalimdor/zone_thousand_needles.cpp
@@ -115,7 +115,6 @@ enum Lakota
 
     QUEST_FREE_AT_LAST    = 4904,
     NPC_GRIM_BANDIT       = 10758,
-    FACTION_ESCORTEE_LAKO = 232,   //guessed
 
     ID_AMBUSH_1           = 0,
     ID_AMBUSH_2           = 2,
@@ -178,7 +177,7 @@ public:
             if (quest->GetQuestId() == QUEST_FREE_AT_LAST)
             {
                 Talk(SAY_LAKO_START, player);
-                me->SetFaction(FACTION_ESCORTEE_LAKO);
+                me->SetFaction(FACTION_ESCORTEE_H_NEUTRAL_ACTIVE);
 
                 Start(false, false, player->GetGUID(), quest);
             }
@@ -202,8 +201,7 @@ enum Packa
     SAY_COMPLETE     = 2,
 
     QUEST_HOMEWARD   = 4770,
-    NPC_WYVERN       = 4107,
-    FACTION_ESCORTEE = 232                               //guessed
+    NPC_WYVERN       = 4107
 };
 
 Position const WyvernLoc[3] =
@@ -253,7 +251,7 @@ public:
             if (quest->GetQuestId() == QUEST_HOMEWARD)
             {
                 Talk(SAY_START, player);
-                me->SetFaction(FACTION_ESCORTEE);
+                me->SetFaction(FACTION_ESCORTEE_H_NEUTRAL_ACTIVE);
 
                 Start(false, false, player->GetGUID(), quest);
             }
diff --git a/src/server/scripts/Kalimdor/zone_ungoro_crater.cpp b/src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
index 07babc1f079..f5b28a5f09a 100644
--- a/src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
+++ b/src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
@@ -137,7 +137,7 @@ public:
                 Talk(SAY_READY, player);
                 me->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
                 // Change faction so mobs attack
-                me->SetFaction(113);
+                me->SetFaction(FACTION_ESCORTEE_N_NEUTRAL_PASSIVE);
             }
         }
     };
diff --git a/src/server/scripts/Kalimdor/zone_winterspring.cpp b/src/server/scripts/Kalimdor/zone_winterspring.cpp
index a2c3e9a8715..4b166bbde01 100644
--- a/src/server/scripts/Kalimdor/zone_winterspring.cpp
+++ b/src/server/scripts/Kalimdor/zone_winterspring.cpp
@@ -585,7 +585,7 @@ public:
             if (quest->GetQuestId() == QUEST_GUARDIANS_ALTAR)
             {
                 Talk(SAY_QUEST_START);
-                me->SetFaction(FACTION_ESCORT_A_NEUTRAL_PASSIVE);
+                me->SetFaction(FACTION_ESCORTEE_A_NEUTRAL_PASSIVE);
 
                 Start(false, false, player->GetGUID(), quest);
             }