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/BreakingPlattform.java

@@ -25,7 +25,7 @@ public class BreakingPlattform extends Plattform
         {
             IsBreaking= true;
             //Greenfoot.playSound("...")
-            this.setImage("BreakingPlattform2.png"); //untested 
+            this.setImage("Breaking2.png");
             
         }
         if(IsBreaking)

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,350);
+        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.ctxt

@@ -0,0 +1,9 @@
+#BlueJ class context
+comment0.target=Groundflower
+comment0.text=\r\n\ Write\ a\ description\ of\ class\ StarPowerUp\ 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()
+comment1.text=\r\n\ Act\ -\ do\ whatever\ the\ StarPowerUp\ wants\ to\ do.\ This\ method\ is\ called\ whenever\r\n\ the\ 'Act'\ or\ 'Run'\ button\ gets\ pressed\ in\ the\ environment.\r\n
+comment2.params=
+comment2.target=void\ collect()
+numComments=3

SMIMS-Game/Groundflower.java

@@ -0,0 +1,30 @@
+import greenfoot.*;  // (World, Actor, GreenfootImage, Greenfoot and MouseInfo)
+
+/**
+ * Write a description of class StarPowerUp here.
+ * 
+ * @author (your name) 
+ * @version (a version number or a date)
+ */
+public class Groundflower extends PowerUps
+{
+    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.
+     */
+    public void act()
+    {
+        moveDown();
+        touchedByPlayer();
+        if (deleteAfterActCycle){
+            getWorld().removeObject(this);
+        }
+    }
+
+    @ Override void collect()
+    {
+        Player player = getIntersectingObjects(Player.class).get(0);
+        player.receivePowerUp(duration, "GroundPower");
+    }
+}

SMIMS-Game/HealthItem.java

@@ -8,14 +8,17 @@ import greenfoot.*;  // (World, Actor, GreenfootImage, Greenfoot and MouseInfo)
  */
 public class HealthItem extends PowerUps
 {
-    int duration = 60*60;
     public void act()
     {
+        moveDown();
         touchedByPlayer();
+        if (deleteAfterActCycle){
+            getWorld().removeObject(this);
+        }
     }
     
     @Override void collect(){
         Player player = getIntersectingObjects(Player.class).get(0);
-        player.reveivePowerUp(duration, "Heal");
+        player.receivePowerUp(duration, "Heal");
     }
 }

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/Heart.ctxt

@@ -0,0 +1,7 @@
+#BlueJ class context
+comment0.target=Heart
+comment0.text=\r\n\ Write\ a\ description\ of\ class\ Heart\ 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()
+comment1.text=\r\n\ Act\ -\ do\ whatever\ the\ Heart\ wants\ to\ do.\ This\ method\ is\ called\ whenever\r\n\ the\ 'Act'\ or\ 'Run'\ button\ gets\ pressed\ in\ the\ environment.\r\n
+numComments=2

SMIMS-Game/Heart.java

@@ -0,0 +1,19 @@
+import greenfoot.*;  // (World, Actor, GreenfootImage, Greenfoot and MouseInfo)
+
+/**
+ * Write a description of class Heart here.
+ * 
+ * @author (your name) 
+ * @version (a version number or a date)
+ */
+public class Heart extends Actor
+{
+    /**
+     * Act - do whatever the Heart wants to do. This method is called whenever
+     * the 'Act' or 'Run' button gets pressed in the environment.
+     */
+    public void act()
+    {
+        // Add your action code here.
+    }
+}

SMIMS-Game/JumpBoostItem.java

@@ -8,14 +8,18 @@ import greenfoot.*;  // (World, Actor, GreenfootImage, Greenfoot and MouseInfo)
  */
 public class JumpBoostItem extends PowerUps
 {
-    int duration = 60*60;
+    int duration = 60*5;
     public void act()
     {
+        moveDown();
         touchedByPlayer();
+        if (deleteAfterActCycle){
+            getWorld().removeObject(this);
+        }
     }
     
     @Override void collect(){
         Player player = getIntersectingObjects(Player.class).get(0);
-        player.reveivePowerUp(duration, "JumpBoost");
+        player.receivePowerUp(duration, "JumpBoost");
     }
 }

