Core/Spells: Fixed target radius calculation for TARGET_DEST_*_RANDOM
This commit is contained in:
1 parent
1251a781a0
commit
a601976e4c
2 files changed
+15
-5
No files matched your search
@@ -1573,7 +1573,7 @@ void Spell::SelectImplicitCasterDestTargets(SpellEffIndex effIndex, SpellImplici
|
||||
{
|
||||
case TARGET_DEST_CASTER_RANDOM:
|
||||
if (dist > objSize)
|
||||
dist = objSize + (dist - objSize) * rand_norm();
|
||||
dist = objSize + (dist - objSize);
|
||||
break;
|
||||
case TARGET_DEST_CASTER_FRONT_LEFT:
|
||||
case TARGET_DEST_CASTER_BACK_LEFT:
|
||||
@@ -1620,8 +1620,6 @@ void Spell::SelectImplicitTargetDestTargets(SpellEffIndex effIndex, SpellImplici
|
||||
{
|
||||
float angle = targetType.CalcDirectionAngle(m_spellInfo->Effects[effIndex]);
|
||||
float dist = m_spellInfo->Effects[effIndex].CalcRadius(nullptr, targetIndex);
|
||||
if (targetType.GetTarget() == TARGET_DEST_TARGET_RANDOM)
|
||||
dist *= rand_norm();
|
||||
|
||||
Position pos = dest._position;
|
||||
target->MovePositionToFirstCollision(pos, dist, angle);
|
||||
@@ -1656,8 +1654,6 @@ void Spell::SelectImplicitDestDestTargets(SpellEffIndex effIndex, SpellImplicitT
|
||||
{
|
||||
float angle = targetType.CalcDirectionAngle(m_spellInfo->Effects[effIndex]);
|
||||
float dist = m_spellInfo->Effects[effIndex].CalcRadius(m_caster, targetIndex);
|
||||
if (targetType.GetTarget() == TARGET_DEST_DEST_RANDOM)
|
||||
dist *= rand_norm();
|
||||
|
||||
Position pos = dest._position;
|
||||
m_caster->MovePositionToFirstCollision(pos, dist, angle);
|
||||
|
||||
@@ -639,14 +639,28 @@ float SpellEffectInfo::CalcRadius(WorldObject* caster /*= nullptr*/, SpellTarget
|
||||
// TargetA -> TargetARadiusEntry
|
||||
// TargetB -> TargetBRadiusEntry
|
||||
// Aura effects have TargetARadiusEntry == TargetBRadiusEntry (mostly)
|
||||
SpellImplicitTargetInfo target = TargetA;
|
||||
SpellRadiusEntry const* entry = TargetARadiusEntry;
|
||||
if (targetIndex == SpellTargetIndex::TargetB && HasRadius(targetIndex))
|
||||
{
|
||||
target = TargetB;
|
||||
entry = TargetBRadiusEntry;
|
||||
}
|
||||
|
||||
if (!entry)
|
||||
return 0.0f;
|
||||
|
||||
float radius = entry->RadiusMin;
|
||||
|
||||
// Random targets use random value between RadiusMin and RadiusMax
|
||||
// For other cases, client uses RadiusMax if RadiusMin is 0
|
||||
if (target.GetTarget() == TARGET_DEST_CASTER_RANDOM ||
|
||||
target.GetTarget() == TARGET_DEST_TARGET_RANDOM ||
|
||||
target.GetTarget() == TARGET_DEST_DEST_RANDOM)
|
||||
radius += (entry->RadiusMax - radius) * rand_norm();
|
||||
else if (radius == 0.0f)
|
||||
radius = entry->RadiusMax;
|
||||
|
||||
if (caster)
|
||||
{
|
||||
if (Unit* casterUnit = caster->ToUnit())
|
||||
|
||||
Reference in new issue
Block a user