diff --git a/SuperPangWorld/src/de/thdeg/greiner/superpangworld/game/managers/GamePlayManager.java b/SuperPangWorld/src/de/thdeg/greiner/superpangworld/game/managers/GamePlayManager.java index 5aec58f..c181645 100644 --- a/SuperPangWorld/src/de/thdeg/greiner/superpangworld/game/managers/GamePlayManager.java +++ b/SuperPangWorld/src/de/thdeg/greiner/superpangworld/game/managers/GamePlayManager.java @@ -76,6 +76,7 @@ public class GamePlayManager { System.exit(-1); } player = new Player(level); + player.score = 1000000; gameObjectManager.getPlayerObject().setGamePlayManager(this); } diff --git a/SuperPangWorld/src/de/thdeg/greiner/superpangworld/game/managers/LevelManager.java b/SuperPangWorld/src/de/thdeg/greiner/superpangworld/game/managers/LevelManager.java index 36d9167..7abd63d 100644 --- a/SuperPangWorld/src/de/thdeg/greiner/superpangworld/game/managers/LevelManager.java +++ b/SuperPangWorld/src/de/thdeg/greiner/superpangworld/game/managers/LevelManager.java @@ -69,7 +69,7 @@ public class LevelManager { private List loadBackgroundImages(){ List images = new ArrayList<>(); for(int i=1;i<=BACKGROUND_IMAGE_COUNT;i++){ - images.add("backgrounds/background_"+i+".png"); + images.add("background_"+i+".png"); } return images; } diff --git a/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/base/Bubble.java b/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/base/Bubble.java index 488a233..3a3ac98 100644 --- a/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/base/Bubble.java +++ b/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/base/Bubble.java @@ -137,9 +137,7 @@ public abstract class Bubble extends CollidingGameObject implements MovingGameOb * * @return the score to add */ - public int getBurstScore(){ - return (int)(size*1000); - } + public abstract int getBurstScore(); /** * Get the size of the bubble. diff --git a/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/immovable/Background.java b/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/immovable/Background.java index afab1aa..7d81dbc 100644 --- a/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/immovable/Background.java +++ b/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/immovable/Background.java @@ -20,7 +20,7 @@ public class Background extends GameObject { this.position.setTo(0,0); size = 1; rotation = 0; - backgroundImage = "backgrounds/background_1.png"; + backgroundImage = "background_1.png"; } @Override diff --git a/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/immovable/LevelLabel.java b/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/immovable/LevelLabel.java index ddb9933..f0eaa1e 100644 --- a/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/immovable/LevelLabel.java +++ b/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/immovable/LevelLabel.java @@ -20,11 +20,11 @@ public class LevelLabel extends GameObject { */ public LevelLabel(GameView gameView){ super(gameView); - size = 3; - width = 101; + size = 1; + width = 109; height = 8; level = 1; - getPosition().setTo(GameView.WIDTH/2.0 - (width/2.0),GameView.HEIGHT-height-60); + getPosition().setTo(GameView.WIDTH/2.0 - width,GameView.HEIGHT-height-60); } /** diff --git a/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/immovable/LevelProgressBar.java b/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/immovable/LevelProgressBar.java index b3d36bf..ecfb873 100644 --- a/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/immovable/LevelProgressBar.java +++ b/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/immovable/LevelProgressBar.java @@ -24,7 +24,7 @@ public class LevelProgressBar extends GameObject { width = 101; height = 8; levelProgress = 0; - getPosition().setTo(GameView.WIDTH/2.0 - (width/2.0),GameView.HEIGHT-(height*size)); + getPosition().setTo(GameView.WIDTH/2.0 - width,GameView.HEIGHT-(height*size)); } /** diff --git a/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/immovable/LivesLabel.java b/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/immovable/LivesLabel.java index 46e2fd1..fd56db6 100644 --- a/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/immovable/LivesLabel.java +++ b/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/immovable/LivesLabel.java @@ -8,17 +8,7 @@ import de.thdeg.greiner.superpangworld.graphics.base.GameObject; */ public class LivesLabel extends GameObject { - private final static String ICON = - " RR RR \n"+ - " RRRR RRRR \n"+ - "RRRRRRRRRRR\n"+ - "RRRRRRRRRRR\n"+ - " RRRRRRRRR \n"+ - " RRRRRRR \n"+ - " RRRRR \n"+ - " RRR \n"+ - " R \n"; - + /** Lives count */ private int lifeCount; /** @@ -29,19 +19,19 @@ public class LivesLabel extends GameObject { public LivesLabel(GameView gameView) { super(gameView); rotation = 0; - size = 5; - width = 12; - height = 12; + size = 2; + width = (int) size * 12; + height = (int) size * 12; this.lifeCount = 0; - position.setTo(0,GameView.HEIGHT-50); + position.setTo(10,GameView.HEIGHT - height - 5); } @Override public void addToCanvas() { for(int i=0;i