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

Core/Movement: Replace old TargetedMovementGenerator into ChaseMovementGenerator and FollowMovementGenerator, full rewrite for both.

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/14939204955d1a24fe465cdfcbf307daf3ce4f09)
This commit is contained in:
hondacrx
2021-09-26 10:29:27 -04:00
parent 4004f583a9
commit ad1975b277
22 changed files with 712 additions and 629 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Unit/Unit.Combat.cs
+6 -4
View File
@@ -1471,14 +1471,16 @@ namespace Game.Entities
}
}
public bool IsWithinMeleeRange(Unit obj)
public bool IsWithinMeleeRange(Unit obj) { return IsWithinMeleeRangeAt(GetPosition(), obj); }
public bool IsWithinMeleeRangeAt(Position pos, Unit obj)
{
if (!obj || !IsInMap(obj) || !IsInPhase(obj))
return false;
float dx = GetPositionX() - obj.GetPositionX();
float dy = GetPositionY() - obj.GetPositionY();
float dz = GetPositionZ() - obj.GetPositionZ();
float dx = pos.GetPositionX() - obj.GetPositionX();
float dy = pos.GetPositionY() - obj.GetPositionY();
float dz = pos.GetPositionZ() - obj.GetPositionZ();
float distsq = (dx * dx) + (dy * dy) + (dz * dz);
float maxdist = GetMeleeRange(obj) + GetTotalAuraModifier(AuraType.ModAutoAttackRange);
Source/Game/Entities/Unit/Unit.Fields.cs
+1 -1
View File
@@ -41,7 +41,7 @@ namespace Game.Entities
//Movement
protected float[] m_speed_rate = new float[(int)UnitMoveType.Max];
RefManager<Unit, ITargetedMovementGeneratorBase> m_FollowingRefManager;
List<AbstractFollower> m_followingMe = new();
public MoveSpline MoveSpline { get; set; }
MotionMaster i_motionMaster;
public uint m_movementCounter; //< Incrementing counter used in movement packets
Source/Game/Entities/Unit/Unit.Movement.cs
+94 -95
View File
@@ -406,57 +406,57 @@ namespace Game.Entities
case UnitMoveType.Walk:
return;
case UnitMoveType.Run:
{
if (IsMounted()) // Use on mount auras
{
if (IsMounted()) // Use on mount auras
{
main_speed_mod = GetMaxPositiveAuraModifier(AuraType.ModIncreaseMountedSpeed);
stack_bonus = GetTotalAuraMultiplier(AuraType.ModMountedSpeedAlways);
non_stack_bonus += GetMaxPositiveAuraModifier(AuraType.ModMountedSpeedNotStack) / 100.0f;
}
else
{
main_speed_mod = GetMaxPositiveAuraModifier(AuraType.ModIncreaseSpeed);
stack_bonus = GetTotalAuraMultiplier(AuraType.ModSpeedAlways);
non_stack_bonus += GetMaxPositiveAuraModifier(AuraType.ModSpeedNotStack) / 100.0f;
}
break;
main_speed_mod = GetMaxPositiveAuraModifier(AuraType.ModIncreaseMountedSpeed);
stack_bonus = GetTotalAuraMultiplier(AuraType.ModMountedSpeedAlways);
non_stack_bonus += GetMaxPositiveAuraModifier(AuraType.ModMountedSpeedNotStack) / 100.0f;
}
else
{
main_speed_mod = GetMaxPositiveAuraModifier(AuraType.ModIncreaseSpeed);
stack_bonus = GetTotalAuraMultiplier(AuraType.ModSpeedAlways);
non_stack_bonus += GetMaxPositiveAuraModifier(AuraType.ModSpeedNotStack) / 100.0f;
}
break;
}
case UnitMoveType.Swim:
{
main_speed_mod = GetMaxPositiveAuraModifier(AuraType.ModIncreaseSwimSpeed);
break;
}
{
main_speed_mod = GetMaxPositiveAuraModifier(AuraType.ModIncreaseSwimSpeed);
break;
}
case UnitMoveType.Flight:
{
if (IsTypeId(TypeId.Unit) && IsControlledByPlayer()) // not sure if good for pet
{
if (IsTypeId(TypeId.Unit) && IsControlledByPlayer()) // not sure if good for pet
{
main_speed_mod = GetMaxPositiveAuraModifier(AuraType.ModIncreaseVehicleFlightSpeed);
stack_bonus = GetTotalAuraMultiplier(AuraType.ModVehicleSpeedAlways);
main_speed_mod = GetMaxPositiveAuraModifier(AuraType.ModIncreaseVehicleFlightSpeed);
stack_bonus = GetTotalAuraMultiplier(AuraType.ModVehicleSpeedAlways);
// for some spells this mod is applied on vehicle owner
int owner_speed_mod = 0;
// for some spells this mod is applied on vehicle owner
int owner_speed_mod = 0;
Unit owner = GetCharmer();
if (owner != null)
owner_speed_mod = owner.GetMaxPositiveAuraModifier(AuraType.ModIncreaseVehicleFlightSpeed);
Unit owner = GetCharmer();
if (owner != null)
owner_speed_mod = owner.GetMaxPositiveAuraModifier(AuraType.ModIncreaseVehicleFlightSpeed);
main_speed_mod = Math.Max(main_speed_mod, owner_speed_mod);
}
else if (IsMounted())
{
main_speed_mod = GetMaxPositiveAuraModifier(AuraType.ModIncreaseMountedFlightSpeed);
stack_bonus = GetTotalAuraMultiplier(AuraType.ModMountedFlightSpeedAlways);
}
else // Use not mount (shapeshift for example) auras (should stack)
main_speed_mod = GetTotalAuraModifier(AuraType.ModIncreaseFlightSpeed) + GetTotalAuraModifier(AuraType.ModIncreaseVehicleFlightSpeed);
non_stack_bonus += GetMaxPositiveAuraModifier(AuraType.ModFlightSpeedNotStack) / 100.0f;
// Update speed for vehicle if available
if (IsTypeId(TypeId.Player) && GetVehicle() != null)
GetVehicleBase().UpdateSpeed(UnitMoveType.Flight);
break;
main_speed_mod = Math.Max(main_speed_mod, owner_speed_mod);
}
else if (IsMounted())
{
main_speed_mod = GetMaxPositiveAuraModifier(AuraType.ModIncreaseMountedFlightSpeed);
stack_bonus = GetTotalAuraMultiplier(AuraType.ModMountedFlightSpeedAlways);
}
else // Use not mount (shapeshift for example) auras (should stack)
main_speed_mod = GetTotalAuraModifier(AuraType.ModIncreaseFlightSpeed) + GetTotalAuraModifier(AuraType.ModIncreaseVehicleFlightSpeed);
non_stack_bonus += GetMaxPositiveAuraModifier(AuraType.ModFlightSpeedNotStack) / 100.0f;
// Update speed for vehicle if available
if (IsTypeId(TypeId.Player) && GetVehicle() != null)
GetVehicleBase().UpdateSpeed(UnitMoveType.Flight);
break;
}
default:
Log.outError(LogFilter.Unit, "Unit.UpdateSpeed: Unsupported move type ({0})", mtype);
return;
@@ -472,71 +472,70 @@ namespace Game.Entities
case UnitMoveType.Run:
case UnitMoveType.Swim:
case UnitMoveType.Flight:
{
// Set creature speed rate
if (IsTypeId(TypeId.Unit))
speed *= ToCreature().GetCreatureTemplate().SpeedRun; // at this point, MOVE_WALK is never reached
// Normalize speed by 191 aura SPELL_AURA_USE_NORMAL_MOVEMENT_SPEED if need
// @todo possible affect only on MOVE_RUN
int normalization = GetMaxPositiveAuraModifier(AuraType.UseNormalMovementSpeed);
if (normalization != 0)
{
// Set creature speed rate
if (IsTypeId(TypeId.Unit))
Creature creature1 = ToCreature();
if (creature1)
{
Unit pOwner = GetCharmerOrOwner();
if ((IsPet() || IsGuardian()) && !IsInCombat() && pOwner != null) // Must check for owner or crash on "Tame Beast"
{
// For every yard over 5, increase speed by 0.01
// to help prevent pet from lagging behind and despawning
float dist = GetDistance(pOwner);
float base_rate = 1.00f; // base speed is 100% of owner speed
if (dist < 5)
dist = 5;
float mult = base_rate + ((dist - 5) * 0.01f);
speed *= pOwner.GetSpeedRate(mtype) * mult; // pets derive speed from owner when not in combat
}
else
speed *= ToCreature().GetCreatureTemplate().SpeedRun; // at this point, MOVE_WALK is never reached
uint immuneMask = creature1.GetCreatureTemplate().MechanicImmuneMask;
if (Convert.ToBoolean(immuneMask & (1 << ((int)Mechanics.Snare - 1))) || Convert.ToBoolean(immuneMask & (1 << ((int)Mechanics.Daze - 1))))
break;
}
// Normalize speed by 191 aura SPELL_AURA_USE_NORMAL_MOVEMENT_SPEED if need
// @todo possible affect only on MOVE_RUN
int normalization = GetMaxPositiveAuraModifier(AuraType.UseNormalMovementSpeed);
if (normalization != 0)
{
Creature creature = ToCreature();
if (creature)
{
uint immuneMask = creature.GetCreatureTemplate().MechanicImmuneMask;
if (Convert.ToBoolean(immuneMask & (1 << ((int)Mechanics.Snare - 1))) || Convert.ToBoolean(immuneMask & (1 << ((int)Mechanics.Daze - 1))))
break;
}
// Use speed from aura
float max_speed = normalization / (IsControlledByPlayer() ? SharedConst.playerBaseMoveSpeed[(int)mtype] : SharedConst.baseMoveSpeed[(int)mtype]);
if (speed > max_speed)
speed = max_speed;
}
if (mtype == UnitMoveType.Run)
{
// force minimum speed rate @ aura 437 SPELL_AURA_MOD_MINIMUM_SPEED_RATE
int minSpeedMod1 = GetMaxPositiveAuraModifier(AuraType.ModMinimumSpeedRate);
if (minSpeedMod1 != 0)
{
float minSpeed = minSpeedMod1 / (IsControlledByPlayer() ? SharedConst.playerBaseMoveSpeed[(int)mtype] : SharedConst.baseMoveSpeed[(int)mtype]);
if (speed < minSpeed)
speed = minSpeed;
}
}
break;
// Use speed from aura
float max_speed = normalization / (IsControlledByPlayer() ? SharedConst.playerBaseMoveSpeed[(int)mtype] : SharedConst.baseMoveSpeed[(int)mtype]);
if (speed > max_speed)
speed = max_speed;
}
if (mtype == UnitMoveType.Run)
{
// force minimum speed rate @ aura 437 SPELL_AURA_MOD_MINIMUM_SPEED_RATE
int minSpeedMod1 = GetMaxPositiveAuraModifier(AuraType.ModMinimumSpeedRate);
if (minSpeedMod1 != 0)
{
float minSpeed = minSpeedMod1 / (IsControlledByPlayer() ? SharedConst.playerBaseMoveSpeed[(int)mtype] : SharedConst.baseMoveSpeed[(int)mtype]);
if (speed < minSpeed)
speed = minSpeed;
}
}
break;
}
default:
break;
}
// for creature case, we check explicit if mob searched for assistance
if (IsTypeId(TypeId.Unit))
Creature creature = ToCreature();
if (creature != null)
{
// for creature case, we check explicit if mob searched for assistance
if (ToCreature().HasSearchedAssistance())
speed *= 0.66f; // best guessed value, so this will be 33% reduction. Based off initial speed, mob can then "run", "walk fast" or "walk".
if (creature.HasUnitTypeMask(UnitTypeMask.Minion) && !creature.IsInCombat())
{
var top = creature.GetMotionMaster().Top();
if (top != null && top.GetMovementGeneratorType() == MovementGeneratorType.Follow)
{
Unit followed = ((AbstractFollower)top).GetTarget();
if (followed != null && followed.GetGUID() == GetOwnerGUID() && !followed.IsInCombat())
{
float ownerSpeed = followed.GetSpeedRate(mtype);
if (speed < ownerSpeed || creature.IsWithinDist3d(followed, 10.0f))
speed = ownerSpeed;
speed *= Math.Min(Math.Max(1.0f, 0.75f + (GetDistance(followed) - SharedConst.PetFollowDist) * 0.05f), 1.3f);
}
}
}
}
// Apply strongest slow aura mod to speed
Source/Game/Entities/Unit/Unit.cs
+11 -6
View File
@@ -44,7 +44,6 @@ namespace Game.Entities
m_combatManager = new CombatManager(this);
m_threatManager = new ThreatManager(this);
_spellHistory = new SpellHistory(this);
m_FollowingRefManager = new RefManager<Unit, ITargetedMovementGeneratorBase>();
ObjectTypeId = TypeId.Unit;
ObjectTypeMask |= TypeMask.Unit;
@@ -454,6 +453,8 @@ namespace Game.Entities
RemoveAreaAurasDueToLeaveWorld();
RemoveAllFollowers();
if (!GetCharmerGUID().IsEmpty())
{
Log.outFatal(LogFilter.Unit, "Unit {0} has charmer guid when removed from world", GetEntry());
@@ -1312,6 +1313,13 @@ namespace Game.Entities
public Totem ToTotem() { return IsTotem() ? (this as Totem) : null; }
public TempSummon ToTempSummon() { return IsSummon() ? (this as TempSummon) : null; }
void RemoveAllFollowers()
{
while (!m_followingMe.Empty())
m_followingMe[0].SetTarget(null);
}
public virtual void SetDeathState(DeathState s)
{
// Death state needs to be updated before RemoveAllAurasOnDeath() is called, to prevent entering combat
@@ -1563,11 +1571,8 @@ namespace Game.Entities
public bool IsCharmedOwnedByPlayerOrPlayer() { return GetCharmerOrOwnerOrOwnGUID().IsPlayer(); }
public void AddFollower(FollowerReference pRef)
{
m_FollowingRefManager.InsertFirst(pRef);
}
public void RemoveFollower(FollowerReference pRef) { } //nothing to do yet
public void FollowerAdded(AbstractFollower f) { m_followingMe.Add(f); }
public void FollowerRemoved(AbstractFollower f) { m_followingMe.Remove(f); }
public uint GetCreatureTypeMask()
{