diff --git a/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.bin b/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.bin index 8972aa9..7d42531 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 d7f139a..9c06703 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 fb2c130..cc758a9 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 bc462f1..106c7d7 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 143f7ea..bf1163e 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 1887c80..5ce8d71 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 ddcd519..51f0dae 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 ef8a4a2..76dba79 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 4d6cb86..a25834e 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 @@ -29,9 +29,6 @@ public class HappyBirdMain extends Application { /* Formatierungsklasse */ private final FormatingClass formatingClass = new FormatingClass(); - /* Testen des Endscreens */ - private final Button endscreenTest = new Button("Endscreentest"); - /* Datenbank einlesen */ private final MariaDB datenbank = new MariaDB(); @@ -712,14 +709,12 @@ public class HappyBirdMain extends Application { } }); - /*ESC-Tast drücken, um das Pause-Menü aufzurufen*/ - scene.setOnKeyPressed(e -> { - if (e.getCode() == KeyCode.ESCAPE && !menuScreenRunning) { - pauseButtonClick(gameRunning); - gameRunning = !gameRunning; - } - }); + + /* ESC-Taste zum Öffnen des Pause-Screens einbinden - + * Tasten W und S einbinden zum Verändern der Höhe des Vogels + * (W bewegt den Vogel hoch / S bewegt den Vogel runter) + */ birdPositionMovedBy = 0; scene.setOnKeyPressed(event -> { if (event.getCode() == KeyCode.S) { @@ -730,6 +725,10 @@ public class HappyBirdMain extends Application { moveBirdUp(); System.out.println(birdPositionMovedBy); } + if (event.getCode() == KeyCode.ESCAPE && !menuScreenRunning) { + pauseButtonClick(gameRunning); + gameRunning = !gameRunning; + } }); } else {