2006-Scape/2006Scape
1
0
Fork 0
mirror of https://github.com/2006-Scape/2006Scape.git synced 2026-07-03 00:31:51 +00:00
Code Issues 4.5k Packages Projects Releases 10 Wiki Activity

items are un noted when sold to shop

Browse Source
This commit is contained in:
RedSparr0w
2019-11-24 16:28:31 +13:00
parent f7d719c811
commit ab57946a01
1 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2006Redone Server/src/redone/game/shops/ShopAssistant.java
+16 -18
View File
@@ -328,9 +328,11 @@ public class ShopAssistant {
} }
public boolean sellItem(int itemID, int fromSlot, int amount) { public boolean sellItem(int itemID, int fromSlot, int amount) {
int unNotedItemID = getUnNoted(itemID);
String itemName = ItemAssistant.getItemName(itemID).toLowerCase();
for (int i : Constants.ITEM_SELLABLE) { for (int i : Constants.ITEM_SELLABLE) {
if (i == itemID) { if (i == unNotedItemID) {
player.getActionSender().sendMessage("You can't sell " + ItemAssistant.getItemName(itemID).toLowerCase() + "."); player.getActionSender().sendMessage("You can't sell " + itemName + ".");
return false; return false;
} }
} }
@@ -355,7 +357,7 @@ public class ShopAssistant {
// Only buys what they sell // Only buys what they sell
case 2: case 2:
for (int j = 0; j <= ShopHandler.ShopItemsStandard[player.myShopId]; j++) { for (int j = 0; j <= ShopHandler.ShopItemsStandard[player.myShopId]; j++) {
if (itemID == (ShopHandler.ShopItems[player.myShopId][j] - 1)) { if (unNotedItemID == (ShopHandler.ShopItems[player.myShopId][j] - 1)) {
canSellToStore = true; canSellToStore = true;
break; break;
} }
@@ -372,17 +374,17 @@ public class ShopAssistant {
} }
if (canSellToStore == false) { if (canSellToStore == false) {
player.getItemAssistant(); player.getItemAssistant();
player.getActionSender().sendMessage("You can't sell " + ItemAssistant.getItemName(itemID).toLowerCase() + " to this store."); player.getActionSender().sendMessage("You can't sell " + itemName + " to this store.");
return false; return false;
} }
// player owned store, setting item price // player owned store, setting item price
if (ShopHandler.playerOwnsStore(player.myShopId, player)) { if (ShopHandler.playerOwnsStore(player.myShopId, player)) {
// No items in stock, we are adding 1 and setting the price // No items in stock, we are adding 1 and setting the price
if (ShopHandler.getStock(player.myShopId, itemID) <= 0){ if (ShopHandler.getStock(player.myShopId, unNotedItemID) <= 0){
player.getItemAssistant().deleteItem(itemID, 1); player.getItemAssistant().deleteItem(itemID, 1);
BotHandler.addTobank(player.myShopId, itemID, 1); BotHandler.addTobank(player.myShopId, unNotedItemID, 1);
BotHandler.setPrice(player.myShopId, itemID, amount); BotHandler.setPrice(player.myShopId, unNotedItemID, amount);
addShopItem(itemID, 1); addShopItem(unNotedItemID, 1);
player.getItemAssistant().resetItems(3823); player.getItemAssistant().resetItems(3823);
resetShop(player.myShopId); resetShop(player.myShopId);
updatePlayerShop(); updatePlayerShop();
@@ -392,14 +394,14 @@ public class ShopAssistant {
if (amount > inventoryAmount) { if (amount > inventoryAmount) {
amount = inventoryAmount; amount = inventoryAmount;
} }
String itemName = ItemAssistant.getItemName(itemID).toLowerCase();
int value = 1; int value = 1;
int currency = 995; int currency = 995;
if (player.myShopId == 138 || player.myShopId == 58 || player.myShopId == 139) { if (player.myShopId == 138 || player.myShopId == 58 || player.myShopId == 139) {
value = (int) Math.floor(getTokkulValue(itemID) * .85); value = (int) Math.floor(getTokkulValue(unNotedItemID) * .85);
currency = 6529; currency = 6529;
} else { } else {
value = (int) Math.floor(getItemShopValue(itemID, amount, true)); value = (int) Math.floor(getItemShopValue(unNotedItemID, amount, true));
currency = 995; currency = 995;
} }
@@ -411,23 +413,19 @@ public class ShopAssistant {
player.getItemAssistant().deleteItem(itemID, amount); player.getItemAssistant().deleteItem(itemID, amount);
// Only un note items if it's not a player owned store
if (!ShopHandler.playerOwnsStore(player.myShopId, player))
itemID = getUnNoted(itemID);
if (ShopHandler.playerOwnsStore(player.myShopId, player)) { if (ShopHandler.playerOwnsStore(player.myShopId, player)) {
// Add items to players store // Add items to players store
player.getActionSender().sendMessage("You sent " + amount + " " + itemName + " to your store."); player.getActionSender().sendMessage("You sent " + amount + " " + itemName + " to your store.");
BotHandler.addTobank(player.myShopId, itemID, amount); BotHandler.addTobank(player.myShopId, unNotedItemID, amount);
} else { } else {
// Add currency to players inventory // Add currency to players inventory
int totalValue = value * amount; int totalValue = value * amount;
player.getItemAssistant().addItem(currency, totalValue); player.getItemAssistant().addItem(currency, totalValue);
player.getActionSender().sendMessage("You sold " + amount + " " + itemName + " for " + totalValue + " " + ItemAssistant.getItemName(itemID).toLowerCase() + "."); player.getActionSender().sendMessage("You sold " + amount + " " + itemName + " for " + totalValue + " " + ItemAssistant.getItemName(currency).toLowerCase() + ".");
} }
// Add item to the shop // Add item to the shop
addShopItem(itemID, amount); addShopItem(unNotedItemID, amount);
player.getItemAssistant().resetItems(3823); player.getItemAssistant().resetItems(3823);
resetShop(player.myShopId); resetShop(player.myShopId);
updatePlayerShop(); updatePlayerShop();