Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-18 16:38:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Trigger offhand hit for Whirlwind

Browse Source 
*Allow to cast conflagrate if target is affected by shadowflame

--HG--
branch : trunk
This commit is contained in:
QAston
2009-04-25 13:58:26 +02:00
parent fdc94c91fa
commit e23ec703fe
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/game/SpellAuras.cpp
View File

@@ -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)

5
src/game/SpellMgr.cpp
View File

@@ -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;
}