Core/Spells: move rocket boots spell cast check to spell script. add event for checkcast for deathcoil (dk) heh i forgot it >.<

This commit is contained in:
Kandera
2012-05-18 11:56:23 -04:00
parent 7688c7609f
commit edf1de6d93
3 changed files with 10 additions and 6 deletions
+1 -6
View File
@@ -4986,12 +4986,7 @@ SpellCastResult Spell::CheckCast(bool strict)
{ {
case SPELL_EFFECT_DUMMY: case SPELL_EFFECT_DUMMY:
{ {
if (m_spellInfo->Id == 51582) // Rocket Boots Engaged if (m_spellInfo->Id == 19938) // Awaken Peon
{
if (m_caster->IsInWater())
return SPELL_FAILED_ONLY_ABOVEWATER;
}
else if (m_spellInfo->Id == 19938) // Awaken Peon
{ {
Unit* unit = m_targets.GetUnitTarget(); Unit* unit = m_targets.GetUnitTarget();
if (!unit || !unit->HasAura(17743)) if (!unit || !unit->HasAura(17743))
+1
View File
@@ -769,6 +769,7 @@ class spell_dk_death_coil : public SpellScriptLoader
void Register() void Register()
{ {
OnCheckCast += SpellCheckCastFn(spell_dk_death_coil_SpellScript::CheckCast);
OnEffectHitTarget += SpellEffectFn(spell_dk_death_coil_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); OnEffectHitTarget += SpellEffectFn(spell_dk_death_coil_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
} }
+8
View File
@@ -1748,8 +1748,16 @@ class spell_item_rocket_boots : public SpellScriptLoader
caster->CastSpell(caster, SPELL_ROCKET_BOOTS_PROC, true, NULL); caster->CastSpell(caster, SPELL_ROCKET_BOOTS_PROC, true, NULL);
} }
SpellCastResult CheckCast()
{
if (GetCaster()->IsInWater())
return SPELL_FAILED_ONLY_ABOVEWATER;
return SPELL_CAST_OK;
}
void Register() void Register()
{ {
OnCheckCast += SpellCheckCastFn(spell_item_rocket_boots_SpellScript::CheckCast);
OnEffectHitTarget += SpellEffectFn(spell_item_rocket_boots_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); OnEffectHitTarget += SpellEffectFn(spell_item_rocket_boots_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
} }
}; };