loottracker: stack clue scrolls in the ui instead of at loot receive time

This commit is contained in:
Adam
2020-05-10 23:35:22 -04:00
parent ff0e2a5245
commit 0309ba41fd
6 changed files with 83 additions and 48 deletions

View File

@@ -0,0 +1,71 @@
/*
* Copyright (c) 2020, Adam <Adam@sigterm.info>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package net.runelite.client.plugins.loottracker;
import java.util.Arrays;
import net.runelite.api.ItemID;
import net.runelite.client.game.ItemManager;
import net.runelite.http.api.loottracker.LootRecordType;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
import static org.mockito.Mockito.mock;
public class LootTrackerBoxTest
{
@Test
public void testAddKill()
{
LootTrackerBox lootTrackerBox = new LootTrackerBox(
mock(ItemManager.class),
"Theatre of Blood",
LootRecordType.EVENT,
null,
false,
LootTrackerPriceType.GRAND_EXCHANGE,
false,
null, null,
false);
LootTrackerItem[] items = new LootTrackerItem[]{
new LootTrackerItem(ItemID.CLUE_SCROLL_MEDIUM, "Clue scroll (medium)", 1, 0, 0, false),
new LootTrackerItem(ItemID.CLUE_SCROLL_MEDIUM_3602, "Clue scroll (medium)", 1, 0, 0, false),
new LootTrackerItem(ItemID.GRACEFUL_HOOD_13579, "Graceful hood", 1, 0, 0, false),
};
LootTrackerRecord lootTrackerRecord = new LootTrackerRecord(
"Theatre of Blood",
null,
LootRecordType.EVENT,
items,
42
);
lootTrackerBox.addKill(lootTrackerRecord);
assertEquals(Arrays.asList(
new LootTrackerItem(ItemID.CLUE_SCROLL_MEDIUM, "Clue scroll (medium)", 2, 0, 0, false),
new LootTrackerItem(ItemID.GRACEFUL_HOOD_13579, "Graceful hood", 1, 0, 0, false)
), lootTrackerBox.getItems());
}
}

View File

@@ -158,25 +158,6 @@ public class LootTrackerPluginTest
return itemComposition;
}
@Test
public void testClueStacks()
{
when(itemManager.getItemComposition(ItemID.CLUE_SCROLL_MEDIUM)).thenAnswer(invocation -> mockItem("Clue scroll (medium)"));
when(itemManager.getItemComposition(ItemID.CLUE_SCROLL_MEDIUM_3602)).thenAnswer(invocation -> mockItem("Clue scroll (medium)"));
when(itemManager.getItemComposition(ItemID.GRACEFUL_HOOD_13579)).thenAnswer(invocation -> mockItem("Graceful hood"));
Collection<ItemStack> stack = lootTrackerPlugin.stack(
Arrays.asList(
new ItemStack(ItemID.CLUE_SCROLL_MEDIUM, 1, null),
new ItemStack(ItemID.CLUE_SCROLL_MEDIUM_3602, 1, null),
new ItemStack(ItemID.GRACEFUL_HOOD_13579, 1, null)
)
);
assertEquals(Arrays.asList(
new ItemStack(ItemID.CLUE_SCROLL_MEDIUM, 2, null),
new ItemStack(ItemID.GRACEFUL_HOOD_13579, 1, null)
), stack);
}
@Test
public void testHerbiboarHerbSack()
{