SMIMS-Game/MovingPlattform.java

@@ -9,7 +9,7 @@ import greenfoot.*;  // (World, Actor, GreenfootImage, Greenfoot and MouseInfo)
 public class MovingPlattform extends Plattform
 {
     int speed;
-
+    int temp=0;
     public MovingPlattform(int pSpeed)
     {
         speed= pSpeed;
@@ -42,10 +42,11 @@ public class MovingPlattform extends Plattform
     {
         if(this.PlayerOnPlattform())
         {
-            Actor DerSpieler = this.getOneObjectAtOffset(0, -40, Player.class);
+            World theWorld= this.getWorld();
+            Player DerSpieler = theWorld.getObjects(Player.class).get(0);
             if(DerSpieler!=null)
             {
-                DerSpieler.setLocation(DerSpieler.getX()+speed, DerSpieler.getY());
+                DerSpieler.setLocation(DerSpieler.getX()+speed*2, DerSpieler.getY());
             }
         }
     }

SMIMS-Game/MyWorld.ctxt

@@ -10,9 +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\ projectile()
+comment4.target=void\ drawNewHearts()
 comment5.params=
-comment5.target=void\ targetingProjectile()
+comment5.target=void\ spawnItems()
 comment6.params=
-comment6.target=void\ showScore()
+comment6.target=void\ spawnEnemies()
-numComments=7
+comment7.params=
+comment7.target=void\ projectile()
+comment8.params=
+comment8.target=void\ targetingProjectile()
+comment9.params=
+comment9.target=void\ showScore()
+numComments=10

SMIMS-Game/MyWorld.java

@@ -9,10 +9,12 @@ 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;
+    int enemyTimer;
+    int itemTimer;
     int score = 0;
     /**
      * Constructor for objects of class MyWorld.
@@ -33,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);
@@ -56,55 +58,111 @@ public class MyWorld extends World
         plattform2.setLocation(320,367);
         plattform2.setLocation(312,371);
         plattform2.setLocation(308,382);
-        Healthbar healthbar = new Healthbar();
+        Heart heart = new Heart();
-        addObject(healthbar,50,50);
+        addObject(heart,371,27);
+        Heart heart2 = new Heart();
+        addObject(heart2,343,27);
+        Heart heart3 = new Heart();
+        addObject(heart3,314,27);
+
+        addObject(new TemporaryGround(60*8), 200, 575);
     }
 
     public void act()
     {
-        Score score = new Score();
+        if (getObjects(Score.class).size() > 0){
-        addObject(score, 200, 30);
+            removeObjects(getObjects(Score.class));
-        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){
+            itemTimer = 0;
+            switch (Greenfoot.getRandomNumber(3)){
+                case 0:
+                    Groundflower groundF = new Groundflower();
+                    addObject(groundF, Greenfoot.getRandomNumber(getWidth()-100)+50,0);
+                    break;
+                case 1:
+                    HealthItem healthItem = new HealthItem();
+                    addObject(healthItem, Greenfoot.getRandomNumber(getWidth()-100)+50,0);
+                    break;
+                case 2:
+                    JumpBoostItem jumpBoostItem = new JumpBoostItem();
+                    addObject(jumpBoostItem, Greenfoot.getRandomNumber(getWidth()-100)+50,0);
+                    break;
+            }
+        }
+    }
+    
+    public void spawnEnemies(){
+        enemyTimer++;
+        if (enemyTimer >= 420){
+            Enemy enemy = new Enemy(Greenfoot.getRandomNumber(getWidth() - 50) + 25, Greenfoot.getRandomNumber(getHeight()/2) + 15);
+            addObject(enemy, Greenfoot.getRandomNumber(getWidth()-100)+50,0);
+            enemyTimer = 0;
+        }
+        
+    }
     public void projectile(){
         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;
@@ -127,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()-20)
+            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=
@@ -18,5 +20,5 @@ comment7.target=void\ checkHealth()
 comment8.params=
 comment8.target=void\ handlePowerUps()
 comment9.params=duration\ type
-comment9.target=void\ reveivePowerUp(int,\ java.lang.String)
+comment9.target=void\ receivePowerUp(int,\ java.lang.String)
-numComments=10
+numComments=11

SMIMS-Game/Player.java

@@ -10,13 +10,13 @@ public class Player extends Actor
 {
     int MAX_HEALTH = 3;
     int health = MAX_HEALTH;
-    
+
     int jumpBoostDuration = -1;
-    int jumpBoostStrength = 5;
+    int jumpBoostStrength = 3;
-    
+
     boolean projectileReady = false;
     int projectileTimer;
-    
+
     private int speed = 6;
     private int currentJumpStrength;
     private int defaultJumpStrength = 15;
@@ -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");
         }
     }
 
@@ -93,8 +97,8 @@ public class Player extends Actor
             } 
         } 
         onGround = landed; 
-        }
+    }
-    
+
     public void shootProjectile(){
         projectileTimer++;
         MouseInfo mouse = Greenfoot.getMouseInfo();
@@ -112,21 +116,23 @@ public class Player extends Actor
 
     public void collision(){
         if (getIntersectingObjects(Projectile.class).size()>0
-        || getIntersectingObjects(Enemy.class).size()>0)
+        || getIntersectingObjects(Enemy.class).size()>0
+        || getIntersectingObjects(Spike.class).size()>0)
         {
             health--;
             getWorld().removeObjects(getIntersectingObjects(Projectile.class));
             getWorld().removeObjects(getIntersectingObjects(Enemy.class));
-            
+            getWorld().removeObjects(getWorld().getObjects(Spike.class));
         }
     }
-    
+
     public void checkHealth(){
         if (health <= 0){
-            Greenfoot.setWorld(new GameOverWorld());
+            MyWorld world = (MyWorld) getWorld();
+            Greenfoot.setWorld(new GameOverWorld(world.score));
         }
     }
-    
+
     public void handlePowerUps(){
         if (jumpBoostDuration >= 0){
             jumpBoostDuration -= 1;
@@ -134,8 +140,8 @@ public class Player extends Actor
             currentJumpStrength = defaultJumpStrength;
         }
     }
-    
+
-    public void reveivePowerUp(int duration, String type){
+    public void receivePowerUp(int duration, String type){
         switch(type){
             case "dummy":
                 break;
@@ -143,10 +149,32 @@ public class Player extends Actor
                 currentJumpStrength = defaultJumpStrength;
                 currentJumpStrength += jumpBoostStrength;
                 jumpBoostDuration = duration;
+                break;
             case "Heal":
                 if (health < MAX_HEALTH){
                     health++;
                 }
+                break;
+            case "GroundPower":
+                World theWorld= this.getWorld();
+                if(!theWorld.getObjects(TemporaryGround.class).isEmpty())
+                {
+                    theWorld.getObjects(TemporaryGround.class).get(0).RefreshLifeToDuration(duration);
+                }
+                else
+                {
+                    theWorld.addObject((new TemporaryGround(duration)), 200, 575);
+                }
+                break;
+        }
+    }
+    
+    public void playerRotation(){
+        if(Greenfoot.isKeyDown("a")){
+            setImage("PlayerLeft.png");
+        }
+        if(Greenfoot.isKeyDown("d")){
+            setImage("Player.png");
         }
     }
 }

SMIMS-Game/PlayerProjectile.java

@@ -8,6 +8,7 @@ import greenfoot.*;  // (World, Actor, GreenfootImage, Greenfoot and MouseInfo)
  */
 public class PlayerProjectile extends Actor
 {
+    boolean deleteAfterActCycle = false;
     /**
      * Act - do whatever the PlayerProjectile wants to do. This method is called whenever
      * the 'Act' or 'Run' button gets pressed in the environment.
@@ -15,16 +16,16 @@ public class PlayerProjectile extends Actor
     public void act()
     {
         move(7);
-        if (!isProjectileOnScreen()){
+        checkForEnemyCollision();
+        if (deleteAfterActCycle || !isProjectileOnScreen()){
             getWorld().removeObject(this);
         }
-        checkForEnemyCollision();
     }
     
     public void checkForEnemyCollision(){
         if (getOneIntersectingObject(Enemy.class) != null){
             getWorld().removeObject(getOneIntersectingObject(Enemy.class));
-            getWorld().removeObject(this);
+            deleteAfterActCycle = true;
         }
     }
     
@@ -34,7 +35,7 @@ public class PlayerProjectile extends Actor
             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/PowerUps.ctxt

@@ -7,4 +7,6 @@ comment2.params=
 comment2.target=void\ touchedByPlayer()
 comment3.params=
 comment3.target=void\ collect()
-numComments=4
+comment4.params=
+comment4.target=void\ moveDown()
+numComments=5

SMIMS-Game/PowerUps.java

@@ -9,20 +9,35 @@ import greenfoot.*;  // (World, Actor, GreenfootImage, Greenfoot and MouseInfo)
 public class PowerUps extends Actor
 {
     int duration;
+    boolean deleteAfterActCycle = false;
+    
     public void act()
     {
+        moveDown();
         touchedByPlayer();
+        if (deleteAfterActCycle){
+            getWorld().removeObject(this);
+        }
     }
     
     public void touchedByPlayer(){
         if (getIntersectingObjects(Player.class).size() > 0){
             collect();
-            getWorld().removeObject(this);
+            deleteAfterActCycle = true;
         }
     }
     
     void collect(){
         Player player = getIntersectingObjects(Player.class).get(0);
-        player.reveivePowerUp(duration, "dummy");
+        player.receivePowerUp(duration, "dummy");
+    }
+    
+    public void moveDown()
+    {
+        setLocation(this.getX(), this.getY()+2);
+        if(this.getY() >= getWorld().getHeight()-1)
+        {
+            deleteAfterActCycle = true;
+        }
     }
 }

SMIMS-Game/Spike.java

@@ -20,11 +20,6 @@ public class Spike extends Actor
      */
     public void act()
     {
-        // Add your action code here.
-        if(this.isTouching(Player.class))
-        {
-            Greenfoot.setWorld(new GameOverWorld());
-        }
         this.bewege();
     }
 

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,350);
+        addObject(button,200,310);
         button.setImage("Start.png");
     }
 }

SMIMS-Game/TemporaryGround.ctxt

@@ -0,0 +1,17 @@
+#BlueJ class context
+comment0.target=TemporaryGround
+comment0.text=\r\n\ Write\ a\ description\ of\ class\ TemporaryGround\ here.\r\n\ \r\n\ @author\ (your\ name)\ \r\n\ @version\ (a\ version\ number\ or\ a\ date)\r\n
+comment1.params=pLebensdauer
+comment1.target=TemporaryGround(int)
+comment2.params=
+comment2.target=void\ act()
+comment2.text=\r\n\ Act\ -\ do\ whatever\ the\ TemporaryGround\ wants\ to\ do.\ This\ method\ is\ called\ whenever\r\n\ the\ 'Act'\ or\ 'Run'\ button\ gets\ pressed\ in\ the\ environment.\r\n
+comment3.params=
+comment3.target=void\ warning()
+comment4.params=
+comment4.target=void\ noMoreWarning()
+comment5.params=pDuration
+comment5.target=void\ RefreshLifeToDuration(int)
+comment6.params=
+comment6.target=void\ Buffer()
+numComments=7

SMIMS-Game/TemporaryGround.java

@@ -0,0 +1,71 @@
+import greenfoot.*;  // (World, Actor, GreenfootImage, Greenfoot and MouseInfo)
+
+/**
+ * Write a description of class TemporaryGround here.
+ * 
+ * @author (your name) 
+ * @version (a version number or a date)
+ */
+public class TemporaryGround extends Plattform
+{
+    private int Lebensdauer;
+    boolean warningHasHappend=false;
+    boolean deWarningHasHappend=true;
+    public TemporaryGround(int pLebensdauer)
+    {
+        Lebensdauer=pLebensdauer;
+    }
+
+    /**
+     * Act - do whatever the TemporaryGround wants to do. This method is called whenever
+     * the 'Act' or 'Run' button gets pressed in the environment.
+     */
+    public void act()
+    {
+        // Add your action code here.
+        this.Buffer();
+        Lebensdauer--;
+        if(Lebensdauer==0)
+        {
+            this.loescheMich();
+        }
+        if(Lebensdauer<60*3 && warningHasHappend==false) //3 Sekunden
+        {
+            this.warning();
+        }
+        if(Lebensdauer>=60*3 && deWarningHasHappend==false)
+        {
+            this.noMoreWarning();
+        }
+    }
+
+    public void warning()
+    {
+        this.setImage("BreakingGround.png");
+        warningHasHappend=true;
+        deWarningHasHappend=false;
+    }
+
+    public void noMoreWarning()
+    {
+        this.setImage("Ground.png");
+        warningHasHappend=false;
+        deWarningHasHappend=true;
+    }
+
+    public void RefreshLifeToDuration(int pDuration)
+    {
+        Lebensdauer=pDuration;
+    }
+
+    public void Buffer()
+    {
+        {
+            Player player= this.getWorld().getObjects(Player.class).get(0);
+            if(this.intersects(player))
+            {
+                player.setLocation(player.getX(), this.getY()-this.getImage().getHeight()-5);
+            }
+        }
+    }
+}

SMIMS-Game/UnactiveSpike.java

@@ -30,7 +30,7 @@ public class UnactiveSpike extends Actor
             MyWorld theWorld= (MyWorld) this.getWorld();
             Spike BeispielSpike=new Spike(1);
             GreenfootImage SpikeImage= BeispielSpike.getImage();
-            theWorld.addObject(new Spike(speed), this.getX(), (this.getY()- this.getImage().getHeight()/2)-10); //die Zahl Minus damit ist endlich passt
+            theWorld.addObject(new Spike(speed), this.getX(), (this.getY()- this.getImage().getHeight()/2)-2); //die Zahl Minus damit ist endlich passt
             geloescht=true;
         }
         if(geloescht)

SMIMS-Game/project.greenfoot

@@ -1,153 +1,177 @@
 #Greenfoot project file
-class.BreakingPlattform.image=Unbenannt2.png
+class.BreakingPlattform.image=Breaking1.png
 class.Button.image=button-red.png
-class.GameOverWorld.image=GameOverBackground.png
+class.Enemy.image=Enemy.png
+class.EnemyProjectile.image=EnemyProjectile.png
+class.GameOverWorld.image=JUMP\ \u2018N\u2019\ RUNj.png
 class.Ground.image=weave.jpg
-class.HealthItem.image=herz.png
+class.Groundflower.image=flower2.png
+class.HealthItem.image=Health.png
+class.Heart.image=Health.png
 class.JumpBoostItem.image=mushroom.png
