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

fix resistbuffs and damageshields spell type checks

Browse Source
This commit is contained in:
nytmyr
2024-11-26 13:16:58 -06:00
parent d97f691255
commit bdea548460
3 changed files with 4 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/spdat.cpp
+2 -19
View File
@@ -3214,14 +3214,6 @@ bool IsResistanceOnlySpell(uint16 spell_id) {
} }
bool IsDamageShieldOnlySpell(uint16 spell_id) { bool IsDamageShieldOnlySpell(uint16 spell_id) {
if (SpellEffectsCount(spell_id) == 1 && IsEffectInSpell(spell_id, SE_DamageShield)) {
return true;
}
return false;
}
bool IsDamageShieldAndResistanceSpellOnly(uint16 spell_id) {
if (!IsValidSpell(spell_id)) { if (!IsValidSpell(spell_id)) {
return false; return false;
} }
@@ -3234,19 +3226,10 @@ bool IsDamageShieldAndResistanceSpellOnly(uint16 spell_id) {
} }
if ( if (
spell.effect_id[i] == SE_DamageShield || 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
) { ) {
continue; return false;
} }
return false;
} }
return true; return true;
common/spdat.h
-1
View File
@@ -1726,6 +1726,5 @@ bool IsResurrectSpell(uint16 spell_id);
bool RequiresStackCheck(uint16 spellType); bool RequiresStackCheck(uint16 spellType);
bool IsResistanceOnlySpell(uint16 spell_id); bool IsResistanceOnlySpell(uint16 spell_id);
bool IsDamageShieldOnlySpell(uint16 spell_id); bool IsDamageShieldOnlySpell(uint16 spell_id);
bool IsDamageShieldAndResistanceSpellOnly(uint16 spell_id);
#endif #endif
zone/bot.cpp
+2 -2
View File
@@ -10964,7 +10964,7 @@ bool Bot::IsValidSpellTypeBySpellID(uint16 spellType, uint16 spell_id) {
switch (spellType) { switch (spellType) {
case BotSpellTypes::Buff: case BotSpellTypes::Buff:
case BotSpellTypes::PetBuffs: case BotSpellTypes::PetBuffs:
if (IsResistanceOnlySpell(spell_id) || IsDamageShieldOnlySpell(spell_id) || IsDamageShieldAndResistanceSpellOnly(spell_id)) { if (IsResistanceOnlySpell(spell_id) || IsDamageShieldOnlySpell(spell_id)) {
return false; return false;
} }
@@ -10978,7 +10978,7 @@ bool Bot::IsValidSpellTypeBySpellID(uint16 spellType, uint16 spell_id) {
return false; return false;
case BotSpellTypes::DamageShields: case BotSpellTypes::DamageShields:
case BotSpellTypes::PetDamageShields: case BotSpellTypes::PetDamageShields:
if (IsDamageShieldOnlySpell(spell_id) || IsDamageShieldAndResistanceSpellOnly(spell_id)) { if (IsDamageShieldOnlySpell(spell_id)) {
return true; return true;
} }