diff --git a/2006Scape Server/data/discord.json b/2006Scape Server/data/discord.json deleted file mode 100644 index 6d308feb..00000000 --- a/2006Scape Server/data/discord.json +++ /dev/null @@ -1 +0,0 @@ -{"token":""} \ No newline at end of file diff --git a/2006Scape Server/src/main/java/com/rs2/GameConstants.java b/2006Scape Server/src/main/java/com/rs2/GameConstants.java index aec7243f..e0448f08 100644 --- a/2006Scape Server/src/main/java/com/rs2/GameConstants.java +++ b/2006Scape Server/src/main/java/com/rs2/GameConstants.java @@ -26,7 +26,8 @@ public class GameConstants { * ADMIN_DROP_ITEMS Defines Whether Admins Can Drop Items * ADMIN_CAN_SELL_ITEMS Defines Whether Admins Can Sell Items * VARIABLE_XP_RATE Allows Players To Choose An XP Rate(x1,x2,x5,x10) - * XP_RATE Sets The XP Rate Multiplier For All Players/Skills If VARIABLE_XP_RATES is false + * PLAYER_XP_RATES Defines The XP Rates That Should Be Available To Players When VARIABLE_XP_RATE is true + * XP_RATE Sets The XP Rate Multiplier For All Players/Skills If VARIABLE_XP_RATE is false */ public static String SERVER_NAME = "2006Scape", WEBSITE_LINK = "https://2006Scape.org"; public static int WORLD = 1, MAX_PLAYERS = 200, TIMEOUT = 60, SAVE_TIMER = 120, @@ -34,6 +35,7 @@ public class GameConstants { public static boolean FILE_SERVER = true, SERVER_DEBUG = false, MEMBERS_ONLY = false, TUTORIAL_ISLAND = false, PARTY_ROOM_DISABLED = false, CLUES_ENABLED = true, ITEM_REQUIREMENTS = true, ADMIN_CAN_TRADE = false, ADMIN_DROP_ITEMS = false, ADMIN_CAN_SELL_ITEMS = false, VARIABLE_XP_RATE = true; + public static int[] PLAYER_XP_RATES = new int[] {1, 2, 5, 10}; public static double XP_RATE = 1.0; diff --git a/2006Scape Server/src/main/java/com/rs2/game/dialogues/DialogueHandler.java b/2006Scape Server/src/main/java/com/rs2/game/dialogues/DialogueHandler.java index 169558f5..4fe1609b 100644 --- a/2006Scape Server/src/main/java/com/rs2/game/dialogues/DialogueHandler.java +++ b/2006Scape Server/src/main/java/com/rs2/game/dialogues/DialogueHandler.java @@ -7599,11 +7599,11 @@ public class DialogueHandler { player.dialogueAction = 10000; break; case 10001: - sendNpcChat(2244, ChatEmotes.HAPPY_JOYFUL, "Please select the XP rate you'd like.", "this can be increased but not decreased later on."); + sendNpcChat(2244, ChatEmotes.HAPPY_JOYFUL, "Please select the XP rate you'd like.", "this can be increased, but not decreased later on."); player.nextChat = 10002; break; case 10002: - sendOption("x1", "x2", "x5", "x10"); + sendOption("x" + GameConstants.PLAYER_XP_RATES[0], "x" + GameConstants.PLAYER_XP_RATES[1], "x" + GameConstants.PLAYER_XP_RATES[2], "x" + GameConstants.PLAYER_XP_RATES[3]); player.dialogueAction = 10002; break; case 10003: @@ -7615,15 +7615,15 @@ public class DialogueHandler { player.dialogueAction = 10004; break; case 10005: - sendOption("x2", "x5", "x10"); + sendOption("x" + GameConstants.PLAYER_XP_RATES[1], "x" + GameConstants.PLAYER_XP_RATES[2], "x" + GameConstants.PLAYER_XP_RATES[3]); player.dialogueAction = 10005; break; case 10006: - sendOption("x5", "x10"); + sendOption("x" + GameConstants.PLAYER_XP_RATES[2], "x" + GameConstants.PLAYER_XP_RATES[3]); player.dialogueAction = 10006; break; case 10007: - sendOption("x10", "Don't Change"); + sendOption("x" + GameConstants.PLAYER_XP_RATES[3], "Don't Change"); player.dialogueAction = 10007; break; } diff --git a/2006Scape Server/src/main/java/com/rs2/game/dialogues/DialogueOptions.java b/2006Scape Server/src/main/java/com/rs2/game/dialogues/DialogueOptions.java index 13b19b6f..1a3aa7ea 100644 --- a/2006Scape Server/src/main/java/com/rs2/game/dialogues/DialogueOptions.java +++ b/2006Scape Server/src/main/java/com/rs2/game/dialogues/DialogueOptions.java @@ -105,9 +105,10 @@ public class DialogueOptions { BotHandler.playerShop(player); return; case 10005: - player.setXPRate(2); + player.setXPRate(GameConstants.PLAYER_XP_RATES[1]); player.getPacketSender().sendMessage("Your XP rate is now set to x" + player.getXPRate() + " you can increase your rate in the future by using"); player.getPacketSender().sendMessage("::xprate"); + player.getPacketSender().closeAllWindows(); return; } player.dialogueAction = 0; @@ -198,9 +199,10 @@ public class DialogueOptions { BotHandler.closeShop(player); return; case 10005: - player.setXPRate(5); + player.setXPRate(GameConstants.PLAYER_XP_RATES[2]); player.getPacketSender().sendMessage("Your XP rate is now set to x" + player.getXPRate() + " you can increase your rate in the future by using"); player.getPacketSender().sendMessage("::xprate"); + player.getPacketSender().closeAllWindows(); return; } player.dialogueAction = 0; @@ -294,9 +296,9 @@ public class DialogueOptions { BotHandler.takeCoins(player); return; case 10005: - player.setXPRate(10); - player.getPacketSender().sendMessage("Your XP rate is now set to x" + player.getXPRate() + " you can increase your rate in the future by using"); - player.getPacketSender().sendMessage("::xprate"); + player.setXPRate(GameConstants.PLAYER_XP_RATES[3]); + player.getPacketSender().sendMessage("Your XP rate is now set to x" + player.getXPRate() + " you now have the highest XP rate."); + player.getPacketSender().closeAllWindows(); return; } player.dialogueAction = 0; @@ -643,21 +645,26 @@ public class DialogueOptions { player.getPacketSender().showInterface(3559); player.canChangeAppearance = true; player.closeTutorialInterface = true; - } else if (player.getXPRate() != 10) { + return; + } else if (player.getXPRate() != + GameConstants.PLAYER_XP_RATES[3]) { player.getPacketSender().sendMessage("Your XP rate is now set to x" + player.getXPRate() + " you can increase your rate in the future by using"); player.getPacketSender().sendMessage("::xprate"); + return; } else { - player.getPacketSender().sendMessage("Your XP rate is now set to x" + player.getXPRate() + " you can increase your rate in the future by using"); + player.getPacketSender().sendMessage("Your XP rate is now set to x" + player.getXPRate() + " you now have the highest XP rate."); + return; } - return; } else if(player.dialogueAction == 10006) { - player.setXPRate(5); + player.setXPRate(GameConstants.PLAYER_XP_RATES[2]); player.getPacketSender().sendMessage("Your XP rate is now set to x" + player.getXPRate() + " you can increase your rate in the future by using"); player.getPacketSender().sendMessage("::xprate"); + player.getPacketSender().closeAllWindows(); + return; } else if(player.dialogueAction == 10007) { - player.setXPRate(10); - player.getPacketSender().sendMessage("Your XP rate is now set to x" + player.getXPRate() + " you can increase your rate in the future by using"); - player.getPacketSender().sendMessage("::xprate"); + player.setXPRate(GameConstants.PLAYER_XP_RATES[3]); + player.getPacketSender().sendMessage("Your XP rate is now set to x" + player.getXPRate() + " you now have the highest XP rate."); + player.getPacketSender().closeAllWindows(); + return; } player.dialogueAction = 0; player.getPacketSender().closeAllWindows(); @@ -888,9 +895,11 @@ public class DialogueOptions { player.getDialogueHandler().sendDialogues(10002, 2244); return; } else if(player.dialogueAction == 10006) { - player.setXPRate(10); - player.getPacketSender().sendMessage("Your XP rate is now set to x" + player.getXPRate() + " you can increase your rate in the future by using"); + player.setXPRate(GameConstants.PLAYER_XP_RATES[3]); + player.getPacketSender().sendMessage("Your XP rate is now set to x" + player.getXPRate() + " you now have the highest XP rate."); player.getPacketSender().sendMessage("::xprate"); + player.getPacketSender().closeAllWindows(); + return; } player.dialogueAction = 0; player.getPacketSender().closeAllWindows(); @@ -966,7 +975,7 @@ public class DialogueOptions { player.getDialogueHandler().sendDialogues(3561, player.npcType); } if (player.dialogueAction == 10002) { - player.setXPRate(1); + player.setXPRate(GameConstants.PLAYER_XP_RATES[0]); player.getDialogueHandler().sendDialogues(10003, player.npcType); } break; @@ -1039,7 +1048,7 @@ public class DialogueOptions { player.getDialogueHandler().sendDialogues(3562, player.npcType); } if (player.dialogueAction == 10002) { - player.setXPRate(2); + player.setXPRate(GameConstants.PLAYER_XP_RATES[1]); player.getDialogueHandler().sendDialogues(10003, player.npcType); } break; @@ -1115,7 +1124,7 @@ public class DialogueOptions { player.getDialogueHandler().sendDialogues(3563, player.npcType); } if (player.dialogueAction == 10002) { - player.setXPRate(5); + player.setXPRate(GameConstants.PLAYER_XP_RATES[2]); player.getDialogueHandler().sendDialogues(10003, player.npcType); } break; @@ -1176,7 +1185,7 @@ public class DialogueOptions { player.getDialogueHandler().sendDialogues(3564, player.npcType); } if (player.dialogueAction == 10002) { - player.setXPRate(10); + player.setXPRate(GameConstants.PLAYER_XP_RATES[3]); player.getDialogueHandler().sendDialogues(10003, player.npcType); } break; diff --git a/2006Scape Server/src/main/java/com/rs2/net/packets/impl/Commands.java b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/Commands.java index e3dcd335..9d3de40d 100644 --- a/2006Scape Server/src/main/java/com/rs2/net/packets/impl/Commands.java +++ b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/Commands.java @@ -8,7 +8,6 @@ import com.rs2.Connection; import com.rs2.GameConstants; import com.rs2.GameEngine; import com.rs2.game.bots.BotHandler; -import com.rs2.game.content.combat.magic.SpellTeleport; import com.rs2.game.npcs.NpcHandler; import com.rs2.game.players.*; import com.rs2.game.players.antimacro.AntiSpam; @@ -47,21 +46,21 @@ public class Commands implements PacketType { switch (playerCommand.toLowerCase()) { case "xprate": if(GameConstants.VARIABLE_XP_RATE) { - if (player.getXPRate() == 0 || player.playerRights >= 2) { - player.getDialogueHandler().sendDialogues(10001, 2244); - return; - } else if (player.getXPRate() == 1) { + if (player.getXPRate() == GameConstants.PLAYER_XP_RATES[0]) { player.getDialogueHandler().sendDialogues(10005, 2244); return; - } else if (player.getXPRate() == 2) { + } else if (player.getXPRate() == GameConstants.PLAYER_XP_RATES[1]) { player.getDialogueHandler().sendDialogues(10006, 2244); return; - } else if (player.getXPRate() == 5) { + } else if (player.getXPRate() == GameConstants.PLAYER_XP_RATES[2]) { player.getDialogueHandler().sendDialogues(10007, 2244); return; - } else if (player.getXPRate() == 10) { + } else if (player.getXPRate() == GameConstants.PLAYER_XP_RATES[3]) { player.getPacketSender().sendMessage("You already have the highest XP rate."); return; + } else { + player.getDialogueHandler().sendDialogues(10001, 2244); + return; } } else { player.getPacketSender().sendMessage("You can't use this command in this world.");