From b738f8852d1241e4a9e309d4b204f4d04193f2cf Mon Sep 17 00:00:00 2001 From: Akkadius Date: Mon, 2 Sep 2019 03:37:18 -0500 Subject: [PATCH] Logs::AA to LogAA --- zone/bonuses.cpp | 4 ++-- zone/client_packet.cpp | 8 ++++---- zone/spells.cpp | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/zone/bonuses.cpp b/zone/bonuses.cpp index 630b75c22..ad314d214 100644 --- a/zone/bonuses.cpp +++ b/zone/bonuses.cpp @@ -663,7 +663,7 @@ void Mob::ApplyAABonuses(const AA::Rank &rank, StatBonuses *newbon) effect == SE_StackingCommand_Overwrite) continue; - Log(Logs::Detail, Logs::AA, "Applying Effect %d from AA %u in slot %d (base1: %d, base2: %d) on %s", + LogAA("Applying Effect [{}] from AA [{}] in slot [{}] (base1: [{}], base2: [{}]) on [{}]", effect, rank.id, slot, base1, base2, GetCleanName()); uint8 focus = IsFocusEffect(0, 0, true, effect); @@ -1537,7 +1537,7 @@ void Mob::ApplyAABonuses(const AA::Rank &rank, StatBonuses *newbon) break; default: - Log(Logs::Detail, Logs::AA, "SPA %d not accounted for in AA %s (%d)", effect, rank.base_ability->name.c_str(), rank.id); + LogAA("SPA [{}] not accounted for in AA [{}] ([{}])", effect, rank.base_ability->name.c_str(), rank.id); break; } diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp index 95efac802..858724e71 100644 --- a/zone/client_packet.cpp +++ b/zone/client_packet.cpp @@ -1731,16 +1731,16 @@ void Client::Handle_0x0193(const EQApplicationPacket *app) void Client::Handle_OP_AAAction(const EQApplicationPacket *app) { - Log(Logs::Detail, Logs::AA, "Received OP_AAAction"); + LogAA("Received OP_AAAction"); if (app->size != sizeof(AA_Action)) { - Log(Logs::General, Logs::AA, "Error! OP_AAAction size didnt match!"); + LogAA("Error! OP_AAAction size didnt match!"); return; } AA_Action* action = (AA_Action*)app->pBuffer; if (action->action == aaActionActivate) {//AA Hotkey - Log(Logs::Detail, Logs::AA, "Activating AA %d", action->ability); + LogAA("Activating AA [{}]", action->ability); ActivateAlternateAdvancementAbility(action->ability, action->target_id); } else if (action->action == aaActionBuy) { @@ -1765,7 +1765,7 @@ void Client::Handle_OP_AAAction(const EQApplicationPacket *app) SendAlternateAdvancementTable(); } else { - Log(Logs::General, Logs::AA, "Unknown AA action : %u %u %u %d", action->action, action->ability, action->target_id, action->exp_value); + LogAA("Unknown AA action : [{}] [{}] [{}] [{}]", action->action, action->ability, action->target_id, action->exp_value); } } diff --git a/zone/spells.cpp b/zone/spells.cpp index 2ebbf9e6b..d4abd2057 100644 --- a/zone/spells.cpp +++ b/zone/spells.cpp @@ -1500,7 +1500,7 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce && (IsGrouped() // still self only if not grouped || IsRaidGrouped()) && (HasProjectIllusion())){ - Log(Logs::Detail, Logs::AA, "Project Illusion overwrote target caster: %s spell id: %d was ON", GetName(), spell_id); + LogAA("Project Illusion overwrote target caster: [{}] spell id: [{}] was ON", GetName(), spell_id); targetType = ST_GroupClientAndPet; } @@ -2231,11 +2231,11 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, CastingSlot slot, ui if(IsPlayerIllusionSpell(spell_id) && IsClient() && (HasProjectIllusion())){ - Log(Logs::Detail, Logs::AA, "Effect Project Illusion for %s on spell id: %d was ON", GetName(), spell_id); + LogAA("Effect Project Illusion for [{}] on spell id: [{}] was ON", GetName(), spell_id); SetProjectIllusion(false); } else{ - Log(Logs::Detail, Logs::AA, "Effect Project Illusion for %s on spell id: %d was OFF", GetName(), spell_id); + LogAA("Effect Project Illusion for [{}] on spell id: [{}] was OFF", GetName(), spell_id); } break; }