diff options
Diffstat (limited to 'src/server/game/Spells/SpellEffects.cpp')
| -rw-r--r-- | src/server/game/Spells/SpellEffects.cpp | 40 |
1 files changed, 27 insertions, 13 deletions
diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 116dac3c4ab..ba29fbe875f 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -207,7 +207,7 @@ SpellEffectHandlerFn SpellEffectHandlers[TOTAL_SPELL_EFFECTS] = &Spell::EffectTriggerSpell, //142 SPELL_EFFECT_TRIGGER_SPELL_WITH_VALUE &Spell::EffectUnused, //143 SPELL_EFFECT_APPLY_AREA_AURA_OWNER &Spell::EffectKnockBack, //144 SPELL_EFFECT_KNOCK_BACK_DEST - &Spell::EffectPullTowards, //145 SPELL_EFFECT_PULL_TOWARDS_DEST Black Hole Effect + &Spell::EffectPullTowardsDest, //145 SPELL_EFFECT_PULL_TOWARDS_DEST Black Hole Effect &Spell::EffectActivateRune, //146 SPELL_EFFECT_ACTIVATE_RUNE &Spell::EffectQuestFail, //147 SPELL_EFFECT_QUEST_FAIL quest fail &Spell::EffectTriggerMissileSpell, //148 SPELL_EFFECT_TRIGGER_MISSILE_SPELL_WITH_VALUE @@ -4392,23 +4392,37 @@ void Spell::EffectPullTowards(SpellEffIndex effIndex) if (!unitTarget) return; + float speedXY = m_spellInfo->Effects[effIndex].MiscValue / 10.0f; + float speedZ = damage / 10.0f; Position pos; - if (m_spellInfo->Effects[effIndex].Effect == SPELL_EFFECT_PULL_TOWARDS_DEST) - { - if (m_targets.HasDst()) - pos.Relocate(*destTarget); - else - return; - } - else //if (m_spellInfo->Effects[i].Effect == SPELL_EFFECT_PULL_TOWARDS) + pos.Relocate(m_caster); + + unitTarget->GetMotionMaster()->MoveJump(pos, speedXY, speedZ); +} + +void Spell::EffectPullTowardsDest(SpellEffIndex effIndex) +{ + if (effectHandleMode != SPELL_EFFECT_HANDLE_HIT_TARGET) + return; + + if (!unitTarget) + return; + + if (!m_targets.HasDst()) { - pos.Relocate(m_caster); + TC_LOG_ERROR("spells", "Spell %u with SPELL_EFFECT_PULL_TOWARDS_DEST has no dest target", m_spellInfo->Id); + return; } - float speedXY = float(m_spellInfo->Effects[effIndex].MiscValue) * 0.1f; - float speedZ = unitTarget->GetDistance(pos) / speedXY * 0.5f * Movement::gravity; + Position const* pos = m_targets.GetDstPos(); + // This is a blizzlike mistake: this should be 2D distance according to projectile motion formulas, but Blizzard erroneously used 3D distance + float distXY = unitTarget->GetExactDist(pos); + float distZ = pos->GetPositionZ() - unitTarget->GetPositionZ(); - unitTarget->GetMotionMaster()->MoveJump(pos, speedXY, speedZ); + float speedXY = m_spellInfo->Effects[effIndex].MiscValue / 10.0f; + float speedZ = (2 * speedXY * speedXY * distZ + Movement::gravity * distXY * distXY) / (2 * speedXY * distXY); + + unitTarget->JumpTo(speedXY, speedZ, true, *pos); } void Spell::EffectDispelMechanic(SpellEffIndex effIndex) |