diff --git a/changelog.txt b/changelog.txt index 4c90cd163..a6a01f28a 100644 --- a/changelog.txt +++ b/changelog.txt @@ -2,6 +2,7 @@ EQEMu Changelog (Started on Sept 24, 2003 15:50) ------------------------------------------------------- == 11/10/2014 == Uleat: Fix for GM Trainer crashing server (really!) +JJ: Yellow faction messages. == 11/09/2014 == Kayen: Implemented support for spell target type (45) 'Target Rings' on Underfoot (does work earlier expansions). Thanks to Lecht for figuring out the op_code side. diff --git a/zone/client.cpp b/zone/client.cpp index 52f046dfd..a8a3f6f8d 100644 --- a/zone/client.cpp +++ b/zone/client.cpp @@ -7754,15 +7754,15 @@ void Client::SendFactionMessage(int32 tmpvalue, int32 faction_id, int32 totalval if (tmpvalue == 0 || temp == 1 || temp == 2) return; else if (totalvalue >= MAX_PERSONAL_FACTION) - Message_StringID(0, FACTION_BEST, name); + Message_StringID(15, FACTION_BEST, name); else if (totalvalue <= MIN_PERSONAL_FACTION) - Message_StringID(0, FACTION_WORST, name); + Message_StringID(15, FACTION_WORST, name); else if (tmpvalue > 0 && totalvalue < MAX_PERSONAL_FACTION && !RuleB(Client, UseLiveFactionMessage)) - Message_StringID(0, FACTION_BETTER, name); + Message_StringID(15, FACTION_BETTER, name); else if (tmpvalue < 0 && totalvalue > MIN_PERSONAL_FACTION && !RuleB(Client, UseLiveFactionMessage)) - Message_StringID(0, FACTION_WORSE, name); + Message_StringID(15, FACTION_WORSE, name); else if (RuleB(Client, UseLiveFactionMessage)) - Message(0, "Your faction standing with %s has been adjusted by %i.", name, tmpvalue); //New Live faction message (14261) + Message(15, "Your faction standing with %s has been adjusted by %i.", name, tmpvalue); //New Live faction message (14261) return; }