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

Create/Use PLAYER_XP_RATES For Easier Rate Changes

Browse Source
This commit is contained in:
Dark98
2021-12-13 01:21:44 +00:00
parent 83eb0be61a
commit c47d9a4b15
5 changed files with 42 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2006Scape Server/data/discord.json
-1
View File
@@ -1 +0,0 @@
{"token":""}
2006Scape Server/src/main/java/com/rs2/GameConstants.java
+3 -1
View File
@@ -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;
2006Scape Server/src/main/java/com/rs2/game/dialogues/DialogueHandler.java
+5 -5
View File
@@ -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;
}
2006Scape Server/src/main/java/com/rs2/game/dialogues/DialogueOptions.java
+27 -18
View File
@@ -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;
2006Scape Server/src/main/java/com/rs2/net/packets/impl/Commands.java
+7 -8
View File
@@ -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.");