diaries: Use new api

This commit is contained in:
Max Weber
2019-01-06 23:02:13 -07:00
parent 78d7d7d929
commit e6ae6829c6
11 changed files with 378 additions and 365 deletions

View File

@@ -27,7 +27,7 @@ package net.runelite.client.plugins.achievementdiary.diaries;
import net.runelite.api.Skill; import net.runelite.api.Skill;
import net.runelite.client.plugins.achievementdiary.GenericDiaryRequirement; import net.runelite.client.plugins.achievementdiary.GenericDiaryRequirement;
import net.runelite.client.plugins.achievementdiary.Requirement; import net.runelite.client.plugins.achievementdiary.SkillRequirement;
public class ArdougneDiaryRequirement extends GenericDiaryRequirement public class ArdougneDiaryRequirement extends GenericDiaryRequirement
{ {
@@ -35,68 +35,68 @@ public class ArdougneDiaryRequirement extends GenericDiaryRequirement
{ {
// EASY // EASY
add("Steal a cake from the Ardougne market stalls.", add("Steal a cake from the Ardougne market stalls.",
new Requirement(Skill.THIEVING, 5)); new SkillRequirement(Skill.THIEVING, 5));
// MEDIUM // MEDIUM
add("Grapple over Yanille's south wall.", add("Grapple over Yanille's south wall.",
new Requirement(Skill.AGILITY, 39), new SkillRequirement(Skill.AGILITY, 39),
new Requirement(Skill.STRENGTH, 38), new SkillRequirement(Skill.STRENGTH, 38),
new Requirement(Skill.RANGED, 21)); new SkillRequirement(Skill.RANGED, 21));
add("Harvest some strawberries from the Ardougne farming patch.", add("Harvest some strawberries from the Ardougne farming patch.",
new Requirement(Skill.FARMING, 31)); new SkillRequirement(Skill.FARMING, 31));
add("Cast the Ardougne Teleport spell.", add("Cast the Ardougne Teleport spell.",
new Requirement(Skill.MAGIC, 51)); new SkillRequirement(Skill.MAGIC, 51));
add("Travel to Castlewars by Hot Air Balloon.", add("Travel to Castlewars by Hot Air Balloon.",
new Requirement(Skill.FIREMAKING, 50)); new SkillRequirement(Skill.FIREMAKING, 50));
add("Claim buckets of sand from Bert in Yanille.", add("Claim buckets of sand from Bert in Yanille.",
new Requirement(Skill.CRAFTING, 49)); new SkillRequirement(Skill.CRAFTING, 49));
add("Pickpocket the master farmer north of Ardougne.", add("Pickpocket the master farmer north of Ardougne.",
new Requirement(Skill.THIEVING, 38)); new SkillRequirement(Skill.THIEVING, 38));
add("Equip Iban's upgraded staff or upgrade an Iban staff.", add("Equip Iban's upgraded staff or upgrade an Iban staff.",
new Requirement(Skill.MAGIC, 50), new SkillRequirement(Skill.MAGIC, 50),
new Requirement(Skill.ATTACK, 50)); new SkillRequirement(Skill.ATTACK, 50));
// HARD // HARD
add("Enter the Magic Guild.", add("Enter the Magic Guild.",
new Requirement(Skill.MAGIC, 66)); new SkillRequirement(Skill.MAGIC, 66));
add("Attempt to steal from King Lathas' chest.", add("Attempt to steal from King Lathas' chest.",
new Requirement(Skill.THIEVING, 72)); new SkillRequirement(Skill.THIEVING, 72));
add("Teleport to the Watchtower.", add("Teleport to the Watchtower.",
new Requirement(Skill.MAGIC, 58)); new SkillRequirement(Skill.MAGIC, 58));
add("Catch a Red Salamander.", add("Catch a Red Salamander.",
new Requirement(Skill.HUNTER, 59)); new SkillRequirement(Skill.HUNTER, 59));
add("Check the health of a Palm tree near tree gnome village.", add("Check the health of a Palm tree near tree gnome village.",
new Requirement(Skill.FARMING, 68)); new SkillRequirement(Skill.FARMING, 68));
add("Pick some Poison Ivy berries from the patch south of Ardougne.", add("Pick some Poison Ivy berries from the patch south of Ardougne.",
new Requirement(Skill.FARMING, 70)); new SkillRequirement(Skill.FARMING, 70));
add("Smith a Mithril platebody near Ardougne.", add("Smith a Mithril platebody near Ardougne.",
new Requirement(Skill.SMITHING, 68)); new SkillRequirement(Skill.SMITHING, 68));
add("Enter your POH from Yanille.", add("Enter your POH from Yanille.",
new Requirement(Skill.CONSTRUCTION, 50)); new SkillRequirement(Skill.CONSTRUCTION, 50));
add("Smith a Dragon sq shield in West Ardougne.", add("Smith a Dragon sq shield in West Ardougne.",
new Requirement(Skill.SMITHING, 60)); new SkillRequirement(Skill.SMITHING, 60));
add("Craft some Death runes.", add("Craft some Death runes.",
new Requirement(Skill.RUNECRAFT, 65)); new SkillRequirement(Skill.RUNECRAFT, 65));
// ELITE // ELITE
add("Catch a Manta ray in the Fishing Trawler and cook it in Port Khazard.", add("Catch a Manta ray in the Fishing Trawler and cook it in Port Khazard.",
new Requirement(Skill.FISHING, 81), new SkillRequirement(Skill.FISHING, 81),
new Requirement(Skill.COOKING, 91) new SkillRequirement(Skill.COOKING, 91)
); );
add("Attempt to picklock the door to the basement of Yanille Agility Dungeon.", add("Attempt to picklock the door to the basement of Yanille Agility Dungeon.",
new Requirement(Skill.THIEVING, 82)); new SkillRequirement(Skill.THIEVING, 82));
add("Pickpocket a Hero.", add("Pickpocket a Hero.",
new Requirement(Skill.THIEVING, 80)); new SkillRequirement(Skill.THIEVING, 80));
add("Make a rune crossbow yourself from scratch within Witchaven or Yanille.", add("Make a rune crossbow yourself from scratch within Witchaven or Yanille.",
new Requirement(Skill.CRAFTING, 10), new SkillRequirement(Skill.CRAFTING, 10),
new Requirement(Skill.SMITHING, 91), new SkillRequirement(Skill.SMITHING, 91),
new Requirement(Skill.FLETCHING, 69)); new SkillRequirement(Skill.FLETCHING, 69));
add("Pick some Torstol from the patch north of Ardougne.", add("Pick some Torstol from the patch north of Ardougne.",
new Requirement(Skill.FARMING, 85)); new SkillRequirement(Skill.FARMING, 85));
add("Complete a lap of Ardougne's rooftop agility course.", add("Complete a lap of Ardougne's rooftop agility course.",
new Requirement(Skill.AGILITY, 90)); new SkillRequirement(Skill.AGILITY, 90));
add("Cast Ice Barrage on another player within Castlewars.", add("Cast Ice Barrage on another player within Castlewars.",
new Requirement(Skill.MAGIC, 94)); new SkillRequirement(Skill.MAGIC, 94));
} }
} }

View File

