pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-31 09:06:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rename BOT_SPELL_TYPE functions

Browse Source
This commit is contained in:
nytmyr
2024-12-01 23:33:21 -06:00
parent 003598a348
commit 8c923a6c51
7 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/bot_commands/cast.cpp
+4 -4
View File
@@ -339,7 +339,7 @@ void bot_command_cast(Client* c, const Seperator* sep)
break;
default:
if (
(BOT_SPELL_TYPES_DETRIMENTAL(spellType) && !c->IsAttackAllowed(tar)) ||
(IsBotSpellTypeDetrimental(spellType) && !c->IsAttackAllowed(tar)) ||
(
spellType == BotSpellTypes::Charm &&
(
@@ -354,7 +354,7 @@ void bot_command_cast(Client* c, const Seperator* sep)
return;
}
if (BOT_SPELL_TYPES_BENEFICIAL(spellType)) {
if (IsBotSpellTypeBeneficial(spellType)) {
if (
(!tar->IsOfClientBot() && !(tar->IsPet() && tar->GetOwner() && tar->GetOwner()->IsOfClientBot())) ||
((tar->IsOfClientBot() && !c->IsInGroupOrRaid(tar)) || (tar->GetOwner() && tar->GetOwner()->IsOfClientBot() && !c->IsInGroupOrRaid(tar->GetOwner())))
@@ -418,14 +418,14 @@ void bot_command_cast(Client* c, const Seperator* sep)
}
if (
BOT_SPELL_TYPES_BENEFICIAL(spellType) &&
IsBotSpellTypeBeneficial(spellType) &&
!RuleB(Bots, CrossRaidBuffingAndHealing) &&
!bot_iter->IsInGroupOrRaid(newTar, true)
) {
continue;
}
if (BOT_SPELL_TYPES_DETRIMENTAL(spellType, bot_iter->GetClass()) && !bot_iter->IsAttackAllowed(newTar)) {
if (IsBotSpellTypeDetrimental(spellType, bot_iter->GetClass()) && !bot_iter->IsAttackAllowed(newTar)) {
bot_iter->BotGroupSay(
bot_iter,
fmt::format(
zone/bot_commands/depart.cpp
+1 -1
View File
@@ -249,7 +249,7 @@ void bot_command_depart(Client* c, const Seperator* sep)
}
if (bot_iter->CastSpell(itr->SpellId, tar->GetID(), EQ::spells::CastingSlot::Gem2, -1, -1)) {
if (BOT_SPELL_TYPES_OTHER_BENEFICIAL(BotSpellTypes::Teleport)) {
if (IsBotSpellTypeOtherBeneficial(BotSpellTypes::Teleport)) {
bot_iter->SetCastedSpellType(UINT16_MAX);
}
else {