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 ed253026ba..6f27f9f5b1 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 @@ -126,7 +126,7 @@ public class WesternDiaryRequirement extends GenericDiaryRequirement new QuestRequirement(Quest.TREE_GNOME_VILLAGE)); // ELITE - add("Fletch a Magic Longbow in the Elven lands.", + add("Fletch a Magic Longbow in Tirannwn.", new SkillRequirement(Skill.FLETCHING, 85), new QuestRequirement(Quest.MOURNINGS_END_PART_I)); add("Kill the Thermonuclear Smoke devil (Does not require task).", diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsConfig.java index 8443994243..77642e72ac 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsConfig.java @@ -38,15 +38,23 @@ public interface BoostsConfig extends Config NEVER } + enum DisplayBoosts + { + NONE, + COMBAT, + NON_COMBAT, + BOTH + } + @ConfigItem( - keyName = "enableSkill", - name = "Enable Skill Boosts", - description = "Configures whether or not to display skill boost information", + keyName = "displayBoosts", + name = "Display Boosts", + description = "Configures which skill boosts to display", position = 1 ) - default boolean enableSkill() + default DisplayBoosts displayBoosts() { - return true; + return DisplayBoosts.BOTH; } @ConfigItem( diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsPlugin.java index 04f6c5d71c..6e4919c62e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsPlugin.java @@ -332,16 +332,26 @@ public class BoostsPlugin extends Plugin private void updateShownSkills() { + switch (config.displayBoosts()) if (this.enableSkill) { - shownSkills.addAll(BOOSTABLE_NON_COMBAT_SKILLS); + case NONE: + shownSkills.removeAll(BOOSTABLE_COMBAT_SKILLS); + shownSkills.removeAll(BOOSTABLE_NON_COMBAT_SKILLS); + break; + case COMBAT: + shownSkills.addAll(BOOSTABLE_COMBAT_SKILLS); + shownSkills.removeAll(BOOSTABLE_NON_COMBAT_SKILLS); + break; + case NON_COMBAT: + shownSkills.removeAll(BOOSTABLE_COMBAT_SKILLS); + shownSkills.addAll(BOOSTABLE_NON_COMBAT_SKILLS); + break; + case BOTH: + shownSkills.addAll(BOOSTABLE_COMBAT_SKILLS); + shownSkills.addAll(BOOSTABLE_NON_COMBAT_SKILLS); + break; } - else - { - shownSkills.removeAll(BOOSTABLE_NON_COMBAT_SKILLS); - } - - shownSkills.addAll(BOOSTABLE_COMBAT_SKILLS); } private void updateBoostedStats() diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/deathindicator/DeathIndicatorPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/deathindicator/DeathIndicatorPlugin.java index 5a56dad3b2..194500c4cc 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/deathindicator/DeathIndicatorPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/deathindicator/DeathIndicatorPlugin.java @@ -65,7 +65,9 @@ public class DeathIndicatorPlugin extends Plugin 12850, // Lumbridge 11828, // Falador 12342, // Edgeville - 11062 // Camelot + 11062, // Camelot + 13150, // Prifddinas (it's possible to spawn in 2 adjacent regions) + 12894 // Prifddinas ); @Inject diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java index 9a8087ce1d..0ff9afb80a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java @@ -308,7 +308,11 @@ public class ExaminePlugin extends Plugin return new int[]{widgetItem.getItemQuantity(), widgetItem.getItemId()}; } } - else if (WidgetInfo.BANK_ITEM_CONTAINER.getGroupId() == widgetGroup) + else if (WidgetInfo.BANK_ITEM_CONTAINER.getGroupId() == widgetGroup + || WidgetInfo.CLUE_SCROLL_REWARD_ITEM_CONTAINER.getGroupId() == widgetGroup + || WidgetInfo.LOOTING_BAG_CONTAINER.getGroupId() == widgetGroup + || WidgetID.SEED_VAULT_INVENTORY_GROUP_ID == widgetGroup + || WidgetID.SEED_BOX_GROUP_ID == widgetGroup) { Widget[] children = widget.getDynamicChildren(); if (actionParam < children.length) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/FixedPriceItem.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/FixedPriceItem.java index aae7d1694b..ba5a1e08f5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/FixedPriceItem.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/FixedPriceItem.java @@ -94,6 +94,8 @@ enum FixedPriceItem ROGUE_GLOVES(ItemID.ROGUE_GLOVES, 650), ROGUE_BOOTS(ItemID.ROGUE_BOOTS, 650), + SALVE_AMULET_EI(ItemID.SALVE_AMULETEI, 209900), + RING_OF_WEALTH_1(ItemID.RING_OF_WEALTH_1, 500, ItemID.RING_OF_WEALTH), RING_OF_WEALTH_2(ItemID.RING_OF_WEALTH_2, 1000, ItemID.RING_OF_WEALTH), RING_OF_WEALTH_3(ItemID.RING_OF_WEALTH_3, 1500, ItemID.RING_OF_WEALTH), diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/itemskeptondeath/ItemsKeptOnDeathPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/itemskeptondeath/ItemsKeptOnDeathPluginTest.java index b34298fe63..2b5f812595 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/itemskeptondeath/ItemsKeptOnDeathPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/itemskeptondeath/ItemsKeptOnDeathPluginTest.java @@ -159,6 +159,9 @@ public class ItemsKeptOnDeathPluginTest final Item brace = mItem(ItemID.COMBAT_BRACELET1, 1, "Combat bracelet(1)", true, 0); final int braceletOffset = FixedPriceItem.COMBAT_BRACELET1.getOffset(); assertEquals(13500 + braceletOffset, plugin.getDeathPrice(brace)); + + final Item amulet = mItem(ItemID.SALVE_AMULETEI, 1, "Salve Amulet(ei)", false, 300); + assertEquals(210200, plugin.getDeathPrice(amulet)); } @Test