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/Kalimdor | |
| parent | 2a63135d3761d5c5c6db3349f05ca65db2255966 (diff) | |
Scripts/Defines: cleanup some magic numbers in factions (#23631)
(cherry picked from commit 0c317498a57b3983de61d381d684a77176b281e4)
Diffstat (limited to 'src/server/scripts/Kalimdor')
| -rw-r--r-- | src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp | 5 | ||||
| -rw-r--r-- | src/server/scripts/Kalimdor/zone_tanaris.cpp | 5 | ||||
| -rw-r--r-- | src/server/scripts/Kalimdor/zone_the_barrens.cpp | 6 |
3 files changed, 6 insertions, 10 deletions
diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp index a516cbc05f5..4c6417d8ba6 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp @@ -438,8 +438,7 @@ public: enum zumrahConsts { - ZUMRAH_ID = 7271, - ZUMRAH_HOSTILE_FACTION = 37 + ZUMRAH_ID = 7271 }; class at_zumrah : public AreaTriggerScript @@ -454,7 +453,7 @@ public: if (!pZumrah) return false; - pZumrah->SetFaction(ZUMRAH_HOSTILE_FACTION); + pZumrah->SetFaction(FACTION_TROLL_FROSTMANE); return true; } diff --git a/src/server/scripts/Kalimdor/zone_tanaris.cpp b/src/server/scripts/Kalimdor/zone_tanaris.cpp index 74b047eef4e..d3232c409a9 100644 --- a/src/server/scripts/Kalimdor/zone_tanaris.cpp +++ b/src/server/scripts/Kalimdor/zone_tanaris.cpp @@ -275,8 +275,7 @@ enum Tooga QUEST_TOOGA = 1560, NPC_TORTA = 6015, - POINT_ID_TO_WATER = 1, - FACTION_TOOG_ESCORTEE = 113 + POINT_ID_TO_WATER = 1 }; Position const ToWaterLoc = {-7032.664551f, -4906.199219f, -1.606446f, 0.0f}; @@ -412,7 +411,7 @@ public: void QuestAccept(Player* player, Quest const* quest) override { if (quest->GetQuestId() == QUEST_TOOGA) - StartFollow(player, FACTION_TOOG_ESCORTEE, quest); + StartFollow(player, FACTION_ESCORTEE_N_NEUTRAL_PASSIVE, quest); } }; diff --git a/src/server/scripts/Kalimdor/zone_the_barrens.cpp b/src/server/scripts/Kalimdor/zone_the_barrens.cpp index 5b5add35f17..14948ca16bb 100644 --- a/src/server/scripts/Kalimdor/zone_the_barrens.cpp +++ b/src/server/scripts/Kalimdor/zone_the_barrens.cpp @@ -170,7 +170,6 @@ public: enum TaskmasterFizzule { - FACTION_FRIENDLY_F = 35, SPELL_FLARE = 10113, SPELL_FOLLY = 10137, }; @@ -220,7 +219,7 @@ public: EngagementOver(); me->GetMotionMaster()->MoveIdle(); - me->SetFaction(FACTION_FRIENDLY_F); + me->SetFaction(FACTION_FRIENDLY); me->HandleEmoteCommand(EMOTE_ONESHOT_SALUTE); } @@ -260,7 +259,7 @@ public: { if (FlareCount >= 2) { - if (me->GetFaction() == FACTION_FRIENDLY_F) + if (me->GetFaction() == FACTION_FRIENDLY) return; DoFriend(); @@ -514,7 +513,6 @@ enum Wizzlecrank SAY_END = 6, QUEST_ESCAPE = 863, - FACTION_RATCHET = 637, NPC_PILOT_WIZZ = 3451, NPC_MERCENARY = 3282, }; |