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

ge: fix computing bought/sold amount

Browse Source 
Use the total spent price instead of the delta spent price, as it is
being divided by the total quantity
This commit is contained in:
Adam
2020-06-06 00:01:08 -04:00
parent dfce3bd7fc
commit a1122ba141
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
http-api/src/main/java/net/runelite/http/api/ge/GrandExchangeTrade.java
View File

@@ -38,6 +38,7 @@ public class GrandExchangeTrade
private int dqty; private int dqty;
private int total; private int total;
private int spent; private int spent;
private int dspent;
private int offer; private int offer;
private int slot; private int slot;
private WorldType worldType; private WorldType worldType;

2
http-service/src/main/java/net/runelite/http/service/ge/GrandExchangeController.java
View File

@@ -94,7 +94,7 @@ public class GrandExchangeController
trade.setQty(grandExchangeTrade.getQty()); trade.setQty(grandExchangeTrade.getQty());
trade.setDqty(grandExchangeTrade.getDqty()); trade.setDqty(grandExchangeTrade.getDqty());
trade.setTotal(grandExchangeTrade.getTotal()); trade.setTotal(grandExchangeTrade.getTotal());
trade.setSpent(grandExchangeTrade.getSpent()); trade.setSpent(grandExchangeTrade.getDspent());
trade.setOffer(grandExchangeTrade.getOffer()); trade.setOffer(grandExchangeTrade.getOffer());
trade.setSlot(grandExchangeTrade.getSlot()); trade.setSlot(grandExchangeTrade.getSlot());
trade.setTime((int) (System.currentTimeMillis() / 1000L)); trade.setTime((int) (System.currentTimeMillis() / 1000L));

4
runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java
View File

@@ -420,7 +420,6 @@ public class GrandExchangePlugin extends Plugin
grandExchangeTrade.setBuy(state == GrandExchangeOfferState.BUYING); grandExchangeTrade.setBuy(state == GrandExchangeOfferState.BUYING);
grandExchangeTrade.setItemId(offer.getItemId()); grandExchangeTrade.setItemId(offer.getItemId());
grandExchangeTrade.setTotal(offer.getTotalQuantity()); grandExchangeTrade.setTotal(offer.getTotalQuantity());
grandExchangeTrade.setSpent(0);
grandExchangeTrade.setOffer(offer.getPrice()); grandExchangeTrade.setOffer(offer.getPrice());
grandExchangeTrade.setSlot(slot); grandExchangeTrade.setSlot(slot);
grandExchangeTrade.setWorldType(getGeWorldType()); grandExchangeTrade.setWorldType(getGeWorldType());
@@ -475,7 +474,8 @@ public class GrandExchangePlugin extends Plugin
grandExchangeTrade.setQty(offer.getQuantitySold()); grandExchangeTrade.setQty(offer.getQuantitySold());
grandExchangeTrade.setDqty(qty); grandExchangeTrade.setDqty(qty);
grandExchangeTrade.setTotal(offer.getTotalQuantity()); grandExchangeTrade.setTotal(offer.getTotalQuantity());
grandExchangeTrade.setSpent(dspent); grandExchangeTrade.setDspent(dspent);
grandExchangeTrade.setSpent(offer.getSpent());
grandExchangeTrade.setOffer(offer.getPrice()); grandExchangeTrade.setOffer(offer.getPrice());
grandExchangeTrade.setSlot(slot); grandExchangeTrade.setSlot(slot);
grandExchangeTrade.setWorldType(getGeWorldType()); grandExchangeTrade.setWorldType(getGeWorldType());

4
runelite-client/src/test/java/net/runelite/client/plugins/grandexchange/GrandExchangePluginTest.java
View File

@@ -135,6 +135,7 @@ public class GrandExchangePluginTest
@Test @Test
public void testSubmitTrade() public void testSubmitTrade()
{ {
// 1 @ 25
SavedOffer savedOffer = new SavedOffer(); SavedOffer savedOffer = new SavedOffer();
savedOffer.setItemId(ItemID.ABYSSAL_WHIP); savedOffer.setItemId(ItemID.ABYSSAL_WHIP);
savedOffer.setQuantitySold(1); savedOffer.setQuantitySold(1);
@@ -162,7 +163,8 @@ public class GrandExchangePluginTest
assertEquals(ItemID.ABYSSAL_WHIP, trade.getItemId()); assertEquals(ItemID.ABYSSAL_WHIP, trade.getItemId());
assertEquals(2, trade.getDqty()); assertEquals(2, trade.getDqty());
assertEquals(10, trade.getTotal()); assertEquals(10, trade.getTotal());
assertEquals(20, trade.getSpent()); assertEquals(45, trade.getSpent());
assertEquals(20, trade.getDspent());
} }
@Test @Test