Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Spells: Use orientation given in destTarget instead of always taking casters orientation for all effect types

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/853c58715ee969463721504eb1b0fecc87b04767)
This commit is contained in:
hondacrx
2022-02-17 09:36:16 -05:00
parent 11e97aa548
commit e2b6adacc3
1 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Spells/SpellEffects.cs
+29 -18
View File
@@ -2606,16 +2606,19 @@ namespace Game.Spells
if (target == null) if (target == null)
target = m_caster; target = m_caster;
float x, y, z; float x, y, z, o;
if (m_targets.HasDst()) if (m_targets.HasDst())
destTarget.GetPosition(out x, out y, out z); destTarget.GetPosition(out x, out y, out z, out o);
else else
{
m_caster.GetClosePoint(out x, out y, out z, SharedConst.DefaultPlayerBoundingRadius); m_caster.GetClosePoint(out x, out y, out z, SharedConst.DefaultPlayerBoundingRadius);
o = target.GetOrientation();
}
Map map = target.GetMap(); Map map = target.GetMap();
Position pos = new(x, y, z, target.GetOrientation()); Position pos = new(x, y, z, o);
Quaternion rotation = Quaternion.CreateFromRotationMatrix(Extensions.fromEulerAnglesZYX(target.GetOrientation(), 0.0f, 0.0f)); Quaternion rotation = Quaternion.CreateFromRotationMatrix(Extensions.fromEulerAnglesZYX(o, 0.0f, 0.0f));
GameObject go = GameObject.CreateGameObject((uint)effectInfo.MiscValue, map, pos, rotation, 255, GameObjectState.Ready); GameObject go = GameObject.CreateGameObject((uint)effectInfo.MiscValue, map, pos, rotation, 255, GameObjectState.Ready);
if (!go) if (!go)
return; return;
@@ -3239,17 +3242,20 @@ namespace Game.Spells
unitCaster.m_ObjectSlot[slot].Clear(); unitCaster.m_ObjectSlot[slot].Clear();
} }
float x, y, z; float x, y, z, o;
// If dest location if present // If dest location if present
if (m_targets.HasDst()) if (m_targets.HasDst())
destTarget.GetPosition(out x, out y, out z); destTarget.GetPosition(out x, out y, out z, out o);
// Summon in random point all other units if location present // Summon in random point all other units if location present
else else
{
unitCaster.GetClosePoint(out x, out y, out z, SharedConst.DefaultPlayerBoundingRadius); unitCaster.GetClosePoint(out x, out y, out z, SharedConst.DefaultPlayerBoundingRadius);
o = unitCaster.GetOrientation();
}
Map map = m_caster.GetMap(); Map map = m_caster.GetMap();
Position pos = new(x, y, z, m_caster.GetOrientation()); Position pos = new(x, y, z, o);
Quaternion rotation = Quaternion.CreateFromRotationMatrix(Extensions.fromEulerAnglesZYX(m_caster.GetOrientation(), 0.0f, 0.0f)); Quaternion rotation = Quaternion.CreateFromRotationMatrix(Extensions.fromEulerAnglesZYX(o, 0.0f, 0.0f));
GameObject go = GameObject.CreateGameObject((uint)effectInfo.MiscValue, map, pos, rotation, 255, GameObjectState.Ready); GameObject go = GameObject.CreateGameObject((uint)effectInfo.MiscValue, map, pos, rotation, 255, GameObjectState.Ready);
if (!go) if (!go)
return; return;
@@ -4024,15 +4030,16 @@ namespace Game.Spells
return; return;
} }
float fx, fy, fz; float fx, fy, fz, fo;
if (m_targets.HasDst()) if (m_targets.HasDst())
destTarget.GetPosition(out fx, out fy, out fz); destTarget.GetPosition(out fx, out fy, out fz, out fo);
//FIXME: this can be better check for most objects but still hack //FIXME: this can be better check for most objects but still hack
else if (effectInfo.HasRadius() && m_spellInfo.Speed == 0) else if (effectInfo.HasRadius() && m_spellInfo.Speed == 0)
{ {
float dis = effectInfo.CalcRadius(unitCaster); float dis = effectInfo.CalcRadius(unitCaster);
unitCaster.GetClosePoint(out fx, out fy, out fz, SharedConst.DefaultPlayerBoundingRadius, dis); unitCaster.GetClosePoint(out fx, out fy, out fz, SharedConst.DefaultPlayerBoundingRadius, dis);
fo = unitCaster.GetOrientation();
} }
else else
{ {
@@ -4042,15 +4049,16 @@ namespace Game.Spells
float dis = (float)RandomHelper.NextDouble() * (max_dis - min_dis) + min_dis; float dis = (float)RandomHelper.NextDouble() * (max_dis - min_dis) + min_dis;
unitCaster.GetClosePoint(out fx, out fy, out fz, SharedConst.DefaultPlayerBoundingRadius, dis); unitCaster.GetClosePoint(out fx, out fy, out fz, SharedConst.DefaultPlayerBoundingRadius, dis);
fo = unitCaster.GetOrientation();
} }
Map cMap = unitCaster.GetMap(); Map cMap = unitCaster.GetMap();
// if gameobject is summoning object, it should be spawned right on caster's position // if gameobject is summoning object, it should be spawned right on caster's position
if (goinfo.type == GameObjectTypes.Ritual) if (goinfo.type == GameObjectTypes.Ritual)
unitCaster.GetPosition(out fx, out fy, out fz); unitCaster.GetPosition(out fx, out fy, out fz, out fo);
Position pos = new(fx, fy, fz, unitCaster.GetOrientation()); Position pos = new(fx, fy, fz, fo);
Quaternion rotation = Quaternion.CreateFromRotationMatrix(Extensions.fromEulerAnglesZYX(unitCaster.GetOrientation(), 0.0f, 0.0f)); Quaternion rotation = Quaternion.CreateFromRotationMatrix(Extensions.fromEulerAnglesZYX(fo, 0.0f, 0.0f));
GameObject go = GameObject.CreateGameObject(name_id, cMap, pos, rotation, 255, GameObjectState.Ready); GameObject go = GameObject.CreateGameObject(name_id, cMap, pos, rotation, 255, GameObjectState.Ready);
if (!go) if (!go)
@@ -4839,15 +4847,18 @@ namespace Game.Spells
if (goId == 0) if (goId == 0)
return; return;
float x, y, z; float x, y, z, o;
if (m_targets.HasDst()) if (m_targets.HasDst())
destTarget.GetPosition(out x, out y, out z); destTarget.GetPosition(out x, out y, out z, out o);
else else
{
m_caster.GetClosePoint(out x, out y, out z, SharedConst.DefaultPlayerBoundingRadius); m_caster.GetClosePoint(out x, out y, out z, SharedConst.DefaultPlayerBoundingRadius);
o = m_caster.GetOrientation();
}
Map map = m_caster.GetMap(); Map map = m_caster.GetMap();
Position pos = new(x, y, z, m_caster.GetOrientation()); Position pos = new(x, y, z, o);
Quaternion rot = Quaternion.CreateFromRotationMatrix(Extensions.fromEulerAnglesZYX(m_caster.GetOrientation(), 0.0f, 0.0f)); Quaternion rot = Quaternion.CreateFromRotationMatrix(Extensions.fromEulerAnglesZYX(o, 0.0f, 0.0f));
GameObject go = GameObject.CreateGameObject(goId, map, pos, rot, 255, GameObjectState.Ready); GameObject go = GameObject.CreateGameObject(goId, map, pos, rot, 255, GameObjectState.Ready);
if (!go) if (!go)