Added a random interval option to the wait command

MCCTeam · Jul 16, 2023 · ac65482 · ac65482
2 parents 8891b65 + c5a0409
commit ac65482
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 3 deletions.
diff --git a/MinecraftClient/ChatBots/Script.cs b/MinecraftClient/ChatBots/Script.cs
@@ -205,7 +205,29 @@ public override void Update()
                                         int ticks = 10;
                                         try
                                         {
-                                            ticks = Convert.ToInt32(instruction_line[5..]);
+                                            if (instruction_line[5..].Contains("to", StringComparison.OrdinalIgnoreCase) ||
+                                                instruction_line[5..].Contains("-"))
+                                            {
+                                                var processedLine = instruction_line.Replace("wait", "")
+                                                    .Trim()
+                                                    .ToLower();
+                                                processedLine = string.Join("", processedLine.Split(default(string[]), StringSplitOptions.RemoveEmptyEntries));
+                                                var parts = processedLine.Contains("to") ? processedLine.Split("to") : processedLine.Split("-");
+
+                                                if (parts.Length == 2)
+                                                {
+                                                    var min = Convert.ToInt32(parts[0]);
+                                                    var max = Convert.ToInt32(parts[1]);
+
+                                                    if (min > max)
+                                                    {
+                                                        (min, max) = (max, min);
+                                                        LogToConsole(Translations.cmd_wait_random_min_bigger);
+                                                    }
+
+                                                    ticks = new Random().Next(min, max);
+                                                } else ticks = Convert.ToInt32(instruction_line[5..]);
+                                            } else ticks = Convert.ToInt32(instruction_line[5..]);
                                         }
                                         catch { }
                                         sleepticks = ticks;

diff --git a/MinecraftClient/Resources/Translations/Translations.Designer.cs b/MinecraftClient/Resources/Translations/Translations.Designer.cs
diff --git a/MinecraftClient/Resources/Translations/Translations.resx b/MinecraftClient/Resources/Translations/Translations.resx
@@ -2115,4 +2115,7 @@ Logging in...</value>
   <data name="bot.common.movement.lock.held" xml:space="preserve">
     <value>You can not start/run/use the '{0}' bot because it requires movement, the movement is currently utilized by the '{1}' bot, stop it if you want to use this one.</value>
   </data>
+  <data name="cmd.wait.random.min.bigger" xml:space="preserve">
+    <value>Minimum number that you have provided is bigger than the maximum, swapping them around!</value>
+  </data>
 </root>
diff --git a/docs/guide/usage.md b/docs/guide/usage.md
@@ -695,10 +695,10 @@ In scripts and remote control, no slash is needed to perform the command, eg. `q
 -   **Examples:**
 
     ```
-    /setrnd <variable> -7to10
+    /setrnd <variable> -7 to 10
     ```
 
-    (Set a `%variable%` to a number from -7 to 9)
+    (Set a `%variable%` to a number from -7 to 10)
 
 ### `sneak`
 
@@ -836,16 +836,38 @@ In scripts and remote control, no slash is needed to perform the command, eg. `q
 
 -   **Usage:**
 
+    Fixed time:
+
     ```
     /wait <time>
     ```
 
+    Random time:
+
+    ```
+    /wait <minimum time> to <maximum time>
+    ```
+
+    <div class="custom-container tip"><p class="custom-container-title">Tip</p>
+
+    **You can use `-` instead of `to`**
+
+    </div>
+
 -   **Examples:**
 
     ```
     /wait 20
     ```
 
+    ```
+    /wait 20 to 100
+    ```
+
+    ```
+    /wait 20-35
+    ```
+
 ### `move`
 
 -   **Description:**