ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

grounditems: update menu highlight logic to match overlay logic

Browse Source 
When the GE price is 0 (untradeable items) the GroundItemPlugin used the store price, not the HA price (which is the store price multiplied by 0.6).

For non-stackable untradeable items the relevant code didn't handle the quantities correctly, e.g. dropping two raw lava eels returned a quantity of 1 and a wrong price, which lead to the wrong color

Co-authored-by: Adam <Adam@sigterm.info>
This commit is contained in:
Robert Nönnig
2020-04-28 17:47:37 +02:00
committed by Adam
parent d99a426e0d
commit baf4f58768
2 changed files with 14 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItem.java
View File

@@ -50,6 +50,7 @@ class GroundItem
private LootType lootType; private LootType lootType;
@Nullable @Nullable
private Instant spawnTime; private Instant spawnTime;
private boolean stackable;
int getHaPrice() int getHaPrice()
{ {

46
runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java
View File

@@ -54,12 +54,9 @@ import net.runelite.api.Constants;
import net.runelite.api.GameState; import net.runelite.api.GameState;
import net.runelite.api.ItemComposition; import net.runelite.api.ItemComposition;
import net.runelite.api.ItemID; import net.runelite.api.ItemID;
import net.runelite.api.ItemLayer;
import net.runelite.api.MenuAction; import net.runelite.api.MenuAction;
import net.runelite.api.MenuEntry; import net.runelite.api.MenuEntry;
import net.runelite.api.Node;
import net.runelite.api.Player; import net.runelite.api.Player;
import net.runelite.api.Scene;
import net.runelite.api.Tile; import net.runelite.api.Tile;
import net.runelite.api.TileItem; import net.runelite.api.TileItem;
import net.runelite.api.coords.WorldPoint; import net.runelite.api.coords.WorldPoint;
@@ -406,6 +403,7 @@ public class GroundItemsPlugin extends Plugin
.tradeable(itemComposition.isTradeable()) .tradeable(itemComposition.isTradeable())
.lootType(dropped ? LootType.DROPPED : LootType.UNKNOWN) .lootType(dropped ? LootType.DROPPED : LootType.UNKNOWN)
.spawnTime(Instant.now()) .spawnTime(Instant.now())
.stackable(itemComposition.isStackable())
.build(); .build();
@@ -482,40 +480,22 @@ public class GroundItemsPlugin extends Plugin
return; return;
} }
int itemId = event.getIdentifier(); final int itemId = event.getIdentifier();
Scene scene = client.getScene(); final int sceneX = event.getActionParam0();
Tile tile = scene.getTiles()[client.getPlane()][event.getActionParam0()][event.getActionParam1()]; final int sceneY = event.getActionParam1();
ItemLayer itemLayer = tile.getItemLayer();
if (itemLayer == null)
{
return;
}
MenuEntry[] menuEntries = client.getMenuEntries(); MenuEntry[] menuEntries = client.getMenuEntries();
MenuEntry lastEntry = menuEntries[menuEntries.length - 1]; MenuEntry lastEntry = menuEntries[menuEntries.length - 1];
int quantity = 1; final WorldPoint worldPoint = WorldPoint.fromScene(client, sceneX, sceneY, client.getPlane());
Node current = itemLayer.getBottom(); GroundItem.GroundItemKey groundItemKey = new GroundItem.GroundItemKey(itemId, worldPoint);
GroundItem groundItem = collectedGroundItems.get(groundItemKey);
int quantity = groundItem.getQuantity();
while (current instanceof TileItem) final int gePrice = groundItem.getGePrice();
{ final int haPrice = groundItem.getHaPrice();
TileItem item = (TileItem) current; final Color hidden = getHidden(new NamedQuantity(groundItem.getName(), quantity), gePrice, haPrice, groundItem.isTradeable());
if (item.getId() == itemId) final Color highlighted = getHighlighted(new NamedQuantity(groundItem.getName(), quantity), gePrice, haPrice);
{
quantity = item.getQuantity();
}
current = current.getNext();
}
final ItemComposition itemComposition = itemManager.getItemComposition(itemId);
final int realItemId = itemComposition.getNote() != -1 ? itemComposition.getLinkedNoteId() : itemComposition.getId();
final int itemPrice = itemManager.getItemPrice(realItemId);
final int price = itemPrice <= 0 ? itemComposition.getPrice() : itemPrice;
final int haPrice = Math.round(itemComposition.getPrice() * Constants.HIGH_ALCHEMY_MULTIPLIER) * quantity;
final int gePrice = quantity * price;
final Color hidden = getHidden(new NamedQuantity(itemComposition.getName(), quantity), gePrice, haPrice, itemComposition.isTradeable());
final Color highlighted = getHighlighted(new NamedQuantity(itemComposition.getName(), quantity), gePrice, haPrice);
final Color color = getItemColor(highlighted, hidden); final Color color = getItemColor(highlighted, hidden);
final boolean canBeRecolored = highlighted != null || (hidden != null && config.recolorMenuHiddenItems()); final boolean canBeRecolored = highlighted != null || (hidden != null && config.recolorMenuHiddenItems());
@@ -549,7 +529,7 @@ public class GroundItemsPlugin extends Plugin
} }
} }
if (config.showMenuItemQuantities() && itemComposition.isStackable() && quantity > 1) if (config.showMenuItemQuantities() && groundItem.isStackable() && quantity > 1)
{ {
lastEntry.setTarget(lastEntry.getTarget() + " (" + quantity + ")"); lastEntry.setTarget(lastEntry.getTarget() + " (" + quantity + ")");
} }