Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 10:26:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Spells: fixed calculating jump speeds

Browse Source 
Thanks to the information provided in https://github.com/TrinityCore/TrinityCore/issues/22547
This commit is contained in:
Ovahlord
2019-02-08 17:40:56 +01:00
parent 688daf9843
commit 716ab87a61
1 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/server/game/Spells/SpellEffects.cpp
View File

@@ -865,23 +865,29 @@ void Spell::EffectJumpDest(SpellEffIndex effIndex)
void Spell::CalculateJumpSpeeds(uint8 i, float dist, float & speedXY, float & speedZ)
{
float miscA = 0.0f;
float miscB = 0.0f;
if (m_spellInfo->Effects[i].MiscValue)
miscA = float(m_spellInfo->Effects[i].MiscValue) / 10;
float runSpeed = m_caster->IsControlledByPlayer() ? playerBaseMoveSpeed[MOVE_RUN] : baseMoveSpeed[MOVE_RUN];
if (Creature* creature = m_caster->ToCreature())
runSpeed *= creature->GetCreatureTemplate()->speed_run;
if (m_spellInfo->Effects[i].MiscValueB)
miscB = float(m_spellInfo->Effects[i].MiscValueB) / 10;
float multiplier = m_spellInfo->Effects[i].ValueMultiplier;
if (multiplier <= 0.0f)
multiplier = 1.0f;
if (miscA == 0.0f && miscB == 0.0f)
speedZ = 10.0f;
speedXY = std::min(runSpeed * 3.0f * multiplier, 50.0f);
float duration = dist / speedXY;
float durationSqr = duration * duration;
float minHeight = m_spellInfo->Effects[i].MiscValue ? m_spellInfo->Effects[i].MiscValue / 10.0f : 0.5f; // Lower bound is blizzlike
float maxHeight = m_spellInfo->Effects[i].MiscValueB ? m_spellInfo->Effects[i].MiscValueB / 10.0f : 1000.0f; // Upper bound is unknown
float height;
if (durationSqr < minHeight * 8 / Movement::gravity)
height = minHeight;
else if (durationSqr > maxHeight * 8 / Movement::gravity)
height = maxHeight;
else
speedZ = std::max(miscA, miscB);
height = Movement::gravity * durationSqr / 8;
if (m_spellInfo->Speed != 0.0f)
speedXY = m_spellInfo->Speed;
else
speedXY = dist * 10.0f / speedZ;
speedZ = std::sqrt(2 * Movement::gravity * height);
}
void Spell::EffectTeleportUnits(SpellEffIndex /*effIndex*/)