Core/Spells: implement TARGET_DIR_SUMMON and use it to properly support TARGET_DEST_CASTER_SUMMON

This fixes positions for pet summons and gameobject summons such as Campfires
This commit is contained in:
Ovahlord committed 2023-07-17 01:23:56 +02:00
1 parent 7f5a407653
commit 4e397e76d0
3 files changed
+53 -11

No files matched your search

+36 -7
View File
@@ -1502,7 +1502,7 @@ void Spell::SelectImplicitCasterDestTargets(SpellEffIndex effIndex, SpellImplici
break;
float dist = m_spellInfo->Effects[effIndex].CalcRadius(unitCaster);
float angle = targetType.CalcDirectionAngle();
float angle = targetType.CalcDirectionAngle(m_spellInfo->Effects[effIndex]);
Position pos = dest._position;
unitCaster->MovePositionToFirstCollision(pos, dist, angle);
@@ -1513,17 +1513,46 @@ void Spell::SelectImplicitCasterDestTargets(SpellEffIndex effIndex, SpellImplici
case TARGET_DEST_CASTER_GROUND_2:
dest._position.m_positionZ = m_caster->GetMapWaterOrGroundLevel(dest._position.GetPositionX(), dest._position.GetPositionY(), dest._position.GetPositionZ());
break;
case TARGET_DEST_CASTER_SUMMON:
{
float angle = targetType.CalcDirectionAngle(m_spellInfo->Effects[effIndex]);
float dist = [&]()
{
// Effect specific radius may override default behavior
if (m_spellInfo->Effects[effIndex].HasRadius())
return m_spellInfo->Effects[effIndex].CalcRadius(m_caster);
// Gameobject summons use range entries
if (m_spellInfo->Effects[effIndex].Effect == SPELL_EFFECT_TRANS_DOOR)
{
if (m_spellInfo->RangeEntry != nullptr)
{
float minDist = m_spellInfo->GetMinRange(true);
float maxDist = m_spellInfo->GetMaxRange(true);
return frand(minDist, maxDist);
}
else
return 0.f;
}
else // creature summons fall back to default distance
return DEFAULT_FOLLOW_DISTANCE;
return 0.f;
}();
Position pos = dest._position;
m_caster->MovePositionToFirstCollision(pos, dist, angle);
dest.Relocate(pos);
break;
}
default:
{
float dist = m_spellInfo->Effects[effIndex].CalcRadius(m_caster);
float angle = targetType.CalcDirectionAngle();
float angle = targetType.CalcDirectionAngle(m_spellInfo->Effects[effIndex]);
float objSize = m_caster->GetCombatReach();
switch (targetType.GetTarget())
{
case TARGET_DEST_CASTER_SUMMON:
dist = DEFAULT_FOLLOW_DISTANCE;
break;
case TARGET_DEST_CASTER_RANDOM:
if (dist > objSize)
dist = objSize + (dist - objSize) * float(rand_norm());
@@ -1571,7 +1600,7 @@ void Spell::SelectImplicitTargetDestTargets(SpellEffIndex effIndex, SpellImplici
break;
default:
{
float angle = targetType.CalcDirectionAngle();
float angle = targetType.CalcDirectionAngle(m_spellInfo->Effects[effIndex]);
float dist = m_spellInfo->Effects[effIndex].CalcRadius(nullptr);
if (targetType.GetTarget() == TARGET_DEST_TARGET_RANDOM)
dist *= float(rand_norm());
@@ -1607,7 +1636,7 @@ void Spell::SelectImplicitDestDestTargets(SpellEffIndex effIndex, SpellImplicitT
break;
default:
{
float angle = targetType.CalcDirectionAngle();
float angle = targetType.CalcDirectionAngle(m_spellInfo->Effects[effIndex]);
float dist = m_spellInfo->Effects[effIndex].CalcRadius(m_caster);
if (targetType.GetTarget() == TARGET_DEST_DEST_RANDOM)
dist *= float(rand_norm());
+13 -2
View File
@@ -100,7 +100,7 @@ SpellTargetDirectionTypes SpellImplicitTargetInfo::GetDirectionType() const
return _data[_target].DirectionType;
}
float SpellImplicitTargetInfo::CalcDirectionAngle() const
float SpellImplicitTargetInfo::CalcDirectionAngle(SpellEffectInfo const& effectInfo) const
{
switch (GetDirectionType())
{
@@ -122,6 +122,17 @@ float SpellImplicitTargetInfo::CalcDirectionAngle() const
return static_cast<float>(M_PI/4);
case TARGET_DIR_RANDOM:
return float(rand_norm())*static_cast<float>(2*M_PI);
case TARGET_DIR_SUMMON:
// This direction does alter its angle based on what is being summoned.
// Creatures are being summoned on the left, gameobjects infront
switch (effectInfo.Effect)
{
case SPELL_EFFECT_SUMMON_PET:
case SPELL_EFFECT_SUMMON:
return static_cast<float>(M_PI / 2);
default:
return 0.0f;
}
default:
return 0.0f;
}
@@ -250,7 +261,7 @@ SpellImplicitTargetInfo::StaticData SpellImplicitTargetInfo::_data[TOTAL_SPELL_
{TARGET_OBJECT_TYPE_DEST, TARGET_REFERENCE_TYPE_DEST, TARGET_SELECT_CATEGORY_DEFAULT, TARGET_CHECK_ALLY, TARGET_DIR_NONE}, // 29 TARGET_DEST_DYNOBJ_ALLY
{TARGET_OBJECT_TYPE_UNIT, TARGET_REFERENCE_TYPE_SRC, TARGET_SELECT_CATEGORY_AREA, TARGET_CHECK_ALLY, TARGET_DIR_NONE}, // 30 TARGET_UNIT_SRC_AREA_ALLY
{TARGET_OBJECT_TYPE_UNIT, TARGET_REFERENCE_TYPE_DEST, TARGET_SELECT_CATEGORY_AREA, TARGET_CHECK_ALLY, TARGET_DIR_NONE}, // 31 TARGET_UNIT_DEST_AREA_ALLY
{TARGET_OBJECT_TYPE_DEST, TARGET_REFERENCE_TYPE_CASTER, TARGET_SELECT_CATEGORY_DEFAULT, TARGET_CHECK_DEFAULT, TARGET_DIR_FRONT_LEFT}, // 32 TARGET_DEST_CASTER_SUMMON
{TARGET_OBJECT_TYPE_DEST, TARGET_REFERENCE_TYPE_CASTER, TARGET_SELECT_CATEGORY_DEFAULT, TARGET_CHECK_DEFAULT, TARGET_DIR_SUMMON }, // 32 TARGET_DEST_CASTER_SUMMON
{TARGET_OBJECT_TYPE_UNIT, TARGET_REFERENCE_TYPE_SRC, TARGET_SELECT_CATEGORY_AREA, TARGET_CHECK_PARTY, TARGET_DIR_NONE}, // 33 TARGET_UNIT_SRC_AREA_PARTY
{TARGET_OBJECT_TYPE_UNIT, TARGET_REFERENCE_TYPE_DEST, TARGET_SELECT_CATEGORY_AREA, TARGET_CHECK_PARTY, TARGET_DIR_NONE}, // 34 TARGET_UNIT_DEST_AREA_PARTY
{TARGET_OBJECT_TYPE_UNIT, TARGET_REFERENCE_TYPE_TARGET, TARGET_SELECT_CATEGORY_DEFAULT, TARGET_CHECK_PARTY, TARGET_DIR_NONE}, // 35 TARGET_UNIT_TARGET_PARTY
+4 -2
View File
@@ -31,6 +31,7 @@ class Unit;
class Player;
class Item;
class Spell;
class SpellEffectInfo;
class SpellInfo;
class WorldObject;
struct SpellChainNode;
@@ -139,7 +140,8 @@ enum SpellTargetDirectionTypes
TARGET_DIR_BACK_LEFT,
TARGET_DIR_FRONT_LEFT,
TARGET_DIR_RANDOM,
TARGET_DIR_ENTRY
TARGET_DIR_ENTRY,
TARGET_DIR_SUMMON // alters direction based on summon type (creatures are summoned on the left side, gameobjects in front)
};
enum SpellEffectImplicitTargetTypes
@@ -222,7 +224,7 @@ public:
SpellTargetObjectTypes GetObjectType() const;
SpellTargetCheckTypes GetCheckType() const;
SpellTargetDirectionTypes GetDirectionType() const;
float CalcDirectionAngle() const;
float CalcDirectionAngle(SpellEffectInfo const& effectInfo) const;
Targets GetTarget() const;
uint32 GetExplicitTargetMask(bool& srcSet, bool& dstSet) const;