diff --git a/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.bin b/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.bin index 7c12307..188e4f2 100644 Binary files a/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.bin and b/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.bin differ diff --git a/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.lock b/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.lock index 389cabd..4daa4de 100644 Binary files a/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.lock and b/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.lock differ diff --git a/Happy_Bird/.gradle/7.1.1/fileHashes/fileHashes.bin b/Happy_Bird/.gradle/7.1.1/fileHashes/fileHashes.bin index 216e3cd..7221e4e 100644 Binary files a/Happy_Bird/.gradle/7.1.1/fileHashes/fileHashes.bin and b/Happy_Bird/.gradle/7.1.1/fileHashes/fileHashes.bin differ diff --git a/Happy_Bird/.gradle/7.1.1/fileHashes/fileHashes.lock b/Happy_Bird/.gradle/7.1.1/fileHashes/fileHashes.lock index 0366635..b3459ef 100644 Binary files a/Happy_Bird/.gradle/7.1.1/fileHashes/fileHashes.lock and b/Happy_Bird/.gradle/7.1.1/fileHashes/fileHashes.lock differ diff --git a/Happy_Bird/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/Happy_Bird/.gradle/buildOutputCleanup/buildOutputCleanup.lock index f5352c9..79d7a3f 100644 Binary files a/Happy_Bird/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/Happy_Bird/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/Happy_Bird/build/classes/java/main/com/example/happy_bird/HappyBirdMain.class b/Happy_Bird/build/classes/java/main/com/example/happy_bird/HappyBirdMain.class index 13b0760..be7d37a 100644 Binary files a/Happy_Bird/build/classes/java/main/com/example/happy_bird/HappyBirdMain.class and b/Happy_Bird/build/classes/java/main/com/example/happy_bird/HappyBirdMain.class differ diff --git a/Happy_Bird/build/libs/Happy_Bird-1.0-SNAPSHOT.jar b/Happy_Bird/build/libs/Happy_Bird-1.0-SNAPSHOT.jar index 736aa50..0e94fd8 100644 Binary files a/Happy_Bird/build/libs/Happy_Bird-1.0-SNAPSHOT.jar and b/Happy_Bird/build/libs/Happy_Bird-1.0-SNAPSHOT.jar differ diff --git a/Happy_Bird/build/tmp/compileJava/previous-compilation-data.bin b/Happy_Bird/build/tmp/compileJava/previous-compilation-data.bin index 61c152f..a9556b3 100644 Binary files a/Happy_Bird/build/tmp/compileJava/previous-compilation-data.bin and b/Happy_Bird/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/Happy_Bird/src/main/java/com/example/happy_bird/HappyBirdMain.java b/Happy_Bird/src/main/java/com/example/happy_bird/HappyBirdMain.java index 8bb166e..ce6f61e 100644 --- a/Happy_Bird/src/main/java/com/example/happy_bird/HappyBirdMain.java +++ b/Happy_Bird/src/main/java/com/example/happy_bird/HappyBirdMain.java @@ -102,7 +102,12 @@ public class HappyBirdMain extends Application { //gameRunning: das Spiel läuft/ GameScreen ist aufgerufen private boolean gameRunning; + /*TranslateTransitions für obere und untere Pipes*/ + + //Birdview + //ImageView birdView = new ImageView(bird); + private TranslateTransition top; private TranslateTransition bottom; @@ -370,8 +375,12 @@ public class HappyBirdMain extends Application { startGameButton.setVisible(false); menuButton.setVisible(false); + /*Vogel hinzufügen, bisher nur als Bild ImageView birdView = new ImageView(bird); + + /*Vogel hinzufügen, bisher nur als Bild*/ + /* pane.getChildren().add(birdView); birdView.setLayoutY(325); birdView.setLayoutX(50);*/ @@ -639,6 +648,8 @@ public class HappyBirdMain extends Application { if (correctName() && correctAcronym()) { generateGameScreen(); + System.out.println(gameRunning); + /*Klick auf den Pause-Button, um das Pause-Menü aufzurufen*/ pauseButton.setOnAction(event -> { @@ -655,8 +666,6 @@ public class HappyBirdMain extends Application { gameRunning = !gameRunning; } }); - } else { - System.out.println("Name oder Kürzel falsch!"); } } @@ -899,20 +908,20 @@ public class HappyBirdMain extends Application { String nametext = name.getText(); if (!nametext.matches("[a-zA-ZÄÖÜäöüß ]*")) { - System.out.println("Fehler Schreibweise Name"); + System.out.println("Fehler Schreibweise Name - nicht erlaubte Zeichen"); return false; } if (nametext.length() > 0) { if (nametext.charAt(0) < 'A' || nametext.charAt(0) > 'Z') { - System.out.println("Fehler Schreibweise Name 1. Buchstabe"); + System.out.println("Fehler Schreibweise Name - 1. Buchstabe muss großgeschrieben werden"); return false; } } else { - System.out.println("Name leer"); + System.out.println("Name darf nicht leer sein"); return false; } return true; @@ -929,12 +938,12 @@ public class HappyBirdMain extends Application { System.out.println(acronymtext); if (acronymtext.length() < 3 || acronymtext.length() > 10) { - System.out.println("Fehler Länge Kürzel"); + System.out.println("Fehler Länge Kürzel (3-10 Zeichen)"); return false; } if (!acronymtext.matches("[A-Za-z0-9]*")) { - System.out.println("Fehler Schreibweise Kürzel"); + System.out.println("Fehler Schreibweise Kürzel - nur Buchstaben und Zahlen erlaubt"); return false; } return true; @@ -1055,4 +1064,5 @@ public class HappyBirdMain extends Application { pane.getChildren().remove(endScreen); generateMenueScreen(); } + } \ No newline at end of file