*fix spell: Tag Murloc (30877)
--HG-- branch : trunk
This commit is contained in:
@@ -2369,6 +2369,7 @@ enum CorpseDynFlags
|
|||||||
#define SPELL_ID_HONORLESS_TARGET 2479 // Honorless target
|
#define SPELL_ID_HONORLESS_TARGET 2479 // Honorless target
|
||||||
#define SPELL_ID_DUEL_BEG 7267 // Beg
|
#define SPELL_ID_DUEL_BEG 7267 // Beg
|
||||||
#define SPELL_ID_DEATH_GATE 50977 // Death Gate
|
#define SPELL_ID_DEATH_GATE 50977 // Death Gate
|
||||||
|
#define SPELL_ID_TAG_MURLOC 30877 // Tag Murloc
|
||||||
|
|
||||||
enum WeatherType
|
enum WeatherType
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -5074,6 +5074,10 @@ SpellCastResult Spell::CheckCast(bool strict)
|
|||||||
//custom check
|
//custom check
|
||||||
switch(m_spellInfo->Id)
|
switch(m_spellInfo->Id)
|
||||||
{
|
{
|
||||||
|
case SPELL_ID_TAG_MURLOC:
|
||||||
|
if (!m_targets.getUnitTarget() || (m_targets.getUnitTarget() && (m_targets.getUnitTarget()->HasAura(SPELL_ID_TAG_MURLOC) || m_targets.getUnitTarget()->GetTypeId() != TYPEID_UNIT || (m_targets.getUnitTarget()->GetTypeId() == TYPEID_UNIT && ((Creature*)m_targets.getUnitTarget())->GetEntry() != 17326 ))))// Tag Murloc, Blacksilt Scout
|
||||||
|
return SPELL_FAILED_BAD_TARGETS;
|
||||||
|
break;
|
||||||
case 61336:
|
case 61336:
|
||||||
if(m_caster->GetTypeId() != TYPEID_PLAYER || !((Player*)m_caster)->IsInFeralForm())
|
if(m_caster->GetTypeId() != TYPEID_PLAYER || !((Player*)m_caster)->IsInFeralForm())
|
||||||
return SPELL_FAILED_ONLY_SHAPESHIFT;
|
return SPELL_FAILED_ONLY_SHAPESHIFT;
|
||||||
|
|||||||
@@ -767,6 +767,7 @@ bool SpellMgr::_isPositiveEffect(uint32 spellId, uint32 effIndex, bool deep) con
|
|||||||
case 50524: // Runic Power Feed
|
case 50524: // Runic Power Feed
|
||||||
return false;
|
return false;
|
||||||
case 12042: // Arcane Power
|
case 12042: // Arcane Power
|
||||||
|
case SPELL_ID_TAG_MURLOC: // Tag Murloc
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -3806,6 +3807,10 @@ void SpellMgr::LoadSpellCustomAttr()
|
|||||||
spellInfo->AttributesEx5 |= SPELL_ATTR_EX5_START_PERIODIC_AT_APPLY;
|
spellInfo->AttributesEx5 |= SPELL_ATTR_EX5_START_PERIODIC_AT_APPLY;
|
||||||
count++;
|
count++;
|
||||||
break;
|
break;
|
||||||
|
case SPELL_ID_TAG_MURLOC:
|
||||||
|
spellInfo->EffectImplicitTargetA[0] = TARGET_UNIT_NEARBY_ENTRY;
|
||||||
|
spellInfo->EffectImplicitTargetB[0] = 0;
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user