From 5eec7ff7df3c2269ec1db676f704370c1db8c7e2 Mon Sep 17 00:00:00 2001
From: Sosch <F.Sosch@hotmail.de>
Date: Tue, 11 Nov 2014 14:57:01 +0100
Subject: [PATCH] Player kann nicht mehr in die interfaceBar fliegen

---
 src/de/teamteamteam/spacescooter/entity/Player.java           | 2 +-
 src/de/teamteamteam/spacescooter/entity/StaticValue.java      | 2 +-
 src/de/teamteamteam/spacescooter/entity/enemy/EnemyThree.java | 2 +-
 src/de/teamteamteam/spacescooter/screen/ShopScreen.java       | 1 -
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/de/teamteamteam/spacescooter/entity/Player.java b/src/de/teamteamteam/spacescooter/entity/Player.java
index d7290bf..58b5bcc 100644
--- a/src/de/teamteamteam/spacescooter/entity/Player.java
+++ b/src/de/teamteamteam/spacescooter/entity/Player.java
@@ -38,7 +38,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())) {
diff --git a/src/de/teamteamteam/spacescooter/entity/StaticValue.java b/src/de/teamteamteam/spacescooter/entity/StaticValue.java
index dde2b4c..c6958bb 100644
--- a/src/de/teamteamteam/spacescooter/entity/StaticValue.java
+++ b/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;
diff --git a/src/de/teamteamteam/spacescooter/entity/enemy/EnemyThree.java b/src/de/teamteamteam/spacescooter/entity/enemy/EnemyThree.java
index 5e8702d..7f13f41 100644
--- a/src/de/teamteamteam/spacescooter/entity/enemy/EnemyThree.java
+++ b/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();
 	}
diff --git a/src/de/teamteamteam/spacescooter/screen/ShopScreen.java b/src/de/teamteamteam/spacescooter/screen/ShopScreen.java
index 699e010..5bb6692 100644
--- a/src/de/teamteamteam/spacescooter/screen/ShopScreen.java
+++ b/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: