From 564f40000751de02130b08629d99989cd33a6418 Mon Sep 17 00:00:00 2001 From: RedSparr0w Date: Sun, 24 Nov 2019 17:50:34 +1300 Subject: [PATCH] check un noted version for buy price etc --- .../src/redone/game/shops/ShopAssistant.java | 27 +++++++++++------- .../redone/game/shops/ShopAssistant.class | Bin 13056 -> 13231 bytes 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/2006Redone Server/src/redone/game/shops/ShopAssistant.java b/2006Redone Server/src/redone/game/shops/ShopAssistant.java index b599a611..21b9de44 100644 --- a/2006Redone Server/src/redone/game/shops/ShopAssistant.java +++ b/2006Redone Server/src/redone/game/shops/ShopAssistant.java @@ -273,8 +273,10 @@ public class ShopAssistant { * Sell item to shop (Shop Price) **/ public void sellToShopPrice(int removeId, int removeSlot) { + int unNotedItemID = getUnNoted(removeId); + String itemName = ItemAssistant.getItemName(unNotedItemID); for (int i : Constants.ITEM_SELLABLE) { - if (i == removeId) { + if (unNotedItemID == i) { player.getActionSender().sendMessage("You can't sell " + ItemAssistant.getItemName(removeId).toLowerCase() + "."); return; } @@ -284,7 +286,7 @@ public class ShopAssistant { // Only buys what is in stock case 2: for (int j = 0; j <= ShopHandler.ShopItemsStandard[player.myShopId]; j++) { - if (removeId == (ShopHandler.ShopItems[player.myShopId][j] - 1)) { + if (unNotedItemID == (ShopHandler.ShopItems[player.myShopId][j] - 1)) { IsIn = true; break; } @@ -294,7 +296,7 @@ public class ShopAssistant { case 1: IsIn = true; break; - // Player owned store + // Player owns this store case 0: IsIn = ShopHandler.playerOwnsStore(player.myShopId, player); break; @@ -303,8 +305,8 @@ 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, true)); - int tokkulValue = (int) Math.floor(getTokkulValue(removeId) *.85); + int ShopValue = (int) Math.floor(getItemShopValue(unNotedItemID, 1, true)); + int tokkulValue = (int) Math.floor(getTokkulValue(unNotedItemID) *.85); String ShopAdd = ""; if (ShopValue >= 1000 && ShopValue < 1000000) { ShopAdd = " (" + (ShopValue / 1000) + "K)"; @@ -312,17 +314,20 @@ public class ShopAssistant { ShopAdd = " (" + (ShopValue / 1000000) + " million)"; } if (ShopHandler.playerOwnsStore(player.myShopId, player)) { - player.getActionSender().sendMessage(ItemAssistant.getItemName(removeId) + ": set your sell price."); + if (ShopHandler.getStock(player.myShopId, unNotedItemID) > 0) + player.getActionSender().sendMessage(itemName + ": you are selling this item for " + BotHandler.getItemPrice(player.myShopId, unNotedItemID) + " coins."); + else + player.getActionSender().sendMessage(itemName + ": you haven't set your sell price."); } else if (player.myShopId != RANGE_SHOP && player.myShopId != PEST_SHOP && player.myShopId != CASTLE_SHOP && player.myShopId != 138 && player.myShopId != 58 && player.myShopId != 139) { - player.getActionSender().sendMessage(ItemAssistant.getItemName(removeId) + ": shop will buy for " + ShopValue + " coins." + ShopAdd); + player.getActionSender().sendMessage(itemName + ": shop will buy for " + ShopValue + " coins." + ShopAdd); } else if (player.myShopId == 138 || player.myShopId == 139 || player.myShopId == 58) { - player.getActionSender().sendMessage(ItemAssistant.getItemName(removeId) + ": shop will buy for " + tokkulValue + " tokkul."); + player.getActionSender().sendMessage(itemName + ": shop will buy for " + tokkulValue + " tokkul."); } else if (player.myShopId == RANGE_SHOP) { - player.getActionSender().sendMessage(ItemAssistant.getItemName(removeId) + ": shop will buy for " + getRGItemValue(removeId) + " archery tickets." + ShopAdd); + player.getActionSender().sendMessage(itemName + ": shop will buy for " + getRGItemValue(unNotedItemID) + " archery tickets." + ShopAdd); } else if (player.myShopId == PEST_SHOP) { - player.getActionSender().sendMessage(ItemAssistant.getItemName(removeId) + ": shop will buy for " + getPestItemValue(removeId) + " pest control points." + ShopAdd); + player.getActionSender().sendMessage(itemName + ": shop will buy for " + getPestItemValue(unNotedItemID) + " pest control points." + ShopAdd); } else if (player.myShopId == CASTLE_SHOP) { - player.getActionSender().sendMessage(ItemAssistant.getItemName(removeId) + ": shop will buy for " + getCastleItemValue(removeId) + " castle war tickets." + ShopAdd); + player.getActionSender().sendMessage(itemName + ": shop will buy for " + getCastleItemValue(unNotedItemID) + " castle war tickets." + ShopAdd); } } } diff --git a/CompiledServer/production/2006rebotted/redone/game/shops/ShopAssistant.class b/CompiledServer/production/2006rebotted/redone/game/shops/ShopAssistant.class index cb099933f7bd6757b443da07bd3096a9716d7bdf..58a2955708461900170cfa650527f57fc332501e 100644 GIT binary patch delta 6388 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 delta 6315 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 Np9uGN=~MW}{{fUkg*E^H