diff --git a/src/main/java/Serenity/balance.java b/src/main/java/Serenity/balance.java index a503bb3..c4ff89d 100755 --- a/src/main/java/Serenity/balance.java +++ b/src/main/java/Serenity/balance.java @@ -118,18 +118,32 @@ public class balance extends ListenerAdapter { result_test.append("**").append(((JSONObject) responseJson.get(key)).get("name").toString()).append(":**\n"); result_test.append("```"); - JSONArray transaction = (JSONArray) ((JSONObject) responseJson.get(key)).get("transaction"); - for (int i = 0; i < transaction.length(); i++) { - for (int j = 7 - (myFormatter.format(Float.parseFloat(((JSONObject) transaction.get(i)).get("amount").toString()))).length(); j > 0; j--) { + if (detail) { + JSONArray transaction = (JSONArray) ((JSONObject) responseJson.get(key)).get("transaction"); + for (int i = 0; i < transaction.length(); i++) { + for (int j = 7 - (myFormatter.format(Float.parseFloat(((JSONObject) transaction.get(i)).get("amount").toString()))).length(); j > 0; j--) { + result_test.append(" "); + } + result_test.append( (myFormatter.format(Float.parseFloat(((JSONObject) transaction.get(i)).get("amount").toString())))); + + + result_test.append(" ").append( ((JSONObject) transaction.get(i)).get("currency_name").toString()).append(" "); + + result_test.append(" - ").append(((JSONObject) transaction.get(i)).get("reason").toString()); + + result_test.append( "\n"); + } + result_test.append( "\n-------------------------------------\n"); + } + JSONArray balance = (JSONArray) ((JSONObject) responseJson.get(key)).get("balance"); + for (int i = 0; i < balance.length(); i++) { + for (int j = 7 - (myFormatter.format(Float.parseFloat(((JSONObject) balance.get(i)).get("amount").toString()))).length(); j > 0; j--) { result_test.append(" "); } - result_test.append( (myFormatter.format(Float.parseFloat(((JSONObject) transaction.get(i)).get("amount").toString())))); + result_test.append( (myFormatter.format(Float.parseFloat(((JSONObject) balance.get(i)).get("amount").toString())))); - result_test.append(" ").append( ((JSONObject) transaction.get(i)).get("currency_name").toString()).append(" "); - if (detail) { - result_test.append(" - ").append(((JSONObject) transaction.get(i)).get("reason").toString()); - } + result_test.append(" ").append( ((JSONObject) balance.get(i)).get("currency_name").toString()).append(" "); result_test.append( "\n"); } result_test.append( "```"); diff --git a/src/main/java/Shadowrun/dice.java b/src/main/java/Shadowrun/dice.java index d4df6e2..7bada01 100755 --- a/src/main/java/Shadowrun/dice.java +++ b/src/main/java/Shadowrun/dice.java @@ -115,16 +115,11 @@ public class dice extends ListenerAdapter { */ private void roll(MessageReceivedEvent event) { - EmbedBuilder test = new EmbedBuilder(); - test.setTitle("Das ist ein Test"); - test.setColor(Color.red); - test.setDescription("Text " + event.getMember().getAsMention()); - - + EmbedBuilder outputBox = new EmbedBuilder(); int[] verteilung = new int[6]; int dice1; - int numberOdDice = 1; + int numberOfDice = 1; int diceart = 6; StringBuilder result = new StringBuilder(""); @@ -149,7 +144,7 @@ public class dice extends ListenerAdapter { String[] diceInterpreter = MsgParts[1].trim().toLowerCase().replace(" ", "").split("[wd]"); try { diceart = Integer.parseInt(diceInterpreter[1]); - numberOdDice = Integer.parseInt(diceInterpreter[0]); + numberOfDice = Integer.parseInt(diceInterpreter[0]); } catch (NumberFormatException e) { event.getChannel().sendMessage(event.getMember().getAsMention() + " Irgent was dummes ist passiert beim Verstehen von " + MsgParts[1].trim().toLowerCase()).queue(); @@ -157,14 +152,19 @@ public class dice extends ListenerAdapter { } } else { - try { - numberOdDice = Integer.parseInt(MsgParts[1].trim().replace(" ", "")); - } - catch (NumberFormatException e) { - event.getChannel().sendMessage(event.getMember().getAsMention() + " Irgent was dummes ist passiert beim Verstehen von " + MsgParts[1].trim()).queue(); - return; - } + event.getChannel().sendMessage(event.getMember().getAsMention() + " ich verstehe nicht was du von mir willst mit " + MsgParts[1].trim()).queue(); + return; } + } + else { + try { + numberOfDice = Integer.parseInt(MsgParts[1].trim().replace(" ", "")); + } + catch (NumberFormatException e) { + event.getChannel().sendMessage(event.getMember().getAsMention() + " Irgent was dummes ist passiert beim Verstehen von " + MsgParts[1].trim()).queue(); + return; + } + } /* if(MsgParts[1].trim().toLowerCase().replace(" ", "").matches("^([0-9]*\\+)?[0-9]*([dw][0-9]*)?(\\+[0-9]*)?")) { // format besteh aus (Zahlen)+(Zahlen)d(Zahlen) oder (Zahlen)d(Zahlen)+(Zahlen) String[] diceInterpreter = MsgParts[1].trim().toLowerCase().replace(" ", "").split("\\+"); @@ -177,47 +177,75 @@ public class dice extends ListenerAdapter { return; } }*/ - } - if(numberOdDice <= 0) { + + if(numberOfDice <= 0) { event.getChannel().sendMessage(event.getMember().getAsMention() + " es darf kein Negativen Wurf geben").queue(); return; } int bonusEdegeDice = 0; - for(int i = 0; i < numberOdDice+bonusEdegeDice; i++) { + for(int i = 0; i < numberOfDice+bonusEdegeDice; i++) { dice1 = new Random().nextInt(diceart); if(edge && dice1 == 5) bonusEdegeDice++; - if(edge && dice1 >= 4) { + if(dice1 >= 4) { hits++; } verteilung[dice1]++; - result.append(dice1); + result.append(dice1+1); result.append(" "); } - if (verteilung[0] >= (numberOdDice+bonusEdegeDice)/2) { + if (verteilung[0] >= (numberOfDice+bonusEdegeDice)/2 && verteilung[0] > 0) { glitches = true; } if(hits == 0) { - test.setColor(Color.red); + outputBox.setColor(Color.red); + if(glitches == true) { + outputBox.setDescription("**Kritischer Patzer** :,("); + } + else { + outputBox.setDescription("**nicht geschafft**"); + } } else if(glitches == true) { - test.setColor(Color.yellow); + outputBox.setColor(Color.yellow); + outputBox.setDescription("**Patzer** :("); } else { - test.setColor(Color.green); + outputBox.setColor(Color.green); + if(hits == 1) { + outputBox.setDescription("**" + String.valueOf(hits) + " Erfolg**"); + } + else if(hits < 4) { + outputBox.setDescription("**" + String.valueOf(hits) + " Erfolge**"); + } + else if(hits < 6) { + outputBox.setDescription("**" + String.valueOf(hits) + " Erfolge**, das ist schon ordentlich"); + } + else if(hits < 10) { + outputBox.setDescription("**" + String.valueOf(hits) + " Erfolge**, WOW sowas mal nachmachen"); + } + else { + outputBox.setDescription("**" + String.valueOf(hits) + " Erfolge**, bist du Wahnsinnig?"); + } } + outputBox.setTitle(event.getMember().getEffectiveName() + " dein Wurf " + MsgParts[1] + " ergibt:"); + + outputBox.addField("Erfolge", String.valueOf(hits), true); + outputBox.addField("Misserfolge", String.valueOf(verteilung[0]), true); + outputBox.addField("Ergbenise", result.toString(), false); + for(int i = 0; i < diceart; i++) { - float pro = verteilung[i]*100f/numberOdDice; - test.addField(Integer.toString(i+1), Integer.toString(verteilung[i]) + " - " + String.format("%.2f", pro) + "%", true); + float pro = verteilung[i]*100f/numberOfDice; + //outputBox.addField(Integer.toString(i+1), Integer.toString(verteilung[i]) + " - " + String.format("%.2f", pro) + "%", true); } - event.getChannel().sendMessage(test.build()).queue(); + event.getChannel().sendMessage(outputBox.build()).queue(); } catch (NumberFormatException e) {