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

NPC Steering refactor (#10190)

Browse Source 
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
This commit is contained in:
metalgearsloth
2022-08-03 16:02:50 +10:00
committed by GitHub
parent 4fc4567a9c
commit 098b536fb8
8 changed files with 480 additions and 840 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Content.Server/AI/Operators/Combat/Melee/UnarmedCombatOperator.cs
View File

@@ -68,6 +68,13 @@ namespace Content.Server.AI.Operators.Combat.Melee
public override Outcome Execute(float frameTime)
{
if (_unarmedCombat == null ||
!_entMan.GetComponent<TransformComponent>(_target).Coordinates.TryDistance(_entMan, _entMan.GetComponent<TransformComponent>(_owner).Coordinates, out var distance) || distance >
_unarmedCombat.Range)
{
return Outcome.Failed;
}
if (_burstTime <= _elapsedTime)
{
return Outcome.Success;
@@ -78,12 +85,6 @@ namespace Content.Server.AI.Operators.Combat.Melee
return Outcome.Failed;
}
if ((_entMan.GetComponent<TransformComponent>(_target).Coordinates.Position - _entMan.GetComponent<TransformComponent>(_owner).Coordinates.Position).Length >
_unarmedCombat.Range)
{
return Outcome.Failed;
}
var interactionSystem = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<InteractionSystem>();
interactionSystem.AiUseInteraction(_owner, _entMan.GetComponent<TransformComponent>(_target).Coordinates, _target);
_elapsedTime += frameTime;

21
Content.Server/AI/Operators/Movement/MoveToEntityOperator.cs
View File

@@ -1,4 +1,5 @@
using Content.Server.AI.Steering;
using Robust.Shared.Map;
using Robust.Shared.Utility;
namespace Content.Server.AI.Operators.Movement
@@ -7,7 +8,6 @@ namespace Content.Server.AI.Operators.Movement
{
// TODO: This and steering need to support InRangeUnobstructed now
private readonly EntityUid _owner;
private EntityTargetSteeringRequest? _request;
private readonly EntityUid _target;
// For now we'll just get as close as we can because we're not doing LOS checks to be able to pick up at the max interaction range
public float ArrivalDistance { get; }
@@ -36,9 +36,9 @@ namespace Content.Server.AI.Operators.Movement
return true;
}
var steering = EntitySystem.Get<AiSteeringSystem>();
_request = new EntityTargetSteeringRequest(_target, ArrivalDistance, PathfindingProximity, _requiresInRangeUnobstructed);
steering.Register(_owner, _request);
var steering = EntitySystem.Get<NPCSteeringSystem>();
var comp = steering.Register(_owner, new EntityCoordinates(_target, Vector2.Zero));
comp.Range = ArrivalDistance;
return true;
}
@@ -47,24 +47,23 @@ namespace Content.Server.AI.Operators.Movement
if (!base.Shutdown(outcome))
return false;
var steering = EntitySystem.Get<AiSteeringSystem>();
var steering = EntitySystem.Get<NPCSteeringSystem>();
steering.Unregister(_owner);
return true;
}
public override Outcome Execute(float frameTime)
{
switch (_request?.Status)
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent<NPCSteeringComponent>(_owner, out var steering))
return Outcome.Failed;
switch (steering.Status)
{
case SteeringStatus.Pending:
DebugTools.Assert(EntitySystem.Get<AiSteeringSystem>().IsRegistered(_owner));
return Outcome.Continuing;
case SteeringStatus.NoPath:
return Outcome.Failed;
case SteeringStatus.Arrived:
case SteeringStatus.InRange:
return Outcome.Success;
case SteeringStatus.Moving:
DebugTools.Assert(EntitySystem.Get<AiSteeringSystem>().IsRegistered(_owner));
return Outcome.Continuing;
default:
throw new ArgumentOutOfRangeException();

20
Content.Server/AI/Operators/Movement/MoveToGridOperator.cs
View File

@@ -7,7 +7,6 @@ namespace Content.Server.AI.Operators.Movement
public sealed class MoveToGridOperator : AiOperator
{
private readonly EntityUid _owner;
private GridTargetSteeringRequest? _request;
private readonly EntityCoordinates _target;
public float DesiredRange { get; set; }
@@ -25,9 +24,9 @@ namespace Content.Server.AI.Operators.Movement
return true;
}
var steering = EntitySystem.Get<AiSteeringSystem>();
_request = new GridTargetSteeringRequest(_target, DesiredRange);
steering.Register(_owner, _request);
var steering = EntitySystem.Get<NPCSteeringSystem>();
var comp = steering.Register(_owner, _target);
comp.Range = DesiredRange;
return true;
}
@@ -36,24 +35,23 @@ namespace Content.Server.AI.Operators.Movement
if (!base.Shutdown(outcome))
return false;
var steering = EntitySystem.Get<AiSteeringSystem>();
var steering = EntitySystem.Get<NPCSteeringSystem>();
steering.Unregister(_owner);
return true;
}
public override Outcome Execute(float frameTime)
{
switch (_request?.Status)
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent<NPCSteeringComponent>(_owner, out var steering))
return Outcome.Failed;
switch (steering.Status)
{
case SteeringStatus.Pending:
DebugTools.Assert(EntitySystem.Get<AiSteeringSystem>().IsRegistered(_owner));
return Outcome.Continuing;
case SteeringStatus.NoPath:
return Outcome.Failed;
case SteeringStatus.Arrived:
case SteeringStatus.InRange:
return Outcome.Success;
case SteeringStatus.Moving:
DebugTools.Assert(EntitySystem.Get<AiSteeringSystem>().IsRegistered(_owner));
return Outcome.Continuing;
default:
throw new ArgumentOutOfRangeException();