pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-25 18:47:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use GetTempSpellType() for announce check in RaidGroupSay

Browse Source
This commit is contained in:
nytmyr
2025-01-31 17:27:13 -06:00
parent 980aa65ecc
commit a008e75a1c
2 changed files with 8 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/bot.cpp
+8
View File
@@ -7911,6 +7911,14 @@ void Bot::SetDefaultBotStance() {
} }
void Bot::RaidGroupSay(Mob* speaker, const char* msg, ...) { void Bot::RaidGroupSay(Mob* speaker, const char* msg, ...) {
if (
speaker->CastToBot()->GetTempSpellType() &&
speaker->CastToBot()->GetTempSpellType() != UINT16_MAX &&
!speaker->CastToBot()->GetSpellTypeAnnounceCast(speaker->CastToBot()->GetTempSpellType())
) {
return;
}
char buf[1000]; char buf[1000];
va_list ap; va_list ap;
va_start(ap, msg); va_start(ap, msg);
zone/botspellsai.cpp
-36
View File
@@ -254,10 +254,6 @@ bool Bot::AICastSpell(Mob* tar, uint8 chance, uint16 spell_type, uint16 sub_targ
SetCastedSpellType(spell_type); SetCastedSpellType(spell_type);
} }
if (!GetSpellTypeAnnounceCast(spell_type)) {
return true;
}
RaidGroupSay( RaidGroupSay(
this, this,
fmt::format( fmt::format(
@@ -305,10 +301,6 @@ bool Bot::BotCastMez(Mob* tar, uint8 bot_class, BotSpell& bot_spell, uint16 spel
SetCastedSpellType(spell_type); SetCastedSpellType(spell_type);
} }
if (!GetSpellTypeAnnounceCast(spell_type)) {
return true;
}
RaidGroupSay( RaidGroupSay(
this, this,
fmt::format( fmt::format(
@@ -352,10 +344,6 @@ bool Bot::BotCastCure(Mob* tar, uint8 bot_class, BotSpell& bot_spell, uint16 spe
} }
} }
if (!GetSpellTypeAnnounceCast(spell_type)) {
return true;
}
RaidGroupSay( RaidGroupSay(
this, this,
fmt::format( fmt::format(
@@ -369,10 +357,6 @@ bool Bot::BotCastCure(Mob* tar, uint8 bot_class, BotSpell& bot_spell, uint16 spe
SetBotSpellRecastTimer(spell_type, tar, true); SetBotSpellRecastTimer(spell_type, tar, true);
} }
if (!GetSpellTypeAnnounceCast(spell_type)) {
return true;
}
RaidGroupSay( RaidGroupSay(
this, this,
fmt::format( fmt::format(
@@ -427,10 +411,6 @@ bool Bot::BotCastPet(Mob* tar, uint8 bot_class, BotSpell& bot_spell, uint16 spel
if (AIDoSpellCast(bot_spell.SpellIndex, tar, bot_spell.ManaCost)) { if (AIDoSpellCast(bot_spell.SpellIndex, tar, bot_spell.ManaCost)) {
SetCastedSpellType(spell_type); SetCastedSpellType(spell_type);
if (!GetSpellTypeAnnounceCast(spell_type)) {
return true;
}
RaidGroupSay( RaidGroupSay(
this, this,
fmt::format( fmt::format(
@@ -487,10 +467,6 @@ bool Bot::BotCastNuke(Mob* tar, uint8 bot_class, BotSpell& bot_spell, uint16 spe
if (AIDoSpellCast(s.SpellIndex, tar, s.ManaCost)) { if (AIDoSpellCast(s.SpellIndex, tar, s.ManaCost)) {
SetCastedSpellType(spell_type); SetCastedSpellType(spell_type);
if (!GetSpellTypeAnnounceCast(spell_type)) {
return true;
}
RaidGroupSay( RaidGroupSay(
this, this,
fmt::format( fmt::format(
@@ -509,10 +485,6 @@ bool Bot::BotCastNuke(Mob* tar, uint8 bot_class, BotSpell& bot_spell, uint16 spe
if (AIDoSpellCast(bot_spell.SpellIndex, tar, bot_spell.ManaCost)) { if (AIDoSpellCast(bot_spell.SpellIndex, tar, bot_spell.ManaCost)) {
SetCastedSpellType(spell_type); SetCastedSpellType(spell_type);
if (!GetSpellTypeAnnounceCast(spell_type)) {
return true;
}
RaidGroupSay( RaidGroupSay(
this, this,
fmt::format( fmt::format(
@@ -549,10 +521,6 @@ bool Bot::BotCastHeal(Mob* tar, uint8 bot_class, BotSpell& bot_spell, uint16 spe
} }
} }
if (!GetSpellTypeAnnounceCast(spell_type)) {
return true;
}
RaidGroupSay( RaidGroupSay(
this, this,
fmt::format( fmt::format(
@@ -570,10 +538,6 @@ bool Bot::BotCastHeal(Mob* tar, uint8 bot_class, BotSpell& bot_spell, uint16 spe
} }
} }
if (!GetSpellTypeAnnounceCast(spell_type)) {
return true;
}
RaidGroupSay( RaidGroupSay(
this, this,
fmt::format( fmt::format(