diff options
| author | ForesterDev <11771800+ForesterDev@users.noreply.github.com> | 2019-07-25 14:54:49 +0400 |
|---|---|---|
| committer | Giacomo Pozzoni <giacomopoz@gmail.com> | 2019-07-25 12:54:49 +0200 |
| commit | 0c317498a57b3983de61d381d684a77176b281e4 (patch) | |
| tree | ea5ce29a5470e89df1e16a2957502def728ba0a0 /src/server/scripts/EasternKingdoms | |
| parent | b9756de7e5b8147569faebb31caad91d3d0cd7dd (diff) | |
Scripts/Defines: cleanup some magic numbers in factions (#23631)
Diffstat (limited to 'src/server/scripts/EasternKingdoms')
4 files changed, 6 insertions, 13 deletions
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.h b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.h index 137f5a1ae38..f376c9f7583 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.h +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.h @@ -24,13 +24,6 @@ #define BRDScriptName "instance_blackrock_depths" #define DataHeader "BRD" -enum BRDFactionIds -{ - FACTION_NEUTRAL = 734, - FACTION_HOSTILE = 754, - FACTION_FRIEND = 35 -}; - enum BRDDataTypes { TYPE_RING_OF_LAW = 1, diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp index 6dc2459321d..58d82908a06 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp @@ -948,7 +948,7 @@ public: { deathcharger->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_SPELLCLICK); deathcharger->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - deathcharger->SetFaction(2096); + deathcharger->SetFaction(FACTION_SCARLET_CRUSADE_2); } } }; diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp index 94a29a98637..d780167c13a 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp @@ -354,7 +354,7 @@ public: { if (GameObject* pOrb = GetOrb(i)) { - if (pOrb->GetFaction() == 35) + if (pOrb->GetFaction() == FACTION_FRIENDLY) { pOrb->CastSpell(me, SPELL_RING_OF_BLUE_FLAMES); pOrb->setActive(true); @@ -380,7 +380,7 @@ class go_orb_of_the_blue_flight : public GameObjectScript bool GossipHello(Player* player) override { - if (me->GetFaction() == 35) + if (me->GetFaction() == FACTION_FRIENDLY) { player->SummonCreature(NPC_POWER_OF_THE_BLUE_DRAGONFLIGHT, player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN, 121000); player->CastSpell(player, SPELL_VENGEANCE_OF_THE_BLUE_FLIGHT, false); diff --git a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp index 26770f1b641..7b80d7f56f7 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp @@ -226,7 +226,7 @@ class instance_uldaman : public InstanceMapScript for (GuidVector::const_iterator i = archaedasWallMinions.begin(); i != archaedasWallMinions.end(); ++i) { Creature* target = instance->GetCreature(*i); - if (!target || target->isDead() || target->GetFaction() != 14) + if (!target || target->isDead() || target->GetFaction() != FACTION_MONSTER) continue; target->DespawnOrUnsummon(); @@ -236,7 +236,7 @@ class instance_uldaman : public InstanceMapScript for (GuidVector::const_iterator i = vaultWalkers.begin(); i != vaultWalkers.end(); ++i) { Creature* target = instance->GetCreature(*i); - if (!target || target->isDead() || target->GetFaction() != 14) + if (!target || target->isDead() || target->GetFaction() != FACTION_MONSTER) continue; target->DespawnOrUnsummon(); @@ -246,7 +246,7 @@ class instance_uldaman : public InstanceMapScript for (GuidVector::const_iterator i = earthenGuardians.begin(); i != earthenGuardians.end(); ++i) { Creature* target = instance->GetCreature(*i); - if (!target || target->isDead() || target->GetFaction() != 14) + if (!target || target->isDead() || target->GetFaction() != FACTION_MONSTER) continue; target->DespawnOrUnsummon(); |