@@ -27,7 +27,7 @@ package net.runelite.client.plugins.achievementdiary.diaries;
import net.runelite.api.Skill; import net.runelite.api.Skill;
import net.runelite.client.plugins.achievementdiary.GenericDiaryRequirement; import net.runelite.client.plugins.achievementdiary.GenericDiaryRequirement;
import net.runelite.client.plugins.achievementdiary.Requirement; import net.runelite.client.plugins.achievementdiary.SkillRequirement;
public class DesertDiaryRequirement extends GenericDiaryRequirement public class DesertDiaryRequirement extends GenericDiaryRequirement
{ {
@@ -35,60 +35,60 @@ public class DesertDiaryRequirement extends GenericDiaryRequirement
{ {
// EASY // EASY
add("Catch a Golden Warbler.", add("Catch a Golden Warbler.",
new Requirement(Skill.HUNTER, 5)); new SkillRequirement(Skill.HUNTER, 5));
add("Mine 5 clay in the north-eastern desert.", add("Mine 5 clay in the north-eastern desert.",
new Requirement(Skill.MINING, 5)); new SkillRequirement(Skill.MINING, 5));
add("Open the Sarcophagus in the first room of Pyramid Plunder.", add("Open the Sarcophagus in the first room of Pyramid Plunder.",
new Requirement(Skill.THIEVING, 21)); new SkillRequirement(Skill.THIEVING, 21));
// MEDIUM // MEDIUM
add("Climb to the summit of the Agility Pyramid.", add("Climb to the summit of the Agility Pyramid.",
new Requirement(Skill.AGILITY, 30)); new SkillRequirement(Skill.AGILITY, 30));
add("Slay a desert lizard.", add("Slay a desert lizard.",
new Requirement(Skill.SLAYER, 22)); new SkillRequirement(Skill.SLAYER, 22));
add("Catch an Orange Salamander.", add("Catch an Orange Salamander.",
new Requirement(Skill.HUNTER, 47)); new SkillRequirement(Skill.HUNTER, 47));
add("Steal a feather from the Desert Phoenix.", add("Steal a feather from the Desert Phoenix.",
new Requirement(Skill.THIEVING, 25)); new SkillRequirement(Skill.THIEVING, 25));
add("Create a combat potion in the desert.", add("Create a combat potion in the desert.",
new Requirement(Skill.HERBLORE, 36)); new SkillRequirement(Skill.HERBLORE, 36));
add("Teleport to Pollnivneach with a redirected teleport to house tablet.", add("Teleport to Pollnivneach with a redirected teleport to house tablet.",
new Requirement(Skill.CONSTRUCTION, 20)); new SkillRequirement(Skill.CONSTRUCTION, 20));
add("Chop some Teak logs near Uzer.", add("Chop some Teak logs near Uzer.",
new Requirement(Skill.WOODCUTTING, 35)); new SkillRequirement(Skill.WOODCUTTING, 35));
// HARD // HARD
add("Knock out and pickpocket a Menaphite Thug.", add("Knock out and pickpocket a Menaphite Thug.",
new Requirement(Skill.THIEVING, 65)); new SkillRequirement(Skill.THIEVING, 65));
add("Mine some Granite.", add("Mine some Granite.",
new Requirement(Skill.MINING, 45)); new SkillRequirement(Skill.MINING, 45));
add("Refill your waterskins in the Desert using Lunar magic.", add("Refill your waterskins in the Desert using Lunar magic.",
new Requirement(Skill.MAGIC, 68)); new SkillRequirement(Skill.MAGIC, 68));
add("Complete a lap of the Pollnivneach agility course.", add("Complete a lap of the Pollnivneach agility course.",
new Requirement(Skill.AGILITY, 70)); new SkillRequirement(Skill.AGILITY, 70));
add("Slay a Dust Devil with a Slayer helmet equipped.", add("Slay a Dust Devil with a Slayer helmet equipped.",
new Requirement(Skill.SLAYER, 65), new SkillRequirement(Skill.SLAYER, 65),
new Requirement(Skill.DEFENCE, 10), new SkillRequirement(Skill.DEFENCE, 10),
new Requirement(Skill.CRAFTING, 55)); new SkillRequirement(Skill.CRAFTING, 55));
add("Defeat a Locust Rider with Keris.", add("Defeat a Locust Rider with Keris.",
new Requirement(Skill.ATTACK, 50)); new SkillRequirement(Skill.ATTACK, 50));
add("Burn some yew logs on the Nardah Mayor's balcony.", add("Burn some yew logs on the Nardah Mayor's balcony.",
new Requirement(Skill.FIREMAKING, 60)); new SkillRequirement(Skill.FIREMAKING, 60));
add("Create a Mithril Platebody in Nardah.", add("Create a Mithril Platebody in Nardah.",
new Requirement(Skill.SMITHING, 68)); new SkillRequirement(Skill.SMITHING, 68));
// ELITE // ELITE
add("Bake a wild pie at the Nardah Clay Oven.", add("Bake a wild pie at the Nardah Clay Oven.",
new Requirement(Skill.COOKING, 85)); new SkillRequirement(Skill.COOKING, 85));
add("Cast Ice Barrage against a foe in the Desert.", add("Cast Ice Barrage against a foe in the Desert.",
new Requirement(Skill.MAGIC, 94)); new SkillRequirement(Skill.MAGIC, 94));
add("Fletch some Dragon darts at the Bedabin Camp.", add("Fletch some Dragon darts at the Bedabin Camp.",
new Requirement(Skill.FLETCHING, 95)); new SkillRequirement(Skill.FLETCHING, 95));
add("Speak to the KQ head in your POH.", add("Speak to the KQ head in your POH.",
new Requirement(Skill.CONSTRUCTION, 78)); new SkillRequirement(Skill.CONSTRUCTION, 78));
add("Steal from the Grand Gold Chest in the final room of Pyramid Plunder.", add("Steal from the Grand Gold Chest in the final room of Pyramid Plunder.",
new Requirement(Skill.THIEVING, 91)); new SkillRequirement(Skill.THIEVING, 91));
add("Restore at least 85 Prayer points when praying at the Altar in Sophanem.", add("Restore at least 85 Prayer points when praying at the Altar in Sophanem.",
new Requirement(Skill.PRAYER, 85)); new SkillRequirement(Skill.PRAYER, 85));
} }
} }

View File

@@ -27,7 +27,7 @@ package net.runelite.client.plugins.achievementdiary.diaries;
import net.runelite.api.Skill; import net.runelite.api.Skill;
import net.runelite.client.plugins.achievementdiary.GenericDiaryRequirement; import net.runelite.client.plugins.achievementdiary.GenericDiaryRequirement;
import net.runelite.client.plugins.achievementdiary.Requirement; import net.runelite.client.plugins.achievementdiary.SkillRequirement;
public class FaladorDiaryRequirement extends GenericDiaryRequirement public class FaladorDiaryRequirement extends GenericDiaryRequirement
{ {
@@ -35,71 +35,71 @@ public class FaladorDiaryRequirement extends GenericDiaryRequirement
{ {
// EASY // EASY
add("Find out what your family crest is from Sir Renitee.", add("Find out what your family crest is from Sir Renitee.",
new Requirement(Skill.CONSTRUCTION, 16)); new SkillRequirement(Skill.CONSTRUCTION, 16));
add("Climb over the western Falador wall.", add("Climb over the western Falador wall.",
new Requirement(Skill.AGILITY, 5)); new SkillRequirement(Skill.AGILITY, 5));
add("Smith some Blurite Limbs on Doric's Anvil.", add("Smith some Blurite Limbs on Doric's Anvil.",
new Requirement(Skill.MINING, 10), new SkillRequirement(Skill.MINING, 10),
new Requirement(Skill.SMITHING, 13)); new SkillRequirement(Skill.SMITHING, 13));
// MEDIUM // MEDIUM
add("Light a Bullseye lantern at the Chemist's in Rimmington.", add("Light a Bullseye lantern at the Chemist's in Rimmington.",
new Requirement(Skill.FIREMAKING, 49)); new SkillRequirement(Skill.FIREMAKING, 49));
add("Telegrab some Wine of Zamorak at the Chaos Temple by the Wilderness.", add("Telegrab some Wine of Zamorak at the Chaos Temple by the Wilderness.",
new Requirement(Skill.MAGIC, 33)); new SkillRequirement(Skill.MAGIC, 33));
add("Place a Scarecrow in the Falador farming patch.", add("Place a Scarecrow in the Falador farming patch.",
new Requirement(Skill.FARMING, 23)); new SkillRequirement(Skill.FARMING, 23));
add("Kill a Mogre at Mudskipper Point.", add("Kill a Mogre at Mudskipper Point.",
new Requirement(Skill.SLAYER, 32)); new SkillRequirement(Skill.SLAYER, 32));
add("Grapple up and then jump off the north Falador wall.", add("Grapple up and then jump off the north Falador wall.",
new Requirement(Skill.AGILITY, 11), new SkillRequirement(Skill.AGILITY, 11),
new Requirement(Skill.STRENGTH, 37), new SkillRequirement(Skill.STRENGTH, 37),
new Requirement(Skill.RANGED, 19)); new SkillRequirement(Skill.RANGED, 19));
add("Pickpocket a Falador guard.", add("Pickpocket a Falador guard.",
new Requirement(Skill.THIEVING, 40)); new SkillRequirement(Skill.THIEVING, 40));
add("Pray at the Altar of Guthix in Taverley whilst wearing full Initiate.", add("Pray at the Altar of Guthix in Taverley whilst wearing full Initiate.",
new Requirement(Skill.PRAYER, 10), new SkillRequirement(Skill.PRAYER, 10),
new Requirement(Skill.DEFENCE, 20)); new SkillRequirement(Skill.DEFENCE, 20));
add("Mine some Gold ore at the Crafting Guild.", add("Mine some Gold ore at the Crafting Guild.",
new Requirement(Skill.CRAFTING, 40), new SkillRequirement(Skill.CRAFTING, 40),
new Requirement(Skill.MINING, 40)); new SkillRequirement(Skill.MINING, 40));
add("Squeeze through the crevice in the Dwarven mines.", add("Squeeze through the crevice in the Dwarven mines.",
new Requirement(Skill.AGILITY, 42)); new SkillRequirement(Skill.AGILITY, 42));
add("Chop and burn some Willow logs in Taverley", add("Chop and burn some Willow logs in Taverley",
new Requirement(Skill.WOODCUTTING, 30), new SkillRequirement(Skill.WOODCUTTING, 30),
new Requirement(Skill.FIREMAKING, 30)); new SkillRequirement(Skill.FIREMAKING, 30));
add("Craft a fruit basket on the Falador Farm loom.", add("Craft a fruit basket on the Falador Farm loom.",
new Requirement(Skill.CRAFTING, 36)); new SkillRequirement(Skill.CRAFTING, 36));
add("Teleport to Falador.", add("Teleport to Falador.",
new Requirement(Skill.MAGIC, 37)); new SkillRequirement(Skill.MAGIC, 37));
// HARD // HARD
add("Craft 140 Mind runes simultaneously.", add("Craft 140 Mind runes simultaneously.",
new Requirement(Skill.RUNECRAFT, 56)); new SkillRequirement(Skill.RUNECRAFT, 56));
add("Change your family crest to the Saradomin symbol.", add("Change your family crest to the Saradomin symbol.",
new Requirement(Skill.PRAYER, 70)); new SkillRequirement(Skill.PRAYER, 70));
add("Kill a Skeletal Wyvern in the Asgarnia Ice Dungeon.", add("Kill a Skeletal Wyvern in the Asgarnia Ice Dungeon.",
new Requirement(Skill.SLAYER, 72)); new SkillRequirement(Skill.SLAYER, 72));
add("Complete a lap of the Falador rooftop agility course.", add("Complete a lap of the Falador rooftop agility course.",
new Requirement(Skill.AGILITY, 50)); new SkillRequirement(Skill.AGILITY, 50));
add("Enter the mining guild wearing full prospector.", add("Enter the mining guild wearing full prospector.",
new Requirement(Skill.MINING, 60)); new SkillRequirement(Skill.MINING, 60));
add("Crack a wall safe within Rogues Den.", add("Crack a wall safe within Rogues Den.",
new Requirement(Skill.THIEVING, 50)); new SkillRequirement(Skill.THIEVING, 50));
add("Recharge your prayer in the Port Sarim church while wearing full Proselyte.", add("Recharge your prayer in the Port Sarim church while wearing full Proselyte.",
new Requirement(Skill.DEFENCE, 30)); new SkillRequirement(Skill.DEFENCE, 30));
add("Equip a dwarven helmet within the dwarven mines.", add("Equip a dwarven helmet within the dwarven mines.",
new Requirement(Skill.DEFENCE, 50)); new SkillRequirement(Skill.DEFENCE, 50));
// ELITE // ELITE
add("Craft 252 Air Runes simultaneously.", add("Craft 252 Air Runes simultaneously.",
new Requirement(Skill.RUNECRAFT, 88)); new SkillRequirement(Skill.RUNECRAFT, 88));
add("Find at least 3 magic roots at once when digging up your magic tree in Falador.", add("Find at least 3 magic roots at once when digging up your magic tree in Falador.",
new Requirement(Skill.FARMING, 91), new SkillRequirement(Skill.FARMING, 91),
new Requirement(Skill.WOODCUTTING, 75)); new SkillRequirement(Skill.WOODCUTTING, 75));
add("Jump over the strange floor in Taverley dungeon.", add("Jump over the strange floor in Taverley dungeon.",
new Requirement(Skill.AGILITY, 80)); new SkillRequirement(Skill.AGILITY, 80));
add("Mix a Saradomin brew in Falador east bank.", add("Mix a Saradomin brew in Falador east bank.",
new Requirement(Skill.HERBLORE, 81)); new SkillRequirement(Skill.HERBLORE, 81));
} }
} }

