From 742ff1eafca32a30180a5f4a32f8d3048741b3e2 Mon Sep 17 00:00:00 2001
From: Jan Philipp Timme <jan.philipp@timme.it>
Date: Tue, 9 Dec 2014 11:01:43 +0100
Subject: [PATCH 01/22] Bugfix: Shield makes player get remaining damage as hp.

---
 src/de/teamteamteam/spacescooter/entity/LivingEntity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/de/teamteamteam/spacescooter/entity/LivingEntity.java b/src/de/teamteamteam/spacescooter/entity/LivingEntity.java
index 048cf4b..7d0b3fd 100644
--- a/src/de/teamteamteam/spacescooter/entity/LivingEntity.java
+++ b/src/de/teamteamteam/spacescooter/entity/LivingEntity.java
@@ -104,7 +104,7 @@ public abstract class LivingEntity extends CollidableEntity implements Hittable
 			return;
 		if (this.shieldPoints > 0) {
 			if (this.shieldPoints < damage) {
-				this.healthPoints = (damage - this.shieldPoints);
+				this.healthPoints -= (damage - this.shieldPoints);
 				this.shieldPoints = 0;
 			} else {
 				this.shieldPoints -= damage;

From 5610ff78067735f2991108f9d6553f18db40d464 Mon Sep 17 00:00:00 2001
From: Jan Philipp Timme <jan.philipp@timme.it>
Date: Tue, 9 Dec 2014 11:03:02 +0100
Subject: [PATCH 02/22] Performance: Maybe this fixes very big frame times.

---
 src/de/teamteamteam/spacescooter/GameFrame.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/de/teamteamteam/spacescooter/GameFrame.java b/src/de/teamteamteam/spacescooter/GameFrame.java
index fa2973d..bf4f8f2 100644
--- a/src/de/teamteamteam/spacescooter/GameFrame.java
+++ b/src/de/teamteamteam/spacescooter/GameFrame.java
@@ -148,8 +148,8 @@ public class GameFrame extends JFrame {
 						bufferedGraphics.dispose();
 				}
 			} while (this.bufferStrategy.contentsRestored()); //Redraw in case the VolatileImage was restored
-			this.bufferStrategy.show(); //Show the drawn image
 		} while (this.bufferStrategy.contentsLost()); //Redraw in case the VolatileImage got lost
+		this.bufferStrategy.show(); //Show the drawn image
 		Toolkit.getDefaultToolkit().sync(); //Tell the OS to update its graphics of the window.
 		this.frameTime = System.nanoTime() - frameStart; //Update frameTime
 	}

From c810d9d966c8ab319320282ad4833453cdc95b1e Mon Sep 17 00:00:00 2001
From: Jan Philipp Timme <jan.philipp@timme.it>
Date: Tue, 9 Dec 2014 11:15:48 +0100
Subject: [PATCH 03/22] Bugfix: Level does not care after the last interval
 ended.

---
 .../spacescooter/level/Level.java             | 61 ++++++++++---------
 1 file changed, 32 insertions(+), 29 deletions(-)

