Compare commits
No commits in common. "680a80d210b083f045c7aa15d88ae2ba4a9d336a" and "241bd0f85b5b040c577640ceafb7a60924d9a85b" have entirely different histories.
680a80d210
...
241bd0f85b
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -106,8 +106,6 @@ 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;
|
||||
@ -347,6 +345,7 @@ 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);
|
||||
@ -566,8 +565,6 @@ 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,6 +581,8 @@ public class HappyBirdMain extends Application {
|
||||
gameRunning = !gameRunning;
|
||||
}
|
||||
});
|
||||
} else {
|
||||
System.out.println("Name oder Kürzel falsch!");
|
||||
}
|
||||
}
|
||||
|
||||
@ -826,20 +825,20 @@ public class HappyBirdMain extends Application {
|
||||
String nametext = name.getText();
|
||||
if (!nametext.matches("[a-zA-ZÄÖÜäöüß ]*"))
|
||||
{
|
||||
System.out.println("Fehler Schreibweise Name - nicht erlaubte Zeichen");
|
||||
System.out.println("Fehler Schreibweise Name");
|
||||
return false;
|
||||
}
|
||||
if (nametext.length() > 0)
|
||||
{
|
||||
if (nametext.charAt(0) < 'A' || nametext.charAt(0) > 'Z')
|
||||
{
|
||||
System.out.println("Fehler Schreibweise Name - 1. Buchstabe muss großgeschrieben werden");
|
||||
System.out.println("Fehler Schreibweise Name 1. Buchstabe");
|
||||
return false;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
System.out.println("Name darf nicht leer sein");
|
||||
System.out.println("Name leer");
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
@ -856,12 +855,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 (3-10 Zeichen)");
|
||||
System.out.println("Fehler Länge Kürzel");
|
||||
return false;
|
||||
}
|
||||
if (!acronymtext.matches("[A-Za-z0-9]*"))
|
||||
{
|
||||
System.out.println("Fehler Schreibweise Kürzel - nur Buchstaben und Zahlen erlaubt");
|
||||
System.out.println("Fehler Schreibweise Kürzel");
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
@ -984,5 +983,4 @@ public class HappyBirdMain extends Application {
|
||||
pane.getChildren().remove(endScreen);
|
||||
generateMenueScreen();
|
||||
}
|
||||
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user