tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix NPC juke stuttering (#19805)

Browse Source
This commit is contained in:
metalgearsloth
2023-09-04 14:34:20 +10:00
committed by GitHub
parent 5d91fc7aff
commit e9a4b1c747
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Content.Server/NPC/Systems/NPCJukeSystem.cs
View File

@@ -20,7 +20,7 @@ public sealed class NPCJukeSystem : EntitySystem
[Dependency] private readonly IRobustRandom _random = default!; [Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly EntityLookupSystem _lookup = default!; [Dependency] private readonly EntityLookupSystem _lookup = default!;
[Dependency] private readonly MeleeWeaponSystem _melee = default!; [Dependency] private readonly MeleeWeaponSystem _melee = default!;
[Dependency] private readonly SharedPhysicsSystem _physics = default!; [Dependency] private readonly SharedTransformSystem _transform = default!;
private EntityQuery<NPCMeleeCombatComponent> _npcMeleeQuery; private EntityQuery<NPCMeleeCombatComponent> _npcMeleeQuery;
private EntityQuery<NPCRangedCombatComponent> _npcRangedQuery; private EntityQuery<NPCRangedCombatComponent> _npcRangedQuery;
@@ -156,15 +156,19 @@ public sealed class NPCJukeSystem : EntitySystem
if (cdRemaining < attackCooldown * 0.45f) if (cdRemaining < attackCooldown * 0.45f)
return; return;
if (!_physics.TryGetNearestPoints(uid, melee.Target, out var pointA, out var pointB)) // If we get whacky boss mobs might need nearestpos that's more of a PITA
return; // so will just use this for now.
var obstacleDirection = _transform.GetWorldPosition(melee.Target) - args.WorldPosition;
var obstacleDirection = pointB - args.WorldPosition; if (obstacleDirection == Vector2.Zero)
{
obstacleDirection = _random.NextVector2();
}
// If they're moving away then pursue anyway. // If they're moving away then pursue anyway.
// If just hit then always back up a bit. // If just hit then always back up a bit.
if (cdRemaining < attackCooldown * 0.90f && if (cdRemaining < attackCooldown * 0.90f &&
TryComp<PhysicsComponent>(melee.Target, out var targetPhysics) && _physicsQuery.TryGetComponent(melee.Target, out var targetPhysics) &&
Vector2.Dot(targetPhysics.LinearVelocity, obstacleDirection) > 0f) Vector2.Dot(targetPhysics.LinearVelocity, obstacleDirection) > 0f)
{ {
return; return;
@@ -173,6 +177,7 @@ public sealed class NPCJukeSystem : EntitySystem
if (cdRemaining < TimeSpan.FromSeconds(1f / _melee.GetAttackRate(weaponUid, uid, weapon)) * 0.45f) if (cdRemaining < TimeSpan.FromSeconds(1f / _melee.GetAttackRate(weaponUid, uid, weapon)) * 0.45f)
return; return;
// TODO: Probably add in our bounds and target bounds for ideal distance.
var idealDistance = weapon.Range * 4f; var idealDistance = weapon.Range * 4f;
var obstacleDistance = obstacleDirection.Length(); var obstacleDistance = obstacleDirection.Length();