Skip to content
This repository was archived by the owner on Feb 9, 2022. It is now read-only.

Commit b0b822d

Browse files
author
Explv
committed
v3.2.7 - Fix tutorial island guide section. Fix rune mysteries intro dialogue
1 parent 87b9db9 commit b0b822d

File tree

3 files changed

+16
-12
lines changed

3 files changed

+16
-12
lines changed

src/main/java/activities/quests/RuneMysteries.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public class RuneMysteries extends QuestActivity {
1111
private final DialogueCompleter dukeHoracioDialogueCompleter = new DialogueCompleter(
1212
"Duke Horacio",
1313
new Area(new Position(3208, 3218, 1), new Position(3213, 3225, 1)),
14-
"Duke Horacio", "Have you any quests for me?", "Sure, no problem."
14+
"Duke Horacio", "Have you any quests for me?", "Yes"
1515
);
1616

1717
private final DialogueCompleter sedridorDialogueCompleter = new DialogueCompleter(

src/main/java/activities/tutorial_island/RuneScapeGuideSection.java

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,14 @@
99
import util.event.ConfigureClientEvent;
1010
import util.event.DisableAudioEvent;
1111
import util.widget.CachedWidget;
12+
import util.widget.filters.WidgetActionFilter;
1213

1314
import java.util.Arrays;
1415
import java.util.Collections;
1516
import java.util.Optional;
1617
import java.util.Random;
1718
import java.util.stream.Collectors;
19+
import java.util.stream.Stream;
1820

1921
public final class RuneScapeGuideSection extends TutorialSection {
2022
private enum UsernameCheckStatus {
@@ -84,7 +86,7 @@ public final void onLoop() throws InterruptedException {
8486
break;
8587
case 10:
8688
if (!isConfigured) {
87-
execute(new ConfigureClientEvent());
89+
isConfigured = execute(new ConfigureClientEvent()).hasFinished();
8890
} else if (getObjects().closest("Door").interact("Open")) {
8991
Sleep.sleepUntil(() -> getProgress() != 10, 5000, 600);
9092
}
@@ -147,18 +149,20 @@ private void createRandomCharacter() throws InterruptedException {
147149
}
148150

149151
final RS2Widget[] childWidgets = getWidgets().getWidgets(creationScreenWidget.get(getWidgets()).get().getRootId());
150-
Collections.shuffle(Arrays.asList(childWidgets));
151152

152-
for (final RS2Widget childWidget : childWidgets) {
153-
if (childWidget.getToolTip() == null) {
154-
continue;
155-
}
156-
if (childWidget.getToolTip().contains("Change") || childWidget.getToolTip().contains("Recolour")) {
157-
clickRandomTimes(childWidget);
158-
}
153+
final WidgetActionFilter selectableWidgetActionFilter = new WidgetActionFilter("Select");
154+
155+
final RS2Widget[] selectableWidgets = Stream.of(childWidgets).filter(selectableWidgetActionFilter::match).toArray(RS2Widget[]::new);
156+
157+
Collections.shuffle(Arrays.asList(selectableWidgets));
158+
159+
int maxSelection = new Random().nextInt(Math.min(selectableWidgets.length, 15));
160+
161+
for (int i = 0; i < maxSelection; i ++) {
162+
clickRandomTimes(selectableWidgets[i]);
159163
}
160164

161-
if (getWidgets().getWidgetContainingText("Accept").interact()) {
165+
if (getWidgets().getWidgetContainingText("Confirm").interact()) {
162166
Sleep.sleepUntil(() -> !creationScreenWidget.isVisible(getWidgets()), 3000, 600);
163167
}
164168
}

src/main/java/script/AIO.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
@ScriptManifest(author = "Explv", name = "Explv's AIO " + AIO.VERSION, info = "AIO", version = 0, logo = "http://i.imgur.com/58Zz0fb.png")
2727
public class AIO extends Script {
2828

29-
public static final String VERSION = "v3.2.6";
29+
public static final String VERSION = "v3.2.7";
3030

3131
private Gui gui;
3232
private Paint paint;

0 commit comments

Comments
 (0)