-class.MovingPlattform.image=Unbenannt.png
+class.MovingPlattform.image=Platform1.png
 class.MyWorld.image=GameBackground.png
 class.Plattform.image=Platform1.png
 class.Player.image=Player.png
+class.PlayerProjectile.image=PlayerProjectile.png
 class.Projectile.image=Projectile1.png
-class.Spike.image=Spike.png
+class.Spike.image=singleSpike.png
-class.SpikedPlattform.image=SpikedPlattform.png
+class.SpikedPlattform.image=Spikes2.png
 class.StartWorld.image=StartBackground.png
-class.TargetingProjectile.image=blue-draught.png
+class.TargetingProjectile.image=TargetProjectile.png
-class.UnactiveSpike.image=SpikeUnactive.png
+class.TemporaryGround.image=Ground.png
-dependency1.from=GameOverWorld
+class.UnactiveSpike.image=Spike_Copy.png
-dependency1.to=Button
+dependency1.from=PlayerTestWorld
+dependency1.to=Ground
 dependency1.type=UsesDependency
 dependency10.from=MyWorld
-dependency10.to=MovingPlattform
+dependency10.to=BreakingPlattform
 dependency10.type=UsesDependency
 dependency11.from=MyWorld
-dependency11.to=BreakingPlattform
+dependency11.to=SpikedPlattform
 dependency11.type=UsesDependency
 dependency12.from=MyWorld
