diff --git a/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.bin b/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.bin index 7c37640..b2f7ae0 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 714a218..28afb23 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 2cea9d8..a8b58db 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 01322a3..2b4675d 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 60bc1bf..7ffa631 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 7dc4537..9600cd5 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 0014bdd..8d15f40 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 c2e51d0..488f6ee 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 5280a4e..33bbe47 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 @@ -106,6 +106,8 @@ public class HappyBirdMain extends Application { //gameRunning: das Spiel läuft/ GameScreen ist aufgerufen private boolean gameRunning; + //Birdview + ImageView birdView = new ImageView(bird); private TranslateTransition top; private TranslateTransition bottom; @@ -348,7 +350,6 @@ public class HappyBirdMain extends Application { menuButton.setVisible(false); /*Vogel hinzufügen, bisher nur als Bild*/ - ImageView birdView = new ImageView(bird); pane.getChildren().add(birdView); birdView.setLayoutY(325); birdView.setLayoutX(50); @@ -568,6 +569,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 -> { @@ -584,8 +587,6 @@ public class HappyBirdMain extends Application { gameRunning = !gameRunning; } }); - } else { - System.out.println("Name oder Kürzel falsch!"); } } @@ -828,20 +829,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; @@ -858,12 +859,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; @@ -986,4 +987,5 @@ public class HappyBirdMain extends Application { pane.getChildren().remove(endScreen); generateMenueScreen(); } + } \ No newline at end of file