diff options
| author | QAston <none@none> | 2009-04-25 13:58:26 +0200 |
|---|---|---|
| committer | QAston <none@none> | 2009-04-25 13:58:26 +0200 |
| commit | e23ec703fedf828f37be5bd3a37b4db4359c8d9d (patch) | |
| tree | b14ea9a63ec9904b905cdf56bb395bd56c1bb8a6 /src | |
| parent | fdc94c91fade8a88b30a478abe7244529e519e0c (diff) | |
*Trigger offhand hit for Whirlwind
*Allow to cast conflagrate if target is affected by shadowflame
--HG--
branch : trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/SpellAuras.cpp | 5 | ||||
| -rw-r--r-- | src/game/SpellMgr.cpp | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index d476f7dcd91..bba2dee3973 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -1013,8 +1013,9 @@ void Aura::_AddAura() if (IsSealSpell(m_spellProto)) SetAuraState(AURA_STATE_JUDGEMENT); - // Conflagrate aura state on Immolate - if (m_spellProto->SpellFamilyName == SPELLFAMILY_WARLOCK && m_spellProto->SpellFamilyFlags[0] & 4) + // Conflagrate aura state on Immolate or Shadowflame + if (m_spellProto->SpellFamilyName == SPELLFAMILY_WARLOCK && (m_spellProto->SpellFamilyFlags[0] & 4 + || m_spellProto->SpellFamilyFlags[2] & 2)) SetAuraState(AURA_STATE_IMMOLATE); // Faerie Fire (druid versions) diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index 3e9992b6544..53b72f7297f 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -2310,7 +2310,10 @@ void SpellMgr::LoadSpellCustomAttr() spellInfo->speed = SPEED_CHARGE; mSpellCustomAttr[i] |= SPELL_ATTR_CU_CHARGE; case SPELL_EFFECT_TRIGGER_SPELL: - if(spellInfo->Targets & (TARGET_FLAG_SOURCE_LOCATION|TARGET_FLAG_DEST_LOCATION)) + //if(spellInfo->Targets & (TARGET_FLAG_SOURCE_LOCATION|TARGET_FLAG_DEST_LOCATION)) + if (SpellTargetType[spellInfo->EffectImplicitTargetA[j]]== TARGET_TYPE_DEST_CASTER || + SpellTargetType[spellInfo->EffectImplicitTargetA[j]]== TARGET_TYPE_DEST_TARGET || + SpellTargetType[spellInfo->EffectImplicitTargetA[j]]== TARGET_TYPE_DEST_DEST) spellInfo->Effect[j] = SPELL_EFFECT_TRIGGER_MISSILE; break; } |