Skip to content

Commit d2faea6

Browse files
Dark98Dark98
committed
More Multi World Stuff
Update Integrations(Discord Bot/Website Stuff) For Multiple Worlds Added More XP Rate Dialogue Stuff
1 parent 38140d8 commit d2faea6

File tree

14 files changed

+72
-28
lines changed

14 files changed

+72
-28
lines changed

‎2006Scape Server/src/main/java/com/rs2/game/dialogues/DialogueHandler.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7614,6 +7614,18 @@ public void sendDialogues2(int dialogue, int npcId) {
76147614
sendOption("Yes", "No");
76157615
player.dialogueAction = 10004;
76167616
break;
7617+
case 10005:
7618+
sendOption("x2", "x5", "x10");
7619+
player.dialogueAction = 10005;
7620+
break;
7621+
case 10006:
7622+
sendOption("x5", "x10");
7623+
player.dialogueAction = 10006;
7624+
break;
7625+
case 10007:
7626+
sendOption("x10", "Don't Change");
7627+
player.dialogueAction = 10007;
7628+
break;
76177629
}
76187630
}
76197631
public void chatboxText(String text, String text1, String text2,

‎2006Scape Server/src/main/java/com/rs2/game/dialogues/DialogueOptions.java‎

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,11 @@ public static void handleDialogueOptions(Player player, int buttonId) {
104104
player.getDialogueHandler().sendStatement("You summoned your shop!");
105105
BotHandler.playerShop(player);
106106
return;
107+
case 10005:
108+
player.setXPRate(2);
109+
player.getPacketSender().sendMessage("Your XP Rate Is Now Set To x" + player.getXPRate() + " You Can Increase Your Rate In The Future By Using");
110+
player.getPacketSender().sendMessage("::xprate");
111+
return;
107112
}
108113
player.dialogueAction = 0;
109114
player.getPacketSender().closeAllWindows();
@@ -192,6 +197,11 @@ public static void handleDialogueOptions(Player player, int buttonId) {
192197
player.getDialogueHandler().sendStatement("You close your shop!");
193198
BotHandler.closeShop(player);
194199
return;
200+
case 10005:
201+
player.setXPRate(5);
202+
player.getPacketSender().sendMessage("Your XP Rate Is Now Set To x" + player.getXPRate() + " You Can Increase Your Rate In The Future By Using");
203+
player.getPacketSender().sendMessage("::xprate");
204+
return;
195205
}
196206
player.dialogueAction = 0;
197207
player.getPacketSender().closeAllWindows();
@@ -283,6 +293,11 @@ public static void handleDialogueOptions(Player player, int buttonId) {
283293
player.getDialogueHandler().sendStatement("You withdraw " + Bot.formatSellPrice(BotHandler.checkCoins(player)) + " from your shop!");
284294
BotHandler.takeCoins(player);
285295
return;
296+
case 10005:
297+
player.setXPRate(10);
298+
player.getPacketSender().sendMessage("Your XP Rate Is Now Set To x" + player.getXPRate() + " You Can Increase Your Rate In The Future By Using");
299+
player.getPacketSender().sendMessage("::xprate");
300+
return;
286301
}
287302
player.dialogueAction = 0;
288303
player.getPacketSender().closeAllWindows();
@@ -628,19 +643,21 @@ else if (player.dialogueAction == 7559) {
628643
player.getPacketSender().showInterface(3559);
629644
player.canChangeAppearance = true;
630645
player.closeTutorialInterface = true;
631-
player.nextChat = 0;
632-
player.dialogueAction = 0;
633646
} else if (player.getXPRate() != 10) {
634647
player.getPacketSender().sendMessage("Your XP Rate Is Now Set To x" + player.getXPRate() + " You Can Increase Your Rate In The Future By Using");
635648
player.getPacketSender().sendMessage("::xprate");
636-
player.dialogueAction = 0;
637-
player.getPacketSender().closeAllWindows();
638649
} else {
639650
player.getPacketSender().sendMessage("Your XP Rate Is Now Set To x" + player.getXPRate());
640-
player.dialogueAction = 0;
641-
player.getPacketSender().closeAllWindows();
642651
}
643652
return;
653+
} else if(player.dialogueAction == 10006) {
654+
player.setXPRate(5);
655+
player.getPacketSender().sendMessage("Your XP Rate Is Now Set To x" + player.getXPRate() + " You Can Increase Your Rate In The Future By Using");
656+
player.getPacketSender().sendMessage("::xprate");
657+
} else if(player.dialogueAction == 10007) {
658+
player.setXPRate(10);
659+
player.getPacketSender().sendMessage("Your XP Rate Is Now Set To x" + player.getXPRate() + " You Can Increase Your Rate In The Future By Using");
660+
player.getPacketSender().sendMessage("::xprate");
644661
}
645662
player.dialogueAction = 0;
646663
player.getPacketSender().closeAllWindows();
@@ -870,6 +887,10 @@ else if (player.dialogueAction == 7559)
870887
} else if (player.dialogueAction == 10004) {
871888
player.getDialogueHandler().sendDialogues(10002, 2244);
872889
return;
890+
} else if(player.dialogueAction == 10006) {
891+
player.setXPRate(10);
892+
player.getPacketSender().sendMessage("Your XP Rate Is Now Set To x" + player.getXPRate() + " You Can Increase Your Rate In The Future By Using");
893+
player.getPacketSender().sendMessage("::xprate");
873894
}
874895
player.dialogueAction = 0;
875896
player.getPacketSender().closeAllWindows();

