Browse Source

Merge branch 'develop' into shop

remotes/origin/develop
Max Gerbeth 2 years ago
parent
commit
fdd6f1958a
  1. 1
      src/main/java/org/bitbiome/classes/InteractionLoop.java
  2. 4
      src/main/java/org/bitbiome/commands/BlackJackCommand.java
  3. 4
      src/main/java/org/bitbiome/commands/HelpCommand.java
  4. 18
      src/test/java/org/bitbiome/commands/HelpCommandTest.java

1
src/main/java/org/bitbiome/classes/InteractionLoop.java

@ -40,7 +40,6 @@ public class InteractionLoop {
+ "Oh, ein Fremder!\nBist du bereit für dein womöglich größtes Abenteuer?\nDann sag mir doch zunächst wie du heißt: "
+ Colors.ANSI_RESET);
String name = input.nextLine();
JsonParser jp = new JsonParser();
JSONObject playerconf = JsonParser.getJSONObject("src/main/resources/playerconfig.json");
playerconf.put("name", name);
travelEngine.getPlayer().setName(name);

4
src/main/java/org/bitbiome/commands/BlackJackCommand.java

@ -17,10 +17,10 @@ public class BlackJackCommand implements CommandAPI {
over = false;
spielen();
}
Scanner sc;
public void spielen() {
BlackJack bj = new BlackJack("Dave");
Scanner sc = new Scanner(System.in);
sc = new Scanner(System.in);
BlackJack.Entity player = bj.getEntity(1);
while (!over) {
int r = new Random().nextInt(4, 11);

4
src/main/java/org/bitbiome/commands/HelpCommand.java

@ -27,6 +27,10 @@ public class HelpCommand implements CommandAPI {
.append("|--------------|-----------------------------|\n")
.append("|" + Colors.ANSI_GREEN + " travel" + Colors.ANSI_RESET + " | Startet das Reise System |\n")
.append("|--------------|-----------------------------|\n")
.append("|" + Colors.ANSI_GREEN + " quiz" + Colors.ANSI_RESET + " | Startet das quiz im shop |\n")
.append("|--------------|-----------------------------|\n")
.append("|" + Colors.ANSI_GREEN + " blackjack" + Colors.ANSI_RESET + " | Startet blackjack im shop |\n")
.append("|--------------|-----------------------------|\n")
.append("|" + Colors.ANSI_GREEN + " location" + Colors.ANSI_RESET + " | Gibt deine Location aus |\n")
.append("|______________|_____________________________|\n");

18
src/test/java/org/bitbiome/commands/HelpCommandTest.java

@ -1,8 +1,7 @@
package org.bitbiome.commands;
import org.bitbiome.classes.Colors;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class HelpCommandTest {
@ -10,20 +9,7 @@ public class HelpCommandTest {
@Test
public void testHelpCommand() {
String helpMessage = HelpCommand.getHelpMessage();
StringBuilder outputMessage = new StringBuilder();
outputMessage
.append("|______________|_____________________________|\n")
.append("|" + Colors.ANSI_PURPLE + " Command" + Colors.ANSI_RESET + " | " + Colors.ANSI_PURPLE + "Description" + Colors.ANSI_RESET + " |\n")
.append("|--------------|-----------------------------|\n")
.append("|" + Colors.ANSI_GREEN + " help" + Colors.ANSI_RESET + " | Gibt diese Nachricht aus |\n")
.append("|--------------|-----------------------------|\n")
.append("|" + Colors.ANSI_GREEN + " exit/quit" + Colors.ANSI_RESET + " | Beendet das Spiel |\n")
.append("|--------------|-----------------------------|\n")
.append("|" + Colors.ANSI_GREEN + " travel" + Colors.ANSI_RESET + " | Startet das Reise System |\n")
.append("|--------------|-----------------------------|\n")
.append("|" + Colors.ANSI_GREEN + " location" + Colors.ANSI_RESET + " | Gibt deine Location aus |\n")
.append("|______________|_____________________________|\n");
assertEquals(outputMessage.toString(), helpMessage);
assertTrue(helpMessage.contains("Command") && helpMessage.contains("Description"));
}

Loading…
Cancel
Save