From 98ba8166a670c3012b82914fbedacf5d78f12aae Mon Sep 17 00:00:00 2001 From: Kerpackie <81828282+Kerpackie@users.noreply.github.com> Date: Sat, 18 Sep 2021 23:39:49 +0100 Subject: [PATCH] Update Quest Reward (M) --- .../MakingFriendsWithMyArm.java | 29 ++++++++++++++ .../quests/makinghistory/MakingHistory.java | 31 ++++++++++++-- .../quests/merlinscrystal/MerlinsCrystal.java | 14 +++++++ .../misthalinmystery/MisthalinMystery.java | 30 ++++++++++++-- .../quests/monkeymadnessi/MonkeyMadnessI.java | 26 ++++++++++++ .../monkeymadnessii/MonkeyMadnessII.java | 40 +++++++++++++++++++ .../quests/monksfriend/MonksFriend.java | 22 ++++++++++ .../mountaindaughter/MountainDaughter.java | 30 ++++++++++++++ .../mourningsendparti/MourningsEndPartI.java | 31 ++++++++++++++ .../MourningsEndPartII.java | 32 +++++++++++++++ .../quests/murdermystery/MurderMystery.java | 27 +++++++++++-- .../MyArmsBigAdventure.java | 31 +++++++++++--- 12 files changed, 326 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/questhelper/quests/makingfriendswithmyarm/MakingFriendsWithMyArm.java b/src/main/java/com/questhelper/quests/makingfriendswithmyarm/MakingFriendsWithMyArm.java index 35682febfa..f0edb25d3b 100644 --- a/src/main/java/com/questhelper/quests/makingfriendswithmyarm/MakingFriendsWithMyArm.java +++ b/src/main/java/com/questhelper/quests/makingfriendswithmyarm/MakingFriendsWithMyArm.java @@ -43,6 +43,9 @@ import com.questhelper.requirements.conditional.ObjectCondition; import com.questhelper.requirements.util.LogicType; import com.questhelper.requirements.util.Operation; +import com.questhelper.rewards.ExperienceReward; +import com.questhelper.rewards.QuestPointReward; +import com.questhelper.rewards.UnlockReward; import com.questhelper.steps.ConditionalStep; import com.questhelper.steps.DetailedQuestStep; import com.questhelper.steps.ItemStep; @@ -590,6 +593,32 @@ public List getCombatRequirements() return Arrays.asList("Don't Know What (level 163)", "Mother (level 198)"); } + @Override + public QuestPointReward getQuestPointReward() + { + return new QuestPointReward(2); + } + + @Override + public List getExperienceRewards() + { + return Arrays.asList( + new ExperienceReward(Skill.CONSTRUCTION, 2000), + new ExperienceReward(Skill.FIREMAKING, 5000), + new ExperienceReward(Skill.MINING, 10000), + new ExperienceReward(Skill.AGILITY, 10000)); + } + + @Override + public List getUnlockRewards() + { + return Arrays.asList( + new UnlockReward("Access to the Salt Mines."), + new UnlockReward("Ability to build fire pits"), + new UnlockReward("Ability to tune a house portal to Troll Stronghold."), + new UnlockReward("Access to a disease free herb patch in Weis.")); + } + @Override public List getPanels() { diff --git a/src/main/java/com/questhelper/quests/makinghistory/MakingHistory.java b/src/main/java/com/questhelper/quests/makinghistory/MakingHistory.java index 2391240fc7..da5ab8a7e1 100644 --- a/src/main/java/com/questhelper/quests/makinghistory/MakingHistory.java +++ b/src/main/java/com/questhelper/quests/makinghistory/MakingHistory.java @@ -37,6 +37,9 @@ import com.questhelper.requirements.var.VarbitRequirement; import com.questhelper.requirements.ZoneRequirement; import com.questhelper.requirements.util.ComplexRequirementBuilder; +import com.questhelper.rewards.ExperienceReward; +import com.questhelper.rewards.ItemReward; +import com.questhelper.rewards.QuestPointReward; import com.questhelper.steps.DetailedQuestStep; import com.questhelper.steps.DigStep; import com.questhelper.requirements.conditional.Conditions; @@ -52,10 +55,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import net.runelite.api.ItemID; -import net.runelite.api.NpcID; -import net.runelite.api.ObjectID; -import net.runelite.api.QuestState; + +import net.runelite.api.*; import net.runelite.api.coords.WorldPoint; @QuestDescriptor( @@ -268,6 +269,28 @@ public List getItemRecommended() return reqs; } + @Override + public QuestPointReward getQuestPointReward() + { + return new QuestPointReward(3); + } + + @Override + public List getExperienceRewards() + { + return Arrays.asList( + new ExperienceReward(Skill.CRAFTING, 1000), + new ExperienceReward(Skill.PRAYER, 1000)); + } + + @Override + public List getItemRewards() + { + return Arrays.asList( + new ItemReward("750 Coins", ItemID.COINS_995, 750), + new ItemReward("An Enchanted Key", ItemID.ENCHANTED_KEY, 1)); + } + @Override public List getPanels() { diff --git a/src/main/java/com/questhelper/quests/merlinscrystal/MerlinsCrystal.java b/src/main/java/com/questhelper/quests/merlinscrystal/MerlinsCrystal.java index a937840543..2b584cee8a 100644 --- a/src/main/java/com/questhelper/quests/merlinscrystal/MerlinsCrystal.java +++ b/src/main/java/com/questhelper/quests/merlinscrystal/MerlinsCrystal.java @@ -38,6 +38,8 @@ import com.questhelper.requirements.conditional.ObjectCondition; import com.questhelper.requirements.WidgetTextRequirement; import com.questhelper.requirements.util.LogicType; +import com.questhelper.rewards.ItemReward; +import com.questhelper.rewards.QuestPointReward; import com.questhelper.steps.ConditionalStep; import com.questhelper.steps.DetailedQuestStep; import com.questhelper.steps.NpcStep; @@ -304,6 +306,18 @@ public List getItemRecommended() return reqs; } + @Override + public QuestPointReward getQuestPointReward() + { + return new QuestPointReward(6); + } + + @Override + public List getItemRewards() + { + return Collections.singletonList(new ItemReward("Excalibur", ItemID.EXCALIBUR, 1)); + } + @Override public List getPanels() { diff --git a/src/main/java/com/questhelper/quests/misthalinmystery/MisthalinMystery.java b/src/main/java/com/questhelper/quests/misthalinmystery/MisthalinMystery.java index f777df5c60..34a60463e7 100644 --- a/src/main/java/com/questhelper/quests/misthalinmystery/MisthalinMystery.java +++ b/src/main/java/com/questhelper/quests/misthalinmystery/MisthalinMystery.java @@ -36,6 +36,9 @@ import com.questhelper.requirements.conditional.Conditions; import com.questhelper.requirements.WidgetTextRequirement; import com.questhelper.requirements.util.Operation; +import com.questhelper.rewards.ExperienceReward; +import com.questhelper.rewards.ItemReward; +import com.questhelper.rewards.QuestPointReward; import com.questhelper.steps.ConditionalStep; import com.questhelper.steps.DetailedQuestStep; import com.questhelper.steps.NpcStep; @@ -48,10 +51,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import net.runelite.api.ItemID; -import net.runelite.api.NpcID; -import net.runelite.api.NullObjectID; -import net.runelite.api.ObjectID; + +import net.runelite.api.*; import net.runelite.api.coords.WorldPoint; @QuestDescriptor( @@ -365,6 +366,27 @@ public void setupSteps() "Talk to Mandy just outside the manor to complete the quest."); } + @Override + public QuestPointReward getQuestPointReward() + { + return new QuestPointReward(1); + } + + @Override + public List getExperienceRewards() + { + return Collections.singletonList(new ExperienceReward(Skill.CRAFTING, 600)); + } + + @Override + public List getItemRewards() + { + return Arrays.asList( + new ItemReward("Uncut Ruby", ItemID.UNCUT_RUBY, 1), + new ItemReward("Uncut Emerald", ItemID.UNCUT_EMERALD, 1), + new ItemReward("Uncut Sapphire", ItemID.UNCUT_SAPPHIRE, 1)); + } + @Override public List getPanels() { diff --git a/src/main/java/com/questhelper/quests/monkeymadnessi/MonkeyMadnessI.java b/src/main/java/com/questhelper/quests/monkeymadnessi/MonkeyMadnessI.java index 8b5183f166..9f0ab7655b 100644 --- a/src/main/java/com/questhelper/quests/monkeymadnessi/MonkeyMadnessI.java +++ b/src/main/java/com/questhelper/quests/monkeymadnessi/MonkeyMadnessI.java @@ -40,6 +40,9 @@ import com.questhelper.requirements.WidgetTextRequirement; import com.questhelper.requirements.util.LogicType; import com.questhelper.requirements.util.Operation; +import com.questhelper.rewards.ItemReward; +import com.questhelper.rewards.QuestPointReward; +import com.questhelper.rewards.UnlockReward; import com.questhelper.steps.ConditionalStep; import com.questhelper.steps.DetailedQuestStep; import com.questhelper.steps.NpcStep; @@ -726,6 +729,29 @@ public List getGeneralRequirements() return req; } + @Override + public QuestPointReward getQuestPointReward() + { + return new QuestPointReward(3); + } + + @Override + public List getItemRewards() + { + return Arrays.asList( + new ItemReward("55,000 Experience Combat Lamp (Over multiple Skills)", ItemID.ANTIQUE_LAMP, 1), //4447 is placeholder for filter + new ItemReward("10,000 Coins", ItemID.COINS_995, 10000), + new ItemReward("3 Diamonds", ItemID.DIAMOND, 3)); + } + + @Override + public List getUnlockRewards() + { + return Arrays.asList( + new UnlockReward("Ability to purchase and wield the Dragon Scimitar."), + new UnlockReward("Full access to Ape Atoll.")); + } + @Override public List getPanels() { diff --git a/src/main/java/com/questhelper/quests/monkeymadnessii/MonkeyMadnessII.java b/src/main/java/com/questhelper/quests/monkeymadnessii/MonkeyMadnessII.java index 76e0b36494..bf77ea64b9 100644 --- a/src/main/java/com/questhelper/quests/monkeymadnessii/MonkeyMadnessII.java +++ b/src/main/java/com/questhelper/quests/monkeymadnessii/MonkeyMadnessII.java @@ -50,6 +50,10 @@ import com.questhelper.requirements.WidgetTextRequirement; import com.questhelper.requirements.util.LogicType; import com.questhelper.requirements.util.Operation; +import com.questhelper.rewards.ExperienceReward; +import com.questhelper.rewards.ItemReward; +import com.questhelper.rewards.QuestPointReward; +import com.questhelper.rewards.UnlockReward; import com.questhelper.steps.ConditionalStep; import com.questhelper.steps.DetailedQuestStep; import com.questhelper.steps.ItemStep; @@ -666,6 +670,42 @@ public List getCombatRequirements() return Arrays.asList("Kruk (level 149, flinchable)", "Keef (level 178, safespottable)", "Kob (level 185, safespottable)", "9 Tortured gorillas (level 141)", "2 Demonic Gorillas (level 275)", "Glough (level 378)"); } + @Override + public QuestPointReward getQuestPointReward() + { + return new QuestPointReward(4); + } + + @Override + public List getExperienceRewards() + { + return Arrays.asList( + new ExperienceReward(Skill.SLAYER, 25000), + new ExperienceReward(Skill.AGILITY, 20000), + new ExperienceReward(Skill.THIEVING, 15000), + new ExperienceReward(Skill.HUNTER, 15000)); + } + + @Override + public List getItemRewards() + { + return Arrays.asList( + new ItemReward("2 x 50,000 Experience Lamps (Any Combat Skill)", ItemID.ANTIQUE_LAMP, 2), //4447 is placeholder for filter + new ItemReward("A Royal Seed Pod", ItemID.ROYAL_SEED_POD, 1), + new ItemReward("A pet monkey", ItemID.MONKEY_19556, 1)); + } + + @Override + public List getUnlockRewards() + { + return Arrays.asList( + new UnlockReward("Access to Demonic Gorillas"), + new UnlockReward("A new Gnome Glider location"), + new UnlockReward("Access to a bank on Ape Atoll"), + new UnlockReward("Ability to wield the Heavy Ballista"), + new UnlockReward("Access to Maniacal Monkey hunting area")); + } + @Override public List getPanels() { diff --git a/src/main/java/com/questhelper/quests/monksfriend/MonksFriend.java b/src/main/java/com/questhelper/quests/monksfriend/MonksFriend.java index 70d202711b..fbee7fca08 100644 --- a/src/main/java/com/questhelper/quests/monksfriend/MonksFriend.java +++ b/src/main/java/com/questhelper/quests/monksfriend/MonksFriend.java @@ -33,6 +33,9 @@ import com.questhelper.requirements.Requirement; import com.questhelper.requirements.ZoneRequirement; import com.questhelper.requirements.conditional.Conditions; +import com.questhelper.rewards.ExperienceReward; +import com.questhelper.rewards.ItemReward; +import com.questhelper.rewards.QuestPointReward; import com.questhelper.steps.ConditionalStep; import com.questhelper.steps.DetailedQuestStep; import com.questhelper.steps.NpcStep; @@ -47,6 +50,7 @@ import net.runelite.api.ItemID; import net.runelite.api.NpcID; import net.runelite.api.ObjectID; +import net.runelite.api.Skill; import net.runelite.api.coords.WorldPoint; @QuestDescriptor( @@ -153,6 +157,24 @@ public List getItemRecommended() return reqs; } + @Override + public QuestPointReward getQuestPointReward() + { + return new QuestPointReward(1); + } + + @Override + public List getExperienceRewards() + { + return Collections.singletonList(new ExperienceReward(Skill.WOODCUTTING, 2000)); + } + + @Override + public List getItemRewards() + { + return Collections.singletonList(new ItemReward("8 Law Runes", ItemID.LAW_RUNE, 8)); + } + @Override public List getPanels() { diff --git a/src/main/java/com/questhelper/quests/mountaindaughter/MountainDaughter.java b/src/main/java/com/questhelper/quests/mountaindaughter/MountainDaughter.java index 7006f6649e..4e9485a253 100644 --- a/src/main/java/com/questhelper/quests/mountaindaughter/MountainDaughter.java +++ b/src/main/java/com/questhelper/quests/mountaindaughter/MountainDaughter.java @@ -39,6 +39,10 @@ import com.questhelper.requirements.ZoneRequirement; import com.questhelper.requirements.conditional.Conditions; import com.questhelper.requirements.util.Operation; +import com.questhelper.rewards.ExperienceReward; +import com.questhelper.rewards.ItemReward; +import com.questhelper.rewards.QuestPointReward; +import com.questhelper.rewards.UnlockReward; import com.questhelper.steps.ConditionalStep; import com.questhelper.steps.DetailedQuestStep; import com.questhelper.steps.NpcStep; @@ -398,6 +402,32 @@ public List getGeneralRequirements() return Collections.singletonList(new SkillRequirement(Skill.AGILITY, 20, true)); } + @Override + public QuestPointReward getQuestPointReward() + { + return new QuestPointReward(2); + } + + @Override + public List getExperienceRewards() + { + return Arrays.asList( + new ExperienceReward(Skill.ATTACK, 1000), + new ExperienceReward(Skill.PRAYER, 2000)); + } + + @Override + public List getItemRewards() + { + return Collections.singletonList(new ItemReward("A Bearhead", ItemID.BEARHEAD, 1)); + } + + @Override + public List getUnlockRewards() + { + return Collections.singletonList(new UnlockReward("Access to the Mountain Camp")); + } + @Override public List getPanels() { diff --git a/src/main/java/com/questhelper/quests/mourningsendparti/MourningsEndPartI.java b/src/main/java/com/questhelper/quests/mourningsendparti/MourningsEndPartI.java index b13aec9c7e..a0e1bba67d 100644 --- a/src/main/java/com/questhelper/quests/mourningsendparti/MourningsEndPartI.java +++ b/src/main/java/com/questhelper/quests/mourningsendparti/MourningsEndPartI.java @@ -32,6 +32,10 @@ import com.questhelper.requirements.item.ItemOnTileRequirement; import com.questhelper.requirements.var.VarbitRequirement; import com.questhelper.requirements.ZoneRequirement; +import com.questhelper.rewards.ExperienceReward; +import com.questhelper.rewards.ItemReward; +import com.questhelper.rewards.QuestPointReward; +import com.questhelper.rewards.UnlockReward; import com.questhelper.steps.ConditionalStep; import com.questhelper.steps.DetailedQuestStep; import com.questhelper.steps.ObjectStep; @@ -455,6 +459,33 @@ public List getGeneralRequirements() return req; } + @Override + public QuestPointReward getQuestPointReward() + { + return new QuestPointReward(2); + } + + @Override + public List getExperienceRewards() + { + return Arrays.asList( + new ExperienceReward(Skill.THIEVING, 25000), + new ExperienceReward(Skill.HITPOINTS, 25000)); + } + + @Override + public List getItemRewards() + { + return Collections.singletonList(new ItemReward("Elven Teleport Crystal", ItemID.TELEPORT_CRYSTAL_4, 1)); + } + + @Override + public List getUnlockRewards() + { + return Collections.singletonList(new UnlockReward("Access to the Mourner HQ")); + } + + @Override public List getPanels() { diff --git a/src/main/java/com/questhelper/quests/mourningsendpartii/MourningsEndPartII.java b/src/main/java/com/questhelper/quests/mourningsendpartii/MourningsEndPartII.java index 86ab68b4e7..c296b7f3cc 100644 --- a/src/main/java/com/questhelper/quests/mourningsendpartii/MourningsEndPartII.java +++ b/src/main/java/com/questhelper/quests/mourningsendpartii/MourningsEndPartII.java @@ -40,6 +40,10 @@ import com.questhelper.requirements.item.ItemRequirements; import com.questhelper.requirements.util.LogicType; import com.questhelper.requirements.util.Operation; +import com.questhelper.rewards.ExperienceReward; +import com.questhelper.rewards.ItemReward; +import com.questhelper.rewards.QuestPointReward; +import com.questhelper.rewards.UnlockReward; import com.questhelper.steps.ConditionalStep; import com.questhelper.steps.DetailedQuestStep; import com.questhelper.steps.NpcStep; @@ -1003,6 +1007,34 @@ public List getGeneralRequirements() return req; } + @Override + public QuestPointReward getQuestPointReward() + { + return new QuestPointReward(2); + } + + @Override + public List getExperienceRewards() + { + return Collections.singletonList(new ExperienceReward(Skill.AGILITY, 20000)); + } + + @Override + public List getItemRewards() + { + return Arrays.asList( + new ItemReward("A Crystal Trinket", ItemID.CRYSTAL_TRINKET, 1), + new ItemReward("A Death Talisman", ItemID.DEATH_TALISMAN, 1)); + } + + @Override + public List getUnlockRewards() + { + return Arrays.asList( + new UnlockReward("Ability to craft Death Runes."), + new UnlockReward("Ability kill Dark Beasts and receive them as a slayer task.")); + } + @Override public List getPanels() { diff --git a/src/main/java/com/questhelper/quests/murdermystery/MurderMystery.java b/src/main/java/com/questhelper/quests/murdermystery/MurderMystery.java index c05f1ea5c3..46867f86e0 100644 --- a/src/main/java/com/questhelper/quests/murdermystery/MurderMystery.java +++ b/src/main/java/com/questhelper/quests/murdermystery/MurderMystery.java @@ -34,10 +34,11 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import net.runelite.api.ItemID; -import net.runelite.api.NpcID; -import net.runelite.api.NullObjectID; -import net.runelite.api.ObjectID; + +import com.questhelper.rewards.ExperienceReward; +import com.questhelper.rewards.ItemReward; +import com.questhelper.rewards.QuestPointReward; +import net.runelite.api.*; import net.runelite.api.coords.WorldPoint; import com.questhelper.requirements.item.ItemRequirement; import com.questhelper.QuestDescriptor; @@ -280,6 +281,24 @@ public List getItemRequirements() return required; } + @Override + public QuestPointReward getQuestPointReward() + { + return new QuestPointReward(3); + } + + @Override + public List getExperienceRewards() + { + return Collections.singletonList(new ExperienceReward(Skill.CRAFTING, 1406)); + } + + @Override + public List getItemRewards() + { + return Collections.singletonList(new ItemReward("2,000 Coins", ItemID.COINS_995, 2000)); + } + @Override public List getPanels() { diff --git a/src/main/java/com/questhelper/quests/myarmsbigadventure/MyArmsBigAdventure.java b/src/main/java/com/questhelper/quests/myarmsbigadventure/MyArmsBigAdventure.java index b2dc0f08ee..53c522c3f5 100644 --- a/src/main/java/com/questhelper/quests/myarmsbigadventure/MyArmsBigAdventure.java +++ b/src/main/java/com/questhelper/quests/myarmsbigadventure/MyArmsBigAdventure.java @@ -41,17 +41,18 @@ import com.questhelper.requirements.conditional.Conditions; import com.questhelper.requirements.conditional.NpcCondition; import com.questhelper.requirements.util.Operation; +import com.questhelper.rewards.ExperienceReward; +import com.questhelper.rewards.QuestPointReward; +import com.questhelper.rewards.UnlockReward; import com.questhelper.steps.ConditionalStep; import com.questhelper.steps.DetailedQuestStep; import com.questhelper.steps.ItemStep; import com.questhelper.steps.NpcStep; import com.questhelper.steps.ObjectStep; import com.questhelper.steps.QuestStep; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; + +import java.util.*; + import net.runelite.api.ItemID; import net.runelite.api.NpcID; import net.runelite.api.ObjectID; @@ -470,6 +471,26 @@ public List getGeneralRequirements() return req; } + @Override + public QuestPointReward getQuestPointReward() + { + return new QuestPointReward(1); + } + + @Override + public List getExperienceRewards() + { + return Arrays.asList( + new ExperienceReward(Skill.HERBLORE, 10000), + new ExperienceReward(Skill.FARMING, 5000)); + } + + @Override + public List getUnlockRewards() + { + return Collections.singletonList(new UnlockReward("Access to a disease-free herb patch on top of the Troll Stronghold.")); + } + @Override public List getPanels() {