‎2006Scape Server/src/main/java/com/rs2/integrations/PlayersOnlineWebsite.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class PlayersOnlineWebsite {
1313

1414
private static void setWebsitePlayersOnline(int amount) throws IOException {
1515
URL url;
16-
url = new URL(GameConstants.WEBSITE_LINK + "/playersonline.php?pass=" + password + "&amount=" + amount);
16+
url = new URL(GameConstants.WEBSITE_LINK + "/playersonline.php?pass=" + password + "&amount=" + amount + "&world=" + GameConstants.WORLD);
1717
url.openStream().close();
1818
}
1919

‎2006Scape Server/src/main/java/com/rs2/integrations/RegisteredAccsWebsite.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public class RegisteredAccsWebsite {
1212

1313
private static void setAccountsRegistered(int amount) throws IOException {
1414
URL url;
15-
url = new URL(GameConstants.WEBSITE_LINK + "/accountsregistered.php?pass=" + password + "&amount=" + amount);
15+
url = new URL(GameConstants.WEBSITE_LINK + "/accountsregistered.php?pass=" + password + "&amount=" + amount + "&world=" + GameConstants.WORLD);
1616
url.openStream().close();
1717
}
1818

‎2006Scape Server/src/main/java/com/rs2/integrations/discord/JavaCord.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public static void init() throws IOException {
3939
}
4040
api.addMessageCreateListener(event -> {
4141

42-
if (event.getMessageContent().startsWith("::movehome")) {
42+
if (event.getMessageContent().startsWith("::w" + GameConstants.WORLD + " movehome")) {
4343
if (event.getMessageAuthor().isServerAdmin()) {
4444
System.out.println("perms");
4545
event.getChannel().sendMessage("perms");

‎2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Commands.java‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.rs2.integrations.discord.commands;
22

3+
import com.rs2.GameConstants;
34
import org.javacord.api.entity.message.Message;
45
import org.javacord.api.event.message.MessageCreateEvent;
56
import org.javacord.api.listener.message.MessageCreateListener;
@@ -8,22 +9,22 @@ public class Commands implements MessageCreateListener {
89
@Override
910
public void onMessageCreate(MessageCreateEvent event) {
1011
Message message = event.getMessage();
11-
if (message.getContent().equalsIgnoreCase("::commands")) {
12+
if (message.getContent().equalsIgnoreCase("::w" + GameConstants.WORLD + " commands")) {
1213
event.getChannel().sendMessage("```fix"
1314
+ System.lineSeparator() +
14-
"::forum/::forums"
15+
"::w(World ID) forum/::(World ID) forums"
1516
+ System.lineSeparator() +
16-
"::hiscores/::highscores"
17+
"::(World ID) hiscores/::(World ID) highscores"
1718
+ System.lineSeparator() +
18-
"::issues/::bugs"
19+
"::(World ID) issues/::(World ID) bugs"
1920
+ System.lineSeparator() +
20-
"::online"
21+
"::(World ID) online"
2122
+ System.lineSeparator() +
22-
"::players"
23+
"::(World ID) players"
2324
+ System.lineSeparator() +
24-
"::vote"
25+
"::(World ID) vote"
2526
+ System.lineSeparator() +
26-
"::website/::site"
27+
"::(World ID) website/::(World ID) site"
2728
+ "```");
2829
}
2930
}

‎2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Forum.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public class Forum implements MessageCreateListener {
1010
@Override
1111
public void onMessageCreate(MessageCreateEvent event) {
1212
Message message = event.getMessage();
13-
if (message.getContent().equalsIgnoreCase("::forum") || message.getContent().equalsIgnoreCase("::forums")) {
13+
if (message.getContent().equalsIgnoreCase("::w" + GameConstants.WORLD + " forum") || message.getContent().equalsIgnoreCase("::w" + GameConstants.WORLD + " forums")) {
1414
event.getChannel().sendMessage(GameConstants.WEBSITE_LINK + "/forums/index.php");
1515
}
1616
}

‎2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Hiscores.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public class Hiscores implements MessageCreateListener {
1010
@Override
1111
public void onMessageCreate(MessageCreateEvent event) {
1212
Message message = event.getMessage();
13-
if (message.getContent().equalsIgnoreCase("::hiscores") || message.getContent().equalsIgnoreCase("::highscores")) {
13+
if (message.getContent().equalsIgnoreCase("::w" + GameConstants.WORLD + " hiscores") || message.getContent().equalsIgnoreCase("::w" + GameConstants.WORLD + " highscores")) {
1414
event.getChannel().sendMessage(GameConstants.WEBSITE_LINK + "/hiscores.html");
1515
}
1616
}

‎2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Issues.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.rs2.integrations.discord.commands;
22

3+
import com.rs2.GameConstants;
34
import org.javacord.api.entity.message.Message;
45
import org.javacord.api.event.message.MessageCreateEvent;
56
import org.javacord.api.listener.message.MessageCreateListener;
@@ -8,7 +9,7 @@ public class Issues implements MessageCreateListener {
89
@Override
910
public void onMessageCreate(MessageCreateEvent event) {
1011
Message message = event.getMessage();
11-
if (message.getContent().equalsIgnoreCase("::issues") || message.getContent().equalsIgnoreCase("::bugs")) {
12+
if (message.getContent().equalsIgnoreCase("::w" + GameConstants.WORLD + " issues") || message.getContent().equalsIgnoreCase("::w" + GameConstants.WORLD + " bugs")) {
1213
event.getChannel().sendMessage("https://github.com/2006-Scape/2006Scape/issues");
1314
}
1415
}

‎2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Online.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.rs2.integrations.discord.commands;
22

3+
import com.rs2.GameConstants;
34
import org.javacord.api.entity.message.Message;
45
import org.javacord.api.event.message.MessageCreateEvent;
56
import org.javacord.api.listener.message.MessageCreateListener;
@@ -10,8 +11,8 @@ public class Online implements MessageCreateListener {
1011
@Override
1112
public void onMessageCreate(MessageCreateEvent event) {
1213
Message message = event.getMessage();
13-
if (message.getContent().equalsIgnoreCase("::online")) {
14-
event.getChannel().sendMessage(":tada: " + JavaCord.serverName + " is Online! :tada:");
14+
if (message.getContent().equalsIgnoreCase("::w" + GameConstants.WORLD + " online")) {
15+
event.getChannel().sendMessage(":tada: " + JavaCord.serverName + " World:" + GameConstants.WORLD + " is Online! :tada:");
1516
}
1617
}
1718
}

0 commit comments

Comments
 (0)