Score im EndScreen ist jetzt besser zentriert

# Conflicts:
#	SMIMS-Game/MyWorld.class
#	SMIMS-Game/SpikedPlattform.class
#	SMIMS-Game/SpikedPlattform.java
#	SMIMS-Game/project.greenfoot

SMIMS-Game/Enemy.java

@@ -34,9 +34,14 @@ public class Enemy extends Actor
     }
     
     public void shootAtPlayer(){
+        Player player = getWorld().getObjects(Player.class).get(0);
         shootTimer++;
+        if (player.getX() - getX() < 0){
+            setImage("Enemy.png");
+        } else if (player.getX() - getX() > 0){
+            setImage("EnemyRight.png");
+        }
         if (shootTimer >= 100){
-            Player player = getWorld().getObjects(Player.class).get(0);
             EnemyProjectile enemyProjectile = new EnemyProjectile();
             getWorld().addObject(enemyProjectile, getX(), getY());
             enemyProjectile.turnTowards(player.getX(), player.getY());

SMIMS-Game/EnemyProjectile.java

@@ -26,7 +26,7 @@ public class EnemyProjectile extends Projectile
             return false;
         }
         //Check X-Value
-        if (getX() <= 0 || getX() >= getWorld().getHeight()-1){
+        if (getX() <= 0 || getX() >= getWorld().getWidth()-1){
             return false;
         }
         return true;

SMIMS-Game/GameOverWorld.ctxt

@@ -1,10 +1,11 @@
 #BlueJ class context
 comment0.target=GameOverWorld
 comment0.text=\r\n\ Write\ a\ description\ of\ class\ GameOverWorld\ here.\r\n\ \r\n\ @author\ (your\ name)\ \r\n\ @version\ (a\ version\ number\ or\ a\ date)\r\n
-comment1.params=
+comment1.params=score
-comment1.target=GameOverWorld()
+comment1.target=GameOverWorld(int)
-comment1.text=\r\n\ Constructor\ for\ objects\ of\ class\ GameOverWorld.\r\n\ \r\n
 comment2.params=
 comment2.target=void\ prepare()
 comment2.text=\r\n\ Prepare\ the\ world\ for\ the\ start\ of\ the\ program.\r\n\ That\ is\:\ create\ the\ initial\ objects\ and\ add\ them\ to\ the\ world.\r\n
-numComments=3
+comment3.params=
+comment3.target=void\ showScore()
+numComments=4

SMIMS-Game/GameOverWorld.java

@@ -13,10 +13,12 @@ public class GameOverWorld extends World
      * Constructor for objects of class GameOverWorld.
      * 
      */
-    public GameOverWorld()
+    int score;
+    public GameOverWorld(int score)
     {    
         // Create a new world with 600x400 cells with a cell size of 1x1 pixels.
         super(400, 600, 1);
+        this.score = score;
         prepare();
     }
 
@@ -27,7 +29,16 @@ public class GameOverWorld extends World
     private void prepare()
     {
         Button button = new Button();
-        addObject(button,200,320);
+        addObject(button,200,520);
         button.setImage("Neustart.png");
+        showScore();
+    }
+    
+    public void showScore(){
+        Color hintergrundFarbe = new Color(0,0,0,0);
+        GreenfootImage scoreBild = new GreenfootImage("" + score, 75, Color.WHITE, hintergrundFarbe);
+        Score score3 = new Score();
+        addObject(score3,200,72);
+        score3.setImage(scoreBild);
     }
 }

SMIMS-Game/Groundflower.java

@@ -8,7 +8,7 @@ import greenfoot.*;  // (World, Actor, GreenfootImage, Greenfoot and MouseInfo)
  */
 public class Groundflower extends PowerUps
 {
-    int duration= 60*8; //15 Sekunden 
+    int duration= 60*4; //15 Sekunden 
     /**
      * Act - do whatever the StarPowerUp wants to do. This method is called whenever
      * the 'Act' or 'Run' button gets pressed in the environment.

SMIMS-Game/Healthbar.ctxt

@@ -1,8 +0,0 @@
-#BlueJ class context
-comment0.target=Healthbar
-comment0.text=\r\n\ Write\ a\ description\ of\ class\ Healthbar\ here.\r\n\ \r\n\ @author\ (your\ name)\ \r\n\ @version\ (a\ version\ number\ or\ a\ date)\r\n
-comment1.params=
-comment1.target=void\ act()
-comment2.params=
-comment2.target=void\ draw_health()
-numComments=3

SMIMS-Game/Healthbar.java

@@ -1,20 +0,0 @@
-import greenfoot.*;  // (World, Actor, GreenfootImage, Greenfoot and MouseInfo)
-
-/**
- * Write a description of class Healthbar here.
- * 
- * @author (your name) 
- * @version (a version number or a date)
- */
-public class Healthbar extends Actor
-{
-    public void act()
-    {
-        draw_health();
-    }
-    
-    public void draw_health(){
-        Player player = getWorld().getObjects(Player.class).get(0);
-        setImage(new GreenfootImage("Health:" + player.health, 24, Color.WHITE, Color.BLACK));
-    }
-}

SMIMS-Game/MovingPlattform.java

@@ -46,7 +46,7 @@ public class MovingPlattform extends Plattform
             Player DerSpieler = theWorld.getObjects(Player.class).get(0);
             if(DerSpieler!=null)
             {
-                DerSpieler.setLocation(DerSpieler.getX()+speed*3, DerSpieler.getY());
+                DerSpieler.setLocation(DerSpieler.getX()+speed*2, DerSpieler.getY());
             }
         }
     }

