From d320d8efe39b2adc3d4b81af3cf5612459be2a3f Mon Sep 17 00:00:00 2001 From: dginovker Date: Fri, 4 Oct 2019 10:46:46 -0400 Subject: [PATCH] Fix shop dupe thing --- 2006Redone Server/data/logs/shopselling/.keep | 0 .../data/logs/shopselling/irdb.txt | 1 + .../src/redone/game/shops/ShopAssistant.java | 16 ++++++++-------- .../redone/game/shops/ShopAssistant.class | Bin 12649 -> 12726 bytes 4 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 2006Redone Server/data/logs/shopselling/.keep create mode 100644 2006Redone Server/data/logs/shopselling/irdb.txt diff --git a/2006Redone Server/data/logs/shopselling/.keep b/2006Redone Server/data/logs/shopselling/.keep new file mode 100644 index 00000000..e69de29b diff --git a/2006Redone Server/data/logs/shopselling/irdb.txt b/2006Redone Server/data/logs/shopselling/irdb.txt new file mode 100644 index 00000000..d71d04ea --- /dev/null +++ b/2006Redone Server/data/logs/shopselling/irdb.txt @@ -0,0 +1 @@ +[2019/10/04] 10:46 irdb sold thread to store id: 24 for 2 coins diff --git a/2006Redone Server/src/redone/game/shops/ShopAssistant.java b/2006Redone Server/src/redone/game/shops/ShopAssistant.java index b42d0fdd..5f1dbda1 100644 --- a/2006Redone Server/src/redone/game/shops/ShopAssistant.java +++ b/2006Redone Server/src/redone/game/shops/ShopAssistant.java @@ -106,13 +106,13 @@ public class ShopAssistant { } } - public double getItemShopValue(int ItemID, int Type, int fromSlot) { + public double getItemShopValue(int ItemID, int Type, boolean isSelling) { double ShopValue = 1; double TotPrice = 0; + double sellingRatio = isSelling ? 0.85 : 1; for (int i = 0; i < Constants.ITEM_LIMIT; i++) { if (ItemDefinitions.getDef()[i] != null) { - ShopValue = (int) ItemDefinitions.getDef()[ItemID].highAlch/3 *5; - //ShopValue = (int) ItemDefinitions.getDef()[ItemID].shopValue; + ShopValue = ItemDefinitions.getDef()[ItemID].highAlch/3.0 *5.0 * sellingRatio; } } @@ -140,7 +140,7 @@ public class ShopAssistant { **/ public void buyFromShopPrice(int removeId, int removeSlot) { - int ShopValue = (int) Math.floor(getItemShopValue(removeId, 0, removeSlot)); + int ShopValue = (int) Math.floor(getItemShopValue(removeId, 0, false)); int SpecialValue = getTokkulValue(removeId); String ShopAdd = ""; if (player.myShopId == 138 || player.myShopId == 139 || player.myShopId == 58) { @@ -307,7 +307,7 @@ public class ShopAssistant { if (IsIn == false) { player.getActionSender().sendMessage("You can't sell " + ItemAssistant.getItemName(removeId).toLowerCase() + " to this store."); } else { - int ShopValue = (int) Math.floor(getItemShopValue(removeId, 1, removeSlot) *.85); + int ShopValue = (int) Math.floor(getItemShopValue(removeId, 1, true)); String ShopAdd = ""; if (ShopValue >= 1000 && ShopValue < 1000000) { ShopAdd = " (" + (ShopValue / 1000) + "K)"; @@ -369,7 +369,7 @@ public class ShopAssistant { int TotPrice2 = 0; String itemName = ItemAssistant.getItemName(itemID).toLowerCase(); for (int i = amount; i > 0; i--) { - TotPrice2 = (int) Math.floor(getItemShopValue(itemID, 1, fromSlot) *.85); + TotPrice2 = (int) Math.floor(getItemShopValue(itemID, 1, true)); if (player.getItemAssistant().freeSlots() > 0 || player.getItemAssistant().playerHasItem(995)) { if (ItemDefinitions.getDef()[itemID].isNoteable == false) { player.getItemAssistant().deleteItem(itemID, player.getItemAssistant().getItemSlot(itemID), 1); @@ -453,7 +453,7 @@ public class ShopAssistant { int castleSlot = 0; for (int i = amount; i > 0; i--) { if (player.myShopId != 138 && player.myShopId != 58 && player.myShopId != 139 && player.myShopId != RANGE_SHOP && player.myShopId != PEST_SHOP && player.myShopId != CASTLE_SHOP) { - TotPrice2 = (int) Math.floor(getItemShopValue(itemID, 0, fromSlot)); + TotPrice2 = (int) Math.floor(getItemShopValue(itemID, 0, false)); } else if (player.myShopId == 138 || player.myShopId == 58 || player.myShopId == 139) { TotPrice2 = getTokkulValue(itemID); } else if (player.myShopId == RANGE_SHOP) { @@ -493,7 +493,7 @@ public class ShopAssistant { } if (TotPrice2 <= 1) { - TotPrice2 = (int) Math.floor(getItemShopValue(itemID, 0, fromSlot)); + TotPrice2 = (int) Math.floor(getItemShopValue(itemID, 0, false)); TotPrice2 *= 1.66; } diff --git a/CompiledServer/production/2006rebotted/redone/game/shops/ShopAssistant.class b/CompiledServer/production/2006rebotted/redone/game/shops/ShopAssistant.class index f38f776642b19bc25da29a9d81f23517353a8091..2f2629e9b4e9e0310376942bcc4ac3aed4768c97 100644 GIT binary patch delta 5518 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