From 00ac5d69c742d998d7d3bc7d3db387f4956f8cb8 Mon Sep 17 00:00:00 2001 From: Haavardaw <72413703+Haavardaw@users.noreply.github.com> Date: Sat, 23 Sep 2023 14:47:48 +0200 Subject: [PATCH] Bone Voyage TeleportItemRequirement and DeathToTheDorgeshuun highlight option --- .../helpers/quests/bonevoyage/BoneVoyage.java | 11 ++++++----- .../deathtothedorgeshuun/DeathToTheDorgeshuun.java | 3 ++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/questhelper/helpers/quests/bonevoyage/BoneVoyage.java b/src/main/java/com/questhelper/helpers/quests/bonevoyage/BoneVoyage.java index 6f6fe57458..32a9eb7397 100644 --- a/src/main/java/com/questhelper/helpers/quests/bonevoyage/BoneVoyage.java +++ b/src/main/java/com/questhelper/helpers/quests/bonevoyage/BoneVoyage.java @@ -29,6 +29,7 @@ import com.questhelper.requirements.Requirement; import com.questhelper.requirements.ZoneRequirement; import com.questhelper.requirements.conditional.Conditions; +import com.questhelper.requirements.item.TeleportItemRequirement; import com.questhelper.requirements.player.Favour; import com.questhelper.requirements.player.FavourRequirement; import com.questhelper.requirements.player.SkillRequirement; @@ -156,14 +157,14 @@ public void setupRequirements() vodka2 = new ItemRequirement("Vodka", ItemID.VODKA, 2); marrentillPotionUnf = new ItemRequirement("Marrentill potion (unf)", ItemID.MARRENTILL_POTION_UNF); - digsiteTeleport = new ItemRequirement("Teleports to the Digsite", ItemID.DIGSITE_PENDANT_4); + digsiteTeleport = new TeleportItemRequirement("Teleports to the Digsite", ItemID.DIGSITE_PENDANT_4); digsiteTeleport.addAlternates(ItemID.DIGSITE_PENDANT_5, ItemID.DIGSITE_TELEPORT); - woodcuttingGuildTeleport = new ItemRequirement("Teleport to the Woodcutting Guild", ItemCollections.SKILLS_NECKLACES); + woodcuttingGuildTeleport = new TeleportItemRequirement("Teleport to the Woodcutting Guild", ItemCollections.SKILLS_NECKLACES); woodcuttingGuildTeleport.addAlternates(ItemID.XERICS_TALISMAN, ItemID.KHAREDSTS_MEMOIRS); - varrockTeleport = new ItemRequirement("Varrock teleport", ItemID.VARROCK_TELEPORT); - sarimTeleport = new ItemRequirement("Port Sarim teleport", ItemCollections.AMULET_OF_GLORIES); + varrockTeleport = new TeleportItemRequirement("Varrock teleport", ItemID.VARROCK_TELEPORT); + sarimTeleport = new TeleportItemRequirement("Port Sarim teleport", ItemCollections.AMULET_OF_GLORIES); sarimTeleport.addAlternates(ItemID.DRAYNOR_MANOR_TELEPORT); - lumberyardTeleport = new ItemRequirement("Lumberyard teleport", ItemID.LUMBERYARD_TELEPORT); + lumberyardTeleport = new TeleportItemRequirement("Lumberyard teleport", ItemID.LUMBERYARD_TELEPORT); hammer = new ItemRequirement("Hammer", ItemCollections.HAMMER); ironBar = new ItemRequirement("Iron bar", ItemID.IRON_BAR); diff --git a/src/main/java/com/questhelper/helpers/quests/deathtothedorgeshuun/DeathToTheDorgeshuun.java b/src/main/java/com/questhelper/helpers/quests/deathtothedorgeshuun/DeathToTheDorgeshuun.java index 3e0fc5af08..5869f3844c 100644 --- a/src/main/java/com/questhelper/helpers/quests/deathtothedorgeshuun/DeathToTheDorgeshuun.java +++ b/src/main/java/com/questhelper/helpers/quests/deathtothedorgeshuun/DeathToTheDorgeshuun.java @@ -403,7 +403,7 @@ private void setupConditionalSteps() goTalkToMistag.addStep(inMines, talkToMistag); goTalkToMistag.addStep(inTunnels, talkToKazgar); goTalkToMistag.addStep(inBasement, climbThroughHole); - goTalkToMistag.addDialogSteps("What is this favour?", "I'll act as a guide."); + goTalkToMistag.addDialogSteps("What is this favour?", "I'll act as a guide.", "Can you show me the way out of the mines?"); goTalkToZanik = new ConditionalStep(this, goDownToBasement, "Talk to Zanik in Lumbridge Castle's basement.", hamHood2, hamShirt2, hamRobe2, hamBoot2, hamGloves2, hamCloak2, hamLogo2); goTalkToZanik.addStep(inMines, talkToMistagToTravel); @@ -412,6 +412,7 @@ private void setupConditionalSteps() if (client.getLocalPlayer() != null) { goTalkToZanik.addDialogStep("Yes, I'm " + client.getLocalPlayer().getName() + "!"); + goTalkToZanik.addDialogStep("Yes, I have two sets of robes!"); } goHaveZanikFollow = new ConditionalStep(this, goDownToBasement, "Talk to Zanik in Lumbridge Castle's basement.");