diff --git a/2006Redone Client/src/Game.java b/2006Redone Client/src/Game.java index b82a5076..d6442088 100644 --- a/2006Redone Client/src/Game.java +++ b/2006Redone Client/src/Game.java @@ -1231,7 +1231,6 @@ public class Game extends RSApplet { } } } - } public void method30(int j, int k, int l, int i1, int j1) { @@ -12087,7 +12086,7 @@ public class Game extends RSApplet { public int anInt1289; public static int tiara; public static int anInt1290; - public boolean showInfo; + public boolean showInfo = true; public static int anInt1401 = 256; public static int[] anIntArray385 = new int[] { 12800, 12800, 12800, 12800, 12800, 12800, 12800, 12800, 12800, 12800, 12800, 12800, diff --git a/2006Redone Server/data/characters/irdb.txt b/2006Redone Server/data/characters/irdb.txt index 107e1f3d..2c10e550 100644 --- a/2006Redone Server/data/characters/irdb.txt +++ b/2006Redone Server/data/characters/irdb.txt @@ -4,8 +4,8 @@ character-password = pwjojo [CHARACTER] character-height = 2 -character-posx = 3210 -character-posy = 3218 +character-posx = 3209 +character-posy = 3215 character-rights = 0 hasStarter = false bankPin1 = 0 @@ -55,8 +55,8 @@ blackMarks = 0 tutorial-progress = 36 skull-timer = 0 recoilHits = 0 -lastX = 3210 -lastY = 3218 +lastX = 3209 +lastY = 3215 lastH = 2 removedTask0 = -1 removedTask1 = -1 @@ -175,7 +175,6 @@ character-item = 5 1932 1 character-item = 6 2310 1 character-item = 7 1266 1 character-item = 8 1206 1 -character-item = 9 1278 1 character-item = 12 883 25 character-item = 16 558 4 character-item = 17 560 2 @@ -183,7 +182,6 @@ character-item = 17 560 2 [BANK] [FRIENDS] -character-friend = 0 211559 [IGNORES] diff --git a/2006Redone Server/data/logs/dropitem/irdb.txt b/2006Redone Server/data/logs/dropitem/irdb.txt index ef2493db..9bc780cd 100644 --- a/2006Redone Server/data/logs/dropitem/irdb.txt +++ b/2006Redone Server/data/logs/dropitem/irdb.txt @@ -1 +1,2 @@ [2019/06/19] 22:04 irdb dropped 1 bronze sword absX: 3210 absY: 3218 +[2019/06/19] 22:14 irdb dropped 1 bronze dagger absX: 3207 absY: 3215 diff --git a/2006Redone Server/data/logs/pickupitem/irdb.txt b/2006Redone Server/data/logs/pickupitem/irdb.txt new file mode 100644 index 00000000..752dede0 --- /dev/null +++ b/2006Redone Server/data/logs/pickupitem/irdb.txt @@ -0,0 +1 @@ +[2019/06/19] 22:14 irdb picked up bronze dagger itemX: 3207, itemY: 3215 diff --git a/2006Redone Server/src/redone/Constants.java b/2006Redone Server/src/redone/Constants.java index e0f6fac4..c660f456 100644 --- a/2006Redone Server/src/redone/Constants.java +++ b/2006Redone Server/src/redone/Constants.java @@ -4,8 +4,8 @@ public class Constants { public final static boolean SERVER_DEBUG = false; - public final static String SERVER_NAME = "2006Redone", SERVER_VERSION = "Server Stage v " + Constants.TEST_VERSION + "."; - public final static double TEST_VERSION = 1.13; + public final static String SERVER_NAME = "2006rebotted", SERVER_VERSION = "Server Stage v " + Constants.TEST_VERSION + "."; + public final static double TEST_VERSION = 2.00; public static int BANK_SIZE = 352; public final static int ITEM_LIMIT = 15000, MAXITEM_AMOUNT = Integer.MAX_VALUE, CLIENT_VERSION = 999999, WORLD = 1, IPS_ALLOWED = 3, CONNECTION_DELAY = 100, diff --git a/2006Redone Server/src/redone/game/players/Client.java b/2006Redone Server/src/redone/game/players/Client.java index de15f939..5f32bae5 100644 --- a/2006Redone Server/src/redone/game/players/Client.java +++ b/2006Redone Server/src/redone/game/players/Client.java @@ -651,10 +651,8 @@ public class Client extends Player { getPlayerAssistant().sendSidebars(); getItemAssistant().sendWeapon(playerEquipment[playerWeapon], ItemAssistant.getItemName(playerEquipment[playerWeapon])); getActionSender().sendMessage("Welcome to @blu@" + Constants.SERVER_NAME + "@bla@ - we are currently in Server Stage v@blu@" + Constants.TEST_VERSION + "@bla@."); - getActionSender().sendMessage("@red@Warning@bla@: If you find a bug, report it to owner in skype."); - if (!hasBankpin) { - getActionSender().sendMessage("You do not have a bank pin it is highly recommended you get one."); - } + getActionSender().sendMessage("@red@Did you know?@bla@ We're open source! Pull requests are welcome"); + getActionSender().sendMessage("Source code at github.com/dginovker/2006rebotted"); } for (int i = 0; i < 25; i++) { getActionSender().setSkillLevel(i, playerLevel[i], playerXP[i]); diff --git a/2006Redone Server/src/redone/net/packets/impl/Commands.java b/2006Redone Server/src/redone/net/packets/impl/Commands.java index c6f20c07..952a848d 100644 --- a/2006Redone Server/src/redone/net/packets/impl/Commands.java +++ b/2006Redone Server/src/redone/net/packets/impl/Commands.java @@ -54,6 +54,29 @@ public class Commands implements PacketType { case "close_interface": player.getPlayerAssistant().closeAllWindows(); break; + case "commands": + player.getActionSender().sendMessage("::players, ::highscores"); + break; + case "highscores": + String[] highscores = new String[]{ + "@dre@Highscores", + "", + "Top 5 Highest total level:", + "1", "2", "3", "4", "5", + "", + "Top 5 Highest coins stack:", + "1", "2", "3", "4", "5" + }; + player.getPlayerAssistant().sendFrame126("@dre@Highscores", 8144); + player.getPlayerAssistant().sendFrame126("", 8145); + player.getPlayerAssistant().sendFrame126("Top 5 Highest total level:", 8145); + player.getPlayerAssistant().sendFrame126("1", 8145); + player.getPlayerAssistant().sendFrame126("1", 8145); + player.getPlayerAssistant().sendFrame126("1", 8145); + player.getPlayerAssistant().sendFrame126("1", 8145); + player.getPlayerAssistant().sendFrame126("1", 8145); + break; + } } diff --git a/2006Redone_Server/redone/Constants.class b/2006Redone_Server/redone/Constants.class index efd6f807..be9ed9f1 100644 Binary files a/2006Redone_Server/redone/Constants.class and b/2006Redone_Server/redone/Constants.class differ diff --git a/2006Redone_Server/redone/Server.class b/2006Redone_Server/redone/Server.class index cca22214..66dc5d84 100644 Binary files a/2006Redone_Server/redone/Server.class and b/2006Redone_Server/redone/Server.class differ diff --git a/2006Redone_Server/redone/game/dialogues/DialogueHandler.class b/2006Redone_Server/redone/game/dialogues/DialogueHandler.class index 148f08a1..1668e4b3 100644 Binary files a/2006Redone_Server/redone/game/dialogues/DialogueHandler.class and b/2006Redone_Server/redone/game/dialogues/DialogueHandler.class differ diff --git a/2006Redone_Server/redone/game/objects/ObjectsActions.class b/2006Redone_Server/redone/game/objects/ObjectsActions.class index e74d268b..7ad45f89 100644 Binary files a/2006Redone_Server/redone/game/objects/ObjectsActions.class and b/2006Redone_Server/redone/game/objects/ObjectsActions.class differ diff --git a/2006Redone_Server/redone/game/players/Client$1.class b/2006Redone_Server/redone/game/players/Client$1.class index bafd78e7..84dafa15 100644 Binary files a/2006Redone_Server/redone/game/players/Client$1.class and b/2006Redone_Server/redone/game/players/Client$1.class differ diff --git a/2006Redone_Server/redone/game/players/Client$2.class b/2006Redone_Server/redone/game/players/Client$2.class index 097bbc6f..32615848 100644 Binary files a/2006Redone_Server/redone/game/players/Client$2.class and b/2006Redone_Server/redone/game/players/Client$2.class differ diff --git a/2006Redone_Server/redone/game/players/Client$3.class b/2006Redone_Server/redone/game/players/Client$3.class index 14388be8..a4708aff 100644 Binary files a/2006Redone_Server/redone/game/players/Client$3.class and b/2006Redone_Server/redone/game/players/Client$3.class differ diff --git a/2006Redone_Server/redone/game/players/Client$4.class b/2006Redone_Server/redone/game/players/Client$4.class index 758a7aa7..e22f0baf 100644 Binary files a/2006Redone_Server/redone/game/players/Client$4.class and b/2006Redone_Server/redone/game/players/Client$4.class differ diff --git a/2006Redone_Server/redone/game/players/Client.class b/2006Redone_Server/redone/game/players/Client.class index c91ab0b2..8f05023b 100644 Binary files a/2006Redone_Server/redone/game/players/Client.class and b/2006Redone_Server/redone/game/players/Client.class differ diff --git a/2006Redone_Server/redone/game/players/PlayerAssistant.class b/2006Redone_Server/redone/game/players/PlayerAssistant.class index 4bb72aad..117f219a 100644 Binary files a/2006Redone_Server/redone/game/players/PlayerAssistant.class and b/2006Redone_Server/redone/game/players/PlayerAssistant.class differ diff --git a/2006Redone_Server/redone/net/packets/impl/Commands.class b/2006Redone_Server/redone/net/packets/impl/Commands.class index 51b8e5c7..180a86a0 100644 Binary files a/2006Redone_Server/redone/net/packets/impl/Commands.class and b/2006Redone_Server/redone/net/packets/impl/Commands.class differ diff --git a/artifacts/client/client.jar b/artifacts/client/client.jar index 528b4d2b..069cb188 100644 Binary files a/artifacts/client/client.jar and b/artifacts/client/client.jar differ diff --git a/production/2006Redone_Client/Game.class b/production/2006Redone_Client/Game.class index 76a42040..89196382 100644 Binary files a/production/2006Redone_Client/Game.class and b/production/2006Redone_Client/Game.class differ