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

Fix rat pathfinding (#12951)

Browse Source 
Fixes https://github.com/space-wizards/space-station-14/issues/12950
This commit is contained in:
metalgearsloth
2022-12-10 20:31:02 +11:00
committed by GitHub
parent 0db20ee8be
commit f8a8b41976
4 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Server/NPC/Pathfinding/PathfindingSystem.Grid.cs
View File

@@ -458,10 +458,11 @@ public sealed partial class PathfindingSystem
continue;
// TODO: Inefficient af
foreach (var (_, fixture) in fixtures.Fixtures)
foreach (var fixture in fixtures.Fixtures.Values)
{
// Don't need to re-do it.
if ((collisionMask & fixture.CollisionMask) == fixture.CollisionMask &&
if (!fixture.Hard ||
(collisionMask & fixture.CollisionMask) == fixture.CollisionMask &&
(collisionLayer & fixture.CollisionLayer) == fixture.CollisionLayer)
continue;

12
Content.Server/NPC/Pathfinding/PathfindingSystem.cs
View File

@@ -11,6 +11,7 @@ using Content.Shared.NPC;
using Robust.Server.Player;
using Robust.Shared.Enums;
using Robust.Shared.Map;
using Robust.Shared.Physics;
using Robust.Shared.Physics.Components;
using Robust.Shared.Physics.Systems;
using Robust.Shared.Players;
@@ -43,6 +44,7 @@ namespace Content.Server.NPC.Pathfinding
[Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly DestructibleSystem _destructible = default!;
[Dependency] private readonly FixtureSystem _fixtures = default!;
[Dependency] private readonly SharedPhysicsSystem _physics = default!;
private ISawmill _sawmill = default!;
@@ -239,10 +241,9 @@ namespace Content.Server.NPC.Pathfinding
var layer = 0;
var mask = 0;
if (TryComp<PhysicsComponent>(entity, out var body))
if (TryComp<FixturesComponent>(entity, out var fixtures))
{
layer = body.CollisionLayer;
mask = body.CollisionMask;
(layer, mask) = _physics.GetHardCollision(entity, fixtures);
}
var request = new BFSPathRequest(maxRange, limit, start.Coordinates, flags, layer, mask, cancelToken);
@@ -386,10 +387,9 @@ namespace Content.Server.NPC.Pathfinding
var layer = 0;
var mask = 0;
if (TryComp<PhysicsComponent>(entity, out var body))
if (TryComp<FixturesComponent>(entity, out var fixtures))
{
layer = body.CollisionLayer;
mask = body.CollisionMask;
(layer, mask) = _physics.GetHardCollision(entity, fixtures);
}
return new AStarPathRequest(start, end, flags, range, layer, mask, cancelToken);

22
Content.Server/NPC/Systems/NPCSteeringSystem.Obstacles.cs
View File

@@ -4,6 +4,7 @@ using Content.Server.NPC.Pathfinding;
using Content.Shared.Doors.Components;
using Content.Shared.NPC;
using Content.Shared.Weapons.Melee;
using Robust.Shared.Physics;
using Robust.Shared.Physics.Components;
namespace Content.Server.NPC.Systems;
@@ -35,20 +36,29 @@ public sealed partial class NPCSteeringSystem
if (poly.Data.IsFreeSpace)
return SteeringObstacleStatus.Completed;
if (!bodyQuery.TryGetComponent(component.Owner, out var body))
return SteeringObstacleStatus.Failed;
// TODO: Store PathFlags on the steering comp
// and be able to re-check it.
var layer = 0;
var mask = 0;
if (TryComp<FixturesComponent>(component.Owner, out var manager))
{
(layer, mask) = _physics.GetHardCollision(component.Owner, manager);
}
else
{
return SteeringObstacleStatus.Failed;
}
// TODO: Should cache the fact we're doing this somewhere.
// See https://github.com/space-wizards/space-station-14/issues/11475
if ((poly.Data.CollisionLayer & body.CollisionMask) != 0x0 ||
(poly.Data.CollisionMask & body.CollisionLayer) != 0x0)
if ((poly.Data.CollisionLayer & mask) != 0x0 ||
(poly.Data.CollisionMask & layer) != 0x0)
{
var obstacleEnts = new List<EntityUid>();
GetObstacleEntities(poly, body.CollisionMask, body.CollisionLayer, bodyQuery, obstacleEnts);
GetObstacleEntities(poly, mask, layer, bodyQuery, obstacleEnts);
var isDoor = (poly.Data.Flags & PathfindingBreadcrumbFlag.Door) != 0x0;
var isAccess = (poly.Data.Flags & PathfindingBreadcrumbFlag.Access) != 0x0;

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

@@ -30,6 +30,7 @@ namespace Content.Server.NPC.Systems
[Dependency] private readonly SharedInteractionSystem _interaction = default!;
[Dependency] private readonly SharedMeleeWeaponSystem _melee = default!;
[Dependency] private readonly SharedMoverController _mover = default!;
[Dependency] private readonly SharedPhysicsSystem _physics = default!;
// This will likely get moved onto an abstract pathfinding node that specifies the max distance allowed from the coordinate.
private const float TileTolerance = 0.40f;