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

Small Fixup For World 2

Browse Source 
Renamed BOT_WORLD to VARIABLE_XP_RATE
Fixed Dialogue/Message grammar
Added a check for VARIABLE_XP_RATES to ::xprate command
This commit is contained in:
Dark98
2021-12-06 07:01:25 +00:00
parent f64b0469c2
commit 2fc416c3e1
6 changed files with 36 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2006Scape Server/ServerConfig.Sample.json
+1 -1
View File
@@ -4,7 +4,7 @@
"server_debug": false, "server_debug": false,
"file_server": true, "file_server": true,
"world_id": 1, "world_id": 1,
"bot_world": true, "variable_xp_rate": false,
"members_only": false, "members_only": false,
"tutorial_island_enabled": false, "tutorial_island_enabled": false,
"party_room_enabled": true, "party_room_enabled": true,
2006Scape Server/src/main/java/com/rs2/ConfigLoader.java
+2 -2
View File
@@ -25,8 +25,8 @@ public class ConfigLoader {
GameConstants.FILE_SERVER = obj.getBoolean("file_server"); GameConstants.FILE_SERVER = obj.getBoolean("file_server");
if(obj.has("world_id")) if(obj.has("world_id"))
GameConstants.WORLD = obj.getInt("world_id"); GameConstants.WORLD = obj.getInt("world_id");
if(obj.has("bot_world")) if(obj.has("variable_xp_rate"))
GameConstants.BOT_WORLD = obj.getBoolean("bot_world"); GameConstants.VARIABLE_XP_RATE = obj.getBoolean("variable_xp_rate");
if(obj.has("members_only")) if(obj.has("members_only"))
GameConstants.MEMBERS_ONLY = obj.getBoolean("members_only"); GameConstants.MEMBERS_ONLY = obj.getBoolean("members_only");
if(obj.has("tutorial_island_enabled")) if(obj.has("tutorial_island_enabled"))
2006Scape Server/src/main/java/com/rs2/GameConstants.java
+2 -1
View File
@@ -25,6 +25,7 @@ public class GameConstants {
* ADMIN_CAN_TRADE Defines Whether Admins Can Trade * ADMIN_CAN_TRADE Defines Whether Admins Can Trade
* ADMIN_DROP_ITEMS Defines Whether Admins Can Drop Items * ADMIN_DROP_ITEMS Defines Whether Admins Can Drop Items
* ADMIN_CAN_SELL_ITEMS Defines Whether Admins Can Sell 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 * XP_RATE Sets The XP Rate Multiplier For All Players/Skills
*/ */
public static String SERVER_NAME = "2006Scape", WEBSITE_LINK = "https://2006Scape.org"; public static String SERVER_NAME = "2006Scape", WEBSITE_LINK = "https://2006Scape.org";
@@ -32,7 +33,7 @@ public class GameConstants {
RESPAWN_X = 3222, RESPAWN_Y = 3218; RESPAWN_X = 3222, RESPAWN_Y = 3218;
public static boolean FILE_SERVER = true, SERVER_DEBUG = false, MEMBERS_ONLY = false, TUTORIAL_ISLAND = false, 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, 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; public static double XP_RATE = Player.xpRate;
2006Scape Server/src/main/java/com/rs2/game/dialogues/DialogueHandler.java
+3 -3
View File
@@ -6137,7 +6137,7 @@ public class DialogueHandler {
break; break;
case 3116: case 3116:
if(!GameConstants.BOT_WORLD) { if(GameConstants.VARIABLE_XP_RATE) {
player.getDialogueHandler().sendDialogues(10001, -1); player.getDialogueHandler().sendDialogues(10001, -1);
} else { } else {
player.getPacketSender().showInterface(3559); player.getPacketSender().showInterface(3559);
@@ -7599,7 +7599,7 @@ public class DialogueHandler {
player.dialogueAction = 10000; player.dialogueAction = 10000;
break; break;
case 10001: 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; player.nextChat = 10002;
break; break;
case 10002: case 10002:
@@ -7607,7 +7607,7 @@ public class DialogueHandler {
player.dialogueAction = 10002; player.dialogueAction = 10002;
break; break;
case 10003: 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; player.nextChat = 10004;
break; break;
case 10004: case 10004:
2006Scape Server/src/main/java/com/rs2/game/dialogues/DialogueOptions.java
+9 -9
View File
@@ -106,7 +106,7 @@ public class DialogueOptions {
return; return;
case 10005: case 10005:
player.setXPRate(2); 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"); player.getPacketSender().sendMessage("::xprate");
return; return;
} }
@@ -199,7 +199,7 @@ public class DialogueOptions {
return; return;
case 10005: case 10005:
player.setXPRate(5); 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"); player.getPacketSender().sendMessage("::xprate");
return; return;
} }
@@ -295,7 +295,7 @@ public class DialogueOptions {
return; return;
case 10005: case 10005:
player.setXPRate(10); 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.getPacketSender().sendMessage("::xprate");
return; return;
} }
@@ -638,25 +638,25 @@ public class DialogueOptions {
return; return;
} else if (player.dialogueAction == 10004) { } else if (player.dialogueAction == 10004) {
if(!player.closeTutorialInterface) { 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().sendMessage("::xprate");
player.getPacketSender().showInterface(3559); player.getPacketSender().showInterface(3559);
player.canChangeAppearance = true; player.canChangeAppearance = true;
player.closeTutorialInterface = true; player.closeTutorialInterface = true;
} else if (player.getXPRate() != 10) { } 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"); player.getPacketSender().sendMessage("::xprate");
} else { } 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; return;
} else if(player.dialogueAction == 10006) { } else if(player.dialogueAction == 10006) {
player.setXPRate(5); 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"); player.getPacketSender().sendMessage("::xprate");
} else if(player.dialogueAction == 10007) { } else if(player.dialogueAction == 10007) {
player.setXPRate(10); 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.getPacketSender().sendMessage("::xprate");
} }
player.dialogueAction = 0; player.dialogueAction = 0;
@@ -889,7 +889,7 @@ public class DialogueOptions {
return; return;
} else if(player.dialogueAction == 10006) { } else if(player.dialogueAction == 10006) {
player.setXPRate(10); 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.getPacketSender().sendMessage("::xprate");
} }
player.dialogueAction = 0; player.dialogueAction = 0;
2006Scape Server/src/main/java/com/rs2/net/packets/impl/Commands.java
+19 -16
View File
@@ -46,22 +46,25 @@ public class Commands implements PacketType {
public static void playerCommands(Player player, String playerCommand, String[] arguments) { public static void playerCommands(Player player, String playerCommand, String[] arguments) {
switch (playerCommand.toLowerCase()) { switch (playerCommand.toLowerCase()) {
case "xprate": case "xprate":
case "XPRate": if(GameConstants.VARIABLE_XP_RATE) {
if(player.getXPRate() == 0/* || player.playerRights == 3*/) { if (player.getXPRate() == 0 || player.playerRights >= 2) {
player.getDialogueHandler().sendDialogues(10001, 2244); player.getDialogueHandler().sendDialogues(10001, 2244);
return; return;
} else if (player.getXPRate() == 1) { } else if (player.getXPRate() == 1) {
player.getDialogueHandler().sendDialogues(10005, 2244); player.getDialogueHandler().sendDialogues(10005, 2244);
return; return;
} else if (player.getXPRate() == 2) { } else if (player.getXPRate() == 2) {
player.getDialogueHandler().sendDialogues(10006, 2244); player.getDialogueHandler().sendDialogues(10006, 2244);
return; return;
} else if (player.getXPRate() == 5) { } else if (player.getXPRate() == 5) {
player.getDialogueHandler().sendDialogues(10007, 2244); player.getDialogueHandler().sendDialogues(10007, 2244);
return; return;
} else if (player.getXPRate() == 10) { } else if (player.getXPRate() == 10) {
player.getPacketSender().sendMessage("You Already Have The Highest XP Rate"); player.getPacketSender().sendMessage("You already have the highest XP rate.");
return; return;
}
} else {
player.getPacketSender().sendMessage("You can't use this command in this world.");
} }
break; break;
case "toggleyell": case "toggleyell":