mirror of
https://github.com/mangosfour/server.git
synced 2025-12-17 07:37:03 +00:00
[11387] Add dummy and script effect of spell 45958 and dummy aura of spell 45963
Thanks dpedroia15 for parts of 45958. Note: spell 45958 may be processed further with DB table spell_scripts. Signed-off-by: NoFantasy <nofantasy@nf.no>
This commit is contained in:
parent
84482b81ac
commit
c4f2b30205
3 changed files with 29 additions and 1 deletions
|
|
@ -1973,6 +1973,14 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
|
||||||
case 43873: // Headless Horseman Laugh
|
case 43873: // Headless Horseman Laugh
|
||||||
target->PlayDistanceSound(11965);
|
target->PlayDistanceSound(11965);
|
||||||
return;
|
return;
|
||||||
|
case 45963: // Call Alliance Deserter
|
||||||
|
{
|
||||||
|
// Escorting Alliance Deserter
|
||||||
|
if (target->GetMiniPet())
|
||||||
|
target->CastSpell(target, 45957, true);
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
case 46699: // Requires No Ammo
|
case 46699: // Requires No Ammo
|
||||||
if (target->GetTypeId() == TYPEID_PLAYER)
|
if (target->GetTypeId() == TYPEID_PLAYER)
|
||||||
// not use ammo and not allow use
|
// not use ammo and not allow use
|
||||||
|
|
@ -2378,6 +2386,12 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
|
||||||
target->DealDamage(target, target->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
|
target->DealDamage(target, target->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
case 45963: // Call Alliance Deserter
|
||||||
|
{
|
||||||
|
// Escorting Alliance Deserter
|
||||||
|
target->RemoveAurasDueToSpell(45957);
|
||||||
|
return;
|
||||||
|
}
|
||||||
case 46308: // Burning Winds
|
case 46308: // Burning Winds
|
||||||
{
|
{
|
||||||
// casted only at creatures at spawn
|
// casted only at creatures at spawn
|
||||||
|
|
|
||||||
|
|
@ -1434,6 +1434,11 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
case 45958: // Signal Alliance
|
||||||
|
{
|
||||||
|
m_caster->CastSpell(m_caster, m_spellInfo->CalculateSimpleValue(eff_idx), true);
|
||||||
|
return;
|
||||||
|
}
|
||||||
case 45980: // Re-Cursive Transmatter Injection
|
case 45980: // Re-Cursive Transmatter Injection
|
||||||
{
|
{
|
||||||
if (m_caster->GetTypeId() == TYPEID_PLAYER && unitTarget)
|
if (m_caster->GetTypeId() == TYPEID_PLAYER && unitTarget)
|
||||||
|
|
@ -6600,6 +6605,15 @@ void Spell::EffectScriptEffect(SpellEffectIndex eff_idx)
|
||||||
m_caster->SetDisplayId(display_id);
|
m_caster->SetDisplayId(display_id);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
case 45958: // Signal Alliance
|
||||||
|
{
|
||||||
|
// "escort" aura not present, so let nothing happen
|
||||||
|
if (!m_caster->HasAura(m_spellInfo->CalculateSimpleValue(eff_idx)))
|
||||||
|
return;
|
||||||
|
// "escort" aura is present so break; and let DB table spell_scripts be used and process further.
|
||||||
|
else
|
||||||
|
break;
|
||||||
|
}
|
||||||
case 46203: // Goblin Weather Machine
|
case 46203: // Goblin Weather Machine
|
||||||
{
|
{
|
||||||
if (!unitTarget)
|
if (!unitTarget)
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#ifndef __REVISION_NR_H__
|
#ifndef __REVISION_NR_H__
|
||||||
#define __REVISION_NR_H__
|
#define __REVISION_NR_H__
|
||||||
#define REVISION_NR "11386"
|
#define REVISION_NR "11387"
|
||||||
#endif // __REVISION_NR_H__
|
#endif // __REVISION_NR_H__
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue