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

check un noted version for buy price etc

Browse Source
This commit is contained in:
RedSparr0w
2019-11-24 17:50:34 +13:00
parent c3f4e831a3
commit 564f400007
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2006Redone Server/src/redone/game/shops/ShopAssistant.java
+16 -11
View File
@@ -273,8 +273,10 @@ public class ShopAssistant {
* Sell item to shop (Shop Price) * Sell item to shop (Shop Price)
**/ **/
public void sellToShopPrice(int removeId, int removeSlot) { public void sellToShopPrice(int removeId, int removeSlot) {
int unNotedItemID = getUnNoted(removeId);
String itemName = ItemAssistant.getItemName(unNotedItemID);
for (int i : Constants.ITEM_SELLABLE) { for (int i : Constants.ITEM_SELLABLE) {
if (i == removeId) { if (unNotedItemID == i) {
player.getActionSender().sendMessage("You can't sell " + ItemAssistant.getItemName(removeId).toLowerCase() + "."); player.getActionSender().sendMessage("You can't sell " + ItemAssistant.getItemName(removeId).toLowerCase() + ".");
return; return;
} }
@@ -284,7 +286,7 @@ public class ShopAssistant {
// Only buys what is in stock // Only buys what is in stock
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 (removeId == (ShopHandler.ShopItems[player.myShopId][j] - 1)) { if (unNotedItemID == (ShopHandler.ShopItems[player.myShopId][j] - 1)) {
IsIn = true; IsIn = true;
break; break;
} }
@@ -294,7 +296,7 @@ public class ShopAssistant {
case 1: case 1:
IsIn = true; IsIn = true;
break; break;
// Player owned store // Player owns this store
case 0: case 0:
IsIn = ShopHandler.playerOwnsStore(player.myShopId, player); IsIn = ShopHandler.playerOwnsStore(player.myShopId, player);
break; break;
@@ -303,8 +305,8 @@ public class ShopAssistant {
if (IsIn == false) { if (IsIn == false) {
player.getActionSender().sendMessage("You can't sell " + ItemAssistant.getItemName(removeId).toLowerCase() + " to this store."); player.getActionSender().sendMessage("You can't sell " + ItemAssistant.getItemName(removeId).toLowerCase() + " to this store.");
} else { } else {
int ShopValue = (int) Math.floor(getItemShopValue(removeId, 1, true)); int ShopValue = (int) Math.floor(getItemShopValue(unNotedItemID, 1, true));
int tokkulValue = (int) Math.floor(getTokkulValue(removeId) *.85); int tokkulValue = (int) Math.floor(getTokkulValue(unNotedItemID) *.85);
String ShopAdd = ""; String ShopAdd = "";
if (ShopValue >= 1000 && ShopValue < 1000000) { if (ShopValue >= 1000 && ShopValue < 1000000) {
ShopAdd = " (" + (ShopValue / 1000) + "K)"; ShopAdd = " (" + (ShopValue / 1000) + "K)";
@@ -312,17 +314,20 @@ public class ShopAssistant {
ShopAdd = " (" + (ShopValue / 1000000) + " million)"; ShopAdd = " (" + (ShopValue / 1000000) + " million)";
} }
if (ShopHandler.playerOwnsStore(player.myShopId, player)) { 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) { } 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) { } 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) { } 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) { } 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) { } 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);
} }
} }
} }
CompiledServer/production/2006rebotted/redone/game/shops/ShopAssistant.class
BIN
View File
Binary file not shown.