View File

@@ -27,7 +27,7 @@ package net.runelite.client.plugins.achievementdiary.diaries;
import net.runelite.api.Skill; import net.runelite.api.Skill;
import net.runelite.client.plugins.achievementdiary.GenericDiaryRequirement; import net.runelite.client.plugins.achievementdiary.GenericDiaryRequirement;
import net.runelite.client.plugins.achievementdiary.Requirement; import net.runelite.client.plugins.achievementdiary.SkillRequirement;
public class FremennikDiaryRequirement extends GenericDiaryRequirement public class FremennikDiaryRequirement extends GenericDiaryRequirement
{ {
@@ -35,62 +35,62 @@ public class FremennikDiaryRequirement extends GenericDiaryRequirement
{ {
// EASY // EASY
add("Catch a Cerulean twitch.", add("Catch a Cerulean twitch.",
new Requirement(Skill.HUNTER, 11)); new SkillRequirement(Skill.HUNTER, 11));
add("Craft a tiara from scratch in Rellekka.", add("Craft a tiara from scratch in Rellekka.",
new Requirement(Skill.CRAFTING, 23), new SkillRequirement(Skill.CRAFTING, 23),
new Requirement(Skill.MINING, 20), new SkillRequirement(Skill.MINING, 20),
new Requirement(Skill.SMITHING, 20)); new SkillRequirement(Skill.SMITHING, 20));
add("Steal from the Keldagrim crafting or baker's stall.", add("Steal from the Keldagrim crafting or baker's stall.",
new Requirement(Skill.THIEVING, 5)); new SkillRequirement(Skill.THIEVING, 5));
add("Chop and burn some oak logs in the Fremennik Province.", add("Chop and burn some oak logs in the Fremennik Province.",
new Requirement(Skill.WOODCUTTING, 15), new SkillRequirement(Skill.WOODCUTTING, 15),
new Requirement(Skill.FIREMAKING, 15)); new SkillRequirement(Skill.FIREMAKING, 15));
// MEDIUM // MEDIUM
add("Slay a Brine rat.", add("Slay a Brine rat.",
new Requirement(Skill.SLAYER, 47)); new SkillRequirement(Skill.SLAYER, 47));
add("Mine some coal in Rellekka.", add("Mine some coal in Rellekka.",
new Requirement(Skill.MINING, 30)); new SkillRequirement(Skill.MINING, 30));
add("Steal from the Rellekka Fish stalls.", add("Steal from the Rellekka Fish stalls.",
new Requirement(Skill.THIEVING, 42)); new SkillRequirement(Skill.THIEVING, 42));
add("Catch a Snowy knight.", add("Catch a Snowy knight.",
new Requirement(Skill.HUNTER, 35)); new SkillRequirement(Skill.HUNTER, 35));
add("Pick up your Pet Rock from your POH Menagerie.", add("Pick up your Pet Rock from your POH Menagerie.",
new Requirement(Skill.CONSTRUCTION, 37)); new SkillRequirement(Skill.CONSTRUCTION, 37));
add("Mine some gold at the Arzinian mine.", add("Mine some gold at the Arzinian mine.",
new Requirement(Skill.MINING, 40)); new SkillRequirement(Skill.MINING, 40));
// HARD // HARD
add("Teleport to Trollheim.", add("Teleport to Trollheim.",
new Requirement(Skill.MAGIC, 61)); new SkillRequirement(Skill.MAGIC, 61));
add("Catch a Sabre-toothed Kyatt.", add("Catch a Sabre-toothed Kyatt.",
new Requirement(Skill.HUNTER, 55)); new SkillRequirement(Skill.HUNTER, 55));
add("Mix a super defence potion in the Fremennik province.", add("Mix a super defence potion in the Fremennik province.",
new Requirement(Skill.HERBLORE, 66)); new SkillRequirement(Skill.HERBLORE, 66));
add("Steal from the Keldagrim Gem Stall.", add("Steal from the Keldagrim Gem Stall.",
new Requirement(Skill.THIEVING, 75)); new SkillRequirement(Skill.THIEVING, 75));
add("Craft a Fremennik shield on Neitiznot.", add("Craft a Fremennik shield on Neitiznot.",
new Requirement(Skill.WOODCUTTING, 56)); new SkillRequirement(Skill.WOODCUTTING, 56));
add("Mine 5 Adamantite ores on Jatizso.", add("Mine 5 Adamantite ores on Jatizso.",
new Requirement(Skill.MINING, 70)); new SkillRequirement(Skill.MINING, 70));
add("Teleport to Waterbirth Island.", add("Teleport to Waterbirth Island.",
new Requirement(Skill.MAGIC, 72)); new SkillRequirement(Skill.MAGIC, 72));
add("Obtain the Blast Furnace Foreman's permission to use the Blast Furnace for free.", add("Obtain the Blast Furnace Foreman's permission to use the Blast Furnace for free.",
new Requirement(Skill.SMITHING, 60)); new SkillRequirement(Skill.SMITHING, 60));
// ELITE // ELITE
add("Craft 56 astral runes at once.", add("Craft 56 astral runes at once.",
new Requirement(Skill.RUNECRAFT, 82)); new SkillRequirement(Skill.RUNECRAFT, 82));
add("Create a dragonstone amulet in the Neitiznot furnace.", add("Create a dragonstone amulet in the Neitiznot furnace.",
new Requirement(Skill.CRAFTING, 80)); new SkillRequirement(Skill.CRAFTING, 80));
add("Complete a lap of the Rellekka agility course.", add("Complete a lap of the Rellekka agility course.",
new Requirement(Skill.AGILITY, 80)); new SkillRequirement(Skill.AGILITY, 80));
add("Kill each of the Godwars generals.", add("Kill each of the Godwars generals.",
new Requirement(Skill.AGILITY, 70), new SkillRequirement(Skill.AGILITY, 70),
new Requirement(Skill.STRENGTH, 70), new SkillRequirement(Skill.STRENGTH, 70),
new Requirement(Skill.HITPOINTS, 70), new SkillRequirement(Skill.HITPOINTS, 70),
new Requirement(Skill.RANGED, 70)); new SkillRequirement(Skill.RANGED, 70));
add("Slay a Spiritual mage within the Godwars Dungeon.", add("Slay a Spiritual mage within the Godwars Dungeon.",
new Requirement(Skill.SLAYER, 83)); new SkillRequirement(Skill.SLAYER, 83));
} }
} }

View File