SMIMS-Game/MyWorld.ctxt

@@ -10,13 +10,15 @@ comment2.text=\r\n\ Prepare\ the\ world\ for\ the\ start\ of\ the\ program.\r\n\
 comment3.params=
 comment3.target=void\ act()
 comment4.params=
-comment4.target=void\ spawnItems()
+comment4.target=void\ drawNewHearts()
 comment5.params=
-comment5.target=void\ spawnEnemies()
+comment5.target=void\ spawnItems()
 comment6.params=
-comment6.target=void\ projectile()
+comment6.target=void\ spawnEnemies()
 comment7.params=
-comment7.target=void\ targetingProjectile()
+comment7.target=void\ projectile()
 comment8.params=
-comment8.target=void\ showScore()
+comment8.target=void\ targetingProjectile()
-numComments=9
+comment9.params=
+comment9.target=void\ showScore()
+numComments=10

SMIMS-Game/MyWorld.java

@@ -9,7 +9,7 @@ import greenfoot.*;  // (World, Actor, GreenfootImage, Greenfoot and MouseInfo)
 public class MyWorld extends World
 {
     int PlattformCountdown;
-    int timer = 300; //Zeit, bevor das erste Projektil auftaucht
+    int timer = 600; //Zeit, bevor das erste Projektil auftaucht
                      //kann später noch beliebig angepasst werden
     int targetTimer = 1000;
     int time = 0;
@@ -35,12 +35,12 @@ public class MyWorld extends World
     {
         Player player = new Player();
         addObject(player,302,320);
-        Score score = new Score();
-        addObject(score, 200, 30);
-        score.setImage("Score1.png");
         Score score1 = new Score();
-        addObject(score1, 200, 60);
+        addObject(score1, 200, 30);
-        score1.setImage("Score2.png");
+        score1.setImage("Score1.png");
+        Score score2 = new Score();
+        addObject(score2, 200, 60);
+        score2.setImage("Score2.png");
         Plattform plattform = new Plattform();
         addObject(plattform,285,577);
         plattform.setLocation(286,492);
@@ -58,8 +58,6 @@ public class MyWorld extends World
         plattform2.setLocation(320,367);
         plattform2.setLocation(312,371);
         plattform2.setLocation(308,382);
-        //Healthbar healthbar = new Healthbar();
-        //addObject(healthbar,50,50);
         Heart heart = new Heart();
         addObject(heart,371,27);
         Heart heart2 = new Heart();
@@ -67,7 +65,7 @@ public class MyWorld extends World
         Heart heart3 = new Heart();
         addObject(heart3,314,27);
 
-        addObject(new TemporaryGround(60*50), 200, 575);
+        addObject(new TemporaryGround(60*8), 200, 575);
     }
 
     public void act()
@@ -75,45 +73,61 @@ public class MyWorld extends World
         if (getObjects(Score.class).size() > 0){
             removeObjects(getObjects(Score.class));
         }
-        Score score = new Score();
-        addObject(score, 200, 30);
-        score.setImage("Score1.png");
         Score score1 = new Score();
-        addObject(score1, 200, 60);
+        addObject(score1, 200, 30);
-        score1.setImage("Score2.png");
+        score1.setImage("Score1.png");
+        Score score2 = new Score();
+        addObject(score2, 200, 60);
+        score2.setImage("Score2.png");
         showScore();
         projectile();
         spawnEnemies();
         targetingProjectile();
         spawnItems();
+        drawNewHearts();
         if(PlattformCountdown==0) //Damit in regelmäßigen Abständen auf jeden Fall eine Plattform auftaucht
         {
-            addObject(new Plattform(), Greenfoot.getRandomNumber(400), 5);
+            addObject(new Plattform(), 1+Greenfoot.getRandomNumber(398), 5);
             PlattformCountdown=50;
         }
         PlattformCountdown--;
         if(Greenfoot.getRandomNumber(100000)>=99800)
         {
-            addObject(new Plattform(), Greenfoot.getRandomNumber(400), 5);
+            addObject(new Plattform(), 1+Greenfoot.getRandomNumber(398), 5);
         }
         if(Greenfoot.getRandomNumber(100000)>=99900)
         {
-            addObject(new MovingPlattform(2), Greenfoot.getRandomNumber(400), 6); //Nach Rechts bewegende Plattform
+            addObject(new MovingPlattform(1), 1+Greenfoot.getRandomNumber(398), 6); //Nach Rechts bewegende Plattform
         }
         if(Greenfoot.getRandomNumber(100000)>=99900)
         {
-            addObject(new MovingPlattform(-2), Greenfoot.getRandomNumber(400), 6); //Nach Links bewegende Plattform
+            addObject(new MovingPlattform(-1), 1+Greenfoot.getRandomNumber(398), 6); //Nach Links bewegende Plattform
         }
         if(Greenfoot.getRandomNumber(100000)>=99750)
         {
-            addObject(new BreakingPlattform(50), Greenfoot.getRandomNumber(400), 6); //Nach Links bewegende Plattform
+            addObject(new BreakingPlattform(50), 1+Greenfoot.getRandomNumber(398), 6); //Nach Links bewegende Plattform
         }
         if(Greenfoot.getRandomNumber(100000)>=99750)
         {
-            addObject(new SpikedPlattform(100), Greenfoot.getRandomNumber(400), 6); //Nach Links bewegende Plattform
+            addObject(new SpikedPlattform(40), 1+Greenfoot.getRandomNumber(398), 6); //Nach Links bewegende Plattform
         }
     }
     
+    public void drawNewHearts(){
+        Player player = getObjects(Player.class).get(0);
+        removeObjects(getObjects(Heart.class));
+        Heart heart = new Heart();
+        addObject(heart,371,27);
+        if (player.health >= 2){
+            Heart heart2 = new Heart();
+            addObject(heart2,343,27);
+        }
+        if (player.health == 3){
+            Heart heart3 = new Heart();
+            addObject(heart3,314,27);
+        }
+    }
+
     public void spawnItems(){
         itemTimer++;
         if (itemTimer >= 575){
@@ -148,7 +162,7 @@ public class MyWorld extends World
         if(timer == 0){
             Projectile projectile = new Projectile();
             addObject(projectile,Greenfoot.getRandomNumber(300)+50,0);
-            timer = 300; //zeitlicher Abstand
+            timer = 600; //zeitlicher Abstand
         }
         else{
             timer = timer - 1;
@@ -171,4 +185,5 @@ public class MyWorld extends World
         score = time/60;
         showText("" + score, 200, 60);
     }
+    
 }

SMIMS-Game/Plattform.java

@@ -40,10 +40,10 @@ public class Plattform extends Actor
 
     public boolean PlayerOnPlattform()
     {
-        Player Spieler= (Player) getOneIntersectingObject(Player.class);       
+        Player Spieler= (Player) this.getWorld().getObjects(Player.class).get(0);   
-        if(this.isTouching(Player.class))
+        if(Spieler.getX()+(Spieler.getImage().getWidth()/2)>=this.getX()-(this.getImage().getWidth()/2) && Spieler.getX()-(Spieler.getImage().getWidth()/2)<=this.getX()+(this.getImage().getWidth()/2))
         {
-            if(Spieler.getY()<this.getY()-39)
+            if(Spieler.getY()+(Spieler.getImage().getHeight()/2)<=this.getY()-(this.getImage().getHeight()/2) && Spieler.getY()+(Spieler.getImage().getHeight()/2)>=this.getY()-(this.getImage().getHeight()/2))
             {
                 return true;
             }

SMIMS-Game/Player.ctxt

@@ -3,6 +3,8 @@ comment0.target=Player
 comment0.text=\r\n\ Write\ a\ description\ of\ class\ Player\ here.\r\n\ \r\n\ @author\ (your\ name)\ \r\n\ @version\ (a\ version\ number\ or\ a\ date)\r\n
 comment1.params=
 comment1.target=void\ act()
+comment10.params=
+comment10.target=void\ playerRotation()
 comment2.params=
 comment2.target=void\ moveLeftAndRight()
 comment3.params=
@@ -19,4 +21,4 @@ comment8.params=
 comment8.target=void\ handlePowerUps()
 comment9.params=duration\ type
 comment9.target=void\ receivePowerUp(int,\ java.lang.String)
-numComments=10
+numComments=11

SMIMS-Game/Player.java

@@ -12,7 +12,7 @@ public class Player extends Actor
     int health = MAX_HEALTH;
 
     int jumpBoostDuration = -1;
-    int jumpBoostStrength = 5;
+    int jumpBoostStrength = 3;
 
     boolean projectileReady = false;
     int projectileTimer;
@@ -34,10 +34,12 @@ public class Player extends Actor
         handlePowerUps();
         shootProjectile();
         checkHealth();
+        playerRotation();
 
         //Check ob der Spieler am unteren Fensterrand ist
         if (getY()+1 >= getWorld().getHeight()){
-            Greenfoot.setWorld(new GameOverWorld());
+            MyWorld world = (MyWorld) getWorld();
+            Greenfoot.setWorld(new GameOverWorld(world.score));
         }
         //Check ob der Spieler an der Seite vom Fenster ist
         if (getX() <= 0){
@@ -53,11 +55,13 @@ public class Player extends Actor
         if (Greenfoot.isKeyDown("a"))
         {
             setLocation(getX() - speed, getY());
+            setImage("Player.png");
         }
 
         if (Greenfoot.isKeyDown("d"))
         {
             setLocation(getX() + speed, getY());
+            setImage("Player.png");
         }
     }
 
@@ -119,21 +123,13 @@ public class Player extends Actor
             getWorld().removeObjects(getIntersectingObjects(Projectile.class));
             getWorld().removeObjects(getIntersectingObjects(Enemy.class));
             getWorld().removeObjects(getWorld().getObjects(Spike.class));
-
-            getWorld().removeObjects(getIntersectingObjects(Spike.class));
-            if (getWorld().getObjects(Heart.class) != null){
-                if (health == 2){
-                    getWorld().getObjects(Heart.class).get(2).setImage("a.png");
-                } else if (health == 1){
-                    getWorld().getObjects(Heart.class).get(1).setImage("a.png");
-                }
-            }
         }
     }
 
     public void checkHealth(){
         if (health <= 0){
-            Greenfoot.setWorld(new GameOverWorld());
+            MyWorld world = (MyWorld) getWorld();
+            Greenfoot.setWorld(new GameOverWorld(world.score));
         }
     }
 
@@ -156,11 +152,6 @@ public class Player extends Actor
                 break;
             case "Heal":
                 if (health < MAX_HEALTH){
-                    if (health == 2){
-                        getWorld().getObjects(Heart.class).get(2).setImage("Health.png");
-                    } else if (health == 1){
-                        getWorld().getObjects(Heart.class).get(1).setImage("Health.png");
-                    }
                     health++;
                 }
                 break;
@@ -177,4 +168,13 @@ public class Player extends Actor
                 break;
         }
     }
