v3.2.7 - Fix tutorial island guide section. Fix rune mysteries intro dialogue

Explv · Explv · commit b0b822d19872 · 2021-01-30T20:18:51.000Z
diff --git a/src/main/java/activities/quests/RuneMysteries.java b/src/main/java/activities/quests/RuneMysteries.java
@@ -11,7 +11,7 @@ public class RuneMysteries extends QuestActivity {
     private final DialogueCompleter dukeHoracioDialogueCompleter = new DialogueCompleter(
             "Duke Horacio",
             new Area(new Position(3208, 3218, 1), new Position(3213, 3225, 1)),
-            "Duke Horacio", "Have you any quests for me?", "Sure, no problem."
+            "Duke Horacio", "Have you any quests for me?", "Yes"
     );
 
     private final DialogueCompleter sedridorDialogueCompleter = new DialogueCompleter(
diff --git a/src/main/java/activities/tutorial_island/RuneScapeGuideSection.java b/src/main/java/activities/tutorial_island/RuneScapeGuideSection.java
@@ -9,12 +9,14 @@
 import util.event.ConfigureClientEvent;
 import util.event.DisableAudioEvent;
 import util.widget.CachedWidget;
+import util.widget.filters.WidgetActionFilter;
 
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Optional;
 import java.util.Random;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 public final class RuneScapeGuideSection extends TutorialSection {
     private enum UsernameCheckStatus {
@@ -84,7 +86,7 @@ public final void onLoop() throws InterruptedException {
                 break;
             case 10:
                 if (!isConfigured) {
-                    execute(new ConfigureClientEvent());
+                    isConfigured = execute(new ConfigureClientEvent()).hasFinished();
                 } else if (getObjects().closest("Door").interact("Open")) {
                     Sleep.sleepUntil(() -> getProgress() != 10, 5000, 600);
                 }
@@ -147,18 +149,20 @@ private void createRandomCharacter() throws InterruptedException {
         }
 
         final RS2Widget[] childWidgets = getWidgets().getWidgets(creationScreenWidget.get(getWidgets()).get().getRootId());
-        Collections.shuffle(Arrays.asList(childWidgets));
 
-        for (final RS2Widget childWidget : childWidgets) {
-            if (childWidget.getToolTip() == null) {
-                continue;
-            }
-            if (childWidget.getToolTip().contains("Change") || childWidget.getToolTip().contains("Recolour")) {
-                clickRandomTimes(childWidget);
-            }
+        final WidgetActionFilter selectableWidgetActionFilter = new WidgetActionFilter("Select");
+
+        final RS2Widget[] selectableWidgets = Stream.of(childWidgets).filter(selectableWidgetActionFilter::match).toArray(RS2Widget[]::new);
+
+        Collections.shuffle(Arrays.asList(selectableWidgets));
+
+        int maxSelection = new Random().nextInt(Math.min(selectableWidgets.length, 15));
+
+        for (int i = 0; i < maxSelection; i ++) {
+            clickRandomTimes(selectableWidgets[i]);
         }
 
-        if (getWidgets().getWidgetContainingText("Accept").interact()) {
+        if (getWidgets().getWidgetContainingText("Confirm").interact()) {
             Sleep.sleepUntil(() -> !creationScreenWidget.isVisible(getWidgets()), 3000, 600);
         }
     }
diff --git a/src/main/java/script/AIO.java b/src/main/java/script/AIO.java
@@ -26,7 +26,7 @@
 @ScriptManifest(author = "Explv", name = "Explv's AIO " + AIO.VERSION, info = "AIO", version = 0, logo = "http://i.imgur.com/58Zz0fb.png")
 public class AIO extends Script {
 
-    public static final String VERSION = "v3.2.6";
+    public static final String VERSION = "v3.2.7";
 
     private Gui gui;
     private Paint paint;
