Vitania/W-rfel-Bot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update ED und JDA

Browse Source
This commit is contained in:
Ocame
2023-02-16 02:30:38 +01:00
parent 06cd082ee2
commit 4a999d9841
16 changed files with 1051 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/DB/base.java
View File

@ -1,6 +1,6 @@
package DB;
import net.dv8tion.jda.core.JDA;
import net.dv8tion.jda.api.JDA;
import javax.security.auth.login.LoginException;
import java.io.FileInputStream;
@ -68,7 +68,7 @@ public class base {
}
catch (SQLException e) {
active = false;
e.printStackTrace();
//e.printStackTrace();
}
}

135
src/main/java/Earthdawn/dice.java
View File

@ -3,8 +3,8 @@ package Earthdawn;
import Shadowrun.db_connect;
import Shadowrun.help;
import net.dv8tion.jda.api.EmbedBuilder;
import net.dv8tion.jda.api.entities.ChannelType;
import net.dv8tion.jda.api.entities.User;
import net.dv8tion.jda.api.entities.channel.ChannelType;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import net.dv8tion.jda.api.events.message.react.MessageReactionAddEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
@ -41,10 +41,10 @@ public class dice extends ListenerAdapter {
public dice() {
this.prefixSr = "/ed";
this.prefixIni = "/ini";
//this.prefixIni = "/ini";
helpDe.add("Alle Befehle können in einen Channel geschrieben werden oder per Direkt Nachricht gesender werden");
helpDe.add("Alle Befehle können in einen Channel geschrieben werden oder per Direkt Nachricht gesendet");
helpDe.add(this.prefixSr + "Zahl", "Würfelt Zahl x W6. Gewürfelte 5. und 6. Werden als Erfolge gezählt, 1. als Misserfolge.\n" +
"Erreicht oder übersteigt die Anzhal der 1. die hälfte der gewürfelten Würfel, zählt dies als ein Patzer. Gibt es mind. 1 Erfolg wird die Markierung der Ausgabe Gelb." +
"wird aber kein Erfolg gewürfelt zählt dies als Kritischer Patzer und die Markierung wird Rot **Wichtig: Vor- und Nachteile die Einfluss auf die Patzer Changse haben werden nicht berücksichtigt");
@ -53,7 +53,7 @@ public class dice extends ListenerAdapter {
helpDe.add(this.prefixSr + " Zahl_1 + Zahl_2", "Würfelt Zahl_2 x W6 und addiert Zahl_1 hinzu, um die Initative zu bestimmen");
helpDe.add(this.prefixIni + " Zahl_1 + Zahl_2", "Synonym für " + this.prefixSr + " Zahl_1 + Zahl_2");
//helpDe.add(this.prefixIni + " Zahl_1 + Zahl_2", "Synonym für " + this.prefixSr + " Zahl_1 + Zahl_2");
this.db = new db_connect();
@ -139,7 +139,7 @@ public class dice extends ListenerAdapter {
float pro = verteilung3[i]*100f/rounds;
test.addField(Integer.toString(i+1), Integer.toString(verteilung3[i]) + " - " + String.format("%.2f", pro) + "%", true);
}
event.getChannel().sendMessage(test.build()).queue();
event.getChannel().sendMessage(test.build().toString()).queue();
}
catch (NumberFormatException e) {
@ -181,9 +181,8 @@ public class dice extends ListenerAdapter {
int modifier = 1;
try {
if(event.getMessage().getContentRaw().matches(".*[ \\+jav].*")) { // es wurden andere zeichen als Zahlen gefunden
}
dieRoll.reset();
// Alte Erkennung für Karma ect
// Prüfen ob Karma wurf
if(event.getMessage().getContentRaw().startsWith(this.prefixSr+"+") || event.getMessage().getContentRaw().startsWith(this.prefixSr+" +")) {
karma = true;
@ -237,19 +236,20 @@ public class dice extends ListenerAdapter {
String[] MsgParts = ContentRaw.split(" ", 2);
if(MsgParts.length < 2) { // Leerer Befehl
String message = activLang.emptyCommand;
message = message.replace("%command%", this.prefixIni);
message = message.replace("%command%", this.prefixSr);
event.getChannel().sendMessage(getAsMention(event) + message).queue();
return;
}
String DicePart = MsgParts[1].trim().toLowerCase();
if(MsgParts[1].trim().matches(".*[^0-9].*")) { // es wurden andere zeichen als Zahlen gefunden
if(MsgParts[1].trim().toLowerCase().equals("de")) {
if(DicePart.equals("de")) {
activLang = langDe;
channelList.put(event.getChannel().getId(), "de");
event.getChannel().sendMessage(getAsMention(event) + activLang.language).queue();
return;
}
else if(MsgParts[1].trim().toLowerCase().equals("en")) {
else if(DicePart.equals("en")) {
activLang = langEn;
channelList.put(event.getChannel().getId(), "en");
event.getChannel().sendMessage(getAsMention(event) + activLang.language).queue();
@ -257,20 +257,39 @@ public class dice extends ListenerAdapter {
}
String[] iniParts = MsgParts[1].trim().toLowerCase().split("[\\+\\-]", 2);
for (int i = 0; i < DicePart.length(); i++) {
if (DicePart.charAt(i) == 'k') {
dieRoll.addKarma(1);
}
else if (DicePart.charAt(i) == 'j') {
dieRoll.addWeiheA(1);
}
else if (DicePart.charAt(i) == 'a') {
dieRoll.addWeiheJ(1);
}
else if (DicePart.charAt(i) == 'v') {
dieRoll.addWeiheV(1);
}
}
DicePart = DicePart.replace("k", "");
DicePart = DicePart.replace("j", "");
DicePart = DicePart.replace("a", "");
DicePart = DicePart.replace("v", "");
String[] iniParts = DicePart.split("[\\+\\-]", 2);
messageInterpreter mI = new messageInterpreter(event, activLang);
rollStufe(Integer.parseInt(iniParts[0]));
rollStufe(Integer.parseInt(iniParts[0].replaceAll("[^0-9]", "")));
if(iniParts.length > 1) { // Nachricht hat kein + Zeichen
rollStufe(Integer.parseInt(iniParts[0]));
if(MsgParts[1].trim().toLowerCase().matches("\\-")) // Prüft auf Negativen Modifizier wenn Ja
rollStufe(Integer.parseInt(iniParts[0].replaceAll("[^0-9]", "")));
if(DicePart.matches("\\-")) // Prüft auf Negativen Modifizier wenn Ja
modifier = -1;
dieRoll.addModifier(Integer.parseInt(iniParts[1].trim())*modifier);
}
}
else {
try {
rollStufe(Integer.parseInt(MsgParts[1].trim().toLowerCase()));
rollStufe(Integer.parseInt(DicePart));
}
catch (NumberFormatException e) {
String message = activLang.error;
@ -316,7 +335,7 @@ public class dice extends ListenerAdapter {
outputBox.setTitle(getEffectiveName(event) + message);
outputBox.setDescription("(" + dieRoll.getResultStructur() + ")");
event.getChannel().sendMessage(outputBox.build()).queue();
event.getChannel().sendMessageEmbeds(outputBox.build()).queue();
}
catch (NumberFormatException e) {
@ -346,8 +365,6 @@ public class dice extends ListenerAdapter {
private void rollStufe(int stufe) {
dieRoll.reset();
switch (stufe) {
case 1:
dieRoll.setW4(1).setModifier(-2);
@ -402,45 +419,45 @@ public class dice extends ListenerAdapter {
case 18:
dieRoll.setW12(1).setW10(1).setW8(1);
break;
case 19:
dieRoll.setW20(1).setW6(2);
break;
case 20:
dieRoll.setW20(1).setW8(1).setW6(1);
break;
case 21:
dieRoll.setW20(1).setW8(2);
break;
case 22:
dieRoll.setW20(1).setW10(1).setW8(1);
break;
case 23:
dieRoll.setW20(1).setW10(2);
break;
case 24:
dieRoll.setW20(1).setW12(1).setW10(1);
break;
case 25:
dieRoll.setW20(1).setW12(2);
break;
case 26:
dieRoll.setW20(1).setW12(1).setW6(2);
break;
case 27:
dieRoll.setW20(1).setW12(1).setW8(1).setW6(1);
break;
case 28:
dieRoll.setW20(1).setW12(1).setW8(2);
break;
case 29:
dieRoll.setW20(1).setW12(1).setW10(1).setW8(1);
break;
case 30:
dieRoll.setW20(2).setW6(1);
break;
case 31:
dieRoll.setW20(2).setW8(1).setW6(1);
break;
default:
int w20 = 0;
w20 = (int) ((stufe-8)/11);
switch ((stufe-8)%11) {
case 0:
dieRoll.setW20(w20).setW6(2);
break;
case 1:
dieRoll.setW20(w20).setW8(1).setW6(1);
break;
case 2:
dieRoll.setW20(w20).setW8(2);
break;
case 3:
dieRoll.setW20(w20).setW10(1).setW8(1);
break;
case 4:
dieRoll.setW20(w20).setW10(2);
break;
case 5:
dieRoll.setW20(w20).setW12(1).setW10(1);
break;
case 6:
dieRoll.setW20(w20).setW12(2);
break;
case 7:
dieRoll.setW20(w20).setW12(1).setW6(2);
break;
case 8:
dieRoll.setW20(w20).setW12(1).setW8(1).setW6(1);
break;
case 9:
dieRoll.setW20(w20).setW12(1).setW8(2);
break;
case 10:
dieRoll.setW20(w20).setW12(1).setW10(1).setW8(1);
break;
}
}

4
src/main/java/Engel/dice.java
View File

@ -4,7 +4,7 @@ import Shadowrun.db_connect;
import Simpleroll.help;
import Simpleroll.language;
import net.dv8tion.jda.api.EmbedBuilder;
import net.dv8tion.jda.api.entities.ChannelType;
import net.dv8tion.jda.api.entities.channel.ChannelType;
import net.dv8tion.jda.api.entities.User;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
@ -126,7 +126,7 @@ public class dice extends ListenerAdapter {
result.append("\n").append(activArcanaList.getExplain());
outputBox.setDescription(result.toString().trim());
outputBox.setImage(activArcanaList.getImage());
event.getChannel().sendMessage(outputBox.build()).queue();
event.getChannel().sendMessageEmbeds(outputBox.build()).queue();
}
catch (NumberFormatException e) {

6
src/main/java/Keeproll/dice.java
View File

@ -4,7 +4,7 @@ import Shadowrun.db_connect;
import Simpleroll.help;
import Simpleroll.language;
import net.dv8tion.jda.api.EmbedBuilder;
import net.dv8tion.jda.api.entities.ChannelType;
import net.dv8tion.jda.api.entities.channel.ChannelType;
import net.dv8tion.jda.api.entities.User;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
@ -294,7 +294,7 @@ public class dice extends ListenerAdapter {
description.append(rolls[i].getText());
}
outputBox.setDescription("(" + description + ")");
event.getChannel().sendMessage(outputBox.build()).queue();
event.getChannel().sendMessageEmbeds(outputBox.build()).queue();
}
catch (NumberFormatException e) {
event.getChannel().sendMessage("Nope").queue();
@ -314,6 +314,6 @@ public class dice extends ListenerAdapter {
"Ab nur **1€** pro Monat steigt die Changse, als dank für die Hilfe, um **1%** ein besseres Ergebnis zu bekommen.\n\n");
description.append("Für mehr Infos: https://bitly.com/98K8eH");
outputBox.setDescription(description);
event.getChannel().sendMessage(outputBox.build()).queue();
event.getChannel().sendMessageEmbeds(outputBox.build()).queue();
}
}

14
src/main/java/Serenity/balance.java → src/main/java/Serenity/balance.java.Deprecated Executable file → Normal file
View File

@ -1,9 +1,9 @@
package Serenity;
import net.dv8tion.jda.core.entities.ChannelType;
import net.dv8tion.jda.core.entities.User;
import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
import net.dv8tion.jda.core.hooks.ListenerAdapter;
import net.dv8tion.jda.api.entities.channel.ChannelType;
import net.dv8tion.jda.api.entities.User;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
import org.json.JSONArray;
import org.json.JSONObject;
@ -87,9 +87,9 @@ public class balance extends ListenerAdapter {
try {
// Zerlgen der Anfrage
String parameter = "";
if (event.getMessage().getMentionedUsers().size() > 0) {
if (IdConvert.containsKey(event.getMessage().getMentionedUsers().get(0).getId()))
parameter = "?id=" + (IdConvert.get(event.getMessage().getMentionedUsers().get(0).getId()));
if (event.getMessage().getMentions().getUsers() .size() > 0) {
if (IdConvert.containsKey(event.getMessage().getMentions().getUsers().get(0).getId()))
parameter = "?id=" + (IdConvert.get(event.getMessage().getMentions().getUsers().get(0).getId()));
} else {
parameter = "?id=1";
}

13
src/main/java/Shadowrun/dice.java
View File

@ -2,14 +2,15 @@ package Shadowrun;
import net.dv8tion.jda.api.EmbedBuilder;
import net.dv8tion.jda.api.JDA;
import net.dv8tion.jda.api.entities.ChannelType;
import net.dv8tion.jda.api.entities.channel.ChannelType;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.MessageChannel;
import net.dv8tion.jda.api.entities.channel.ChannelType;
import net.dv8tion.jda.api.entities.User;
import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import net.dv8tion.jda.api.events.message.react.MessageReactionAddEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
import net.dv8tion.jda.api.requests.restaction.MessageAction;
import net.dv8tion.jda.api.requests.restaction.*;
import java.awt.*;
@ -186,7 +187,7 @@ public class dice extends ListenerAdapter {
float pro = verteilung3[i]*100f/rounds;
test.addField(Integer.toString(i+1), Integer.toString(verteilung3[i]) + " - " + String.format("%.2f", pro) + "%", true);
}
event.getChannel().sendMessage(test.build()).queue();
event.getChannel().sendMessageEmbeds(test.build()).queue();
}
catch (NumberFormatException e) {
@ -407,7 +408,7 @@ public class dice extends ListenerAdapter {
long[] messageId = new long[1];
boolean finalEdge = edge;
String finalRollData = rollString.toString();
channel.sendMessage(outputBox.build()).queue(message1 -> {
channel.sendMessageEmbeds(outputBox.build()).queue(message1 -> {
if(!finalEdge && type == 0) {
//message1.addReaction("sr:517528156014510111").queue();
}
@ -539,7 +540,7 @@ public class dice extends ListenerAdapter {
outputBox.setDescription(String.valueOf(iniBase) + " + (" + result.toString().trim().replace(" ", "+") + ")");
event.getChannel().sendMessage(outputBox.build()).queue();
event.getChannel().sendMessageEmbeds(outputBox.build()).queue();
}
catch (NumberFormatException e) {

132
src/main/java/Simpleroll/dice.java
View File

@ -2,21 +2,15 @@ package Simpleroll;
import Shadowrun.db_connect;
import net.dv8tion.jda.api.EmbedBuilder;
import net.dv8tion.jda.api.entities.ChannelType;
import net.dv8tion.jda.api.entities.User;
import net.dv8tion.jda.api.entities.channel.ChannelType;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import net.dv8tion.jda.api.events.message.react.MessageReactionAddEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
import java.awt.*;
import java.io.IOException;
import java.io.InputStream;
import java.security.SecureRandom;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
import java.util.Random;
import java.util.concurrent.ThreadLocalRandom;
public class dice extends ListenerAdapter {
@ -59,12 +53,10 @@ public class dice extends ListenerAdapter {
channelList.put(event.getChannel().getId(), Einstellungen.get("lang").toString());
}
switch (channelList.get(event.getChannel().getId())) {
case "de":
activLang = langDe;
break;
case "en":
activLang = langEn;
break;
case "de":
default:
activLang = langDe;
@ -100,15 +92,6 @@ public class dice extends ListenerAdapter {
EmbedBuilder outputBox = new EmbedBuilder();
int[] verteilung = new int[6];
int dice1;
int numberOfDice = 1;
int diceart = 6;
StringBuilder result = new StringBuilder("");
int hits = 0;
try {
String ContentRaw = event.getMessage().getContentRaw();
@ -124,96 +107,40 @@ public class dice extends ListenerAdapter {
}
if(MsgParts[1].trim().matches(".*[^0-9].*")) { // es wurden andere zeichen als Zahlen gefunden
if(MsgParts[1].trim().toLowerCase().equals("de")) {
activLang = langDe;
channelList.put(event.getChannel().getId(), "de");
event.getChannel().sendMessage(getAsMention(event) + activLang.language).queue();
db.setChannelSettings(event.getChannel().getId(), "de", event.getGuild().getId(), event.getChannel().getName());
return;
}
else if(MsgParts[1].trim().toLowerCase().equals("en")) {
activLang = langEn;
channelList.put(event.getChannel().getId(), "en");
event.getChannel().sendMessage(getAsMention(event) + activLang.language).queue();
db.setChannelSettings(event.getChannel().getId(), "en", event.getGuild().getId(), event.getChannel().getName());
return;
}
if(MsgParts[1].trim().toLowerCase().replace(" ", "").matches("([0-9]*)[dw]([0-9].*)")) { // format besteh aus (Zahlen)d(Zahlen) oder (Zahlen)w(Zahlen)
String[] diceInterpreter = MsgParts[1].trim().toLowerCase().replace(" ", "").split("[wd]");
try {
diceart = Integer.parseInt(diceInterpreter[1]);
numberOfDice = Integer.parseInt(diceInterpreter[0]);
verteilung = new int[diceart];
}
catch (NumberFormatException e) {
String message = activLang.error;
message = message.replace("%command%", MsgParts[1].trim().toLowerCase());
event.getChannel().sendMessage(getAsMention(event) + message).queue();
return;
}
}
else {
String message = activLang.error;
message = message.replace("%command%", MsgParts[1].trim());
event.getChannel().sendMessage(getAsMention(event) + message).queue();
return;
}
if(MsgParts[1].trim().toLowerCase().equals("de")) {
activLang = langDe;
channelList.put(event.getChannel().getId(), "de");
event.getChannel().sendMessage(getAsMention(event) + activLang.language).queue();
db.setChannelSettings(event.getChannel().getId(), "de", event.getGuild().getId(), event.getChannel().getName());
return;
}
else {
try {
numberOfDice = Integer.parseInt(MsgParts[1].trim().replace(" ", ""));
}
catch (NumberFormatException e) {
String message = activLang.error;
message = message.replace("%command%", MsgParts[1].trim());
event.getChannel().sendMessage(getAsMention(event) + message).queue();
return;
}
}
if(numberOfDice <= 0) {
String message = activLang.noNegativ;
event.getChannel().sendMessage(getAsMention(event) + message).queue();
else if(MsgParts[1].trim().toLowerCase().equals("en")) {
activLang = langEn;
channelList.put(event.getChannel().getId(), "en");
event.getChannel().sendMessage(getAsMention(event) + activLang.language).queue();
db.setChannelSettings(event.getChannel().getId(), "en", event.getGuild().getId(), event.getChannel().getName());
return;
}
for(int i = 0; i < numberOfDice; i++) {
dice1 = new Random().nextInt(diceart);
verteilung[dice1]++;
result.append(dice1+1);
result.append(" ");
}
messageInterpreter mI = new messageInterpreter(activLang, MsgParts[1]);
outputBox.setColor(Color.green);
String addition = "";
String message = activLang.basisresultText;
//%numberOfDice%%dice%%diceart% %EdgeDice%:\tErfolge: %hits%\tMisserfolge: %oneHits%";
message = message.replace("%numberOfDice%", String.valueOf(numberOfDice)).replace("%diceart%", String.valueOf(diceart));
outputBox.setTitle(getEffectiveName(event) + message);
outputBox.setTitle(getEffectiveName(event) + " " + mI.getHeaderOutput() + ": " + mI.getResult());
outputBox.setDescription("(" + result.toString().trim() + ")");
if(mI.isComplex())
outputBox.setDescription(mI.getResolveOutput() + "\n" + mI.getBodyOutput());
else
outputBox.setDescription(mI.getBodyOutput());
for(int i = 0; i < diceart; i++) {
float pro = verteilung[i]*100f/numberOfDice;
//outputBox.addField(Integer.toString(i+1), Integer.toString(verteilung[i]) + " - " + String.format("%.2f", pro) + "%", true);
}
event.getChannel().sendMessage(outputBox.build()).queue();
/*event.getChannel().sendMessage(outputBox.build()).queue(message1 -> {
message1.addReaction("sr:517528156014510111").queue();
message1.addReaction("test:517545127376322596").queue();
});*/
/*
if(event.getChannelType() == ChannelType.PRIVATE) {
db.insertDice(event.getAuthor().getName(), event.getAuthor().getId(), event.getMessage().getContentRaw(), result.toString().trim(), event.getChannel().getId());
}
else {
db.insertDice(event.getMember().getEffectiveName(), event.getMember().getUser().getId(), event.getMessage().getContentRaw(), result.toString().trim(), event.getChannel().getId());
}*/
event.getChannel().sendMessageEmbeds(outputBox.build()).queue();
System.runFinalization();
System.gc();
}
catch (NumberFormatException e) {
event.getChannel().sendMessage("Nope").queue();
@ -229,7 +156,7 @@ public class dice extends ListenerAdapter {
StringBuilder result = new StringBuilder("");
outputBox.setTitle("Hallo ich exestieren aktuell in der Version: 0.8\n");
outputBox.setTitle("Hallo ich exestieren aktuell in der Version: 0.10\n");
result.append("Ich kann aktuell folgent Wüfe:\n");
result.append("**/r** bzw. **/roll** für Allgemeine würfe. Ohne eine angabe vom Würfeltyp wird ein W6 benuzt\n\n");
@ -239,6 +166,9 @@ public class dice extends ListenerAdapter {
result.append("**/l5r** bzw **/keep** für Legend of the 5 Rings\n");
outputBox.setDescription(result);
event.getChannel().sendMessage(outputBox.build()).queue();
event.getChannel().sendMessageEmbeds(outputBox.build()).queue();
}
//7d4+19+1d7
}

238
src/main/java/Simpleroll/diceOld.java Normal file
View File

@ -0,0 +1,238 @@
package Simpleroll;
import Shadowrun.db_connect;
import net.dv8tion.jda.api.EmbedBuilder;
import net.dv8tion.jda.api.entities.channel.ChannelType;
import net.dv8tion.jda.api.entities.User;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
import java.awt.*;
import java.util.HashMap;
import java.util.Map;
import java.util.Random;
public class diceOld extends ListenerAdapter {
private String prefixR;
private String prefixRoll;
private String prefixHelp;
private language langDe = new language("de");
private language langEn = new language("en");
private help helpDe = new help("de");
private help helpEn = new help("En");
private language activLang;
private help activHelp;
private db_connect db;
private Map<String, String> channelList = new HashMap<>();
public diceOld() {
this.prefixR = "/roll";
this.prefixRoll = "/r ";
this.prefixHelp = "/help";
this.db = new db_connect();
}
@Override
public void onMessageReceived(MessageReceivedEvent event) {
if ((!event.getMessage().getContentRaw().startsWith(this.prefixR)
&& !event.getMessage().getContentRaw().startsWith(this.prefixRoll) && !event.getMessage().getContentRaw().startsWith(this.prefixHelp))
|| (event.getChannelType() != ChannelType.TEXT && event.getChannelType() != ChannelType.PRIVATE)) {
return;
}
if(!channelList.containsKey(event.getChannel().getId())) {
Map<String, String> Einstellungen = db.getChannelSettings(event.getChannel().getId());
channelList.put(event.getChannel().getId(), Einstellungen.get("lang").toString());
}
switch (channelList.get(event.getChannel().getId())) {
case "de":
activLang = langDe;
break;
case "en":
activLang = langEn;
break;
default:
activLang = langDe;
}
User author = event.getAuthor();
if (event.getMessage().getContentRaw().startsWith(this.prefixR) || event.getMessage().getContentRaw().startsWith(this.prefixRoll))
this.roll(event);
if (event.getMessage().getContentRaw().startsWith(this.prefixHelp))
this.help(event);
}
private String getEffectiveName(MessageReceivedEvent event) {
if(event.getMember() == null) {
return "";
}
return event.getMember().getEffectiveName() + " ";
}
private String getAsMention(MessageReceivedEvent event) {
if(event.getMember() == null) {
return "";
}
return event.getMember().getAsMention() + " ";
}
/**
* rolltest
*
* @param event JDA Event
*/
private void roll(MessageReceivedEvent event) {
EmbedBuilder outputBox = new EmbedBuilder();
int[] verteilung = new int[6];
int dice1;
int numberOfDice = 1;
int diceart = 6;
StringBuilder result = new StringBuilder("");
int hits = 0;
try {
String ContentRaw = event.getMessage().getContentRaw();
// Prüfen ob Leerer Command gesendet wird
String[] MsgParts = ContentRaw.replace(" ", " ").split(" ", 2);
if(MsgParts.length < 2) {
String message = activLang.emptyCommand;
message = message.replace("%command%", this.prefixRoll);
event.getChannel().sendMessage(getAsMention(event) + message).queue();
return;
}
if(MsgParts[1].trim().matches(".*[^0-9].*")) { // es wurden andere zeichen als Zahlen gefunden
if(MsgParts[1].trim().toLowerCase().equals("de")) {
activLang = langDe;
channelList.put(event.getChannel().getId(), "de");
event.getChannel().sendMessage(getAsMention(event) + activLang.language).queue();
db.setChannelSettings(event.getChannel().getId(), "de", event.getGuild().getId(), event.getChannel().getName());
return;
}
else if(MsgParts[1].trim().toLowerCase().equals("en")) {
activLang = langEn;
channelList.put(event.getChannel().getId(), "en");
event.getChannel().sendMessage(getAsMention(event) + activLang.language).queue();
db.setChannelSettings(event.getChannel().getId(), "en", event.getGuild().getId(), event.getChannel().getName());
return;
}
if(MsgParts[1].trim().toLowerCase().replace(" ", "").matches("([0-9]*)[dw]([0-9].*)")) { // format besteh aus (Zahlen)d(Zahlen) oder (Zahlen)w(Zahlen)
String[] diceInterpreter = MsgParts[1].trim().toLowerCase().replace(" ", "").split("[wd]");
try {
diceart = Integer.parseInt(diceInterpreter[1]);
numberOfDice = Integer.parseInt(diceInterpreter[0]);
verteilung = new int[diceart];
}
catch (NumberFormatException e) {
String message = activLang.error;
message = message.replace("%command%", MsgParts[1].trim().toLowerCase());
event.getChannel().sendMessage(getAsMention(event) + message).queue();
return;
}
}
else {
String message = activLang.error;
message = message.replace("%command%", MsgParts[1].trim());
event.getChannel().sendMessage(getAsMention(event) + message).queue();
return;
}
}
else {
try {
numberOfDice = Integer.parseInt(MsgParts[1].trim().replace(" ", ""));
}
catch (NumberFormatException e) {
String message = activLang.error;
message = message.replace("%command%", MsgParts[1].trim());
event.getChannel().sendMessage(getAsMention(event) + message).queue();
return;
}
}
if(numberOfDice <= 0) {
String message = activLang.noNegativ;
event.getChannel().sendMessage(getAsMention(event) + message).queue();
return;
}
for(int i = 0; i < numberOfDice; i++) {
dice1 = new Random().nextInt(diceart);
verteilung[dice1]++;
result.append(dice1+1);
result.append(" ");
}
outputBox.setColor(Color.green);
String addition = "";
String message = activLang.basisresultText;
//%numberOfDice%%dice%%diceart% %EdgeDice%:\tErfolge: %hits%\tMisserfolge: %oneHits%";
message = message.replace("%numberOfDice%", String.valueOf(numberOfDice)).replace("%diceart%", String.valueOf(diceart));
outputBox.setTitle(getEffectiveName(event) + message);
outputBox.setDescription("(" + result.toString().trim() + ")");
for(int i = 0; i < diceart; i++) {
float pro = verteilung[i]*100f/numberOfDice;
//outputBox.addField(Integer.toString(i+1), Integer.toString(verteilung[i]) + " - " + String.format("%.2f", pro) + "%", true);
}
event.getChannel().sendMessageEmbeds(outputBox.build()).queue();
/*event.getChannel().sendMessage(outputBox.build()).queue(message1 -> {
message1.addReaction("sr:517528156014510111").queue();
message1.addReaction("test:517545127376322596").queue();
});*/
/*
if(event.getChannelType() == ChannelType.PRIVATE) {
db.insertDice(event.getAuthor().getName(), event.getAuthor().getId(), event.getMessage().getContentRaw(), result.toString().trim(), event.getChannel().getId());
}
else {
db.insertDice(event.getMember().getEffectiveName(), event.getMember().getUser().getId(), event.getMessage().getContentRaw(), result.toString().trim(), event.getChannel().getId());
}*/
}
catch (NumberFormatException e) {
event.getChannel().sendMessage("Nope").queue();
}
catch (Exception e) {
System.out.println("problem: " + e.getMessage());
}
}
private void help(MessageReceivedEvent event) {
EmbedBuilder outputBox = new EmbedBuilder();
StringBuilder result = new StringBuilder("");
outputBox.setTitle("Hallo ich exestieren aktuell in der Version: 0.8\n");
result.append("Ich kann aktuell folgent Wüfe:\n");
result.append("**/r** bzw. **/roll** für Allgemeine würfe. Ohne eine angabe vom Würfeltyp wird ein W6 benuzt\n\n");
result.append("**/sr** für Shadowrun 5\n\n");
result.append("**/ed** für Earthdawn 4\n\n");
result.append("**/e** bzw **/engel** für die Arcane Version von Engel\n\n");
result.append("**/l5r** bzw **/keep** für Legend of the 5 Rings\n");
outputBox.setDescription(result);
event.getChannel().sendMessage(outputBox.build().toString()).queue();
}
}

247
src/main/java/Simpleroll/messageInterpreter.java
View File

@ -2,89 +2,226 @@ package Simpleroll;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import java.util.Scanner;
import java.util.Random;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class messageInterpreter {
private Integer diceart = 6;
private Integer numberOfDice = 1;
private Integer typ = 0;
private Integer intResult = 0;
private language activLang;
private MessageReceivedEvent event;
private final language activLang;
private final StringBuilder bodyOutput;
public Integer getDiceart() {
return diceart;
}
private final StringBuilder resolveOutput;
public Integer getNumberOfDice() {
return numberOfDice;
}
private final StringBuilder headerOutput;
private boolean isComplex;
public Integer getIntResult() {
return intResult;
}
public boolean isNum() {
if(typ == 1) {
return true;
}
return false;
}
public boolean isDice() {
if(typ == 2) {
return true;
}
return false;
}
/**
*
* @param event JDA Event
* @param activLang Aktive Sprache
*/
public messageInterpreter(MessageReceivedEvent event, language activLang) {
this.event = event;
public messageInterpreter(language activLang) {
this.activLang = activLang;
bodyOutput = new StringBuilder();
resolveOutput = new StringBuilder();
headerOutput = new StringBuilder();
isComplex = false;
}
private void reset() {
diceart = 6;
numberOfDice = 1;
typ = 0;
intResult = 0;
public messageInterpreter(language activLang, String Input) {
this(activLang);
inputInterpreter(Input);
}
public void inputInterpreter(String Input) {
reset();
Scanner sc = new Scanner(Input.trim());
if(sc.hasNextInt()) { // ist eine Zahl
typ = 1;
intResult = Integer.parseInt(Input.trim());
return;
public void inputInterpreter(String Input) {
if(Input.trim().toLowerCase().replace(" ", "").matches("\\d+")) {
Input = Input.trim().toLowerCase().replace(" ", "") + "w6";
}
else {
if (Input.trim().toLowerCase().replace(" ", "").matches("([0-9]*)[dw]([0-9].*)")) { // format besteh aus (Zahlen)d(Zahlen) oder (Zahlen)w(Zahlen)
String[] diceInterpreter = Input.trim().toLowerCase().replace(" ", "").split("[wd]");
try {
diceart = Integer.parseInt(diceInterpreter[1]);
numberOfDice = Integer.parseInt(diceInterpreter[0]);
typ = 2;
} catch (NumberFormatException e) {
String message = activLang.error;
message = message.replace("%command%", Input.trim().toLowerCase());
//event.getChannel().sendMessage(event.getMember().getAsMention() + message).queue();
typ = -1;
throw new IllegalArgumentException( message );
subpart result = new subpart();
result = subPartAnalyse(Input);
resolveOutput.append(result.getResolveOutput());
bodyOutput.append(result.getBodyOutput());
headerOutput.append(result.getHeaderOutput());
intResult = result.getResolve();
}
private subpart subPartAnalyse(String part) {
subpart result = new subpart();
part = part.trim().toLowerCase().replace(" ", "");
boolean first = true;
/*
if(part.contains("max(")) {
/*
1d6 + max(5d5+10,2d4+2) + 15
* /
Pattern pattern = Pattern.compile("(?:.*)max\\((.*?)\\).*");
Matcher matcher = pattern.matcher(part);
if(matcher.find()) {
//String pre = part.substring(0, (matcher.start() - 3));
//String operation = part.substring((matcher.start() + 1), (matcher.end()-1));
//String after = part.substring(matcher.end());
StringBuilder newBody = new StringBuilder("max(");
StringBuilder newHeader = new StringBuilder("max(");
String[] subParts = matcher.group(1).split(",");
subpart[] tempSubparts = new subpart[subParts.length];
int i = 0;
int highest = 0;
for(String subPart : subParts) { // Vergleichen welcher wert der höhste ist
tempSubparts[i] = subPartAnalyse(subPart);
if(i != highest && tempSubparts[i].getResolve() > tempSubparts[highest].getResolve()) {
highest = i;
}
if(i > 0) {
newBody.append("), ");
newHeader.append(", ");
}
newBody.append("(");
newBody.append(tempSubparts[i].getBodyOutput());
newHeader.append(tempSubparts[i].getHeaderOutput());
i++;
}
newBody.append(")");
newHeader.append(")");
int partmarker = new Random().nextInt(1500);
//subPartAnalyse(part.substring(0, (matcher.start() - 3)) + tempSubparts[highest].getResolve() + part.substring(matcher.end()));
subpart contAnalyser = subPartAnalyse(part.substring(0, (matcher.start(1) - 4)) + " ###b" + tempSubparts[highest].getResolve() + "##" + partmarker + "e### " + part.substring(matcher.end(1)+1));
tempSubparts[highest].getResolve();
result.appendBodyOutput(contAnalyser.getBodyOutput().replaceAll("###b" + tempSubparts[highest].getResolve() + "##" + partmarker + "e###", newBody.toString()));
result.appendResolveOutput(contAnalyser.getResolveOutput().replaceAll("###b" + tempSubparts[highest].getResolve() + "##" + partmarker + "e###", "max(" + contAnalyser.getResolve().toString() + ")"));
result.appendHeaderOutput(contAnalyser.getHeaderOutput().replaceAll("###b" + tempSubparts[highest].getResolve() + "##" + partmarker + "e###", newHeader.toString()));
result.addResolve(contAnalyser.getResolve());
}
else {
//part.matches("")
return result;
}
if(part.contains("min(")) {
}*/
if(part.contains("+")) {
String[] subParts = part.trim().split("\\+");
subpart tempSubpart;
for(String subPart : subParts) {
tempSubpart = subPartAnalyse(subPart);
if(!first) {
result.appendBodyOutput(" + ");
result.appendResolveOutput(" + ");
result.appendHeaderOutput(" + ");
}
first = false;
result.appendBodyOutput(tempSubpart.getBodyOutput());
result.appendResolveOutput(tempSubpart.getResolveOutput());
result.appendHeaderOutput(tempSubpart.getHeaderOutput());
result.addResolve(tempSubpart.getResolve());
}
isComplex = true;
return result;
}
if(part.contains("-")) {
String[] subParts = part.trim().split("\\-");
subpart tempSubpart;
for(String subPart : subParts) {
tempSubpart = subPartAnalyse(subPart);
if(!first) {
result.appendBodyOutput(" - ");
result.appendResolveOutput(" - ");
result.appendHeaderOutput(" - ");
result.addResolve(tempSubpart.getResolve()*-1);
}
else
result.addResolve(tempSubpart.getResolve());
first = false;
result.appendBodyOutput(tempSubpart.getBodyOutput());
result.appendResolveOutput(tempSubpart.getResolveOutput());
result.appendHeaderOutput(tempSubpart.getHeaderOutput());
}
isComplex = true;
return result;
}
if(part.matches("([0-9]*)[dw]([0-9]*)")) {
String[] diceInterpreter = part.split("[wd]");
try {
int diceart = Integer.parseInt(diceInterpreter[1]);
int numberOfDice = 1;
if(!diceInterpreter[0].isEmpty())
numberOfDice = Integer.parseInt(diceInterpreter[0]);
result = roll(diceart, numberOfDice);
} catch (NumberFormatException e) {
String message = activLang.error;
message = message.replace("%command%", Input.trim().toLowerCase());
typ = -1;
message = message.replace("%command%", part.trim().toLowerCase());
throw new IllegalArgumentException( message );
}
}
else if(part.matches("\\d+")) {
result.addResolve(Integer.parseInt(part));
result.appendBodyOutput(part);
result.appendHeaderOutput(part);
result.appendResolveOutput(part);
}
else if(part.matches("###b\\d+##\\d+e###")) {
Pattern pattern = Pattern.compile("###b(\\d+)##\\d+e###");
Matcher matcher = pattern.matcher(part);
matcher.find();
result.addResolve(Integer.parseInt(matcher.group(1)));
result.appendBodyOutput(part);
result.appendHeaderOutput(part);
result.appendResolveOutput(part);
}
return result;
}
subpart roll(Integer diceart, Integer numberOfDice) {
int dice = 0;
subpart result = new subpart();
result.appendHeaderOutput(numberOfDice.toString() + "w" + diceart.toString());
result.appendBodyOutput("(");
for(int i = 0; i < numberOfDice; i++) {
dice = new Random().nextInt(diceart);
if(i > 0) {
result.appendBodyOutput(", ");
}
result.appendBodyOutput(dice+1);
result.addResolve(dice+1);
}
result.appendBodyOutput(")");
result.appendResolveOutput("(" + result.getResolve() + ")");
return result;
}
public String getBodyOutput() {
return bodyOutput.toString();
}
public String getResolveOutput() {
return resolveOutput.toString();
}
public String getHeaderOutput() {
return headerOutput.toString();
}
public Integer getResult() {
return intResult;
}
public boolean isComplex() {
return isComplex;
}
}

69
src/main/java/Simpleroll/subpart.java Normal file
View File

@ -0,0 +1,69 @@
package Simpleroll;
public class subpart {
private StringBuilder bodyOutput;
private StringBuilder resolveOutput;
private StringBuilder headerOutput;
private Integer resolve;
public subpart() {
bodyOutput = new StringBuilder("");
resolveOutput = new StringBuilder("");
headerOutput = new StringBuilder("");
resolve = 0;
}
public String getBodyOutput() {
return bodyOutput.toString();
}
public void appendBodyOutput(String bodyOutput) {
this.bodyOutput.append(bodyOutput);
}
public void appendBodyOutput(Integer bodyOutput) {
this.bodyOutput.append(bodyOutput);
}
public String getResolveOutput() {
return resolveOutput.toString();
}
public void appendResolveOutput(String resolveOutput) {
this.resolveOutput.append(resolveOutput);
}
public String getHeaderOutput() {
return headerOutput.toString();
}
public void appendHeaderOutput(String headerOutput) {
this.headerOutput.append(headerOutput);
}
public Integer getResolve() {
return resolve;
}
public void setResolve(Integer resolve) {
this.resolve = resolve;
}
public void setBodyOutput(String bodyOutput) {
this.bodyOutput = new StringBuilder(bodyOutput);
}
public void setResolveOutput(String resolveOutput) {
this.resolveOutput = new StringBuilder(resolveOutput);
}
public void setHeaderOutput(String headerOutput) {
this.headerOutput = new StringBuilder(headerOutput);
}
public void addResolve(Integer i) {
this.resolve += i;
}
}

7
src/main/java/Socket/shadowrun.java
View File

@ -1,7 +1,7 @@
package Socket;
import net.dv8tion.jda.core.EmbedBuilder;
import net.dv8tion.jda.core.JDA;
import net.dv8tion.jda.api.EmbedBuilder;
import net.dv8tion.jda.api.JDA;
import java.awt.*;
import java.io.*;
@ -20,6 +20,7 @@ public class shadowrun implements Runnable{
public shadowrun(JDA jda) {
this.jda = jda;
}
@Override
@ -165,7 +166,7 @@ public class shadowrun implements Runnable{
}
out.println("ACKSend");
}
jda.getTextChannelById(channelId).sendMessage(outputBox.build()).queue();
jda.getTextChannelById(channelId).sendMessage(outputBox.build().toString()).queue();
}
}
}

302
src/main/java/Vampire/dice.java Normal file
View File

@ -0,0 +1,302 @@
package Vampire;
import Shadowrun.db_connect;
import Simpleroll.help;
import Simpleroll.language;
import net.dv8tion.jda.api.EmbedBuilder;
import net.dv8tion.jda.api.entities.channel.ChannelType;
import net.dv8tion.jda.api.entities.User;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
import java.awt.*;
import java.util.*;
import java.util.regex.MatchResult;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class dice extends ListenerAdapter {
private String prefixlong;
private String prefixShort;
private String prefixVeryShort;
private language langDe = new language("de");
private language langEn = new language("en");
private help helpDe = new help("de");
private help helpEn = new help("En");
private language activLang;
private help activHelp;
private db_connect db;
private Map<String, String> channelList = new HashMap<>();
public dice() {
this.prefixlong = "/vampire";
this.prefixShort = "/v";
this.db = new db_connect();
}
@Override
public void onMessageReceived(MessageReceivedEvent event) {
if ((!event.getMessage().getContentRaw().toLowerCase().startsWith(this.prefixlong)
&& !event.getMessage().getContentRaw().toLowerCase().startsWith(this.prefixShort))
|| (event.getChannelType() != ChannelType.TEXT && event.getChannelType() != ChannelType.PRIVATE)) {
return;
}
if(!channelList.containsKey(event.getChannel().getId())) {
Map<String, String> Einstellungen = db.getChannelSettings(event.getChannel().getId());
channelList.put(event.getChannel().getId(), Einstellungen.get("lang").toString());
}
switch (channelList.get(event.getChannel().getId())) {
case "de":
activLang = langDe;
break;
case "en":
activLang = langEn;
break;
default:
activLang = langDe;
}
User author = event.getAuthor();
if (event.getMessage().getContentRaw().toLowerCase().startsWith(this.prefixlong) || event.getMessage().getContentRaw().toLowerCase().startsWith(this.prefixShort))
this.roll(event);
}
private String getEffectiveName(MessageReceivedEvent event) {
if(event.getMember() == null) {
return "";
}
return event.getMember().getEffectiveName() + " ";
}
private String getAsMention(MessageReceivedEvent event) {
if(event.getMember() == null) {
return "";
}
return event.getMember().getAsMention() + " ";
}
/**
*
*
* @param event JDA Event
*/
private void roll(MessageReceivedEvent event) {
EmbedBuilder outputBox = new EmbedBuilder();
StringBuilder result = new StringBuilder("");
StringBuilder resultDice = new StringBuilder("");
StringBuilder resultHungerDice = new StringBuilder("");
String msgText = "";
String rollState = "";
int numberOfDice, numberOfHungerDice, successes, difficult, dice1;
numberOfDice = numberOfHungerDice = successes = difficult = 0;
int[] verteilungGesammt = new int[11];
int[] verteilungHunger = new int[11];
try {
String ContentRaw = event.getMessage().getContentRaw();
// Prüfen ob Leerer Command gesendet wird
String[] MsgParts = ContentRaw.replace(" ", " ").split(" ", 2);
if(MsgParts.length < 2) {
String message = activLang.emptyCommand;
message = message.replace("%command%", this.prefixShort);
event.getChannel().sendMessage(getAsMention(event) + message).queue();
return;
}
msgText = MsgParts[1].trim();
if(msgText.matches(".*[^0-9].*")) { // es wurden andere zeichen als Zahlen gefunden
if(msgText.toLowerCase().equals("de")) {
activLang = langDe;
channelList.put(event.getChannel().getId(), "de");
event.getChannel().sendMessage(getAsMention(event) + activLang.language).queue();
db.setChannelSettings(event.getChannel().getId(), "de", event.getGuild().getId(), event.getChannel().getName());
return;
}
else if(msgText.toLowerCase().equals("en")) {
activLang = langEn;
channelList.put(event.getChannel().getId(), "en");
event.getChannel().sendMessage(getAsMention(event) + activLang.language).queue();
db.setChannelSettings(event.getChannel().getId(), "en", event.getGuild().getId(), event.getChannel().getName());
return;
}
else if(msgText.toLowerCase().equals("help") || msgText.toLowerCase().equals("hilfe")) {
event.getChannel().sendMessage(getAsMention(event)
+ " Die Syntax lautet XkY z.b. 5k4\nEs werden X mal W10 gewürfelt und davon die höhsten Anzahl Y behalten und addiert. Wird eine 10 gewürfelt, wird der Wurf weiter gewürfelt und addiert aber nur als ein Wurf gezählt.\nWird nach dem XkY eine weiter Zahl angeben so ist dies die Schwierigkeit\n"
+ "Wird nach dem XkY eine Zahl mit + oder - Angegeben, zählt dies als ein Modifikator für das ergebnis.\n\n"
+ "Zudem gibt es folgente sonderzeichen, die an belibiger stelle gesetz werden können:\n"
+ "! - auch gewüfelte 9 explodieren\n"
+ "e - gewürfelte 1 werden neu gewürfelt\n"
+ "# - Würfel explodierente nur einmal\n"
+ "n - Würfel explodierente nicht\n"
).queue();
return;
}
if(msgText.toLowerCase().matches(".*([0-9]+) +([0-9]+) +([0-9]+).*")) { // X Y Z Aufbau in der Anfrage
Pattern pattern = Pattern.compile("([0-9]+) +([0-9]+) +([0-9]+)");
Matcher matcher = pattern.matcher(msgText.toLowerCase());
matcher.find();
MatchResult elements = matcher.toMatchResult();
numberOfDice = Integer.parseInt(elements.group(1));
numberOfHungerDice = Integer.parseInt(elements.group(2));
difficult = Integer.parseInt(elements.group(3));
}
else if(msgText.toLowerCase().matches(".*([0-9]+) +([0-9]+).*")) { // XkY Aufbau in der Anfrage
Pattern pattern = Pattern.compile("([0-9]+) +([0-9]+)");
Matcher matcher = pattern.matcher(msgText.toLowerCase());
matcher.find();
MatchResult elements = matcher.toMatchResult();
numberOfDice = Integer.parseInt(elements.group(1));
numberOfHungerDice = Integer.parseInt(elements.group(2));
}
else {
String message = activLang.error;
message = message.replace("%command%", msgText);
event.getChannel().sendMessage(getAsMention(event) + message).queue();
return;
}
}
else {
String message = activLang.error;
message = message.replace("%command%", msgText);
event.getChannel().sendMessage(getAsMention(event) + message).queue();
return;
}
if(numberOfDice <= 0) {
String message = activLang.noNegativ;
event.getChannel().sendMessage(getAsMention(event) + message).queue();
return;
}
if(numberOfDice < numberOfHungerDice) {
numberOfHungerDice = numberOfDice;
}
for(int i = 0; i < numberOfDice-numberOfHungerDice; i++) {
dice1 = new Random().nextInt(10);
dice1++;
if(dice1 >= 6) {
successes++;
}
verteilungGesammt[dice1]++;
if(resultDice.length() > 0)
resultDice.append(" ");
if((dice1 >= 6))
resultDice.append("**").append(dice1).append("**");
else
resultDice.append(dice1);
}
for(int i = 0; i < numberOfHungerDice; i++) {
dice1 = new Random().nextInt(10);
dice1++;
if(dice1 >= 6) {
successes++;
}
verteilungGesammt[dice1]++;
verteilungHunger[dice1]++;
if(resultHungerDice.length() > 0)
resultHungerDice.append(" ");
if((dice1 >= 6))
resultHungerDice.append("**").append(dice1).append("**");
else
resultHungerDice.append(dice1);
}
if(verteilungGesammt[10] > 2) {
successes += 2;
}
if((difficult > 0 && successes > difficult) || (difficult == 0 && successes > 0)) { // erfolg
if(verteilungGesammt[10] > 2) {
if(verteilungHunger[10] > 0) {
rollState = "Krit";
outputBox.setColor(Color.green);
}
else {
rollState = "Schmutziger Triumphe";
outputBox.setColor(Color.red);
}
}
else {
rollState = "Erfolg";
outputBox.setColor(Color.green);
}
}
else if(difficult > 0 && successes > 0) { // Fehlschlag
if(verteilungHunger[1] > 0) {
rollState = "Bestialischer Fehlschlag";
outputBox.setColor(Color.red);
}
else {
rollState = "Fehlschlag";
outputBox.setColor(Color.darkGray);
}
}
else if(successes == 0) { // Totaler Fehlschlag
if(verteilungHunger[1] > 0) {
rollState = "Bestialischer Fehlschlag";
outputBox.setColor(Color.red);
}
else {
rollState = "Totaler Fehlschlag";
outputBox.setColor(Color.darkGray);
}
}
// Ausgabe beginn
String addition = "";
if(difficult > 0) {
addition += " Schwierigkeit " + difficult;
}
String title = getEffectiveName(event) + "Pool " + numberOfDice;
if(numberOfHungerDice > 0) {
title += " Hunger " + numberOfHungerDice;
}
if(difficult > 0) {
title += " Schwierigkeit " + difficult;
}
outputBox.setTitle(title);
/*
StringBuilder description = new StringBuilder();
for(int i = 0; i < numberOfDice; i++) {
if(description.length() > 0) {
description.append(", ");
}
description.append(rolls[i].getText());
}
outputBox.setDescription("(" + description + ")");*/
event.getChannel().sendMessage(outputBox.build().toString()).queue();
}
catch (NumberFormatException e) {
event.getChannel().sendMessage("Nope").queue();
}
catch (Exception e) {
System.out.println("problem: " + e.getMessage());
}
}
}

105
src/main/java/Vampire/result.java Normal file
View File

@ -0,0 +1,105 @@
package Vampire;
import java.util.Random;
public class result {
private StringBuilder text;
private int value;
private int diceart;
private Boolean reroll9;
private Boolean reroll1;
private Boolean maxReroll;
private Boolean noreroll;
public result() {
diceart = 10;
text = new StringBuilder();
value = 0;
reroll9 = false;
reroll1 = false;
maxReroll = false;
noreroll = false;
}
public String getText() {
return text.toString();
}
public void setText(String text) {
this.text = new StringBuilder();
this.text.append(text);
}
public void setMarket() {
String tmp = this.text.toString();
this.text = new StringBuilder();
this.text.append("**").append(tmp).append("**");
}
public int getValue() {
return value;
}
public void setValue(Integer value) {
this.value = value;
}
public result setReroll9(Boolean reroll9) {
this.reroll9 = reroll9;
return this;
}
public result setReroll1(Boolean reroll1) {
this.reroll1 = reroll1;
return this;
}
public result setMaxReroll(Boolean maxReroll) {
this.maxReroll = maxReroll;
return this;
}
public result setNoreroll(Boolean noreroll) {
this.noreroll = noreroll;
return this;
}
public result roll() {
int dice;
int rolls = 0;
Boolean reroll = false;
do{
reroll = false;
dice = new Random().nextInt(diceart);
dice++;
if(text.length() > 0) {
text.append("+");
}
if(reroll1 && dice == 1 && rolls <= 0) {
text.append("~~ ").append(dice).append(" ~~ ");
}
else {
text.append(dice);
}
value += dice;
if(!noreroll) {
if (dice == 10) {
reroll = rolls <= 0 || !maxReroll; // wenn maxRolls an und schon einmal gerollt wurde kein reroll
++rolls;
} else if (reroll9 && dice == 9) {
reroll = rolls <= 0 || !maxReroll;
} else if (reroll1 && dice == 1 && rolls <= 0) {
reroll = true;
value--;
}
}
} while(reroll);
return this;
}
}

22
src/main/java/core/Main.java
View File

@ -2,17 +2,11 @@ package core;
//import Serenity.balance;
import Shadowrun.dice;
import Socket.shadowrun;
import javafx.scene.effect.Shadow;
import net.dv8tion.jda.api.JDA;
import net.dv8tion.jda.api.JDABuilder;
import net.dv8tion.jda.api.OnlineStatus;
import net.dv8tion.jda.api.entities.*;
import javax.security.auth.login.LoginException;
import net.dv8tion.jda.api.requests.GatewayIntent;
public class Main {
@ -22,9 +16,9 @@ public class Main {
String token = "NTQ2ODk5MzYwMDEzODc3MjU4.D0u8wA.VfA2vJzundVhCl1-ibDiBaKuA8w";
// iro
//String token = "NTQ2NzEwODUwOTIxMjk5OTc5.D0sL6A.1fUd5iBr3eo2tbPXofEqyumDm6w";
try {
JDA jda = JDABuilder.createDefault(token)
.enableIntents(GatewayIntent.MESSAGE_CONTENT)
.setActivity(Activity.playing("mit den Würfeln"))
.setStatus(OnlineStatus.ONLINE)
//.addEventListeners(new dice())
@ -36,13 +30,13 @@ public class Main {
.setAutoReconnect(true)
.build();
Thread thread = new Thread(new shadowrun(jda));
thread.start();
//jda.upsertCommand("sr", "Calculate ping of the bot").queue();
// Thread thread = new Thread(new shadowrun(jda));
//thread.start();
}
catch (LoginException e) {
e.printStackTrace();
}
}
}