@@ -27,7 +27,7 @@ package net.runelite.client.plugins.achievementdiary.diaries;
import net.runelite.api.Skill; import net.runelite.api.Skill;
import net.runelite.client.plugins.achievementdiary.GenericDiaryRequirement; import net.runelite.client.plugins.achievementdiary.GenericDiaryRequirement;
import net.runelite.client.plugins.achievementdiary.Requirement; import net.runelite.client.plugins.achievementdiary.SkillRequirement;
public class KandarinDiaryRequirement extends GenericDiaryRequirement public class KandarinDiaryRequirement extends GenericDiaryRequirement
{ {
@@ -35,78 +35,78 @@ public class KandarinDiaryRequirement extends GenericDiaryRequirement
{ {
// EASY // EASY
add("Catch a Mackerel at Catherby.", add("Catch a Mackerel at Catherby.",
new Requirement(Skill.FISHING, 16)); new SkillRequirement(Skill.FISHING, 16));
add("Plant some Jute seeds in the patch north of McGrubor's Wood.", add("Plant some Jute seeds in the patch north of McGrubor's Wood.",
new Requirement(Skill.FARMING, 13)); new SkillRequirement(Skill.FARMING, 13));
add("Cross the Coal truck log shortcut.", add("Cross the Coal truck log shortcut.",
new Requirement(Skill.AGILITY, 20)); new SkillRequirement(Skill.AGILITY, 20));
// MEDIUM // MEDIUM
add("Complete a lap of the Barbarian agility course.", add("Complete a lap of the Barbarian agility course.",
new Requirement(Skill.AGILITY, 35)); new SkillRequirement(Skill.AGILITY, 35));
add("Create a Super Antipoison potion from scratch in the Seers/Catherby Area.", add("Create a Super Antipoison potion from scratch in the Seers/Catherby Area.",
new Requirement(Skill.HERBLORE, 48)); new SkillRequirement(Skill.HERBLORE, 48));
add("Enter the Ranging guild.", add("Enter the Ranging guild.",
new Requirement(Skill.RANGED, 40)); new SkillRequirement(Skill.RANGED, 40));
add("Use the grapple shortcut to get from the water obelisk to Catherby shore.", add("Use the grapple shortcut to get from the water obelisk to Catherby shore.",
new Requirement(Skill.AGILITY, 36), new SkillRequirement(Skill.AGILITY, 36),
new Requirement(Skill.STRENGTH, 22), new SkillRequirement(Skill.STRENGTH, 22),
new Requirement(Skill.RANGED, 39)); new SkillRequirement(Skill.RANGED, 39));
add("Catch and cook a Bass in Catherby.", add("Catch and cook a Bass in Catherby.",
new Requirement(Skill.FISHING, 46), new SkillRequirement(Skill.FISHING, 46),
new Requirement(Skill.COOKING, 43)); new SkillRequirement(Skill.COOKING, 43));
add("Teleport to Camelot.", add("Teleport to Camelot.",
new Requirement(Skill.MAGIC, 45)); new SkillRequirement(Skill.MAGIC, 45));
add("String a Maple shortbow in Seers' Village bank.", add("String a Maple shortbow in Seers' Village bank.",
new Requirement(Skill.FLETCHING, 50)); new SkillRequirement(Skill.FLETCHING, 50));
add("Pick some Limpwurt root from the farming patch in Catherby.", add("Pick some Limpwurt root from the farming patch in Catherby.",
new Requirement(Skill.FARMING, 26)); new SkillRequirement(Skill.FARMING, 26));
add("Steal from the chest in Hemenster.", add("Steal from the chest in Hemenster.",
new Requirement(Skill.THIEVING, 47)); new SkillRequirement(Skill.THIEVING, 47));
add("Mine some coal near the coal trucks.", add("Mine some coal near the coal trucks.",
new Requirement(Skill.MINING, 30)); new SkillRequirement(Skill.MINING, 30));
// HARD // HARD
add("Catch a Leaping Sturgeon.", add("Catch a Leaping Sturgeon.",
new Requirement(Skill.FISHING, 70), new SkillRequirement(Skill.FISHING, 70),
new Requirement(Skill.AGILITY, 45), new SkillRequirement(Skill.AGILITY, 45),
new Requirement(Skill.STRENGTH, 45)); new SkillRequirement(Skill.STRENGTH, 45));
add("Complete a lap of the Seers' Village agility course.", add("Complete a lap of the Seers' Village agility course.",
new Requirement(Skill.AGILITY, 60)); new SkillRequirement(Skill.AGILITY, 60));
add("Create a Yew Longbow from scratch around Seers' Village.", add("Create a Yew Longbow from scratch around Seers' Village.",
new Requirement(Skill.WOODCUTTING, 60), new SkillRequirement(Skill.WOODCUTTING, 60),
new Requirement(Skill.FLETCHING, 70), new SkillRequirement(Skill.FLETCHING, 70),
new Requirement(Skill.CRAFTING, 10)); new SkillRequirement(Skill.CRAFTING, 10));
add("Enter the Seers' Village courthouse with piety turned on.", add("Enter the Seers' Village courthouse with piety turned on.",
new Requirement(Skill.PRAYER, 70), new SkillRequirement(Skill.PRAYER, 70),
new Requirement(Skill.DEFENCE, 70)); new SkillRequirement(Skill.DEFENCE, 70));
add("Charge a Water Orb.", add("Charge a Water Orb.",
new Requirement(Skill.MAGIC, 56)); new SkillRequirement(Skill.MAGIC, 56));
add("Burn some Maple logs with a bow in Seers' Village.", add("Burn some Maple logs with a bow in Seers' Village.",
new Requirement(Skill.FIREMAKING, 65)); new SkillRequirement(Skill.FIREMAKING, 65));
add("Purchase and equip a granite body from Barbarian Assault.", add("Purchase and equip a granite body from Barbarian Assault.",
new Requirement(Skill.STRENGTH, 50), new SkillRequirement(Skill.STRENGTH, 50),
new Requirement(Skill.DEFENCE, 50)); new SkillRequirement(Skill.DEFENCE, 50));
add("Have the Seers' estate agent decorate your house with Fancy Stone.", add("Have the Seers' estate agent decorate your house with Fancy Stone.",
new Requirement(Skill.CONSTRUCTION, 50)); new SkillRequirement(Skill.CONSTRUCTION, 50));
add("Smith an Adamant spear at Otto's Grotto.", add("Smith an Adamant spear at Otto's Grotto.",
new Requirement(Skill.SMITHING, 75)); new SkillRequirement(Skill.SMITHING, 75));
// ELITE // ELITE
add("Pick some Dwarf weed from the herb patch at Catherby.", add("Pick some Dwarf weed from the herb patch at Catherby.",
new Requirement(Skill.FARMING, 79)); new SkillRequirement(Skill.FARMING, 79));
add("Fish and Cook 5 Sharks in Catherby using the Cooking gauntlets.", add("Fish and Cook 5 Sharks in Catherby using the Cooking gauntlets.",
new Requirement(Skill.FISHING, 76), new SkillRequirement(Skill.FISHING, 76),
new Requirement(Skill.COOKING, 80)); new SkillRequirement(Skill.COOKING, 80));
add("Mix a Stamina Mix on top of the Seers' Village bank.", add("Mix a Stamina Mix on top of the Seers' Village bank.",
new Requirement(Skill.HERBLORE, 86), new SkillRequirement(Skill.HERBLORE, 86),
new Requirement(Skill.AGILITY, 60)); new SkillRequirement(Skill.AGILITY, 60));
add("Smith a Rune Hasta at Otto's Grotto.", add("Smith a Rune Hasta at Otto's Grotto.",
new Requirement(Skill.SMITHING, 90)); new SkillRequirement(Skill.SMITHING, 90));
add("Construct a Pyre ship from Magic Logs.(Requires Chewed Bones.)", add("Construct a Pyre ship from Magic Logs.(Requires Chewed Bones.)",
new Requirement(Skill.FIREMAKING, 85), new SkillRequirement(Skill.FIREMAKING, 85),
new Requirement(Skill.CRAFTING, 85)); new SkillRequirement(Skill.CRAFTING, 85));
add("Teleport to Catherby.", add("Teleport to Catherby.",
new Requirement(Skill.MAGIC, 87)); new SkillRequirement(Skill.MAGIC, 87));
} }
} }

View File

@@ -26,8 +26,9 @@
package net.runelite.client.plugins.achievementdiary.diaries; package net.runelite.client.plugins.achievementdiary.diaries;
import net.runelite.api.Skill; 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.GenericDiaryRequirement;
import net.runelite.client.plugins.achievementdiary.Requirement; import net.runelite.client.plugins.achievementdiary.SkillRequirement;
public class KaramjaDiaryRequirement extends GenericDiaryRequirement public class KaramjaDiaryRequirement extends GenericDiaryRequirement
{ {
@@ -36,70 +37,70 @@ public class KaramjaDiaryRequirement extends GenericDiaryRequirement
// EASY // EASY
add("Use the rope swing to travel to the small island north-west of Karamja, where the " + add("Use the rope swing to travel to the small island north-west of Karamja, where the " +
"moss giants are.", "moss giants are.",
new Requirement(Skill.AGILITY, 10)); new SkillRequirement(Skill.AGILITY, 10));
add("Mine some gold from the rocks on the north-west peninsula of Karamja.", add("Mine some gold from the rocks on the north-west peninsula of Karamja.",
new Requirement(Skill.MINING, 40)); new SkillRequirement(Skill.MINING, 40));
add("Explore Cairn Island to the west of Karamja.", add("Explore Cairn Island to the west of Karamja.",
new Requirement(Skill.AGILITY, 15)); new SkillRequirement(Skill.AGILITY, 15));
// MEDIUM // MEDIUM
add("Claim a ticket from the Agility Arena in Brimhaven.", add("Claim a ticket from the Agility Arena in Brimhaven.",
new Requirement(Skill.AGILITY, 30)); new SkillRequirement(Skill.AGILITY, 30));
add("Earn 100% favour in the village of Tai Bwo Wannai.", add("Earn 100% favour in the village of Tai Bwo Wannai.",
new Requirement(Skill.WOODCUTTING, 10)); new SkillRequirement(Skill.WOODCUTTING, 10));
add("Cook a spider on a stick.", add("Cook a spider on a stick.",
new Requirement(Skill.COOKING, 16)); new SkillRequirement(Skill.COOKING, 16));
add("Cut a log from a teak tree.", add("Cut a log from a teak tree.",
new Requirement(Skill.WOODCUTTING, 35)); new SkillRequirement(Skill.WOODCUTTING, 35));
add("Cut a log from a mahogany tree.", add("Cut a log from a mahogany tree.",
new Requirement(Skill.WOODCUTTING, 50)); new SkillRequirement(Skill.WOODCUTTING, 50));
add("Catch a karambwan.", add("Catch a karambwan.",
new Requirement(Skill.FISHING, 65)); new SkillRequirement(Skill.FISHING, 65));
add("Grow a healthy fruit tree in the patch near Brimhaven.", add("Grow a healthy fruit tree in the patch near Brimhaven.",
new Requirement(Skill.FARMING, 27)); new SkillRequirement(Skill.FARMING, 27));
add("Trap a horned graahk.", add("Trap a horned graahk.",
new Requirement(Skill.HUNTER, 41)); new SkillRequirement(Skill.HUNTER, 41));
add("Chop the vines to gain deeper access to Brimhaven Dungeon.", add("Chop the vines to gain deeper access to Brimhaven Dungeon.",
new Requirement(Skill.WOODCUTTING, 10)); new SkillRequirement(Skill.WOODCUTTING, 10));
add("Cross the lava using the stepping stones within Brimhaven Dungeon.", add("Cross the lava using the stepping stones within Brimhaven Dungeon.",
new Requirement(Skill.AGILITY, 12)); new SkillRequirement(Skill.AGILITY, 12));
add("Climb the stairs within Brimhaven Dungeon.", add("Climb the stairs within Brimhaven Dungeon.",
new Requirement(Skill.WOODCUTTING, 10)); new SkillRequirement(Skill.WOODCUTTING, 10));
add("Mine a red topaz from a gem rock.", add("Mine a red topaz from a gem rock.",
new Requirement(Skill.MINING, 40)); new SkillRequirement(Skill.MINING, 40));
// HARD // HARD
add("Craft some nature runes.", add("Craft some nature runes.",
new Requirement(Skill.RUNECRAFT, 44)); new SkillRequirement(Skill.RUNECRAFT, 44));
add("Cook a karambwan thoroughly.", add("Cook a karambwan thoroughly.",
new Requirement(Skill.COOKING, 30)); new SkillRequirement(Skill.COOKING, 30));
add("Kill a deathwing in the dungeon under the Kharazi Jungle.", add("Kill a deathwing in the dungeon under the Kharazi Jungle.",
new Requirement(Skill.WOODCUTTING, 15), new SkillRequirement(Skill.WOODCUTTING, 15),
new Requirement(Skill.STRENGTH, 50), new SkillRequirement(Skill.STRENGTH, 50),
new Requirement(Skill.AGILITY, 50), new SkillRequirement(Skill.AGILITY, 50),
new Requirement(Skill.THIEVING, 50), new SkillRequirement(Skill.THIEVING, 50),
new Requirement(Skill.MINING, 52)); new SkillRequirement(Skill.MINING, 52));
add("Use the crossbow short cut south of the volcano.", add("Use the crossbow short cut south of the volcano.",
new Requirement(Skill.AGILITY, 53), new SkillRequirement(Skill.AGILITY, 53),
new Requirement(Skill.RANGED, 42), new SkillRequirement(Skill.RANGED, 42),
new Requirement(Skill.STRENGTH, 21)); new SkillRequirement(Skill.STRENGTH, 21));
add("Collect 5 palm leaves.", add("Collect 5 palm leaves.",
new Requirement(Skill.WOODCUTTING, 15)); new SkillRequirement(Skill.WOODCUTTING, 15));
add("Be assigned a Slayer task by Duradel north of Shilo Village.", add("Be assigned a Slayer task by Duradel north of Shilo Village.",
new Requirement("Combat", 100), new CombatLevelRequirement(100),
new Requirement(Skill.SLAYER, 50)); new SkillRequirement(Skill.SLAYER, 50));
add("Kill a metal dragon in Brimhaven Dungeon.", add("Kill a metal dragon in Brimhaven Dungeon.",
new Requirement(Skill.AGILITY, 12), new SkillRequirement(Skill.AGILITY, 12),
new Requirement(Skill.WOODCUTTING, 34)); new SkillRequirement(Skill.WOODCUTTING, 34));
// ELITE // ELITE
add("Craft 56 Nature runes at once.", add("Craft 56 Nature runes at once.",
new Requirement(Skill.RUNECRAFT, 91)); new SkillRequirement(Skill.RUNECRAFT, 91));
add("Check the health of a palm tree in Brimhaven.", add("Check the health of a palm tree in Brimhaven.",
new Requirement(Skill.FARMING, 68)); new SkillRequirement(Skill.FARMING, 68));
add("Create an antivenom potion whilst standing in the horse shoe mine.", add("Create an antivenom potion whilst standing in the horse shoe mine.",
new Requirement(Skill.HERBLORE, 87)); new SkillRequirement(Skill.HERBLORE, 87));
add("Check the health of your Calquat tree patch.", add("Check the health of your Calquat tree patch.",
new Requirement(Skill.FARMING, 72)); new SkillRequirement(Skill.FARMING, 72));
} }
} }

