Convert suicide and ghost commands to LEC. #38652
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
S: Untriaged
|
@VerinSenpai I am not a maintainer, but as a Triager, I am going to suggest that you follow the format that you get when making the PR. This current PR does not include the info that both triagers and maintainers need to properly review the PR. Such as a CL, technical details, etc. This means I cannot add the triage labels, and a maintainer may outright choose to close it (or they may not, up to them.) |
|
I added some technical details for it since this one does a bit more than just an LEC conversion. This change doesn't require a cl entry so I've omitted that as well as the media categories so the PR looks cleaner. I've been a bit lax lately as most of these PRs are just the same shit different day type deals. I'll bear that in mind though for the future. |
VerinSenpai
added
P3: Standard
Princess-Cheeseballs
requested changes
Oct 4, 2025
Comment on lines
+28
to
+49
| if (!_gameTicker.PlayerGameStatuses.TryGetValue(player.UserId, out var playerStatus) || | ||
| playerStatus is not PlayerGameStatus.JoinedGame) | ||
| { | ||
| shell.WriteLine(Loc.GetString("suicide-command-error-lobby")); | ||
| return; | ||
| } | ||
|
|
||
| public void Execute(IConsoleShell shell, string argStr, string[] args) | ||
| if (player.AttachedEntity is { Valid: true } frozen && | ||
| EntityManager.HasComponent<AdminFrozenComponent>(frozen)) | ||
| { | ||
| if (shell.Player is not { } player) | ||
| { | ||
| shell.WriteError(Loc.GetString("shell-cannot-run-command-from-server")); | ||
| return; | ||
| } | ||
|
|
||
| if (player.Status != SessionStatus.InGame || player.AttachedEntity == null) | ||
| return; | ||
|
|
||
| var minds = _e.System<SharedMindSystem>(); | ||
|
|
||
| // This check also proves mind not-null for at the end when the mob is ghosted. | ||
| if (!minds.TryGetMind(player, out var mindId, out var mindComp) || | ||
| mindComp.OwnedEntity is not { Valid: true } victim) | ||
| { | ||
| shell.WriteLine(Loc.GetString("suicide-command-no-mind")); | ||
| return; | ||
| } | ||
|
|
||
| var suicideSystem = _e.System<SuicideSystem>(); | ||
|
|
||
| if (_e.HasComponent<AdminFrozenComponent>(victim)) | ||
| { | ||
| var deniedMessage = Loc.GetString("suicide-command-denied"); | ||
| shell.WriteLine(deniedMessage); | ||
| _e.System<PopupSystem>() | ||
| .PopupEntity(deniedMessage, victim, victim); | ||
| return; | ||
| } | ||
|
|
||
| if (suicideSystem.Suicide(victim)) | ||
| return; | ||
|
|
||
| shell.WriteLine(Loc.GetString("ghost-command-denied")); | ||
| var deniedMessage = Loc.GetString("suicide-command-denied"); | ||
| shell.WriteLine(deniedMessage); | ||
| _popupSystem.PopupEntity(deniedMessage, frozen, frozen); | ||
| return; | ||
| } | ||
|
|
||
| if (!_mindSystem.TryGetMind(player, out _, out var mindComp) || | ||
| mindComp.OwnedEntity is not { Valid: true } victim) | ||
| { | ||
| shell.WriteLine(Loc.GetString("suicide-command-no-mind")); | ||
| return; | ||
| } |
There was a problem hiding this comment.
This should be deboilerplated and moved to a helper system.
PJBot
added
S: Awaiting Changes
|
Ive opted to close this for now. Im instead going to let Pok take over localizing this and begin work on the mentioned command helpers. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About the PR
Also unified the structure of both commands. Do suggest any improvements that can be made.
Technical details
Converts the suicide and ghost commands to LocalizedEntityCommands and performed cleanup that comes with that. The commands were already localized but this does make a few minor changes such as switching the suicide command to using its own denied message.
Also unifies the code between the two commands. I'm sure this can be deduplicated better with methods in the future so I'll keep that in mind.
Requirements