setgamepreset command rework (space-wizards#30756)

* gameticker.gamepreset namespace * setgamepreset now has a finite duration * comments, cleanup
themias · Aug 9, 2024 · f269f66 · f269f66
1 parent 83a7253
commit f269f66
Show file tree

Hide file tree

Showing 4 changed files with 264 additions and 228 deletions.
diff --git a/Content.Server/GameTicking/Commands/SetGamePresetCommand.cs b/Content.Server/GameTicking/Commands/SetGamePresetCommand.cs
@@ -2,6 +2,7 @@
 using Content.Server.Administration;
 using Content.Server.GameTicking.Presets;
 using Content.Shared.Administration;
+using Linguini.Shared.Util;
 using Robust.Shared.Console;
 using Robust.Shared.Prototypes;
 
@@ -19,9 +20,9 @@ public sealed class SetGamePresetCommand : IConsoleCommand
 
         public void Execute(IConsoleShell shell, string argStr, string[] args)
         {
-            if (args.Length != 1)
+            if (!args.Length.InRange(1, 2))
             {
-                shell.WriteError(Loc.GetString("shell-wrong-arguments-number-need-specific", ("properAmount", 1), ("currentAmount", args.Length)));
+                shell.WriteError(Loc.GetString("shell-need-between-arguments", ("lower", 1), ("upper", 2), ("currentAmount", args.Length)));
                 return;
             }
 
@@ -33,8 +34,16 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
                 return;
             }
 
-            ticker.SetGamePreset(preset);
-            shell.WriteLine(Loc.GetString("set-game-preset-preset-set", ("preset", preset.ID)));
+            var rounds = 1;
+
+            if (args.Length == 2 && !int.TryParse(args[1], out rounds))
+            {
+                shell.WriteError(Loc.GetString("set-game-preset-optional-argument-not-integer"));
+                return;
+            }
+
+            ticker.SetGamePreset(preset, false, rounds);
+            shell.WriteLine(Loc.GetString("set-game-preset-preset-set-finite", ("preset", preset.ID), ("rounds", rounds.ToString())));
         }
 
         public CompletionResult GetCompletion(IConsoleShell shell, string[] args)