-dependency12.to=SpikedPlattform
+dependency12.to=Groundflower
 dependency12.type=UsesDependency
 dependency13.from=MyWorld
-dependency13.to=Projectile
+dependency13.to=HealthItem
 dependency13.type=UsesDependency
 dependency14.from=MyWorld
-dependency14.to=TargetingProjectile
+dependency14.to=JumpBoostItem
 dependency14.type=UsesDependency
-dependency15.from=Spike
+dependency15.from=MyWorld
-dependency15.to=GameOverWorld
+dependency15.to=Enemy
 dependency15.type=UsesDependency
-dependency16.from=Spike
+dependency16.from=MyWorld
-dependency16.to=MyWorld
+dependency16.to=Projectile
 dependency16.type=UsesDependency
-dependency17.from=Spike
+dependency17.from=MyWorld
-dependency17.to=Player
+dependency17.to=TargetingProjectile
 dependency17.type=UsesDependency
-dependency18.from=Player
+dependency18.from=GameOverWorld
-dependency18.to=GameOverWorld
+dependency18.to=Button
 dependency18.type=UsesDependency
-dependency19.from=Player
+dependency19.from=GameOverWorld
-dependency19.to=Plattform
+dependency19.to=Score
 dependency19.type=UsesDependency
 dependency2.from=PlayerTestWorld
-dependency2.to=Ground
+dependency2.to=Player
 dependency2.type=UsesDependency
-dependency20.from=Player
+dependency20.from=StartWorld
-dependency20.to=PlayerProjectile
+dependency20.to=Button
 dependency20.type=UsesDependency
-dependency21.from=Player
+dependency21.from=UnactiveSpike
-dependency21.to=Projectile
+dependency21.to=SpikedPlattform
 dependency21.type=UsesDependency
-dependency22.from=Player
+dependency22.from=UnactiveSpike
-dependency22.to=Enemy
+dependency22.to=MyWorld
 dependency22.type=UsesDependency
 dependency23.from=UnactiveSpike
-dependency23.to=SpikedPlattform
+dependency23.to=Spike
 dependency23.type=UsesDependency
-dependency24.from=UnactiveSpike
+dependency24.from=Button
 dependency24.to=MyWorld
 dependency24.type=UsesDependency
-dependency25.from=UnactiveSpike
+dependency25.from=PowerUps
-dependency25.to=Spike
+dependency25.to=Player
 dependency25.type=UsesDependency
-dependency26.from=Healthbar
+dependency26.from=HealthItem
 dependency26.to=Player
 dependency26.type=UsesDependency
-dependency27.from=Plattform
+dependency27.from=JumpBoostItem
-dependency27.to=MyWorld
+dependency27.to=Player
 dependency27.type=UsesDependency
-dependency28.from=Plattform
+dependency28.from=Groundflower
 dependency28.to=Player
 dependency28.type=UsesDependency
-dependency29.from=MovingPlattform
+dependency29.from=Enemy
-dependency29.to=MyWorld
+dependency29.to=Player
 dependency29.type=UsesDependency
 dependency3.from=PlayerTestWorld
-dependency3.to=Player
+dependency3.to=JumpBoostItem
 dependency3.type=UsesDependency
-dependency30.from=MovingPlattform
+dependency30.from=Enemy
-dependency30.to=Player
+dependency30.to=EnemyProjectile
 dependency30.type=UsesDependency
-dependency31.from=SpikedPlattform
+dependency31.from=Spike
-dependency31.to=Spike
+dependency31.to=MyWorld
 dependency31.type=UsesDependency
-dependency32.from=SpikedPlattform
+dependency32.from=Player
 dependency32.to=GameOverWorld
 dependency32.type=UsesDependency
-dependency33.from=SpikedPlattform
+dependency33.from=Player
-dependency33.to=MyWorld
+dependency33.to=Plattform
 dependency33.type=UsesDependency
-dependency34.from=SpikedPlattform
+dependency34.from=Player
-dependency34.to=UnactiveSpike
+dependency34.to=PlayerProjectile
 dependency34.type=UsesDependency
-dependency35.from=TargetingProjectile
+dependency35.from=Player
-dependency35.to=Player
+dependency35.to=TemporaryGround
 dependency35.type=UsesDependency
