mirror of
https://github.com/2006-Scape/2006Scape.git
synced 2026-07-03 00:31:51 +00:00
Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 9efafdff47 | |||
| 37322d4874 | |||
| b94157f01b | |||
| c1a5cf449c | |||
| 23951e9af6 | |||
| 2d58593be9 | |||
| 9b160452ad |
@@ -5,7 +5,11 @@
|
|||||||
|
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
import java.applet.AppletContext;
|
import java.applet.AppletContext;
|
||||||
import java.awt.*;
|
//import java.awt.*;
|
||||||
|
import java.awt.Component;
|
||||||
|
import java.awt.Graphics;
|
||||||
|
import java.awt.Color;
|
||||||
|
import java.awt.Font;
|
||||||
import java.awt.event.KeyEvent;
|
import java.awt.event.KeyEvent;
|
||||||
import java.io.ByteArrayInputStream;
|
import java.io.ByteArrayInputStream;
|
||||||
import java.io.DataInputStream;
|
import java.io.DataInputStream;
|
||||||
|
|||||||
@@ -3,18 +3,6 @@
|
|||||||
* THIS IS TO ALLOW LOCAL PARABOT TO CONTINUE TO WORK
|
* THIS IS TO ALLOW LOCAL PARABOT TO CONTINUE TO WORK
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import java.applet.AppletContext;
|
|
||||||
import java.awt.*;
|
|
||||||
import java.awt.event.KeyEvent;
|
|
||||||
import java.io.*;
|
|
||||||
import java.net.InetAddress;
|
|
||||||
import java.net.Socket;
|
|
||||||
import java.net.URL;
|
|
||||||
import java.text.DecimalFormat;
|
|
||||||
import java.text.DecimalFormatSymbols;
|
|
||||||
import java.util.Calendar;
|
|
||||||
import java.util.Date;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* NOTICE: IF YOU CHANGE ANYTHING IN GAME.JAVA, PLEASE COPY-PASTE THE WHOLE CLASS OVER TO LOCALGAME.JAVA
|
* NOTICE: IF YOU CHANGE ANYTHING IN GAME.JAVA, PLEASE COPY-PASTE THE WHOLE CLASS OVER TO LOCALGAME.JAVA
|
||||||
* THIS IS TO ALLOW LOCAL PARABOT TO CONTINUE TO WORK
|
* THIS IS TO ALLOW LOCAL PARABOT TO CONTINUE TO WORK
|
||||||
|
|||||||
@@ -4,7 +4,13 @@
|
|||||||
|
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
import java.applet.Applet;
|
import java.applet.Applet;
|
||||||
import java.awt.*;
|
//import java.awt.*;
|
||||||
|
import java.awt.Component;
|
||||||
|
import java.awt.Graphics;
|
||||||
|
import java.awt.Color;
|
||||||
|
import java.awt.Font;
|
||||||
|
import java.awt.Insets;
|
||||||
|
import java.awt.FontMetrics;
|
||||||
import java.awt.event.FocusEvent;
|
import java.awt.event.FocusEvent;
|
||||||
import java.awt.event.FocusListener;
|
import java.awt.event.FocusListener;
|
||||||
import java.awt.event.KeyEvent;
|
import java.awt.event.KeyEvent;
|
||||||
|
|||||||
@@ -2,7 +2,15 @@
|
|||||||
// Jad home page: http://www.kpdus.com/jad.html
|
// Jad home page: http://www.kpdus.com/jad.html
|
||||||
// Decompiler options: packimports(3)
|
// Decompiler options: packimports(3)
|
||||||
|
|
||||||
import java.awt.*;
|
//import java.awt.*;
|
||||||
|
import java.awt.Component;
|
||||||
|
import java.awt.Graphics;
|
||||||
|
import java.awt.Color;
|
||||||
|
import java.awt.Font;
|
||||||
|
import java.awt.Insets;
|
||||||
|
import java.awt.FontMetrics;
|
||||||
|
import java.awt.Frame;
|
||||||
|
import java.awt.Dimension;
|
||||||
|
|
||||||
@SuppressWarnings("serial")
|
@SuppressWarnings("serial")
|
||||||
final class RSFrame extends Frame {
|
final class RSFrame extends Frame {
|
||||||
|
|||||||
@@ -25,16 +25,15 @@ public class Smelting extends SkillHandler {
|
|||||||
* Handles Smelting data.
|
* Handles Smelting data.
|
||||||
*/
|
*/
|
||||||
public static int[][] data = {
|
public static int[][] data = {
|
||||||
// index ,lvl required, XP, item required, item2, COAL AMOUNT,
|
// index ,lvl required, XP, primary item required, secondary item required, secondary item amount, output item(BAR)
|
||||||
// Final item(BAR)
|
{ 1, 1, 6, COPPER, TIN, 1, 2349 }, // Bronze
|
||||||
{ 1, 1, 6, COPPER, TIN, -1, 2349 }, // Bronze
|
|
||||||
{ 2, 15, 12, IRON, -1, -1, 2351 }, // iron
|
{ 2, 15, 12, IRON, -1, -1, 2351 }, // iron
|
||||||
{ 3, 20, 17, IRON, COAL, 2, 2353 }, // Steel
|
{ 3, 20, 17, IRON, COAL, 2, 2353 }, // Steel
|
||||||
{ 4, 50, 30, MITH, COAL, 4, 2359 }, // Mith
|
{ 4, 50, 30, MITH, COAL, 4, 2359 }, // Mith
|
||||||
{ 5, 70, 37, ADDY, COAL, 6, 2361 }, // Addy
|
{ 5, 70, 37, ADDY, COAL, 6, 2361 }, // Addy
|
||||||
{ 6, 85, 50, RUNE, COAL, 8, 2363 }, // Rune
|
{ 6, 85, 50, RUNE, COAL, 8, 2363 }, // Rune
|
||||||
{ 7, 20, 13, SILVER, -1, -1, 2355 }, // Silver
|
{ 7, 20, 13, SILVER, -1, -1, 2355 }, // Silver
|
||||||
{ 8, 40, 22, GOLD, -1, -1, 2357 } // GOLD
|
{ 8, 40, 22, GOLD, -1, -1, 2357 }, // GOLD
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -44,8 +43,7 @@ public class Smelting extends SkillHandler {
|
|||||||
*/
|
*/
|
||||||
public static void startSmelting(Player c, int object) {
|
public static void startSmelting(Player c, int object) {
|
||||||
for (int j = 0; j < SMELT_FRAME.length; j++) {
|
for (int j = 0; j < SMELT_FRAME.length; j++) {
|
||||||
c.getPacketSender().sendFrame246(SMELT_FRAME[j], 150,
|
c.getPacketSender().sendFrame246(SMELT_FRAME[j], 150, SMELT_BARS[j]);
|
||||||
SMELT_BARS[j]);
|
|
||||||
}
|
}
|
||||||
c.getPacketSender().sendChatInterface(2400);
|
c.getPacketSender().sendChatInterface(2400);
|
||||||
c.isSmelting = true;
|
c.isSmelting = true;
|
||||||
@@ -70,30 +68,22 @@ public class Smelting extends SkillHandler {
|
|||||||
private static void smeltBar(final Player c, int bartype) {
|
private static void smeltBar(final Player c, int bartype) {
|
||||||
for (int i = 0; i < data.length; i++) {
|
for (int i = 0; i < data.length; i++) {
|
||||||
if (bartype == data[i][0]) {
|
if (bartype == data[i][0]) {
|
||||||
|
// Check player has the correct smithing level
|
||||||
if (c.playerLevel[c.playerSmithing] < data[i][1]) { // Smithing level
|
if (c.playerLevel[c.playerSmithing] < data[i][1]) { // Smithing level
|
||||||
c.getDialogueHandler().sendStatement("You need a smithing level of at least "+ data[i][1] + " in order smelt this bar.");
|
c.getDialogueHandler().sendStatement("You need a smithing level of at least "+ data[i][1] + " in order smelt this bar.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (data[i][3] > 0 && data[i][4] > 0) { // All OTHER bars
|
// Check the player has all required items
|
||||||
if (!c.getItemAssistant().playerHasItem(data[i][3]) || !c.getItemAssistant().playerHasItem(data[i][4])) {
|
if (data[i][4] <= 0) { // Bars with only a primary requirement
|
||||||
c.getPacketSender().sendMessage("You need an " + ItemAssistant.getItemName(data[i][3]).toLowerCase() + " and " + data[i][5] + " " + ItemAssistant.getItemName(data[i][4]).toLowerCase() + " to make this bar.");
|
|
||||||
c.getPacketSender().closeAllWindows();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (data[i][4] < 0) { // Iron bar, Gold & Silver requirements
|
|
||||||
if (!c.getItemAssistant().playerHasItem(data[i][3])) {
|
if (!c.getItemAssistant().playerHasItem(data[i][3])) {
|
||||||
c.getPacketSender().sendMessage("You need an " + ItemAssistant.getItemName(data[i][3]).toLowerCase() + " to make this bar.");
|
c.getPacketSender().sendMessage("You need " + ItemAssistant.getItemName(data[i][3]).toLowerCase() + " to make this bar.");
|
||||||
c.getPacketSender().closeAllWindows();
|
c.getPacketSender().closeAllWindows();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
} else { // Bars with a secondary requirement
|
||||||
|
if (!c.getItemAssistant().playerHasItem(data[i][3]) || !c.getItemAssistant().playerHasItem(data[i][4], data[i][5])) {
|
||||||
if (data[i][5] > 0) { // Bars with more than 1 coal requirement
|
c.getPacketSender().sendMessage("You need 1 " + ItemAssistant.getItemName(data[i][3]).toLowerCase() + " and " + data[i][5] + " " + ItemAssistant.getItemName(data[i][4]).toLowerCase() + " to make this bar.");
|
||||||
if (!c.getItemAssistant().playerHasItem(data[i][4], data[i][5])) {
|
|
||||||
c.getPacketSender().sendMessage("You need an " + ItemAssistant.getItemName(data[i][3]).toLowerCase() + " and " + data[i][5] + " coal ores to make this bar.");
|
|
||||||
c.getPacketSender().closeAllWindows();
|
c.getPacketSender().closeAllWindows();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -109,10 +99,10 @@ public class Smelting extends SkillHandler {
|
|||||||
c.playerSkillProp[13][0] = data[i][0];// index
|
c.playerSkillProp[13][0] = data[i][0];// index
|
||||||
c.playerSkillProp[13][1] = data[i][1];// Level required
|
c.playerSkillProp[13][1] = data[i][1];// Level required
|
||||||
c.playerSkillProp[13][2] = data[i][2];// XP
|
c.playerSkillProp[13][2] = data[i][2];// XP
|
||||||
c.playerSkillProp[13][3] = data[i][3];// item required
|
c.playerSkillProp[13][3] = data[i][3];// primary item required
|
||||||
c.playerSkillProp[13][4] = data[i][4];// item required 2
|
c.playerSkillProp[13][4] = data[i][4];// secondary item required
|
||||||
c.playerSkillProp[13][5] = data[i][5];// coal amount
|
c.playerSkillProp[13][5] = data[i][5];// secondary item amount
|
||||||
c.playerSkillProp[13][6] = data[i][6];// Final Item
|
c.playerSkillProp[13][6] = data[i][6];// output item
|
||||||
|
|
||||||
c.getPacketSender().closeAllWindows();
|
c.getPacketSender().closeAllWindows();
|
||||||
c.startAnimation(899);
|
c.startAnimation(899);
|
||||||
@@ -122,45 +112,40 @@ public class Smelting extends SkillHandler {
|
|||||||
@Override
|
@Override
|
||||||
public void execute(CycleEventContainer container) {
|
public void execute(CycleEventContainer container) {
|
||||||
deleteTime(c);
|
deleteTime(c);
|
||||||
|
// Remove primary item
|
||||||
c.getItemAssistant().deleteItem(c.playerSkillProp[13][3], 1);
|
c.getItemAssistant().deleteItem(c.playerSkillProp[13][3], 1);
|
||||||
if (c.playerSkillProp[13][5] == -1) {
|
// Check if required and remove secondary items
|
||||||
c.getItemAssistant().deleteItem(c.playerSkillProp[13][4], 1);
|
if (c.playerSkillProp[13][4] > 0 && c.playerSkillProp[13][5] > 0) {
|
||||||
}
|
|
||||||
if (c.playerSkillProp[13][5] > 0) {// if coal amount is > 0
|
|
||||||
c.getItemAssistant().deleteItem(c.playerSkillProp[13][4], c.playerSkillProp[13][5]);
|
c.getItemAssistant().deleteItem(c.playerSkillProp[13][4], c.playerSkillProp[13][5]);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (c.playerSkillProp[13][3] == IRON && c.playerSkillProp[13][4] == -1 && Misc.random(100) >= 50) {
|
if (c.playerSkillProp[13][3] == IRON && c.playerSkillProp[13][4] == -1) {
|
||||||
c.getPlayerAssistant().addSkillXP(c.playerSkillProp[13][2], c.playerSmithing);
|
// Ring of forging
|
||||||
c.getItemAssistant().addItem(c.playerSkillProp[13][6], 1);// item
|
if (c.playerEquipment[c.playerRing] == 2568) {
|
||||||
c.getPacketSender().sendMessage("You receive an " + ItemAssistant.getItemName(c.playerSkillProp[13][6]).toLowerCase() + ".");
|
c.getPlayerAssistant().addSkillXP(c.playerSkillProp[13][2], c.playerSmithing);
|
||||||
}
|
c.getItemAssistant().addItem(c.playerSkillProp[13][6], 1);// item
|
||||||
|
c.getPacketSender().sendMessage("You receive an " + ItemAssistant.getItemName(c.playerSkillProp[13][6]).toLowerCase() + ".");
|
||||||
|
|
||||||
if (c.playerSkillProp[13][3] == GOLD && c.playerSkillProp[13][4] == -1 && c.playerEquipment[c.playerHands] == 776) {
|
} else {
|
||||||
c.getPacketSender().sendMessage("You receive an " + ItemAssistant.getItemName(c.playerSkillProp[13][6]).toLowerCase() + ".");
|
if (Misc.random(100) >= 50) {
|
||||||
|
c.getPlayerAssistant().addSkillXP(c.playerSkillProp[13][2], c.playerSmithing);
|
||||||
|
c.getItemAssistant().addItem(c.playerSkillProp[13][6], 1);// item
|
||||||
|
c.getPacketSender().sendMessage("You receive an " + ItemAssistant.getItemName(c.playerSkillProp[13][6]).toLowerCase() + ".");
|
||||||
|
} else {
|
||||||
|
c.getPacketSender().sendMessage("You failed to smelt the iron bar.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else if (c.playerSkillProp[13][3] == GOLD && c.playerEquipment[c.playerHands] == 776) {
|
||||||
|
c.getPacketSender().sendMessage("You receive a " + ItemAssistant.getItemName(c.playerSkillProp[13][6]).toLowerCase() + ".");
|
||||||
c.getPlayerAssistant().addSkillXP(56.2, c.playerSmithing);
|
c.getPlayerAssistant().addSkillXP(56.2, c.playerSmithing);
|
||||||
c.getItemAssistant().addItem(c.playerSkillProp[13][6], 1);// item
|
c.getItemAssistant().addItem(c.playerSkillProp[13][6], 1);// item
|
||||||
} else {
|
} else {
|
||||||
if (c.playerSkillProp[13][3] != IRON) {
|
c.getPacketSender().sendMessage("You receive a " + ItemAssistant.getItemName(c.playerSkillProp[13][6]).toLowerCase() + ".");
|
||||||
c.getPacketSender().sendMessage("You receive an " + ItemAssistant.getItemName(c.playerSkillProp[13][6]).toLowerCase() + ".");
|
c.getPlayerAssistant().addSkillXP(c.playerSkillProp[13][2], c.playerSmithing);
|
||||||
c.getPlayerAssistant().addSkillXP(c.playerSkillProp[13][2], c.playerSmithing);
|
c.getItemAssistant().addItem(c.playerSkillProp[13][6], 1);// item
|
||||||
c.getItemAssistant().addItem(c.playerSkillProp[13][6], 1);// item
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// ///////////////////////////////CHECKING//////////////////////
|
////////////////////// CHECKING //////////////////////
|
||||||
if (!c.getItemAssistant().playerHasItem(c.playerSkillProp[13][3], 1)) {
|
|
||||||
c.getPacketSender().sendMessage("You don't have enough ores to continue smelting!");
|
|
||||||
resetSmelting(c);
|
|
||||||
container.stop();
|
|
||||||
}
|
|
||||||
if (c.playerSkillProp[13][4] > 0) {
|
|
||||||
if (!c.getItemAssistant().playerHasItem(c.playerSkillProp[13][4], 1)) {
|
|
||||||
c.getPacketSender().sendMessage("You don't have enough ores to continue smelting!");
|
|
||||||
resetSmelting(c);
|
|
||||||
container.stop();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (c.doAmount <= 0) {
|
if (c.doAmount <= 0) {
|
||||||
resetSmelting(c);
|
resetSmelting(c);
|
||||||
container.stop();
|
container.stop();
|
||||||
@@ -173,6 +158,18 @@ public class Smelting extends SkillHandler {
|
|||||||
resetSmelting(c);
|
resetSmelting(c);
|
||||||
container.stop();
|
container.stop();
|
||||||
}
|
}
|
||||||
|
if (!c.getItemAssistant().playerHasItem(c.playerSkillProp[13][3], 1)) {
|
||||||
|
c.getPacketSender().sendMessage("You don't have enough ores to continue smelting!");
|
||||||
|
resetSmelting(c);
|
||||||
|
container.stop();
|
||||||
|
}
|
||||||
|
if (c.playerSkillProp[13][4] > 0) {
|
||||||
|
if (!c.getItemAssistant().playerHasItem(c.playerSkillProp[13][4], c.playerSkillProp[13][5])) {
|
||||||
|
c.getPacketSender().sendMessage("You don't have enough ores to continue smelting!");
|
||||||
|
resetSmelting(c);
|
||||||
|
container.stop();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ import com.rebotted.world.GlobalDropsHandler;
|
|||||||
public class PlayerHandler {
|
public class PlayerHandler {
|
||||||
|
|
||||||
public static Player players[] = new Player[GameConstants.MAX_PLAYERS];
|
public static Player players[] = new Player[GameConstants.MAX_PLAYERS];
|
||||||
public static int playerCount = 0, playerBotCount = 0;
|
public static int playerCount = 0, playerShopCount = 0;
|
||||||
public static String playersCurrentlyOn[] = new String[GameConstants.MAX_PLAYERS];
|
public static String playersCurrentlyOn[] = new String[GameConstants.MAX_PLAYERS];
|
||||||
public static boolean updateAnnounced;
|
public static boolean updateAnnounced;
|
||||||
public static boolean updateRunning;
|
public static boolean updateRunning;
|
||||||
@@ -54,18 +54,18 @@ public class PlayerHandler {
|
|||||||
return playerCount;
|
return playerCount;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int getPlayerBotCount() {
|
public static int getPlayerShopCount() {
|
||||||
return playerBotCount;
|
return playerShopCount;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void updatePlayerNames() {
|
public void updatePlayerNames() {
|
||||||
playerBotCount = 0;
|
playerShopCount = 0;
|
||||||
playerCount = 0;
|
playerCount = 0;
|
||||||
for (int i = 0; i < GameConstants.MAX_PLAYERS; i++) {
|
for (int i = 0; i < GameConstants.MAX_PLAYERS; i++) {
|
||||||
if (players[i] != null) {
|
if (players[i] != null) {
|
||||||
playersCurrentlyOn[i] = players[i].playerName;
|
playersCurrentlyOn[i] = players[i].playerName;
|
||||||
if (players[i].isBot)
|
if (players[i].isBot)
|
||||||
playerBotCount++;
|
playerShopCount++;
|
||||||
else
|
else
|
||||||
playerCount++;
|
playerCount++;
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -276,32 +276,32 @@ public class ShopAssistant {
|
|||||||
String itemName = ItemAssistant.getItemName(unNotedItemID);
|
String itemName = ItemAssistant.getItemName(unNotedItemID);
|
||||||
for (int i : GameConstants.ITEM_SELLABLE) {
|
for (int i : GameConstants.ITEM_SELLABLE) {
|
||||||
if (unNotedItemID == i) {
|
if (unNotedItemID == i) {
|
||||||
player.getPacketSender().sendMessage("You can't sell " + ItemAssistant.getItemName(removeId).toLowerCase() + ".");
|
player.getPacketSender().sendMessage("You can't sell " + itemName + ".");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
boolean IsIn = false;
|
boolean canSellItem = false;
|
||||||
switch (ShopHandler.shopSModifier[player.shopId]) {
|
switch (ShopHandler.shopSModifier[player.shopId]) {
|
||||||
// Only buys what is in stock
|
// Only buys what is in stock
|
||||||
case 2:
|
case 2:
|
||||||
for (int j = 0; j <= ShopHandler.shopItemsStandard[player.shopId]; j++) {
|
for (int j = 0; j <= ShopHandler.shopItemsStandard[player.shopId]; j++) {
|
||||||
if (unNotedItemID == (ShopHandler.shopItems[player.shopId][j] - 1)) {
|
if (unNotedItemID == (ShopHandler.shopItems[player.shopId][j] - 1)) {
|
||||||
IsIn = true;
|
canSellItem = true;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
// General store
|
// General store
|
||||||
case 1:
|
case 1:
|
||||||
IsIn = true;
|
canSellItem = true;
|
||||||
break;
|
break;
|
||||||
// Player owns this store
|
// Player owns this store
|
||||||
case 0:
|
case 0:
|
||||||
IsIn = ShopHandler.playerOwnsStore(player.shopId, player);
|
canSellItem = ShopHandler.playerOwnsStore(player.shopId, player);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (IsIn == false) {
|
if (canSellItem == false) {
|
||||||
player.getPacketSender().sendMessage("You can't sell " + ItemAssistant.getItemName(removeId).toLowerCase() + " to this store.");
|
player.getPacketSender().sendMessage("You can't sell " + ItemAssistant.getItemName(removeId).toLowerCase() + " to this store.");
|
||||||
} else {
|
} else {
|
||||||
int ShopValue = (int) Math.floor(getItemShopValue(unNotedItemID, 1, true));
|
int ShopValue = (int) Math.floor(getItemShopValue(unNotedItemID, 1, true));
|
||||||
@@ -468,7 +468,7 @@ public class ShopAssistant {
|
|||||||
private static int getUnNoted(int itemID){
|
private static int getUnNoted(int itemID){
|
||||||
String itemName = ItemAssistant.getItemName(itemID).toLowerCase();
|
String itemName = ItemAssistant.getItemName(itemID).toLowerCase();
|
||||||
String ItemNameUnNotedItem = ItemAssistant.getItemName(itemID - 1).toLowerCase();
|
String ItemNameUnNotedItem = ItemAssistant.getItemName(itemID - 1).toLowerCase();
|
||||||
if (itemName.contains(ItemNameUnNotedItem)) {
|
if (itemName.equalsIgnoreCase(ItemNameUnNotedItem)) {
|
||||||
itemID--; //Replace the noted item by it's un-noted version.
|
itemID--; //Replace the noted item by it's un-noted version.
|
||||||
}
|
}
|
||||||
return itemID;
|
return itemID;
|
||||||
@@ -477,7 +477,7 @@ public class ShopAssistant {
|
|||||||
private static int getNoted(int itemID){
|
private static int getNoted(int itemID){
|
||||||
String itemName = ItemAssistant.getItemName(itemID).toLowerCase();
|
String itemName = ItemAssistant.getItemName(itemID).toLowerCase();
|
||||||
String ItemNameUnNotedItem = ItemAssistant.getItemName(itemID + 1).toLowerCase();
|
String ItemNameUnNotedItem = ItemAssistant.getItemName(itemID + 1).toLowerCase();
|
||||||
if (itemName.contains(ItemNameUnNotedItem)) {
|
if (itemName.equalsIgnoreCase(ItemNameUnNotedItem)) {
|
||||||
itemID++; //Replace the item by it's noted version.
|
itemID++; //Replace the item by it's noted version.
|
||||||
}
|
}
|
||||||
return itemID;
|
return itemID;
|
||||||
|
|||||||
@@ -16,9 +16,9 @@ public class ShopHandler {
|
|||||||
|
|
||||||
public static int MAX_SHOP_ITEMS = 40;
|
public static int MAX_SHOP_ITEMS = 40;
|
||||||
|
|
||||||
public static int SHOW_DELAY = 2;
|
public static int SHOW_DELAY = 1; // Restock 1 item every tick
|
||||||
|
|
||||||
public static int SPECIAL_DELAY = 60;
|
public static int SPECIAL_DELAY = 60; // Remove overstocked items after 60 ticks
|
||||||
|
|
||||||
public static int totalshops = 0;
|
public static int totalshops = 0;
|
||||||
|
|
||||||
@@ -106,11 +106,13 @@ public class ShopHandler {
|
|||||||
shopItemsN[shopID][ArrayID] -= 1;
|
shopItemsN[shopID][ArrayID] -= 1;
|
||||||
if (shopItemsN[shopID][ArrayID] <= 0) {
|
if (shopItemsN[shopID][ArrayID] <= 0) {
|
||||||
shopItemsN[shopID][ArrayID] = 0;
|
shopItemsN[shopID][ArrayID] = 0;
|
||||||
ResetItem(shopID, ArrayID);
|
if (shopItemsStandard[shopID] <= ArrayID)
|
||||||
|
ResetItem(shopID, ArrayID);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void ResetItem(int shopID, int ArrayID) {
|
private static void ResetItem(int shopID, int ArrayID) {
|
||||||
|
if (shopItemsStandard[shopID] > ArrayID) return;
|
||||||
shopItems[shopID][ArrayID] = 0;
|
shopItems[shopID][ArrayID] = 0;
|
||||||
shopItemsN[shopID][ArrayID] = 0;
|
shopItemsN[shopID][ArrayID] = 0;
|
||||||
shopItemsDelay[shopID][ArrayID] = 0;
|
shopItemsDelay[shopID][ArrayID] = 0;
|
||||||
@@ -143,19 +145,19 @@ public class ShopHandler {
|
|||||||
token = line.substring(0, spot);
|
token = line.substring(0, spot);
|
||||||
token = token.trim();
|
token = token.trim();
|
||||||
token2 = line.substring(spot + 1);
|
token2 = line.substring(spot + 1);
|
||||||
token2 = token2.trim();
|
token3 = token2.trim().split("\t+");
|
||||||
token2_2 = token2.replaceAll("\t+", "\t");
|
|
||||||
token3 = token2_2.split("\t");
|
|
||||||
if (token.equals("shop")) {
|
if (token.equals("shop")) {
|
||||||
int shopID = Integer.parseInt(token3[0]);
|
int shopID = Integer.parseInt(token3[0]);
|
||||||
shopName[shopID] = token3[1].replaceAll("_", " ");
|
shopName[shopID] = token3[1].replaceAll("_", " ");
|
||||||
shopSModifier[shopID] = Integer.parseInt(token3[2]);
|
shopSModifier[shopID] = Integer.parseInt(token3[2]);
|
||||||
shopBModifier[shopID] = Integer.parseInt(token3[3]);
|
shopBModifier[shopID] = Integer.parseInt(token3[3]);
|
||||||
for (int i = 0; i < ((token3.length - 4) / 2); i++) {
|
for (int i = 0; i < ((token3.length - 4) / 2); i++) {
|
||||||
if (token3[(4 + (i * 2))] != null) {
|
int itemID = Integer.parseInt(token3[(4 + (i * 2))]);
|
||||||
shopItems[shopID][i] = (Integer.parseInt(token3[(4 + (i * 2))]) + 1);
|
int itemAmount = Integer.parseInt(token3[(5 + (i * 2))]);
|
||||||
shopItemsN[shopID][i] = Integer.parseInt(token3[(5 + (i * 2))]);
|
if (itemID > 0) {
|
||||||
shopItemsSN[shopID][i] = Integer.parseInt(token3[(5 + (i * 2))]);
|
shopItems[shopID][i] = itemID + 1;
|
||||||
|
shopItemsN[shopID][i] = itemAmount;
|
||||||
|
shopItemsSN[shopID][i] = itemAmount;
|
||||||
shopItemsStandard[shopID]++;
|
shopItemsStandard[shopID]++;
|
||||||
} else {
|
} else {
|
||||||
break;
|
break;
|
||||||
@@ -164,7 +166,7 @@ public class ShopHandler {
|
|||||||
totalshops++;
|
totalshops++;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (line.equals("[ENDOFshopLIST]")) {
|
if (line.equalsIgnoreCase("[ENDOFSHOPLIST]")) {
|
||||||
try {
|
try {
|
||||||
characterfile.close();
|
characterfile.close();
|
||||||
} catch (IOException ioexception) {
|
} catch (IOException ioexception) {
|
||||||
|
|||||||
@@ -74,6 +74,7 @@ public class Commands implements PacketType {
|
|||||||
case "coords":
|
case "coords":
|
||||||
case "coord":
|
case "coord":
|
||||||
case "pos":
|
case "pos":
|
||||||
|
case "loc":
|
||||||
player.getPacketSender().sendMessage("Your coords are [" + player.absX + ", " + player.absY + ", " + player.heightLevel + "]");
|
player.getPacketSender().sendMessage("Your coords are [" + player.absX + ", " + player.absY + ", " + player.heightLevel + "]");
|
||||||
break;
|
break;
|
||||||
case "password":
|
case "password":
|
||||||
@@ -91,13 +92,38 @@ public class Commands implements PacketType {
|
|||||||
player.logout(true);
|
player.logout(true);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case "null":
|
|
||||||
break;
|
|
||||||
case "players":
|
case "players":
|
||||||
if (PlayerHandler.getPlayerCount() != 1) {
|
case "playershops":
|
||||||
player.getPacketSender().sendMessage("There are currently " + PlayerHandler.getPlayerCount() + " players online.");
|
int count = playerCommand.equalsIgnoreCase("players") ? PlayerHandler.getPlayerCount() : PlayerHandler.getPlayerShopCount();
|
||||||
|
if (count != 1) {
|
||||||
|
player.getPacketSender().sendMessage("There are currently " + count + " " + (playerCommand.equalsIgnoreCase("players") ? "players" : "player shops") + " online.");
|
||||||
} else {
|
} else {
|
||||||
player.getPacketSender().sendMessage("There is currently " + PlayerHandler.getPlayerCount() + " player online.");
|
player.getPacketSender().sendMessage("There is currently " + count + " " + (playerCommand.equalsIgnoreCase("players") ? "player" : "player shop") + " online.");
|
||||||
|
}
|
||||||
|
if (player.playerRights > 0) {
|
||||||
|
String[] players = new String[count];
|
||||||
|
|
||||||
|
int playerIndex = 0;
|
||||||
|
for(Player _player : PlayerHandler.players) {
|
||||||
|
if(_player != null) {
|
||||||
|
if (playerCommand.equalsIgnoreCase("players") ? !_player.isBot : _player.isBot)
|
||||||
|
players[playerIndex++] = _player.properName;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// Clear all lines
|
||||||
|
for (int i = 8144; i < 8195; i++) player.getPacketSender().sendFrame126("", i);
|
||||||
|
|
||||||
|
player.getPacketSender().sendFrame126("@dre@" + (playerCommand.equalsIgnoreCase("players") ? "Players" : "Player Shops"), 8144);
|
||||||
|
|
||||||
|
int playersLineNumber = 8147;
|
||||||
|
for (String line : players){
|
||||||
|
player.getPacketSender().sendFrame126(line, playersLineNumber++);
|
||||||
|
}
|
||||||
|
player.getPacketSender().showInterface(8134);
|
||||||
|
break;
|
||||||
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case "shop":
|
case "shop":
|
||||||
@@ -151,10 +177,49 @@ public class Commands implements PacketType {
|
|||||||
player.getPacketSender().closeAllWindows();
|
player.getPacketSender().closeAllWindows();
|
||||||
break;
|
break;
|
||||||
case "commands":
|
case "commands":
|
||||||
player.getPacketSender().sendMessage("::players, ::highscores, ::loc, ::stuck, ::randomtoggle, ::debug, ::togglegfx, ::shop");
|
String[] commands = new String[]{
|
||||||
break;
|
"::players",
|
||||||
case "loc":
|
"Show how many players are online",
|
||||||
player.getPacketSender().sendMessage(player.absX + "," + player.absY);
|
"",
|
||||||
|
"::highscores",
|
||||||
|
"Get a list of current highscores",
|
||||||
|
"",
|
||||||
|
"::loc, ::pos, ::coord",
|
||||||
|
"Get your current world position",
|
||||||
|
"",
|
||||||
|
"::stuck",
|
||||||
|
"Return to Lumbridge when stuck",
|
||||||
|
"",
|
||||||
|
"::randomtoggle",
|
||||||
|
"Enable/Disable random events",
|
||||||
|
"",
|
||||||
|
"::debug",
|
||||||
|
"Enable/Disable debug information",
|
||||||
|
"",
|
||||||
|
"::togglegfx",
|
||||||
|
"Enable/Disable graphics rendering",
|
||||||
|
"",
|
||||||
|
"::shop",
|
||||||
|
"Open/Move player owned shop to your location",
|
||||||
|
"",
|
||||||
|
"::closeshop",
|
||||||
|
"Close your player owned shop",
|
||||||
|
"",
|
||||||
|
"::withdrawshop",
|
||||||
|
"Withdraw profits from player owned shop",
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
// Clear all lines
|
||||||
|
for (int i = 8144; i < 8195; i++) player.getPacketSender().sendFrame126("", i);
|
||||||
|
|
||||||
|
player.getPacketSender().sendFrame126("@dre@Commands", 8144);
|
||||||
|
|
||||||
|
int commandsLineNumber = 8147;
|
||||||
|
for (String line : commands){
|
||||||
|
player.getPacketSender().sendFrame126(line, commandsLineNumber++);
|
||||||
|
}
|
||||||
|
player.getPacketSender().showInterface(8134);
|
||||||
break;
|
break;
|
||||||
case "stuck":
|
case "stuck":
|
||||||
player.getPlayerAssistant().startTeleport(LUMBRIDGE_X, LUMBRIDGE_Y, 0, "modern");
|
player.getPlayerAssistant().startTeleport(LUMBRIDGE_X, LUMBRIDGE_Y, 0, "modern");
|
||||||
@@ -211,10 +276,9 @@ public class Commands implements PacketType {
|
|||||||
|
|
||||||
player.getPacketSender().sendFrame126("@dre@Highscores", 8144);
|
player.getPacketSender().sendFrame126("@dre@Highscores", 8144);
|
||||||
|
|
||||||
int lineNumber = 8147;
|
int highscoresLineNumber = 8147;
|
||||||
for (String line : highscores){
|
for (String line : highscores){
|
||||||
System.out.println(line + " - " + lineNumber);
|
player.getPacketSender().sendFrame126(line, highscoresLineNumber++);
|
||||||
player.getPacketSender().sendFrame126(line, lineNumber++);
|
|
||||||
}
|
}
|
||||||
player.getPacketSender().showInterface(8134);
|
player.getPacketSender().showInterface(8134);
|
||||||
|
|
||||||
|
|||||||
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user