From 2fc416c3e109b75bc694092b5e2d1d0b3c267e9b Mon Sep 17 00:00:00 2001 From: Dark98 Date: Mon, 6 Dec 2021 07:01:25 +0000 Subject: [PATCH] Small Fixup For World 2 Renamed BOT_WORLD to VARIABLE_XP_RATE Fixed Dialogue/Message grammar Added a check for VARIABLE_XP_RATES to ::xprate command --- 2006Scape Server/ServerConfig.Sample.json | 2 +- .../src/main/java/com/rs2/ConfigLoader.java | 4 +-- .../src/main/java/com/rs2/GameConstants.java | 3 +- .../rs2/game/dialogues/DialogueHandler.java | 6 ++-- .../rs2/game/dialogues/DialogueOptions.java | 18 +++++----- .../com/rs2/net/packets/impl/Commands.java | 35 ++++++++++--------- 6 files changed, 36 insertions(+), 32 deletions(-) diff --git a/2006Scape Server/ServerConfig.Sample.json b/2006Scape Server/ServerConfig.Sample.json index a57fada0..fed3bde3 100644 --- a/2006Scape Server/ServerConfig.Sample.json +++ b/2006Scape Server/ServerConfig.Sample.json @@ -4,7 +4,7 @@ "server_debug": false, "file_server": true, "world_id": 1, - "bot_world": true, + "variable_xp_rate": false, "members_only": false, "tutorial_island_enabled": false, "party_room_enabled": true, diff --git a/2006Scape Server/src/main/java/com/rs2/ConfigLoader.java b/2006Scape Server/src/main/java/com/rs2/ConfigLoader.java index a8c4a555..01bdecad 100644 --- a/2006Scape Server/src/main/java/com/rs2/ConfigLoader.java +++ b/2006Scape Server/src/main/java/com/rs2/ConfigLoader.java @@ -25,8 +25,8 @@ public class ConfigLoader { GameConstants.FILE_SERVER = obj.getBoolean("file_server"); if(obj.has("world_id")) GameConstants.WORLD = obj.getInt("world_id"); - if(obj.has("bot_world")) - GameConstants.BOT_WORLD = obj.getBoolean("bot_world"); + if(obj.has("variable_xp_rate")) + GameConstants.VARIABLE_XP_RATE = obj.getBoolean("variable_xp_rate"); if(obj.has("members_only")) GameConstants.MEMBERS_ONLY = obj.getBoolean("members_only"); if(obj.has("tutorial_island_enabled")) diff --git a/2006Scape Server/src/main/java/com/rs2/GameConstants.java b/2006Scape Server/src/main/java/com/rs2/GameConstants.java index 17bafc04..98b3beb9 100644 --- a/2006Scape Server/src/main/java/com/rs2/GameConstants.java +++ b/2006Scape Server/src/main/java/com/rs2/GameConstants.java @@ -25,6 +25,7 @@ public class GameConstants { * ADMIN_CAN_TRADE Defines Whether Admins Can Trade * 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 */ public static String SERVER_NAME = "2006Scape", WEBSITE_LINK = "https://2006Scape.org"; @@ -32,7 +33,7 @@ public class GameConstants { RESPAWN_X = 3222, RESPAWN_Y = 3218; 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, BOT_WORLD = true; + ADMIN_CAN_TRADE = false, ADMIN_DROP_ITEMS = false, ADMIN_CAN_SELL_ITEMS = false, VARIABLE_XP_RATE = true; public static double XP_RATE = Player.xpRate; 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 f4aa7f54..f3e79158 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 @@ -6137,7 +6137,7 @@ public class DialogueHandler { break; case 3116: - if(!GameConstants.BOT_WORLD) { + if(GameConstants.VARIABLE_XP_RATE) { player.getDialogueHandler().sendDialogues(10001, -1); } else { player.getPacketSender().showInterface(3559); @@ -7599,7 +7599,7 @@ 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: @@ -7607,7 +7607,7 @@ public class DialogueHandler { player.dialogueAction = 10002; break; case 10003: - sendNpcChat(2244, ChatEmotes.HAPPY_JOYFUL, "Are You Sure x" + player.getXPRate() + " Is The XP Rate You'd Like?"); + sendNpcChat(2244, ChatEmotes.HAPPY_JOYFUL, "Are you sure x" + player.getXPRate() + "is the XP rate you'd like?"); player.nextChat = 10004; break; case 10004: 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 1da6698f..13b19b6f 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 @@ -106,7 +106,7 @@ public class DialogueOptions { return; case 10005: player.setXPRate(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("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; } @@ -199,7 +199,7 @@ public class DialogueOptions { return; case 10005: player.setXPRate(5); - 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 can increase your rate in the future by using"); player.getPacketSender().sendMessage("::xprate"); return; } @@ -295,7 +295,7 @@ public class DialogueOptions { 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("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; } @@ -638,25 +638,25 @@ public class DialogueOptions { return; } else if (player.dialogueAction == 10004) { if(!player.closeTutorialInterface) { - 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 can increase your rate in the future by using"); player.getPacketSender().sendMessage("::xprate"); player.getPacketSender().showInterface(3559); player.canChangeAppearance = true; player.closeTutorialInterface = true; } else if (player.getXPRate() != 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("Your XP rate is now set to x" + player.getXPRate() + " you can increase your rate in the future by using"); player.getPacketSender().sendMessage("::xprate"); } else { - player.getPacketSender().sendMessage("Your XP Rate Is Now Set To x" + player.getXPRate()); + player.getPacketSender().sendMessage("Your XP rate is now set to x" + player.getXPRate() + " you can increase your rate in the future by using"); } return; } else if(player.dialogueAction == 10006) { player.setXPRate(5); - 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 can increase your rate in the future by using"); player.getPacketSender().sendMessage("::xprate"); } 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("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.dialogueAction = 0; @@ -889,7 +889,7 @@ public class DialogueOptions { 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.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.dialogueAction = 0; 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 4d17b6af..ed441143 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 @@ -46,22 +46,25 @@ public class Commands implements PacketType { public static void playerCommands(Player player, String playerCommand, String[] arguments) { switch (playerCommand.toLowerCase()) { case "xprate": - case "XPRate": - if(player.getXPRate() == 0/* || player.playerRights == 3*/) { - player.getDialogueHandler().sendDialogues(10001, 2244); - return; - } else if (player.getXPRate() == 1) { - player.getDialogueHandler().sendDialogues(10005, 2244); - return; - } else if (player.getXPRate() == 2) { - player.getDialogueHandler().sendDialogues(10006, 2244); - return; - } else if (player.getXPRate() == 5) { - player.getDialogueHandler().sendDialogues(10007, 2244); - return; - } else if (player.getXPRate() == 10) { - player.getPacketSender().sendMessage("You Already Have The Highest XP Rate"); - return; + if(GameConstants.VARIABLE_XP_RATE) { + if (player.getXPRate() == 0 || player.playerRights >= 2) { + player.getDialogueHandler().sendDialogues(10001, 2244); + return; + } else if (player.getXPRate() == 1) { + player.getDialogueHandler().sendDialogues(10005, 2244); + return; + } else if (player.getXPRate() == 2) { + player.getDialogueHandler().sendDialogues(10006, 2244); + return; + } else if (player.getXPRate() == 5) { + player.getDialogueHandler().sendDialogues(10007, 2244); + return; + } else if (player.getXPRate() == 10) { + player.getPacketSender().sendMessage("You already have the highest XP rate."); + return; + } + } else { + player.getPacketSender().sendMessage("You can't use this command in this world."); } break; case "toggleyell":