From fc7e697aa7f562aee6077594ee59c6acbcbda8d1 Mon Sep 17 00:00:00 2001 From: Daniel Date: Mon, 25 May 2020 02:09:53 -0400 Subject: [PATCH] item prices: always show tooltip when alching if option is enabled --- .../runelite/client/plugins/itemprices/ItemPricesConfig.java | 2 +- .../client/plugins/itemprices/ItemPricesOverlay.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesConfig.java index 2880d1b8f0..5c667a2b1a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesConfig.java @@ -89,7 +89,7 @@ public interface ItemPricesConfig extends Config @ConfigItem( keyName = "showWhileAlching", name = "Show prices while alching", - description = "Show the price overlay while using High Alchemy", + description = "Show the price overlay while using High Alchemy. Takes priority over \"Hide tooltips on Inventory Items\"", position = 6 ) default boolean showWhileAlching() diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java index 0203578378..a4102f7996 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java @@ -93,12 +93,13 @@ class ItemPricesOverlay extends Overlay final MenuAction action = MenuAction.of(menuEntry.getType()); final int widgetId = menuEntry.getParam1(); final int groupId = WidgetInfo.TO_GROUP(widgetId); + final boolean isAlching = menuEntry.getOption().equals("Cast") && menuEntry.getTarget().contains("High Level Alchemy"); // Tooltip action type handling switch (action) { case ITEM_USE_ON_WIDGET: - if (!config.showWhileAlching() || !menuEntry.getOption().equals("Cast") || !menuEntry.getTarget().contains("High Level Alchemy")) + if (!config.showWhileAlching() || !isAlching) { break; } @@ -118,7 +119,7 @@ class ItemPricesOverlay extends Overlay return null; } case WidgetID.INVENTORY_GROUP_ID: - if (config.hideInventory()) + if (config.hideInventory() && !(config.showWhileAlching() && isAlching)) { return null; }