diff options
| author | megamage <none@none> | 2009-03-29 17:18:51 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-03-29 17:18:51 -0600 |
| commit | d0877fa0069aabf8534089f38fe153badb88f45b (patch) | |
| tree | 4332a1ade99712769579c9ed18d397aa7dda9d0b /src | |
| parent | 5840bf44672357faad859f3e772f50e40931b97b (diff) | |
[7581] Move spell 58418, 58420 to script effect (first) from dummy (second). Author: VladimirMangos
In new spell data second dummy effect often use for additional info (script+dummy) or (dummy+dummy) and not called in fact.
--HG--
branch : trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/SpellEffects.cpp | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 46bbd8fbb0b..57b43c834bb 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -1242,18 +1242,7 @@ void Spell::EffectDummy(uint32 i) } case 58418: // Portal to Orgrimmar case 58420: // Portal to Stormwind - { - if(!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER) - return; - - uint32 spellID = m_spellInfo->EffectBasePoints[0] + 1; - uint32 questID = m_spellInfo->EffectBasePoints[1] + 1; - - if( ((Player*)unitTarget)->GetQuestStatus(questID) == QUEST_STATUS_COMPLETE && !((Player*)unitTarget)->GetQuestRewardStatus (questID) ) - unitTarget->CastSpell(unitTarget, spellID, true); - - return; - } + return; // implemented in EffectScript[0] } //All IconID Check in there @@ -4758,6 +4747,20 @@ void Spell::EffectScriptEffect(uint32 effIndex) unitTarget->CastSpell(unitTarget, damage, false); break; } + case 58418: // Portal to Orgrimmar + case 58420: // Portal to Stormwind + { + if(!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER || effIndex!=0) + return; + + uint32 spellID = m_spellInfo->EffectBasePoints[0] + 1; + uint32 questID = m_spellInfo->EffectBasePoints[1] + 1; + + if( ((Player*)unitTarget)->GetQuestStatus(questID) == QUEST_STATUS_COMPLETE && !((Player*)unitTarget)->GetQuestRewardStatus (questID) ) + unitTarget->CastSpell(unitTarget, spellID, true); + + return; + } // random spell learn instead placeholder case 60893: // Northrend Alchemy Research case 61177: // Northrend Inscription Research |