+    
+    public void playerRotation(){
+        if(Greenfoot.isKeyDown("a")){
+            setImage("PlayerLeft.png");
+        }
+        if(Greenfoot.isKeyDown("d")){
+            setImage("Player.png");
+        }
+    }
 }

SMIMS-Game/SpikedPlattform.java

@@ -36,10 +36,6 @@ public class SpikedPlattform extends Plattform
         {
             this.spikeTheSurface();
         }
-        if(isSpiked && this.PlayerOnPlattform())
-        {
-            Greenfoot.setWorld(new GameOverWorld());
-        }
         super.act();
     }
 

SMIMS-Game/StartWorld.java

@@ -26,7 +26,7 @@ public class StartWorld extends World
     private void prepare()
     {
         Button button = new Button();
-        addObject(button,200,320);
+        addObject(button,200,310);
         button.setImage("Start.png");
     }
 }

SMIMS-Game/TemporaryGround.java

@@ -41,14 +41,14 @@ public class TemporaryGround extends Plattform
 
     public void warning()
     {
-        this.setImage("TemporaryIsBreaking.png");
+        this.setImage("BreakingGround.png");
         warningHasHappend=true;
         deWarningHasHappend=false;
     }
 
     public void noMoreWarning()
     {
-        this.setImage("TemporaryGround.png");
+        this.setImage("Ground.png");
         warningHasHappend=false;
         deWarningHasHappend=true;
     }
@@ -64,7 +64,7 @@ public class TemporaryGround extends Plattform
             Player player= this.getWorld().getObjects(Player.class).get(0);
             if(this.intersects(player))
             {
-                player.setLocation(player.getX(), this.getY()-this.getImage().getHeight());
+                player.setLocation(player.getX(), this.getY()-this.getImage().getHeight()-5);
             }
         }
     }

SMIMS-Game/project.greenfoot

@@ -1,9 +1,9 @@
 #Greenfoot project file
 class.BreakingPlattform.image=Breaking1.png
 class.Button.image=button-red.png
-class.Enemy.image=bee.png
+class.Enemy.image=Enemy.png
-class.EnemyProjectile.image=yellow-draught.png
+class.EnemyProjectile.image=EnemyProjectile.png
-class.GameOverWorld.image=GameOverBackground.png
+class.GameOverWorld.image=JUMP\ \u2018N\u2019\ RUNj.png
 class.Ground.image=weave.jpg
 class.Groundflower.image=flower2.png
 class.HealthItem.image=Health.png
@@ -13,14 +13,14 @@ class.MovingPlattform.image=Platform1.png
 class.MyWorld.image=GameBackground.png
 class.Plattform.image=Platform1.png
 class.Player.image=Player.png
-class.PlayerProjectile.image=beeper.png
+class.PlayerProjectile.image=PlayerProjectile.png
 class.Projectile.image=Projectile1.png
 class.Spike.image=singleSpike.png
 class.SpikedPlattform.image=Spikes2.png
 class.StartWorld.image=StartBackground.png
-class.TargetingProjectile.image=blue-draught.png
+class.TargetingProjectile.image=TargetProjectile.png
-class.TemporaryGround.image=TemporaryGround.png
+class.TemporaryGround.image=Ground.png
-class.UnactiveSpike.image=inactiveSpike.png
+class.UnactiveSpike.image=Spike_Copy.png
 dependency1.from=PlayerTestWorld
 dependency1.to=Ground
 dependency1.type=UsesDependency
@@ -51,114 +51,108 @@ dependency17.type=UsesDependency
 dependency18.from=GameOverWorld
 dependency18.to=Button
 dependency18.type=UsesDependency
-dependency19.from=StartWorld
+dependency19.from=GameOverWorld
-dependency19.to=Button
+dependency19.to=Score
 dependency19.type=UsesDependency
 dependency2.from=PlayerTestWorld
 dependency2.to=Player
 dependency2.type=UsesDependency
