Fix "to" and "take" toolshed commands (#5438)

space-wizards · Sep 13, 2024 · 4949b34 · 4949b34
1 parent 0f60ad9
commit 4949b34
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -43,7 +43,7 @@ END TEMPLATE-->
 
 ### Bugfixes
 
-*None yet*
+* Fixed the "to" and "take" toolshed commands not working as intended.
 
 ### Other
 

diff --git a/Resources/Locale/en-US/toolshed-commands.ftl b/Resources/Locale/en-US/toolshed-commands.ftl
@@ -219,9 +219,9 @@ command-description-MulVecCommand =
 command-description-DivVecCommand =
     Divides every element in the input by a scalar (single value).
 command-description-rng-to =
-    Returns a number from its input to its argument (i.e. n..m inclusive)
+    Returns a number between the input (inclusive) and the argument (exclusive).
 command-description-rng-from =
-    Returns a number to its input from its argument (i.e. m..n inclusive)
+    Returns a number between the argument (inclusive) and the input (exclusive))
 command-description-rng-prob =
     Returns a boolean based on the input probability/chance (from 0 to 1)
 command-description-sum =

diff --git a/Robust.Shared/Toolshed/Commands/Generic/ListGeneration/ToCommand.cs b/Robust.Shared/Toolshed/Commands/Generic/ListGeneration/ToCommand.cs
@@ -15,5 +15,5 @@ public IEnumerable<T> To<T>(
             [CommandArgument] ValueRef<T> end
         )
         where T : INumber<T>
-        => Enumerable.Range(int.CreateTruncating(start), int.CreateTruncating(end.Evaluate(ctx)!)).Select(T.CreateTruncating);
+        => Enumerable.Range(int.CreateTruncating(start), int.CreateTruncating(end.Evaluate(ctx)! - start)).Select(T.CreateTruncating);
 }
diff --git a/Robust.Shared/Toolshed/Commands/Generic/TakeCommand.cs b/Robust.Shared/Toolshed/Commands/Generic/TakeCommand.cs
@@ -7,7 +7,7 @@ namespace Robust.Shared.Toolshed.Commands.Generic;
 [ToolshedCommand]
 public sealed class TakeCommand : ToolshedCommand
 {
-    [CommandImplementation]
+    [CommandImplementation, TakesPipedTypeAsGeneric]
     public IEnumerable<T> Take<T>(
             [CommandInvocationContext] IInvocationContext ctx,
             [PipedArgument] IEnumerable<T> input,