Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Steering tweaks (#14140)

Browse Source 
- Fix the direct-path so NPCs. This is most noticeable when moving diagonally on planetmaps (given the current pathfinder is cardinal)
- Reduce static collision avoidance weight and distance. This seems to reduce instances of getting stuck on railings.
This commit is contained in:
metalgearsloth
2023-02-17 01:24:57 +11:00
committed by GitHub
parent 468d0715d6
commit 0a9da80058
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -320,7 +320,7 @@ public sealed partial class NPCSteeringSystem
EntityQuery<PhysicsComponent> bodyQuery, EntityQuery<PhysicsComponent> bodyQuery,
EntityQuery<TransformComponent> xformQuery) EntityQuery<TransformComponent> xformQuery)
{ {
var detectionRadius = MathF.Max(1.5f, agentRadius); var detectionRadius = MathF.Max(1f, agentRadius);
foreach (var ent in _lookup.GetEntitiesInRange(uid, detectionRadius, LookupFlags.Static)) foreach (var ent in _lookup.GetEntitiesInRange(uid, detectionRadius, LookupFlags.Static))
{ {
@@ -364,7 +364,7 @@ public sealed partial class NPCSteeringSystem
for (var i = 0; i < InterestDirections; i++) for (var i = 0; i < InterestDirections; i++)
{ {
var dot = Vector2.Dot(norm, Directions[i]); var dot = Vector2.Dot(norm, Directions[i]);
danger[i] = MathF.Max(dot * weight, danger[i]); danger[i] = MathF.Max(dot * weight * 0.9f, danger[i]);
} }
} }

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

@@ -12,6 +12,7 @@ using Content.Shared.Movement.Components;
using Content.Shared.Movement.Systems; using Content.Shared.Movement.Systems;
using Content.Shared.NPC; using Content.Shared.NPC;
using Content.Shared.NPC.Events; using Content.Shared.NPC.Events;
using Content.Shared.Physics;
using Content.Shared.Weapons.Melee; using Content.Shared.Weapons.Melee;
using Robust.Server.Player; using Robust.Server.Player;
using Robust.Shared.Configuration; using Robust.Shared.Configuration;
@@ -363,6 +364,7 @@ namespace Content.Server.NPC.Systems
// This should also implicitly solve tie situations. // This should also implicitly solve tie situations.
// I think doing this after all the ops above is best? // I think doing this after all the ops above is best?
// Originally I had it way above but sometimes mobs would overshoot their tile targets. // Originally I had it way above but sometimes mobs would overshoot their tile targets.
if (steering.NextSteer > curTime) if (steering.NextSteer > curTime)
{ {
SetDirection(mover, steering, steering.LastSteerDirection, false); SetDirection(mover, steering, steering.LastSteerDirection, false);
@@ -396,7 +398,10 @@ namespace Content.Server.NPC.Systems
// Short-circuit with no path. // Short-circuit with no path.
var targetPoly = _pathfindingSystem.GetPoly(steering.Coordinates); var targetPoly = _pathfindingSystem.GetPoly(steering.Coordinates);
if (targetPoly != null && steering.Coordinates.Position.Equals(Vector2.Zero) && _interaction.InRangeUnobstructed(steering.Owner, steering.Coordinates.EntityId)) // If this still causes issues future sloth adjust the collision mask.
if (targetPoly != null &&
steering.Coordinates.Position.Equals(Vector2.Zero) &&
_interaction.InRangeUnobstructed(steering.Owner, steering.Coordinates.EntityId, range: 30f))
{ {
steering.CurrentPath.Clear(); steering.CurrentPath.Clear();
steering.CurrentPath.Enqueue(targetPoly); steering.CurrentPath.Enqueue(targetPoly);