diff options
| author | ForesterDev <11771800+ForesterDev@users.noreply.github.com> | 2019-07-25 14:54:49 +0400 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2021-12-17 20:48:31 +0100 |
| commit | 529ca2dd5d6c4cfcb44188a7139c78ffd6bb1ad0 (patch) | |
| tree | df1175fb2906eb59cde9971cbf6c3c8979f3f46e /src/server/scripts/EasternKingdoms | |
| parent | 2a63135d3761d5c5c6db3349f05ca65db2255966 (diff) | |
Scripts/Defines: cleanup some magic numbers in factions (#23631)
(cherry picked from commit 0c317498a57b3983de61d381d684a77176b281e4)
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 01dffbf2980..9f7231581c6 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.h +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.h @@ -23,13 +23,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 37572cdc7a3..f340efa61cb 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp @@ -955,7 +955,7 @@ public: { deathcharger->AddNpcFlag(UNIT_NPC_FLAG_SPELLCLICK); deathcharger->RemoveUnitFlag(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 002b7703a99..0e318b2d72e 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp @@ -355,7 +355,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); @@ -381,7 +381,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 63169edce7a..1cc72dbbb75 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(); } @@ -235,7 +235,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(); } @@ -244,7 +244,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(); } |