josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Fix mind flay target requirements.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
QAston
2009-03-11 22:27:07 +01:00
parent 5808c12f5e
commit 6683ae58c9
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/SpellMgr.cpp
+6 -3
View File
@@ -513,7 +513,7 @@ bool IsPositiveTarget(uint32 targetA, uint32 targetB)
return true; return true;
} }
bool IsPositiveEffect(uint32 spellId, uint32 effIndex) bool IsPositiveEffect(uint32 spellId, uint32 effIndex, bool deep)
{ {
SpellEntry const *spellproto = sSpellStore.LookupEntry(spellId); SpellEntry const *spellproto = sSpellStore.LookupEntry(spellId);
if (!spellproto) return false; if (!spellproto) return false;
@@ -702,11 +702,14 @@ bool IsPositiveEffect(uint32 spellId, uint32 effIndex)
if(spellproto->AttributesEx & SPELL_ATTR_EX_NEGATIVE) if(spellproto->AttributesEx & SPELL_ATTR_EX_NEGATIVE)
return false; return false;
if (!deep && spellproto->EffectTriggerSpell[effIndex] && !IsPositiveSpell(spellproto->EffectTriggerSpell[effIndex], true))
return false;
// ok, positive // ok, positive
return true; return true;
} }
bool IsPositiveSpell(uint32 spellId) bool IsPositiveSpell(uint32 spellId, bool deep)
{ {
SpellEntry const *spellproto = sSpellStore.LookupEntry(spellId); SpellEntry const *spellproto = sSpellStore.LookupEntry(spellId);
if (!spellproto) return false; if (!spellproto) return false;
@@ -714,7 +717,7 @@ bool IsPositiveSpell(uint32 spellId)
// spells with at least one negative effect are considered negative // spells with at least one negative effect are considered negative
// some self-applied spells have negative effects but in self casting case negative check ignored. // some self-applied spells have negative effects but in self casting case negative check ignored.
for (int i = 0; i < 3; i++) for (int i = 0; i < 3; i++)
if (!IsPositiveEffect(spellId, i)) if (!IsPositiveEffect(spellId, i, deep))
return false; return false;
return true; return true;
} }
src/game/SpellMgr.h
+2 -2
View File
@@ -408,8 +408,8 @@ inline bool IsNonCombatSpell(SpellEntry const *spellInfo)
return (spellInfo->Attributes & SPELL_ATTR_CANT_USED_IN_COMBAT) != 0; return (spellInfo->Attributes & SPELL_ATTR_CANT_USED_IN_COMBAT) != 0;
} }
bool IsPositiveSpell(uint32 spellId); bool IsPositiveSpell(uint32 spellId, bool deep = false);
bool IsPositiveEffect(uint32 spellId, uint32 effIndex); bool IsPositiveEffect(uint32 spellId, uint32 effIndex, bool deep = false);
bool IsPositiveTarget(uint32 targetA, uint32 targetB); bool IsPositiveTarget(uint32 targetA, uint32 targetB);
bool IsSingleTargetSpell(SpellEntry const *spellInfo); bool IsSingleTargetSpell(SpellEntry const *spellInfo);