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

Reduce NPC static collision avoidance range (#13197)

Browse Source
This commit is contained in:
metalgearsloth
2022-12-27 12:30:31 +11:00
committed by GitHub
parent 033e87aa3b
commit 181e16db53
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/NPC/Systems/NPCSteeringSystem.Context.cs
View File

@@ -320,7 +320,7 @@ public sealed partial class NPCSteeringSystem
EntityQuery<PhysicsComponent> bodyQuery,
EntityQuery<TransformComponent> xformQuery)
{
var detectionRadius = agentRadius + moveSpeed;
var detectionRadius = MathF.Max(1.5f, agentRadius + moveSpeed / 4f);
foreach (var ent in _lookup.GetEntitiesInRange(uid, detectionRadius, LookupFlags.Static))
{

6
Content.Server/NPC/Systems/NPCSteeringSystem.cs
View File

@@ -204,7 +204,7 @@ namespace Content.Server.NPC.Systems
var modifierQuery = GetEntityQuery<MovementSpeedModifierComponent>();
var xformQuery = GetEntityQuery<TransformComponent>();
var npcs = EntityQuery<NPCSteeringComponent, ActiveNPCComponent, InputMoverComponent, TransformComponent>()
var npcs = EntityQuery<ActiveNPCComponent, NPCSteeringComponent, InputMoverComponent, TransformComponent>()
.ToArray();
var options = new ParallelOptions
{
@@ -213,7 +213,7 @@ namespace Content.Server.NPC.Systems
Parallel.For(0, npcs.Length, options, i =>
{
var (steering, _, mover, xform) = npcs[i];
var (_, steering, mover, xform) = npcs[i];
Steer(steering, mover, xform, modifierQuery, bodyQuery, xformQuery, frameTime);
});
@@ -223,7 +223,7 @@ namespace Content.Server.NPC.Systems
{
var data = new List<NPCSteeringDebugData>(npcs.Length);
foreach (var (steering, _, mover, _) in npcs)
foreach (var (_, steering, mover, _) in npcs)
{
data.Add(new NPCSteeringDebugData(
mover.Owner,