From f5a980edc2222deedf3e0a0c640e12eef3ccaa1a Mon Sep 17 00:00:00 2001 From: Kyle Tyo <36606155+VerinSenpai@users.noreply.github.com> Date: Wed, 3 Sep 2025 16:16:43 -0400 Subject: [PATCH] Cleanup AddPolymorphActionCommand and LEC conversion. (#38853) commit --- .../Commands/AddPolymorphActionCommand.cs | 22 +++++++------------ .../commands/polymorph-command.ftl | 8 ------- .../commands/addpolymorphaction-command.ftl | 2 ++ 3 files changed, 10 insertions(+), 22 deletions(-) delete mode 100644 Resources/Locale/en-US/administration/commands/polymorph-command.ftl create mode 100644 Resources/Locale/en-US/commands/addpolymorphaction-command.ftl diff --git a/Content.Server/Administration/Commands/AddPolymorphActionCommand.cs b/Content.Server/Administration/Commands/AddPolymorphActionCommand.cs index b92cbfc0de..f089268bea 100644 --- a/Content.Server/Administration/Commands/AddPolymorphActionCommand.cs +++ b/Content.Server/Administration/Commands/AddPolymorphActionCommand.cs @@ -6,17 +6,13 @@ using Robust.Shared.Console; namespace Content.Server.Administration.Commands; [AdminCommand(AdminFlags.Fun)] -public sealed class AddPolymorphActionCommand : IConsoleCommand +public sealed class AddPolymorphActionCommand : LocalizedEntityCommands { - [Dependency] private readonly IEntityManager _entityManager = default!; + [Dependency] private readonly PolymorphSystem _polySystem = default!; - public string Command => "addpolymorphaction"; + public override string Command => "addpolymorphaction"; - public string Description => Loc.GetString("add-polymorph-action-command-description"); - - public string Help => Loc.GetString("add-polymorph-action-command-help-text"); - - public void Execute(IConsoleShell shell, string argStr, string[] args) + public override void Execute(IConsoleShell shell, string argStr, string[] args) { if (args.Length != 2) { @@ -24,15 +20,13 @@ public sealed class AddPolymorphActionCommand : IConsoleCommand return; } - if (!NetEntity.TryParse(args[0], out var entityUidNet) || !_entityManager.TryGetEntity(entityUidNet, out var entityUid)) + if (!NetEntity.TryParse(args[0], out var entityUidNet) || !EntityManager.TryGetEntity(entityUidNet, out var entityUid)) { - shell.WriteError(Loc.GetString("shell-entity-uid-must-be-number")); + shell.WriteError(Loc.GetString("shell-could-not-find-entity-with-uid", ("uid", args[0]))); return; } - var polySystem = _entityManager.EntitySysManager.GetEntitySystem(); - - var polymorphable = _entityManager.EnsureComponent(entityUid.Value); - polySystem.CreatePolymorphAction(args[1], (entityUid.Value, polymorphable)); + var polymorphable = EntityManager.EnsureComponent(entityUid.Value); + _polySystem.CreatePolymorphAction(args[1], (entityUid.Value, polymorphable)); } } diff --git a/Resources/Locale/en-US/administration/commands/polymorph-command.ftl b/Resources/Locale/en-US/administration/commands/polymorph-command.ftl deleted file mode 100644 index ef7d1b744d..0000000000 --- a/Resources/Locale/en-US/administration/commands/polymorph-command.ftl +++ /dev/null @@ -1,8 +0,0 @@ -polymorph-command-description = For when you need someone to stop being a person. Takes an entity and a polymorph prototype. -polymorph-command-help-text = polymorph - -add-polymorph-action-command-description = Takes an entity and gives them a voluntary polymorph. -add-polymorph-action-command-help-text = addpolymorphaction - - -polymorph-not-valid-prototype-error = Polymorph prototype is not valid. \ No newline at end of file diff --git a/Resources/Locale/en-US/commands/addpolymorphaction-command.ftl b/Resources/Locale/en-US/commands/addpolymorphaction-command.ftl new file mode 100644 index 0000000000..72f2158273 --- /dev/null +++ b/Resources/Locale/en-US/commands/addpolymorphaction-command.ftl @@ -0,0 +1,2 @@ +cmd-addpolymorphaction-desc = Takes an entity and gives them a voluntary polymorph. +cmd-addpolymorphaction-help = Usage: addpolymorphaction -- 2.51.2