From 7a4cac84ac93c39d27920a1951a79a630665c144 Mon Sep 17 00:00:00 2001 From: Uleat Date: Fri, 10 May 2013 22:24:56 -0400 Subject: [PATCH] -- Added missing wrapper to bot update message -- Added notes to AESpell() update --- zone/bot.cpp | 3 ++- zone/effects.cpp | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/zone/bot.cpp b/zone/bot.cpp index c274454e0..47f974444 100644 --- a/zone/bot.cpp +++ b/zone/bot.cpp @@ -11931,7 +11931,7 @@ void Bot::CalcBotStats(bool showtext) { GetBotOwner()->Message(15, "Level: %i HP: %i AC: %i Mana: %i STR: %i STA: %i DEX: %i AGI: %i INT: %i WIS: %i CHA: %i", GetLevel(), max_hp, GetAC(), max_mana, GetSTR(), GetSTA(), GetDEX(), GetAGI(), GetINT(), GetWIS(), GetCHA()); GetBotOwner()->Message(15, "Resists-- Magic: %i, Poison: %i, Fire: %i, Cold: %i, Disease: %i, Corruption: %i.",GetMR(),GetPR(),GetFR(),GetCR(),GetDR(),GetCorrup()); // Test Code - if(GetClass() == BARD) + if(GetClass() == BARD) { GetBotOwner()->Message(15, "Bard Skills-- Brass: %i, Percussion: %i, Singing: %i, Stringed: %i, Wind: %i", GetSkill(BRASS_INSTRUMENTS) + GetBrassMod(), GetSkill(PERCUSSION_INSTRUMENTS) + GetPercMod(), @@ -11939,6 +11939,7 @@ void Bot::CalcBotStats(bool showtext) { GetSkill(STRINGED_INSTRUMENTS) + GetStringMod(), GetSkill(WIND_INSTRUMENTS) + GetWindMod()); GetBotOwner()->Message(15, "Bard Skill Mods-- Brass: %i, Percussion: %i, Singing: %i, Stringed: %i, Wind: %i", GetBrassMod(), GetPercMod(), GetSingMod(), GetStringMod(), GetWindMod()); + } } } diff --git a/zone/effects.cpp b/zone/effects.cpp index 15016da62..55ca41630 100644 --- a/zone/effects.cpp +++ b/zone/effects.cpp @@ -707,6 +707,9 @@ void EntityList::AESpell(Mob *caster, Mob *center, uint16 spell_id, bool affect_ continue; } else { // check to stop casting beneficial ae buffs (to wit: bard songs) on enemies... + // This does not check faction for beneficial AE buffs..only agro and attackable. + // I've tested for spells that I can find without problem, but a faction-based + // check may still be needed. Any changes here should also reflect in BardAEPulse() -U if(caster->IsAttackAllowed(curmob, true)) continue; if(caster->CheckAggro(curmob)) @@ -819,6 +822,7 @@ void EntityList::AEBardPulse(Mob *caster, Mob *center, uint16 spell_id, bool aff continue; } else { // check to stop casting beneficial ae buffs (to wit: bard songs) on enemies... + // See notes in AESpell() above for more info. if(caster->IsAttackAllowed(curmob, true)) continue; if(caster->CheckAggro(curmob))