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

Content update for ECS physics (#13291)

Browse Source
This commit is contained in:
metalgearsloth
2023-01-15 15:38:59 +11:00
committed by GitHub
parent 46d24bc36b
commit bf79d76666
61 changed files with 431 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Content.Server/Administration/Commands/WarpCommand.cs
View File

@@ -9,12 +9,15 @@ using Robust.Shared.Enums;
using Robust.Shared.Map;
using Robust.Shared.Physics;
using Robust.Shared.Physics.Components;
using Robust.Shared.Physics.Systems;
namespace Content.Server.Administration.Commands
{
[AdminCommand(AdminFlags.Admin)]
public sealed class WarpCommand : IConsoleCommand
{
[Dependency] private readonly IEntityManager _entManager = default!;
public string Command => "warp";
public string Description => "Teleports you to predefined areas on the map.";
@@ -37,11 +40,10 @@ namespace Content.Server.Administration.Commands
return;
}
var entMan = IoCManager.Resolve<IEntityManager>();
var location = args[0];
if (location == "?")
{
var locations = string.Join(", ", GetWarpPointNames(entMan));
var locations = string.Join(", ", GetWarpPointNames());
shell.WriteLine(locations);
}
@@ -53,20 +55,19 @@ namespace Content.Server.Administration.Commands
return;
}
var mapManager = IoCManager.Resolve<IMapManager>();
var currentMap = entMan.GetComponent<TransformComponent>(playerEntity).MapID;
var currentGrid = entMan.GetComponent<TransformComponent>(playerEntity).GridUid;
var currentMap = _entManager.GetComponent<TransformComponent>(playerEntity).MapID;
var currentGrid = _entManager.GetComponent<TransformComponent>(playerEntity).GridUid;
var found = entMan.EntityQuery<WarpPointComponent>(true)
var found = _entManager.EntityQuery<WarpPointComponent>(true)
.Where(p => p.Location == location)
.Select(p => (entMan.GetComponent<TransformComponent>(p.Owner).Coordinates, p.Follow))
.Select(p => (_entManager.GetComponent<TransformComponent>(p.Owner).Coordinates, p.Follow))
.OrderBy(p => p.Item1, Comparer<EntityCoordinates>.Create((a, b) =>
{
// Sort so that warp points on the same grid/map are first.
// So if you have two maps loaded with the same warp points,
// it will prefer the warp points on the map you're currently on.
var aGrid = a.GetGridUid(entMan);
var bGrid = b.GetGridUid(entMan);
var aGrid = a.GetGridUid(_entManager);
var bGrid = b.GetGridUid(_entManager);
if (aGrid == bGrid)
{
@@ -83,8 +84,8 @@ namespace Content.Server.Administration.Commands
return 1;
}
var mapA = a.GetMapId(entMan);
var mapB = a.GetMapId(entMan);
var mapA = a.GetMapId(_entManager);
var mapB = a.GetMapId(_entManager);
if (mapA == mapB)
{
@@ -113,25 +114,25 @@ namespace Content.Server.Administration.Commands
return;
}
if (follow && entMan.HasComponent<GhostComponent>(playerEntity))
if (follow && _entManager.HasComponent<GhostComponent>(playerEntity))
{
entMan.EntitySysManager.GetEntitySystem<FollowerSystem>().StartFollowingEntity(playerEntity, coords.EntityId);
_entManager.System<FollowerSystem>().StartFollowingEntity(playerEntity, coords.EntityId);
return;
}
var xform = entMan.GetComponent<TransformComponent>(playerEntity);
var xform = _entManager.GetComponent<TransformComponent>(playerEntity);
xform.Coordinates = coords;
xform.AttachToGridOrMap();
if (entMan.TryGetComponent(playerEntity, out PhysicsComponent? physics))
if (_entManager.TryGetComponent(playerEntity, out PhysicsComponent? physics))
{
physics.LinearVelocity = Vector2.Zero;
_entManager.System<SharedPhysicsSystem>().SetLinearVelocity(playerEntity, Vector2.Zero, body: physics);
}
}
}
private static IEnumerable<string> GetWarpPointNames(IEntityManager entMan)
private IEnumerable<string> GetWarpPointNames()
{
return entMan.EntityQuery<WarpPointComponent>(true)
return _entManager.EntityQuery<WarpPointComponent>(true)
.Select(p => p.Location)
.Where(p => p != null)
.OrderBy(p => p)
@@ -142,8 +143,7 @@ namespace Content.Server.Administration.Commands
{
if (args.Length == 1)
{
var ent = IoCManager.Resolve<IEntityManager>();
var options = new[] { "?" }.Concat(GetWarpPointNames(ent));
var options = new[] { "?" }.Concat(GetWarpPointNames());
return CompletionResult.FromHintOptions(options, "<warp point | ?>");
}