-dependency36.from=Button
+dependency36.from=Player
-dependency36.to=MyWorld
+dependency36.to=Projectile
 dependency36.type=UsesDependency
-dependency37.from=PowerUps
+dependency37.from=Player
-dependency37.to=Player
+dependency37.to=Enemy
 dependency37.type=UsesDependency
-dependency38.from=HealthItem
+dependency38.from=Player
-dependency38.to=Player
+dependency38.to=Spike
 dependency38.type=UsesDependency
-dependency39.from=JumpBoostItem
+dependency39.from=Plattform
-dependency39.to=Player
+dependency39.to=MyWorld
 dependency39.type=UsesDependency
-dependency4.from=PlayerTestWorld
+dependency4.from=MyWorld
-dependency4.to=JumpBoostItem
+dependency4.to=Player
 dependency4.type=UsesDependency
-dependency40.from=Enemy
+dependency40.from=Plattform
 dependency40.to=Player
 dependency40.type=UsesDependency
-dependency41.from=Enemy
+dependency41.from=MovingPlattform
-dependency41.to=EnemyProjectile
+dependency41.to=MyWorld
 dependency41.type=UsesDependency
-dependency42.from=PlayerProjectile
+dependency42.from=MovingPlattform
-dependency42.to=Enemy
+dependency42.to=Player
 dependency42.type=UsesDependency
-dependency5.from=StartWorld
+dependency43.from=TemporaryGround
-dependency5.to=Button
+dependency43.to=Player
+dependency43.type=UsesDependency
+dependency44.from=SpikedPlattform
+dependency44.to=Spike
+dependency44.type=UsesDependency
+dependency45.from=SpikedPlattform
+dependency45.to=MyWorld
+dependency45.type=UsesDependency
+dependency46.from=SpikedPlattform
+dependency46.to=UnactiveSpike
+dependency46.type=UsesDependency
+dependency47.from=TargetingProjectile
+dependency47.to=Player
+dependency47.type=UsesDependency
+dependency48.from=PlayerProjectile
+dependency48.to=Enemy
+dependency48.type=UsesDependency
+dependency5.from=MyWorld
+dependency5.to=Score
 dependency5.type=UsesDependency
 dependency6.from=MyWorld
-dependency6.to=Player
+dependency6.to=Plattform
 dependency6.type=UsesDependency
 dependency7.from=MyWorld
-dependency7.to=Score
+dependency7.to=Heart
 dependency7.type=UsesDependency
 dependency8.from=MyWorld
-dependency8.to=Plattform
+dependency8.to=TemporaryGround
 dependency8.type=UsesDependency
 dependency9.from=MyWorld
-dependency9.to=Healthbar
+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=360
+editor.fx.0.x=223
-editor.fx.0.y=26
+editor.fx.0.y=111
-height=822
+height=814
-package.numDependencies=42
+package.numDependencies=48
-package.numTargets=23
+package.numTargets=25
 project.charset=UTF-8
 publish.hasSource=false
 publish.locked=true
@@ -163,126 +187,140 @@ readme.x=10
 readme.y=10
 simulation.speed=50
 target1.height=70
-target1.name=Spike
+target1.name=Heart
 target1.showInterface=false
 target1.type=ClassTarget
 target1.width=120
 target1.x=0
 target1.y=0
 target10.height=70
-target10.name=GameOverWorld
+target10.name=Button
 target10.showInterface=false
 target10.type=ClassTarget
 target10.width=120
 target10.x=0
 target10.y=0
 target11.height=70
-target11.name=PlayerTestWorld
+target11.name=PowerUps
 target11.showInterface=false
 target11.type=ClassTarget
 target11.width=120
 target11.x=0
 target11.y=0
 target12.height=70
-target12.name=StartWorld
+target12.name=Enemy
 target12.showInterface=false
 target12.type=ClassTarget
 target12.width=120
 target12.x=0
 target12.y=0
 target13.height=70
-target13.name=Plattform
+target13.name=MyWorld
 target13.showInterface=false
 target13.type=ClassTarget
 target13.width=120
 target13.x=0
 target13.y=0
 target14.height=70
