Fix: game crasht nicht mehr bei damage

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

SMIMS-Game/Enemy.ctxt

@@ -1,7 +1,11 @@
 #BlueJ class context
 comment0.target=Enemy
-comment1.params=
+comment1.params=targetX\ targetY
-comment1.target=void\ act()
+comment1.target=Enemy(int,\ int)
 comment2.params=
-comment2.target=void\ shootAtPlayer()
+comment2.target=void\ act()
-numComments=3
+comment3.params=targetX\ targetY
+comment3.target=void\ moveToTargetLocation(int,\ int)
+comment4.params=
+comment4.target=void\ shootAtPlayer()
+numComments=5

SMIMS-Game/Groundflower.ctxt

@@ -6,6 +6,4 @@ 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()
-comment3.params=
+numComments=3
-comment3.target=void\ bewegeNachUnten()
-numComments=4

SMIMS-Game/Groundflower.java

@@ -15,29 +15,16 @@ public class Groundflower extends PowerUps
      */
     public void act()
     {
-        this.touchedByPlayer();
+        moveDown();
-        this.setLocation(this.getX(), this.getY()+2);
+        touchedByPlayer();
-        if(this.getY()>=this.getWorld().getHeight()-5)
+        if (deleteAfterActCycle){
-        {
+            getWorld().removeObject(this);
-            this.getWorld().removeObject(this);
-            return;
         }
-        this.touchedByPlayer();
-        // Add your action code here.
     }
 
     @ Override void collect()
     {
         Player player = getIntersectingObjects(Player.class).get(0);
-        player.reveivePowerUp(duration, "GroundPower");
+        player.receivePowerUp(duration, "GroundPower");
-    }
-
-    public void bewegeNachUnten()
-    {
-        this.setLocation(this.getX(), this.getY()+2);
-        if(this.getY()>=this.getWorld().getHeight()-5)
-        {
-            this.getWorld().removeObject(this);
-        }
     }
 }

SMIMS-Game/HealthItem.java

@@ -11,11 +11,15 @@ 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/JumpBoostItem.java

@@ -11,11 +11,15 @@ public class JumpBoostItem 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, "JumpBoost");
+        player.receivePowerUp(duration, "JumpBoost");
     }
 }

SMIMS-Game/MyWorld.ctxt

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

SMIMS-Game/MyWorld.java

@@ -13,6 +13,7 @@ public class MyWorld extends World
                      //kann später noch beliebig angepasst werden
     int targetTimer = 1000;
     int time = 0;
