From 67fa6ea7b0c733cae0b7f25d6d681da568f15124 Mon Sep 17 00:00:00 2001 From: TheStonedTurtle Date: Sun, 25 Aug 2019 17:20:30 -0700 Subject: [PATCH 1/7] ItemsKeptOnDeath - Add missing salve (ei) price offset --- .../client/plugins/itemskeptondeath/FixedPriceItem.java | 2 ++ .../plugins/itemskeptondeath/ItemsKeptOnDeathPluginTest.java | 3 +++ 2 files changed, 5 insertions(+) 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 74120a47d6..4aa806616b 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 19ffc8f9a8..67a6e428e0 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 From e2e06952bd0ee43274c00ad13c1b397ffb4e8d17 Mon Sep 17 00:00:00 2001 From: Daniel Bolink Date: Mon, 26 Aug 2019 10:36:53 -0700 Subject: [PATCH 2/7] Update Western Provinces Diary Step after SOTE update --- .../achievementdiary/diaries/WesternDiaryRequirement.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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).", From fcc5b79aea0c2a688a1801646f61a7381165b256 Mon Sep 17 00:00:00 2001 From: Hydrox6 Date: Tue, 27 Aug 2019 15:55:43 +0100 Subject: [PATCH 3/7] death indicator: add prifddinas --- .../client/plugins/deathindicator/DeathIndicatorPlugin.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 34bb399c2f..773a6ea6e6 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 @@ -63,7 +63,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 From 10c5be4487fb707e53c8828d398cdb118ed5d848 Mon Sep 17 00:00:00 2001 From: Adam Date: Wed, 28 Aug 2019 08:36:03 -0400 Subject: [PATCH 4/7] examine plugin: combine identical widget cases --- .../client/plugins/examine/ExaminePlugin.java | 32 +++---------------- 1 file changed, 4 insertions(+), 28 deletions(-) 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 1383403d20..0a1fff13d6 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 @@ -282,7 +282,10 @@ 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) { Widget[] children = widget.getDynamicChildren(); if (actionParam < children.length) @@ -300,24 +303,6 @@ public class ExaminePlugin extends Plugin return new int[]{1, widgetItem.getItemId()}; } } - else if (WidgetInfo.CLUE_SCROLL_REWARD_ITEM_CONTAINER.getGroupId() == widgetGroup) - { - Widget[] children = widget.getDynamicChildren(); - if (actionParam < children.length) - { - Widget widgetItem = children[actionParam]; - return new int[]{widgetItem.getItemQuantity(), widgetItem.getItemId()}; - } - } - else if (WidgetInfo.LOOTING_BAG_CONTAINER.getGroupId() == widgetGroup) - { - Widget[] children = widget.getDynamicChildren(); - if (actionParam < children.length) - { - Widget widgetItem = children[actionParam]; - return new int[]{widgetItem.getItemQuantity(), widgetItem.getItemId()}; - } - } else if (WidgetID.SEED_VAULT_GROUP_ID == widgetGroup) { Widget[] children = client.getWidget(SEED_VAULT_ITEM_CONTAINER).getDynamicChildren(); @@ -327,15 +312,6 @@ public class ExaminePlugin extends Plugin return new int[]{widgetItem.getItemQuantity(), widgetItem.getItemId()}; } } - else if (WidgetID.SEED_VAULT_INVENTORY_GROUP_ID == widgetGroup) - { - Widget[] children = widget.getDynamicChildren(); - if (actionParam < children.length) - { - Widget widgetItem = children[actionParam]; - return new int[]{widgetItem.getItemQuantity(), widgetItem.getItemId()}; - } - } return null; } From a93cb5f47183f4414bf765cfa0f8291d1220b536 Mon Sep 17 00:00:00 2001 From: Adam Date: Wed, 28 Aug 2019 08:51:22 -0400 Subject: [PATCH 5/7] examine plugin: add seed box --- .../net/runelite/client/plugins/examine/ExaminePlugin.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 0a1fff13d6..33cc9deb90 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 @@ -57,6 +57,7 @@ import net.runelite.client.game.ItemManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.util.StackFormatter; +import net.runelite.client.util.Text; import net.runelite.http.api.examine.ExamineClient; /** @@ -104,7 +105,7 @@ public class ExaminePlugin extends Plugin @Subscribe public void onMenuOptionClicked(MenuOptionClicked event) { - if (!event.getMenuOption().equals("Examine")) + if (!Text.removeTags(event.getMenuOption()).equals("Examine")) { return; } @@ -285,7 +286,8 @@ public class ExaminePlugin extends Plugin 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_VAULT_INVENTORY_GROUP_ID == widgetGroup + || WidgetID.SEED_BOX_GROUP_ID == widgetGroup) { Widget[] children = widget.getDynamicChildren(); if (actionParam < children.length) From 596100fbeb1bb2e0d79ec9f086894b578e4f642d Mon Sep 17 00:00:00 2001 From: chestnut1693 <47870624+chestnut1693@users.noreply.github.com> Date: Thu, 29 Aug 2019 00:30:24 +0200 Subject: [PATCH 6/7] boosts: add config to not display combat boosts --- .../client/plugins/boosts/BoostsConfig.java | 18 +++++++++---- .../client/plugins/boosts/BoostsPlugin.java | 25 +++++++++++++------ 2 files changed, 30 insertions(+), 13 deletions(-) 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 e623442da3..a853ea41c3 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 1962320efb..aa7e46d00e 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 @@ -263,16 +263,25 @@ public class BoostsPlugin extends Plugin private void updateShownSkills() { - if (config.enableSkill()) + switch (config.displayBoosts()) { - 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() From 844aa787ae9ec83c97283916b201ca87a321a77e Mon Sep 17 00:00:00 2001 From: Runelite auto updater Date: Thu, 29 Aug 2019 10:34:24 +0000 Subject: [PATCH 7/7] Update 182 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 69b684da1a..8d722a34b5 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ true true - 181 + 182