From 701ae90ed5c497bffdceedc2dec86a220eaf4c56 Mon Sep 17 00:00:00 2001 From: Unmoon Date: Fri, 22 Dec 2017 14:17:52 +0200 Subject: [PATCH 1/4] Ground Items - Fix alch value not applying to whole stack --- .../runelite/client/plugins/grounditems/GroundItemsOverlay.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java index 91badee731..78c8955609 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java @@ -191,7 +191,7 @@ public class GroundItemsOverlay extends Overlay ItemPrice itemPrice = itemManager.getItemPriceAsync(itemId); int gePrice = itemPrice == null ? 0 : itemPrice.getPrice() * quantity; - int alchPrice = Math.round(itemDefinition.getPrice() * HIGH_ALCHEMY_CONSTANT); + int alchPrice = Math.round(itemDefinition.getPrice() * HIGH_ALCHEMY_CONSTANT) * quantity; if (gePrice == 0 || ((gePrice >= config.getHideUnderGeValue()) && (alchPrice >= config.getHideUnderHAValue()))) From c647d755b47d702ba4391e83e6a536a14b5be082 Mon Sep 17 00:00:00 2001 From: Unmoon Date: Fri, 22 Dec 2017 14:18:42 +0200 Subject: [PATCH 2/4] Ground Items - Fix coins not having value --- .../plugins/grounditems/GroundItemsOverlay.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java index 78c8955609..69840acffa 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java @@ -46,6 +46,7 @@ import net.runelite.api.Player; import net.runelite.api.Point; import net.runelite.api.Region; import net.runelite.api.Tile; +import net.runelite.api.ItemID; import net.runelite.api.widgets.Widget; import net.runelite.client.game.ItemManager; import net.runelite.client.ui.FontManager; @@ -81,6 +82,8 @@ public class GroundItemsOverlay extends Overlay private static final float HIGH_ALCHEMY_CONSTANT = 0.6f; // Regex for splitting the hidden items in the config. private static final String DELIMITER_REGEX = "\\s*,\\s*"; + // ItemID for coins + private static final int COINS = ItemID.COINS_995; private final Client client; private final GroundItemsConfig config; @@ -190,9 +193,18 @@ public class GroundItemsOverlay extends Overlay ItemPrice itemPrice = itemManager.getItemPriceAsync(itemId); - int gePrice = itemPrice == null ? 0 : itemPrice.getPrice() * quantity; - int alchPrice = Math.round(itemDefinition.getPrice() * HIGH_ALCHEMY_CONSTANT) * quantity; + int gePrice, alchPrice; + if (itemId == COINS) + { + gePrice = quantity; + alchPrice = quantity; + } + else + { + gePrice = itemPrice == null ? 0 : itemPrice.getPrice() * quantity; + alchPrice = Math.round(itemDefinition.getPrice() * HIGH_ALCHEMY_CONSTANT) * quantity; + } if (gePrice == 0 || ((gePrice >= config.getHideUnderGeValue()) && (alchPrice >= config.getHideUnderHAValue()))) { From d74f2f3e46bbeac59eed3cabd09bf2f7be5fcc22 Mon Sep 17 00:00:00 2001 From: Unmoon Date: Fri, 22 Dec 2017 15:33:59 +0200 Subject: [PATCH 3/4] Ground Items - Fix quantity in high alch value display --- .../runelite/client/plugins/grounditems/GroundItemsOverlay.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java index 69840acffa..83ef625bac 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java @@ -287,7 +287,7 @@ public class GroundItemsOverlay extends Overlay if (config.showHAValue()) { itemStringBuilder.append(" (HA: ") - .append(Math.round(item.getPrice() * HIGH_ALCHEMY_CONSTANT)) + .append(Math.round(item.getPrice() * HIGH_ALCHEMY_CONSTANT) * quantity) .append(" gp)"); } From 833bc3e6b2838a558f99aa178be9f774e253690e Mon Sep 17 00:00:00 2001 From: Unmoon Date: Fri, 22 Dec 2017 18:04:32 +0200 Subject: [PATCH 4/4] Ground Items - Always show highlighted items Show highlighted items even if they are under the GE/HA value thresholds. --- .../client/plugins/grounditems/GroundItemsOverlay.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java index 83ef625bac..4dd10c80df 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java @@ -205,7 +205,8 @@ public class GroundItemsOverlay extends Overlay gePrice = itemPrice == null ? 0 : itemPrice.getPrice() * quantity; alchPrice = Math.round(itemDefinition.getPrice() * HIGH_ALCHEMY_CONSTANT) * quantity; } - if (gePrice == 0 || ((gePrice >= config.getHideUnderGeValue()) && + if (highlightedItems.contains(itemDefinition.getName().toLowerCase()) || + gePrice == 0 || ((gePrice >= config.getHideUnderGeValue()) && (alchPrice >= config.getHideUnderHAValue()))) { items.put(itemId, quantity);