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

Commit 3b35a8e

Browse files
author
Explv
committed
Fix Sheep Shearer quest dialogue & stuck when farmer is behind door.
v3.2.1
1 parent e4cccc8 commit 3b35a8e

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

src/main/java/activities/quests/DialogueCompleter.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import org.osbot.rs07.api.map.Area;
44
import org.osbot.rs07.api.model.NPC;
5+
import org.osbot.rs07.event.WalkingEvent;
56
import org.osbot.rs07.event.WebWalkEvent;
67
import org.osbot.rs07.utility.Condition;
78
import util.Executable;
@@ -28,7 +29,7 @@ public DialogueCompleter(final String npcName, final String... dialogueOptions)
2829
public void run() throws InterruptedException {
2930
NPC npc = getNpcs().closest(npcName);
3031

31-
if (npc == null || !npc.isOnScreen() || !getMap().canReach(npc)) {
32+
if (npc == null || !npc.isOnScreen()) {
3233
if (area != null && !area.contains(myPosition())) {
3334
WebWalkEvent webWalkEvent = new WebWalkEvent(area);
3435
webWalkEvent.setBreakCondition(new Condition() {
@@ -47,7 +48,9 @@ public boolean evaluate() {
4748
}
4849
}
4950

50-
if (!getDialogues().inDialogue() || !myPlayer().isInteracting(npc)) {
51+
if (!getMap().canReach(npc)) {
52+
getDoorHandler().handleNextObstacle(npc);
53+
} else if (!getDialogues().inDialogue() || !myPlayer().isInteracting(npc)) {
5154
if (npc.interact("Talk-to")) {
5255
Sleep.sleepUntil(() -> getDialogues().inDialogue() && myPlayer().isInteracting(npc), 5000);
5356
}

src/main/java/activities/quests/SheepShearer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public class SheepShearer extends QuestActivity {
2828
"Fred the Farmer",
2929
FARMER_AREA,
3030
"I'm looking for a quest.",
31-
"Yes okay. I can do that.",
31+
"Yes, okay. I can do that.",
3232
"Of course!",
3333
"I'm something of an expert actually!"
3434
);

src/main/java/script/AIO.java

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

31-
public static final String VERSION = "v3.2.0";
31+
public static final String VERSION = "v3.2.1";
3232

3333
private Gui gui;
3434
private Paint paint;

0 commit comments

Comments
 (0)