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(){
-        shootTimer++;
-        if (shootTimer >= 100){
         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){
             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.target=GameOverWorld()
-comment1.text=\r\n\ Constructor\ for\ objects\ of\ class\ GameOverWorld.\r\n\ \r\n
+comment1.params=score
+comment1.target=GameOverWorld(int)
 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/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()
-numComments=9
+comment8.target=void\ targetingProjectile()
+comment9.params=
+comment9.target=void\ showScore()
+numComments=10

SMIMS-Game/MyWorld.java

@@ -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);
-        score1.setImage("Score2.png");
+        addObject(score1, 200, 30);
+        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);
@@ -65,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()
@@ -73,17 +73,18 @@ 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);
-        score1.setImage("Score2.png");
+        addObject(score1, 200, 30);
+        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(), 1+Greenfoot.getRandomNumber(398), 5);
@@ -106,6 +107,25 @@ public class MyWorld extends World
         {
             addObject(new BreakingPlattform(50), 1+Greenfoot.getRandomNumber(398), 6); //Nach Links bewegende Plattform
         }
+        if(Greenfoot.getRandomNumber(100000)>=99750)
+        {
+            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(){
@@ -165,4 +185,5 @@ public class MyWorld extends World
         score = time/60;
         showText("" + score, 200, 60);
     }
+    
 }

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;
@@ -38,7 +38,8 @@ public class Player extends Actor
 
         //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){
@@ -54,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");
         }
     }
 
@@ -120,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));
         }
     }
 
@@ -157,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;

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

@@ -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

@@ -3,7 +3,7 @@ class.BreakingPlattform.image=Breaking1.png
 class.Button.image=button-red.png
 class.Enemy.image=Enemy.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
@@ -20,7 +20,7 @@ class.SpikedPlattform.image=Spikes2.png
 class.StartWorld.image=StartBackground.png
 class.TargetingProjectile.image=TargetProjectile.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
@@ -28,115 +28,115 @@ dependency10.from=MyWorld
 dependency10.to=BreakingPlattform
 dependency10.type=UsesDependency
 dependency11.from=MyWorld
-dependency11.to=Groundflower
+dependency11.to=SpikedPlattform
 dependency11.type=UsesDependency
 dependency12.from=MyWorld
-dependency12.to=HealthItem
+dependency12.to=Groundflower
 dependency12.type=UsesDependency
 dependency13.from=MyWorld
-dependency13.to=JumpBoostItem
+dependency13.to=HealthItem
 dependency13.type=UsesDependency
 dependency14.from=MyWorld
-dependency14.to=Enemy
+dependency14.to=JumpBoostItem
 dependency14.type=UsesDependency
 dependency15.from=MyWorld
-dependency15.to=Projectile
+dependency15.to=Enemy
 dependency15.type=UsesDependency
 dependency16.from=MyWorld
-dependency16.to=TargetingProjectile
+dependency16.to=Projectile
 dependency16.type=UsesDependency
-dependency17.from=GameOverWorld
-dependency17.to=Button
+dependency17.from=MyWorld
+dependency17.to=TargetingProjectile
 dependency17.type=UsesDependency
-dependency18.from=StartWorld
+dependency18.from=GameOverWorld
 dependency18.to=Button
 dependency18.type=UsesDependency
-dependency19.from=UnactiveSpike
-dependency19.to=SpikedPlattform
+dependency19.from=GameOverWorld
+dependency19.to=Score
 dependency19.type=UsesDependency
 dependency2.from=PlayerTestWorld
 dependency2.to=Player
 dependency2.type=UsesDependency
-dependency20.from=UnactiveSpike
-dependency20.to=MyWorld
+dependency20.from=StartWorld
+dependency20.to=Button
 dependency20.type=UsesDependency
 dependency21.from=UnactiveSpike
-dependency21.to=Spike
+dependency21.to=SpikedPlattform
 dependency21.type=UsesDependency
-dependency22.from=Button
+dependency22.from=UnactiveSpike
 dependency22.to=MyWorld
 dependency22.type=UsesDependency
-dependency23.from=PowerUps
-dependency23.to=Player
+dependency23.from=UnactiveSpike
+dependency23.to=Spike
 dependency23.type=UsesDependency
-dependency24.from=HealthItem
-dependency24.to=Player
+dependency24.from=Button
+dependency24.to=MyWorld
 dependency24.type=UsesDependency
-dependency25.from=JumpBoostItem
+dependency25.from=PowerUps
 dependency25.to=Player
 dependency25.type=UsesDependency
-dependency26.from=Groundflower
+dependency26.from=HealthItem
 dependency26.to=Player
 dependency26.type=UsesDependency
-dependency27.from=Enemy
+dependency27.from=JumpBoostItem
 dependency27.to=Player
 dependency27.type=UsesDependency
-dependency28.from=Enemy
-dependency28.to=EnemyProjectile
+dependency28.from=Groundflower
+dependency28.to=Player
 dependency28.type=UsesDependency
-dependency29.from=Spike
-dependency29.to=MyWorld
+dependency29.from=Enemy
+dependency29.to=Player
 dependency29.type=UsesDependency
 dependency3.from=PlayerTestWorld
 dependency3.to=JumpBoostItem
 dependency3.type=UsesDependency
-dependency30.from=Player
-dependency30.to=GameOverWorld
+dependency30.from=Enemy
+dependency30.to=EnemyProjectile
 dependency30.type=UsesDependency
-dependency31.from=Player
-dependency31.to=Plattform
+dependency31.from=Spike
+dependency31.to=MyWorld
 dependency31.type=UsesDependency
 dependency32.from=Player
-dependency32.to=PlayerProjectile
+dependency32.to=GameOverWorld
 dependency32.type=UsesDependency
 dependency33.from=Player
-dependency33.to=TemporaryGround
+dependency33.to=Plattform
 dependency33.type=UsesDependency
 dependency34.from=Player
-dependency34.to=Projectile
+dependency34.to=PlayerProjectile
 dependency34.type=UsesDependency
 dependency35.from=Player
-dependency35.to=Enemy
+dependency35.to=TemporaryGround
 dependency35.type=UsesDependency
 dependency36.from=Player
-dependency36.to=Spike
+dependency36.to=Projectile
 dependency36.type=UsesDependency
 dependency37.from=Player
-dependency37.to=Heart
+dependency37.to=Enemy
 dependency37.type=UsesDependency
-dependency38.from=Plattform
-dependency38.to=MyWorld
+dependency38.from=Player
+dependency38.to=Spike
 dependency38.type=UsesDependency
 dependency39.from=Plattform
-dependency39.to=Player
+dependency39.to=MyWorld
 dependency39.type=UsesDependency
 dependency4.from=MyWorld
 dependency4.to=Player
 dependency4.type=UsesDependency
-dependency40.from=MovingPlattform
-dependency40.to=MyWorld
+dependency40.from=Plattform
+dependency40.to=Player
 dependency40.type=UsesDependency
 dependency41.from=MovingPlattform
-dependency41.to=Player
+dependency41.to=MyWorld
 dependency41.type=UsesDependency
-dependency42.from=TemporaryGround
+dependency42.from=MovingPlattform
 dependency42.to=Player
 dependency42.type=UsesDependency
-dependency43.from=SpikedPlattform
-dependency43.to=Spike
+dependency43.from=TemporaryGround
+dependency43.to=Player
 dependency43.type=UsesDependency
 dependency44.from=SpikedPlattform
-dependency44.to=GameOverWorld
+dependency44.to=Spike
 dependency44.type=UsesDependency
 dependency45.from=SpikedPlattform
 dependency45.to=MyWorld
@@ -165,11 +165,11 @@ dependency8.type=UsesDependency
 dependency9.from=MyWorld
 dependency9.to=MovingPlattform
 dependency9.type=UsesDependency
-editor.fx.0.height=737
-editor.fx.0.width=814
-editor.fx.0.x=204
-editor.fx.0.y=64
-height=830
+editor.fx.0.height=607
+editor.fx.0.width=1092
+editor.fx.0.x=223
+editor.fx.0.y=111
+height=814
 package.numDependencies=48
 package.numTargets=25
 project.charset=UTF-8
@@ -362,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