View File

@@ -26,8 +26,9 @@
package net.runelite.client.plugins.achievementdiary.diaries; package net.runelite.client.plugins.achievementdiary.diaries;
import net.runelite.api.Skill; 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.GenericDiaryRequirement;
import net.runelite.client.plugins.achievementdiary.Requirement; import net.runelite.client.plugins.achievementdiary.SkillRequirement;
public class LumbridgeDiaryRequirement extends GenericDiaryRequirement public class LumbridgeDiaryRequirement extends GenericDiaryRequirement
{ {
@@ -35,76 +36,76 @@ public class LumbridgeDiaryRequirement extends GenericDiaryRequirement
{ {
// EASY // EASY
add("Complete a lap of the Draynor Village agility course.", add("Complete a lap of the Draynor Village agility course.",
new Requirement(Skill.AGILITY, 10)); new SkillRequirement(Skill.AGILITY, 10));
add("Slay a Cave bug beneath Lumbridge Swamp.", add("Slay a Cave bug beneath Lumbridge Swamp.",
new Requirement(Skill.SLAYER, 7)); new SkillRequirement(Skill.SLAYER, 7));
add("Craft some water runes.", add("Craft some water runes.",
new Requirement(Skill.RUNECRAFT, 5)); new SkillRequirement(Skill.RUNECRAFT, 5));
add("Chop and burn some oak logs in Lumbridge.", add("Chop and burn some oak logs in Lumbridge.",
new Requirement(Skill.WOODCUTTING, 15), new SkillRequirement(Skill.WOODCUTTING, 15),
new Requirement(Skill.FIREMAKING, 15)); new SkillRequirement(Skill.FIREMAKING, 15));
add("Catch some Anchovies in Al Kharid.", add("Catch some Anchovies in Al Kharid.",
new Requirement(Skill.FISHING, 15)); new SkillRequirement(Skill.FISHING, 15));
add("Mine some Iron ore at the Al Kharid mine.", add("Mine some Iron ore at the Al Kharid mine.",
new Requirement(Skill.MINING, 15)); new SkillRequirement(Skill.MINING, 15));
// MEDIUM // MEDIUM
add("Complete a lap of the Al Kharid agility course.", add("Complete a lap of the Al Kharid agility course.",
new Requirement(Skill.AGILITY, 20)); new SkillRequirement(Skill.AGILITY, 20));
add("Grapple across the River Lum.", add("Grapple across the River Lum.",
new Requirement(Skill.AGILITY, 8), new SkillRequirement(Skill.AGILITY, 8),
new Requirement(Skill.STRENGTH, 19), new SkillRequirement(Skill.STRENGTH, 19),
new Requirement(Skill.RANGED, 37)); new SkillRequirement(Skill.RANGED, 37));
add("Purchase an upgraded device from Ava.", add("Purchase an upgraded device from Ava.",
new Requirement(Skill.RANGED, 50)); new SkillRequirement(Skill.RANGED, 50));
add("Cast the teleport to Lumbridge spell.", add("Cast the teleport to Lumbridge spell.",
new Requirement(Skill.MAGIC, 31)); new SkillRequirement(Skill.MAGIC, 31));
add("Catch some Salmon in Lumbridge.", add("Catch some Salmon in Lumbridge.",
new Requirement(Skill.FISHING, 30)); new SkillRequirement(Skill.FISHING, 30));
add("Craft a coif in the Lumbridge cow pen.", add("Craft a coif in the Lumbridge cow pen.",
new Requirement(Skill.CRAFTING, 38)); new SkillRequirement(Skill.CRAFTING, 38));
add("Get a slayer task from Chaeldar.", add("Get a slayer task from Chaeldar.",
new Requirement("Combat", 70)); new CombatLevelRequirement(70));
add("Chop some willow logs in Draynor Village.", add("Chop some willow logs in Draynor Village.",
new Requirement(Skill.WOODCUTTING, 30)); new SkillRequirement(Skill.WOODCUTTING, 30));
add("Pickpocket Martin the Master Gardener.", add("Pickpocket Martin the Master Gardener.",
new Requirement(Skill.THIEVING, 38)); new SkillRequirement(Skill.THIEVING, 38));
add("Catch an Essence or Eclectic impling in Puro-Puro.", add("Catch an Essence or Eclectic impling in Puro-Puro.",
new Requirement(Skill.HUNTER, 42)); new SkillRequirement(Skill.HUNTER, 42));
add("Craft some Lava runes at the fire altar in Al Kharid.", add("Craft some Lava runes at the fire altar in Al Kharid.",
new Requirement(Skill.RUNECRAFT, 23)); new SkillRequirement(Skill.RUNECRAFT, 23));
// HARD // HARD
add("Cast Bones to Peaches in Al Kharid palace.", add("Cast Bones to Peaches in Al Kharid palace.",
new Requirement(Skill.MAGIC, 60)); new SkillRequirement(Skill.MAGIC, 60));
add("Squeeze past the jutting wall on your way to the cosmic altar.", add("Squeeze past the jutting wall on your way to the cosmic altar.",
new Requirement(Skill.AGILITY, 46)); new SkillRequirement(Skill.AGILITY, 46));
add("Craft 56 Cosmic runes simultaneously.", add("Craft 56 Cosmic runes simultaneously.",
new Requirement(Skill.RUNECRAFT, 59)); new SkillRequirement(Skill.RUNECRAFT, 59));
add("Travel from Lumbridge to Edgeville on a Waka Canoe.", add("Travel from Lumbridge to Edgeville on a Waka Canoe.",
new Requirement(Skill.WOODCUTTING, 57)); new SkillRequirement(Skill.WOODCUTTING, 57));
add("Pick some Belladonna from the farming patch at Draynor Manor.", add("Pick some Belladonna from the farming patch at Draynor Manor.",
new Requirement(Skill.FARMING, 63)); new SkillRequirement(Skill.FARMING, 63));
add("Light your mining helmet in the Lumbridge castle basement.", add("Light your mining helmet in the Lumbridge castle basement.",
new Requirement(Skill.FIREMAKING, 65)); new SkillRequirement(Skill.FIREMAKING, 65));
add("Recharge your prayer at Clan Wars with Smite activated.", add("Recharge your prayer at Clan Wars with Smite activated.",
new Requirement(Skill.PRAYER, 52)); new SkillRequirement(Skill.PRAYER, 52));
add("Craft, string and enchant an Amulet of Power in Lumbridge.", add("Craft, string and enchant an Amulet of Power in Lumbridge.",
new Requirement(Skill.CRAFTING, 70), new SkillRequirement(Skill.CRAFTING, 70),
new Requirement(Skill.MAGIC, 57)); new SkillRequirement(Skill.MAGIC, 57));
// ELITE // ELITE
add("Steal from a Dorgesh-Kaan rich chest.", add("Steal from a Dorgesh-Kaan rich chest.",
new Requirement(Skill.THIEVING, 78)); new SkillRequirement(Skill.THIEVING, 78));
add("Pickpocket Movario on the Dorgesh-Kaan Agility course.", add("Pickpocket Movario on the Dorgesh-Kaan Agility course.",
new Requirement(Skill.AGILITY, 70), new SkillRequirement(Skill.AGILITY, 70),
new Requirement(Skill.RANGED, 70), new SkillRequirement(Skill.RANGED, 70),
new Requirement(Skill.STRENGTH, 70)); new SkillRequirement(Skill.STRENGTH, 70));
add("Chop some magic logs at the Mage Training Arena.", add("Chop some magic logs at the Mage Training Arena.",
new Requirement(Skill.WOODCUTTING, 75)); new SkillRequirement(Skill.WOODCUTTING, 75));
add("Smith an Adamant platebody down Draynor sewer.", add("Smith an Adamant platebody down Draynor sewer.",
new Requirement(Skill.SMITHING, 88)); new SkillRequirement(Skill.SMITHING, 88));
add("Craft 140 or more Water runes at once.", add("Craft 140 or more Water runes at once.",
new Requirement(Skill.RUNECRAFT, 76)); new SkillRequirement(Skill.RUNECRAFT, 76));
} }
} }

