diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/ArdougneDiaryRequirement.java b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/ArdougneDiaryRequirement.java index 9deb322322..7873c2c923 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/ArdougneDiaryRequirement.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/ArdougneDiaryRequirement.java @@ -25,8 +25,10 @@ */ package net.runelite.client.plugins.achievementdiary.diaries; +import net.runelite.api.Quest; import net.runelite.api.Skill; import net.runelite.client.plugins.achievementdiary.GenericDiaryRequirement; +import net.runelite.client.plugins.achievementdiary.QuestRequirement; import net.runelite.client.plugins.achievementdiary.SkillRequirement; public class ArdougneDiaryRequirement extends GenericDiaryRequirement @@ -34,10 +36,16 @@ public class ArdougneDiaryRequirement extends GenericDiaryRequirement public ArdougneDiaryRequirement() { // EASY + add("Have Wizard Cromperty teleport you to the Rune Essence mine.", + new QuestRequirement(Quest.RUNE_MYSTERIES)); add("Steal a cake from the Ardougne market stalls.", new SkillRequirement(Skill.THIEVING, 5)); + add("Enter the Combat Training Camp north of W. Ardougne", + new QuestRequirement(Quest.BIOHAZARD)); // MEDIUM + add("Enter the Unicorn pen in Ardougne zoo using Fairy rings.", + new QuestRequirement(Quest.FAIRYTALE_II__CURE_A_QUEEN, true)); add("Grapple over Yanille's south wall.", new SkillRequirement(Skill.AGILITY, 39), new SkillRequirement(Skill.STRENGTH, 38), @@ -45,24 +53,41 @@ public class ArdougneDiaryRequirement extends GenericDiaryRequirement add("Harvest some strawberries from the Ardougne farming patch.", new SkillRequirement(Skill.FARMING, 31)); add("Cast the Ardougne Teleport spell.", - new SkillRequirement(Skill.MAGIC, 51)); + new SkillRequirement(Skill.MAGIC, 51), + new QuestRequirement(Quest.PLAGUE_CITY)); add("Travel to Castlewars by Hot Air Balloon.", - new SkillRequirement(Skill.FIREMAKING, 50)); + new SkillRequirement(Skill.FIREMAKING, 50), + new QuestRequirement(Quest.ENLIGHTENED_JOURNEY)); add("Claim buckets of sand from Bert in Yanille.", - new SkillRequirement(Skill.CRAFTING, 49)); + new SkillRequirement(Skill.CRAFTING, 49), + new QuestRequirement(Quest.THE_HAND_IN_THE_SAND)); + add("Catch any fish on the Fishing Platform.", + new QuestRequirement(Quest.SEA_SLUG, true)); add("Pickpocket the master farmer north of Ardougne.", new SkillRequirement(Skill.THIEVING, 38)); + add("Collect some Nightshade from the Skavid Caves.", + new QuestRequirement(Quest.WATCHTOWER, true)); + add("Kill a swordchick in the Tower of Life.", + new QuestRequirement(Quest.TOWER_OF_LIFE)); add("Equip Iban's upgraded staff or upgrade an Iban staff.", new SkillRequirement(Skill.MAGIC, 50), - new SkillRequirement(Skill.ATTACK, 50)); + new SkillRequirement(Skill.ATTACK, 50), + new QuestRequirement(Quest.UNDERGROUND_PASS)); + add("Visit the Island East of the Necromancer's tower.", + new QuestRequirement(Quest.FAIRYTALE_II__CURE_A_QUEEN, true)); // HARD + add("Recharge some Jewellery at Totem in the Legends Guild.", + new QuestRequirement(Quest.LEGENDS_QUEST)); add("Enter the Magic Guild.", new SkillRequirement(Skill.MAGIC, 66)); add("Attempt to steal from King Lathas' chest.", new SkillRequirement(Skill.THIEVING, 72)); + add("Have a zookeeper put you in Ardougne Zoo's monkey cage.", + new QuestRequirement(Quest.MONKEY_MADNESS_I, true)); add("Teleport to the Watchtower.", - new SkillRequirement(Skill.MAGIC, 58)); + new SkillRequirement(Skill.MAGIC, 58), + new QuestRequirement(Quest.WATCHTOWER)); add("Catch a Red Salamander.", new SkillRequirement(Skill.HUNTER, 59)); add("Check the health of a Palm tree near tree gnome village.", @@ -74,13 +99,14 @@ public class ArdougneDiaryRequirement extends GenericDiaryRequirement add("Enter your POH from Yanille.", new SkillRequirement(Skill.CONSTRUCTION, 50)); add("Smith a Dragon sq shield in West Ardougne.", - new SkillRequirement(Skill.SMITHING, 60)); + new SkillRequirement(Skill.SMITHING, 60), + new QuestRequirement(Quest.LEGENDS_QUEST)); add("Craft some Death runes.", - new SkillRequirement(Skill.RUNECRAFT, 65)); + new SkillRequirement(Skill.RUNECRAFT, 65), + new QuestRequirement(Quest.MOURNINGS_ENDS_PART_II)); // ELITE add("Catch a Manta ray in the Fishing Trawler and cook it in Port Khazard.", - new SkillRequirement(Skill.FISHING, 81), new SkillRequirement(Skill.COOKING, 91) ); @@ -92,11 +118,14 @@ public class ArdougneDiaryRequirement extends GenericDiaryRequirement new SkillRequirement(Skill.CRAFTING, 10), new SkillRequirement(Skill.SMITHING, 91), new SkillRequirement(Skill.FLETCHING, 69)); + add("Imbue a salve amulet at Nightmare Zone or equip an imbued salve amulet.", + new QuestRequirement(Quest.HAUNTED_MINE)); add("Pick some Torstol from the patch north of Ardougne.", new SkillRequirement(Skill.FARMING, 85)); add("Complete a lap of Ardougne's rooftop agility course.", new SkillRequirement(Skill.AGILITY, 90)); add("Cast Ice Barrage on another player within Castlewars.", - new SkillRequirement(Skill.MAGIC, 94)); + new SkillRequirement(Skill.MAGIC, 94), + new QuestRequirement(Quest.DESERT_TREASURE)); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/DesertDiaryRequirement.java b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/DesertDiaryRequirement.java index 09a032db73..4de2c0a4d3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/DesertDiaryRequirement.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/DesertDiaryRequirement.java @@ -25,8 +25,10 @@ */ package net.runelite.client.plugins.achievementdiary.diaries; +import net.runelite.api.Quest; import net.runelite.api.Skill; import net.runelite.client.plugins.achievementdiary.GenericDiaryRequirement; +import net.runelite.client.plugins.achievementdiary.QuestRequirement; import net.runelite.client.plugins.achievementdiary.SkillRequirement; public class DesertDiaryRequirement extends GenericDiaryRequirement @@ -39,7 +41,8 @@ public class DesertDiaryRequirement extends GenericDiaryRequirement add("Mine 5 clay in the north-eastern desert.", new SkillRequirement(Skill.MINING, 5)); add("Open the Sarcophagus in the first room of Pyramid Plunder.", - new SkillRequirement(Skill.THIEVING, 21)); + new SkillRequirement(Skill.THIEVING, 21), + new QuestRequirement(Quest.ICTHLARINS_LITTLE_HELPER, true)); // MEDIUM add("Climb to the summit of the Agility Pyramid.", @@ -50,8 +53,18 @@ public class DesertDiaryRequirement extends GenericDiaryRequirement new SkillRequirement(Skill.HUNTER, 47)); add("Steal a feather from the Desert Phoenix.", new SkillRequirement(Skill.THIEVING, 25)); + add("Travel to Uzer via Magic Carpet.", + new QuestRequirement(Quest.THE_GOLEM)); + add("Travel to the Desert via Eagle.", + new QuestRequirement(Quest.EAGLES_PEAK)); + add("Pray at the Elidinis statuette in Nardah.", + new QuestRequirement(Quest.SPIRITS_OF_THE_ELID)); add("Create a combat potion in the desert.", new SkillRequirement(Skill.HERBLORE, 36)); + add("Teleport to Enakhra's Temple with the Camulet.", + new QuestRequirement(Quest.ENAKHRAS_LAMENT)); + add("Visit the Genie.", + new QuestRequirement(Quest.SPIRITS_OF_THE_ELID)); add("Teleport to Pollnivneach with a redirected teleport to house tablet.", new SkillRequirement(Skill.CONSTRUCTION, 20)); add("Chop some Teak logs near Uzer.", @@ -59,19 +72,25 @@ public class DesertDiaryRequirement extends GenericDiaryRequirement // HARD add("Knock out and pickpocket a Menaphite Thug.", - new SkillRequirement(Skill.THIEVING, 65)); + new SkillRequirement(Skill.THIEVING, 65), + new QuestRequirement(Quest.THE_FEUD)); add("Mine some Granite.", new SkillRequirement(Skill.MINING, 45)); add("Refill your waterskins in the Desert using Lunar magic.", - new SkillRequirement(Skill.MAGIC, 68)); + new SkillRequirement(Skill.MAGIC, 68), + new QuestRequirement(Quest.DREAM_MENTOR)); add("Complete a lap of the Pollnivneach agility course.", new SkillRequirement(Skill.AGILITY, 70)); add("Slay a Dust Devil with a Slayer helmet equipped.", new SkillRequirement(Skill.SLAYER, 65), new SkillRequirement(Skill.DEFENCE, 10), - new SkillRequirement(Skill.CRAFTING, 55)); + new SkillRequirement(Skill.CRAFTING, 55), + new QuestRequirement(Quest.DESERT_TREASURE, true)); + add("Activate Ancient Magicks at the altar in the Jaldraocht Pyramid.", + new QuestRequirement(Quest.DESERT_TREASURE)); add("Defeat a Locust Rider with Keris.", - new SkillRequirement(Skill.ATTACK, 50)); + new SkillRequirement(Skill.ATTACK, 50), + new QuestRequirement(Quest.CONTACT)); add("Burn some yew logs on the Nardah Mayor's balcony.", new SkillRequirement(Skill.FIREMAKING, 60)); add("Create a Mithril Platebody in Nardah.", @@ -81,14 +100,19 @@ public class DesertDiaryRequirement extends GenericDiaryRequirement add("Bake a wild pie at the Nardah Clay Oven.", new SkillRequirement(Skill.COOKING, 85)); add("Cast Ice Barrage against a foe in the Desert.", - new SkillRequirement(Skill.MAGIC, 94)); + new SkillRequirement(Skill.MAGIC, 94), + new QuestRequirement(Quest.DESERT_TREASURE)); add("Fletch some Dragon darts at the Bedabin Camp.", - new SkillRequirement(Skill.FLETCHING, 95)); + new SkillRequirement(Skill.FLETCHING, 95), + new QuestRequirement(Quest.THE_TOURIST_TRAP)); add("Speak to the KQ head in your POH.", - new SkillRequirement(Skill.CONSTRUCTION, 78)); + new SkillRequirement(Skill.CONSTRUCTION, 78), + new QuestRequirement(Quest.PRIEST_IN_PERIL)); add("Steal from the Grand Gold Chest in the final room of Pyramid Plunder.", - new SkillRequirement(Skill.THIEVING, 91)); + new SkillRequirement(Skill.THIEVING, 91), + new QuestRequirement(Quest.ICTHLARINS_LITTLE_HELPER, true)); add("Restore at least 85 Prayer points when praying at the Altar in Sophanem.", - new SkillRequirement(Skill.PRAYER, 85)); + new SkillRequirement(Skill.PRAYER, 85), + new QuestRequirement(Quest.ICTHLARINS_LITTLE_HELPER, true)); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/FaladorDiaryRequirement.java b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/FaladorDiaryRequirement.java index 22853cea9b..3111b0d6e1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/FaladorDiaryRequirement.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/FaladorDiaryRequirement.java @@ -25,8 +25,10 @@ */ package net.runelite.client.plugins.achievementdiary.diaries; +import net.runelite.api.Quest; import net.runelite.api.Skill; import net.runelite.client.plugins.achievementdiary.GenericDiaryRequirement; +import net.runelite.client.plugins.achievementdiary.QuestRequirement; import net.runelite.client.plugins.achievementdiary.SkillRequirement; public class FaladorDiaryRequirement extends GenericDiaryRequirement @@ -38,9 +40,13 @@ public class FaladorDiaryRequirement extends GenericDiaryRequirement new SkillRequirement(Skill.CONSTRUCTION, 16)); add("Climb over the western Falador wall.", new SkillRequirement(Skill.AGILITY, 5)); + add("Make a mind tiara.", + new QuestRequirement(Quest.RUNE_MYSTERIES)); add("Smith some Blurite Limbs on Doric's Anvil.", new SkillRequirement(Skill.MINING, 10), - new SkillRequirement(Skill.SMITHING, 13)); + new SkillRequirement(Skill.SMITHING, 13), + new QuestRequirement(Quest.THE_KNIGHTS_SWORD), + new QuestRequirement(Quest.DORICS_QUEST)); // MEDIUM add("Light a Bullseye lantern at the Chemist's in Rimmington.", @@ -50,7 +56,10 @@ public class FaladorDiaryRequirement extends GenericDiaryRequirement add("Place a Scarecrow in the Falador farming patch.", new SkillRequirement(Skill.FARMING, 23)); add("Kill a Mogre at Mudskipper Point.", - new SkillRequirement(Skill.SLAYER, 32)); + new SkillRequirement(Skill.SLAYER, 32), + new QuestRequirement(Quest.SKIPPY_AND_THE_MOGRES)); + add("Visit the Port Sarim Rat Pits.", + new QuestRequirement(Quest.RATCATCHERS, true)); add("Grapple up and then jump off the north Falador wall.", new SkillRequirement(Skill.AGILITY, 11), new SkillRequirement(Skill.STRENGTH, 37), @@ -59,7 +68,8 @@ public class FaladorDiaryRequirement extends GenericDiaryRequirement new SkillRequirement(Skill.THIEVING, 40)); add("Pray at the Altar of Guthix in Taverley whilst wearing full Initiate.", new SkillRequirement(Skill.PRAYER, 10), - new SkillRequirement(Skill.DEFENCE, 20)); + new SkillRequirement(Skill.DEFENCE, 20), + new QuestRequirement(Quest.RECRUITMENT_DRIVE)); add("Mine some Gold ore at the Crafting Guild.", new SkillRequirement(Skill.CRAFTING, 40), new SkillRequirement(Skill.MINING, 40)); @@ -87,13 +97,17 @@ public class FaladorDiaryRequirement extends GenericDiaryRequirement add("Crack a wall safe within Rogues Den.", new SkillRequirement(Skill.THIEVING, 50)); add("Recharge your prayer in the Port Sarim church while wearing full Proselyte.", - new SkillRequirement(Skill.DEFENCE, 30)); + new SkillRequirement(Skill.DEFENCE, 30), + new QuestRequirement(Quest.THE_SLUG_MENACE)); add("Equip a dwarven helmet within the dwarven mines.", - new SkillRequirement(Skill.DEFENCE, 50)); + new SkillRequirement(Skill.DEFENCE, 50), + new QuestRequirement(Quest.GRIM_TALES)); // ELITE add("Craft 252 Air Runes simultaneously.", new SkillRequirement(Skill.RUNECRAFT, 88)); + add("Purchase a White 2h Sword from Sir Vyvin.", + new QuestRequirement(Quest.WANTED)); add("Find at least 3 magic roots at once when digging up your magic tree in Falador.", new SkillRequirement(Skill.FARMING, 91), new SkillRequirement(Skill.WOODCUTTING, 75)); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/FremennikDiaryRequirement.java b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/FremennikDiaryRequirement.java index 8053dbbcd3..130432035b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/FremennikDiaryRequirement.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/FremennikDiaryRequirement.java @@ -25,8 +25,10 @@ */ package net.runelite.client.plugins.achievementdiary.diaries; +import net.runelite.api.Quest; import net.runelite.api.Skill; import net.runelite.client.plugins.achievementdiary.GenericDiaryRequirement; +import net.runelite.client.plugins.achievementdiary.QuestRequirement; import net.runelite.client.plugins.achievementdiary.SkillRequirement; public class FremennikDiaryRequirement extends GenericDiaryRequirement @@ -36,61 +38,95 @@ public class FremennikDiaryRequirement extends GenericDiaryRequirement // EASY add("Catch a Cerulean twitch.", new SkillRequirement(Skill.HUNTER, 11)); + add("Change your boots at Yrsa's Shoe Store.", + new QuestRequirement(Quest.THE_FREMENNIK_TRIALS)); add("Craft a tiara from scratch in Rellekka.", new SkillRequirement(Skill.CRAFTING, 23), new SkillRequirement(Skill.MINING, 20), - new SkillRequirement(Skill.SMITHING, 20)); + new SkillRequirement(Skill.SMITHING, 20), + new QuestRequirement(Quest.THE_FREMENNIK_TRIALS)); + add("Browse the Stonemasons shop.", + new QuestRequirement(Quest.THE_GIANT_DWARF, true)); add("Steal from the Keldagrim crafting or baker's stall.", - new SkillRequirement(Skill.THIEVING, 5)); + new SkillRequirement(Skill.THIEVING, 5), + new QuestRequirement(Quest.THE_GIANT_DWARF, true)); + add("Enter the Troll Stronghold", + new QuestRequirement(Quest.DEATH_PLATEAU), + new QuestRequirement(Quest.TROLL_STRONGHOLD)); add("Chop and burn some oak logs in the Fremennik Province.", new SkillRequirement(Skill.WOODCUTTING, 15), new SkillRequirement(Skill.FIREMAKING, 15)); // MEDIUM add("Slay a Brine rat.", - new SkillRequirement(Skill.SLAYER, 47)); + new SkillRequirement(Skill.SLAYER, 47), + new QuestRequirement(Quest.OLAFS_QUEST, true)); + add("Travel to the Snowy Hunter Area via Eagle.", + new QuestRequirement(Quest.EAGLES_PEAK)); add("Mine some coal in Rellekka.", - new SkillRequirement(Skill.MINING, 30)); + new SkillRequirement(Skill.MINING, 30), + new QuestRequirement(Quest.THE_FREMENNIK_TRIALS)); add("Steal from the Rellekka Fish stalls.", - new SkillRequirement(Skill.THIEVING, 42)); + new SkillRequirement(Skill.THIEVING, 42), + new QuestRequirement(Quest.THE_FREMENNIK_TRIALS)); + add("Travel to Miscellania by Fairy ring.", + new QuestRequirement(Quest.THE_FREMENNIK_TRIALS), + new QuestRequirement(Quest.FAIRYTALE_II__CURE_A_QUEEN, true)); add("Catch a Snowy knight.", new SkillRequirement(Skill.HUNTER, 35)); add("Pick up your Pet Rock from your POH Menagerie.", - new SkillRequirement(Skill.CONSTRUCTION, 37)); + new SkillRequirement(Skill.CONSTRUCTION, 37), + new QuestRequirement(Quest.THE_FREMENNIK_TRIALS)); + add("Visit the Lighthouse from Waterbirth island.", + new QuestRequirement(Quest.HORROR_FROM_THE_DEEP), + new QuestRequirement(Quest.THE_FREMENNIK_TRIALS, true)); add("Mine some gold at the Arzinian mine.", - new SkillRequirement(Skill.MINING, 40)); + new SkillRequirement(Skill.MINING, 40), + new QuestRequirement(Quest.BETWEEN_A_ROCK, true)); // HARD add("Teleport to Trollheim.", - new SkillRequirement(Skill.MAGIC, 61)); + new SkillRequirement(Skill.MAGIC, 61), + new QuestRequirement(Quest.EADGARS_RUSE)); add("Catch a Sabre-toothed Kyatt.", new SkillRequirement(Skill.HUNTER, 55)); add("Mix a super defence potion in the Fremennik province.", new SkillRequirement(Skill.HERBLORE, 66)); add("Steal from the Keldagrim Gem Stall.", - new SkillRequirement(Skill.THIEVING, 75)); + new SkillRequirement(Skill.THIEVING, 75), + new QuestRequirement(Quest.THE_GIANT_DWARF, true)); add("Craft a Fremennik shield on Neitiznot.", - new SkillRequirement(Skill.WOODCUTTING, 56)); + new SkillRequirement(Skill.WOODCUTTING, 56), + new QuestRequirement(Quest.THE_FREMENNIK_ISLES)); add("Mine 5 Adamantite ores on Jatizso.", - new SkillRequirement(Skill.MINING, 70)); + new SkillRequirement(Skill.MINING, 70), + new QuestRequirement(Quest.THE_FREMENNIK_ISLES)); + add("Obtain 100% support from your kingdom subjects.", + new QuestRequirement(Quest.THRONE_OF_MISCELLANIA)); add("Teleport to Waterbirth Island.", - new SkillRequirement(Skill.MAGIC, 72)); + new SkillRequirement(Skill.MAGIC, 72), + new QuestRequirement(Quest.LUNAR_DIPLOMACY)); add("Obtain the Blast Furnace Foreman's permission to use the Blast Furnace for free.", - new SkillRequirement(Skill.SMITHING, 60)); + new SkillRequirement(Skill.SMITHING, 60), + new QuestRequirement(Quest.THE_GIANT_DWARF, true)); // ELITE add("Craft 56 astral runes at once.", - new SkillRequirement(Skill.RUNECRAFT, 82)); + new SkillRequirement(Skill.RUNECRAFT, 82), + new QuestRequirement(Quest.LUNAR_DIPLOMACY)); add("Create a dragonstone amulet in the Neitiznot furnace.", - new SkillRequirement(Skill.CRAFTING, 80)); + new SkillRequirement(Skill.CRAFTING, 80), + new QuestRequirement(Quest.THE_FREMENNIK_ISLES, true)); add("Complete a lap of the Rellekka agility course.", new SkillRequirement(Skill.AGILITY, 80)); add("Kill each of the Godwars generals.", new SkillRequirement(Skill.AGILITY, 70), new SkillRequirement(Skill.STRENGTH, 70), new SkillRequirement(Skill.HITPOINTS, 70), - new SkillRequirement(Skill.RANGED, 70)); + new SkillRequirement(Skill.RANGED, 70), + new QuestRequirement(Quest.TROLL_STRONGHOLD)); add("Slay a Spiritual mage within the Godwars Dungeon.", - new SkillRequirement(Skill.SLAYER, 83)); + new SkillRequirement(Skill.SLAYER, 83), + new QuestRequirement(Quest.TROLL_STRONGHOLD)); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/KandarinDiaryRequirement.java b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/KandarinDiaryRequirement.java index cedc5c72db..0b775a0dba 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/KandarinDiaryRequirement.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/KandarinDiaryRequirement.java @@ -25,8 +25,10 @@ */ package net.runelite.client.plugins.achievementdiary.diaries; +import net.runelite.api.Quest; import net.runelite.api.Skill; import net.runelite.client.plugins.achievementdiary.GenericDiaryRequirement; +import net.runelite.client.plugins.achievementdiary.QuestRequirement; import net.runelite.client.plugins.achievementdiary.SkillRequirement; public class KandarinDiaryRequirement extends GenericDiaryRequirement @@ -38,12 +40,15 @@ public class KandarinDiaryRequirement extends GenericDiaryRequirement new SkillRequirement(Skill.FISHING, 16)); add("Plant some Jute seeds in the patch north of McGrubor's Wood.", new SkillRequirement(Skill.FARMING, 13)); + add("Defeat on of each elemental in the workshop.", + new QuestRequirement(Quest.ELEMENTAL_WORKSHOP_I, true)); add("Cross the Coal truck log shortcut.", new SkillRequirement(Skill.AGILITY, 20)); // MEDIUM add("Complete a lap of the Barbarian agility course.", - new SkillRequirement(Skill.AGILITY, 35)); + new SkillRequirement(Skill.AGILITY, 35), + new QuestRequirement(Quest.ALFRED_GRIMHANDS_BARCRAWL)); add("Create a Super Antipoison potion from scratch in the Seers/Catherby Area.", new SkillRequirement(Skill.HERBLORE, 48)); add("Enter the Ranging guild.", @@ -61,8 +66,14 @@ public class KandarinDiaryRequirement extends GenericDiaryRequirement new SkillRequirement(Skill.FLETCHING, 50)); add("Pick some Limpwurt root from the farming patch in Catherby.", new SkillRequirement(Skill.FARMING, 26)); + add("Create a Mind helmet.", + new QuestRequirement(Quest.ELEMENTAL_WORKSHOP_II)); + add("Kill a Fire Giant inside Baxtorian Waterfall.", + new QuestRequirement(Quest.WATERFALL_QUEST, true)); add("Steal from the chest in Hemenster.", new SkillRequirement(Skill.THIEVING, 47)); + add("Travel to McGrubor's Wood by Fairy Ring.", + new QuestRequirement(Quest.FAIRYTALE_II__CURE_A_QUEEN, true)); add("Mine some coal near the coal trucks.", new SkillRequirement(Skill.MINING, 30)); @@ -79,7 +90,8 @@ public class KandarinDiaryRequirement extends GenericDiaryRequirement new SkillRequirement(Skill.CRAFTING, 10)); add("Enter the Seers' Village courthouse with piety turned on.", new SkillRequirement(Skill.PRAYER, 70), - new SkillRequirement(Skill.DEFENCE, 70)); + new SkillRequirement(Skill.DEFENCE, 70), + new QuestRequirement(Quest.KINGS_RANSOM)); add("Charge a Water Orb.", new SkillRequirement(Skill.MAGIC, 56)); add("Burn some Maple logs with a bow in Seers' Village.", @@ -90,14 +102,16 @@ public class KandarinDiaryRequirement extends GenericDiaryRequirement add("Have the Seers' estate agent decorate your house with Fancy Stone.", new SkillRequirement(Skill.CONSTRUCTION, 50)); add("Smith an Adamant spear at Otto's Grotto.", - new SkillRequirement(Skill.SMITHING, 75)); + new SkillRequirement(Skill.SMITHING, 75), + new QuestRequirement(Quest.TAI_BWO_WANNAI_TRIO)); // ELITE add("Pick some Dwarf weed from the herb patch at Catherby.", new SkillRequirement(Skill.FARMING, 79)); add("Fish and Cook 5 Sharks in Catherby using the Cooking gauntlets.", new SkillRequirement(Skill.FISHING, 76), - new SkillRequirement(Skill.COOKING, 80)); + new SkillRequirement(Skill.COOKING, 80), + new QuestRequirement(Quest.FAMILY_CREST)); add("Mix a Stamina Mix on top of the Seers' Village bank.", new SkillRequirement(Skill.HERBLORE, 86), new SkillRequirement(Skill.AGILITY, 60)); @@ -107,6 +121,7 @@ public class KandarinDiaryRequirement extends GenericDiaryRequirement new SkillRequirement(Skill.FIREMAKING, 85), new SkillRequirement(Skill.CRAFTING, 85)); add("Teleport to Catherby.", - new SkillRequirement(Skill.MAGIC, 87)); + new SkillRequirement(Skill.MAGIC, 87), + new QuestRequirement(Quest.LUNAR_DIPLOMACY)); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/KaramjaDiaryRequirement.java b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/KaramjaDiaryRequirement.java index 22c1b887b3..f6523bc667 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/KaramjaDiaryRequirement.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/KaramjaDiaryRequirement.java @@ -25,9 +25,12 @@ */ package net.runelite.client.plugins.achievementdiary.diaries; +import net.runelite.api.Quest; import net.runelite.api.Skill; import net.runelite.client.plugins.achievementdiary.CombatLevelRequirement; import net.runelite.client.plugins.achievementdiary.GenericDiaryRequirement; +import net.runelite.client.plugins.achievementdiary.OrRequirement; +import net.runelite.client.plugins.achievementdiary.QuestRequirement; import net.runelite.client.plugins.achievementdiary.SkillRequirement; public class KaramjaDiaryRequirement extends GenericDiaryRequirement @@ -46,16 +49,32 @@ public class KaramjaDiaryRequirement extends GenericDiaryRequirement // MEDIUM add("Claim a ticket from the Agility Arena in Brimhaven.", new SkillRequirement(Skill.AGILITY, 30)); + add("Discover hidden wall in the dungeon below the volcano.", + new QuestRequirement(Quest.DRAGON_SLAYER, true)); + add("Visit the Isle of Crandor via the dungeon below the volcano.", + new QuestRequirement(Quest.DRAGON_SLAYER, true)); + add("Use Vigroy and Hajedy's cart service.", + new QuestRequirement(Quest.SHILO_VILLAGE)); add("Earn 100% favour in the village of Tai Bwo Wannai.", - new SkillRequirement(Skill.WOODCUTTING, 10)); + new SkillRequirement(Skill.WOODCUTTING, 10), + new QuestRequirement(Quest.JUNGLE_POTION)); add("Cook a spider on a stick.", new SkillRequirement(Skill.COOKING, 16)); + add("Charter the Lady of the Waves from Cairn Isle to Port Khazard.", + new QuestRequirement(Quest.SHILO_VILLAGE)); add("Cut a log from a teak tree.", - new SkillRequirement(Skill.WOODCUTTING, 35)); + new SkillRequirement(Skill.WOODCUTTING, 35), + new QuestRequirement(Quest.JUNGLE_POTION)); add("Cut a log from a mahogany tree.", - new SkillRequirement(Skill.WOODCUTTING, 50)); + new SkillRequirement(Skill.WOODCUTTING, 50), + new QuestRequirement(Quest.JUNGLE_POTION)); add("Catch a karambwan.", - new SkillRequirement(Skill.FISHING, 65)); + new SkillRequirement(Skill.FISHING, 65), + new QuestRequirement(Quest.TAI_BWO_WANNAI_TRIO, true)); + add("Exchange gems for a machete.", + new QuestRequirement(Quest.JUNGLE_POTION)); + add("Use the gnome glider to travel to Karamja.", + new QuestRequirement(Quest.THE_GRAND_TREE)); add("Grow a healthy fruit tree in the patch near Brimhaven.", new SkillRequirement(Skill.FARMING, 27)); add("Trap a horned graahk.", @@ -66,29 +85,41 @@ public class KaramjaDiaryRequirement extends GenericDiaryRequirement new SkillRequirement(Skill.AGILITY, 12)); add("Climb the stairs within Brimhaven Dungeon.", new SkillRequirement(Skill.WOODCUTTING, 10)); + add("Charter a ship from the shipyard in the far east of Karamja.", + new QuestRequirement(Quest.THE_GRAND_TREE)); add("Mine a red topaz from a gem rock.", - new SkillRequirement(Skill.MINING, 40)); + new SkillRequirement(Skill.MINING, 40), + new OrRequirement( + new QuestRequirement(Quest.SHILO_VILLAGE), + new QuestRequirement(Quest.JUNGLE_POTION) + ) + ); // HARD add("Craft some nature runes.", - new SkillRequirement(Skill.RUNECRAFT, 44)); + new SkillRequirement(Skill.RUNECRAFT, 44), + new QuestRequirement(Quest.RUNE_MYSTERIES)); add("Cook a karambwan thoroughly.", - new SkillRequirement(Skill.COOKING, 30)); + new SkillRequirement(Skill.COOKING, 30), + new QuestRequirement(Quest.TAI_BWO_WANNAI_TRIO)); add("Kill a deathwing in the dungeon under the Kharazi Jungle.", new SkillRequirement(Skill.WOODCUTTING, 15), new SkillRequirement(Skill.STRENGTH, 50), new SkillRequirement(Skill.AGILITY, 50), new SkillRequirement(Skill.THIEVING, 50), - new SkillRequirement(Skill.MINING, 52)); + new SkillRequirement(Skill.MINING, 52), + new QuestRequirement(Quest.LEGENDS_QUEST)); add("Use the crossbow short cut south of the volcano.", new SkillRequirement(Skill.AGILITY, 53), new SkillRequirement(Skill.RANGED, 42), new SkillRequirement(Skill.STRENGTH, 21)); add("Collect 5 palm leaves.", - new SkillRequirement(Skill.WOODCUTTING, 15)); + new SkillRequirement(Skill.WOODCUTTING, 15), + new QuestRequirement(Quest.LEGENDS_QUEST)); add("Be assigned a Slayer task by Duradel north of Shilo Village.", new CombatLevelRequirement(100), - new SkillRequirement(Skill.SLAYER, 50)); + new SkillRequirement(Skill.SLAYER, 50), + new QuestRequirement(Quest.SHILO_VILLAGE)); add("Kill a metal dragon in Brimhaven Dungeon.", new SkillRequirement(Skill.AGILITY, 12), new SkillRequirement(Skill.WOODCUTTING, 34)); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/LumbridgeDiaryRequirement.java b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/LumbridgeDiaryRequirement.java index 2da8b50998..7238e18a55 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/LumbridgeDiaryRequirement.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/LumbridgeDiaryRequirement.java @@ -25,9 +25,11 @@ */ package net.runelite.client.plugins.achievementdiary.diaries; +import net.runelite.api.Quest; import net.runelite.api.Skill; import net.runelite.client.plugins.achievementdiary.CombatLevelRequirement; import net.runelite.client.plugins.achievementdiary.GenericDiaryRequirement; +import net.runelite.client.plugins.achievementdiary.QuestRequirement; import net.runelite.client.plugins.achievementdiary.SkillRequirement; public class LumbridgeDiaryRequirement extends GenericDiaryRequirement @@ -39,13 +41,18 @@ public class LumbridgeDiaryRequirement extends GenericDiaryRequirement new SkillRequirement(Skill.AGILITY, 10)); add("Slay a Cave bug beneath Lumbridge Swamp.", new SkillRequirement(Skill.SLAYER, 7)); + add("Have Sedridor teleport you to the Essence Mine.", + new QuestRequirement(Quest.RUNE_MYSTERIES)); add("Craft some water runes.", - new SkillRequirement(Skill.RUNECRAFT, 5)); + new SkillRequirement(Skill.RUNECRAFT, 5), + new QuestRequirement(Quest.RUNE_MYSTERIES)); add("Chop and burn some oak logs in Lumbridge.", new SkillRequirement(Skill.WOODCUTTING, 15), new SkillRequirement(Skill.FIREMAKING, 15)); add("Catch some Anchovies in Al Kharid.", new SkillRequirement(Skill.FISHING, 15)); + add("Bake some Bread on the Lumbridge kitchen range.", + new QuestRequirement(Quest.COOKS_ASSISTANT)); add("Mine some Iron ore at the Al Kharid mine.", new SkillRequirement(Skill.MINING, 15)); @@ -57,33 +64,47 @@ public class LumbridgeDiaryRequirement extends GenericDiaryRequirement new SkillRequirement(Skill.STRENGTH, 19), new SkillRequirement(Skill.RANGED, 37)); add("Purchase an upgraded device from Ava.", - new SkillRequirement(Skill.RANGED, 50)); + new SkillRequirement(Skill.RANGED, 50), + new QuestRequirement(Quest.ANIMAL_MAGNETISM)); + add("Travel to the Wizards' Tower by Fairy ring.", + new QuestRequirement(Quest.FAIRYTALE_II__CURE_A_QUEEN, true)); add("Cast the teleport to Lumbridge spell.", new SkillRequirement(Skill.MAGIC, 31)); add("Catch some Salmon in Lumbridge.", new SkillRequirement(Skill.FISHING, 30)); add("Craft a coif in the Lumbridge cow pen.", new SkillRequirement(Skill.CRAFTING, 38)); - add("Get a slayer task from Chaeldar.", - new CombatLevelRequirement(70)); add("Chop some willow logs in Draynor Village.", new SkillRequirement(Skill.WOODCUTTING, 30)); add("Pickpocket Martin the Master Gardener.", new SkillRequirement(Skill.THIEVING, 38)); + add("Get a slayer task from Chaeldar.", + new CombatLevelRequirement(70), + new QuestRequirement(Quest.LOST_CITY)); add("Catch an Essence or Eclectic impling in Puro-Puro.", - new SkillRequirement(Skill.HUNTER, 42)); + new SkillRequirement(Skill.HUNTER, 42), + new QuestRequirement(Quest.LOST_CITY)); add("Craft some Lava runes at the fire altar in Al Kharid.", - new SkillRequirement(Skill.RUNECRAFT, 23)); + new SkillRequirement(Skill.RUNECRAFT, 23), + new QuestRequirement(Quest.RUNE_MYSTERIES)); // HARD add("Cast Bones to Peaches in Al Kharid palace.", new SkillRequirement(Skill.MAGIC, 60)); add("Squeeze past the jutting wall on your way to the cosmic altar.", - new SkillRequirement(Skill.AGILITY, 46)); + new SkillRequirement(Skill.AGILITY, 46), + new QuestRequirement(Quest.LOST_CITY)); add("Craft 56 Cosmic runes simultaneously.", - new SkillRequirement(Skill.RUNECRAFT, 59)); + new SkillRequirement(Skill.RUNECRAFT, 59), + new QuestRequirement(Quest.LOST_CITY)); add("Travel from Lumbridge to Edgeville on a Waka Canoe.", new SkillRequirement(Skill.WOODCUTTING, 57)); + add("Collect at least 100 Tears of Guthix in one visit.", + new QuestRequirement(Quest.TEARS_OF_GUTHIX)); + add("Take the train from Dorgesh-Kaan to Keldagrim.", + new QuestRequirement(Quest.ANOTHER_SLICE_OF_HAM)); + add("Purchase some Barrows gloves from the Lumbridge bank chest.", + new QuestRequirement(Quest.RECIPE_FOR_DISASTER)); add("Pick some Belladonna from the farming patch at Draynor Manor.", new SkillRequirement(Skill.FARMING, 63)); add("Light your mining helmet in the Lumbridge castle basement.", @@ -96,16 +117,19 @@ public class LumbridgeDiaryRequirement extends GenericDiaryRequirement // ELITE add("Steal from a Dorgesh-Kaan rich chest.", - new SkillRequirement(Skill.THIEVING, 78)); + new SkillRequirement(Skill.THIEVING, 78), + new QuestRequirement(Quest.DEATH_TO_THE_DORGESHUUN)); add("Pickpocket Movario on the Dorgesh-Kaan Agility course.", new SkillRequirement(Skill.AGILITY, 70), new SkillRequirement(Skill.RANGED, 70), - new SkillRequirement(Skill.STRENGTH, 70)); + new SkillRequirement(Skill.STRENGTH, 70), + new QuestRequirement(Quest.DEATH_TO_THE_DORGESHUUN)); add("Chop some magic logs at the Mage Training Arena.", new SkillRequirement(Skill.WOODCUTTING, 75)); add("Smith an Adamant platebody down Draynor sewer.", new SkillRequirement(Skill.SMITHING, 88)); add("Craft 140 or more Water runes at once.", - new SkillRequirement(Skill.RUNECRAFT, 76)); + new SkillRequirement(Skill.RUNECRAFT, 76), + new QuestRequirement(Quest.RUNE_MYSTERIES)); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/MorytaniaDiaryRequirement.java b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/MorytaniaDiaryRequirement.java index 63ab784959..9b9a861779 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/MorytaniaDiaryRequirement.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/MorytaniaDiaryRequirement.java @@ -25,10 +25,12 @@ */ package net.runelite.client.plugins.achievementdiary.diaries; +import net.runelite.api.Quest; import net.runelite.api.Skill; import net.runelite.client.plugins.achievementdiary.CombatLevelRequirement; import net.runelite.client.plugins.achievementdiary.GenericDiaryRequirement; import net.runelite.client.plugins.achievementdiary.OrRequirement; +import net.runelite.client.plugins.achievementdiary.QuestRequirement; import net.runelite.client.plugins.achievementdiary.SkillRequirement; public class MorytaniaDiaryRequirement extends GenericDiaryRequirement @@ -46,6 +48,8 @@ public class MorytaniaDiaryRequirement extends GenericDiaryRequirement new SkillRequirement(Skill.SLAYER, 15)); add("Place a Scarecrow in the Morytania flower patch.", new SkillRequirement(Skill.FARMING, 23)); + add("Restore your prayer points at the nature altar.", + new QuestRequirement(Quest.NATURE_SPIRIT)); // MEDIUM add("Catch a swamp lizard.", @@ -55,47 +59,67 @@ public class MorytaniaDiaryRequirement extends GenericDiaryRequirement add("Obtain some Bark from a Hollow tree.", new SkillRequirement(Skill.WOODCUTTING, 45)); add("Kill a Terror Dog.", - new SkillRequirement(Skill.SLAYER, 40)); + new SkillRequirement(Skill.SLAYER, 40), + new QuestRequirement(Quest.LAIR_OF_TARN_RAZORLOR)); add("Complete a game of trouble brewing.", - new SkillRequirement(Skill.COOKING, 40)); + new SkillRequirement(Skill.COOKING, 40), + new QuestRequirement(Quest.CABIN_FEVER)); add("Make a batch of cannonballs at the Port Phasmatys furnace.", - new SkillRequirement(Skill.SMITHING, 35)); + new SkillRequirement(Skill.SMITHING, 35), + new QuestRequirement(Quest.DWARF_CANNON), + new QuestRequirement(Quest.GHOSTS_AHOY, true)); add("Kill a Fever Spider on Braindeath Island.", - new SkillRequirement(Skill.SLAYER, 42)); + new SkillRequirement(Skill.SLAYER, 42), + new QuestRequirement(Quest.RUM_DEAL)); + add("Use an ectophial to return to Port Phasmatys.", + new QuestRequirement(Quest.GHOSTS_AHOY)); add("Mix a Guthix Balance potion while in Morytania.", - new SkillRequirement(Skill.HERBLORE, 36)); + new SkillRequirement(Skill.HERBLORE, 36), + new QuestRequirement(Quest.IN_AID_OF_THE_MYREQUE, true)); // HARD add("Enter the Kharyrll portal in your POH.", new SkillRequirement(Skill.MAGIC, 66), - new SkillRequirement(Skill.CONSTRUCTION, 50)); + new SkillRequirement(Skill.CONSTRUCTION, 50), + new QuestRequirement(Quest.DESERT_TREASURE)); add("Climb the advanced spike chain within Slayer Tower.", new SkillRequirement(Skill.AGILITY, 71)); add("Harvest some Watermelon from the Allotment patch on Harmony Island.", - new SkillRequirement(Skill.FARMING, 47)); + new SkillRequirement(Skill.FARMING, 47), + new QuestRequirement(Quest.THE_GREAT_BRAIN_ROBBERY, true)); add("Chop and burn some mahogany logs on Mos Le'Harmless.", new SkillRequirement(Skill.WOODCUTTING, 50), - new SkillRequirement(Skill.FIREMAKING, 50)); + new SkillRequirement(Skill.FIREMAKING, 50), + new QuestRequirement(Quest.CABIN_FEVER)); + add("Complete a temple trek with a hard companion.", + new QuestRequirement(Quest.IN_AID_OF_THE_MYREQUE)); add("Kill a Cave Horror.", - new SkillRequirement(Skill.SLAYER, 58)); + new SkillRequirement(Skill.SLAYER, 58), + new QuestRequirement(Quest.CABIN_FEVER)); add("Harvest some Bittercap Mushrooms from the patch in Canifis.", new SkillRequirement(Skill.FARMING, 53)); add("Pray at the Altar of Nature with Piety activated.", new SkillRequirement(Skill.PRAYER, 70), - new SkillRequirement(Skill.DEFENCE, 70)); + new SkillRequirement(Skill.DEFENCE, 70), + new QuestRequirement(Quest.NATURE_SPIRIT), + new QuestRequirement(Quest.KINGS_RANSOM)); add("Use the shortcut to get to the bridge over the Salve.", new SkillRequirement(Skill.AGILITY, 65)); add("Mine some Mithril ore in the Abandoned Mine.", - new SkillRequirement(Skill.MINING, 55)); + new SkillRequirement(Skill.MINING, 55), + new QuestRequirement(Quest.HAUNTED_MINE)); // ELITE add("Catch a shark in Burgh de Rott with your bare hands.", new SkillRequirement(Skill.FISHING, 96), - new SkillRequirement(Skill.STRENGTH, 76)); + new SkillRequirement(Skill.STRENGTH, 76), + new QuestRequirement(Quest.IN_AID_OF_THE_MYREQUE)); add("Cremate any Shade remains on a Magic or Redwood pyre.", - new SkillRequirement(Skill.FIREMAKING, 80)); + new SkillRequirement(Skill.FIREMAKING, 80), + new QuestRequirement(Quest.SHADES_OF_MORTTON)); add("Fertilize the Morytania herb patch using Lunar Magic.", - new SkillRequirement(Skill.MAGIC, 83)); + new SkillRequirement(Skill.MAGIC, 83), + new QuestRequirement(Quest.LUNAR_DIPLOMACY)); add("Craft a Black dragonhide body in Canifis bank.", new SkillRequirement(Skill.CRAFTING, 84)); add("Kill an Abyssal demon in the Slayer Tower.", diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/VarrockDiaryRequirement.java b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/VarrockDiaryRequirement.java index fab4b0c0bd..bff800b4c2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/VarrockDiaryRequirement.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/VarrockDiaryRequirement.java @@ -25,9 +25,12 @@ */ package net.runelite.client.plugins.achievementdiary.diaries; +import net.runelite.api.Quest; import net.runelite.api.Skill; import net.runelite.client.plugins.achievementdiary.CombatLevelRequirement; import net.runelite.client.plugins.achievementdiary.GenericDiaryRequirement; +import net.runelite.client.plugins.achievementdiary.QuestPointRequirement; +import net.runelite.client.plugins.achievementdiary.QuestRequirement; import net.runelite.client.plugins.achievementdiary.SkillRequirement; public class VarrockDiaryRequirement extends GenericDiaryRequirement @@ -35,6 +38,8 @@ public class VarrockDiaryRequirement extends GenericDiaryRequirement public VarrockDiaryRequirement() { // EASY + add("Have Aubury teleport you to the Essence mine.", + new QuestRequirement(Quest.RUNE_MYSTERIES)); add("Mine some Iron in the south east mining patch near Varrock.", new SkillRequirement(Skill.MINING, 15)); add("Jump over the fence south of Varrock.", @@ -49,14 +54,27 @@ public class VarrockDiaryRequirement extends GenericDiaryRequirement new SkillRequirement(Skill.THIEVING, 5)); // MEDIUM + add("Enter the Champions' Guild.", + new QuestPointRequirement(32)); + add("Select a colour for your kitten.", + new QuestRequirement(Quest.GARDEN_OF_TRANQUILLITY, true), + new QuestRequirement(Quest.GERTRUDES_CAT)); + add("Use the spirit tree north of Varrock.", + new QuestRequirement(Quest.TREE_GNOME_VILLAGE)); + add("Enter the Tolna dungeon after completing A Soul's Bane.", + new QuestRequirement(Quest.A_SOULS_BANE)); + add("Teleport to the digsite using a Digsite pendant.", + new QuestRequirement(Quest.THE_DIG_SITE)); add("Cast the teleport to Varrock spell.", new SkillRequirement(Skill.MAGIC, 25)); add("Get a Slayer task from Vannaka.", new CombatLevelRequirement(40)); add("Pick a White tree fruit.", - new SkillRequirement(Skill.FARMING, 25)); + new SkillRequirement(Skill.FARMING, 25), + new QuestRequirement(Quest.GARDEN_OF_TRANQUILLITY)); add("Use the balloon to travel from Varrock.", - new SkillRequirement(Skill.FIREMAKING, 40)); + new SkillRequirement(Skill.FIREMAKING, 40), + new QuestRequirement(Quest.ENLIGHTENED_JOURNEY)); add("Complete a lap of the Varrock Agility course.", new SkillRequirement(Skill.AGILITY, 30)); @@ -66,7 +84,8 @@ public class VarrockDiaryRequirement extends GenericDiaryRequirement add("Make a Waka Canoe near Edgeville.", new SkillRequirement(Skill.WOODCUTTING, 57)); add("Teleport to Paddewwa.", - new SkillRequirement(Skill.MAGIC, 54)); + new SkillRequirement(Skill.MAGIC, 54), + new QuestRequirement(Quest.DESERT_TREASURE)); add("Chop some yew logs in Varrock and burn them at the top of the Varrock church.", new SkillRequirement(Skill.WOODCUTTING, 60), new SkillRequirement(Skill.FIREMAKING, 60)); @@ -82,15 +101,19 @@ public class VarrockDiaryRequirement extends GenericDiaryRequirement // ELITE add("Create a super combat potion in Varrock west bank.", - new SkillRequirement(Skill.HERBLORE, 90)); + new SkillRequirement(Skill.HERBLORE, 90), + new QuestRequirement(Quest.DRUIDIC_RITUAL)); add("Use Lunar magic to make 20 mahogany planks at the Lumberyard.", - new SkillRequirement(Skill.MAGIC, 86)); + new SkillRequirement(Skill.MAGIC, 86), + new QuestRequirement(Quest.DREAM_MENTOR)); add("Bake a summer pie in the Cooking Guild.", new SkillRequirement(Skill.COOKING, 95)); add("Smith and fletch ten rune darts within Varrock.", new SkillRequirement(Skill.SMITHING, 89), - new SkillRequirement(Skill.FLETCHING, 81)); + new SkillRequirement(Skill.FLETCHING, 81), + new QuestRequirement(Quest.THE_TOURIST_TRAP)); add("Craft 100 or more earth runes simultaneously.", - new SkillRequirement(Skill.RUNECRAFT, 78)); + new SkillRequirement(Skill.RUNECRAFT, 78), + new QuestRequirement(Quest.RUNE_MYSTERIES)); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/WesternDiaryRequirement.java b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/WesternDiaryRequirement.java index ce05bc5b1d..be612338e8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/WesternDiaryRequirement.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/WesternDiaryRequirement.java @@ -25,9 +25,11 @@ */ package net.runelite.client.plugins.achievementdiary.diaries; +import net.runelite.api.Quest; import net.runelite.api.Skill; import net.runelite.client.plugins.achievementdiary.CombatLevelRequirement; import net.runelite.client.plugins.achievementdiary.GenericDiaryRequirement; +import net.runelite.client.plugins.achievementdiary.QuestRequirement; import net.runelite.client.plugins.achievementdiary.SkillRequirement; public class WesternDiaryRequirement extends GenericDiaryRequirement @@ -41,65 +43,103 @@ public class WesternDiaryRequirement extends GenericDiaryRequirement new CombatLevelRequirement(40)); add("Mine some Iron Ore near Piscatoris.", new SkillRequirement(Skill.MINING, 15)); + add("Claim any Chompy bird hat from Rantz.", + new QuestRequirement(Quest.BIG_CHOMPY_BIRD_HUNTING)); + add("Have Brimstail teleport you to the Essence mine.", + new QuestRequirement(Quest.RUNE_MYSTERIES)); add("Fletch an Oak shortbow from the Gnome Stronghold.", new SkillRequirement(Skill.FLETCHING, 20)); // MEDIUM add("Take the agility shortcut from the Grand Tree to Otto's Grotto.", - new SkillRequirement(Skill.AGILITY, 37)); + new SkillRequirement(Skill.AGILITY, 37), + new QuestRequirement(Quest.TREE_GNOME_VILLAGE), + new QuestRequirement(Quest.THE_GRAND_TREE)); + add("Travel to the Gnome Stronghold by Spirit Tree.", + new QuestRequirement(Quest.TREE_GNOME_VILLAGE)); add("Trap a Spined Larupia.", new SkillRequirement(Skill.HUNTER, 31)); add("Fish some Bass on Ape Atoll.", - new SkillRequirement(Skill.FISHING, 46)); + new SkillRequirement(Skill.FISHING, 46), + new QuestRequirement(Quest.MONKEY_MADNESS_I, true)); add("Chop and burn some teak logs on Ape Atoll.", new SkillRequirement(Skill.WOODCUTTING, 35), - new SkillRequirement(Skill.FIREMAKING, 35)); + new SkillRequirement(Skill.FIREMAKING, 35), + new QuestRequirement(Quest.MONKEY_MADNESS_I)); add("Complete an intermediate game of Pest Control.", new CombatLevelRequirement(70)); + add("Travel to the Feldip Hills by Gnome Glider.", + new QuestRequirement(Quest.ONE_SMALL_FAVOUR), + new QuestRequirement(Quest.THE_GRAND_TREE)); + add("Claim a Chompy bird hat from Rantz after registering at least 125 kills.", + new QuestRequirement(Quest.BIG_CHOMPY_BIRD_HUNTING)); + add("Travel from Eagles' Peak to the Feldip Hills by Eagle.", + new QuestRequirement(Quest.EAGLES_PEAK)); add("Make a Chocolate Bomb at the Grand Tree.", new SkillRequirement(Skill.COOKING, 42)); add("Complete a delivery for the Gnome Restaurant.", new SkillRequirement(Skill.COOKING, 42)); + add("Turn your small crystal seed into a Crystal saw.", + new QuestRequirement(Quest.THE_EYES_OF_GLOUPHRIE)); add("Mine some Gold ore underneath the Grand Tree.", - new SkillRequirement(Skill.MINING, 40)); + new SkillRequirement(Skill.MINING, 40), + new QuestRequirement(Quest.THE_GRAND_TREE)); // HARD add("Kill an Elf with a Crystal bow.", new SkillRequirement(Skill.RANGED, 70), - new SkillRequirement(Skill.AGILITY, 50)); + new SkillRequirement(Skill.AGILITY, 50), + new QuestRequirement(Quest.ROVING_ELVES)); add("Catch and cook a Monkfish in Piscatoris.", new SkillRequirement(Skill.FISHING, 62), - new SkillRequirement(Skill.COOKING, 62)); + new SkillRequirement(Skill.COOKING, 62), + new QuestRequirement(Quest.SWAN_SONG)); add("Complete a Veteran game of Pest Control.", new CombatLevelRequirement(100)); add("Catch a Dashing Kebbit.", new SkillRequirement(Skill.HUNTER, 69)); add("Complete a lap of the Ape Atoll agility course.", - new SkillRequirement(Skill.AGILITY, 48)); + new SkillRequirement(Skill.AGILITY, 48), + new QuestRequirement(Quest.MONKEY_MADNESS_I)); add("Chop and burn some Mahogany logs on Ape Atoll.", new SkillRequirement(Skill.WOODCUTTING, 50), - new SkillRequirement(Skill.FIREMAKING, 50)); + new SkillRequirement(Skill.FIREMAKING, 50), + new QuestRequirement(Quest.MONKEY_MADNESS_I)); add("Mine some Adamantite ore in Tirannwn.", - new SkillRequirement(Skill.MINING, 70)); + new SkillRequirement(Skill.MINING, 70), + new QuestRequirement(Quest.REGICIDE)); add("Check the health of your Palm tree in Lletya.", - new SkillRequirement(Skill.FARMING, 68)); + new SkillRequirement(Skill.FARMING, 68), + new QuestRequirement(Quest.MOURNINGS_ENDS_PART_I, true)); + add("Claim a Chompy bird hat from Rantz after registering at least 300 kills.", + new QuestRequirement(Quest.BIG_CHOMPY_BIRD_HUNTING)); add("Build an Isafdar painting in your POH Quest hall.", - new SkillRequirement(Skill.CONSTRUCTION, 65)); + new SkillRequirement(Skill.CONSTRUCTION, 65), + new QuestRequirement(Quest.ROVING_ELVES)); + add("Kill Zulrah.", + new QuestRequirement(Quest.REGICIDE, true)); add("Teleport to Ape Atoll.", - new SkillRequirement(Skill.MAGIC, 64)); + new SkillRequirement(Skill.MAGIC, 64), + new QuestRequirement(Quest.RECIPE_FOR_DISASTER, true)); add("Pickpocket a Gnome.", - new SkillRequirement(Skill.THIEVING, 75)); + new SkillRequirement(Skill.THIEVING, 75), + new QuestRequirement(Quest.TREE_GNOME_VILLAGE)); // ELITE add("Fletch a Magic Longbow in the Elven lands.", - new SkillRequirement(Skill.FLETCHING, 85)); + new SkillRequirement(Skill.FLETCHING, 85), + new QuestRequirement(Quest.MOURNINGS_ENDS_PART_I)); add("Kill the Thermonuclear Smoke devil (Does not require task).", new SkillRequirement(Skill.SLAYER, 93)); add("Have Prissy Scilla protect your Magic tree.", new SkillRequirement(Skill.FARMING, 75)); add("Use the Elven overpass advanced cliffside shortcut.", - new SkillRequirement(Skill.AGILITY, 85)); + new SkillRequirement(Skill.AGILITY, 85), + new QuestRequirement(Quest.UNDERGROUND_PASS)); + add("Claim a Chompy bird hat from Rantz after registering at least 1000 kills.", + new QuestRequirement(Quest.BIG_CHOMPY_BIRD_HUNTING)); add("Pickpocket an Elf.", - new SkillRequirement(Skill.THIEVING, 85)); + new SkillRequirement(Skill.THIEVING, 85), + new QuestRequirement(Quest.MOURNINGS_ENDS_PART_II)); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/WildernessDiaryRequirement.java b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/WildernessDiaryRequirement.java index 6f944fb0ad..0a059a1785 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/WildernessDiaryRequirement.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/WildernessDiaryRequirement.java @@ -25,9 +25,11 @@ */ package net.runelite.client.plugins.achievementdiary.diaries; +import net.runelite.api.Quest; import net.runelite.api.Skill; import net.runelite.client.plugins.achievementdiary.GenericDiaryRequirement; import net.runelite.client.plugins.achievementdiary.OrRequirement; +import net.runelite.client.plugins.achievementdiary.QuestRequirement; import net.runelite.client.plugins.achievementdiary.SkillRequirement; public class WildernessDiaryRequirement extends GenericDiaryRequirement @@ -41,6 +43,8 @@ public class WildernessDiaryRequirement extends GenericDiaryRequirement new SkillRequirement(Skill.AGILITY, 15)); add("Mine some Iron ore in the Wilderness.", new SkillRequirement(Skill.MINING, 15)); + add("Have the Mage of Zamorak teleport you to the Abyss.", + new QuestRequirement(Quest.ENTER_THE_ABYSS)); // MEDIUM add("Mine some Mithril ore in the wilderness.", @@ -60,11 +64,13 @@ public class WildernessDiaryRequirement extends GenericDiaryRequirement add("Kill a Bloodveld in the Wilderness Godwars Dungeon.", new SkillRequirement(Skill.SLAYER, 50)); add("Smith a Golden helmet in the Resource Area.", - new SkillRequirement(Skill.SMITHING, 50)); + new SkillRequirement(Skill.SMITHING, 50), + new QuestRequirement(Quest.BETWEEN_A_ROCK, true)); // HARD add("Cast one of the 3 God spells against another player in the Wilderness.", - new SkillRequirement(Skill.MAGIC, 60)); + new SkillRequirement(Skill.MAGIC, 60), + new QuestRequirement(Quest.THE_MAGE_ARENA)); add("Charge an Air Orb.", new SkillRequirement(Skill.MAGIC, 66)); add("Catch a Black Salamander in the Wilderness.", @@ -72,7 +78,8 @@ public class WildernessDiaryRequirement extends GenericDiaryRequirement add("Smith an Adamant scimitar in the Resource Area.", new SkillRequirement(Skill.SMITHING, 75)); add("Take the agility shortcut from Trollheim into the Wilderness.", - new SkillRequirement(Skill.AGILITY, 64)); + new SkillRequirement(Skill.AGILITY, 64), + new QuestRequirement(Quest.DEATH_PLATEAU)); add("Kill a Spiritual warrior in the Wilderness Godwars Dungeon.", new SkillRequirement(Skill.SLAYER, 68)); add("Fish some Raw Lava Eel in the Wilderness.", @@ -80,7 +87,8 @@ public class WildernessDiaryRequirement extends GenericDiaryRequirement // ELITE add("Teleport to Ghorrock.", - new SkillRequirement(Skill.MAGIC, 96)); + new SkillRequirement(Skill.MAGIC, 96), + new QuestRequirement(Quest.DESERT_TREASURE)); add("Fish and Cook a Dark Crab in the Resource Area.", new SkillRequirement(Skill.FISHING, 85), new SkillRequirement(Skill.COOKING, 90));