mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-20 16:37:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[c12534] Implement spell effects 50742, 50810 and 61546

Browse source 
(based on commit [12387] - 0bb915d)
This commit is contained in:
Xfurry 2013-03-03 17:36:22 +02:00 • committed by Antz
parent 3ff9317e54
commit 2502fb8a46
3 changed files with 26 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/game/Spell.cpp
View file

@ -1714,8 +1714,10 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList&
case 45976: // Open Portal case 45976: // Open Portal
case 47669: // Awaken Subboss case 47669: // Awaken Subboss
case 48278: // Paralyze (Utgarde Pinnacle) case 48278: // Paralyze (Utgarde Pinnacle)
case 50742: // Ooze Combine (Halls of Stone)
case 50988: // Glare of the Tribunal (Halls of Stone) case 50988: // Glare of the Tribunal (Halls of Stone)
case 51146: // Searching Gaze (Halls Of Stone) case 51003: // Summon Dark Matter Target (Halls of Stone)
case 51146: // Summon Searing Gaze Target (Halls Of Stone)
case 52438: // Summon Skittering Swarmer (Azjol Nerub, Krik'thir the Gatewatcher) case 52438: // Summon Skittering Swarmer (Azjol Nerub, Krik'thir the Gatewatcher)
case 53457: // Impale (Azjol Nerub, Anub'arak) case 53457: // Impale (Azjol Nerub, Anub'arak)
case 54148: // Ritual of the Sword (Utgarde Pinnacle, Svala) case 54148: // Ritual of the Sword (Utgarde Pinnacle, Svala)

22
src/game/SpellEffects.cpp
View file

@ -7895,6 +7895,28 @@ void Spell::EffectScriptEffect(SpellEffectEntry const* effect)
((Player*)caster)->RemoveSpellCategoryCooldown(82, true); ((Player*)caster)->RemoveSpellCategoryCooldown(82, true);
return; return;
} }
case 50742: // Ooze Combine
{
if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT)
return;
m_caster->CastSpell(unitTarget, 50747, true);
((Creature*)m_caster)->ForcedDespawn();
return;
}
case 50810: // Shatter
case 61546: // Shatter (h)
{
if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
return;
if (!unitTarget->HasAura(50812))
return;
unitTarget->RemoveAurasDueToSpell(50812);
unitTarget->CastSpell(unitTarget, m_spellInfo->Id == 50810 ? 50811 : 61547 , true, NULL, NULL, m_caster->GetObjectGuid());
return;
}
case 50894: // Zul'Drak Rat case 50894: // Zul'Drak Rat
{ {
if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT) if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT)

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "12533" #define REVISION_NR "12534"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__