+    int enemyTimer;
     int score = 0;
     /**
      * Constructor for objects of class MyWorld.
@@ -81,6 +82,7 @@ public class MyWorld extends World
         score1.setImage("Score2.png");
         showScore();
         projectile();
+        spawnEnemies();
         targetingProjectile();
         if(PlattformCountdown==0) //Damit in regelmäßigen Abständen auf jeden Fall eine Plattform auftaucht
         {
@@ -115,6 +117,16 @@ public class MyWorld extends World
         }
     }
     
+    
+    public void spawnEnemies(){
+        enemyTimer++;
+        if (enemyTimer == 420){
+            Enemy enemy = new Enemy(Greenfoot.getRandomNumber(getWidth()), Greenfoot.getRandomNumber(getHeight()/2));
+            addObject(enemy, Greenfoot.getRandomNumber(300)+50,0);
+            enemyTimer = 0;
+        }
+        
+    }
     public void projectile(){
         if(timer == 0){
             Projectile projectile = new Projectile();

SMIMS-Game/Player.ctxt

@@ -18,5 +18,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

SMIMS-Game/Player.java

@@ -118,11 +118,10 @@ public class Player extends Actor
             health--;
             getWorld().removeObjects(getIntersectingObjects(Projectile.class));
             getWorld().removeObjects(getIntersectingObjects(Enemy.class));
+            getWorld().removeObjects(getWorld().getObjects(Spike.class));
+
             getWorld().removeObjects(getIntersectingObjects(Spike.class));
             getWorld().removeObject(getWorld().getObjects(Heart.class).get(0));
-            //if(health<=2){
-            //    getWorld().removeObject(getWorld().getObjects(Heart.class).get(0));
-            //}
         }
     }
 
@@ -140,7 +139,7 @@ public class Player extends Actor
         }
     }
 
-    public void reveivePowerUp(int duration, String type){
+    public void receivePowerUp(int duration, String type){
         switch(type){
             case "dummy":
                 break;
@@ -148,10 +147,12 @@ 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())
@@ -162,6 +163,7 @@ public class Player extends Actor
                 {
                     theWorld.addObject((new TemporaryGround(duration)), 200, 575);
                 }
+                break;
         }
     }
 }

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.
@@ -16,7 +17,7 @@ public class PlayerProjectile extends Actor
     {
         move(7);
         checkForEnemyCollision();
-        if (!isProjectileOnScreen()){
+        if (deleteAfterActCycle || !isProjectileOnScreen()){
             getWorld().removeObject(this);
         }
     }
@@ -24,7 +25,7 @@ public class PlayerProjectile extends Actor
     public void checkForEnemyCollision(){
         if (getOneIntersectingObject(Enemy.class) != null){
             getWorld().removeObject(getOneIntersectingObject(Enemy.class));
-            getWorld().removeObject(this);
+            deleteAfterActCycle = 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()
+    {
+        this.setLocation(this.getX(), this.getY()+2);
+        if(this.getY()>=this.getWorld().getHeight())
+        {
+            deleteAfterActCycle = true;
+        }
     }
 }

SMIMS-Game/project.greenfoot

@@ -1,131 +1,156 @@
 #Greenfoot project file
-class.BreakingPlattform.image=Unbenannt2.png
+class.BreakingPlattform.image=Breaking1.png
+class.Button.image=button-red.png
+class.Enemy.image=bee.png
+class.GameOverWorld.image=GameOverBackground.png
 class.Ground.image=weave.jpg
-class.Groundflower.image=beeper.png
+class.Groundflower.image=flower2.png
-class.MovingPlattform.image=Unbenannt.png
+class.HealthItem.image=Health.png
-class.Plattform.image=Plattform.png
+class.Heart.image=Health.png
-class.Player.image=ppl2.png
+class.JumpBoostItem.image=mushroom.png
-class.Spike.image=Spike.png
+class.MovingPlattform.image=Platform1.png
-class.SpikedPlattform.image=SpikedPlattform.png
+class.MyWorld.image=GameBackground.png
-class.TemporaryGround.image=TemporaryGround.png
+class.Plattform.image=Platform1.png
-class.UnactiveSpike.image=Spike_Copy.png
+class.Player.image=Player.png
+class.PlayerProjectile.image=beeper.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.UnactiveSpike.image=inactiveSpike.png
 dependency1.from=PlayerTestWorld
 dependency1.to=Ground
 dependency1.type=UsesDependency
 dependency10.from=MyWorld
-dependency10.to=SpikedPlattform
+dependency10.to=MovingPlattform
 dependency10.type=UsesDependency
 dependency11.from=MyWorld
-dependency11.to=Projectile
+dependency11.to=BreakingPlattform
 dependency11.type=UsesDependency
 dependency12.from=MyWorld
-dependency12.to=TargetingProjectile
+dependency12.to=SpikedPlattform
 dependency12.type=UsesDependency
-dependency13.from=GameOverWorld
+dependency13.from=MyWorld
-dependency13.to=Button
+dependency13.to=Groundflower
 dependency13.type=UsesDependency
-dependency14.from=StartWorld
+dependency14.from=MyWorld
-dependency14.to=Button
+dependency14.to=Enemy
 dependency14.type=UsesDependency
-dependency15.from=UnactiveSpike
+dependency15.from=MyWorld
-dependency15.to=SpikedPlattform
+dependency15.to=Projectile
 dependency15.type=UsesDependency
-dependency16.from=UnactiveSpike
+dependency16.from=MyWorld
-dependency16.to=MyWorld
+dependency16.to=TargetingProjectile
 dependency16.type=UsesDependency
-dependency17.from=UnactiveSpike
+dependency17.from=GameOverWorld
-dependency17.to=Spike
+dependency17.to=Button
 dependency17.type=UsesDependency
-dependency18.from=Button
+dependency18.from=StartWorld
-dependency18.to=MyWorld
+dependency18.to=Button
 dependency18.type=UsesDependency
-dependency19.from=PowerUps
+dependency19.from=UnactiveSpike
-dependency19.to=Player
+dependency19.to=SpikedPlattform
 dependency19.type=UsesDependency
 dependency2.from=PlayerTestWorld
 dependency2.to=Player
 dependency2.type=UsesDependency
-dependency20.from=HealthItem
+dependency20.from=UnactiveSpike
-dependency20.to=Player
+dependency20.to=MyWorld
 dependency20.type=UsesDependency
-dependency21.from=JumpBoostItem
+dependency21.from=UnactiveSpike
-dependency21.to=Player
+dependency21.to=Spike
 dependency21.type=UsesDependency
-dependency22.from=Groundflower
+dependency22.from=Button
-dependency22.to=Player
+dependency22.to=MyWorld
 dependency22.type=UsesDependency
-dependency23.from=Enemy
+dependency23.from=PowerUps
 dependency23.to=Player
 dependency23.type=UsesDependency
-dependency24.from=Enemy
+dependency24.from=HealthItem
-dependency24.to=EnemyProjectile
+dependency24.to=Player
 dependency24.type=UsesDependency
-dependency25.from=Spike
+dependency25.from=JumpBoostItem
-dependency25.to=GameOverWorld
+dependency25.to=Player
 dependency25.type=UsesDependency
-dependency26.from=Spike
+dependency26.from=Groundflower
-dependency26.to=MyWorld
+dependency26.to=Player
 dependency26.type=UsesDependency
-dependency27.from=Spike
+dependency27.from=Enemy
 dependency27.to=Player
 dependency27.type=UsesDependency
-dependency28.from=Player
+dependency28.from=Enemy
-dependency28.to=GameOverWorld
+dependency28.to=EnemyProjectile
 dependency28.type=UsesDependency
-dependency29.from=Player
+dependency29.from=Spike
-dependency29.to=Plattform
+dependency29.to=MyWorld
 dependency29.type=UsesDependency
 dependency3.from=PlayerTestWorld
 dependency3.to=JumpBoostItem
 dependency3.type=UsesDependency
 dependency30.from=Player
-dependency30.to=PlayerProjectile
+dependency30.to=GameOverWorld
 dependency30.type=UsesDependency
 dependency31.from=Player
-dependency31.to=TemporaryGround
+dependency31.to=Plattform
 dependency31.type=UsesDependency
 dependency32.from=Player
-dependency32.to=Projectile
+dependency32.to=PlayerProjectile
 dependency32.type=UsesDependency
 dependency33.from=Player
-dependency33.to=Enemy
+dependency33.to=TemporaryGround
 dependency33.type=UsesDependency
-dependency34.from=Healthbar
+dependency34.from=Player
-dependency34.to=Player
+dependency34.to=Projectile
 dependency34.type=UsesDependency
-dependency35.from=Plattform
+dependency35.from=Player
-dependency35.to=MyWorld
+dependency35.to=Enemy
 dependency35.type=UsesDependency
-dependency36.from=Plattform
+dependency36.from=Player
-dependency36.to=Player
+dependency36.to=Spike
 dependency36.type=UsesDependency
-dependency37.from=MovingPlattform
+dependency37.from=Player
-dependency37.to=MyWorld
+dependency37.to=Heart
 dependency37.type=UsesDependency
-dependency38.from=MovingPlattform
+dependency38.from=Healthbar
 dependency38.to=Player
 dependency38.type=UsesDependency
-dependency39.from=SpikedPlattform
+dependency39.from=Plattform
-dependency39.to=Spike
+dependency39.to=MyWorld
 dependency39.type=UsesDependency
 dependency4.from=MyWorld
 dependency4.to=Player
 dependency4.type=UsesDependency
-dependency40.from=SpikedPlattform
+dependency40.from=Plattform
-dependency40.to=GameOverWorld
+dependency40.to=Player
 dependency40.type=UsesDependency
-dependency41.from=SpikedPlattform
+dependency41.from=MovingPlattform
 dependency41.to=MyWorld
 dependency41.type=UsesDependency
-dependency42.from=SpikedPlattform
+dependency42.from=MovingPlattform
-dependency42.to=UnactiveSpike
+dependency42.to=Player
 dependency42.type=UsesDependency
-dependency43.from=TargetingProjectile
+dependency43.from=TemporaryGround
 dependency43.to=Player
 dependency43.type=UsesDependency
-dependency44.from=PlayerProjectile
+dependency44.from=SpikedPlattform
-dependency44.to=Enemy
+dependency44.to=Spike
 dependency44.type=UsesDependency
+dependency45.from=SpikedPlattform
+dependency45.to=GameOverWorld
+dependency45.type=UsesDependency
+dependency46.from=SpikedPlattform
+dependency46.to=MyWorld
+dependency46.type=UsesDependency
+dependency47.from=SpikedPlattform
+dependency47.to=UnactiveSpike
+dependency47.type=UsesDependency
+dependency48.from=TargetingProjectile
+dependency48.to=Player
+dependency48.type=UsesDependency
+dependency49.from=PlayerProjectile
+dependency49.to=Enemy
+dependency49.type=UsesDependency
 dependency5.from=MyWorld
 dependency5.to=Score
 dependency5.type=UsesDependency
@@ -136,18 +161,18 @@ dependency7.from=MyWorld
 dependency7.to=Healthbar
 dependency7.type=UsesDependency
 dependency8.from=MyWorld
-dependency8.to=MovingPlattform
+dependency8.to=Heart
 dependency8.type=UsesDependency
 dependency9.from=MyWorld
-dependency9.to=BreakingPlattform
+dependency9.to=TemporaryGround
 dependency9.type=UsesDependency
-editor.fx.0.height=739
+editor.fx.0.height=737
-editor.fx.0.width=816
+editor.fx.0.width=814
-editor.fx.0.x=552
+editor.fx.0.x=444
-editor.fx.0.y=98
+editor.fx.0.y=78
-height=1048
+height=830
-package.numDependencies=44
+package.numDependencies=49
-package.numTargets=25
+package.numTargets=26
 project.charset=UTF-8
 publish.hasSource=false
 publish.locked=true
@@ -163,182 +188,189 @@ readme.x=10
 readme.y=10
 simulation.speed=50
 target1.height=70
-target1.name=MovingPlattform
+target1.name=Heart
 target1.showInterface=false
 target1.type=ClassTarget
 target1.width=120
 target1.x=0
 target1.y=0
 target10.height=70
-target10.name=PowerUps
+target10.name=Button
 target10.showInterface=false
 target10.type=ClassTarget
 target10.width=120
 target10.x=0
 target10.y=0
 target11.height=70
-target11.name=Enemy
+target11.name=PowerUps
 target11.showInterface=false
 target11.type=ClassTarget
 target11.width=120
 target11.x=0
 target11.y=0
 target12.height=70
-target12.name=MyWorld
+target12.name=Enemy
 target12.showInterface=false
 target12.type=ClassTarget
 target12.width=120
 target12.x=0
 target12.y=0
 target13.height=70
-target13.name=Spike
+target13.name=MyWorld
 target13.showInterface=false
 target13.type=ClassTarget
 target13.width=120
 target13.x=0
 target13.y=0
 target14.height=70
-target14.name=Groundflower
+target14.name=Spike
 target14.showInterface=false
 target14.type=ClassTarget
 target14.width=120
 target14.x=0
 target14.y=0
 target15.height=70
-target15.name=Player
+target15.name=Groundflower
 target15.showInterface=false
 target15.type=ClassTarget
 target15.width=120
 target15.x=0
 target15.y=0
 target16.height=70
-target16.name=Healthbar
+target16.name=Player
 target16.showInterface=false
 target16.type=ClassTarget
 target16.width=120
 target16.x=0
 target16.y=0
 target17.height=70
-target17.name=BreakingPlattform
+target17.name=Healthbar
 target17.showInterface=false
 target17.type=ClassTarget
 target17.width=120
 target17.x=0
 target17.y=0
 target18.height=70
-target18.name=GameOverWorld
+target18.name=BreakingPlattform
 target18.showInterface=false
 target18.type=ClassTarget
 target18.width=120
 target18.x=0
 target18.y=0
 target19.height=70
-target19.name=StartWorld
+target19.name=GameOverWorld
 target19.showInterface=false
 target19.type=ClassTarget
 target19.width=120
 target19.x=0
 target19.y=0
 target2.height=70
-target2.name=Ground
+target2.name=MovingPlattform
 target2.showInterface=false
 target2.type=ClassTarget
 target2.width=120
 target2.x=0
 target2.y=0
 target20.height=70
-target20.name=Plattform
+target20.name=StartWorld
 target20.showInterface=false
 target20.type=ClassTarget
 target20.width=120
 target20.x=0
 target20.y=0
 target21.height=70
-target21.name=Projectile
+target21.name=Plattform
 target21.showInterface=false
 target21.type=ClassTarget
 target21.width=120
 target21.x=0
 target21.y=0
 target22.height=70
-target22.name=Score
+target22.name=Projectile
 target22.showInterface=false
 target22.type=ClassTarget
 target22.width=120
 target22.x=0
 target22.y=0
 target23.height=70
-target23.name=EnemyProjectile
+target23.name=Score
 target23.showInterface=false
 target23.type=ClassTarget
 target23.width=120
 target23.x=0
 target23.y=0
 target24.height=70
-target24.name=PlayerProjectile
+target24.name=EnemyProjectile
 target24.showInterface=false
 target24.type=ClassTarget
 target24.width=120
 target24.x=0
 target24.y=0
 target25.height=70
-target25.name=SpikedPlattform
+target25.name=PlayerProjectile
 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=HealthItem
+target3.name=Ground
 target3.showInterface=false
 target3.type=ClassTarget
 target3.width=120
 target3.x=0
 target3.y=0
 target4.height=70
-target4.name=UnactiveSpike
+target4.name=HealthItem
 target4.showInterface=false
 target4.type=ClassTarget
 target4.width=120
 target4.x=0
 target4.y=0
 target5.height=70
-target5.name=JumpBoostItem
+target5.name=UnactiveSpike
 target5.showInterface=false
 target5.type=ClassTarget
 target5.width=120
 target5.x=0
 target5.y=0
 target6.height=70
-target6.name=PlayerTestWorld
+target6.name=JumpBoostItem
 target6.showInterface=false
 target6.type=ClassTarget
 target6.width=120
 target6.x=0
 target6.y=0
 target7.height=70
-target7.name=TargetingProjectile
+target7.name=PlayerTestWorld
 target7.showInterface=false
 target7.type=ClassTarget
 target7.width=120
 target7.x=0
 target7.y=0
 target8.height=70
-target8.name=TemporaryGround
+target8.name=TargetingProjectile
 target8.showInterface=false
 target8.type=ClassTarget
 target8.width=120
 target8.x=0
 target8.y=0
 target9.height=70
-target9.name=Button
+target9.name=TemporaryGround
 target9.showInterface=false
 target9.type=ClassTarget
 target9.width=120
 target9.x=0
 target9.y=0
 version=3.1.0
-width=1936
+width=1550
-world.lastInstantiated=StartWorld
+world.lastInstantiated=MyWorld
 xPosition=0
 yPosition=0