diff --git a/runelite-api/src/main/java/net/runelite/api/AnimationID.java b/runelite-api/src/main/java/net/runelite/api/AnimationID.java index 722f72c389..e45020f9bf 100644 --- a/runelite-api/src/main/java/net/runelite/api/AnimationID.java +++ b/runelite-api/src/main/java/net/runelite/api/AnimationID.java @@ -338,6 +338,7 @@ public final class AnimationID // Combat counter public static final int BARRAGE_ANIMATION = 1979; + public static final int BLITZ_ANIMATION = 1978; public static final int CHIN_ANIMATION = 7618; // Gauntlet Hunleff diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesBox.java b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesBox.java index 9757410d0d..fa627ae5ea 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesBox.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesBox.java @@ -340,7 +340,7 @@ class SuppliesBox extends JPanel { ItemDefinition item = this.itemManager.getItemDefinition(itemId); final String name = item.getName(); - final long price = item.getPrice(); + final long price = itemManager.getItemPrice(itemId); return name + " x " + qty + " (" + QuantityFormatter.quantityToStackSize(price * qty) + ") "; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java index 69768a681b..4f14c2e9f9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java @@ -41,6 +41,8 @@ import javax.inject.Inject; import javax.inject.Singleton; import javax.swing.SwingUtilities; import lombok.extern.slf4j.Slf4j; +import static net.runelite.api.AnimationID.BARRAGE_ANIMATION; +import static net.runelite.api.AnimationID.BLITZ_ANIMATION; import static net.runelite.api.AnimationID.BLOWPIPE_ATTACK; import static net.runelite.api.AnimationID.HIGH_LEVEL_MAGIC_ATTACK; import static net.runelite.api.AnimationID.LOW_LEVEL_MAGIC_ATTACK; @@ -371,6 +373,17 @@ public class SuppliesTrackerPlugin extends Plugin actionStack.push(newAction); } } + else if (animationChanged.getActor().getAnimation() == BARRAGE_ANIMATION || animationChanged.getActor().getAnimation() == BLITZ_ANIMATION ) + { + old = client.getItemContainer(InventoryID.INVENTORY); + + if (old != null && old.getItems() != null && actionStack.stream().noneMatch(a -> + a.getType() == CAST)) + { + MenuAction newAction = new MenuAction(CAST, old.getItems()); + actionStack.push(newAction); + } + } } }