View File

@@ -26,8 +26,10 @@
package net.runelite.client.plugins.achievementdiary.diaries; package net.runelite.client.plugins.achievementdiary.diaries;
import net.runelite.api.Skill; 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.GenericDiaryRequirement;
import net.runelite.client.plugins.achievementdiary.Requirement; import net.runelite.client.plugins.achievementdiary.OrRequirement;
import net.runelite.client.plugins.achievementdiary.SkillRequirement;
public class MorytaniaDiaryRequirement extends GenericDiaryRequirement public class MorytaniaDiaryRequirement extends GenericDiaryRequirement
{ {
@@ -35,75 +37,77 @@ public class MorytaniaDiaryRequirement extends GenericDiaryRequirement
{ {
// EASY // EASY
add("Craft any Snelm from scratch in Morytania.", add("Craft any Snelm from scratch in Morytania.",
new Requirement(Skill.CRAFTING, 15)); new SkillRequirement(Skill.CRAFTING, 15));
add("Cook a thin Snail on the Port Phasmatys range.", add("Cook a thin Snail on the Port Phasmatys range.",
new Requirement(Skill.COOKING, 12)); new SkillRequirement(Skill.COOKING, 12));
add("Get a slayer task from Mazchna.", add("Get a slayer task from Mazchna.",
new Requirement("Combat", 20)); new CombatLevelRequirement(20));
add("Kill a Banshee in the Slayer Tower.", add("Kill a Banshee in the Slayer Tower.",
new Requirement(Skill.SLAYER, 15)); new SkillRequirement(Skill.SLAYER, 15));
add("Place a Scarecrow in the Morytania flower patch.", add("Place a Scarecrow in the Morytania flower patch.",
new Requirement(Skill.FARMING, 23)); new SkillRequirement(Skill.FARMING, 23));
// MEDIUM // MEDIUM
add("Catch a swamp lizard.", add("Catch a swamp lizard.",
new Requirement(Skill.HUNTER, 29)); new SkillRequirement(Skill.HUNTER, 29));
add("Complete a lap of the Canifis agility course.", add("Complete a lap of the Canifis agility course.",
new Requirement(Skill.AGILITY, 40)); new SkillRequirement(Skill.AGILITY, 40));
add("Obtain some Bark from a Hollow tree.", add("Obtain some Bark from a Hollow tree.",
new Requirement(Skill.WOODCUTTING, 45)); new SkillRequirement(Skill.WOODCUTTING, 45));
add("Kill a Terror Dog.", add("Kill a Terror Dog.",
new Requirement(Skill.SLAYER, 40)); new SkillRequirement(Skill.SLAYER, 40));
add("Complete a game of trouble brewing.", add("Complete a game of trouble brewing.",
new Requirement(Skill.COOKING, 40)); new SkillRequirement(Skill.COOKING, 40));
add("Make a batch of cannonballs at the Port Phasmatys furnace.", add("Make a batch of cannonballs at the Port Phasmatys furnace.",
new Requirement(Skill.SMITHING, 35)); new SkillRequirement(Skill.SMITHING, 35));
add("Kill a Fever Spider on Braindeath Island.", add("Kill a Fever Spider on Braindeath Island.",
new Requirement(Skill.SLAYER, 42)); new SkillRequirement(Skill.SLAYER, 42));
add("Mix a Guthix Balance potion while in Morytania.", add("Mix a Guthix Balance potion while in Morytania.",
new Requirement(Skill.HERBLORE, 36)); new SkillRequirement(Skill.HERBLORE, 36));
// HARD // HARD
add("Enter the Kharyrll portal in your POH.", add("Enter the Kharyrll portal in your POH.",
new Requirement(Skill.MAGIC, 66), new SkillRequirement(Skill.MAGIC, 66),
new Requirement(Skill.CONSTRUCTION, 50)); new SkillRequirement(Skill.CONSTRUCTION, 50));
add("Climb the advanced spike chain within Slayer Tower.", add("Climb the advanced spike chain within Slayer Tower.",
new Requirement(Skill.AGILITY, 71)); new SkillRequirement(Skill.AGILITY, 71));
add("Harvest some Watermelon from the Allotment patch on Harmony Island.", add("Harvest some Watermelon from the Allotment patch on Harmony Island.",
new Requirement(Skill.FARMING, 47)); new SkillRequirement(Skill.FARMING, 47));
add("Chop and burn some mahogany logs on Mos Le'Harmless.", add("Chop and burn some mahogany logs on Mos Le'Harmless.",
new Requirement(Skill.WOODCUTTING, 50), new SkillRequirement(Skill.WOODCUTTING, 50),
new Requirement(Skill.FIREMAKING, 50)); new SkillRequirement(Skill.FIREMAKING, 50));
add("Kill a Cave Horror.", add("Kill a Cave Horror.",
new Requirement(Skill.SLAYER, 58)); new SkillRequirement(Skill.SLAYER, 58));
add("Harvest some Bittercap Mushrooms from the patch in Canifis.", add("Harvest some Bittercap Mushrooms from the patch in Canifis.",
new Requirement(Skill.FARMING, 53)); new SkillRequirement(Skill.FARMING, 53));
add("Pray at the Altar of Nature with Piety activated.", add("Pray at the Altar of Nature with Piety activated.",
new Requirement(Skill.PRAYER, 70), new SkillRequirement(Skill.PRAYER, 70),
new Requirement(Skill.DEFENCE, 70)); new SkillRequirement(Skill.DEFENCE, 70));
add("Use the shortcut to get to the bridge over the Salve.", add("Use the shortcut to get to the bridge over the Salve.",
new Requirement(Skill.AGILITY, 65)); new SkillRequirement(Skill.AGILITY, 65));
add("Mine some Mithril ore in the Abandoned Mine.", add("Mine some Mithril ore in the Abandoned Mine.",
new Requirement(Skill.MINING, 55)); new SkillRequirement(Skill.MINING, 55));
// ELITE // ELITE
add("Catch a shark in Burgh de Rott with your bare hands.", add("Catch a shark in Burgh de Rott with your bare hands.",
new Requirement(Skill.FISHING, 96), new SkillRequirement(Skill.FISHING, 96),
new Requirement(Skill.STRENGTH, 76)); new SkillRequirement(Skill.STRENGTH, 76));
add("Cremate any Shade remains on a Magic or Redwood pyre.", add("Cremate any Shade remains on a Magic or Redwood pyre.",
new Requirement(Skill.FIREMAKING, 80)); new SkillRequirement(Skill.FIREMAKING, 80));
add("Fertilize the Morytania herb patch using Lunar Magic.", add("Fertilize the Morytania herb patch using Lunar Magic.",
new Requirement(Skill.MAGIC, 83)); new SkillRequirement(Skill.MAGIC, 83));
add("Craft a Black dragonhide body in Canifis bank.", add("Craft a Black dragonhide body in Canifis bank.",
new Requirement(Skill.CRAFTING, 84)); new SkillRequirement(Skill.CRAFTING, 84));
add("Kill an Abyssal demon in the Slayer Tower.", add("Kill an Abyssal demon in the Slayer Tower.",
new Requirement(Skill.SLAYER, 85)); new SkillRequirement(Skill.SLAYER, 85));
add("Loot the Barrows chest while wearing any complete barrows set.", add("Loot the Barrows chest while wearing any complete barrows set.",
new Requirement(Skill.DEFENCE, 70), new SkillRequirement(Skill.DEFENCE, 70),
new Requirement(Skill.ATTACK, 70, new OrRequirement(
new Requirement(Skill.STRENGTH, 70), new SkillRequirement(Skill.ATTACK, 70),
new Requirement(Skill.RANGED, 70), new SkillRequirement(Skill.STRENGTH, 70),
new Requirement(Skill.MAGIC, 70)) new SkillRequirement(Skill.RANGED, 70),
new SkillRequirement(Skill.MAGIC, 70)
)
); );
} }
} }

View File

