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

Calculate total count/value from loot records instead of boxes

Browse Source 
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
This commit is contained in:
Tomas Slusny
2018-10-24 08:58:16 +02:00
parent 120be3ab13
commit b899a4b675
2 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerBox.java
View File

@@ -63,9 +63,7 @@ class LootTrackerBox extends JPanel
@Getter @Getter
private final List<LootTrackerRecord> records = new ArrayList<>(); private final List<LootTrackerRecord> records = new ArrayList<>();
@Getter
private long totalPrice; private long totalPrice;
private boolean hideIgnoredItems; private boolean hideIgnoredItems;
private BiConsumer<String, Boolean> onItemToggle; private BiConsumer<String, Boolean> onItemToggle;
@@ -116,7 +114,7 @@ class LootTrackerBox extends JPanel
* *
* @return total amount of kills * @return total amount of kills
*/ */
long getTotalKills() private long getTotalKills()
{ {
return hideIgnoredItems return hideIgnoredItems
? records.stream().filter(r -> !Arrays.stream(r.getItems()).allMatch(LootTrackerItem::isIgnored)).count() ? records.stream().filter(r -> !Arrays.stream(r.getItems()).allMatch(LootTrackerItem::isIgnored)).count()
@@ -169,9 +167,11 @@ class LootTrackerBox extends JPanel
buildItems(); buildItems();
priceLabel.setText(StackFormatter.quantityToStackSize(totalPrice) + " gp"); priceLabel.setText(StackFormatter.quantityToStackSize(totalPrice) + " gp");
if (records.size() > 1)
final long kills = getTotalKills();
if (kills > 1)
{ {
subTitleLabel.setText("x " + records.size()); subTitleLabel.setText("x " + kills);
} }
repaint(); repaint();

31
runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPanel.java
View File

@@ -481,8 +481,35 @@ class LootTrackerPanel extends PluginPanel
private void updateOverall() private void updateOverall()
{ {
final long overallGp = boxes.stream().mapToLong(LootTrackerBox::getTotalPrice).sum(); long overallKills = 0;
final long overallKills = boxes.stream().mapToLong(LootTrackerBox::getTotalKills).sum(); long overallGp = 0;
for (LootTrackerRecord record : records)
{
if (!record.matches(currentView))
{
continue;
}
int present = record.getItems().length;
for (LootTrackerItem item : record.getItems())
{
if (hideIgnoredItems && item.isIgnored())
{
present--;
continue;
}
overallGp += item.getPrice();
}
if (present > 0)
{
overallKills++;
}
}
overallKillsLabel.setText(htmlLabel("Total count: ", overallKills)); overallKillsLabel.setText(htmlLabel("Total count: ", overallKills));
overallGpLabel.setText(htmlLabel("Total value: ", overallGp)); overallGpLabel.setText(htmlLabel("Total value: ", overallGp));
} }