Merge branch 'master' of /home/stud/timmeja/SpaceScooter

src/de/teamteamteam/spacescooter/entity/Player.java

@@ -46,7 +46,7 @@ public class Player extends ShootingEntity implements KeyboardListener {
 		if(this.canMove()) {
 			super.update();
 			int offset = 3;
-			if(Keyboard.isKeyDown(KeyEvent.VK_UP) && this.getY() > 0) {
+			if(Keyboard.isKeyDown(KeyEvent.VK_UP) && this.getY() > 51) {
 				this.transpose(0, -1 * offset);
 			}
 			if(Keyboard.isKeyDown(KeyEvent.VK_DOWN) && this.getY() < (GameConfig.windowHeight - this.getImage().getHeight())) {

src/de/teamteamteam/spacescooter/entity/StaticValue.java

@@ -10,7 +10,7 @@ public class StaticValue {
 	public static int ShieldPoints = 100;
 	
 	/**
-	 * Values for the Shop
+	 * Values for the shop
 	 */
 	public static int schaden = 0;
 	public static int schild = 0;

src/de/teamteamteam/spacescooter/entity/enemy/EnemyThree.java

@@ -26,7 +26,7 @@ public class EnemyThree extends Enemy{
 		this.setHealthPoints(15);
 		this.setCollisionDamage(10);
 		this.setScore(30);
-		this.setPosition(GameConfig.windowWidth, Random.nextInt(GameConfig.windowHeight - this.getHeight()));
+		this.setPosition(GameConfig.windowWidth, Random.nextInt(GameConfig.windowHeight - this.getHeight() - 50) +50);
 		this.newY = this.getY();
 		this.entityIterator = Screen.currentScreen.createEntityIterator();
 	}

src/de/teamteamteam/spacescooter/screen/ShopScreen.java

@@ -81,7 +81,6 @@ public class ShopScreen extends Screen {
 					StaticValue.ShootDamage += 5;
 					StaticValue.schaden++;
 					Credits.setCredits(Credits.getCredits() - 5);
-					System.out.println(schaden.getGekauft());
 				}
 				break;
 			case 1: