pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-11 21:01:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Bots] Fix for Bot Pets Taunting (#1519)

Browse Source 
Currently bot pets will taunt and there's no way to turn it off. This makes it so pets follow their owner's taunt settings.
This commit is contained in:
Chris 2021-09-12 23:37:39 -04:00 committed by GitHub
parent 6b93130c13
commit 97dcba70cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
zone/bot_command.cpp
View File

@ -4789,12 +4789,25 @@ void bot_command_taunt(Client *c, const Seperator *sep)
++taunting_count; ++taunting_count;
} }
for (auto bot_iter : sbl) {
if (!bot_iter->HasPet())
continue;
if (!bot_iter->GetPet()->GetSkill(EQ::skills::SkillTaunt))
continue;
if (toggle_taunt)
bot_iter->GetPet()->CastToNPC()->SetTaunting(!bot_iter->GetPet()->CastToNPC()->IsTaunting());
else
bot_iter->GetPet()->CastToNPC()->SetTaunting(taunt_state);
if (sbl.size() == 1)
Bot::BotGroupSay(bot_iter, "My Pet is %s taunting", bot_iter->GetPet()->CastToNPC()->IsTaunting() ? "now" : "no longer");
++taunting_count;
}
if (taunting_count) { if (taunting_count) {
if (toggle_taunt) if (toggle_taunt)
c->Message(m_action, "%i of your bots %s toggled their taunting state", taunting_count, ((taunting_count != 1) ? ("have") : ("has"))); c->Message(m_action, "%i of your bots and their pets %s toggled their taunting state", taunting_count, ((taunting_count != 1) ? ("have") : ("has")));
else else
c->Message(m_action, "%i of your bots %s %s taunting", taunting_count, ((taunting_count != 1) ? ("have") : ("has")), ((taunt_state) ? ("started") : ("stopped"))); c->Message(m_action, "%i of your bots and their pets %s %s taunting", taunting_count, ((taunting_count != 1) ? ("have") : ("has")), ((taunt_state) ? ("started") : ("stopped")));
} }
else { else {
c->Message(m_fail, "None of your bots are capable of taunting"); c->Message(m_fail, "None of your bots are capable of taunting");