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

Climbing refactor (#20516)

Browse Source
This commit is contained in:
metalgearsloth
2023-10-11 10:41:11 +11:00
committed by GitHub
parent ab75941bc0
commit edbfef22d6
30 changed files with 637 additions and 661 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,6 +10,7 @@ using Content.Shared.NPC;
using Content.Shared.Physics;
using Robust.Shared.Map;
using Robust.Shared.Physics.Components;
using ClimbingComponent = Content.Shared.Climbing.Components.ClimbingComponent;
namespace Content.Server.NPC.Systems;

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

@@ -9,6 +9,8 @@ using Content.Shared.NPC;
using Robust.Shared.Physics;
using Robust.Shared.Physics.Components;
using Robust.Shared.Utility;
using ClimbableComponent = Content.Shared.Climbing.Components.ClimbableComponent;
using ClimbingComponent = Content.Shared.Climbing.Components.ClimbingComponent;
namespace Content.Server.NPC.Systems;
@@ -132,7 +134,7 @@ public sealed partial class NPCSteeringSystem
{
return SteeringObstacleStatus.Completed;
}
else if (climbing.OwnerIsTransitioning)
else if (climbing.NextTransition != null)
{
return SteeringObstacleStatus.Continuing;
}

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

@@ -1,21 +1,19 @@
using System.Linq;
using System.Numerics;
using System.Threading;
using System.Threading.Tasks;
using Content.Server.Administration.Managers;
using Content.Server.Climbing;
using Content.Server.DoAfter;
using Content.Server.Doors.Systems;
using Content.Server.NPC.Components;
using Content.Server.NPC.Events;
using Content.Server.NPC.Pathfinding;
using Content.Shared.CCVar;
using Content.Shared.Climbing.Systems;
using Content.Shared.CombatMode;
using Content.Shared.Interaction;
using Content.Shared.Movement.Components;
using Content.Shared.Movement.Systems;
using Content.Shared.NPC;
using Content.Shared.NPC;
using Content.Shared.NPC.Events;
using Content.Shared.Physics;
using Content.Shared.Weapons.Melee;
@@ -28,7 +26,6 @@ using Robust.Shared.Physics.Systems;
using Robust.Shared.Player;
using Robust.Shared.Players;
using Robust.Shared.Random;
using Robust.Shared.Threading;
using Robust.Shared.Timing;
using Robust.Shared.Utility;
using Content.Shared.Prying.Systems;