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

Core/Creatures: Compute CombatReach and BoundingRadius using DisplayScale

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/81ea6f54d93ee10b03e6432c6071e0d0983796a2)
This commit is contained in:
hondacrx
2023-04-21 18:21:08 -04:00
parent d3297b96a2
commit 19c484dc5a
10 changed files with 50 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Unit/Unit.cs
+23 -10
View File
@@ -1870,16 +1870,34 @@ namespace Game.Entities
public virtual float GetNativeObjectScale() { return 1.0f; }
public float GetDisplayScale() { return m_unitData.DisplayScale; }
public uint GetDisplayId() { return m_unitData.DisplayID; }
public virtual void SetDisplayId(uint modelId, float displayScale = 1f)
public virtual void SetDisplayId(uint displayId, bool setNative = false)
{
SetUpdateFieldValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.DisplayID), modelId);
float displayScale = SharedConst.DefaultPlayerDisplayScale;
if (IsCreature() && !IsPet())
{
CreatureModel model = ToCreature().GetCreatureTemplate().GetModelWithDisplayId(displayId);
if (model != null)
displayScale = model.DisplayScale;
}
SetUpdateFieldValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.DisplayID), displayId);
SetUpdateFieldValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.DisplayScale), displayScale);
if (setNative)
{
SetUpdateFieldValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.NativeDisplayID), displayId);
SetUpdateFieldValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.NativeXDisplayScale), displayScale);
}
// Set Gender by modelId
CreatureModelInfo minfo = Global.ObjectMgr.GetCreatureModelInfo(modelId);
if (minfo != null)
SetGender((Gender)minfo.gender);
CreatureModelInfo modelInfo = Global.ObjectMgr.GetCreatureModelInfo(displayId);
if (modelInfo != null)
SetGender((Gender)modelInfo.gender);
}
public void RestoreDisplayId(bool ignorePositiveAurasPreventingMounting = false)
@@ -1944,11 +1962,6 @@ namespace Game.Entities
SetDisplayId(GetNativeDisplayId());
}
public uint GetNativeDisplayId() { return m_unitData.NativeDisplayID; }
public void SetNativeDisplayId(uint displayId, float displayScale = 1f)
{
SetUpdateFieldValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.NativeDisplayID), displayId);
SetUpdateFieldValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.NativeXDisplayScale), displayScale);
}
public float GetNativeDisplayScale() { return m_unitData.NativeXDisplayScale; }
public bool IsMounted()