diff --git a/res/sounds/abgang.wav b/res/sounds/abgang.wav index 6f8ffa3..4983d5a 100644 Binary files a/res/sounds/abgang.wav and b/res/sounds/abgang.wav differ diff --git a/res/sounds/bad_explosion1.wav b/res/sounds/bad_explosion1.wav index 115044f..391a2c0 100644 Binary files a/res/sounds/bad_explosion1.wav and b/res/sounds/bad_explosion1.wav differ diff --git a/res/sounds/bad_explosion2.wav b/res/sounds/bad_explosion2.wav index ffaff66..e26beb2 100644 Binary files a/res/sounds/bad_explosion2.wav and b/res/sounds/bad_explosion2.wav differ diff --git a/res/sounds/powerup_pickup.wav b/res/sounds/powerup_pickup.wav index a1b7aba..29be7ab 100644 Binary files a/res/sounds/powerup_pickup.wav and b/res/sounds/powerup_pickup.wav differ diff --git a/res/sounds/shot_hit_something.wav b/res/sounds/shot_hit_something.wav index 2adaa7b..fae4312 100644 Binary files a/res/sounds/shot_hit_something.wav and b/res/sounds/shot_hit_something.wav differ diff --git a/res/sounds/shot_hit_something_loud.wav b/res/sounds/shot_hit_something_loud.wav index 3080cef..a17c69c 100644 Binary files a/res/sounds/shot_hit_something_loud.wav and b/res/sounds/shot_hit_something_loud.wav differ diff --git a/src/de/teamteamteam/spacescooter/entity/Player.java b/src/de/teamteamteam/spacescooter/entity/Player.java index 8547211..689594b 100644 --- a/src/de/teamteamteam/spacescooter/entity/Player.java +++ b/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())) { 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: