Skip to content

Commit

Permalink
Merge pull request #17 from spess-empyrean/tile_movement
Browse files Browse the repository at this point in the history
Fixes space carp mob AI not working with tile movement
  • Loading branch information
spess-empyrean authored Jan 15, 2025
2 parents 1777096 + 4f1f075 commit f95a738
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions Content.Server/NPC/Systems/NPCSteeringSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
using Content.Shared.CCVar;
using Content.Shared.Climbing.Systems;
using Content.Shared.CombatMode;
using Content.Shared.Gravity;
using Content.Shared.Interaction;
using Content.Shared.Movement.Components;
using Content.Shared.Movement.Systems;
Expand Down Expand Up @@ -65,8 +66,9 @@ public sealed partial class NPCSteeringSystem : SharedNPCSteeringSystem
[Dependency] private readonly SharedTransformSystem _transform = default!;
[Dependency] private readonly SharedCombatModeSystem _combat = default!;
[Dependency] private readonly SharedMapSystem _map = default!;
[Dependency] protected readonly IGameTiming Timing = default!;
[Dependency] protected readonly SharedPhysicsSystem PhysicsSystem = default!;
[Dependency] private readonly IGameTiming Timing = default!;
[Dependency] private readonly SharedPhysicsSystem PhysicsSystem = default!;
[Dependency] private readonly SharedGravitySystem _gravity = default!;

private EntityQuery<FixturesComponent> _fixturesQuery;
private EntityQuery<MovementSpeedModifierComponent> _modifierQuery;
Expand Down Expand Up @@ -401,7 +403,10 @@ private void Steer(

steering.LastSteerDirection = resultDirection;
DebugTools.Assert(!float.IsNaN(resultDirection.X));
if (_tileMovementQuery.TryGetComponent(uid, out var tileMovement))

if (!_gravity.IsWeightless(uid, body, xform) &&
body.BodyStatus == BodyStatus.OnGround &&
_tileMovementQuery.TryGetComponent(uid, out var tileMovement))
{
SetTileMovementDirection(xform, tileMovement, resultDirection);
}
Expand Down

0 comments on commit f95a738

Please sign in to comment.