@@ -26,8 +26,9 @@
package net.runelite.client.plugins.achievementdiary.diaries; package net.runelite.client.plugins.achievementdiary.diaries;
import net.runelite.api.Skill; 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.GenericDiaryRequirement;
import net.runelite.client.plugins.achievementdiary.Requirement; import net.runelite.client.plugins.achievementdiary.SkillRequirement;
public class VarrockDiaryRequirement extends GenericDiaryRequirement public class VarrockDiaryRequirement extends GenericDiaryRequirement
{ {
@@ -35,61 +36,61 @@ public class VarrockDiaryRequirement extends GenericDiaryRequirement
{ {
// EASY // EASY
add("Mine some Iron in the south east mining patch near Varrock.", add("Mine some Iron in the south east mining patch near Varrock.",
new Requirement(Skill.MINING, 15)); new SkillRequirement(Skill.MINING, 15));
add("Jump over the fence south of Varrock.", add("Jump over the fence south of Varrock.",
new Requirement(Skill.AGILITY, 13)); new SkillRequirement(Skill.AGILITY, 13));
add("Spin a bowl on the pottery wheel and fire it in the oven in Barb Village.", add("Spin a bowl on the pottery wheel and fire it in the oven in Barb Village.",
new Requirement(Skill.CRAFTING, 8)); new SkillRequirement(Skill.CRAFTING, 8));
add("Craft some Earth runes.", add("Craft some Earth runes.",
new Requirement(Skill.RUNECRAFT, 9)); new SkillRequirement(Skill.RUNECRAFT, 9));
add("Catch some trout in the River Lum at Barbarian Village.", add("Catch some trout in the River Lum at Barbarian Village.",
new Requirement(Skill.FISHING, 20)); new SkillRequirement(Skill.FISHING, 20));
add("Steal from the Tea stall in Varrock.", add("Steal from the Tea stall in Varrock.",
new Requirement(Skill.THIEVING, 5)); new SkillRequirement(Skill.THIEVING, 5));
// MEDIUM // MEDIUM
add("Cast the teleport to Varrock spell.", add("Cast the teleport to Varrock spell.",
new Requirement(Skill.MAGIC, 25)); new SkillRequirement(Skill.MAGIC, 25));
add("Get a Slayer task from Vannaka.", add("Get a Slayer task from Vannaka.",
new Requirement("Combat", 40)); new CombatLevelRequirement(40));
add("Pick a White tree fruit.", add("Pick a White tree fruit.",
new Requirement(Skill.FARMING, 25)); new SkillRequirement(Skill.FARMING, 25));
add("Use the balloon to travel from Varrock.", add("Use the balloon to travel from Varrock.",
new Requirement(Skill.FIREMAKING, 40)); new SkillRequirement(Skill.FIREMAKING, 40));
add("Complete a lap of the Varrock Agility course.", add("Complete a lap of the Varrock Agility course.",
new Requirement(Skill.AGILITY, 30)); new SkillRequirement(Skill.AGILITY, 30));
// HARD // HARD
add("Trade furs with the Fancy Dress Seller for a spottier cape and equip it.", add("Trade furs with the Fancy Dress Seller for a spottier cape and equip it.",
new Requirement(Skill.HUNTER, 66)); new SkillRequirement(Skill.HUNTER, 66));
add("Make a Waka Canoe near Edgeville.", add("Make a Waka Canoe near Edgeville.",
new Requirement(Skill.WOODCUTTING, 57)); new SkillRequirement(Skill.WOODCUTTING, 57));
add("Teleport to Paddewwa.", add("Teleport to Paddewwa.",
new Requirement(Skill.MAGIC, 54)); new SkillRequirement(Skill.MAGIC, 54));
add("Chop some yew logs in Varrock and burn them at the top of the Varrock church.", add("Chop some yew logs in Varrock and burn them at the top of the Varrock church.",
new Requirement(Skill.WOODCUTTING, 60), new SkillRequirement(Skill.WOODCUTTING, 60),
new Requirement(Skill.FIREMAKING, 60)); new SkillRequirement(Skill.FIREMAKING, 60));
add("Have the Varrock estate agent decorate your house with Fancy Stone.", add("Have the Varrock estate agent decorate your house with Fancy Stone.",
new Requirement(Skill.CONSTRUCTION, 50)); new SkillRequirement(Skill.CONSTRUCTION, 50));
add("Collect at least 2 yew roots from the Tree patch in Varrock Palace.", add("Collect at least 2 yew roots from the Tree patch in Varrock Palace.",
new Requirement(Skill.WOODCUTTING, 60), new SkillRequirement(Skill.WOODCUTTING, 60),
new Requirement(Skill.FARMING, 68)); new SkillRequirement(Skill.FARMING, 68));
add("Pray at the altar in Varrock palace with Smite active.", add("Pray at the altar in Varrock palace with Smite active.",
new Requirement(Skill.PRAYER, 52)); new SkillRequirement(Skill.PRAYER, 52));
add("Squeeze through the obstacle pipe in Edgeville dungeon.", add("Squeeze through the obstacle pipe in Edgeville dungeon.",
new Requirement(Skill.AGILITY, 51)); new SkillRequirement(Skill.AGILITY, 51));
// ELITE // ELITE
add("Create a super combat potion in Varrock west bank.", add("Create a super combat potion in Varrock west bank.",
new Requirement(Skill.HERBLORE, 90)); new SkillRequirement(Skill.HERBLORE, 90));
add("Use Lunar magic to make 20 mahogany planks at the Lumberyard.", add("Use Lunar magic to make 20 mahogany planks at the Lumberyard.",
new Requirement(Skill.MAGIC, 86)); new SkillRequirement(Skill.MAGIC, 86));
add("Bake a summer pie in the Cooking Guild.", add("Bake a summer pie in the Cooking Guild.",
new Requirement(Skill.COOKING, 95)); new SkillRequirement(Skill.COOKING, 95));
add("Smith and fletch ten rune darts within Varrock.", add("Smith and fletch ten rune darts within Varrock.",
new Requirement(Skill.SMITHING, 89), new SkillRequirement(Skill.SMITHING, 89),
new Requirement(Skill.FLETCHING, 81)); new SkillRequirement(Skill.FLETCHING, 81));
add("Craft 100 or more earth runes simultaneously.", add("Craft 100 or more earth runes simultaneously.",
new Requirement(Skill.RUNECRAFT, 78)); new SkillRequirement(Skill.RUNECRAFT, 78));
} }
} }

View File

@@ -26,8 +26,9 @@
package net.runelite.client.plugins.achievementdiary.diaries; package net.runelite.client.plugins.achievementdiary.diaries;
import net.runelite.api.Skill; 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.GenericDiaryRequirement;
import net.runelite.client.plugins.achievementdiary.Requirement; import net.runelite.client.plugins.achievementdiary.SkillRequirement;
public class WesternDiaryRequirement extends GenericDiaryRequirement public class WesternDiaryRequirement extends GenericDiaryRequirement
{ {
@@ -35,70 +36,70 @@ public class WesternDiaryRequirement extends GenericDiaryRequirement
{ {
// EASY // EASY
add("Catch a Copper Longtail.", add("Catch a Copper Longtail.",
new Requirement(Skill.HUNTER, 9)); new SkillRequirement(Skill.HUNTER, 9));
add("Complete a novice game of Pest Control.", add("Complete a novice game of Pest Control.",
new Requirement("Combat", 40)); new CombatLevelRequirement(40));
add("Mine some Iron Ore near Piscatoris.", add("Mine some Iron Ore near Piscatoris.",
new Requirement(Skill.MINING, 15)); new SkillRequirement(Skill.MINING, 15));
add("Fletch an Oak shortbow from the Gnome Stronghold.", add("Fletch an Oak shortbow from the Gnome Stronghold.",
new Requirement(Skill.FLETCHING, 20)); new SkillRequirement(Skill.FLETCHING, 20));
// MEDIUM // MEDIUM
add("Take the agility shortcut from the Grand Tree to Otto's Grotto.", add("Take the agility shortcut from the Grand Tree to Otto's Grotto.",
new Requirement(Skill.AGILITY, 37)); new SkillRequirement(Skill.AGILITY, 37));
add("Trap a Spined Larupia.", add("Trap a Spined Larupia.",
new Requirement(Skill.HUNTER, 31)); new SkillRequirement(Skill.HUNTER, 31));
add("Fish some Bass on Ape Atoll.", add("Fish some Bass on Ape Atoll.",
new Requirement(Skill.FISHING, 46)); new SkillRequirement(Skill.FISHING, 46));
add("Chop and burn some teak logs on Ape Atoll.", add("Chop and burn some teak logs on Ape Atoll.",
new Requirement(Skill.WOODCUTTING, 35), new SkillRequirement(Skill.WOODCUTTING, 35),
new Requirement(Skill.FIREMAKING, 35)); new SkillRequirement(Skill.FIREMAKING, 35));
add("Complete an intermediate game of Pest Control.", add("Complete an intermediate game of Pest Control.",
new Requirement("Combat", 70)); new CombatLevelRequirement(70));
add("Make a Chocolate Bomb at the Grand Tree.", add("Make a Chocolate Bomb at the Grand Tree.",
new Requirement(Skill.COOKING, 42)); new SkillRequirement(Skill.COOKING, 42));
add("Complete a delivery for the Gnome Restaurant.", add("Complete a delivery for the Gnome Restaurant.",
new Requirement(Skill.COOKING, 42)); new SkillRequirement(Skill.COOKING, 42));
add("Mine some Gold ore underneath the Grand Tree.", add("Mine some Gold ore underneath the Grand Tree.",
new Requirement(Skill.MINING, 40)); new SkillRequirement(Skill.MINING, 40));
// HARD // HARD
add("Kill an Elf with a Crystal bow.", add("Kill an Elf with a Crystal bow.",
new Requirement(Skill.RANGED, 70), new SkillRequirement(Skill.RANGED, 70),
new Requirement(Skill.AGILITY, 50)); new SkillRequirement(Skill.AGILITY, 50));
add("Catch and cook a Monkfish in Piscatoris.", add("Catch and cook a Monkfish in Piscatoris.",
new Requirement(Skill.FISHING, 62), new SkillRequirement(Skill.FISHING, 62),
new Requirement(Skill.COOKING, 62)); new SkillRequirement(Skill.COOKING, 62));
add("Complete a Veteran game of Pest Control.", add("Complete a Veteran game of Pest Control.",
new Requirement("Combat", 100)); new CombatLevelRequirement(100));
add("Catch a Dashing Kebbit.", add("Catch a Dashing Kebbit.",
new Requirement(Skill.HUNTER, 69)); new SkillRequirement(Skill.HUNTER, 69));
add("Complete a lap of the Ape Atoll agility course.", add("Complete a lap of the Ape Atoll agility course.",
new Requirement(Skill.AGILITY, 48)); new SkillRequirement(Skill.AGILITY, 48));
add("Chop and burn some Mahogany logs on Ape Atoll.", add("Chop and burn some Mahogany logs on Ape Atoll.",
new Requirement(Skill.WOODCUTTING, 50), new SkillRequirement(Skill.WOODCUTTING, 50),
new Requirement(Skill.FIREMAKING, 50)); new SkillRequirement(Skill.FIREMAKING, 50));
add("Mine some Adamantite ore in Tirannwn.", add("Mine some Adamantite ore in Tirannwn.",
new Requirement(Skill.MINING, 70)); new SkillRequirement(Skill.MINING, 70));
add("Check the health of your Palm tree in Lletya.", add("Check the health of your Palm tree in Lletya.",
new Requirement(Skill.FARMING, 68)); new SkillRequirement(Skill.FARMING, 68));
add("Build an Isafdar painting in your POH Quest hall.", add("Build an Isafdar painting in your POH Quest hall.",
new Requirement(Skill.CONSTRUCTION, 65)); new SkillRequirement(Skill.CONSTRUCTION, 65));
add("Teleport to Ape Atoll.", add("Teleport to Ape Atoll.",
new Requirement(Skill.MAGIC, 64)); new SkillRequirement(Skill.MAGIC, 64));
add("Pickpocket a Gnome.", add("Pickpocket a Gnome.",
new Requirement(Skill.THIEVING, 75)); new SkillRequirement(Skill.THIEVING, 75));
// ELITE // ELITE
add("Fletch a Magic Longbow in the Elven lands.", add("Fletch a Magic Longbow in the Elven lands.",
new Requirement(Skill.FLETCHING, 85)); new SkillRequirement(Skill.FLETCHING, 85));
add("Kill the Thermonuclear Smoke devil (Does not require task).", add("Kill the Thermonuclear Smoke devil (Does not require task).",
new Requirement(Skill.SLAYER, 93)); new SkillRequirement(Skill.SLAYER, 93));
add("Have Prissy Scilla protect your Magic tree.", add("Have Prissy Scilla protect your Magic tree.",
new Requirement(Skill.FARMING, 75)); new SkillRequirement(Skill.FARMING, 75));
add("Use the Elven overpass advanced cliffside shortcut.", add("Use the Elven overpass advanced cliffside shortcut.",
new Requirement(Skill.AGILITY, 85)); new SkillRequirement(Skill.AGILITY, 85));
add("Pickpocket an Elf.", add("Pickpocket an Elf.",
new Requirement(Skill.THIEVING, 85)); new SkillRequirement(Skill.THIEVING, 85));
} }
} }

