From 9f8cfb77d491a95d49884658b9ba4f4370169d9d Mon Sep 17 00:00:00 2001 From: Daggy Date: Wed, 5 Jan 2011 10:22:44 +0100 Subject: [PATCH] [10967] Add dummy effect of spell 38194 and limit it's maxTargets Correct order of spellfamily case. Note: triggered spell 38203 needs target map fill Signed-off-by: NoFantasy --- src/game/Spell.cpp | 18 ++++++++++++------ src/game/SpellEffects.cpp | 8 ++++++++ src/shared/revision_nr.h | 2 +- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index 38674a2ec..2e1b033c6 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -1517,6 +1517,18 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList& } break; } + case SPELLFAMILY_MAGE: + { + if (m_spellInfo->Id == 38194) // Blink + unMaxTargets = 1; + break; + } + case SPELLFAMILY_DRUID: + { + if (m_spellInfo->SpellFamilyFlags2 & 0x00000100)// Starfall + unMaxTargets = 2; + break; + } case SPELLFAMILY_PALADIN: if (m_spellInfo->Id == 20424) // Seal of Command (2 more target for single targeted spell) { @@ -1529,12 +1541,6 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList& EffectChainTarget = 0; // no chain targets } break; - case SPELLFAMILY_DRUID: - { - if (m_spellInfo->SpellFamilyFlags2 & 0x00000100)// Starfall - unMaxTargets = 2; - break; - } default: break; } diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 714a95254..27fd9a2da 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -1154,6 +1154,14 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx) m_caster->CastCustomSpell(unitTarget, 37675, &basepoints0, NULL, NULL, true); return; } + case 38194: // Blink + { + // Blink + if (unitTarget) + m_caster->CastSpell(unitTarget, 38203, true); + + return; + } case 40802: // Mingo's Fortune Generator (Mingo's Fortune Giblets) { // selecting one from Bloodstained Fortune item diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index f26162839..ccad7175d 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "10966" + #define REVISION_NR "10967" #endif // __REVISION_NR_H__