pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-17 03:08:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Correct pet buff type logic to catch DS/Resists with other spell effects in them

Browse Source
This commit is contained in:
nytmyr
2025-01-31 15:40:47 -06:00
parent c5aa1ea06f
commit e5bcb6acfc
4 changed files with 64 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/spdat.cpp
+57
View File
@@ -2824,6 +2824,34 @@ bool IsResurrectSpell(uint16 spell_id)
return IsEffectInSpell(spell_id, SE_Revive);
}
bool IsResistanceBuffSpell(uint16 spell_id) {
if (!IsValidSpell(spell_id)) {
return false;
}
const auto& spell = spells[spell_id];
for (int i = 0; i < EFFECT_COUNT; i++) {
if (IsBlankSpellEffect(spell_id, i)) {
continue;
}
if (
spell.effect_id[i] == SE_ResistFire ||
spell.effect_id[i] == SE_ResistCold ||
spell.effect_id[i] == SE_ResistPoison ||
spell.effect_id[i] == SE_ResistDisease ||
spell.effect_id[i] == SE_ResistMagic ||
spell.effect_id[i] == SE_ResistCorruption ||
spell.effect_id[i] == SE_ResistAll
) {
return true;
}
}
return false;
}
bool IsResistanceOnlySpell(uint16 spell_id) {
if (!IsValidSpell(spell_id)) {
return false;
@@ -2876,6 +2904,35 @@ bool IsDamageShieldOnlySpell(uint16 spell_id) {
return true;
}
bool IsDamageShieldAndResistSpell(uint16 spell_id) {
if (!IsValidSpell(spell_id)) {
return false;
}
const auto& spell = spells[spell_id];
for (int i = 0; i < EFFECT_COUNT; i++) {
if (IsBlankSpellEffect(spell_id, i)) {
continue;
}
if (
spell.effect_id[i] != SE_DamageShield &&
spell.effect_id[i] != SE_ResistFire &&
spell.effect_id[i] != SE_ResistCold &&
spell.effect_id[i] != SE_ResistPoison &&
spell.effect_id[i] != SE_ResistDisease &&
spell.effect_id[i] != SE_ResistMagic &&
spell.effect_id[i] != SE_ResistCorruption &&
spell.effect_id[i] != SE_ResistAll
) {
return false;
}
}
return true;
}
bool IsHateSpell(uint16 spell_id) {
if (!IsValidSpell(spell_id)) {
return false;
common/spdat.h
+2
View File
@@ -1908,8 +1908,10 @@ bool IsLichSpell(uint16 spell_id);
bool IsInstantHealSpell(uint32 spell_id);
bool IsResurrectSpell(uint16 spell_id);
bool RequiresStackCheck(uint16 spell_type);
bool IsResistanceBuffSpell(uint16 spell_id);
bool IsResistanceOnlySpell(uint16 spell_id);
bool IsDamageShieldOnlySpell(uint16 spell_id);
bool IsDamageShieldAndResistSpell(uint16 spell_id);
bool IsHateSpell(uint16 spell_id);
#endif
zone/bot.cpp
+4 -3
View File
@@ -11572,7 +11572,8 @@ bool Bot::IsValidSpellTypeBySpellID(uint16 spell_type, uint16 spell_id) {
case BotSpellTypes::PetBuffs:
if (
IsResistanceOnlySpell(spell_id) ||
IsDamageShieldOnlySpell(spell_id)
IsDamageShieldOnlySpell(spell_id) ||
IsDamageShieldAndResistSpell(spell_id)
) {
return false;
}
@@ -11580,14 +11581,14 @@ bool Bot::IsValidSpellTypeBySpellID(uint16 spell_type, uint16 spell_id) {
return true;
case BotSpellTypes::ResistBuffs:
case BotSpellTypes::PetResistBuffs:
if (IsResistanceOnlySpell(spell_id)) {
if (IsResistanceBuffSpell(spell_id)) {
return true;
}
return false;
case BotSpellTypes::DamageShields:
case BotSpellTypes::PetDamageShields:
if (IsDamageShieldOnlySpell(spell_id)) {
if (IsEffectInSpell(spell_id, SE_DamageShield)) {
return true;
}
zone/botspellsai.cpp
+1 -4
View File
@@ -32,10 +32,7 @@ bool Bot::AICastSpell(Mob* tar, uint8 chance, uint16 spell_type, uint16 sub_targ
!AI_HasSpells() ||
(spell_type == BotSpellTypes::Pet && tar != this) ||
(IsPetBotSpellType(spell_type) && !tar->IsPet()) ||
(spell_type == BotSpellTypes::Buff && tar->IsPet()) ||
(spell_type == BotSpellTypes::InCombatBuffSong && tar->IsPet()) ||
(spell_type == BotSpellTypes::OutOfCombatBuffSong && tar->IsPet()) ||
(spell_type == BotSpellTypes::PreCombatBuffSong && tar->IsPet()) ||
(!IsPetBotSpellType(spell_type) && tar->IsPet()) ||
(!RuleB(Bots, AllowBuffingHealingFamiliars) && tar->IsFamiliar()) ||
(tar->IsPet() && tar->IsCharmed() && spell_type == BotSpellTypes::PetBuffs && !RuleB(Bots, AllowCharmedPetBuffs)) ||
(tar->IsPet() && tar->IsCharmed() && spell_type == BotSpellTypes::PetCures && !RuleB(Bots, AllowCharmedPetCures)) ||