diff --git a/src/de/teamteamteam/spacescooter/level/Level.java b/src/de/teamteamteam/spacescooter/level/Level.java
index 0509123..9c67e9b 100644
--- a/src/de/teamteamteam/spacescooter/level/Level.java
+++ b/src/de/teamteamteam/spacescooter/level/Level.java
@@ -84,37 +84,40 @@ public final class Level {
 	public void handleUpdateTick() {
 		//Check whether the current interval is configured
 		int currentIntervalIndex = this.config.getIntervalIndexByCurrentTime(this.levelClock);
-		if(currentIntervalIndex == -1) return; //Nothing to do
-		//Fetch the current interval
-		int[] currentInterval = this.config.intervalList.get(currentIntervalIndex);
-		int relativeTimeWithinCurrentInterval = this.levelClock - currentInterval[0];
-		int intervalLength = currentInterval[1] - currentInterval[0];
-		/*
-		 * @see <LevelConfig>
-		 * Get all the spawnrules for the current interval.
-		 * - 0: Interval this rule belongs to
-		 * - 1: EntityNumber - This helps to find out what Entity to actually spawn.
-		 * - 2: Amount - The amount of Entities to spawn at a time.
-		 * - 3: SpawnRate - The rate at which the Entities are supposed to be spawned.
-		 * - 4: SpawnPosition - percentage of GameConfig.windowHeight - Where the Enemy shall spawn.
-		 */
-		for(int[] spawnRule : this.config.spawnRuleList) {
-			//Skip spawn rules that are not in the current spawn interval.
-			if(spawnRule[0] != currentIntervalIndex) continue;
-			//Divide the current interval by spawnrate
-			int intervalModulus = intervalLength / spawnRule[3];
-			//Check whether the spawn rate strikes right now.
-			if(relativeTimeWithinCurrentInterval % Math.max(1,intervalModulus) == 0) {
-				//If the rule matches the current time, spawn the configured Entity in the configured amount:
-				for(int i=0; i<spawnRule[2]; i++) {
-					//Minus one because the upper border is _excluded_ from the range!
-					int x = GameConfig.gameScreenWidth + GameConfig.gameScreenXOffset - 1;
-					//Minus one because the upper border is _excluded_ from the range!
-					int y = Math.round((GameConfig.gameScreenHeight * spawnRule[4]) / 100) + GameConfig.gameScreenYOffset - 1;
-					this.spawnEntityByAvailableName(Entity.availableNames.values()[spawnRule[1]], x, y);
+		
+		//If there are still configured intervals, take care of the rules
+		if(currentIntervalIndex != -1) {
+			//Fetch the current interval
+			int[] currentInterval = this.config.intervalList.get(currentIntervalIndex);
+			int relativeTimeWithinCurrentInterval = this.levelClock - currentInterval[0];
+			int intervalLength = currentInterval[1] - currentInterval[0];
+			/*
+			 * @see <LevelConfig>
+			 * Get all the spawnrules for the current interval.
+			 * - 0: Interval this rule belongs to
+			 * - 1: EntityNumber - This helps to find out what Entity to actually spawn.
+			 * - 2: Amount - The amount of Entities to spawn at a time.
+			 * - 3: SpawnRate - The rate at which the Entities are supposed to be spawned.
+			 * - 4: SpawnPosition - percentage of GameConfig.windowHeight - Where the Enemy shall spawn.
+			 */
+			for(int[] spawnRule : this.config.spawnRuleList) {
+				//Skip spawn rules that are not in the current spawn interval.
+				if(spawnRule[0] != currentIntervalIndex) continue;
+				//Divide the current interval by spawnrate
+				int intervalModulus = intervalLength / spawnRule[3];
+				//Check whether the spawn rate strikes right now.
+				if(relativeTimeWithinCurrentInterval % Math.max(1,intervalModulus) == 0) {
+					//If the rule matches the current time, spawn the configured Entity in the configured amount:
+					for(int i=0; i<spawnRule[2]; i++) {
+						//Minus one because the upper border is _excluded_ from the range!
+						int x = GameConfig.gameScreenWidth + GameConfig.gameScreenXOffset - 1;
+						//Minus one because the upper border is _excluded_ from the range!
+						int y = Math.round((GameConfig.gameScreenHeight * spawnRule[4]) / 100) + GameConfig.gameScreenYOffset - 1;
+						this.spawnEntityByAvailableName(Entity.availableNames.values()[spawnRule[1]], x, y);
+					}
 				}
 			}
-		}
+		} //end if still intervals configured
 		
 		//Check for GameOver things.
 		this.checkGameOverCondition();

From e01463a543269a51cf9a1e9c14be69094ae732ca Mon Sep 17 00:00:00 2001
From: ramapcsx2 <ramapcsx2.code@gmail.com>
Date: Tue, 9 Dec 2014 11:15:55 +0100
Subject: [PATCH 04/22] make debug playing easier :p

---
 res/levels/test.level | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/res/levels/test.level b/res/levels/test.level
index 2d2d832..c22ddb7 100644
--- a/res/levels/test.level
+++ b/res/levels/test.level
@@ -6,13 +6,6 @@ background:CloudBackground
 spawn:EnemyBoss,1,1,50
 [1-2]
 spawn:StoneOne,2,1,0
-spawn:StoneOne,2,1,10
-spawn:StoneTwo,2,1,20
-spawn:StoneOne,2,1,30
-spawn:StoneTwo,2,1,40
-spawn:EnemyOne,2,1,50
-spawn:StoneOne,2,1,60
-spawn:StoneThree,2,1,70
 spawn:StoneOne,2,1,80
 spawn:StoneThree,2,1,90
 spawn:StoneThree,2,1,100

From 73f948b4e1238ca5b46d6ab7fa328be8703dba96 Mon Sep 17 00:00:00 2001
From: Jan Philipp Timme <jan.philipp@timme.it>
Date: Tue, 9 Dec 2014 11:58:31 +0100
Subject: [PATCH 05/22] Feature: Add centered hitboxes that can have seperate
 dimensions.

---
 .../spacescooter/control/Keyboard.java        |  4 +
 .../spacescooter/entity/CollidableEntity.java | 86 +++++++++++++++++++
 .../spacescooter/entity/Entity.java           | 29 ++++---
 .../spacescooter/entity/Player.java           |  2 +-
 .../spacescooter/entity/enemy/Enemy.java      |  2 +-
 .../spacescooter/entity/enemy/EnemyBoss.java  |  6 +-
 .../entity/explosion/ExplosionOne.java        |  2 +-
 .../entity/explosion/ExplosionTwo.java        |  2 +-
 .../spacescooter/entity/item/Item.java        |  2 +-
 .../entity/obstacle/StoneOne.java             |  1 +
 .../entity/obstacle/StoneThree.java           |  1 +
 .../entity/obstacle/StoneTwo.java             |  1 +
 .../spacescooter/entity/shot/BeamImage.java   |  1 -
 .../spacescooter/entity/shot/Shot.java        |  4 +-
 .../spacescooter/entity/spi/Collidable.java   | 22 +++--
 .../gui/SecondaryWeaponAmount.java            |  1 -
 .../utility/CollisionHandler.java             | 20 ++---
 17 files changed, 144 insertions(+), 42 deletions(-)

diff --git a/src/de/teamteamteam/spacescooter/control/Keyboard.java b/src/de/teamteamteam/spacescooter/control/Keyboard.java
index 104a756..dcb3bc2 100644
--- a/src/de/teamteamteam/spacescooter/control/Keyboard.java
+++ b/src/de/teamteamteam/spacescooter/control/Keyboard.java
@@ -11,6 +11,7 @@ import de.teamteamteam.spacescooter.entity.enemy.EnemyOne;
 import de.teamteamteam.spacescooter.entity.enemy.EnemyThree;
 import de.teamteamteam.spacescooter.entity.enemy.EnemyTwo;
 import de.teamteamteam.spacescooter.entity.item.ItemNuke;
+import de.teamteamteam.spacescooter.screen.GameScreen;
 
 /**
  * This is our main control input source.
@@ -126,6 +127,9 @@ public class Keyboard implements KeyListener {
 		if(e.getKeyCode() == KeyEvent.VK_0) {
 			new EnemyBoss(400,400);
 		}
+		if(e.getKeyCode() == KeyEvent.VK_5) {
+			GameScreen.getPlayer().setCollide(!GameScreen.getPlayer().canCollide());
+		}
 		
 	}
 
diff --git a/src/de/teamteamteam/spacescooter/entity/CollidableEntity.java b/src/de/teamteamteam/spacescooter/entity/CollidableEntity.java
index 9fb7712..761780f 100644
--- a/src/de/teamteamteam/spacescooter/entity/CollidableEntity.java
+++ b/src/de/teamteamteam/spacescooter/entity/CollidableEntity.java
@@ -1,5 +1,9 @@
 package de.teamteamteam.spacescooter.entity;
 
+import java.awt.Color;
+import java.awt.Graphics2D;
+
+import de.teamteamteam.spacescooter.brain.GameConfig;
 import de.teamteamteam.spacescooter.entity.spi.Collidable;
 
 /**
@@ -22,6 +26,16 @@ public abstract class CollidableEntity extends Entity implements Collidable {
 	 */
 	private boolean damaging;
 	
+	/**
+	 * Height of the hitbox.
+	 */
+	private int hitboxHeight;
+	
+	/**
+	 * Width of the hitbox.
+	 */
+	private int hitboxWidth;
+	
 	
 	/**
 	 * Default constructor. Initializes sane defaults.
@@ -32,6 +46,78 @@ public abstract class CollidableEntity extends Entity implements Collidable {
 		this.setDamaging(true);
 	}
 	
+	/**
+	 * Get X-Position of the Collidable.
+	 */
+	public int getHitboxX() {
+		return this.getCenteredX() - (this.hitboxWidth / 2);
+	}
+
+	/**
+	 * Get Y-Position of the Collidable.
+	 */
+	public int getHitboxY() {
+		return this.getCenteredY() - (this.hitboxHeight / 2);
+	}
+	
+	/**
+	 * Get the width of the Collidable.
+	 */
+	public int getHitboxWidth() {
+		return this.hitboxWidth;
+	}
+
+	/**
+	 * Set the width of the Collidable.
+	 */
+	public void setHitboxWidth(int hitboxWidth) {
+		this.hitboxWidth = hitboxWidth;
+	}
+	
+	/**
+	 * Get the height of the Collidable.
+	 */
+	public int getHitboxHeight() {
+		return this.hitboxHeight;
+	}
+	
+	/**
+	 * Set the height of the Collidable.
+	 */
+	public void setHitboxHeight(int hitboxHeight) {
+		this.hitboxHeight = hitboxHeight;
+	}
+	
+	/**
+	 * Set the dimensions of the CollidableEntities hitbox.
+	 */
+	public void setHitboxDimenstions(int width, int height) {
+		this.hitboxWidth = width;
+		this.hitboxHeight = height;
+	}
+	
+	/**
+	 * Overriding the Entities setImageDimension to (ab)use their width/height
+	 * for reuse in the hitbox.
+	 */
+	@Override
+	public void setImageDimensions(int width, int height) {
+		super.setImageDimensions(width, height);
+		this.hitboxWidth = this.getImageWidth();
+		this.hitboxHeight = this.getImageHeight();
+	}
+	
+	/**
+	 * Adding a debugging option to draw the hitbox in red.
+	 */
+	@Override
+	public void paint(Graphics2D g) {
+		super.paint(g);
+		if(GameConfig.DEBUG) {
+			g.setColor(new Color(255,0,0));
+			g.drawRect(this.getHitboxX(), this.getHitboxY(), this.hitboxWidth, this.hitboxHeight);
+		}
+	}
 	
 	/**
 	 * Handle collisions based on what the LivingEntity collided with.
diff --git a/src/de/teamteamteam/spacescooter/entity/Entity.java b/src/de/teamteamteam/spacescooter/entity/Entity.java
index 75f2fa0..1073d79 100644
--- a/src/de/teamteamteam/spacescooter/entity/Entity.java
+++ b/src/de/teamteamteam/spacescooter/entity/Entity.java
@@ -53,12 +53,12 @@ public abstract class Entity implements Updateable, Paintable {
 	/**
 	 * Entity width.
 	 */
-	private int width;
+	private int imageWidth;
 	
 	/**
 	 * Entity height.
 	 */
-	private int height;
+	private int imageHeight;
 	
 	/**
 	 * Whether or not the Entity is able to move using transpose.
@@ -106,14 +106,14 @@ public abstract class Entity implements Updateable, Paintable {
 	 * Get the centered X-Position of the Entity.
 	 */
 	public int getCenteredX() {
-		return this.x + (this.width / 2);
+		return this.x + (this.imageWidth / 2);
 	}
 
 	/**
 	 * Get the centered Y-Position of the Entity.
 	 */
 	public int getCenteredY() {
-		return this.y + (this.height / 2);
+		return this.y + (this.imageHeight / 2);
 	}
 	
 	/**
@@ -138,23 +138,23 @@ public abstract class Entity implements Updateable, Paintable {
 	/**
 	 * Get the Entities width.
 	 */
-	public int getWidth() {
-		return this.width;
+	public int getImageWidth() {
+		return this.imageWidth;
 	}
 	
 	/**
 	 * Get the Entities height.
 	 */
-	public int getHeight() {
-		return this.height;
+	public int getImageHeight() {
+		return this.imageHeight;
 	}
 
 	/**
 	 * Set the entities width and height.
 	 */
-	public void setDimensions(int width, int height) {
-		this.width = width;
-		this.height = height;
+	public void setImageDimensions(int width, int height) {
+		this.imageWidth = width;
+		this.imageHeight = height;
 	}
 	
 	/**
@@ -170,7 +170,7 @@ public abstract class Entity implements Updateable, Paintable {
 	public void setImage(String filename) {
 		this.img = Loader.getBufferedImageByFilename(filename);
 		//set the entities dimensions using the dimensions of the image.
-		this.setDimensions(this.img.getWidth(), this.img.getHeight());
+		this.setImageDimensions(this.img.getWidth(), this.img.getHeight());
 	}
 	
 	/**
@@ -190,11 +190,12 @@ public abstract class Entity implements Updateable, Paintable {
 	/**
 	 * The default way to paint the Entity.
 	 * Simply draw the Entities image on its current position.
+	 * Debugging option: draw the image border in green.
 	 */
 	public void paint(Graphics2D g) {
 		if(GameConfig.DEBUG) {
-			g.setColor(new Color(255,0,0));
-			g.drawRect(this.x, this.y, this.width, this.height);
+			g.setColor(new Color(0,255,0));
+			g.drawRect(this.x, this.y, this.imageWidth, this.imageHeight);
 		}
 		g.drawImage(this.img, this.x, this.y, null);
 	}
diff --git a/src/de/teamteamteam/spacescooter/entity/Player.java b/src/de/teamteamteam/spacescooter/entity/Player.java
index c650fcd..721ca0f 100644
--- a/src/de/teamteamteam/spacescooter/entity/Player.java
+++ b/src/de/teamteamteam/spacescooter/entity/Player.java
@@ -128,7 +128,7 @@ public class Player extends ShootingEntity implements KeyboardListener {
 	public void paint(Graphics2D g) {
 		if(this.currentCollisionCooldown > 0) {
 			g.setColor(Color.RED);
-			g.drawRect(this.getX(), this.getY(), this.getWidth(), this.getHeight());
+			g.drawRect(this.getX(), this.getY(), this.getImageWidth(), this.getImageHeight());
 		}
 		super.paint(g);
 	}
diff --git a/src/de/teamteamteam/spacescooter/entity/enemy/Enemy.java b/src/de/teamteamteam/spacescooter/entity/enemy/Enemy.java
index cc23a19..39c5dc2 100644
--- a/src/de/teamteamteam/spacescooter/entity/enemy/Enemy.java
+++ b/src/de/teamteamteam/spacescooter/entity/enemy/Enemy.java
@@ -42,7 +42,7 @@ public abstract class Enemy extends ShootingEntity {
 		super.update();
 		
 		// enemy has fully left the screen ..to the left!
-		if(this.getX() + this.getWidth() < 0){
+		if(this.getX() + this.getImageWidth() < 0){
 			this.remove();
 			return;
 		}
diff --git a/src/de/teamteamteam/spacescooter/entity/enemy/EnemyBoss.java b/src/de/teamteamteam/spacescooter/entity/enemy/EnemyBoss.java
index b4ea41b..af231d1 100644
--- a/src/de/teamteamteam/spacescooter/entity/enemy/EnemyBoss.java
+++ b/src/de/teamteamteam/spacescooter/entity/enemy/EnemyBoss.java
@@ -44,7 +44,7 @@ public class EnemyBoss extends Enemy{
 	public void update() {
 		super.update();
 		//Move into the Screen until it fits on X-Axis
-		if(this.getX() > GameConfig.gameScreenWidth+GameConfig.gameScreenXOffset-this.getWidth()) {
+		if(this.getX() > GameConfig.gameScreenWidth+GameConfig.gameScreenXOffset-this.getImageWidth()) {
 			this.transpose(-1, 0);
 		}
 		//Move up or down within the GameScreen.
@@ -52,12 +52,12 @@ public class EnemyBoss extends Enemy{
 		if(this.getY() == GameConfig.gameScreenYOffset){
 			move = 1;
 		}
-		if(this.getY() == GameConfig.gameScreenHeight + GameConfig.gameScreenYOffset - this.getHeight()){
+		if(this.getY() == GameConfig.gameScreenHeight + GameConfig.gameScreenYOffset - this.getImageHeight()){
 			move = -1;
 		}
 		//Randomly spawn minions.
 		if(Random.nextInt(1000) < 5) {
-			new EnemyBossMinion(GameConfig.gameScreenWidth  +GameConfig.gameScreenXOffset - this.getWidth(), this.getY());
+			new EnemyBossMinion(GameConfig.gameScreenWidth  +GameConfig.gameScreenXOffset - this.getImageWidth(), this.getY());
 		}
 		//Randomly fire doubleshots.
 		if(Random.nextInt(1000) < 50) {
diff --git a/src/de/teamteamteam/spacescooter/entity/explosion/ExplosionOne.java b/src/de/teamteamteam/spacescooter/entity/explosion/ExplosionOne.java
index 11619af..4f27df7 100644
--- a/src/de/teamteamteam/spacescooter/entity/explosion/ExplosionOne.java
+++ b/src/de/teamteamteam/spacescooter/entity/explosion/ExplosionOne.java
@@ -17,7 +17,7 @@ public class ExplosionOne extends Animation {
 			"images/explosions/01/explosion7.png"
 		};
 		this.configure(images, 10);
-		this.setPosition(x - (this.getWidth()/2), y - (this.getHeight()/2));
+		this.setPosition(x - (this.getImageWidth()/2), y - (this.getImageHeight()/2));
 		SoundSystem.playSound("sounds/bad_explosion1.wav");
 	}
 }
diff --git a/src/de/teamteamteam/spacescooter/entity/explosion/ExplosionTwo.java b/src/de/teamteamteam/spacescooter/entity/explosion/ExplosionTwo.java
index 7ca3797..48348ce 100644
--- a/src/de/teamteamteam/spacescooter/entity/explosion/ExplosionTwo.java
+++ b/src/de/teamteamteam/spacescooter/entity/explosion/ExplosionTwo.java
@@ -26,7 +26,7 @@ public class ExplosionTwo extends Animation {
 			"images/explosions/02/explosion2_16.png"
 		};
 		this.configure(images, 10);
-		this.setPosition(x - (this.getWidth()/2), y - (this.getHeight()/2));
+		this.setPosition(x - (this.getImageWidth()/2), y - (this.getImageHeight()/2));
 		SoundSystem.playSound("sounds/bad_explosion2.wav");
 	}
 
diff --git a/src/de/teamteamteam/spacescooter/entity/item/Item.java b/src/de/teamteamteam/spacescooter/entity/item/Item.java
index ced3250..88020c2 100644
--- a/src/de/teamteamteam/spacescooter/entity/item/Item.java
+++ b/src/de/teamteamteam/spacescooter/entity/item/Item.java
@@ -38,7 +38,7 @@ public abstract class Item extends CollidableEntity {
 	 */
 	public void update(){
 		this.transpose(-1, 0);
-		if(this.getX() < this.getWidth()) {
+		if(this.getX() < this.getImageWidth()) {
 			this.remove();
 		}
 	}
diff --git a/src/de/teamteamteam/spacescooter/entity/obstacle/StoneOne.java b/src/de/teamteamteam/spacescooter/entity/obstacle/StoneOne.java
index 034be47..8c504f1 100644
--- a/src/de/teamteamteam/spacescooter/entity/obstacle/StoneOne.java
+++ b/src/de/teamteamteam/spacescooter/entity/obstacle/StoneOne.java
@@ -9,6 +9,7 @@ public class StoneOne extends MovingObstacle {
 		super(x, y);
 		this.setImage("images/stones/stone01.png");
 		this.setCollisionDamage(9001);
+		this.setHitboxDimenstions(this.getImageWidth() - 5, this.getImageHeight() - 5);
 	}
 
 }
diff --git a/src/de/teamteamteam/spacescooter/entity/obstacle/StoneThree.java b/src/de/teamteamteam/spacescooter/entity/obstacle/StoneThree.java
index f1b92b4..992bd6b 100644
--- a/src/de/teamteamteam/spacescooter/entity/obstacle/StoneThree.java
+++ b/src/de/teamteamteam/spacescooter/entity/obstacle/StoneThree.java
@@ -9,6 +9,7 @@ public class StoneThree extends MovingObstacle {
 		super(x, y);
 		this.setImage("images/stones/stone03.png");
 		this.setCollisionDamage(9001);
+		this.setHitboxDimenstions(this.getImageWidth() - 5, this.getImageHeight() - 5);
 	}
 
 }
diff --git a/src/de/teamteamteam/spacescooter/entity/obstacle/StoneTwo.java b/src/de/teamteamteam/spacescooter/entity/obstacle/StoneTwo.java
index 8392b9d..f9bf4ee 100644
--- a/src/de/teamteamteam/spacescooter/entity/obstacle/StoneTwo.java
+++ b/src/de/teamteamteam/spacescooter/entity/obstacle/StoneTwo.java
@@ -9,6 +9,7 @@ public class StoneTwo extends MovingObstacle {
 		super(x, y);
 		this.setImage("images/stones/stone02.png");
 		this.setCollisionDamage(9001);
+		this.setHitboxDimenstions(this.getImageWidth() - 5, this.getImageHeight() - 5);
 	}
 
 }
diff --git a/src/de/teamteamteam/spacescooter/entity/shot/BeamImage.java b/src/de/teamteamteam/spacescooter/entity/shot/BeamImage.java
index 802600b..ad1015f 100644
--- a/src/de/teamteamteam/spacescooter/entity/shot/BeamImage.java
+++ b/src/de/teamteamteam/spacescooter/entity/shot/BeamImage.java
@@ -15,7 +15,6 @@ public class BeamImage extends Entity {
 		this.setImage("images/shots/beam.png");
 	}
 
-	@Override
 	public void update() {
 		this.lifetime++;
 		if(this.lifetime>30){
diff --git a/src/de/teamteamteam/spacescooter/entity/shot/Shot.java b/src/de/teamteamteam/spacescooter/entity/shot/Shot.java
index 1085e76..a32e20f 100644
--- a/src/de/teamteamteam/spacescooter/entity/shot/Shot.java
+++ b/src/de/teamteamteam/spacescooter/entity/shot/Shot.java
@@ -90,8 +90,8 @@ public class Shot extends CollidableEntity {
 	public void update() {
 		this.transpose(this.direction * this.speed, 0);
 		//remove the shot in case it is out of the game window.
-		if ((this.getX() + this.getWidth()) < 0 || this.getX() > GameConfig.windowWidth
-				|| (this.getY() + this.getHeight()) < 0
+		if ((this.getX() + this.getImageWidth()) < 0 || this.getX() > GameConfig.windowWidth
+				|| (this.getY() + this.getImageHeight()) < 0
 				|| this.getY() > GameConfig.windowHeight) {
 			this.remove();
 		}
diff --git a/src/de/teamteamteam/spacescooter/entity/spi/Collidable.java b/src/de/teamteamteam/spacescooter/entity/spi/Collidable.java
index 45202d5..2bad3b5 100644
--- a/src/de/teamteamteam/spacescooter/entity/spi/Collidable.java
+++ b/src/de/teamteamteam/spacescooter/entity/spi/Collidable.java
@@ -8,22 +8,32 @@ public interface Collidable {
 	/**
 	 * Get X-Position of the Collidable.
 	 */
-	public int getX();
-
+	public int getHitboxX();
+	
 	/**
 	 * Get Y-Position of the Collidable.
 	 */
-	public int getY();
+	public int getHitboxY();
 	
 	/**
 	 * Get the width of the Collidable.
 	 */
-	public int getWidth();
-
+	public int getHitboxWidth();
+	
+	/**
+	 * Set the width of the Collidable.
+	 */
+	public void setHitboxWidth(int hitboxWidth);
+	
 	/**
 	 * Get the height of the Collidable.
 	 */
-	public int getHeight();
+	public int getHitboxHeight();
+
+	/**
+	 * Set the height of the Collidable.
+	 */
+	public void setHitboxHeight(int hitboxHeight);
 	
 	/**
 	 * Notify the Collidable that a collision happened.
diff --git a/src/de/teamteamteam/spacescooter/gui/SecondaryWeaponAmount.java b/src/de/teamteamteam/spacescooter/gui/SecondaryWeaponAmount.java
index c6c6c9a..ba939f2 100644
--- a/src/de/teamteamteam/spacescooter/gui/SecondaryWeaponAmount.java
+++ b/src/de/teamteamteam/spacescooter/gui/SecondaryWeaponAmount.java
@@ -30,7 +30,6 @@ public class SecondaryWeaponAmount extends Entity{
 		}
 	}
 	
-	@Override
 	public void update() {}
 
 }
diff --git a/src/de/teamteamteam/spacescooter/utility/CollisionHandler.java b/src/de/teamteamteam/spacescooter/utility/CollisionHandler.java
index a1d7b48..5dc491e 100644
--- a/src/de/teamteamteam/spacescooter/utility/CollisionHandler.java
+++ b/src/de/teamteamteam/spacescooter/utility/CollisionHandler.java
@@ -70,18 +70,18 @@ public class CollisionHandler {
 	 * Check if two Collidables actually collided.
 	 */
 	private static boolean doCollide(Collidable cOne, Collidable cTwo) {
-		int x1 = cOne.getX();
-		int x2 = cOne.getX() + cOne.getWidth();
-		int x3 = cTwo.getX();
-		int x4 = cTwo.getX() + cTwo.getWidth();
-		int total_width = cOne.getWidth() + cTwo.getWidth();
+		int x1 = cOne.getHitboxX();
+		int x2 = cOne.getHitboxX() + cOne.getHitboxWidth();
+		int x3 = cTwo.getHitboxX();
+		int x4 = cTwo.getHitboxX() + cTwo.getHitboxWidth();
+		int total_width = cOne.getHitboxWidth() + cTwo.getHitboxWidth();
 		boolean x_overlap = total_width > Math.abs(Math.max(x2, x4) - Math.min(x1, x3));
 		
-		int y1 = cOne.getY();
-		int y2 = cOne.getY() + cOne.getHeight();
-		int y3 = cTwo.getY();
-		int y4 = cTwo.getY() + cTwo.getHeight();
-		int total_height = cOne.getHeight() + cTwo.getHeight();
+		int y1 = cOne.getHitboxY();
+		int y2 = cOne.getHitboxY() + cOne.getHitboxHeight();
+		int y3 = cTwo.getHitboxY();
+		int y4 = cTwo.getHitboxY() + cTwo.getHitboxHeight();
+		int total_height = cOne.getHitboxHeight() + cTwo.getHitboxHeight();
 		boolean y_overlap = total_height > Math.abs(Math.max(y2, y4) - Math.min(y1, y3));
 		
 		return x_overlap && y_overlap;

From 0f975030f7046bda7a8c82e91b95ae1a63c5654e Mon Sep 17 00:00:00 2001
From: Licht <johannes.huschke@gmx.de>
Date: Tue, 9 Dec 2014 12:22:00 +0100
Subject: [PATCH 06/22] Added new Enemy Spaceship

---
 res/images/ShuttlecraftSpaceship.png | Bin 0 -> 1338 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 res/images/ShuttlecraftSpaceship.png

diff --git a/res/images/ShuttlecraftSpaceship.png b/res/images/ShuttlecraftSpaceship.png
new file mode 100644
index 0000000000000000000000000000000000000000..419260036680ae9c31857702732bfb4df0f38982
GIT binary patch
literal 1338
zcmV-A1;zS_P)<h;3K|Lk000e1NJLTq002Ay0015c1^@s6aF~5h00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^<`
z3lJT7iR2vs000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}000D)Nkl<Z
zSi{|zO=}xR7{~uBRz+G9y_i^vg({yEX#53AD8$f1sl&F^aS3TkXrZa=TteJ9H2DAt
z)NVqcSe8vGn6|2$w%`cgV_Hn1XImz^#HuY>YGExIjf5qn9OT)|zOP~_Zt}pw&d%=a
z{^tL@%npZF$Zp=e(Ntf%bLVT0ZSyZPjGm2;T>${>?(QP7_>-oeds#qO7%S@w1dx9G
zSO#WQ{@*A(K6VAi1AhEhkTf6f76kg?Af%{yRuH`Md4&)FK=kBETsZ%cMrFrQgQ{cf
zc)+hX+=74#A@ZRIOGr^Ztn5e>zIX2%g&P+N`L2fzoml=wK>@(z<W~TIjg1ZYTB%e5
zAq27bjO^B|RS1z?nkr0Pn5xRQS<`cCzMGKgbXw7WWAY0Cz=xxs003s^W)A=a({U-N
zTM%R@IuWcZ3xZeI?K_&Ktsu9ywg3R(a2P(XQvpn&smiBLy`fQ=gHt}IfJTby0jsk$
z-%ZF?JuJfK^XiUMELtZSH=}-q5HwL!z_J-yFKMaWn(G!MYd)V>qc97bSWFnI%qpx_
zTHj@#-T!Z)004-^XJ9L7JrCsS>R+01hKJuVe8+yRrh8pok6Ft+d1BhnS}Z<;U1`TW
zX|bSc$ho=iEMIcsL{L88*|9D;=SD{H+wZ>u0M^%2h{b0*mPmV#`HX>$K;3RP?%)4b
zZjX$708tbniXuE74@#vHlF1~J$s|&#6eP*s?6c~g8yN)vl*?soZ*S|~@8pdgGSJrt
z0B{||yxZx-KbZ`6@_GG*2ZdFG0)Wfql9luOm36Y&Y{KL5002Z$1c0`nSu2;zmY_6=
z9qZ}Q+{eP2uC(mHQj;VJsZ>gCQ<X(gL^7Fd3-C3kQxn6ix_Y2$SeL4XQ&>H90f0Ay
zwQE#ms<0iEy<V?rS#t8c0<v9LBXeB4_9X`Z(P$LWXtY)DDi!&tR;!u>L{+A7ySKN8
zQmJHXawMr}%bjcWy6#WI9&=xn5L9(mR<B1Qtq=?b%~x7hWyns3R@>>*Zz}4rBo*=b
z<*SN?$9}CQ1Gk&7)X7S%^y=R$h|Ml=mP^ZaYOoy(hr?(#T53>W3QgnK3fgQU)ZmGq
z<LD8*3Rv4KEj#exaM(K58w9D1%@^_u8j1J-01FFC?E~9|Ute!!@3HZ$;+a2I-j@3S
z;QHj{uEPGZ_<-@OUfjO@J@?$eM(|5Z4`rC?sd>CRyoJa>YeOX-3uz!PKG+8UG>SRg
zJ?qkp-QOSV2)G*fQ2)a;!w(IeX&NaPkA-xft!LL-9}pVE#Bxs4fA?(O6g-#9+n$(P
zw?1uB=tFM+sA1`cL<StlY&JA5oXh2L{ZBvm&>-sBHPo|f;6sCG6qV2u%d{L?#k{gV
z@!5c)O-L1j;Og9t$D>Cp+|baO=JeD&E`I!;GI1QZ^z_uc0($x_2@}gzIC^?zx7I4`
z>PmcfWQ&JF|M<g089KAsKxDvyvGJ_Jt^50fvKN@abs~ma8w9S-B`qWOR%hu8=hGbR
w1EBGQPQi6OOCM%Zj;ap7vUcgx`??eR6e?YjkfLq4^Z)<=07*qoM6N<$f{15weE<Le

literal 0
HcmV?d00001


From c613829884786f6509f03489774e3f8dcd786afa Mon Sep 17 00:00:00 2001
From: Licht <johannes.huschke@gmx.de>
Date: Tue, 9 Dec 2014 12:58:13 +0100
Subject: [PATCH 07/22] Adding new Boss Image

---
 res/images/BossBobaFett.png | Bin 0 -> 25202 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 res/images/BossBobaFett.png

diff --git a/res/images/BossBobaFett.png b/res/images/BossBobaFett.png
new file mode 100644
index 0000000000000000000000000000000000000000..5c342c8ef927669dc2e7408e7181bf718b046e1b
GIT binary patch
literal 25202
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

literal 0
HcmV?d00001


From f4699e28ee51a64c10a54fc3abbc63d29dd933ed Mon Sep 17 00:00:00 2001
From: ramapcsx2 <you@example.com>
Date: Tue, 9 Dec 2014 13:03:42 +0100
Subject: [PATCH 08/22] adequate rocket damage

---
 src/de/teamteamteam/spacescooter/entity/ShootingEntity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/de/teamteamteam/spacescooter/entity/ShootingEntity.java b/src/de/teamteamteam/spacescooter/entity/ShootingEntity.java
index eb5f471..808049c 100644
--- a/src/de/teamteamteam/spacescooter/entity/ShootingEntity.java
+++ b/src/de/teamteamteam/spacescooter/entity/ShootingEntity.java
@@ -251,7 +251,7 @@ public abstract class ShootingEntity extends LivingEntity {
 			this.getY() + this.shootSpawnY,
 			this.shootDirection,
 			this.shootSpeed,
-			(int) (this.shootDamage*1.2),
+			(int) (this.shootDamage*5),
 			this. primaryShotImage
 		);
 	}

From ea15be2fd1a6b24fc67c2504d3614efa739ebee4 Mon Sep 17 00:00:00 2001
From: Jan Philipp Timme <jan.philipp@timme.it>
Date: Tue, 9 Dec 2014 13:07:56 +0100
Subject: [PATCH 09/22] Feature: Proper gameover condition, GameWonScreen,
 nextLevel works.

---
 res/levels/second.level                       |  22 ++++
 res/levels/test.level                         |   1 +
 .../spacescooter/brain/GameConfig.java        |   5 +
 .../spacescooter/brain/PlayerSession.java     |  20 ++++
 .../spacescooter/entity/Entity.java           |   9 ++
 .../spacescooter/entity/ShootingEntity.java   |   1 +
 .../spacescooter/entity/enemy/Enemy.java      |   7 --
 .../spacescooter/entity/item/Item.java        |   3 -
 .../entity/obstacle/MovingObstacle.java       |   1 +
 .../entity/obstacle/Obstacle.java             |   8 ++
 .../spacescooter/level/Level.java             |  44 +++++++-
 .../spacescooter/level/LevelConfig.java       |   7 ++
 .../spacescooter/level/LevelConfigParser.java |   8 ++
 .../spacescooter/screen/GameOverScreen.java   |   2 +-
 .../spacescooter/screen/GameScreen.java       |  18 +++-
 .../spacescooter/screen/GameWonScreen.java    | 100 ++++++++++++++++++
 .../spacescooter/screen/MainMenuScreen.java   |   2 +-
 17 files changed, 241 insertions(+), 17 deletions(-)
 create mode 100644 res/levels/second.level
 create mode 100644 src/de/teamteamteam/spacescooter/screen/GameWonScreen.java

diff --git a/res/levels/second.level b/res/levels/second.level
new file mode 100644
index 0000000..993e90c
--- /dev/null
+++ b/res/levels/second.level
@@ -0,0 +1,22 @@
+name:Level Zwai! :D
+backgroundMusic:music/ScooterFriendsTurbo8Bit.wav
+background:EarthBackground
+nextLevel:
+-
+[0-1]
+spawn:EnemyBoss,1,1,50
+[1-2]
+spawn:StoneOne,2,1,0
+spawn:StoneOne,2,1,80
+spawn:StoneThree,2,1,90
+spawn:StoneThree,2,1,100
+[2-4]
+spawn:EnemyOne,1,5,20
+spawn:StoneOne,4,5,50
+[4-10]
+spawn:EnemyTwo,1,10,60
+[10-25]
+spawn:EnemyThree,2,4,33
+spawn:EnemyTwo,5,6,10
+[25-30]
+spawn:EnemyBoss,1,1,50
diff --git a/res/levels/test.level b/res/levels/test.level
index c22ddb7..53bec45 100644
--- a/res/levels/test.level
+++ b/res/levels/test.level
@@ -1,6 +1,7 @@
 name:Testlevel \o/
 backgroundMusic:music/ScooterFriendsTurbo8Bit.wav
 background:CloudBackground
+nextLevel:levels/second.level
 -
 [0-1]
 spawn:EnemyBoss,1,1,50
diff --git a/src/de/teamteamteam/spacescooter/brain/GameConfig.java b/src/de/teamteamteam/spacescooter/brain/GameConfig.java
index 6b2e983..64abe31 100644
--- a/src/de/teamteamteam/spacescooter/brain/GameConfig.java
+++ b/src/de/teamteamteam/spacescooter/brain/GameConfig.java
@@ -78,6 +78,11 @@ public final class GameConfig {
 	 */
 	public static final int initialPlayerShotDamage = 10;
 	
+	/**
+	 * The first level the game will start with.
+	 */
+	public static final String firstLevel = "levels/test.level";
+	
 	/**
 	 * Private constructor, this class will never be instantiated.
 	 */
diff --git a/src/de/teamteamteam/spacescooter/brain/PlayerSession.java b/src/de/teamteamteam/spacescooter/brain/PlayerSession.java
index 1a704d6..458d0b2 100644
--- a/src/de/teamteamteam/spacescooter/brain/PlayerSession.java
+++ b/src/de/teamteamteam/spacescooter/brain/PlayerSession.java
@@ -57,6 +57,11 @@ public class PlayerSession {
 	 */
 	private static int secondaryWeapon;
 	
+	/**
+	 * The next level to load for the player.
+	 */
+	private static String nextLevel;
+	
 	
 	/**
 	 * Private constructor, this class will never be instantiated.
@@ -237,6 +242,19 @@ public class PlayerSession {
 		PlayerSession.secondaryWeapon = secondaryWeapon;
 	}
 	
+	/**
+	 * Get the next Level the player will play.
+	 */
+	public static String getNextLevel() {
+		return PlayerSession.nextLevel;
+	}
+
+	/**
+	 * Set the next Level the player will play.
+	 */
+	public static void setNextLevel(String nextLevel) {
+		PlayerSession.nextLevel = nextLevel;
+	}
 	
 	/**
 	 * This will reset all data from the players session.
@@ -245,6 +263,7 @@ public class PlayerSession {
 	 * (So the next player can start a fresh session.)
 	 */
 	public static void reset() {
+		PlayerSession.nextLevel = GameConfig.firstLevel;
 		PlayerSession.score = 0;
 		PlayerSession.secondaryWeapon = 1;
 		PlayerSession.credits = 0;
@@ -255,4 +274,5 @@ public class PlayerSession {
 		PlayerSession.shipShieldUpgadesBought = 0;
 		PlayerSession.shipShotUpgadesBought = 0;
 	}
+
 }
diff --git a/src/de/teamteamteam/spacescooter/entity/Entity.java b/src/de/teamteamteam/spacescooter/entity/Entity.java
index 1073d79..40b49ff 100644
--- a/src/de/teamteamteam/spacescooter/entity/Entity.java
+++ b/src/de/teamteamteam/spacescooter/entity/Entity.java
@@ -200,6 +200,15 @@ public abstract class Entity implements Updateable, Paintable {
 		g.drawImage(this.img, this.x, this.y, null);
 	}
 	
+	/**
+	 * Make sure an Entity removes itself when off-screen.
+	 */
+	public void update() {
+		if(this.getX() + this.getImageWidth() < 0) {
+			this.remove();
+		}
+	}
+	
 	/**
 	 * Removes entity from the game by telling the current Screen
 	 * to remove it from its list.
diff --git a/src/de/teamteamteam/spacescooter/entity/ShootingEntity.java b/src/de/teamteamteam/spacescooter/entity/ShootingEntity.java
index 808049c..ae17cbd 100644
--- a/src/de/teamteamteam/spacescooter/entity/ShootingEntity.java
+++ b/src/de/teamteamteam/spacescooter/entity/ShootingEntity.java
@@ -87,6 +87,7 @@ public abstract class ShootingEntity extends LivingEntity {
 	 * Update logic making sure that the currentShootDelay is updated.
 	 */
 	public void update() {
+		super.update();
 		if(this.currentShootDelay > 0) this.currentShootDelay--;
 		if(this.currentRocketDelay > 0) this.currentRocketDelay--;
 		if(this.currentBeamDelay > 0) this.currentBeamDelay--;
diff --git a/src/de/teamteamteam/spacescooter/entity/enemy/Enemy.java b/src/de/teamteamteam/spacescooter/entity/enemy/Enemy.java
index 39c5dc2..5012986 100644
--- a/src/de/teamteamteam/spacescooter/entity/enemy/Enemy.java
+++ b/src/de/teamteamteam/spacescooter/entity/enemy/Enemy.java
@@ -40,13 +40,6 @@ public abstract class Enemy extends ShootingEntity {
 	 */
 	public void update() {
 		super.update();
-		
-		// enemy has fully left the screen ..to the left!
-		if(this.getX() + this.getImageWidth() < 0){
-			this.remove();
-			return;
-		}
-		
 		if(willShoot == true){
 			this.shoot();
 		}
diff --git a/src/de/teamteamteam/spacescooter/entity/item/Item.java b/src/de/teamteamteam/spacescooter/entity/item/Item.java
index 88020c2..0789175 100644
--- a/src/de/teamteamteam/spacescooter/entity/item/Item.java
+++ b/src/de/teamteamteam/spacescooter/entity/item/Item.java
@@ -38,9 +38,6 @@ public abstract class Item extends CollidableEntity {
 	 */
 	public void update(){
 		this.transpose(-1, 0);
-		if(this.getX() < this.getImageWidth()) {
-			this.remove();
-		}
 	}
 	
 	/**
diff --git a/src/de/teamteamteam/spacescooter/entity/obstacle/MovingObstacle.java b/src/de/teamteamteam/spacescooter/entity/obstacle/MovingObstacle.java
index 6864d06..ecf7f3f 100644
--- a/src/de/teamteamteam/spacescooter/entity/obstacle/MovingObstacle.java
+++ b/src/de/teamteamteam/spacescooter/entity/obstacle/MovingObstacle.java
@@ -27,6 +27,7 @@ public abstract class MovingObstacle extends Obstacle {
 	 * Make the Obstacle move at its defined X- and Y-Delta.
 	 */
 	public void update() {
+		super.update();
 		this.transpose(this.xDelta, this.yDelta);
 	}
 
diff --git a/src/de/teamteamteam/spacescooter/entity/obstacle/Obstacle.java b/src/de/teamteamteam/spacescooter/entity/obstacle/Obstacle.java
index ee1db86..988deb7 100644
--- a/src/de/teamteamteam/spacescooter/entity/obstacle/Obstacle.java
+++ b/src/de/teamteamteam/spacescooter/entity/obstacle/Obstacle.java
@@ -20,5 +20,13 @@ public abstract class Obstacle extends CollidableEntity {
 	public void collideWith(Collidable entity) {
 
 	}
+	
+	/**
+	 * Patch through the update() call.
+	 */
+	@Override
+	public void update() {
+		super.update();
+	}
 
 }
diff --git a/src/de/teamteamteam/spacescooter/level/Level.java b/src/de/teamteamteam/spacescooter/level/Level.java
index 9c67e9b..e1d05a9 100644
--- a/src/de/teamteamteam/spacescooter/level/Level.java
+++ b/src/de/teamteamteam/spacescooter/level/Level.java
@@ -4,16 +4,21 @@ import de.teamteamteam.spacescooter.background.CloudBackground;
 import de.teamteamteam.spacescooter.background.EarthBackground;
 import de.teamteamteam.spacescooter.background.StarBackground;
 import de.teamteamteam.spacescooter.brain.GameConfig;
+import de.teamteamteam.spacescooter.brain.PlayerSession;
+import de.teamteamteam.spacescooter.datastructure.ConcurrentIterator;
 import de.teamteamteam.spacescooter.entity.Entity;
 import de.teamteamteam.spacescooter.entity.Player;
+import de.teamteamteam.spacescooter.entity.enemy.Enemy;
 import de.teamteamteam.spacescooter.entity.enemy.EnemyBoss;
 import de.teamteamteam.spacescooter.entity.enemy.EnemyOne;
 import de.teamteamteam.spacescooter.entity.enemy.EnemyThree;
 import de.teamteamteam.spacescooter.entity.enemy.EnemyTwo;
+import de.teamteamteam.spacescooter.entity.obstacle.Obstacle;
 import de.teamteamteam.spacescooter.entity.obstacle.StoneOne;
 import de.teamteamteam.spacescooter.entity.obstacle.StoneThree;
 import de.teamteamteam.spacescooter.entity.obstacle.StoneTwo;
 import de.teamteamteam.spacescooter.screen.GameScreen;
+import de.teamteamteam.spacescooter.screen.Screen;
 import de.teamteamteam.spacescooter.sound.SoundSystem;
 import de.teamteamteam.spacescooter.utility.Loader;
 
@@ -54,17 +59,29 @@ public final class Level {
 	 */
 	private int gameOverDelay;
 
+	/**
+	 * Tells how the game over has to be interpreted.
+	 * True - player won, False - player lost.
+	 */
+	private boolean playerWon;
+
+	/**
+	 * EntityIterator to evaluate the state of all the existing Entities.
+	 */
+	private ConcurrentIterator<Entity> entityIterator;
+	
 	/**
 	 * Constructor creating a LevelConfig based on a given config file.
 	 */
 	public Level(String levelConfig) {
 		this.levelClock = 0;
 		this.isGameOver = false;
+		this.playerWon = false;
 		this.gameOverDelay = 3;
 		this.config = Loader.getLevelConfigByFilename(levelConfig);
+		this.entityIterator = Screen.currentScreen.createEntityIterator();
 	}
 	
-	
 	/**
 	 * Initialize the level based on the LevelConfig attributes.
 	 */
@@ -134,10 +151,29 @@ public final class Level {
 	/**
 	 * Evaluates things like whether the Player is alive or
 	 * - if there is a bossfight - if the boss is dead.
+	 * Also checks whether the player has survived everything (won)
 	 */
 	private void checkGameOverCondition() {
 		if(!GameScreen.getPlayer().isAlive()) {
 			this.isGameOver = true;
+			this.playerWon = false;
+		}
+		int enemyCounter = 0;
+		int obstacleCounter = 0;
+		this.entityIterator.reset();
+		while(this.entityIterator.hasNext()) {
+			Entity e = this.entityIterator.next();
+			if(e instanceof Enemy) enemyCounter++;
+			if(e instanceof Obstacle) obstacleCounter++;
+		}
+		
+		//use the currentIntervalIndex to determine whether there are things scheduled to spawn.
+		int currentIntervalIndex = this.config.getIntervalIndexByCurrentTime(this.levelClock);
+		if(enemyCounter == 0 && obstacleCounter == 0 && GameScreen.getPlayer().isAlive() && currentIntervalIndex == -1) {
+			this.isGameOver = true;
+			this.playerWon = true;
+			//Update the next Level
+			PlayerSession.setNextLevel(this.config.nextLevel);
 		}
 	}
 
@@ -149,6 +185,12 @@ public final class Level {
 		return (this.gameOverDelay == 0);
 	}
 	
+	/**
+	 * Tell whether the player won the game.
+	 */
+	public boolean playerHasWon() {
+		return this.playerWon;
+	}
 
 	/**
 	 * Clean up before the Level is torn down.
diff --git a/src/de/teamteamteam/spacescooter/level/LevelConfig.java b/src/de/teamteamteam/spacescooter/level/LevelConfig.java
index 9a53c88..72181a8 100644
--- a/src/de/teamteamteam/spacescooter/level/LevelConfig.java
+++ b/src/de/teamteamteam/spacescooter/level/LevelConfig.java
@@ -28,6 +28,11 @@ public class LevelConfig {
 	 */
 	public String backgroundMusic;
 	
+	/**
+	 * The name of the level that will come after this one.
+	 */
+	public String nextLevel;
+	
 	/**
 	 * Intervals have a start and an end.
 	 * They are put within this list in a sorted manner, ascending in values.
@@ -62,6 +67,8 @@ public class LevelConfig {
 		sb.append(this.background);
 		sb.append(" backgroundMusic=");
 		sb.append(this.backgroundMusic);
+		sb.append(" nextLevelName=");
+		sb.append(this.nextLevel);
 		sb.append("\\\n\tRules:\n");
 		for(int[] rule : this.spawnRuleList) {
 			sb.append("\t");
diff --git a/src/de/teamteamteam/spacescooter/level/LevelConfigParser.java b/src/de/teamteamteam/spacescooter/level/LevelConfigParser.java
index 8041ac9..84727a0 100644
--- a/src/de/teamteamteam/spacescooter/level/LevelConfigParser.java
+++ b/src/de/teamteamteam/spacescooter/level/LevelConfigParser.java
@@ -70,6 +70,8 @@ public class LevelConfigParser {
 							this.levelConfig.background = linePieces[1];
 						} else if (linePieces[0].equals("backgroundMusic")) {
 							this.levelConfig.backgroundMusic = linePieces[1];
+						} else if (linePieces[0].equals("nextLevel")) {
+							this.levelConfig.nextLevel = linePieces[1];
 						} else {
 							throw new LevelConfigException("[LevelConfigParser] Unknown attribute in line: '" + line + "'");
 						}
@@ -104,6 +106,12 @@ public class LevelConfigParser {
 					throw new LevelConfigException("[LevelConfigParser] Where am i?!");
 			}
 		}
+		
+		//Set the nextLevel to null explicitly, so it is easy to detect.
+		if(this.levelConfig.nextLevel.equals("")) {
+			this.levelConfig.nextLevel = null;
+		}
+		
 		return this.levelConfig;
 	}
 	
diff --git a/src/de/teamteamteam/spacescooter/screen/GameOverScreen.java b/src/de/teamteamteam/spacescooter/screen/GameOverScreen.java
index 6386598..f015177 100644
--- a/src/de/teamteamteam/spacescooter/screen/GameOverScreen.java
+++ b/src/de/teamteamteam/spacescooter/screen/GameOverScreen.java
@@ -94,7 +94,7 @@ public class GameOverScreen extends Screen {
 		} else if(this.animationStatus == 2) {
 			switch (this.menuPoint) {
 			case 0:
-				this.parent.setOverlay(new GameScreen(this.parent, "levels/test.level"));
+				this.parent.setOverlay(new GameScreen(this.parent));
 				break;
 			case 1:
 				this.parent.setOverlay(new MainMenuScreen(this.parent));
diff --git a/src/de/teamteamteam/spacescooter/screen/GameScreen.java b/src/de/teamteamteam/spacescooter/screen/GameScreen.java
index 18ce787..9584ac6 100644
--- a/src/de/teamteamteam/spacescooter/screen/GameScreen.java
+++ b/src/de/teamteamteam/spacescooter/screen/GameScreen.java
@@ -3,6 +3,7 @@ package de.teamteamteam.spacescooter.screen;
 import java.awt.Graphics2D;
 import java.awt.event.KeyEvent;
 
+import de.teamteamteam.spacescooter.brain.PlayerSession;
 import de.teamteamteam.spacescooter.control.Keyboard;
 import de.teamteamteam.spacescooter.entity.Player;
 import de.teamteamteam.spacescooter.gui.HealthBar;
@@ -37,9 +38,9 @@ public class GameScreen extends Screen {
 	 * GameScreen Constructor.
 	 * Takes the level as its second parameter.
 	 */
-	public GameScreen(Screen parent, String levelConfigName) {
+	public GameScreen(Screen parent) {
 		super(parent);
-		this.level = new Level(levelConfigName);
+		this.level = new Level(PlayerSession.getNextLevel());
 		this.level.doBuildUp(); //Have the level build up the whole setting.
 		
 		this.gameClockTrigger = 0;
@@ -89,9 +90,18 @@ public class GameScreen extends Screen {
 			this.setOverlay(new GamePausedScreen(this), false);
 		}
 		
-		//Go to GameOverScreen if the game is actually over.
+		//React if the game is actually over.
 		if (this.level.isGameOver()) {
-			this.parent.setOverlay(new GameOverScreen(this.parent));
+			if(this.level.playerHasWon()) {
+				if(PlayerSession.getNextLevel() == null) {
+					System.out.println("You beat the game! TODO: Transition to HighscoreScreen now!");
+				}
+				//Go to the I don't know yet Screen if the game is over and the player WON.
+				this.parent.setOverlay(new GameWonScreen(this.parent));
+			} else {
+				//Go to GameOverScreen if the game is over - the player died and lost the game.
+				this.parent.setOverlay(new GameOverScreen(this.parent));
+			}
 		}
 	}
 	
diff --git a/src/de/teamteamteam/spacescooter/screen/GameWonScreen.java b/src/de/teamteamteam/spacescooter/screen/GameWonScreen.java
new file mode 100644
index 0000000..4fc00b2
--- /dev/null
+++ b/src/de/teamteamteam/spacescooter/screen/GameWonScreen.java
@@ -0,0 +1,100 @@
+package de.teamteamteam.spacescooter.screen;
+
+import java.awt.Color;
+import java.awt.Font;
+import java.awt.Graphics2D;
+import java.awt.event.KeyEvent;
+import java.awt.image.BufferedImage;
+
+import de.teamteamteam.spacescooter.brain.GameConfig;
+import de.teamteamteam.spacescooter.control.Keyboard;
+import de.teamteamteam.spacescooter.entity.Player;
+import de.teamteamteam.spacescooter.gui.Button;
+import de.teamteamteam.spacescooter.utility.Loader;
+
+/**
+ * This Screen is shown after the player has beaten a level, so he can enter the shop
+ * and do some various things before entering the next level.
+ */
+public class GameWonScreen extends Screen {
+
+	private BufferedImage img;
+	private Player player;
+	private float playerMoveSpeed = 0;
+	private int colorValue = 0;
+	private boolean colorValueIncrease = true;
+	private int menuPoint = 0;
+	private int animationStatus = 0; //0 = Noch nicht gestartet, 1 = Animation läuft, 2 = Animation beendet
+	
+	public GameWonScreen(Screen parent) {
+		super(parent);
+		this.img = Loader.getBufferedImageByFilename("images/pausebackground.png");
+		new Button(GameConfig.windowWidth/2-125, 300);
+		new Button(GameConfig.windowWidth/2-125, 400);
+		player = new Player(GameConfig.windowWidth/2-170, 309);
+		player.setCanMove(false);
+		player.setCanShoot(false);
+	}
+
+	@Override
+	protected void paint(Graphics2D g) {
+		g.drawImage(this.img, 0, 0, null);
+		this.entityPaintIterator.reset();
+		while (this.entityPaintIterator.hasNext()) {
+			this.entityPaintIterator.next().paint(g);
+		}
+		g.setFont(new Font("Monospace", 0, 100));
+		g.setColor(new Color(75 + colorValue, 175 + colorValue, 175 + colorValue));
+		g.drawString("You win!", GameConfig.windowWidth/2-290, 200);
+		g.setFont(new Font("Monospace", 0, 20));
+		g.setColor(new Color(0, 0, 0));
+		g.drawString("Weiter zum nächsten Abenteuer! :D", GameConfig.windowWidth/2-60, 332);
+		g.drawString("Hauptmen\u00fc", GameConfig.windowWidth/2-60, 432);
+	}
+
+	@Override
+	protected void update() {
+		this.entityUpdateIterator.reset();
+		while (this.entityUpdateIterator.hasNext()) {
+			this.entityUpdateIterator.next().update();
+		}
+		
+		if(this.colorValueIncrease) {
+			this.colorValue += 2;
+			if(this.colorValue > 70) this.colorValueIncrease = false;
+		} else {
+			this.colorValue -= 2;
+			if(this.colorValue < -70) this.colorValueIncrease = true;
+		}
+				
+		if(Keyboard.isKeyDown(KeyEvent.VK_DOWN) && this.animationStatus == 0){
+			this.menuPoint = 1;
+			player.setPosition(player.getX(), 409);
+		}
+		if(Keyboard.isKeyDown(KeyEvent.VK_UP) && this.animationStatus == 0){
+			this.menuPoint = 0;
+			player.setPosition(player.getX(), 309);
+		}
+		
+		// make a selection
+		if(Keyboard.isKeyDown(KeyEvent.VK_ENTER) || Keyboard.isKeyDown(KeyEvent.VK_SPACE)) {
+			this.animationStatus = 1;
+		}
+		if(this.animationStatus == 1) {
+			if(player.getX() <= GameConfig.windowWidth) {
+				player.setPosition(player.getX() + (int) playerMoveSpeed, player.getY());
+				playerMoveSpeed += 0.1;
+			} else this.animationStatus = 2;
+		} else if(this.animationStatus == 2) {
+			switch (this.menuPoint) {
+			case 0:
+				this.parent.setOverlay(new GameScreen(this.parent));
+				break;
+			case 1:
+				this.parent.setOverlay(new MainMenuScreen(this.parent));
+				break;
+			}
+		}
+	}
+
+}
diff --git a/src/de/teamteamteam/spacescooter/screen/MainMenuScreen.java b/src/de/teamteamteam/spacescooter/screen/MainMenuScreen.java
index ce23576..31c5394 100644
--- a/src/de/teamteamteam/spacescooter/screen/MainMenuScreen.java
+++ b/src/de/teamteamteam/spacescooter/screen/MainMenuScreen.java
@@ -99,7 +99,7 @@ public class MainMenuScreen extends Screen {
 		} else if(animationStatus == 2) {
 			switch (menuPoint) {
 				case 0:
-					this.parent.setOverlay(new GameScreen(this.parent, "levels/test.level"));
+					this.parent.setOverlay(new GameScreen(this.parent));
 					break;
 				case 1:
 					this.parent.setOverlay(new ShopScreen(this.parent));

From ced2501c8493332e310d66fcce000d01f3c5cefd Mon Sep 17 00:00:00 2001
From: ramapcsx2 <you@example.com>
Date: Tue, 9 Dec 2014 13:20:00 +0100
Subject: [PATCH 10/22] balancing

---
 .../teamteamteam/spacescooter/entity/enemy/EnemyBossMinion.java | 2 +-
 src/de/teamteamteam/spacescooter/entity/enemy/EnemyFour.java    | 2 +-
 src/de/teamteamteam/spacescooter/entity/enemy/EnemyOne.java     | 2 +-
 src/de/teamteamteam/spacescooter/entity/enemy/EnemyThree.java   | 2 +-
 src/de/teamteamteam/spacescooter/entity/enemy/EnemyTwo.java     | 2 +-
 src/de/teamteamteam/spacescooter/entity/item/Item.java          | 2 +-
 src/de/teamteamteam/spacescooter/entity/item/ItemHeal.java      | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/de/teamteamteam/spacescooter/entity/enemy/EnemyBossMinion.java b/src/de/teamteamteam/spacescooter/entity/enemy/EnemyBossMinion.java
index 155a1be..969e24d 100644
--- a/src/de/teamteamteam/spacescooter/entity/enemy/EnemyBossMinion.java
+++ b/src/de/teamteamteam/spacescooter/entity/enemy/EnemyBossMinion.java
@@ -16,7 +16,7 @@ public class EnemyBossMinion extends Enemy{
 		this.setImage("images/enemybossminion.png");
 		this.setPrimaryShotImage("images/shots/laser_green.png");
 		this.setShootSpeed(4);
-		this.setShootDelay(42);
+		this.setShootDelay(30);
 		this.setShootSpawn(-10, 10);
 		this.setShootDamage(5);
 		this.setHealthPoints(15);
diff --git a/src/de/teamteamteam/spacescooter/entity/enemy/EnemyFour.java b/src/de/teamteamteam/spacescooter/entity/enemy/EnemyFour.java
index 1a2ddd2..36aa40c 100644
--- a/src/de/teamteamteam/spacescooter/entity/enemy/EnemyFour.java
+++ b/src/de/teamteamteam/spacescooter/entity/enemy/EnemyFour.java
@@ -21,7 +21,7 @@ public class EnemyFour extends Enemy{
 		this.setImage("images/enemy01.png");
 		this.setPrimaryShotImage("images/shots/laser_yellow.png");
 		this.setShootSpeed(4);
-		this.setShootDelay(42);
+		this.setShootDelay(62);
 		this.setShootSpawn(-10, 10);
 		this.setShootDamage(5);
 		this.setCollisionDamage(5);
diff --git a/src/de/teamteamteam/spacescooter/entity/enemy/EnemyOne.java b/src/de/teamteamteam/spacescooter/entity/enemy/EnemyOne.java
index 5520a0e..e403de8 100644
--- a/src/de/teamteamteam/spacescooter/entity/enemy/EnemyOne.java
+++ b/src/de/teamteamteam/spacescooter/entity/enemy/EnemyOne.java
@@ -9,7 +9,7 @@ public class EnemyOne extends Enemy {
 		this.setImage("images/nyancat.png");
 		this.setPrimaryShotImage("images/shots/laser_red.png");
 		this.setShootSpeed(2);
-		this.setShootDelay(42);
+		this.setShootDelay(62);
 		this.setShootSpawn(-8, 10);
 		this.setShootDamage(5);
 		this.setCollisionDamage(5);
diff --git a/src/de/teamteamteam/spacescooter/entity/enemy/EnemyThree.java b/src/de/teamteamteam/spacescooter/entity/enemy/EnemyThree.java
index 435373e..8c0f3d4 100644
--- a/src/de/teamteamteam/spacescooter/entity/enemy/EnemyThree.java
+++ b/src/de/teamteamteam/spacescooter/entity/enemy/EnemyThree.java
@@ -16,7 +16,7 @@ public class EnemyThree extends Enemy{
 		this.setImage("images/enemy03.png");
 		this.setPrimaryShotImage("images/shots/laser_red.png");
 		this.setShootSpeed(4);
-		this.setShootDelay(42);
+		this.setShootDelay(62);
 		this.setShootSpawn(-10, 10);
 		this.setShootDamage(5);
 		this.setHealthPoints(15);
diff --git a/src/de/teamteamteam/spacescooter/entity/enemy/EnemyTwo.java b/src/de/teamteamteam/spacescooter/entity/enemy/EnemyTwo.java
index bdef067..67323bd 100644
--- a/src/de/teamteamteam/spacescooter/entity/enemy/EnemyTwo.java
+++ b/src/de/teamteamteam/spacescooter/entity/enemy/EnemyTwo.java
@@ -9,7 +9,7 @@ public class EnemyTwo extends Enemy{
 		this.setImage("images/enemy02.png");
 		this.setPrimaryShotImage("images/shots/laser_green.png");
 		this.setShootSpeed(4);
-		this.setShootDelay(42);
+		this.setShootDelay(62);
 		this.setShootSpawn(-10, 10);
 		this.setShootDamage(5);
 		this.setCollisionDamage(5);
diff --git a/src/de/teamteamteam/spacescooter/entity/item/Item.java b/src/de/teamteamteam/spacescooter/entity/item/Item.java
index 88020c2..84f7507 100644
--- a/src/de/teamteamteam/spacescooter/entity/item/Item.java
+++ b/src/de/teamteamteam/spacescooter/entity/item/Item.java
@@ -60,7 +60,7 @@ public abstract class Item extends CollidableEntity {
 		int[] items = new int[6];
 		items[0] = 1;	//ItemNuke
 		items[1] = 4;	//ItemCredit
-		items[2] = 2;	//ItemHeal
+		items[2] = 3;	//ItemHeal
 		items[3] = 2;	//ItemShield
 		items[4] = 2;	//ItemRocket or ItemBeam
 		items[5] = 3;	//ItemIncreaseDamage
diff --git a/src/de/teamteamteam/spacescooter/entity/item/ItemHeal.java b/src/de/teamteamteam/spacescooter/entity/item/ItemHeal.java
index e9fe589..7e0582d 100644
--- a/src/de/teamteamteam/spacescooter/entity/item/ItemHeal.java
+++ b/src/de/teamteamteam/spacescooter/entity/item/ItemHeal.java
@@ -11,6 +11,6 @@ public class ItemHeal extends Item {
 
 	@Override
 	public void itemCollected(Player player) {
-		player.addHealthPoints(15);
+		player.addHealthPoints(20);
 	}
 }

From d12d00d1b2caa5781d2bea9b52f5edbc1edcebe0 Mon Sep 17 00:00:00 2001
From: Jan Philipp Timme <jan.philipp@timme.it>
Date: Tue, 9 Dec 2014 13:45:52 +0100
Subject: [PATCH 11/22] Rename attributes of PlayerSession.

---
 .../spacescooter/brain/PlayerSession.java     | 84 +++++++++----------
 .../spacescooter/entity/Player.java           | 12 +--
 .../entity/item/ItemIncreaseDamage.java       |  9 +-
 .../spacescooter/screen/ShopScreen.java       | 18 ++--
 4 files changed, 65 insertions(+), 58 deletions(-)

diff --git a/src/de/teamteamteam/spacescooter/brain/PlayerSession.java b/src/de/teamteamteam/spacescooter/brain/PlayerSession.java
index 458d0b2..56d9787 100644
--- a/src/de/teamteamteam/spacescooter/brain/PlayerSession.java
+++ b/src/de/teamteamteam/spacescooter/brain/PlayerSession.java
@@ -21,34 +21,34 @@ public class PlayerSession {
 	 * Damage value of the normal Shots the ship fires.
 	 * This can be changed by upgrades in the shop.
 	 */
-	private static int shipShotDamage;
+	private static int baseShotDamage;
 
 	/**
 	 * The ships default maximum shield points.
 	 * This can be changed by upgrades in the shop.
 	 */
-	private static int shipShieldPoints;
+	private static int baseShieldPoints;
 
 	/**
 	 * The ships default maximum health points.
 	 * This can be changed by upgrades in the shop.
 	 */
-	private static int shipHealthPoints;
+	private static int baseHealthPoints;
 	
 	/**
 	 * The number of health upgrades the player bought for the ship.
 	 */
-	private static int shipHealthUpgadesBought;
+	private static int baseHealthUpgadesBought;
 
 	/**
 	 * The number of shield upgrades the player bought for the ship.
 	 */
-	private static int shipShieldUpgadesBought;
+	private static int baseShieldUpgadesBought;
 	
 	/**
 	 * The number of shot damage upgrades the player bought for the ship.
 	 */
-	private static int shipShotUpgadesBought;
+	private static int baseShotUpgadesBought;
 	
 	/**
 	 * The secondary weapon of the ship.
@@ -126,106 +126,106 @@ public class PlayerSession {
 	/**
 	 * Get the ships maximum health points.
 	 */
-	public static int getShipHealthPoints() {
-		return PlayerSession.shipHealthPoints;
+	public static int getBaseHealthPoints() {
+		return PlayerSession.baseHealthPoints;
 	}
 	
 	/**
 	 * Set the ships maximum health points.
 	 */
-	public static void setShipHealthPoints(int shipHealthPoints) {
-		PlayerSession.shipHealthPoints = shipHealthPoints;
+	public static void setBaseHealthPoints(int baseHealthPoints) {
+		PlayerSession.baseHealthPoints = baseHealthPoints;
 	}
 	
 	/**
 	 * Add to the ships maximum health points.
 	 */
-	public static void addShipHealthPoints(int shipHealthPoints) {
-		PlayerSession.shipHealthPoints += shipHealthPoints;
+	public static void addBaseHealthPoints(int baseHealthPoints) {
+		PlayerSession.baseHealthPoints += baseHealthPoints;
 	}
 	
 	/**
 	 * Get the ships maximum shield points.
 	 */
-	public static int getShipShieldPoints() {
-		return PlayerSession.shipShieldPoints;
+	public static int getBaseShieldPoints() {
+		return PlayerSession.baseShieldPoints;
 	}
 	
 	/**
 	 * Set the ships maximum shield points.
 	 */
-	public static void setShipShieldPoints(int shipShieldPoints) {
-		PlayerSession.shipShieldPoints = shipShieldPoints;
+	public static void setBaseShieldPoints(int baseShieldPoints) {
+		PlayerSession.baseShieldPoints = baseShieldPoints;
 	}
 	
 	/**
 	 * Add to the ships maximum shield points.
 	 */
-	public static void addShipShieldPoints(int shipShieldPoints) {
-		PlayerSession.shipShieldPoints += shipShieldPoints;
+	public static void addBaseShieldPoints(int baseShieldPoints) {
+		PlayerSession.baseShieldPoints += baseShieldPoints;
 	}
 	
 	/**
 	 * Get the ships shot damage value.
 	 */
-	public static int getShipShotDamage() {
-		return PlayerSession.shipShotDamage;
+	public static int getBaseShotDamage() {
+		return PlayerSession.baseShotDamage;
 	}
 	
 	/**
 	 * Set the ships shot damage value.
 	 */
-	public static void setShipShotDamage(int shipShotDamage) {
-		PlayerSession.shipShotDamage = shipShotDamage;
+	public static void setBaseShotDamage(int baseShotDamage) {
+		PlayerSession.baseShotDamage = baseShotDamage;
 	}
 	
 	/**
 	 * Add to the ships shot damage value.
 	 */
-	public static void addShipShotDamage(int shipShotDamage) {
-		PlayerSession.shipShotDamage += shipShotDamage;
+	public static void addBaseShotDamage(int shipShotDamage) {
+		PlayerSession.baseShotDamage += shipShotDamage;
 	}
 
 	/**
 	 * Get the number of ship health upgrades the player bought in the shop.
 	 */
-	public static int getShipHealthUpgradesBought() {
-		return PlayerSession.shipHealthUpgadesBought;
+	public static int getBaseHealthUpgradesBought() {
+		return PlayerSession.baseHealthUpgadesBought;
 	}
 	
 	/**
 	 * Increment the number of ship health upgrades the player bought.
 	 */
-	public static void incrementShipHealthUpgradesBought() {
-		PlayerSession.shipHealthUpgadesBought++;
+	public static void incrementBaseHealthUpgradesBought() {
+		PlayerSession.baseHealthUpgadesBought++;
 	}
 
 	/**
 	 * Get the number of ship shield upgrades the player bought in the shop.
 	 */
-	public static int getShipShieldUpgradesBought() {
-		return PlayerSession.shipShieldUpgadesBought;
+	public static int getBaseShieldUpgradesBought() {
+		return PlayerSession.baseShieldUpgadesBought;
 	}
 
 	/**
 	 * Increment the number of ship shield upgrades the player bought.
 	 */
-	public static void incrementShipShieldUpgradesBought() {
-		PlayerSession.shipShieldUpgadesBought++;
+	public static void incrementBaseShieldUpgradesBought() {
+		PlayerSession.baseShieldUpgadesBought++;
 	}
 	
 	/**
 	 * Get the number of ship shot upgrades the player bought in the shop.
 	 */
-	public static int getShipShotUpgradesBought() {
-		return PlayerSession.shipShotUpgadesBought;
+	public static int getBaseShotUpgradesBought() {
+		return PlayerSession.baseShotUpgadesBought;
 	}
 
 	/**
 	 * Increment the number of ship shot upgrades the player bought.
 	 */
-	public static void incrementShipShotUpgradesBought() {
-		PlayerSession.shipShotUpgadesBought++;
+	public static void incrementBaseShotUpgradesBought() {
+		PlayerSession.baseShotUpgadesBought++;
 	}
 
 	/**
@@ -267,12 +267,12 @@ public class PlayerSession {
 		PlayerSession.score = 0;
 		PlayerSession.secondaryWeapon = 1;
 		PlayerSession.credits = 0;
-		PlayerSession.shipHealthPoints = GameConfig.initialPlayerHealthPoints;
-		PlayerSession.shipShieldPoints = GameConfig.initialPlayerShieldPoints;
-		PlayerSession.shipShotDamage = GameConfig.initialPlayerShotDamage;
-		PlayerSession.shipHealthUpgadesBought = 0;
-		PlayerSession.shipShieldUpgadesBought = 0;
-		PlayerSession.shipShotUpgadesBought = 0;
+		PlayerSession.baseHealthPoints = GameConfig.initialPlayerHealthPoints;
+		PlayerSession.baseShieldPoints = GameConfig.initialPlayerShieldPoints;
+		PlayerSession.baseShotDamage = GameConfig.initialPlayerShotDamage;
+		PlayerSession.baseHealthUpgadesBought = 0;
+		PlayerSession.baseShieldUpgadesBought = 0;
+		PlayerSession.baseShotUpgadesBought = 0;
 	}
 
 }
diff --git a/src/de/teamteamteam/spacescooter/entity/Player.java b/src/de/teamteamteam/spacescooter/entity/Player.java
index 721ca0f..79a5e63 100644
--- a/src/de/teamteamteam/spacescooter/entity/Player.java
+++ b/src/de/teamteamteam/spacescooter/entity/Player.java
@@ -66,11 +66,11 @@ public class Player extends ShootingEntity implements KeyboardListener {
 		this.setShootSpeed(10);
 		this.setCollisionDamage(5);
 		this.setScore(0);
-		this.setHealthPoints(PlayerSession.getShipHealthPoints());
-		this.setMaximumHealthPoints(PlayerSession.getShipHealthPoints());
-		this.setShieldPoints(PlayerSession.getShipShieldPoints());
-		this.setMaximumShieldPoints(PlayerSession.getShipShieldPoints());
-		this.setShootDamage((PlayerSession.getShipShotDamage())/2);
+		this.setHealthPoints(PlayerSession.getBaseHealthPoints());
+		this.setMaximumHealthPoints(PlayerSession.getBaseHealthPoints());
+		this.setShieldPoints(PlayerSession.getBaseShieldPoints());
+		this.setMaximumShieldPoints(PlayerSession.getBaseShieldPoints());
+		this.setShootDamage(PlayerSession.getBaseShotDamage());
 		this.registerOnKeyboard(Keyboard.getInstance());
 	}
 
@@ -175,7 +175,7 @@ public class Player extends ShootingEntity implements KeyboardListener {
 		}
 		super.remove();
 	}
-
+	
 	/**
 	 * keyPressed method, comes in handy when a key on the keyboard is pressed
 	 */
diff --git a/src/de/teamteamteam/spacescooter/entity/item/ItemIncreaseDamage.java b/src/de/teamteamteam/spacescooter/entity/item/ItemIncreaseDamage.java
index 06240e8..e39bbb0 100644
--- a/src/de/teamteamteam/spacescooter/entity/item/ItemIncreaseDamage.java
+++ b/src/de/teamteamteam/spacescooter/entity/item/ItemIncreaseDamage.java
@@ -10,9 +10,16 @@ public class ItemIncreaseDamage extends Item {
 		this.setImage("images/items/item.png");
 	}
 
+	/**
+	 * Increase shoot damage of Player if not above 25.
+	 */
 	@Override
 	public void itemCollected(Player player) {
-		player.setShootDamage(player.getShootDamage()+5);
+		if(player.getShootDamage() > 25) {
+			return;
+		} else {
+			player.setShootDamage(player.getShootDamage()+5);
+		}
 	}
 
 }
diff --git a/src/de/teamteamteam/spacescooter/screen/ShopScreen.java b/src/de/teamteamteam/spacescooter/screen/ShopScreen.java
index 418a332..6bc9d03 100644
--- a/src/de/teamteamteam/spacescooter/screen/ShopScreen.java
+++ b/src/de/teamteamteam/spacescooter/screen/ShopScreen.java
@@ -35,9 +35,9 @@ public class ShopScreen extends Screen {
 		super(parent);
 		this.img = Loader.getBufferedImageByFilename("images/shopbackground.png");
 		new Button(GameConfig.windowWidth/2-125, 500);
-		damage = new ShopOffer(100, 150, 15, PlayerSession.getShipShotUpgradesBought(), "Schaden  5C");
-		shield = new ShopOffer(100, 225, 15, PlayerSession.getShipShieldUpgradesBought(), "Schild     10C");
-		life = new ShopOffer(100, 300, 15, PlayerSession.getShipHealthUpgradesBought(), "Leben     10C");
+		damage = new ShopOffer(100, 150, 15, PlayerSession.getBaseShotUpgradesBought(), "Schaden  5C");
+		shield = new ShopOffer(100, 225, 15, PlayerSession.getBaseShieldUpgradesBought(), "Schild     10C");
+		life = new ShopOffer(100, 300, 15, PlayerSession.getBaseHealthUpgradesBought(), "Leben     10C");
 		new ImageEntity(GameConfig.windowWidth / 2 - 120, 365, "images/shop/shoprocket.png");
 		new ImageEntity(GameConfig.windowWidth / 2 + 30, 365, "images/shop/shopbeam.png");
 		if(PlayerSession.getSecondsecondaryWeapon() == 1){
@@ -106,24 +106,24 @@ public class ShopScreen extends Screen {
 			case 0:
 				if(PlayerSession.getCredits() >= 5 && damage.getBought() < damage.getMax()){
 					damage.buy();
-					PlayerSession.addShipShotDamage(5);
-					PlayerSession.incrementShipShotUpgradesBought();
+					PlayerSession.addBaseShotDamage(5);
+					PlayerSession.incrementBaseShotUpgradesBought();
 					PlayerSession.removeCredits(5);
 				}
 				break;
 			case 1:
 				if(PlayerSession.getCredits() >= 10 && shield.getBought() < shield.getMax()){
 					shield.buy();
-					PlayerSession.addShipShieldPoints(10);
-					PlayerSession.incrementShipShieldUpgradesBought();
+					PlayerSession.addBaseShieldPoints(10);
+					PlayerSession.incrementBaseShieldUpgradesBought();
 					PlayerSession.removeCredits(10);
 				}
 				break;
 			case 2:
 				if(PlayerSession.getCredits() >= 10 && life.getBought() < life.getMax()){
 					life.buy();
-					PlayerSession.addShipHealthPoints(10);
-					PlayerSession.incrementShipHealthUpgradesBought();
+					PlayerSession.addBaseHealthPoints(10);
+					PlayerSession.incrementBaseHealthUpgradesBought();
 					PlayerSession.removeCredits(10);
 				}
 				break;

From 8621e07e3c6aeb5171ba49d987477fe2bc661983 Mon Sep 17 00:00:00 2001
From: Jan Philipp Timme <jan.philipp@timme.it>
Date: Tue, 9 Dec 2014 14:01:40 +0100
Subject: [PATCH 12/22] Feature: Prototype for Fscking hardcore mode
 background.

---
 .../background/FuckedUpCloudBackground.java   | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 src/de/teamteamteam/spacescooter/background/FuckedUpCloudBackground.java

diff --git a/src/de/teamteamteam/spacescooter/background/FuckedUpCloudBackground.java b/src/de/teamteamteam/spacescooter/background/FuckedUpCloudBackground.java
new file mode 100644
index 0000000..a636c16
--- /dev/null
+++ b/src/de/teamteamteam/spacescooter/background/FuckedUpCloudBackground.java
@@ -0,0 +1,38 @@
+package de.teamteamteam.spacescooter.background;
+
+import java.awt.Graphics2D;
+
+import de.teamteamteam.spacescooter.brain.GameConfig;
+
+public class FuckedUpCloudBackground extends ScrollingBackground {
+
+	private double x;
+	private double x_delta;
+	private int percentage;
+	private int timer;
+	
+	public FuckedUpCloudBackground(int x, int y) {
+		super(x, y);
+		this.setImage("images/cloudbackground.png");
+		this.setScrollingSpeed(-1);
+	}
+	
+	public void paint(Graphics2D g) {
+		g.fillRect(0, 0, GameConfig.windowWidth, GameConfig.windowHeight);
+		/*if(this.timer == 0 && this.percentage < 100) {
+			this.percentage++;
+		} else if (timer > 500 && this.percentage > 0) {
+			this.percentage--;
+		} else if (this.percentage == 100){
+			this.timer++;
+		} else if (this.percentage == 0) {
+			this.timer--;
+		}*/
+		this.x += 0.005;
+		
+		
+		g.rotate(this.x, GameConfig.windowWidth/2, GameConfig.windowHeight/2);
+		super.paint(g);
+	}
+
+}

From 68cdeddb7353c827285fd00f26187daa7cd1b327 Mon Sep 17 00:00:00 2001
From: ramapcsx2 <you@example.com>
Date: Tue, 9 Dec 2014 14:04:19 +0100
Subject: [PATCH 13/22] encasing that thread work time takes too long in DEBUG

---
 .../spacescooter/thread/TimedThread.java            | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/de/teamteamteam/spacescooter/thread/TimedThread.java b/src/de/teamteamteam/spacescooter/thread/TimedThread.java
index cbb4c15..1815364 100644
--- a/src/de/teamteamteam/spacescooter/thread/TimedThread.java
+++ b/src/de/teamteamteam/spacescooter/thread/TimedThread.java
@@ -1,5 +1,7 @@
 package de.teamteamteam.spacescooter.thread;
 
+import de.teamteamteam.spacescooter.brain.GameConfig;
+
 /**
  * Since things like drawing the next image or triggering the next game tick
  * need to happen in time, this TimedThread allows more precise timing
@@ -18,11 +20,6 @@ public abstract class TimedThread extends Thread {
 	 */
 	private long workTime;
 	
-	/**
-	 * This is a quick hack :)
-	 */
-	private long runloops; 
-	
 	/**
 	 * This method sets the actual working interval based on hz.
 	 * 
@@ -37,7 +34,6 @@ public abstract class TimedThread extends Thread {
 	 */
 	public final void run() {
 		while (true) {
-			this.runloops++;
 			long workStart = System.nanoTime();
 			// do the actual work
 			this.work();
@@ -47,9 +43,8 @@ public abstract class TimedThread extends Thread {
 
 			long timeToWait = this.workInterval - workTime;
 			//in case we are already running late, just print a warning and carry on!
-			if(timeToWait < 0 && this.runloops > 50) { // runloops for filtering out game start delays
-				System.err.println("[" + this.getName() + "] workTime exceeds workInterval!:" + this.workTime + " > " + this.workInterval);
-				runloops = 100; // overflow protect 
+			if(timeToWait < 0) {
+				if(GameConfig.DEBUG) System.err.println("[" + this.getName() + "] workTime exceeds workInterval!:" + this.workTime + " > " + this.workInterval);
 				continue;
 			}
 			long msToWait = timeToWait / 1000000;

From 7c6676f6d52a8aac53a995e1a2ecf42e5665675e Mon Sep 17 00:00:00 2001
From: ramapcsx2 <you@example.com>
Date: Tue, 9 Dec 2014 14:15:21 +0100
Subject: [PATCH 14/22] bugfixes / gamewonscreen

---
 src/de/teamteamteam/spacescooter/screen/GameWonScreen.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/de/teamteamteam/spacescooter/screen/GameWonScreen.java b/src/de/teamteamteam/spacescooter/screen/GameWonScreen.java
index 4fc00b2..f243742 100644
--- a/src/de/teamteamteam/spacescooter/screen/GameWonScreen.java
+++ b/src/de/teamteamteam/spacescooter/screen/GameWonScreen.java
@@ -45,10 +45,10 @@ public class GameWonScreen extends Screen {
 		}
 		g.setFont(new Font("Monospace", 0, 100));
 		g.setColor(new Color(75 + colorValue, 175 + colorValue, 175 + colorValue));
-		g.drawString("You win!", GameConfig.windowWidth/2-290, 200);
+		g.drawString("You win!", GameConfig.windowWidth/2-210, 200);
 		g.setFont(new Font("Monospace", 0, 20));
 		g.setColor(new Color(0, 0, 0));
-		g.drawString("Weiter zum nächsten Abenteuer! :D", GameConfig.windowWidth/2-60, 332);
+		g.drawString("Forwards Ever!", GameConfig.windowWidth/2-70, 332);
 		g.drawString("Hauptmen\u00fc", GameConfig.windowWidth/2-60, 432);
 	}
 

From 9cd809b4a31099a23b1e7983599806a46c86ed98 Mon Sep 17 00:00:00 2001
From: ramapcsx2 <you@example.com>
Date: Tue, 9 Dec 2014 14:36:05 +0100
Subject: [PATCH 15/22] added shotpowerup image and used it, replaing item.png

---
 .../spacescooter/entity/item/ItemIncreaseDamage.java           | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/de/teamteamteam/spacescooter/entity/item/ItemIncreaseDamage.java b/src/de/teamteamteam/spacescooter/entity/item/ItemIncreaseDamage.java
index e39bbb0..49ed8e8 100644
--- a/src/de/teamteamteam/spacescooter/entity/item/ItemIncreaseDamage.java
+++ b/src/de/teamteamteam/spacescooter/entity/item/ItemIncreaseDamage.java
@@ -6,8 +6,7 @@ public class ItemIncreaseDamage extends Item {
 		
 	public ItemIncreaseDamage(int x, int y) {
 		super(x, y);
-		//TODO: Change Image
-		this.setImage("images/items/item.png");
+		this.setImage("images/items/itemShotPowerUp.png");
 	}
 
 	/**

From 130152aba0c3b97da073454d1e0c0b0cc69ec43b Mon Sep 17 00:00:00 2001
From: Jan Philipp Timme <jan.philipp@timme.it>
Date: Tue, 9 Dec 2014 15:01:35 +0100
Subject: [PATCH 16/22] Feature: Levelname wird bei Levelbeginn eingeblendet.

---
 .../spacescooter/gui/LevelHeadline.java       | 56 +++++++++++++++++++
 .../spacescooter/level/Level.java             |  5 +-
 2 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100644 src/de/teamteamteam/spacescooter/gui/LevelHeadline.java

diff --git a/src/de/teamteamteam/spacescooter/gui/LevelHeadline.java b/src/de/teamteamteam/spacescooter/gui/LevelHeadline.java
new file mode 100644
index 0000000..fff32f5
--- /dev/null
+++ b/src/de/teamteamteam/spacescooter/gui/LevelHeadline.java
@@ -0,0 +1,56 @@
+package de.teamteamteam.spacescooter.gui;
+
+import java.awt.Color;
+import java.awt.Font;
+import java.awt.Graphics2D;
+
+import de.teamteamteam.spacescooter.brain.GameConfig;
+import de.teamteamteam.spacescooter.entity.Entity;
+
+/**
+ * A headline that is being displayed at the beginning of each level,
+ * disappearing by fading out after 1-2 seconds.
+ */
+public class LevelHeadline extends Entity {
+
+
+	private int lifeTime;
+	private int lifeTimeCounter;
+
+	private String text;
+	
+	public LevelHeadline(int x, int y, String text) {
+		super(x, y);
+		this.text = text;
+		this.lifeTime = 150;
+		this.lifeTimeCounter = this.lifeTime;
+	}
+	
+	/**
+	 * Make the headline stay for a while, then let it disappear.
+	 */
+	@Override
+	public void update() {
+		if(this.lifeTimeCounter > 0) {
+			this.lifeTimeCounter--;
+		}
+		if(lifeTime == 0) {
+			this.remove();
+		}
+	}
+	
+	/**
+	 * Draw the Headline
+	 */
+	public void paint(Graphics2D g) {
+		g.setFont(new Font("Monospace", 0, 60));
+		float alpha = (float) (this.lifeTimeCounter / (this.lifeTime * 1.0));
+		int textWidth = g.getFontMetrics().stringWidth(this.text);
+		int textHeight = g.getFontMetrics().getHeight();
+		int x = (GameConfig.gameScreenWidth/2 - textWidth/2);
+		int y = (int) (GameConfig.gameScreenHeight/2 - textHeight);
+		g.setColor(new Color(1.0F, 1.0F, 1.0F, alpha));
+		g.drawString(this.text, x, y);
+	}
+
+}
diff --git a/src/de/teamteamteam/spacescooter/level/Level.java b/src/de/teamteamteam/spacescooter/level/Level.java
index e1d05a9..e952002 100644
--- a/src/de/teamteamteam/spacescooter/level/Level.java
+++ b/src/de/teamteamteam/spacescooter/level/Level.java
@@ -17,6 +17,7 @@ import de.teamteamteam.spacescooter.entity.obstacle.Obstacle;
 import de.teamteamteam.spacescooter.entity.obstacle.StoneOne;
 import de.teamteamteam.spacescooter.entity.obstacle.StoneThree;
 import de.teamteamteam.spacescooter.entity.obstacle.StoneTwo;
+import de.teamteamteam.spacescooter.gui.LevelHeadline;
 import de.teamteamteam.spacescooter.screen.GameScreen;
 import de.teamteamteam.spacescooter.screen.Screen;
 import de.teamteamteam.spacescooter.sound.SoundSystem;
@@ -83,12 +84,14 @@ public final class Level {
 	}
 	
 	/**
-	 * Initialize the level based on the LevelConfig attributes.
+	 * Initialize the level based on the LevelConfig attributes,
+	 * show the level name in a LevelHeadline.
 	 */
 	public void doBuildUp() {
 		this.spawnEntityByAvailableName(Entity.availableNames.valueOf(this.config.background), 0, 50);
 		GameScreen.setPlayer(new Player(200, 300));
 		this.backgroundMusic = SoundSystem.playSound(this.config.backgroundMusic);
+		new LevelHeadline(100,100, this.config.name);
 	}
 	
 	/**

From a0788fc08d14e992d6d1644311a6de9e6f4b18e3 Mon Sep 17 00:00:00 2001
From: JJTCM <jjtcm@gulli.com>
Date: Tue, 9 Dec 2014 15:12:33 +0100
Subject: [PATCH 17/22] Changed the Test Level a bit EnemyFour can now be spawn
 with the Level Config EnemyFour now drops Items Removed simicolon from
 Keyboard Debugcode

---
 res/levels/test.level                         | 73 +++++++++++++++++--
 .../spacescooter/control/Keyboard.java        |  2 +-
 .../spacescooter/entity/enemy/EnemyFour.java  | 14 +++-
 .../spacescooter/level/Level.java             | 32 +++++---
 .../spacescooter/level/LevelConfig.java       | 14 ++--
 .../spacescooter/level/LevelConfigParser.java | 19 ++++-
 6 files changed, 127 insertions(+), 27 deletions(-)

diff --git a/res/levels/test.level b/res/levels/test.level
index 53bec45..13232da 100644
--- a/res/levels/test.level
+++ b/res/levels/test.level
@@ -4,19 +4,82 @@ background:CloudBackground
 nextLevel:levels/second.level
 -
 [0-1]
-spawn:EnemyBoss,1,1,50
+spawn:EnemyTwo,1,4,5
+spawn:EnemyTwo,1,4,25
+spawn:EnemyTwo,1,4,45
+spawn:EnemyTwo,1,4,65
+spawn:EnemyTwo,1,4,85
+spawn:EnemyTwo,1,4,100
 [1-2]
+spawn:EnemyTwo,1,6,15
+spawn:EnemyTwo,1,6,35
+spawn:EnemyTwo,1,6,55
+spawn:EnemyTwo,1,6,75
+spawn:EnemyTwo,1,6,95
+[2-3]
+spawn:EnemyTwo,1,4,5
+spawn:EnemyTwo,1,4,25
+spawn:EnemyTwo,1,4,45
+spawn:EnemyTwo,1,4,65
+spawn:EnemyTwo,1,4,85
+spawn:EnemyTwo,1,4,100
+[3-4]
+spawn:EnemyTwo,1,6,15
+spawn:EnemyTwo,1,6,35
+spawn:EnemyTwo,1,6,55
+spawn:EnemyTwo,1,6,75
+spawn:EnemyTwo,1,6,95
+[4-5]
+spawn:EnemyTwo,1,4,5
+spawn:EnemyTwo,1,4,25
+spawn:EnemyTwo,1,4,45
+spawn:EnemyTwo,1,4,65
+spawn:EnemyTwo,1,4,85
+spawn:EnemyTwo,1,4,100
+[5-6]
+spawn:EnemyTwo,1,6,15
+spawn:EnemyTwo,1,6,35
+spawn:EnemyTwo,1,6,55
+spawn:EnemyTwo,1,6,75
+spawn:EnemyTwo,1,6,95
+[6-7]
+spawn:EnemyTwo,1,4,5
+spawn:EnemyTwo,1,4,25
+spawn:EnemyTwo,1,4,45
+spawn:EnemyTwo,1,4,65
+spawn:EnemyTwo,1,4,85
+spawn:EnemyTwo,1,4,100
+[7-8]
+spawn:EnemyTwo,1,6,15
+spawn:EnemyTwo,1,6,35
+spawn:EnemyTwo,1,6,55
+spawn:EnemyTwo,1,6,75
+spawn:EnemyTwo,1,6,95
+[8-9]
+spawn:EnemyTwo,1,4,5
+spawn:EnemyTwo,1,4,25
+spawn:EnemyTwo,1,4,45
+spawn:EnemyTwo,1,4,65
+spawn:EnemyTwo,1,4,85
+spawn:EnemyTwo,1,4,100
+[9-10]
+spawn:EnemyTwo,1,6,15
+spawn:EnemyTwo,1,6,35
+spawn:EnemyTwo,1,6,55
+spawn:EnemyTwo,1,6,75
+spawn:EnemyTwo,1,6,95
+[10-12]
 spawn:StoneOne,2,1,0
 spawn:StoneOne,2,1,80
 spawn:StoneThree,2,1,90
 spawn:StoneThree,2,1,100
-[2-4]
+[12-14]
 spawn:EnemyOne,1,5,20
 spawn:StoneOne,4,5,50
-[4-10]
+[14-20]
 spawn:EnemyTwo,1,10,60
-[10-25]
+[20-35]
 spawn:EnemyThree,2,4,33
 spawn:EnemyTwo,5,6,10
-[25-30]
+[35-40]
 spawn:EnemyBoss,1,1,50
diff --git a/src/de/teamteamteam/spacescooter/control/Keyboard.java b/src/de/teamteamteam/spacescooter/control/Keyboard.java
index dcb3bc2..0b507ad 100644
--- a/src/de/teamteamteam/spacescooter/control/Keyboard.java
+++ b/src/de/teamteamteam/spacescooter/control/Keyboard.java
@@ -117,7 +117,7 @@ public class Keyboard implements KeyListener {
 		}
 		if(e.getKeyCode() == KeyEvent.VK_4) {
 			ArrayList<Point> points = new ArrayList<Point>();
-			points.add(new Point(398,306));;
+			points.add(new Point(398,306));
 			points.add(new Point(10,300));
 			new EnemyFour(700,51,points);
 		}
diff --git a/src/de/teamteamteam/spacescooter/entity/enemy/EnemyFour.java b/src/de/teamteamteam/spacescooter/entity/enemy/EnemyFour.java
index 36aa40c..42826f2 100644
--- a/src/de/teamteamteam/spacescooter/entity/enemy/EnemyFour.java
+++ b/src/de/teamteamteam/spacescooter/entity/enemy/EnemyFour.java
@@ -4,6 +4,8 @@ import java.awt.Point;
 import java.util.ArrayList;
 
 import de.teamteamteam.spacescooter.entity.explosion.ExplosionOne;
+import de.teamteamteam.spacescooter.entity.item.Item;
+import de.teamteamteam.spacescooter.utility.Random;
 
 public class EnemyFour extends Enemy{
 	
@@ -21,7 +23,8 @@ public class EnemyFour extends Enemy{
 		this.setImage("images/enemy01.png");
 		this.setPrimaryShotImage("images/shots/laser_yellow.png");
 		this.setShootSpeed(4);
-		this.setShootDelay(62);
+		this.setShootDelay(60);
+		this.setCanShoot(false);
 		this.setShootSpawn(-10, 10);
 		this.setShootDamage(5);
 		this.setCollisionDamage(5);
@@ -70,4 +73,13 @@ public class EnemyFour extends Enemy{
 		new ExplosionOne(this.getCenteredX(), this.getCenteredY());
 	}
 	
+	/**
+	 * This enemy spawns an Item on its death and causes another enemy to appear.
+	 */
+	@Override
+	public void die() {
+		if(Random.nextInt(100) < 5) Item.create(getX(), getY());
+		super.die();
+	}
+	
 }
diff --git a/src/de/teamteamteam/spacescooter/level/Level.java b/src/de/teamteamteam/spacescooter/level/Level.java
index e952002..b8c34f7 100644
--- a/src/de/teamteamteam/spacescooter/level/Level.java
+++ b/src/de/teamteamteam/spacescooter/level/Level.java
@@ -1,5 +1,8 @@
 package de.teamteamteam.spacescooter.level;
 
+import java.awt.Point;
+import java.util.ArrayList;
+
 import de.teamteamteam.spacescooter.background.CloudBackground;
 import de.teamteamteam.spacescooter.background.EarthBackground;
 import de.teamteamteam.spacescooter.background.StarBackground;
@@ -10,6 +13,7 @@ import de.teamteamteam.spacescooter.entity.Entity;
 import de.teamteamteam.spacescooter.entity.Player;
 import de.teamteamteam.spacescooter.entity.enemy.Enemy;
 import de.teamteamteam.spacescooter.entity.enemy.EnemyBoss;
+import de.teamteamteam.spacescooter.entity.enemy.EnemyFour;
 import de.teamteamteam.spacescooter.entity.enemy.EnemyOne;
 import de.teamteamteam.spacescooter.entity.enemy.EnemyThree;
 import de.teamteamteam.spacescooter.entity.enemy.EnemyTwo;
@@ -88,7 +92,7 @@ public final class Level {
 	 * show the level name in a LevelHeadline.
 	 */
 	public void doBuildUp() {
-		this.spawnEntityByAvailableName(Entity.availableNames.valueOf(this.config.background), 0, 50);
+		this.spawnEntityByAvailableName(Entity.availableNames.valueOf(this.config.background), 0, 50, null);
 		GameScreen.setPlayer(new Player(200, 300));
 		this.backgroundMusic = SoundSystem.playSound(this.config.backgroundMusic);
 		new LevelHeadline(100,100, this.config.name);
@@ -119,21 +123,30 @@ public final class Level {
 			 * - 2: Amount - The amount of Entities to spawn at a time.
 			 * - 3: SpawnRate - The rate at which the Entities are supposed to be spawned.
 			 * - 4: SpawnPosition - percentage of GameConfig.windowHeight - Where the Enemy shall spawn.
+			 * - 5: Points - points for EnemyFour
 			 */
-			for(int[] spawnRule : this.config.spawnRuleList) {
+			for(String[] spawnRule : this.config.spawnRuleList) {
 				//Skip spawn rules that are not in the current spawn interval.
-				if(spawnRule[0] != currentIntervalIndex) continue;
+				if(Integer.parseInt(spawnRule[0]) != currentIntervalIndex) continue;
 				//Divide the current interval by spawnrate
-				int intervalModulus = intervalLength / spawnRule[3];
+				int intervalModulus = intervalLength / Integer.parseInt(spawnRule[3]);
 				//Check whether the spawn rate strikes right now.
 				if(relativeTimeWithinCurrentInterval % Math.max(1,intervalModulus) == 0) {
 					//If the rule matches the current time, spawn the configured Entity in the configured amount:
-					for(int i=0; i<spawnRule[2]; i++) {
+					for(int i=0; i<Integer.parseInt(spawnRule[2]); i++) {
+						ArrayList<Point> points = null;
 						//Minus one because the upper border is _excluded_ from the range!
 						int x = GameConfig.gameScreenWidth + GameConfig.gameScreenXOffset - 1;
+						if (!spawnRule[5].equals("")) {
+							points = new ArrayList<Point>();
+							String [] lol = spawnRule[5].split(";");
+							for(int run = 0; run < lol.length; run = run+2) {
+								points.add(new Point(Integer.parseInt(lol[run]),Integer.parseInt(lol[run+1])));
+							}
+						}
 						//Minus one because the upper border is _excluded_ from the range!
-						int y = Math.round((GameConfig.gameScreenHeight * spawnRule[4]) / 100) + GameConfig.gameScreenYOffset - 1;
-						this.spawnEntityByAvailableName(Entity.availableNames.values()[spawnRule[1]], x, y);
+						int y = Math.round((GameConfig.gameScreenHeight * Integer.parseInt(spawnRule[4])) / 100) + GameConfig.gameScreenYOffset - 1;
+						this.spawnEntityByAvailableName(Entity.availableNames.values()[Integer.parseInt(spawnRule[1])], x, y, points);
 					}
 				}
 			}
@@ -210,7 +223,7 @@ public final class Level {
 	 * Spawn an Entity by name on the given position.
 	 * Uses Entity.availableNames to determine the actual Entity to spawn.
 	 */
-	private void spawnEntityByAvailableName(Entity.availableNames entity, int x, int y) {
+	private void spawnEntityByAvailableName(Entity.availableNames entity, int x, int y, ArrayList<Point> points) {
 		switch(entity) {
 			case StarBackground:
 				new StarBackground(x, y);
@@ -231,7 +244,7 @@ public final class Level {
 				new EnemyThree(x, y);
 				break;
 			case EnemyFour:
-				//TODO: FIX CONSTRUCTOR new EnemyFour(x, y);
+				new EnemyFour(x, y, points);
 				break;
 			case EnemyBoss:
 				new EnemyBoss(x, y);
@@ -250,5 +263,4 @@ public final class Level {
 				break;
 		}
 	}
-
 }
diff --git a/src/de/teamteamteam/spacescooter/level/LevelConfig.java b/src/de/teamteamteam/spacescooter/level/LevelConfig.java
index 72181a8..915641f 100644
--- a/src/de/teamteamteam/spacescooter/level/LevelConfig.java
+++ b/src/de/teamteamteam/spacescooter/level/LevelConfig.java
@@ -50,12 +50,12 @@ public class LevelConfig {
 	 * - 3: SpawnRate - The rate at which the Entities are supposed to be spawned.
 	 * - 4: SpawnPosition - percentage of GameConfig.windowHeight - Where the Enemy shall spawn.
 	 */
-	public List<int[]> spawnRuleList;
+	public List<String[]> spawnRuleList;
 	
 	
 	public LevelConfig() {
 		this.intervalList = new ArrayList<int[]>();
-		this.spawnRuleList = new ArrayList<int[]>();
+		this.spawnRuleList = new ArrayList<String[]>();
 	}
 	
 	public String toString() {
@@ -70,7 +70,7 @@ public class LevelConfig {
 		sb.append(" nextLevelName=");
 		sb.append(this.nextLevel);
 		sb.append("\\\n\tRules:\n");
-		for(int[] rule : this.spawnRuleList) {
+		for(String[] rule : this.spawnRuleList) {
 			sb.append("\t");
 			sb.append(rule);
 			sb.append("\n");
@@ -126,17 +126,19 @@ public class LevelConfig {
 	
 	/**
 	 * Add a given EntitySpawnRule to the ruleList.
+	 * @param wayPoints 
+	 * @param enemyWayPoints 
 	 */
-	public void addEntitySpawnRule(int intervalStart, int intervalEnd, String entityName, int amount, int spawnRate, int spawnPositionPercentage) {
+	public void addEntitySpawnRule(int intervalStart, int intervalEnd, String entityName, String amount, String spawnRate, String spawnPositionPercentage, String wayPoints) {
 		int intervalIndex = this.getIntervalIndexByBorders(intervalStart, intervalEnd);
 		if(intervalIndex == -1) {
 			throw new LevelConfigException("No Interval for rule found!\nRule: " + intervalStart + " to " + intervalEnd + ": " + entityName + ", " + amount + ", " + spawnRate + ", " + spawnPositionPercentage);
 		} else {
 			int enemyNumber = Entity.availableNames.valueOf(entityName).ordinal();
-			if(spawnPositionPercentage < 0 || spawnPositionPercentage > 100) {
+			if(Integer.parseInt(spawnPositionPercentage) < 0 || Integer.parseInt(spawnPositionPercentage) > 100) {
 				throw new LevelConfigException("Invalid spawnPosition percentage!\nRule: " + intervalStart + " to " + intervalEnd + ": " + entityName + ", " + amount + ", " + spawnRate + ", " + spawnPositionPercentage);
 			}
-			int[] newRule = {intervalIndex, enemyNumber, amount, spawnRate, spawnPositionPercentage};
+			String[] newRule = {""+intervalIndex, ""+enemyNumber, ""+amount, ""+spawnRate, ""+spawnPositionPercentage, wayPoints};
 			this.spawnRuleList.add(newRule);
 		}
 	}
diff --git a/src/de/teamteamteam/spacescooter/level/LevelConfigParser.java b/src/de/teamteamteam/spacescooter/level/LevelConfigParser.java
index 84727a0..96714bb 100644
--- a/src/de/teamteamteam/spacescooter/level/LevelConfigParser.java
+++ b/src/de/teamteamteam/spacescooter/level/LevelConfigParser.java
@@ -31,6 +31,11 @@ public class LevelConfigParser {
 	 */
 	private int currentIntervalStart;
 
+	/**
+	 * The start of the last read interval.
+	 */
+	private String wayPoints;
+	
 	/**
 	 * The end of the last read interval.
 	 */
@@ -88,14 +93,20 @@ public class LevelConfigParser {
 					} else {
 						String[] rule = line.split(":", 2);
 						if(rule[0].equals("spawn")) {
-							String[] entitySpawnRule = rule[1].split(",", 4);
+							String[] entitySpawnRule = rule[1].split(",", 5);
+							if (entitySpawnRule.length <= 4) {
+								wayPoints = "";
+							} else {
+								wayPoints = entitySpawnRule[4];
+							}
 							this.levelConfig.addEntitySpawnRule(
 								this.currentIntervalStart, 
 								this.currentIntervalEnd, 
 								entitySpawnRule[0], 
-								Integer.parseInt(entitySpawnRule[1]), 
-								Integer.parseInt(entitySpawnRule[2]), 
-								Integer.parseInt(entitySpawnRule[3])
+								entitySpawnRule[1], 
+								entitySpawnRule[2], 
+								entitySpawnRule[3],
+								wayPoints
 							);
 						} else {
 							throw new LevelConfigException("Unknown rule type: '"+rule[0]+"' : '"+line+"'");

From 061569a237e0fa29d2ae47d1fb0a6d7391a90753 Mon Sep 17 00:00:00 2001
From: ramapcsx2 <you@example.com>
Date: Tue, 9 Dec 2014 15:24:23 +0100
Subject: [PATCH 18/22] ja

---
 res/images/items/itemShotPowerUp.png | Bin 0 -> 1363 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 res/images/items/itemShotPowerUp.png

diff --git a/res/images/items/itemShotPowerUp.png b/res/images/items/itemShotPowerUp.png
new file mode 100644
index 0000000000000000000000000000000000000000..ccd20b9d0228b381dcf0d1ce436f22937136a8a1
GIT binary patch
literal 1363
zcmV-Z1+4msP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#24YJ`L;%kKVE|#_rZlVo000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^<`
z4H+=$8Gn-i000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}000E8Nkl<Z
zSi_~4!EaSX6vlsN`e-8*!b%rLS@;)NUBU`P5TqqRB~@aoF&I-5MJQ<(L=t07g(?J$
z#2O_k7=zL-ObFBk!jiCY<<<p37bZjuL3-zNac1V;2h?!oCNFQ^%zbmdIrE+GoMW_n
zUR!%gk`WcCFoY3hL;{j=^86-iv)?_vJi6|r+yF#EF&MLPHOACnPW`;W?hC-%>%UUo
zTm&k)5hWvKETd9L<Mh7FJ*2=77uGLoCoHzG`|0B{z)S>Fa(4IF(g_U8{GID!>zcD_
z1z_)nFO)a+7lc`?H#ZTovF2P8gi+Q5uyxHj-P09JZ2VmAT6giy-ij)~(T7G_k@cBt
z-?9Aaa_2-eWWL|*g{N#$0Q)w6rif8x02ot`z6`*niFVQQ<oo{p!mno%Q7v()8$>4$
z_HR0-C}A>!L6i!*OB3+Ks&)V_O*n|c1xu%uF}QkOa~IcH7l4{H5hM5=sy@yC^?(rx
z<{=z_XzFsi0lc^QsMH9fs^PBdD{gXS=?YFQd9f9MZGWDibG?tA8+}QzLYH7g1!ga<
zvrZ0$XaYIogSo3BV%fDm9=mpnF&!@=6Xo$;rFbvmlyspY5Vgz?WNCj1!!QKqo+)7%
zEH*-^9{V?h@|$|iqR%(=p{W;LSDHAGLY4Fzz&?ETP-1@Cu6YGX)yhfJJC(X!8X^5J
zAV_MM=A(P6xnInRDWijd$weayWFlaIh=_&W1r`Dv`2L$#9C&{CRr;^4B$^1S_j9ip
zAzei$AY>qsm@i_Agka)>({6Z<$yNXcPmBXFvi6-4Spk6zC7Y%MASUCMNSN;~3-KJ2
zY+-dP0CP+-$avy}pExG+1p)}7866{n^$;XCYniR2IT&QTy$2XCWOK#`Oq56nfDj#L
zd30RKpe$lCu)yBoZQNLTi@}-kRseQvA7RP$2ND$nQOT&uJ)N%G4i6oaWK^P?*;zC)
z>(z(`dWeFYw5le<)vXmiM^^#Uw9`qHz|3%Bs>mlwo-v$8&LL0)bAFVQrIY&O>rQ4P
zU`RQ-Am%zkBD^`f+k#PxhGmgx2#+$Th@(_PkaDt7Q8`z*T9{ny^8Q)4A}7vob}2SR
zdI(gOP~~%&xYfHr6=44(Z?)pUOMlF;^7noxbJhSe=b1$+S)GnUfJzMkQtgp_tCHbe
zms<h&dU^mJgwbEVb(hP-FP0Ln0pN|(V|HX{N+_l<@p~`++;tfqe!N{i-gOzK2TFLW
zly)A9U;Z@IT@M6PqKv;T879wIOb@j70Mi3W2b@D*<Tw{3-Mu6`x^+tNw$l5r{(tyw
z=}Kmn?`&oN^(&vU<nKOuZuXYMlT-Dv`R8oWqV&knl%z%<U;)KO220sa*lqD2JelE{
zuo7iWsc(oFpUiK!|18T#XUEJuNK;82q0|Vm<aLsq);&O4^MqV#g+N`R-)?--zF>5A
zk2Q;skc$Z#9}{)qR`&&%=*eVDK#j=ZbHmoEGa8-UV?oUdr&+w#;uFjXmc0>@Q00m!
znE2@I4!f`B^w8iz)%l^jA=Mp?YOVE?XI{C#=JamQfh`|<d){b7o8{KKKkjU`=f8sO
V>io|AHA?^h002ovPDHLkV1m$|X@LL$

literal 0
HcmV?d00001


From 6568fdd46af3f5dcac16782fb28c07de4a1b97a4 Mon Sep 17 00:00:00 2001
From: ramapcsx2 <you@example.com>
Date: Tue, 9 Dec 2014 15:29:38 +0100
Subject: [PATCH 19/22] balancing

---
 src/de/teamteamteam/spacescooter/entity/enemy/EnemyTwo.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/de/teamteamteam/spacescooter/entity/enemy/EnemyTwo.java b/src/de/teamteamteam/spacescooter/entity/enemy/EnemyTwo.java
index 67323bd..15c92a3 100644
--- a/src/de/teamteamteam/spacescooter/entity/enemy/EnemyTwo.java
+++ b/src/de/teamteamteam/spacescooter/entity/enemy/EnemyTwo.java
@@ -9,7 +9,7 @@ public class EnemyTwo extends Enemy{
 		this.setImage("images/enemy02.png");
 		this.setPrimaryShotImage("images/shots/laser_green.png");
 		this.setShootSpeed(4);
-		this.setShootDelay(62);
+		this.setShootDelay(120);
 		this.setShootSpawn(-10, 10);
 		this.setShootDamage(5);
 		this.setCollisionDamage(5);

From 571d990f91bb9e400c1a32c93d4ab407876e67d8 Mon Sep 17 00:00:00 2001
From: Jan Philipp Timme <jan.philipp@timme.it>
Date: Tue, 9 Dec 2014 15:30:40 +0100
Subject: [PATCH 20/22] Screens kommen jetzt in der korrekten Reihenfolge beim
 Spielen.

---
 src/de/teamteamteam/spacescooter/screen/GameScreen.java    | 7 ++++---
 src/de/teamteamteam/spacescooter/screen/GameWonScreen.java | 4 ++--
 .../teamteamteam/spacescooter/screen/HighscoreScreen.java  | 2 ++
 src/de/teamteamteam/spacescooter/screen/LoadingScreen.java | 1 -
 src/de/teamteamteam/spacescooter/screen/ShopScreen.java    | 4 ++--
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/de/teamteamteam/spacescooter/screen/GameScreen.java b/src/de/teamteamteam/spacescooter/screen/GameScreen.java
index 9584ac6..06a214b 100644
--- a/src/de/teamteamteam/spacescooter/screen/GameScreen.java
+++ b/src/de/teamteamteam/spacescooter/screen/GameScreen.java
@@ -94,10 +94,11 @@ public class GameScreen extends Screen {
 		if (this.level.isGameOver()) {
 			if(this.level.playerHasWon()) {
 				if(PlayerSession.getNextLevel() == null) {
-					System.out.println("You beat the game! TODO: Transition to HighscoreScreen now!");
+					this.parent.setOverlay(new HighscoreScreen(this.parent));
+				} else {
+					//Go to the I don't know yet Screen if the game is over and the player WON.
+					this.parent.setOverlay(new GameWonScreen(this.parent));
 				}
-				//Go to the I don't know yet Screen if the game is over and the player WON.
-				this.parent.setOverlay(new GameWonScreen(this.parent));
 			} else {
 				//Go to GameOverScreen if the game is over - the player died and lost the game.
 				this.parent.setOverlay(new GameOverScreen(this.parent));
diff --git a/src/de/teamteamteam/spacescooter/screen/GameWonScreen.java b/src/de/teamteamteam/spacescooter/screen/GameWonScreen.java
index f243742..58801bb 100644
--- a/src/de/teamteamteam/spacescooter/screen/GameWonScreen.java
+++ b/src/de/teamteamteam/spacescooter/screen/GameWonScreen.java
@@ -48,7 +48,7 @@ public class GameWonScreen extends Screen {
 		g.drawString("You win!", GameConfig.windowWidth/2-210, 200);
 		g.setFont(new Font("Monospace", 0, 20));
 		g.setColor(new Color(0, 0, 0));
-		g.drawString("Forwards Ever!", GameConfig.windowWidth/2-70, 332);
+		g.drawString("Weiter", GameConfig.windowWidth/2-70, 332);
 		g.drawString("Hauptmen\u00fc", GameConfig.windowWidth/2-60, 432);
 	}
 
@@ -88,7 +88,7 @@ public class GameWonScreen extends Screen {
 		} else if(this.animationStatus == 2) {
 			switch (this.menuPoint) {
 			case 0:
-				this.parent.setOverlay(new GameScreen(this.parent));
+				this.parent.setOverlay(new ShopScreen(this.parent));
 				break;
 			case 1:
 				this.parent.setOverlay(new MainMenuScreen(this.parent));
diff --git a/src/de/teamteamteam/spacescooter/screen/HighscoreScreen.java b/src/de/teamteamteam/spacescooter/screen/HighscoreScreen.java
index bdf57a4..e6deee2 100644
--- a/src/de/teamteamteam/spacescooter/screen/HighscoreScreen.java
+++ b/src/de/teamteamteam/spacescooter/screen/HighscoreScreen.java
@@ -12,6 +12,7 @@ import java.util.ArrayList;
 import java.util.Scanner;
 
 import de.teamteamteam.spacescooter.brain.GameConfig;
+import de.teamteamteam.spacescooter.brain.PlayerSession;
 import de.teamteamteam.spacescooter.control.Keyboard;
 import de.teamteamteam.spacescooter.entity.Player;
 import de.teamteamteam.spacescooter.gui.Button;
@@ -62,6 +63,7 @@ public class HighscoreScreen extends Screen{
 				this.playerMoveSpeed += 0.1;
 			} else this.animationStatus = 2;
 		} else if(this.animationStatus == 2) {
+			PlayerSession.reset(); //The player now entered his highscore, reset the PlayerSession now.
 			this.parent.setOverlay(new MainMenuScreen(this.parent));
 		}
 	}
diff --git a/src/de/teamteamteam/spacescooter/screen/LoadingScreen.java b/src/de/teamteamteam/spacescooter/screen/LoadingScreen.java
index d0f1a47..d1944d4 100644
--- a/src/de/teamteamteam/spacescooter/screen/LoadingScreen.java
+++ b/src/de/teamteamteam/spacescooter/screen/LoadingScreen.java
@@ -74,7 +74,6 @@ public class LoadingScreen extends Screen {
 		g.fillRect(0, 0, GameConfig.windowWidth, GameConfig.windowHeight);
 		g.setColor(Color.WHITE);
 		g.setFont(new Font("Monospace", 0, 50));
-		g.drawString("Loading ...", 100, 100);
 		g.drawString("Progress: " + this.getProgress() + "%", 200, 500);
 	}
 
diff --git a/src/de/teamteamteam/spacescooter/screen/ShopScreen.java b/src/de/teamteamteam/spacescooter/screen/ShopScreen.java
index 6bc9d03..da9f772 100644
--- a/src/de/teamteamteam/spacescooter/screen/ShopScreen.java
+++ b/src/de/teamteamteam/spacescooter/screen/ShopScreen.java
@@ -65,7 +65,7 @@ public class ShopScreen extends Screen {
 		g.drawString("Rocket", GameConfig.windowWidth / 2 - 110, 390);
 		g.drawString("Beam", GameConfig.windowWidth / 2 + 45, 390);
 		g.setColor(new Color(0, 0, 0));
-		g.drawString("Hauptmen\u00fc", GameConfig.windowWidth/2-55, 533);
+		g.drawString("Weiter", GameConfig.windowWidth/2-55, 533);
 	}
 
 	@Override
@@ -154,7 +154,7 @@ public class ShopScreen extends Screen {
 				this.playerMoveSpeed += 0.1;
 			} else this.animationStatus = 2;
 		} else if(this.animationStatus == 2) {
-			this.parent.setOverlay(new MainMenuScreen(this.parent));
+			this.parent.setOverlay(new GameScreen(this.parent));
 		}
 	}
 

From f08d5ef6f5c950ecd2e1fcb2390f565dff6c54b4 Mon Sep 17 00:00:00 2001
From: Jan Philipp Timme <jan.philipp@timme.it>
Date: Tue, 9 Dec 2014 15:43:24 +0100
Subject: [PATCH 21/22] LoadingScreen now much cooler 8-)

---
 .../spacescooter/screen/LoadingScreen.java          | 13 ++++++++++++-
 .../teamteamteam/spacescooter/utility/Loader.java   |  6 ++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/de/teamteamteam/spacescooter/screen/LoadingScreen.java b/src/de/teamteamteam/spacescooter/screen/LoadingScreen.java
index d1944d4..bbc1858 100644
--- a/src/de/teamteamteam/spacescooter/screen/LoadingScreen.java
+++ b/src/de/teamteamteam/spacescooter/screen/LoadingScreen.java
@@ -74,7 +74,18 @@ public class LoadingScreen extends Screen {
 		g.fillRect(0, 0, GameConfig.windowWidth, GameConfig.windowHeight);
 		g.setColor(Color.WHITE);
 		g.setFont(new Font("Monospace", 0, 50));
-		g.drawString("Progress: " + this.getProgress() + "%", 200, 500);
+		String text = "Loading ...";
+		g.drawString(text, (GameConfig.windowWidth - g.getFontMetrics().stringWidth(text))/2, 150);
+		text = this.getProgress() + "%";
+		g.drawString(text, (GameConfig.windowWidth - g.getFontMetrics().stringWidth(text))/2, GameConfig.windowHeight - 175);
+		int height = 75;
+		int width = GameConfig.windowWidth - 100;
+		int x = (GameConfig.windowWidth - width) / 2;
+		int y = GameConfig.windowHeight - 150;
+		int padding = 5;
+		g.drawRect(x - padding , y - padding, width + 2*padding, height + 2*padding);
+		g.setColor(Color.YELLOW);
+		g.fillRect(x, y, (int) (width * (this.getProgress() / 100.0)), height);
 	}
 
 	/**
diff --git a/src/de/teamteamteam/spacescooter/utility/Loader.java b/src/de/teamteamteam/spacescooter/utility/Loader.java
index 8d4b93b..81c676b 100644
--- a/src/de/teamteamteam/spacescooter/utility/Loader.java
+++ b/src/de/teamteamteam/spacescooter/utility/Loader.java
@@ -135,6 +135,12 @@ public class Loader {
 				Loader.addLevelByFilename(e);
 			}
 			loadingScreen.increaseCurrentProcessed();
+			//For the retro :D
+			try {
+				Thread.sleep(Random.nextInt(15));
+			} catch (InterruptedException e1) {
+				e1.printStackTrace();
+			}
 		}
 	}
 

From 52152eccc15c05e1994e5cf43bf5e09023cd256f Mon Sep 17 00:00:00 2001
From: Jan Philipp Timme <jan.philipp@timme.it>
Date: Tue, 9 Dec 2014 16:07:59 +0100
Subject: [PATCH 22/22] Add CreditsScreen Template.

---
 .../datastructure/ConcurrentLinkedList.java   |  2 +-
 .../spacescooter/screen/CreditsScreen.java    | 47 +++++++++++++++++++
 .../spacescooter/screen/MainMenuScreen.java   |  1 +
 .../spacescooter/screen/Screen.java           |  2 +
 4 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 src/de/teamteamteam/spacescooter/screen/CreditsScreen.java

diff --git a/src/de/teamteamteam/spacescooter/datastructure/ConcurrentLinkedList.java b/src/de/teamteamteam/spacescooter/datastructure/ConcurrentLinkedList.java
index 9a8b721..1ec4b9e 100644
--- a/src/de/teamteamteam/spacescooter/datastructure/ConcurrentLinkedList.java
+++ b/src/de/teamteamteam/spacescooter/datastructure/ConcurrentLinkedList.java
@@ -47,7 +47,7 @@ public class ConcurrentLinkedList<T> {
 		while(element.equals(currentNode.getValue()) == false && currentNode.hasNext()) {
 			currentNode = currentNode.next();
 		}
-		if(currentNode.getValue().equals(element)) {
+		if(currentNode.getValue() != null && currentNode.getValue().equals(element)) {
 			currentNode.setValue(null);
 			return;
 		}
diff --git a/src/de/teamteamteam/spacescooter/screen/CreditsScreen.java b/src/de/teamteamteam/spacescooter/screen/CreditsScreen.java
new file mode 100644
index 0000000..64fa6de
--- /dev/null
+++ b/src/de/teamteamteam/spacescooter/screen/CreditsScreen.java
@@ -0,0 +1,47 @@
+package de.teamteamteam.spacescooter.screen;
+
+import java.awt.Color;
+import java.awt.Font;
+import java.awt.Graphics2D;
+import java.awt.event.KeyEvent;
+
+import de.teamteamteam.spacescooter.brain.GameConfig;
+import de.teamteamteam.spacescooter.control.Keyboard;
+import de.teamteamteam.spacescooter.entity.enemy.EnemyOne;
+
+/**
+ * This is the Screen where you can look at all those awesome guys who created this game. :D
+ */
+public class CreditsScreen extends Screen {
+	
+	/**
+	 * Default Constructor
+	 */
+	public CreditsScreen(Screen parent) {
+		super(parent);
+	}
+	
+	/**
+	 * Draw the Credits :)
+	 */
+	@Override
+	protected void paint(Graphics2D g) {
+		g.setColor(new Color(0,0,120));
+		g.fillRect(0, 0, GameConfig.windowWidth, GameConfig.windowHeight);
+		g.setColor(Color.WHITE);
+		g.setFont(new Font("Monospace", 0, 50));
+		String text = "#yolo";
+		g.drawString(text, (GameConfig.windowWidth - g.getFontMetrics().stringWidth(text))/2, 150);
+	}
+
+	/**
+	 * In case the Loader is done, immediately fire up the MainMenuScreen.
+	 */
+	@Override
+	protected void update() {
+		if(Keyboard.isKeyDown(KeyEvent.VK_ENTER) || Keyboard.isKeyDown(KeyEvent.VK_SPACE)) {
+			this.parent.setOverlay(new MainMenuScreen(this.parent));
+		}
+ 	}
+
+}
diff --git a/src/de/teamteamteam/spacescooter/screen/MainMenuScreen.java b/src/de/teamteamteam/spacescooter/screen/MainMenuScreen.java
index 31c5394..bac1066 100644
--- a/src/de/teamteamteam/spacescooter/screen/MainMenuScreen.java
+++ b/src/de/teamteamteam/spacescooter/screen/MainMenuScreen.java
@@ -108,6 +108,7 @@ public class MainMenuScreen extends Screen {
 					this.parent.setOverlay(new HighscoreScreen(this.parent));
 					break;
 				case 3:
+					this.parent.setOverlay(new CreditsScreen(this.parent));
 					break;
 				case 4:
 					System.exit(0);
diff --git a/src/de/teamteamteam/spacescooter/screen/Screen.java b/src/de/teamteamteam/spacescooter/screen/Screen.java
index 09fb977..8f351ec 100644
--- a/src/de/teamteamteam/spacescooter/screen/Screen.java
+++ b/src/de/teamteamteam/spacescooter/screen/Screen.java
@@ -241,6 +241,8 @@ public abstract class Screen {
 		if(this.processSetOverlayCall) {
 			if(this.overlay != null) {
 				this.overlay.cleanup();
+			} else {
+				this.cleanup();
 			}
 			if(this.newOverlay == null) {
 				Screen.currentScreen = this;