-target14.name=TargetingProjectile
+target14.name=Spike
 target14.showInterface=false
 target14.type=ClassTarget
 target14.width=120
 target14.x=0
 target14.y=0
 target15.height=70
-target15.name=Projectile
+target15.name=Groundflower
 target15.showInterface=false
 target15.type=ClassTarget
 target15.width=120
 target15.x=0
 target15.y=0
 target16.height=70
-target16.name=Score
+target16.name=Player
 target16.showInterface=false
 target16.type=ClassTarget
 target16.width=120
 target16.x=0
 target16.y=0
 target17.height=70
-target17.name=Button
+target17.name=BreakingPlattform
 target17.showInterface=false
 target17.type=ClassTarget
 target17.width=120
 target17.x=0
 target17.y=0
 target18.height=70
-target18.name=EnemyProjectile
+target18.name=GameOverWorld
 target18.showInterface=false
 target18.type=ClassTarget
 target18.width=120
 target18.x=0
 target18.y=0
 target19.height=70
-target19.name=PowerUps
+target19.name=StartWorld
 target19.showInterface=false
 target19.type=ClassTarget
 target19.width=120
 target19.x=0
 target19.y=0
 target2.height=70
-target2.name=Player
+target2.name=MovingPlattform
 target2.showInterface=false
 target2.type=ClassTarget
 target2.width=120
 target2.x=0
 target2.y=0
 target20.height=70
-target20.name=Enemy
+target20.name=Plattform
 target20.showInterface=false
 target20.type=ClassTarget
 target20.width=120
 target20.x=0
 target20.y=0
 target21.height=70
-target21.name=PlayerProjectile
+target21.name=Projectile
 target21.showInterface=false
 target21.type=ClassTarget
 target21.width=120
 target21.x=0
 target21.y=0
 target22.height=70
-target22.name=SpikedPlattform
+target22.name=Score
 target22.showInterface=false
 target22.type=ClassTarget
 target22.width=120
 target22.x=0
 target22.y=0
 target23.height=70
-target23.name=MyWorld
+target23.name=EnemyProjectile
 target23.showInterface=false
 target23.type=ClassTarget
 target23.width=120
 target23.x=0
 target23.y=0
+target24.height=70
+target24.name=PlayerProjectile
+target24.showInterface=false
+target24.type=ClassTarget
+target24.width=120
+target24.x=0
+target24.y=0
+target25.height=70
+target25.name=SpikedPlattform
+target25.showInterface=false
+target25.type=ClassTarget
+target25.width=120
+target25.x=0
+target25.y=0
 target3.height=70
-target3.name=MovingPlattform
+target3.name=Ground
 target3.showInterface=false
 target3.type=ClassTarget
 target3.width=120
 target3.x=0
 target3.y=0
 target4.height=70
-target4.name=Ground
+target4.name=HealthItem
 target4.showInterface=false
 target4.type=ClassTarget
 target4.width=120
@@ -296,35 +334,35 @@ target5.width=120
 target5.x=0
 target5.y=0
 target6.height=70
-target6.name=HealthItem
+target6.name=JumpBoostItem
 target6.showInterface=false
 target6.type=ClassTarget
 target6.width=120
 target6.x=0
 target6.y=0
 target7.height=70
-target7.name=Healthbar
+target7.name=PlayerTestWorld
 target7.showInterface=false
 target7.type=ClassTarget
 target7.width=120
 target7.x=0
 target7.y=0
 target8.height=70
-target8.name=JumpBoostItem
+target8.name=TargetingProjectile
 target8.showInterface=false
 target8.type=ClassTarget
 target8.width=120
 target8.x=0
 target8.y=0
 target9.height=70
-target9.name=BreakingPlattform
+target9.name=TemporaryGround
 target9.showInterface=false
 target9.type=ClassTarget
 target9.width=120
 target9.x=0
 target9.y=0
 version=3.1.0
-width=715
+width=1534
-world.lastInstantiated=MyWorld
+world.lastInstantiated=StartWorld
-xPosition=532
+xPosition=0
 yPosition=117