View File

@@ -27,7 +27,8 @@ package net.runelite.client.plugins.achievementdiary.diaries;
import net.runelite.api.Skill; import net.runelite.api.Skill;
import net.runelite.client.plugins.achievementdiary.GenericDiaryRequirement; import net.runelite.client.plugins.achievementdiary.GenericDiaryRequirement;
import net.runelite.client.plugins.achievementdiary.Requirement; import net.runelite.client.plugins.achievementdiary.OrRequirement;
import net.runelite.client.plugins.achievementdiary.SkillRequirement;
public class WildernessDiaryRequirement extends GenericDiaryRequirement public class WildernessDiaryRequirement extends GenericDiaryRequirement
{ {
@@ -35,64 +36,68 @@ public class WildernessDiaryRequirement extends GenericDiaryRequirement
{ {
// EASY // EASY
add("Cast Low Alchemy at the Fountain of Rune.", add("Cast Low Alchemy at the Fountain of Rune.",
new Requirement(Skill.MAGIC, 21)); new SkillRequirement(Skill.MAGIC, 21));
add("Kill an Earth Warrior in the Wilderness beneath Edgeville.", add("Kill an Earth Warrior in the Wilderness beneath Edgeville.",
new Requirement(Skill.AGILITY, 15)); new SkillRequirement(Skill.AGILITY, 15));
add("Mine some Iron ore in the Wilderness.", add("Mine some Iron ore in the Wilderness.",
new Requirement(Skill.MINING, 15)); new SkillRequirement(Skill.MINING, 15));
// MEDIUM // MEDIUM
add("Mine some Mithril ore in the wilderness.", add("Mine some Mithril ore in the wilderness.",
new Requirement(Skill.MINING, 55)); new SkillRequirement(Skill.MINING, 55));
add("Chop some yew logs from a fallen Ent.", add("Chop some yew logs from a fallen Ent.",
new Requirement(Skill.WOODCUTTING, 61)); new SkillRequirement(Skill.WOODCUTTING, 61));
add("Enter the Wilderness Godwars Dungeon.", add("Enter the Wilderness Godwars Dungeon.",
new Requirement(Skill.AGILITY, 60, new OrRequirement(
new Requirement(Skill.STRENGTH, 60)) new SkillRequirement(Skill.AGILITY, 60),
new SkillRequirement(Skill.STRENGTH, 60)
)
); );
add("Complete a lap of the Wilderness Agility course.", add("Complete a lap of the Wilderness Agility course.",
new Requirement(Skill.AGILITY, 52)); new SkillRequirement(Skill.AGILITY, 52));
add("Charge an Earth Orb.", add("Charge an Earth Orb.",
new Requirement(Skill.MAGIC, 60)); new SkillRequirement(Skill.MAGIC, 60));
add("Kill a Bloodveld in the Wilderness Godwars Dungeon.", add("Kill a Bloodveld in the Wilderness Godwars Dungeon.",
new Requirement(Skill.SLAYER, 50)); new SkillRequirement(Skill.SLAYER, 50));
add("Smith a Golden helmet in the Resource Area.", add("Smith a Golden helmet in the Resource Area.",
new Requirement(Skill.SMITHING, 50)); new SkillRequirement(Skill.SMITHING, 50));
// HARD // HARD
add("Cast one of the 3 God spells against another player in the Wilderness.", add("Cast one of the 3 God spells against another player in the Wilderness.",
new Requirement(Skill.MAGIC, 60)); new SkillRequirement(Skill.MAGIC, 60));
add("Charge an Air Orb.", add("Charge an Air Orb.",
new Requirement(Skill.MAGIC, 66)); new SkillRequirement(Skill.MAGIC, 66));
add("Catch a Black Salamander in the Wilderness.", add("Catch a Black Salamander in the Wilderness.",
new Requirement(Skill.HUNTER, 67)); new SkillRequirement(Skill.HUNTER, 67));
add("Smith an Adamant scimitar in the Resource Area.", add("Smith an Adamant scimitar in the Resource Area.",
new Requirement(Skill.SMITHING, 75)); new SkillRequirement(Skill.SMITHING, 75));
add("Take the agility shortcut from Trollheim into the Wilderness.", add("Take the agility shortcut from Trollheim into the Wilderness.",
new Requirement(Skill.AGILITY, 64)); new SkillRequirement(Skill.AGILITY, 64));
add("Kill a Spiritual warrior in the Wilderness Godwars Dungeon.", add("Kill a Spiritual warrior in the Wilderness Godwars Dungeon.",
new Requirement(Skill.SLAYER, 68)); new SkillRequirement(Skill.SLAYER, 68));
add("Fish some Raw Lava Eel in the Wilderness.", add("Fish some Raw Lava Eel in the Wilderness.",
new Requirement(Skill.FISHING, 53)); new SkillRequirement(Skill.FISHING, 53));
// ELITE // ELITE
add("Teleport to Ghorrock.", add("Teleport to Ghorrock.",
new Requirement(Skill.MAGIC, 96)); new SkillRequirement(Skill.MAGIC, 96));
add("Fish and Cook a Dark Crab in the Resource Area.", add("Fish and Cook a Dark Crab in the Resource Area.",
new Requirement(Skill.FISHING, 85), new SkillRequirement(Skill.FISHING, 85),
new Requirement(Skill.COOKING, 90)); new SkillRequirement(Skill.COOKING, 90));
add("Smith a rune scimitar from scratch in the Resource Area.", add("Smith a rune scimitar from scratch in the Resource Area.",
new Requirement(Skill.MINING, 85), new SkillRequirement(Skill.MINING, 85),
new Requirement(Skill.SMITHING, 90)); new SkillRequirement(Skill.SMITHING, 90));
add("Steal from the Rogues' chest.", add("Steal from the Rogues' chest.",
new Requirement(Skill.THIEVING, 84)); new SkillRequirement(Skill.THIEVING, 84));
add("Slay a spiritual mage inside the wilderness Godwars Dungeon.", add("Slay a spiritual mage inside the wilderness Godwars Dungeon.",
new Requirement(Skill.SLAYER, 83), new SkillRequirement(Skill.SLAYER, 83),
new Requirement(Skill.AGILITY, 60, new OrRequirement(
new Requirement(Skill.STRENGTH, 60)) new SkillRequirement(Skill.AGILITY, 60),
new SkillRequirement(Skill.STRENGTH, 60)
)
); );
add("Cut and burn some magic logs in the Resource Area.", add("Cut and burn some magic logs in the Resource Area.",
new Requirement(Skill.WOODCUTTING, 75), new SkillRequirement(Skill.WOODCUTTING, 75),
new Requirement(Skill.FIREMAKING, 75)); new SkillRequirement(Skill.FIREMAKING, 75));
} }
} }