Command resolve killing and LEC conversions batch 2 (#38367)

commit progress
This commit is contained in:
Kyle Tyo
2025-06-17 14:01:28 -04:00
committed by GitHub
parent 57babe15ee
commit 0e1ff2644f
18 changed files with 130 additions and 126 deletions

View File

@@ -10,53 +10,50 @@ using Robust.Shared.Prototypes;
namespace Content.Server.Roles
{
[AdminCommand(AdminFlags.Admin)]
public sealed class AddRoleCommand : IConsoleCommand
public sealed class AddRoleCommand : LocalizedEntityCommands
{
[Dependency] private readonly EntityManager _entityManager = default!;
[Dependency] private readonly IPlayerManager _playerManager = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly JobSystem _jobSystem = default!;
public string Command => "addrole";
public override string Command => "addrole";
public string Description => "Adds a role to a player's mind.";
public string Help => "addrole <session ID> <role>";
public void Execute(IConsoleShell shell, string argStr, string[] args)
public override void Execute(IConsoleShell shell, string argStr, string[] args)
{
if (args.Length != 2)
{
shell.WriteLine("Expected exactly 2 arguments.");
shell.WriteLine(Loc.GetString($"shell-wrong-arguments-number-need-specific",
("properAmount", 2),
("currentAmount", args.Length)));
return;
}
var mgr = IoCManager.Resolve<IPlayerManager>();
if (!mgr.TryGetPlayerDataByUsername(args[0], out var data))
if (!_playerManager.TryGetPlayerDataByUsername(args[0], out var data))
{
shell.WriteLine("Can't find that mind");
shell.WriteLine(Loc.GetString($"cmd-addrole-mind-not-found"));
return;
}
var mind = data.ContentData()?.Mind;
if (mind == null)
{
shell.WriteLine("Can't find that mind");
shell.WriteLine(Loc.GetString($"cmd-addrole-mind-not-found"));
return;
}
var prototypeManager = IoCManager.Resolve<IPrototypeManager>();
if (!prototypeManager.TryIndex<JobPrototype>(args[1], out var jobPrototype))
if (!_prototypeManager.TryIndex<JobPrototype>(args[1], out var jobPrototype))
{
shell.WriteLine("Can't find that role");
shell.WriteLine(Loc.GetString($"cmd-addrole-role-not-found"));
return;
}
var jobs = _entityManager.System<JobSystem>();
if (jobs.MindHasJobWithId(mind, jobPrototype.Name))
if (_jobSystem.MindHasJobWithId(mind, jobPrototype.Name))
{
shell.WriteLine("Mind already has that role");
shell.WriteLine(Loc.GetString($"cmd-addrole-mind-already-has-role"));
return;
}
jobs.MindAddJob(mind.Value, args[1]);
_jobSystem.MindAddJob(mind.Value, args[1]);
}
}
}