-dependency20.from=UnactiveSpike
+dependency20.from=StartWorld
-dependency20.to=SpikedPlattform
+dependency20.to=Button
 dependency20.type=UsesDependency
 dependency21.from=UnactiveSpike
-dependency21.to=MyWorld
+dependency21.to=SpikedPlattform
 dependency21.type=UsesDependency
 dependency22.from=UnactiveSpike
-dependency22.to=Spike
+dependency22.to=MyWorld
 dependency22.type=UsesDependency
-dependency23.from=Button
+dependency23.from=UnactiveSpike
-dependency23.to=MyWorld
+dependency23.to=Spike
 dependency23.type=UsesDependency
-dependency24.from=PowerUps
+dependency24.from=Button
-dependency24.to=Player
+dependency24.to=MyWorld
 dependency24.type=UsesDependency
-dependency25.from=HealthItem
+dependency25.from=PowerUps
 dependency25.to=Player
 dependency25.type=UsesDependency
-dependency26.from=JumpBoostItem
+dependency26.from=HealthItem
 dependency26.to=Player
 dependency26.type=UsesDependency
-dependency27.from=Groundflower
+dependency27.from=JumpBoostItem
 dependency27.to=Player
 dependency27.type=UsesDependency
-dependency28.from=Enemy
+dependency28.from=Groundflower
 dependency28.to=Player
 dependency28.type=UsesDependency
 dependency29.from=Enemy
-dependency29.to=EnemyProjectile
+dependency29.to=Player
 dependency29.type=UsesDependency
 dependency3.from=PlayerTestWorld
 dependency3.to=JumpBoostItem
 dependency3.type=UsesDependency
-dependency30.from=Spike
+dependency30.from=Enemy
-dependency30.to=MyWorld
+dependency30.to=EnemyProjectile
 dependency30.type=UsesDependency
-dependency31.from=Player
+dependency31.from=Spike
-dependency31.to=GameOverWorld
+dependency31.to=MyWorld
 dependency31.type=UsesDependency
 dependency32.from=Player
-dependency32.to=Plattform
+dependency32.to=GameOverWorld
 dependency32.type=UsesDependency
 dependency33.from=Player
-dependency33.to=PlayerProjectile
+dependency33.to=Plattform
 dependency33.type=UsesDependency
 dependency34.from=Player
-dependency34.to=TemporaryGround
+dependency34.to=PlayerProjectile
 dependency34.type=UsesDependency
 dependency35.from=Player
-dependency35.to=Projectile
+dependency35.to=TemporaryGround
 dependency35.type=UsesDependency
 dependency36.from=Player
-dependency36.to=Enemy
+dependency36.to=Projectile
 dependency36.type=UsesDependency
 dependency37.from=Player
-dependency37.to=Spike
+dependency37.to=Enemy
 dependency37.type=UsesDependency
 dependency38.from=Player
-dependency38.to=Heart
+dependency38.to=Spike
 dependency38.type=UsesDependency
-dependency39.from=Healthbar
+dependency39.from=Plattform
-dependency39.to=Player
+dependency39.to=MyWorld
 dependency39.type=UsesDependency
 dependency4.from=MyWorld
 dependency4.to=Player
 dependency4.type=UsesDependency
 dependency40.from=Plattform
-dependency40.to=MyWorld
+dependency40.to=Player
 dependency40.type=UsesDependency
-dependency41.from=Plattform
+dependency41.from=MovingPlattform
-dependency41.to=Player
+dependency41.to=MyWorld
 dependency41.type=UsesDependency
 dependency42.from=MovingPlattform
-dependency42.to=MyWorld
+dependency42.to=Player
 dependency42.type=UsesDependency
-dependency43.from=MovingPlattform
+dependency43.from=TemporaryGround
 dependency43.to=Player
 dependency43.type=UsesDependency
-dependency44.from=TemporaryGround
+dependency44.from=SpikedPlattform
-dependency44.to=Player
+dependency44.to=Spike
 dependency44.type=UsesDependency
 dependency45.from=SpikedPlattform
-dependency45.to=Spike
+dependency45.to=MyWorld
 dependency45.type=UsesDependency
 dependency46.from=SpikedPlattform
