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/Creature/Creature.cs
+11 -15
View File
@@ -264,8 +264,7 @@ namespace Game.Entities
return false;
}
SetDisplayId(model.CreatureDisplayID, model.DisplayScale);
SetNativeDisplayId(model.CreatureDisplayID, model.DisplayScale);
SetDisplayId(model.CreatureDisplayID, true);
// Load creature equipment
if (data == null)
@@ -2003,10 +2002,7 @@ namespace Game.Entities
CreatureModel display = new(GetNativeDisplayId(), GetNativeDisplayScale(), 1.0f);
if (Global.ObjectMgr.GetCreatureModelRandomGender(ref display, GetCreatureTemplate()) != null)
{
SetDisplayId(display.CreatureDisplayID, display.DisplayScale);
SetNativeDisplayId(display.CreatureDisplayID, display.DisplayScale);
}
SetDisplayId(display.CreatureDisplayID, true);
GetMotionMaster().InitializeDefault();
@@ -3023,20 +3019,20 @@ namespace Game.Entities
CreatureModelInfo minfo = Global.ObjectMgr.GetCreatureModelInfo(GetDisplayId());
if (minfo != null)
{
SetBoundingRadius((IsPet() ? 1.0f : minfo.BoundingRadius) * scale);
SetCombatReach((IsPet() ? SharedConst.DefaultPlayerCombatReach : minfo.CombatReach) * scale);
SetBoundingRadius((IsPet() ? 1.0f : minfo.BoundingRadius) * scale * GetDisplayScale());
SetCombatReach((IsPet() ? SharedConst.DefaultPlayerCombatReach : minfo.CombatReach) * scale * GetDisplayScale());
}
}
public override void SetDisplayId(uint modelId, float displayScale = 1f)
public override void SetDisplayId(uint modelId, bool setNative = false)
{
base.SetDisplayId(modelId, displayScale);
base.SetDisplayId(modelId, setNative);
CreatureModelInfo minfo = Global.ObjectMgr.GetCreatureModelInfo(modelId);
if (minfo != null)
CreatureModelInfo modelInfo = Global.ObjectMgr.GetCreatureModelInfo(modelId);
if (modelInfo != null)
{
SetBoundingRadius((IsPet() ? 1.0f : minfo.BoundingRadius) * GetObjectScale());
SetCombatReach((IsPet() ? SharedConst.DefaultPlayerCombatReach : minfo.CombatReach) * GetObjectScale());
SetBoundingRadius((IsPet() ? 1.0f : modelInfo.BoundingRadius) * GetObjectScale() * GetDisplayScale());
SetCombatReach((IsPet() ? SharedConst.DefaultPlayerCombatReach : modelInfo.CombatReach) * GetObjectScale() * GetDisplayScale());
}
}
@@ -3044,7 +3040,7 @@ namespace Game.Entities
{
CreatureModel model = GetCreatureTemplate().GetModelByIdx(modelIdx);
if (model != null)
SetDisplayId(model.CreatureDisplayID, model.DisplayScale);
SetDisplayId(model.CreatureDisplayID);
}
public override void SetTarget(ObjectGuid guid)