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

fixup ordering of shop items

Browse Source
This commit is contained in:
RedSparr0w
2019-11-23 11:39:03 +13:00
parent d2cf6fac12
commit 10c7adf74d
9 changed files with 18 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2006Redone Server/src/redone/game/bots/Bot.java
+2 -1
View File
@@ -67,7 +67,8 @@ public class Bot {
if (items.size() <= 0) return;
int item_id = Misc.randomArrayListItem(items);
String item_name = ItemAssistant.getItemName(item_id);
int value = Math.max(1, BotHandler.getItemPrice(botClient.myShopId, item_id));
int value = BotHandler.getItemPrice(botClient.myShopId, item_id);
if (value <= 0) return;
botClient.forcedChat("Selling " + item_name + " " + formatSellPrice(value) + " ea");
/*
Real chat - Disabled for now, can't get it to function correctly
2006Redone Server/src/redone/game/bots/BotHandler.java
+2 -2
View File
@@ -107,13 +107,13 @@ public class BotHandler
public static int getItemPrice(int shop_id, int item_id){
item_id++;
Client shop = getPlayerShop(shop_id);
if (shop == null) return 1;
if (shop == null) return 0;
for (int slot = 0; slot < ShopHandler.MaxShopItems; slot++) {
if (shop.bankItems[slot] == item_id) {
return Math.max(1, shop.bankItemsV[slot]);
}
}
return 1;
return 0;
}
public static void setPrice(int shop_id, int item_id, int amount){
2006Redone Server/src/redone/game/items/ItemAssistant.java
+2
View File
@@ -1804,9 +1804,11 @@ public class ItemAssistant {
for (int j = k; j <= highestSlot; j++) {
c.bankItems[j - spots] = c.bankItems[j];
c.bankItemsN[j - spots] = c.bankItemsN[j];
c.bankItemsV[j - spots] = c.bankItemsV[j];
stop = true;
c.bankItems[j] = 0;
c.bankItemsN[j] = 0;
c.bankItemsV[j] = 0;
}
}
}
2006Redone Server/src/redone/game/shops/ShopHandler.java
+7 -7
View File
@@ -197,14 +197,14 @@ public class ShopHandler {
public static void refreshShop(int shop_id){
// We don't want to remove items that should be kept in stock
for (int j = ShopItemsStandard[shop_id]; j < MaxShopItems; j++) {
if (ShopItems[shop_id][j] > 0 && ShopItemsN[shop_id][j] <= 0) {
if (ShopItemsN[shop_id][j] <= 0) {
ResetItem(shop_id, j);
if (ShopItems[shop_id][j + 1] > 0) {
ShopItems[shop_id][j] = ShopItems[shop_id][j + 1];
ShopItemsN[shop_id][j] = ShopItemsN[shop_id][j + 1];
ShopItemsSN[shop_id][j] = ShopItemsSN[shop_id][j + 1];
ShopItemsDelay[shop_id][j] = ShopItemsDelay[shop_id][j + 1];
ResetItem(shop_id, j + 1);
int next = j + 1;
if (next < MaxShopItems && ShopItemsN[shop_id][next] > 0) {
ShopItems[shop_id][j] = ShopItems[shop_id][next];
ShopItemsN[shop_id][j] = ShopItemsN[shop_id][next];
ShopItemsDelay[shop_id][j] = ShopItemsDelay[shop_id][next];
ResetItem(shop_id, next);
}
}
}