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

don't charge player to withdraw items from their store

Browse Source
This commit is contained in:
RedSparr0w
2019-11-23 12:02:22 +13:00
parent 10c7adf74d
commit b920549af0
4 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2006Redone Server/src/redone/game/shops/ShopAssistant.java
+21 -12
View File
@@ -298,7 +298,7 @@ public class ShopAssistant {
break;
// Player owned store
case 0:
IsIn = ShopHandler.ShopName[player.myShopId].equalsIgnoreCase(player.properName + "'s Store");
IsIn = ShopHandler.playerOwnsStore(player.myShopId, player);
break;
}
@@ -313,7 +313,7 @@ public class ShopAssistant {
} else if (ShopValue >= 1000000) {
ShopAdd = " (" + (ShopValue / 1000000) + " million)";
}
if (ShopHandler.ShopName[player.myShopId].equalsIgnoreCase(player.properName + "'s Store")) {
if (ShopHandler.playerOwnsStore(player.myShopId, player)) {
player.getActionSender().sendMessage(ItemAssistant.getItemName(removeId) + ": 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);
@@ -369,7 +369,7 @@ public class ShopAssistant {
break;
// Player owned store - only "buys" from the player whos store it is
case 0:
canSellToStore = ShopHandler.ShopName[player.myShopId].equalsIgnoreCase(player.properName + "'s Store");
canSellToStore = ShopHandler.playerOwnsStore(player.myShopId, player);
break;
}
if (canSellToStore == false) {
@@ -378,7 +378,7 @@ public class ShopAssistant {
return false;
}
// player owned store, setting item price
if (ShopHandler.ShopName[player.myShopId].equalsIgnoreCase(player.properName + "'s Store")) {
if (ShopHandler.playerOwnsStore(player.myShopId, player)) {
// No items in stock, we are adding 1 and setting the price
if (ShopHandler.getStock(player.myShopId, itemID) <= 0){
player.getItemAssistant().deleteItem(itemID, 1);
@@ -417,7 +417,7 @@ public class ShopAssistant {
itemID = itemID - 1; //Replace the noted item by it's un-noted version.
}
if (ShopHandler.ShopName[player.myShopId].equalsIgnoreCase(player.properName + "'s Store")) {
if (ShopHandler.playerOwnsStore(player.myShopId, player)) {
// Add items to players store
player.getActionSender().sendMessage("You sent " + amount + " " + itemName + " to your store.");
BotHandler.addTobank(player.myShopId, itemID, amount);
@@ -502,10 +502,14 @@ public class ShopAssistant {
return false;
}
}
int value = 0; // Item Value
int currency = 995; // currency this shop uses
int value = 0;
int currency = 995;
// player owned shop
if (ShopHandler.ShopBModifier[player.myShopId] == 0) {
boolean playerOwnsShop = ShopHandler.playerOwnsStore(player.myShopId, player);
if (playerOwnsShop) {
value = 0;
currency = -1;
} else if (ShopHandler.ShopBModifier[player.myShopId] == 0) {
value = BotHandler.getItemPrice(player.myShopId, itemID);
currency = 995; // gp
} else if (player.myShopId == 138 || player.myShopId == 58 || player.myShopId == 139) {
@@ -545,17 +549,22 @@ public class ShopAssistant {
return false;
}
}
player.getItemAssistant().deleteItem2(currency, totalValue);
String itemName = ItemAssistant.getItemName(itemID).toLowerCase();
if (!playerOwnsShop) {
player.getItemAssistant().deleteItem2(currency, totalValue);
player.getActionSender().sendMessage("You bought " + amount + " " + itemName + " for " + totalValue + " " + ItemAssistant.getItemName(currency).toLowerCase() + "." );
} else {
player.getActionSender().sendMessage("You withdrew " + amount + " " + itemName + " from your store." );
}
player.getItemAssistant().addItem(itemID, amount);
ShopHandler.buyItem(shopID, itemID, amount);
if (ShopHandler.ShopBModifier[shopID] == 0){
BotHandler.removeFrombank(shopID, itemID, amount);
}
player.getActionSender().sendMessage("You bought " + amount + " " + ItemAssistant.getItemName(itemID).toLowerCase() + " for " + totalValue + " " + ItemAssistant.getItemName(currency).toLowerCase() + "." );
String itemName = ItemAssistant.getItemName(itemID).toLowerCase();
if (player.getPlayerAssistant().isPlayer()) {
GameLogger.writeLog(player.playerName, "shopbuying", player.playerName + " bought " + amount + " " + ItemAssistant.getItemName(itemID).toLowerCase() + " for " + totalValue + " " + ItemAssistant.getItemName(currency).toLowerCase() + " from store " + shopID + ".");
GameLogger.writeLog(player.playerName, "shopbuying", player.playerName + " bought " + amount + " " + itemName + " for " + totalValue + " " + ItemAssistant.getItemName(currency).toLowerCase() + " from store " + shopID + ".");
}
player.getItemAssistant().resetItems(3823);
resetShop(player.myShopId);
2006Redone Server/src/redone/game/shops/ShopHandler.java
+5
View File
@@ -177,6 +177,7 @@ public class ShopHandler {
int id = getEmptyShop();
player.myShopId = id;
ShopSModifier[id] = 0;
ShopBModifier[id] = 0;
ShopName[id] = player.properName + "'s Store";
for (int i = 0; i < MaxShopItems; i++){
ShopItems[id][i] = player.bankItems[i];
@@ -229,4 +230,8 @@ public class ShopHandler {
}
refreshShop(shop_id);
}
public static boolean playerOwnsStore(int shop_id, Client player){
return ShopSModifier[shop_id] == 0 && ShopBModifier[shop_id] == 0 && ShopName[shop_id].equalsIgnoreCase(player.properName + "'s Store");
}
}
CompiledServer/production/2006rebotted/redone/game/shops/ShopAssistant.class
BIN
View File
Binary file not shown.
CompiledServer/production/2006rebotted/redone/game/shops/ShopHandler.class
BIN
View File
Binary file not shown.