Merge pull request #24554 from funjoker/cherry-picks

20 files changed, 46 insertions, 65 deletions

diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp
index 56b21a7465f..416eec05c45 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp
@@ -192,7 +192,7 @@ class boss_grandmaster_vorpil : public CreatureScript
                                         if (i_pl->IsAlive() && !i_pl->HasAura(SPELL_BANISH))
                                             i_pl->TeleportTo(me->GetMapId(), VorpilPosition.GetPositionX(), VorpilPosition.GetPositionY(), VorpilPosition.GetPositionZ(), VorpilPosition.GetOrientation(), TELE_TO_NOT_LEAVE_COMBAT);
 
-                                me->SetPosition(VorpilPosition);
+                                me->UpdatePosition(VorpilPosition);
                                 DoCast(me, SPELL_DRAW_SHADOWS, true);
                                 DoCast(me, SPELL_RAIN_OF_FIRE);
                                 events.ScheduleEvent(EVENT_SHADOWBOLT_VOLLEY, 6000);
diff --git a/src/server/scripts/Outland/BlackTemple/black_temple.h b/src/server/scripts/Outland/BlackTemple/black_temple.h
index 2213c65373d..42a6c0457d8 100644
--- a/src/server/scripts/Outland/BlackTemple/black_temple.h
+++ b/src/server/scripts/Outland/BlackTemple/black_temple.h
@@ -133,7 +133,6 @@ enum BTGameObjectIds
 
 enum BlackTempleMisc
 {
-    ASHTONGUE_FACTION_FRIEND        = 1820,
     AKAMA_FACTION_COMBAT            = 1868,
     AKAMA_INTRO                     = 1,
     AKAMA_FIGHT                     = 2,
diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
index 44f9f9069ee..1080e6c1ca9 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
@@ -439,7 +439,7 @@ public:
 
     bool operator()(Unit* unit) const
     {
-        return _me->GetDistance2d(unit) > 25.0f;
+        return unit->GetTypeId() == TYPEID_PLAYER && _me->GetDistance2d(unit) > 25.0f;
     }
 
 private:
@@ -2074,7 +2074,8 @@ class spell_illidan_flame_blast : public SpellScriptLoader
             void HandleBlaze(SpellEffIndex /*effIndex*/)
             {
                 Unit* target = GetHitUnit();
-                target->CastSpell(target, SPELL_BLAZE_SUMMON, true);
+                if (target->GetTypeId() == TYPEID_PLAYER)
+                    target->CastSpell(target, SPELL_BLAZE_SUMMON, true);
             }
 
             void Register() override
diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
index 279749dfd9f..3d5b3c3f4a4 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
@@ -384,7 +384,7 @@ public:
         void Reset() override
         {
             Initialize();
-            me->SetFaction(ASHTONGUE_FACTION_FRIEND);
+            me->SetFaction(FACTION_ASHTONGUE_DEATHSWORN);
             DoCastSelf(SPELL_STEALTH);
 
             if (_instance->GetBossState(DATA_SHADE_OF_AKAMA) != DONE)
@@ -430,7 +430,7 @@ public:
             {
                 _isInCombat = false;
                 me->CombatStop(true);
-                me->SetFaction(ASHTONGUE_FACTION_FRIEND);
+                me->SetFaction(FACTION_ASHTONGUE_DEATHSWORN);
                 me->SetWalk(true);
                 _events.Reset();
                 me->GetMotionMaster()->MovePoint(AKAMA_INTRO_WAYPOINT, AkamaWP[1]);
@@ -484,7 +484,7 @@ public:
                     case EVENT_SHADE_CHANNEL:
                         me->SetFacingTo(FACE_THE_PLATFORM);
                         DoCastSelf(SPELL_AKAMA_SOUL_CHANNEL);
-                        me->SetFaction(AKAMA_FACTION_COMBAT);
+                        me->SetFaction(FACTION_MONSTER_SPAR_BUDDY);
                         _events.ScheduleEvent(EVENT_FIXATE, Seconds(5));
                         break;
                     case EVENT_FIXATE:
@@ -532,7 +532,7 @@ public:
                 }
             }
 
-            if (me->GetFaction() == AKAMA_FACTION_COMBAT)
+            if (me->GetFaction() == FACTION_MONSTER_SPAR_BUDDY)
             {
                 if (!UpdateVictim())
                     return;
@@ -1171,7 +1171,7 @@ public:
                     Talk(SAY_BROKEN_SPECIAL);
                     break;
                 case ACTION_BROKEN_HAIL:
-                    me->SetFaction(ASHTONGUE_FACTION_FRIEND);
+                    me->SetFaction(FACTION_ASHTONGUE_DEATHSWORN);
                     Talk(SAY_BROKEN_HAIL);
                     break;
                 case ACTION_BROKEN_EMOTE:
diff --git a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
index 21197f01c81..bc2c071f7c3 100644
--- a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
+++ b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
@@ -128,7 +128,7 @@ class instance_black_temple : public InstanceMapScript
                     case NPC_STORM_FURY:
                         AshtongueGUIDs.emplace_back(creature->GetGUID());
                         if (GetBossState(DATA_SHADE_OF_AKAMA) == DONE)
-                            creature->SetFaction(ASHTONGUE_FACTION_FRIEND);
+                            creature->SetFaction(FACTION_ASHTONGUE_DEATHSWORN);
                         break;
                     default:
                         break;
@@ -175,8 +175,8 @@ class instance_black_temple : public InstanceMapScript
                         if (state == DONE)
                             for (ObjectGuid ashtongueGuid : AshtongueGUIDs)
                                 if (Creature* ashtongue = instance->GetCreature(ashtongueGuid))
-                                    ashtongue->SetFaction(ASHTONGUE_FACTION_FRIEND);
-                        /* fallthrough */
+                                    ashtongue->SetFaction(FACTION_ASHTONGUE_DEATHSWORN);
+                        // no break
                     case DATA_TERON_GOREFIEND:
                     case DATA_GURTOGG_BLOODBOIL:
                     case DATA_RELIQUARY_OF_SOULS:
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
index a454599bbf7..ba563eb252f 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
@@ -753,7 +753,7 @@ public:
         void Reset() override
         {
             me->SetDisableGravity(true);
-            me->SetFaction(14);
+            me->SetFaction(FACTION_MONSTER);
             Initialize();
         }
 
@@ -788,7 +788,7 @@ public:
                 {
                     if (Creature* trig = me->SummonCreature(TOXIC_SPORES_TRIGGER, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 30000))
                     {
-                        trig->SetFaction(14);
+                        trig->SetFaction(FACTION_MONSTER);
                         trig->CastSpell(trig, SPELL_TOXIC_SPORES, true);
                     }
                 }
@@ -804,7 +804,7 @@ public:
                 if (!Vashj || !Vashj->IsAlive() || ENSURE_AI(boss_lady_vashj::boss_lady_vashjAI, Vashj->ToCreature()->AI())->Phase != 3)
                 {
                     // remove
-                    me->SetFaction(35);
+                    me->SetFaction(FACTION_FRIENDLY);
                     me->DespawnOrUnsummon();
                     return;
                 }
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
index eca80aec5e6..8d2d134d80c 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
@@ -321,7 +321,7 @@ public:
 
             me->RemoveUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
             me->AddUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
-            me->SetFaction(14);
+            me->SetFaction(FACTION_MONSTER);
         }
 
         void EnterCombat(Unit* /*who*/) override { }
diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp
index 2379950f294..00a911cc53b 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp
@@ -662,7 +662,7 @@ public:
 
         InstanceScript* instance;
 
-        bool OnGossipSelect(Player* player, uint32 /*menuId*/, uint32 /*gossipListId*/)
+        bool GossipSelect(Player* player, uint32 /*menuId*/, uint32 /*gossipListId*/) override
         {
             ClearGossipMenuFor(player);
 
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
index 765a7d5a7de..7a04ba358ac 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
@@ -207,7 +207,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript
 
             void JustSummoned(Creature* summoned) override
             {
-                summoned->SetFaction(16);
+                summoned->SetFaction(FACTION_MONSTER_2);
                 summoned->AddUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
                 summoned->AddUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
 
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
index 6fba85f3580..59e48cb078b 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
@@ -289,7 +289,7 @@ class boss_alar : public CreatureScript
                                     if (me->IsWithinDist3d(target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 5.0f))
                                         dist = 5.0f;
                                     WaitTimer = 1000 + uint32(floor(dist / 80 * 1000.0f));
-                                    me->SetPosition(target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0.0f);
+                                    me->UpdatePosition(target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0.0f);
                                     me->StopMoving();
                                     WaitEvent = WE_LAND;
                                     return;
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
index ee7c9396764..f1a4e6e2d8f 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
@@ -291,7 +291,7 @@ class boss_high_astromancer_solarian : public CreatureScript
                         Phase1_Timer = 50000;
                         //After these 50 seconds she portals to the middle of the room and disappears, leaving 3 light portals behind.
                         me->GetMotionMaster()->Clear();
-                        me->SetPosition(CENTER_X, CENTER_Y, CENTER_Z, CENTER_O);
+                        me->UpdatePosition(CENTER_X, CENTER_Y, CENTER_Z, CENTER_O);
                         for (uint8 i=0; i <= 2; ++i)
                         {
                             if (!i)
@@ -357,7 +357,7 @@ class boss_high_astromancer_solarian : public CreatureScript
                         //15 seconds later Solarian reappears out of one of the 3 portals. Simultaneously, 2 healers appear in the two other portals.
                         int i = rand32() % 3;
                         me->GetMotionMaster()->Clear();
-                        me->SetPosition(Portals[i][0], Portals[i][1], Portals[i][2], CENTER_O);
+                        me->UpdatePosition(Portals[i][0], Portals[i][1], Portals[i][2], CENTER_O);
 
                         for (int j=0; j <= 2; j++)
                             if (j != i)
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
index ee44f0c0f46..ab5480e8b5f 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
@@ -1278,7 +1278,7 @@ class npc_kael_flamestrike : public CreatureScript
                 Initialize();
 
                 me->AddUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
-                me->SetFaction(14);
+                me->SetFaction(FACTION_MONSTER);
             }
 
             void MoveInLineOfSight(Unit* /*who*/) override { }
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
index 70b1da72d93..3b4f22bc23c 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
@@ -539,7 +539,7 @@ class npc_zerekethvoidzone : public CreatureScript
             void Reset() override
             {
                 me->SetNpcFlags(UNIT_NPC_FLAG_NONE);
-                me->SetFaction(16);
+                me->SetFaction(FACTION_MONSTER_2);
                 me->AddUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
 
                 DoCast(me, SPELL_VOID_ZONE_DAMAGE);
diff --git a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp
index 72001b3a07e..ab8b16468ae 100644
--- a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp
+++ b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp
@@ -46,8 +46,6 @@ enum Aeranas
 {
     SAY_SUMMON                  = 0,
     SAY_FREE                    = 1,
-    FACTION_HOSTILE             = 16,
-    FACTION_FRIENDLY            = 35,
     SPELL_ENVELOPING_WINDS      = 15535,
     SPELL_SHOCK                 = 12553
 };
@@ -87,7 +85,7 @@ public:
             {
                 if (faction_Timer <= diff)
                 {
-                    me->SetFaction(FACTION_HOSTILE);
+                    me->SetFaction(FACTION_MONSTER_2);
                     faction_Timer = 0;
                 } else faction_Timer -= diff;
             }
@@ -252,7 +250,7 @@ enum WoundedBloodElf
     QUEST_ROAD_TO_FALCON_WATCH  = 9375,
     NPC_HAALESHI_WINDWALKER     = 16966,
     NPC_HAALESHI_TALONGUARD     = 16967,
-    FACTION_FALCON_WATCH_QUEST  = 775
+  
 };
 
 class npc_wounded_blood_elf : public CreatureScript
@@ -281,7 +279,7 @@ public:
         {
             if (quest->GetQuestId() == QUEST_ROAD_TO_FALCON_WATCH)
             {
-                me->SetFaction(FACTION_FALCON_WATCH_QUEST);
+                me->SetFaction(FACTION_ESCORTEE_H_PASSIVE);
                 npc_escortAI::Start(true, false, player->GetGUID());
             }
         }
@@ -997,7 +995,7 @@ public:
                     break;
                 case EVENT_ATTACK:
                     me->RemoveUnitFlag(UNIT_FLAG_IMMUNE_TO_PC);
-                    me->SetFaction(FACTION_HOSTILE);
+                    me->SetFaction(FACTION_MONSTER_2);
                     if (Player* player = ObjectAccessor::GetPlayer(*me, _playerGUID))
                         me->CombatStart(player);
                     _events.ScheduleEvent(EVENT_FIREBALL, 1);
diff --git a/src/server/scripts/Outland/zone_nagrand.cpp b/src/server/scripts/Outland/zone_nagrand.cpp
index c51dfa286ad..55e129504e6 100644
--- a/src/server/scripts/Outland/zone_nagrand.cpp
+++ b/src/server/scripts/Outland/zone_nagrand.cpp
@@ -200,7 +200,7 @@ public:
             if (quest->GetQuestId() == QUEST_TOTEM_KARDASH_H)
             {
                 me->SetStandState(UNIT_STAND_STATE_STAND);
-                me->SetFaction(232);
+                me->SetFaction(FACTION_ESCORTEE_H_NEUTRAL_ACTIVE);
                 Start(true, false, player->GetGUID(), quest);
                 Talk(SAY_MAG_START);
 
@@ -575,7 +575,7 @@ public:
             if (quest->GetQuestId() == QUEST_TOTEM_KARDASH_A)
             {
                 me->SetStandState(UNIT_STAND_STATE_STAND);
-                me->SetFaction(231);
+                me->SetFaction(FACTION_ESCORTEE_A_NEUTRAL_ACTIVE);
                 Start(true, false, player->GetGUID(), quest);
                 Talk(SAY_KUR_START);
 
diff --git a/src/server/scripts/Outland/zone_netherstorm.cpp b/src/server/scripts/Outland/zone_netherstorm.cpp
index c4560a9d633..9ef66707d03 100644
--- a/src/server/scripts/Outland/zone_netherstorm.cpp
+++ b/src/server/scripts/Outland/zone_netherstorm.cpp
@@ -548,7 +548,7 @@ public:
         {
             if (quest->GetQuestId() == Q_ALMABTRIEB)
             {
-                me->SetFaction(113);
+                me->SetFaction(FACTION_ESCORTEE_N_NEUTRAL_PASSIVE);
                 me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
                 Start(true, false, player->GetGUID());
             }
@@ -656,7 +656,7 @@ public:
         {
             if (quest->GetQuestId() == QUEST_MARK_V_IS_ALIVE)
             {
-                me->SetFaction(113);
+                me->SetFaction(FACTION_ESCORTEE_N_NEUTRAL_PASSIVE);
                 Start(false, false, player->GetGUID());
             }
         }
diff --git a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp
index 19b79b6ee4c..a44dedb56ca 100644
--- a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp
+++ b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp
@@ -341,10 +341,6 @@ public:
 
 enum EnshlavedNetherwingDrake
 {
-    // Factions
-    FACTION_DEFAULT                 = 62,
-    FACTION_FRIENDLY                = 1840, // Not sure if this is correct, it was taken off of Mordenai.
-
     // Spells
     SPELL_HIT_FORCE_OF_NELTHARAKU   = 38762,
     SPELL_FORCE_OF_NELTHARAKU       = 38775,
@@ -380,7 +376,7 @@ public:
         void Reset() override
         {
             if (!Tapped)
-                me->SetFaction(FACTION_DEFAULT);
+                me->SetFaction(FACTION_ORC_DRAGONMAW);
 
             FlyTimer = 10000;
             me->SetDisableGravity(false);
@@ -396,7 +392,7 @@ public:
                 Tapped = true;
                 PlayerGUID = caster->GetGUID();
 
-                me->SetFaction(FACTION_FRIENDLY);
+                me->SetFaction(FACTION_FLAYER_HUNTER);
                 DoCast(caster, SPELL_FORCE_OF_NELTHARAKU, true);
 
                 Unit* Dragonmaw = me->FindNearestCreature(NPC_DRAGONMAW_SUBJUGATOR, 50);
@@ -589,8 +585,7 @@ enum Earthmender
     SPELL_HEALING_WAVE          = 12491,
 
     QUEST_ESCAPE_COILSCAR       = 10451,
-    NPC_COILSKAR_ASSASSIN       = 21044,
-    FACTION_EARTHEN             = 1726                      //guessed
+    NPC_COILSKAR_ASSASSIN       = 21044
 };
 
 class npc_earthmender_wilda : public CreatureScript
@@ -733,7 +728,7 @@ public:
             if (quest->GetQuestId() == QUEST_ESCAPE_COILSCAR)
             {
                 Talk(SAY_WIL_START, player);
-                me->SetFaction(FACTION_EARTHEN);
+                me->SetFaction(FACTION_EARTHEN_RING);
 
                 Start(false, false, player->GetGUID(), quest);
             }
@@ -1415,11 +1410,7 @@ enum Enraged_Dpirits
     NPC_CREDIT_EARTH                        = 21092,
 
     // Captured Spell / Buff
-    SPELL_SOUL_CAPTURED                     = 36115,
-
-    // Factions
-    FACTION_ENRAGED_SOUL_FRIENDLY           = 35,
-    FACTION_ENRAGED_SOUL_HOSTILE            = 14
+    SPELL_SOUL_CAPTURED                     = 36115
 };
 
 class npc_enraged_spirit : public CreatureScript
@@ -1487,7 +1478,7 @@ public:
                  totemOspirits = me->FindNearestCreature(ENTRY_TOTEM_OF_SPIRITS, RADIUS_TOTEM_OF_SPIRITS);
                  if (totemOspirits)
                  {
-                     Summoned->SetFaction(FACTION_ENRAGED_SOUL_FRIENDLY);
+                     Summoned->SetFaction(FACTION_FRIENDLY);
                      Summoned->GetMotionMaster()->MovePoint(0, totemOspirits->GetPositionX(), totemOspirits->GetPositionY(), Summoned->GetPositionZ());
 
                      if (Unit* owner = totemOspirits->GetOwner())
diff --git a/src/server/scripts/Outland/zone_shattrath_city.cpp b/src/server/scripts/Outland/zone_shattrath_city.cpp
index 5334f567a89..60037276c25 100644
--- a/src/server/scripts/Outland/zone_shattrath_city.cpp
+++ b/src/server/scripts/Outland/zone_shattrath_city.cpp
@@ -44,7 +44,6 @@ enum RaliqTheDrunk
 {
     SAY_RALIQ_ATTACK         = 0,
     OPTION_ID_COLLECT_A_DEBT = 0,
-    FACTION_OGRE_HOSTILE     = 45,
     MENU_ID_COLLECT_A_DEBT   = 7729,
     NPC_TEXT_WUT_YOU_WANT    = 9440,
     CRACKIN_SOME_SKULLS      = 10009,
@@ -97,7 +96,7 @@ public:
             if (action == GOSSIP_ACTION_INFO_DEF + 1)
             {
                 CloseGossipMenuFor(player);
-                me->SetFaction(FACTION_OGRE_HOSTILE);
+                me->SetFaction(FACTION_OGRE);
                 Talk(SAY_RALIQ_ATTACK, player);
                 AttackStart(player);
             }
@@ -134,8 +133,6 @@ enum Salsalabim
 {
     SAY_DEMONIC_AGGRO          = 0,
     OPTION_ID_ALTRUIS_SENT_ME  = 0,
-    FACTION_FRIENDLY           = 35,
-    FACTION_DEMON_HOSTILE      = 90,
     MENU_ID_ALTRUIS_SENT_ME    = 7725,
     NPC_TEXT_SAL_GROWLS_AT_YOU = 9435,
     PATIENCE_AND_UNDERSTANDING = 10004,
@@ -198,7 +195,7 @@ public:
             if (action == GOSSIP_ACTION_INFO_DEF + 1)
             {
                 CloseGossipMenuFor(player);
-                me->SetFaction(FACTION_DEMON_HOSTILE);
+                me->SetFaction(FACTION_DEMON);
                 Talk(SAY_DEMONIC_AGGRO, player);
                 AttackStart(player);
             }
diff --git a/src/server/scripts/Outland/zone_terokkar_forest.cpp b/src/server/scripts/Outland/zone_terokkar_forest.cpp
index 50ee9cf0039..7d519c434a4 100644
--- a/src/server/scripts/Outland/zone_terokkar_forest.cpp
+++ b/src/server/scripts/Outland/zone_terokkar_forest.cpp
@@ -48,8 +48,6 @@ enum UnkorTheRuthless
 {
     SAY_SUBMIT              = 0,
     REQUIRED_KILL_COUNT     = 10,
-    FACTION_FRIENDLY        = 35,
-    FACTION_HOSTILE         = 45,
     SPELL_PULVERIZE         = 2676,
     QUEST_DONTKILLTHEFATONE = 9889,
     NPC_BOULDERFIST_INVADER = 18260
@@ -87,7 +85,7 @@ public:
         {
             Initialize();
             me->SetStandState(UNIT_STAND_STATE_STAND);
-            me->SetFaction(FACTION_HOSTILE);
+            me->SetFaction(FACTION_OGRE);
         }
 
         void EnterCombat(Unit* /*who*/) override { }
@@ -310,7 +308,6 @@ enum Floon
     SAY_FLOON_ATTACK            = 0,
     OPTION_ID_PAY_UP_OR_DIE     = 0,
     OPTION_ID_COLLECT_A_DEBT    = 0,
-    FACTION_HOSTILE_FLOON       = 1738,
     MENU_ID_PAY_UP_OR_DIE       = 7731,
     MENU_ID_COLLECT_A_DEBT      = 7732,
     GOSSIP_FLOON_STRANGE_SOUNDS = 9442,
@@ -395,7 +392,7 @@ public:
             if (action == GOSSIP_ACTION_INFO_DEF + 1)
             {
                 CloseGossipMenuFor(player);
-                me->SetFaction(FACTION_HOSTILE_FLOON);
+                me->SetFaction(FACTION_ARAKKOA);
                 Talk(SAY_FLOON_ATTACK, player);
                 AttackStart(player);
             }
@@ -428,7 +425,6 @@ enum IslaStarmaneData
     SAY_PROGRESS_3               = 2,
     SAY_PROGRESS_4               = 3,
     GO_DISTANCE                  = 10,
-    FACTION_ESCORTEE             = 113,
     ESCAPE_FROM_FIREWING_POINT_A = 10051,
     ESCAPE_FROM_FIREWING_POINT_H = 10052,
     SPELL_TRAVEL_FORM_CAT        = 32447,
@@ -504,7 +500,7 @@ public:
             if (quest->GetQuestId() == ESCAPE_FROM_FIREWING_POINT_H || quest->GetQuestId() == ESCAPE_FROM_FIREWING_POINT_A)
             {
                 Start(true, false, player->GetGUID());
-                me->SetFaction(FACTION_ESCORTEE);
+                me->SetFaction(FACTION_ESCORTEE_N_NEUTRAL_PASSIVE);
             }
         }
     };
@@ -694,9 +690,9 @@ public:
                 Start(false, false, player->GetGUID());
 
                 if (player->GetTeamId() == TEAM_ALLIANCE)
-                    me->SetFaction(FACTION_ESCORT_A_NEUTRAL_PASSIVE);
+                    me->SetFaction(FACTION_ESCORTEE_A_NEUTRAL_PASSIVE);
                 else
-                    me->SetFaction(FACTION_ESCORT_H_NEUTRAL_PASSIVE);
+                    me->SetFaction(FACTION_ESCORTEE_H_NEUTRAL_PASSIVE);
             }
         }
     };
diff --git a/src/server/scripts/Outland/zone_zangarmarsh.cpp b/src/server/scripts/Outland/zone_zangarmarsh.cpp
index ced7d46107f..3ff618f4b2d 100644
--- a/src/server/scripts/Outland/zone_zangarmarsh.cpp
+++ b/src/server/scripts/Outland/zone_zangarmarsh.cpp
@@ -162,8 +162,7 @@ public:
 enum Cooshhooosh
 {
     SPELL_LIGHTNING_BOLT    = 9532,
-    QUEST_CRACK_SKULLS      = 10009,
-    FACTION_HOSTILE_CO      = 45
+    QUEST_CRACK_SKULLS      = 10009
 };
 
 class npc_cooshcoosh : public CreatureScript
@@ -226,7 +225,7 @@ public:
             if (action == GOSSIP_ACTION_INFO_DEF)
             {
                 CloseGossipMenuFor(player);
-                me->SetFaction(FACTION_HOSTILE_CO);
+                me->SetFaction(FACTION_OGRE);
                 AttackStart(player);
             }
             return true;