Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 17:27:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

[7581] Move spell 58418, 58420 to script effect (first) from dummy (second). Author: VladimirMangos

Browse Source 
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
This commit is contained in:
megamage
2009-03-29 17:18:51 -06:00
parent 5840bf4467
commit d0877fa006
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/game/SpellEffects.cpp
View File

@@ -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