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

AnchorableComponent light cleanup. (#4009)

Browse Source 
* Remove awful commands

* Unanchoring is a word.

* Fix disposal tests....

* Slight anchorable cleanup
This commit is contained in:
Vera Aguilera Puerto
2021-05-16 22:33:21 +02:00
committed by GitHub
parent efbe129d61
commit dc03f1f545
7 changed files with 73 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
Content.Server/Commands/Interactable/AnchorCommand.cs
View File

@@ -1,58 +0,0 @@
#nullable enable
using System.Linq;
using Content.Server.Administration;
using Content.Server.GameObjects.Components;
using Content.Shared.Administration;
using Robust.Server.GameObjects;
using Robust.Server.Player;
using Robust.Shared.Console;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
namespace Content.Server.Commands.Interactable
{
[AdminCommand(AdminFlags.Debug)]
class AnchorCommand : IConsoleCommand
{
public string Command => "anchor";
public string Description => "Anchors all entities in a radius around the user";
public string Help => $"Usage: {Command} <radius>";
public void Execute(IConsoleShell shell, string argStr, string[] args)
{
var player = shell.Player as IPlayerSession;
if (player?.AttachedEntity == null)
{
return;
}
if (args.Length != 1)
{
shell.WriteLine(Help);
return;
}
if (!int.TryParse(args[0], out var radius))
{
shell.WriteLine($"{args[0]} isn't a valid integer.");
return;
}
if (radius < 0)
{
shell.WriteLine("Radius must be positive.");
return;
}
var entities = IoCManager.Resolve<IEntityLookup>().GetEntitiesInRange(player.AttachedEntity, radius).ToList();
foreach (var entity in entities)
{
if (entity.TryGetComponent(out AnchorableComponent? anchorable))
{
_ = anchorable.TryAnchor(player.AttachedEntity, force: true);
}
}
}
}
}

58
Content.Server/Commands/Interactable/UnAnchorCommand.cs
View File

@@ -1,58 +0,0 @@
#nullable enable
using System.Linq;
using Content.Server.Administration;
using Content.Server.GameObjects.Components;
using Content.Shared.Administration;
using Robust.Server.GameObjects;
using Robust.Server.Player;
using Robust.Shared.Console;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
namespace Content.Server.Commands.Interactable
{
[AdminCommand(AdminFlags.Debug)]
class UnAnchorCommand : IConsoleCommand
{
public string Command => "unanchor";
public string Description => "Unanchors all anchorable entities in a radius around the user";
public string Help => $"Usage: {Command} <radius>";
public void Execute(IConsoleShell shell, string argStr, string[] args)
{
var player = shell.Player as IPlayerSession;
if (player?.AttachedEntity == null)
{
return;
}
if (args.Length != 1)
{
shell.WriteLine(Help);
return;
}
if (!int.TryParse(args[0], out var radius))
{
shell.WriteLine($"{args[0]} isn't a valid integer.");
return;
}
if (radius < 0)
{
shell.WriteLine("Radius must be positive.");
return;
}
var entities = IoCManager.Resolve<IEntityLookup>().GetEntitiesInRange(player.AttachedEntity, radius).ToList();
foreach (var entity in entities)
{
if (entity.TryGetComponent(out AnchorableComponent? anchorable))
{
_ = anchorable.TryUnAnchor(player.AttachedEntity, force: true);
}
}
}
}
}

60
Content.Server/Commands/SetAnchorCommand.cs
View File

@@ -1,60 +0,0 @@
#nullable enable
using Content.Server.Administration;
using Content.Server.GameObjects.Components;
using Content.Shared.Administration;
using Robust.Shared.Console;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Physics;
namespace Content.Server.Commands
{
[AdminCommand(AdminFlags.Debug)]
public class SetAnchorCommand : IConsoleCommand
{
public string Command => "setanchor";
public string Description => "Sets the anchoring state of an entity.";
public string Help => "setanchor <entity id> <value (optional)>";
public async void Execute(IConsoleShell shell, string argStr, string[] args)
{
if (args.Length == 0 || args.Length > 2)
{
shell.WriteLine("Invalid number of argument!");
return;
}
if (!int.TryParse(args[0], out var id))
{
shell.WriteLine("Invalid argument specified!");
return;
}
var entId = new EntityUid(id);
var entityManager = IoCManager.Resolve<IEntityManager>();
if (!entityManager.TryGetEntity(entId, out var entity) || entity.Deleted || !entity.TryGetComponent(out AnchorableComponent? anchorable))
{
shell.WriteLine("Invalid entity specified!");
return;
}
if (args.Length == 2)
{
if (!bool.TryParse(args[1], out var value))
{
shell.WriteLine("Invalid argument specified!");
return;
}
if (value)
await anchorable.TryAnchor(default, force: true);
else
await anchorable.TryUnAnchor(default, force: true);
return;
}
await anchorable.TryToggleAnchor(default, force: true);
}
}
}