BreakOut 5 - reset direction

README.md

@@ -3,8 +3,13 @@
 - Einführung in die Programmierung WS19/20
 - Programmieren des Spieles "Breakout" basierend auf dem Framework des Instituts
 
-# Gruppe
+# alte Gruppe (bis inkl. 3.)
 Gruppennummer: 175  
 Gruppenmitglieder
   - [Ruben Meyer](mailto:ruben.meyer@student.uni-luebeck.de)
   - [Moritz Henseleit](mailto:moritz.henseleit@student.uni-luebeck.de)
+
+# neue Gruppe (ab inkl. 4.)
+Gruppennummer: 262
+Gruppenmitglieder:
+  - [Ruben Meyer](mailto:ruben.meyer@student.uni-luebeck.de)

createRelease.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env zsh
 
 # project prefix
-PREFIX="175-BreakOutA"
+PREFIX="262-BreakOutA"
 
 # get versioning
 echo -n "Type your tag version for '$PREFIX' (like (2.1) followed by [ENTER] for ${PREFIX}2.1): "

res/Level1.json

@@ -1,33 +1,35 @@
 {
-    "field" : [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-                [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-                [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-                [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-                [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-                [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-                [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-                [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-                [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-                [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-                [0, 0, 2, 0, 2, 2, 2, 0, 2, 2, 0, 2, 2, 0, 0, 0, 0, 2, 2, 2, 0, 0],
-                [0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0],
-                [0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0],
-                [0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0],
-                [0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0],
-                [0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0],
-                [0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0],
-                [0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0],
-                [0, 0, 3, 0, 0, 3, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 3, 3, 0, 0, 0],
-                [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-                [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-                [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-                [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-                [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-                [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-                [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-                [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-                [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-                [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-                [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]],
+  "field" : [
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0],
+    [0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0],
+    [0, 1, 0, 3, 0, 1, 0, 0, 0, 1, 2, 1, 0, 0, 0, 1, 0, 3, 0, 1, 0],
+    [0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 3, 1, 0, 0, 0, 0, 1, 0, 1, 0, 0],
+    [0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 2, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 3, 3, 3, 3, 2, 1, 2, 3, 3, 3, 3, 0, 0, 0, 0, 0],
+    [0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0],
+    [0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0],
+    [0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0],
+    [0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0],
+    [0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+  ],
     "maxLives" : 5
 }

res/Level2.json

@@ -0,0 +1,33 @@
+{
+  "field" : [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 2, 0, 2, 2, 2, 0, 2, 2, 0, 2, 2, 0, 0, 0, 0, 2, 2, 2, 0, 0],
+    [0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0],
+    [0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0],
+    [0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0],
+    [0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0],
+    [0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0],
+    [0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0],
+    [0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0],
+    [0, 0, 3, 0, 0, 3, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 3, 3, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]],
+  "maxLives" : 5
+}

res/Level3.json

@@ -0,0 +1,33 @@
+{
+  "field" : [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 1, 1, 1, 1, 0, 0, 2, 0, 0, 0, 0, 3, 0, 0, 3, 0, 0, 0, 3, 0, 0],
+    [0, 1, 0, 0, 1, 1, 0, 2, 2, 2, 2, 0, 3, 3, 0, 3, 3, 0, 0, 3, 3, 0],
+    [0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 2, 0, 3, 3, 0, 0, 3, 0, 0, 3, 3, 0],
+    [0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 2, 0, 0, 3, 0, 0, 3, 0, 0, 3, 0, 0],
+    [0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 2, 0, 0, 3, 0, 0, 3, 0, 0, 3, 0, 0],
+    [0, 1, 0, 0, 0, 1, 0, 0, 0, 2, 2, 0, 0, 3, 0, 0, 3, 0, 3, 3, 0, 0],
+    [0, 1, 0, 0, 0, 1, 0, 0, 2, 2, 0, 0, 0, 3, 0, 0, 3, 0, 3, 0, 0, 0],
+    [0, 1, 0, 0, 0, 1, 0, 2, 2, 0, 0, 0, 0, 3, 0, 3, 3, 0, 3, 0, 0, 0],
+    [0, 1, 1, 1, 1, 1, 0, 2, 0, 0, 0, 0, 0, 3, 0, 3, 0, 0, 3, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 3, 3, 3, 0, 0, 3, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]],
+  "maxLives" : 5
+}

src/break_out/Constants.java

@@ -1,5 +1,7 @@
 package break_out;
 
+import break_out.model.Position;
+
 import java.awt.Color;
 
 /**
@@ -77,21 +79,51 @@ public class Constants {
 	/**
 	 * The background color for the field
 	 */
-	public static final Color COLOR_GAME_BACKGROUND = new Color(33, 97, 138);
+	public static final Color COLOR_GAME_BACKGROUND = new Color(64, 45, 61);
 
 	/**
 	 * The default component color
 	 */
-	public static final Color COLOR_COMPONENT = new Color(200, 200, 200);
+	public static final Color COLOR_COMPONENT = new Color(191, 105, 145);
 
 	/**
 	 * The component color for the bottom paddle
 	 */
-	public static final Color COLOR_PADDLE_BOTTOM = new Color(226, 215, 73);
+	public static final Color COLOR_PADDLE_BOTTOM = new Color(242, 173, 148);
 
 	/**
 	 * The component color for the top paddle
 	 */
-	public static final Color COLOR_PADDLE_TOP = new Color(140, 226, 165);
+	public static final Color COLOR_PADDLE_TOP = new Color(242, 196, 141);
+
+	/**
+	 * The component color for the text
+	 */
+	public static final Color COLOR_TEXT = new Color(0, 0, 0);
+
+	/**
+	 * The component color for the scoreboard
+	 */
+	public static final Color COLOR_SCOREBOARD = new Color(140, 140, 140, 144);
+
+	/**
+	 * The padding / offset of the scoreboard to the inner text elements
+	 */
+	public static final int SCOREBOARD_OFFSET = 15;
+
+	/**
+	 * The string for the score on the scoreboard
+	 */
+	public static final String SCOREBOARD_SCORE = "Score: ";
+
+	/**
+	 * The string for the lives on the scoreboard
+	 */
+	public static final String SCOREBOARD_LIVES = "Lives: ";
+
+	/**
+	 * The position for the scoreboards midpoint (bottom center)
+	 */
+	public static final Position SCOREBOARD_MIDPOINT = new Position(SCREEN_WIDTH*5/6, SCREEN_HEIGHT);
 
 }

src/break_out/controller/Controller.java

@@ -136,7 +136,7 @@ public class Controller implements ActionListener, KeyListener {
 			case KeyEvent.VK_ESCAPE:
 				// exit current level
 				game.getLevel().setFinished(true);
-				toStartScreen();
+				toStartScreen(game.getLevel().getScore());
 				break;
 		}
 
@@ -161,10 +161,14 @@ public class Controller implements ActionListener, KeyListener {
 
 	/**
 	 * This method switches the view to the StartScreen view.
+	 * @param score The player score
 	 */
-	public void toStartScreen() {
+	public void toStartScreen(int score) {
 		view.showScreen(StartScreen.class.getName());
 		view.getStartScreen().requestFocusInWindow();
+
+		view.getStartScreen().addScore(score);
+		view.getStartScreen().repaint();
 	}
 
 	/**

src/break_out/model/Ball.java

@@ -28,6 +28,11 @@ public class Ball implements IBall {
 	 */
 	private boolean hitsPaddle;
 
+	/**
+	 * The balls lost state for upper and lower borders
+	 */
+	private boolean isLost;
+
 	/**
 	 * The balls color with default component color
 	 */
@@ -44,12 +49,12 @@ public class Ball implements IBall {
 	 */
 	public Ball() {
 		this.position = new Position(0, 0);
-		this.direction = new Vector2D(Constants.BALL_SPEED, Constants.BALL_SPEED);
-		this.direction.rescale();
 
-		// start at bottom-center
-		this.position.setX((Constants.SCREEN_WIDTH - Constants.BALL_DIAMETER) / 2.0);
-		this.position.setY(Constants.SCREEN_HEIGHT - Constants.BALL_DIAMETER - Constants.PADDLE_HEIGHT);
+		// reset direction
+		resetDirection();
+
+		// reset position to bottom-center
+		resetPosition();
 	}
 
 	/**
@@ -93,8 +98,7 @@ public class Ball implements IBall {
 		Random random = new Random();
 
 		// random hue without blue colors to prevent ghosting
-		// 65 <~ 170/255
-		float hue = (random.nextInt(65)) / 100f;
+		float hue = (random.nextInt(200)+50) / 360f;
 
 		// saturation between 0.5 and 0.7
 		float saturation = (random.nextInt(2000) + 5000) / 10000f;
@@ -147,14 +151,12 @@ public class Ball implements IBall {
 
 		// reacts on top border
 		if (this.position.getY() <= 0) {
-			this.position.setY(0);
-			this.direction.setDy(-(this.direction.getDy()));
+			isLost = true;
 		}
 
 		// reacts on bottom border (+Diameter because of hitbox)
 		if (this.position.getY() >= Constants.SCREEN_HEIGHT - Constants.BALL_DIAMETER) {
-			this.position.setY(Constants.SCREEN_HEIGHT - Constants.BALL_DIAMETER);
-			this.direction.setDy(-(this.direction.getDy()));
+			isLost = true;
 		}
 	}
 
@@ -369,4 +371,37 @@ public class Ball implements IBall {
 
 	}
 
+	/**
+	 * The getter for balls lost state
+	 * @return balls lost state
+	 */
+	public boolean isLost() {
+		return isLost;
+	}
+
+	/**
+	 * The setter for balls lost state
+	 * @param lost balls lost state
+	 */
+	public void setLost(boolean lost) {
+		isLost = lost;
+	}
+
+	/**
+	 * resets balls position
+	 */
+	public void resetPosition() {
+		// start at bottom-center
+		position.setX((Constants.SCREEN_WIDTH - Constants.BALL_DIAMETER) / 2.0);
+		position.setY(Constants.SCREEN_HEIGHT - Constants.BALL_DIAMETER - Constants.PADDLE_HEIGHT);
+	}
+
+	/**
+	 * resets balls direction
+	 */
+	public void resetDirection() {
+		direction = new Vector2D(Constants.BALL_SPEED, Constants.BALL_SPEED);
+		direction.rescale();
+	}
+
 }

src/break_out/model/Game.java

@@ -36,7 +36,7 @@ public class Game {
 	/**
 	 * The last levelnumber
 	 */
-	private int maxLevel = 1;
+	private int maxLevel = 3;
 
 	/**
 	 * The total score of the game
@@ -114,7 +114,7 @@ public class Game {
 			controller.toPlayground();
 		} else {
 			// tells the controller to switch to the startScreen of the game
-			controller.toStartScreen();
+			controller.toStartScreen(level.getScore());
 
 		}
 

src/break_out/model/IBall.java

@@ -17,4 +17,7 @@ public interface IBall {
 	// Exercise 4
 	public boolean hitsStone(ArrayList<Stone> stones);
 	public Stone getHitStone();
+
+	// Exercise 5
+	public boolean isLost();
 }

src/break_out/model/Level.java

@@ -42,7 +42,7 @@ public class Level extends Thread implements ILevel {
 	/**
 	 * Flag that shows if the level was finished
 	 */
-	private boolean levelFinished = false;
+	private boolean finished = false;
 
 	/**
 	 * The paddles of the level
@@ -73,13 +73,7 @@ public class Level extends Thread implements ILevel {
 		this.score = score;
 		this.ball = new Ball();
 
-		// calc paddle positions
-		Position posPaddleTop = new Position((Constants.SCREEN_WIDTH - Constants.PADDLE_WIDTH) / 2.0, 0);
-		Position posPaddleBottom = new Position((Constants.SCREEN_WIDTH - Constants.PADDLE_WIDTH) / 2.0, Constants.SCREEN_HEIGHT - Constants.PADDLE_HEIGHT);
-
-		// set paddles
-		this.paddleTop = new Paddle(posPaddleTop);
-		this.paddleBottom = new Paddle(posPaddleBottom);
+		resetPaddles();
 
 		// set paddles color
 		this.paddleTop.setColor(Constants.COLOR_PADDLE_TOP);
@@ -127,7 +121,7 @@ public class Level extends Thread implements ILevel {
 		game.notifyObservers();
 
 		// endless loop
-		while (!levelFinished) {
+		while (!finished) {
 			// if ballWasStarted is true, the ball is moving
 			if (ballWasStarted()) {
 
@@ -137,6 +131,11 @@ public class Level extends Thread implements ILevel {
 				// Call here the balls method for reacting on the borders of the playground
 				getBall().reactOnBorder();
 
+				// Call here the balls method for reacting on lost ball state
+				if(getBall().isLost()) {
+					decreaseLives();
+				}
+
 				// if ball hits paddle (top|bottom), reflect ball
 				if(getBall().hitsPaddle(paddleTop)) getBall().reflectOnPaddle(paddleTop);
 				if(getBall().hitsPaddle(paddleBottom)) getBall().reflectOnPaddle(paddleBottom);
@@ -155,13 +154,13 @@ public class Level extends Thread implements ILevel {
 				// Call here the balls method for reacting on stones of the playground
 				if(getBall().hitsStone(getStones())) {
 					updateStonesAndScore();
-					System.out.println("count: "+stones.size());
+					//System.out.println("count: "+stones.size());
 				}
 
 				// if all stones are broken, go to next level
 				if(allStonesBroken()) {
 					// next level
-					System.out.println("next level");
+					//System.out.println("next level");
 				}
 
 				// update paddles position
@@ -189,16 +188,18 @@ public class Level extends Thread implements ILevel {
 	 */
 	private void loadLevelData(int levelnr) {
 		JSONReader reader = new JSONReader(String.format("res/Level%s.json", levelnr));
-		int[][] stoneArray = reader.getStones2DArray();
+		int[][] stoneTypes = reader.getStones2DArray();
+
+		// life counter
 		lifeCounter = reader.getLifeCounter();
 
 		// clear stones list, not needed but could cause problems when not done
 		stones.clear();
 
 		// foreach column
-		for(int y = 0; y < stoneArray.length; y++) {
+		for(int y = 0; y < stoneTypes.length; y++) {
 			// foreach element in column x
-			for(int x = 0; x < stoneArray[y].length; x++) {
+			for(int x = 0; x < stoneTypes[y].length; x++) {
 				Position tempPos = new Position(-1, -1);
 				// position calculation, equivalent to grid calculation in "view.Field"
 
@@ -208,7 +209,7 @@ public class Level extends Thread implements ILevel {
 
 				tempPos.setX(blockWidth * x);
 				tempPos.setY(blockHeight * y);
-				Stone tempStone = new Stone(stoneArray[y][x], tempPos);
+				Stone tempStone = new Stone(stoneTypes[y][x], tempPos);
 
 				// add stone to list
 				if(tempStone.getType() != 0)
@@ -240,7 +241,7 @@ public class Level extends Thread implements ILevel {
 	 * @param finished game state
 	 */
 	public void setFinished(boolean finished) {
-		this.levelFinished = finished;
+		this.finished = finished;
 	}
 
 	/**
@@ -258,13 +259,24 @@ public class Level extends Thread implements ILevel {
 	 * The updater for the levels stones and the player score
 	 */
 	private void updateStonesAndScore() {
+		// hit stone
 		Stone stone = getBall().getHitStone();
+
+		// add value to score
 		score += stone.getValue();
+
+		// set new type
 		stone.setType(stone.getType()-1);
 
+		// stones type is 0? remove it!
 		if(stone.getType() == 0) {
 			stones.remove(stone);
 		}
+
+		if(allStonesBroken()) {
+			setFinished(true);
+			nextLevel();
+		}
 	}
 
 	/**
@@ -272,8 +284,66 @@ public class Level extends Thread implements ILevel {
 	 * @return true when all stones are broken
 	 */
 	private boolean allStonesBroken() {
-		if(stones.isEmpty()) return true;
-		else return false;
+		return stones.isEmpty();
+	}
+
+	/**
+	 * decreases the lives and interact to the new count
+	 */
+	private void decreaseLives() {
+		lifeCounter--;
+		// reset paddles to center pos
+		if(lifeCounter > 0) {
+			resetPaddles();
+			getBall().resetPosition();
+			getBall().resetDirection();
+			getBall().setLost(false);
+			stopBall();
+		// level failed
+		} else {
+			setFinished(true);
+			game.getController().toStartScreen(getScore());
+		}
+	}
+
+	/**
+	 * resets paddles position and or init them
+	 */
+	private void resetPaddles() {
+		// calc paddle positions
+		Position posPaddleTop = new Position((Constants.SCREEN_WIDTH - Constants.PADDLE_WIDTH) / 2.0, 0);
+		Position posPaddleBottom = new Position((Constants.SCREEN_WIDTH - Constants.PADDLE_WIDTH) / 2.0, Constants.SCREEN_HEIGHT - Constants.PADDLE_HEIGHT);
+
+		// resets top paddle
+		if(paddleTop == null) paddleTop = new Paddle(posPaddleTop);
+		else paddleTop.setPosition(posPaddleTop);
+
+		// resets bottom paddle
+		if(paddleBottom == null) paddleBottom = new Paddle(posPaddleBottom);
+		else paddleBottom.setPosition(posPaddleBottom);
+	}
+
+	/**
+	 * The getter for levels score
+	 * @return the score
+	 */
+	public int getScore() {
+		return score;
+	}
+
+	/**
+	 * The getter for levels lives
+	 * @return the life counter
+	 */
+	public int getLives() {
+		return lifeCounter;
+	}
+
+	/**
+	 * switch to next level
+	 */
+	public void nextLevel() {
+		game.createLevel(++levelnr, score);
 	}
 }
     

src/break_out/model/Paddle.java

@@ -136,9 +136,10 @@ public class Paddle implements IPaddle {
 	 * @param direction The paddles new direction
 	 */
 	public void setDirection(int direction) {
+		// normalization not needed
 		// normalize to valid values
-		if(direction > 0) direction =  1;
-		if(direction < 0) direction = -1;
+		//if(direction > 0) direction =  1;
+		//if(direction < 0) direction = -1;
 
 		this.direction = direction;
 	}

src/break_out/model/Stone.java

@@ -112,10 +112,10 @@ public class Stone implements IStone {
 	 * @param type The stones new type
 	 */
 	public void setType(int type) {
-		// type not in range
-		if(type > 3) { type = 0; }
-		setValue(type);
+
+		// set the type; no verification needed;
 		this.type = type;
+
 		switch(type) {
 			// multi-case, hacky, but dont care
 			case 0:
@@ -127,15 +127,18 @@ public class Stone implements IStone {
 				break;
 			case 1:
 				// stone type one
-				setColor(Color.CYAN);
+				setColor(new Color(77, 80, 140));
+				setValue(1);
 				break;
 			case 2:
 				// stone type two
-				setColor(Color.WHITE);
+				setColor(new Color(242, 191, 94));
+				setValue(2);
 				break;
 			case 3:
 				// stone type three
-				setColor(Color.BLUE);
+				setColor(new Color(242, 80, 65));
+				setValue(3);
 				break;
 		}
 	}

src/break_out/view/Field.java

@@ -1,11 +1,15 @@
 package break_out.view;
 
 import java.awt.Color;
-import java.awt.Dimension;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
+import java.awt.Dimension;
 import java.awt.RenderingHints;
+import java.awt.Font;
+import java.awt.font.TextAttribute;
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
 
 import javax.swing.JPanel;
 
@@ -114,6 +118,9 @@ public class Field extends JPanel {
 		// Calls the method for drawing the top paddle
 		drawPaddleTop(g2);
 
+		// Calls the method for drawing the scoreboard
+		drawScoreboard(g2);
+
 	}
 
 	/**
@@ -249,4 +256,96 @@ public class Field extends JPanel {
 		}
 	}
 
+	/**
+	 * Draws the scoreboard with score and lives
+	 * @param g2
+	 */
+	private void drawScoreboard(Graphics2D g2) {
+		Font currentFont = g2.getFont();
+
+		// source: <a href="https://stackoverflow.com/questions/18249592/"> Stackoverflow Question - 18249592 </a>
+		Map<TextAttribute, Object> attributes = new HashMap<>();
+		attributes.put(TextAttribute.FAMILY, currentFont.getFamily());
+		attributes.put(TextAttribute.WEIGHT, TextAttribute.WEIGHT_BOLD);
+		attributes.put(TextAttribute.SIZE, (int) (currentFont.getSize() * 1.8));
+		Font myFont = Font.getFont(attributes);
+		g2.setFont(myFont);
+
+		// temporarily save default component color to draw text and background in specific color
+		Color temp = g2.getColor();
+
+		// draw background in specific color
+		g2.setColor(Constants.COLOR_SCOREBOARD);
+
+		// bottom centered mid-point
+		int midX = (int) Constants.SCOREBOARD_MIDPOINT.getX();
+		int midY = (int) Constants.SCOREBOARD_MIDPOINT.getY();
+
+		int offset = Constants.SCOREBOARD_OFFSET;
+
+		// calculate rendered string width
+		int scoreWidth = g2.getFontMetrics().stringWidth(Constants.SCOREBOARD_SCORE + view.getGame().getLevel().getScore());
+		int lifeWidth = g2.getFontMetrics().stringWidth(Constants.SCOREBOARD_LIVES + view.getGame().getLevel().getLives());
+		int maxWidth = Math.max(scoreWidth, lifeWidth); // max width
+		int fontSize = g2.getFontMetrics().getHeight(); // font size
+
+		// fillRoundRect(x, y, width, height, arcWidth, arcHeight)
+		g2.fillRoundRect((midX)-offset-maxWidth/2, midY-2*offset-3*fontSize, maxWidth+2*offset, 2*(fontSize+offset), 5, 5);
+
+		// draw text in specific color (sharing g2 object and therefore also color)
+		g2.setColor(Constants.COLOR_TEXT);
+
+		// draw score and lives
+		drawScore(g2);
+		drawLives(g2);
+
+		// reset color and font
+		g2.setColor(temp);
+		g2.setFont(currentFont);
+	}
+
+	/**
+	 * Draws the score
+	 *
+	 * @param g2 The graphics object
+	 */
+	private void drawScore(Graphics2D g2) {
+		int score = view.getGame().getLevel().getScore();
+
+		int fontSize = g2.getFontMetrics().getHeight(); // font size
+
+		// bottom centered mid-point
+		int x = (int) Constants.SCOREBOARD_MIDPOINT.getX();
+		int y = (int) Constants.SCOREBOARD_MIDPOINT.getY()-(int)((3.0/2.0)*fontSize);
+
+		String str = Constants.SCOREBOARD_SCORE+score;
+
+		x -= g2.getFontMetrics().stringWidth(str)/2; // because x is middle position on x axis
+
+		// draw string
+		g2.drawString(str, x, y);
+	}
+
+	/**
+	 * Draws the life counter
+	 *
+	 * @param g2 The graphics object
+	 */
+	private void drawLives(Graphics2D g2) {
+		int lives = view.getGame().getLevel().getLives();
+
+		int fontSize = g2.getFontMetrics().getHeight(); // font size
+
+		// bottom centered mid-point
+		int x = (int) Constants.SCOREBOARD_MIDPOINT.getX();
+		int y = (int) Constants.SCOREBOARD_MIDPOINT.getY()-3*fontSize;
+
+		String str = Constants.SCOREBOARD_LIVES+lives;
+
+		x -= g2.getFontMetrics().stringWidth(str)/2; // because x is middle position on x axis
+
+		// draw string
+		g2.drawString(str, x, y);
+	}
+
 }

src/break_out/view/StartScreen.java

@@ -51,6 +51,11 @@ public class StartScreen extends JPanel {
 	 */
 	private JLabel error;
 
+	/**
+	 * The scoreMenu
+	 */
+	private SectionPanel scoreMenu;
+
 
 	/**
 	 * The constructor needs a view
@@ -125,16 +130,16 @@ public class StartScreen extends JPanel {
 	 */
 	private void initializeScoreMenu() {
 		// The layout
-		SectionPanel scoreMenu = new SectionPanel(Color.WHITE);
+		scoreMenu = new SectionPanel(Color.WHITE);
 		scoreMenu.shady = false;
 		scoreMenu.setLayout(new MigLayout("", "10[center, grow, fill]10",
 				"5[center]5"));
 
-		// adding the compoenents to the layout
+		// adding the components to the layout
 		JLabel headline = new JLabel("Scores");
 		headline.setFont(new Font("Sans-serif", Font.PLAIN, 16));
 		headline.setHorizontalAlignment(SwingConstants.CENTER);
-		scoreMenu.add(headline, "cell 0 0, gaptop 5");
+		scoreMenu.add(headline, "cell 0 0, gaptop 5, wrap");
 
 		add(scoreMenu, "cell 1 0, gapleft 5");
 	}
@@ -200,4 +205,28 @@ public class StartScreen extends JPanel {
 		error.setText("");
 	}
 
+	/**
+	 * Adds a score to the scoreboard
+	 * @param score
+	 */
+	public void addScore(int score) {
+		// adding the components to the layout
+
+		// name
+		JLabel lName = new JLabel(getPlayersName());
+		lName.setFont(new Font("Sans-serif", Font.PLAIN, 16));
+		lName.setHorizontalAlignment(SwingConstants.CENTER);
+		scoreMenu.add(lName, "gaptop 5");
+
+		// spacing
+		JLabel space = new JLabel();
+		scoreMenu.add(space);
+
+		// score
+		JLabel lScore = new JLabel(String.valueOf(score));
+		lScore.setFont(new Font("Sans-serif", Font.PLAIN, 16));
+		lScore.setHorizontalAlignment(SwingConstants.CENTER);
+		scoreMenu.add(lScore, "gaptop 5, wrap");
+	}
+
 }