diff --git a/src/main/java/org/jointheleague/discord_bot_example/Bot.java b/src/main/java/org/jointheleague/discord_bot_example/Bot.java index 06e330bf..443e87c0 100644 --- a/src/main/java/org/jointheleague/discord_bot_example/Bot.java +++ b/src/main/java/org/jointheleague/discord_bot_example/Bot.java @@ -47,9 +47,9 @@ public void connect(boolean printInvite) { api.addMessageCreateListener(dl); helpListener.addHelpEmbed(dl.getHelpEmbed()); - CurrencyConverter cc = new CurrencyConverter(channelName); - api.addMessageCreateListener(cc); - helpListener.addHelpEmbed(cc.getHelpEmbed()); + //CurrencyConverter cc = new CurrencyConverter(channelName); + //api.addMessageCreateListener(cc); + //helpListener.addHelpEmbed(cc.getHelpEmbed()); ToDoList list = new ToDoList(channelName); api.addMessageCreateListener(list); @@ -143,10 +143,14 @@ public void connect(boolean printInvite) { UnbeatableRockPaperScissors rps = new UnbeatableRockPaperScissors(channelName); api.addMessageCreateListener(rps); helpListener.addHelpEmbed(rps.getHelpEmbed()); + Depression depress = new Depression(channelName); api.addMessageCreateListener(depress); helpListener.addHelpEmbed(depress.getHelpEmbed()); + DndCompanion dc = new DndCompanion(channelName); + api.addMessageCreateListener(dc); + helpListener.addHelpEmbed(dc.getHelpEmbed()); //old way to add listeners api.addMessageCreateListener(helpListener); diff --git a/src/main/java/org/jointheleague/modules/DndCompanion.java b/src/main/java/org/jointheleague/modules/DndCompanion.java new file mode 100644 index 00000000..98deaa5e --- /dev/null +++ b/src/main/java/org/jointheleague/modules/DndCompanion.java @@ -0,0 +1,70 @@ +package org.jointheleague.modules; + +import java.io.FileWriter; +import java.io.IOException; +import java.util.Random; + +import javax.swing.JOptionPane; + +import org.javacord.api.event.message.MessageCreateEvent; +import org.jointheleague.modules.pojo.HelpEmbed; + +import net.aksingh.owmjapis.api.APIException; + +public class DndCompanion extends CustomMessageCreateListener { + + private final static String COMMAND = "/ask"; + + public DndCompanion(String channelName) { + super(channelName); + helpEmbed = new HelpEmbed(COMMAND, "/ask roll followed by a number to role between and a modifier \n /ask link pick from the following 3 choices: discord, character sheets or table"); + } + + @Override + public void handle(MessageCreateEvent event) throws APIException { + // TODO Auto-generated method stub + String[] str = event.getMessageContent().split(" "); + if (str[0].equals(COMMAND)) { +// if (str.length <= 2 && str.length != 1) { +// event.getChannel().sendMessage("the links are: " + "\n" + "table: roll20.net" + "\n" +// + "character sheets: dndbeyond.com" + "\n" + "this website"); +// } + if (str.length >= 3 && str[1].equals("links")) { + if (str[2].equals("table")) { + event.getChannel().sendMessage("httpS://ro1120.net for the table :)"); + } else if (str.length >= 4 && str[2].equals("character") && str[3].equals("sheets")) { + event.getChannel().sendMessage("dndbeyond.com for the characters. They're not alive though :L"); + } else if (str[2].equals("discord")) { + event.getChannel().sendMessage("this website for discord calls"); + } else if(str[2].equals("all")){ + event.getChannel().sendMessage("the links are: " + "\n" + "table: httpS://roll20.net" + "\n" + + "character sheets: dndbeyond.com" + "\n" + "this website"); + } + } else if (str.length >= 4 && str[1].equals("roll")) { + Random rand = new Random(); + int max = 0; + int mod = 0; + int finale = 0; + if(Integer.parseInt(str[2]) <= 0) { + event.getChannel().sendMessage("you can't do a number less then 0"); + } else { + max = rand.nextInt(Integer.parseInt(str[2])) + 1; + mod = Integer.parseInt(str[3]); + finale = max + mod; + event.getChannel().sendMessage("your number is: "+ max + " + " + mod + " = " + finale); + } + } else if (str[1].equals("advice")) { + try { + FileWriter fw = new FileWriter("src/main/java/org/jointheleague/modules/DndCompanionExtras"); + for(int i = 2; i < str.length; i++) { + fw.write(str[i]); + fw.close(); + } + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + } + } +} diff --git a/src/main/java/org/jointheleague/modules/MazeGame.java b/src/main/java/org/jointheleague/modules/MazeGame.java index 76e1f77c..f4578587 100644 --- a/src/main/java/org/jointheleague/modules/MazeGame.java +++ b/src/main/java/org/jointheleague/modules/MazeGame.java @@ -30,7 +30,7 @@ public void handle(MessageCreateEvent event) throws APIException { System.out.println("Heard message: " + event.getMessageContent()); if (event.getMessageContent().contains(COMMAND) && !event.getMessageAuthor().isBotUser()) { if (event.getMessageContent().contains("start") || event.getMessageContent().contains("load")) { - String target = event.getMessageContent().substring(11).strip(); + String target = event.getMessageContent().substring(11).trim(); try { if(!target.equalsIgnoreCase("upload")) { diff --git a/src/main/resources/.config.json.swp b/src/main/resources/.config.json.swp new file mode 100644 index 00000000..8c2e41a7 Binary files /dev/null and b/src/main/resources/.config.json.swp differ diff --git a/src/main/resources/config.json b/src/main/resources/config.json index 0b58c8d9..4dd58050 100644 --- a/src/main/resources/config.json +++ b/src/main/resources/config.json @@ -1,4 +1,4 @@ { - "channels": ["channelName"], - "token": "discordToken" + "channels": [""], + "token": "" }