-dependency46.to=GameOverWorld
+dependency46.to=UnactiveSpike
 dependency46.type=UsesDependency
-dependency47.from=SpikedPlattform
+dependency47.from=TargetingProjectile
-dependency47.to=MyWorld
+dependency47.to=Player
 dependency47.type=UsesDependency
-dependency48.from=SpikedPlattform
+dependency48.from=PlayerProjectile
-dependency48.to=UnactiveSpike
+dependency48.to=Enemy
 dependency48.type=UsesDependency
-dependency49.from=TargetingProjectile
-dependency49.to=Player
-dependency49.type=UsesDependency
 dependency5.from=MyWorld
 dependency5.to=Score
 dependency5.type=UsesDependency
-dependency50.from=PlayerProjectile
-dependency50.to=Enemy
-dependency50.type=UsesDependency
 dependency6.from=MyWorld
 dependency6.to=Plattform
 dependency6.type=UsesDependency
@@ -171,13 +165,13 @@ dependency8.type=UsesDependency
 dependency9.from=MyWorld
 dependency9.to=MovingPlattform
 dependency9.type=UsesDependency
-editor.fx.0.height=737
+editor.fx.0.height=607
-editor.fx.0.width=814
+editor.fx.0.width=1092
-editor.fx.0.x=668
+editor.fx.0.x=223
-editor.fx.0.y=120
+editor.fx.0.y=111
-height=830
+height=814
-package.numDependencies=50
+package.numDependencies=48
-package.numTargets=26
+package.numTargets=25
 project.charset=UTF-8
 publish.hasSource=false
 publish.locked=true
@@ -249,21 +243,21 @@ target16.width=120
 target16.x=0
 target16.y=0
 target17.height=70
-target17.name=Healthbar
+target17.name=BreakingPlattform
 target17.showInterface=false
 target17.type=ClassTarget
 target17.width=120
 target17.x=0
 target17.y=0
 target18.height=70
-target18.name=BreakingPlattform
+target18.name=GameOverWorld
 target18.showInterface=false
 target18.type=ClassTarget
 target18.width=120
 target18.x=0
 target18.y=0
 target19.height=70
-target19.name=GameOverWorld
+target19.name=StartWorld
 target19.showInterface=false
 target19.type=ClassTarget
 target19.width=120
@@ -277,54 +271,47 @@ target2.width=120
 target2.x=0
 target2.y=0
 target20.height=70
-target20.name=StartWorld
+target20.name=Plattform
 target20.showInterface=false
 target20.type=ClassTarget
 target20.width=120
 target20.x=0
 target20.y=0
 target21.height=70
-target21.name=Plattform
+target21.name=Projectile
 target21.showInterface=false
 target21.type=ClassTarget
 target21.width=120
 target21.x=0
 target21.y=0
 target22.height=70
-target22.name=Projectile
+target22.name=Score
 target22.showInterface=false
 target22.type=ClassTarget
 target22.width=120
 target22.x=0
 target22.y=0
 target23.height=70
-target23.name=Score
+target23.name=EnemyProjectile
 target23.showInterface=false
 target23.type=ClassTarget
 target23.width=120
 target23.x=0
 target23.y=0
 target24.height=70
-target24.name=EnemyProjectile
+target24.name=PlayerProjectile
 target24.showInterface=false
 target24.type=ClassTarget
 target24.width=120
 target24.x=0
 target24.y=0
 target25.height=70
-target25.name=PlayerProjectile
+target25.name=SpikedPlattform
 target25.showInterface=false
 target25.type=ClassTarget
 target25.width=120
 target25.x=0
 target25.y=0
-target26.height=70
-target26.name=SpikedPlattform
-target26.showInterface=false
-target26.type=ClassTarget
-target26.width=120
-target26.x=0
-target26.y=0
 target3.height=70
 target3.name=Ground
 target3.showInterface=false
@@ -375,7 +362,7 @@ target9.width=120
 target9.x=0
 target9.y=0
 version=3.1.0
-width=1550
+width=1534
 world.lastInstantiated=StartWorld
 xPosition=0
-yPosition=0
+yPosition=117