Merge remote-tracking branch 'origin/main'

# 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/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/MyWorld.java

@@ -59,6 +59,14 @@ public class MyWorld extends World
         plattform2.setLocation(308,382);
         Healthbar healthbar = new Healthbar();
         addObject(healthbar,50,50);
+        Heart heart = new Heart();
+        addObject(heart,371,27);
+        Heart heart2 = new Heart();
+        addObject(heart2,343,27);
+        Heart heart3 = new Heart();
+        addObject(heart3,314,27);
+
+        addObject(new TemporaryGround(60*50), 200, 575);
     }
 
     public void act()
@@ -103,6 +111,10 @@ public class MyWorld extends World
             addObject(new SpikedPlattform(100), Greenfoot.getRandomNumber(400), 6); //Nach Links bewegende Plattform
         }
 
+        if(Greenfoot.getRandomNumber(100000)>=99750)
+        {
+            addObject(new Groundflower(), Greenfoot.getRandomNumber(400), 6); //Nach Links bewegende Plattform
+        }
     }
     
     

SMIMS-Game/Plattform.java

@@ -43,7 +43,7 @@ public class Plattform extends Actor
         Player Spieler= (Player) getOneIntersectingObject(Player.class);       
         if(this.isTouching(Player.class))
         {
-            if(Spieler.getY()<this.getY()-20)
+            if(Spieler.getY()<this.getY()-39)
             {
                 return true;
             }

SMIMS-Game/Player.java

@@ -120,6 +120,9 @@ public class Player extends Actor
             getWorld().removeObjects(getIntersectingObjects(Enemy.class));
             getWorld().removeObjects(getWorld().getObjects(Spike.class));
 
+            getWorld().removeObjects(getIntersectingObjects(Spike.class));
+            getWorld().removeObject(getWorld().getObjects(Heart.class).get(0));
+            getWorld().removeObject(getWorld().getObjects(Heart.class).get(0));
         }
     }
 
@@ -159,7 +162,7 @@ public class Player extends Actor
                 }
                 else
                 {
-                    theWorld.addObject((new TemporaryGround(duration)), 200, 550);
+                    theWorld.addObject((new TemporaryGround(duration)), 200, 575);
                 }
                 break;
         }

SMIMS-Game/TemporaryGround.ctxt

@@ -12,4 +12,6 @@ comment4.params=
 comment4.target=void\ noMoreWarning()
 comment5.params=pDuration
 comment5.target=void\ RefreshLifeToDuration(int)
-numComments=6
+comment6.params=
+comment6.target=void\ Buffer()
+numComments=7

SMIMS-Game/TemporaryGround.java

@@ -23,6 +23,7 @@ public class TemporaryGround extends Plattform
     public void act()
     {
         // Add your action code here.
+        this.Buffer();
         Lebensdauer--;
         if(Lebensdauer==0)
         {
@@ -56,4 +57,15 @@ public class TemporaryGround extends Plattform
     {
         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());
+            }
+        }
+    }
 }

SMIMS-Game/project.greenfoot

@@ -1,30 +1,27 @@
 #Greenfoot project file
 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.HealthItem.image=herz.png
 class.JumpBoostItem.image=mushroom.png
 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.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.from=GameOverWorld
-dependency1.to=Ground
+dependency1.to=Button
 dependency1.type=UsesDependency
 dependency10.from=MyWorld
-dependency10.to=SpikedPlattform
+dependency10.to=BreakingPlattform
 dependency10.type=UsesDependency
 dependency11.from=MyWorld
-dependency11.to=Enemy
+dependency11.to=SpikedPlattform
 dependency11.type=UsesDependency
 dependency12.from=MyWorld
 dependency12.to=Projectile
@@ -32,130 +29,115 @@ dependency12.type=UsesDependency
 dependency13.from=MyWorld
 dependency13.to=TargetingProjectile
 dependency13.type=UsesDependency
-dependency14.from=GameOverWorld
+dependency14.from=Spike
-dependency14.to=Button
+dependency14.to=GameOverWorld
 dependency14.type=UsesDependency
-dependency15.from=StartWorld
+dependency15.from=Spike
-dependency15.to=Button
+dependency15.to=MyWorld
 dependency15.type=UsesDependency
-dependency16.from=UnactiveSpike
+dependency16.from=Spike
-dependency16.to=SpikedPlattform
+dependency16.to=Player
 dependency16.type=UsesDependency
-dependency17.from=UnactiveSpike
+dependency17.from=Player
-dependency17.to=MyWorld
+dependency17.to=GameOverWorld
 dependency17.type=UsesDependency
-dependency18.from=UnactiveSpike
+dependency18.from=Player
-dependency18.to=Spike
+dependency18.to=Plattform
 dependency18.type=UsesDependency
-dependency19.from=Button
+dependency19.from=Player
-dependency19.to=MyWorld
+dependency19.to=PlayerProjectile
 dependency19.type=UsesDependency
 dependency2.from=PlayerTestWorld
-dependency2.to=Player
+dependency2.to=Ground
 dependency2.type=UsesDependency
-dependency20.from=PowerUps
+dependency20.from=Player
-dependency20.to=Player
+dependency20.to=Projectile
 dependency20.type=UsesDependency
-dependency21.from=HealthItem
+dependency21.from=Player
-dependency21.to=Player
+dependency21.to=Enemy
 dependency21.type=UsesDependency
-dependency22.from=JumpBoostItem
+dependency22.from=UnactiveSpike
-dependency22.to=Player
+dependency22.to=SpikedPlattform
 dependency22.type=UsesDependency
-dependency23.from=Groundflower
+dependency23.from=UnactiveSpike
-dependency23.to=Player
+dependency23.to=MyWorld
 dependency23.type=UsesDependency
-dependency24.from=Enemy
+dependency24.from=UnactiveSpike
-dependency24.to=Player
+dependency24.to=Spike
 dependency24.type=UsesDependency
-dependency25.from=Enemy
+dependency25.from=Plattform
-dependency25.to=EnemyProjectile
+dependency25.to=MyWorld
 dependency25.type=UsesDependency
-dependency26.from=Spike
+dependency26.from=Plattform
-dependency26.to=MyWorld
+dependency26.to=Player
 dependency26.type=UsesDependency
-dependency27.from=Player
+dependency27.from=MovingPlattform
-dependency27.to=GameOverWorld
+dependency27.to=MyWorld
 dependency27.type=UsesDependency
-dependency28.from=Player
+dependency28.from=MovingPlattform
-dependency28.to=Plattform
+dependency28.to=Player
 dependency28.type=UsesDependency
-dependency29.from=Player
+dependency29.from=SpikedPlattform
-dependency29.to=PlayerProjectile
+dependency29.to=Spike
 dependency29.type=UsesDependency
 dependency3.from=PlayerTestWorld
-dependency3.to=JumpBoostItem
+dependency3.to=Player
 dependency3.type=UsesDependency
-dependency30.from=Player
+dependency30.from=SpikedPlattform
-dependency30.to=TemporaryGround
+dependency30.to=GameOverWorld
 dependency30.type=UsesDependency
-dependency31.from=Player
+dependency31.from=SpikedPlattform
-dependency31.to=Projectile
+dependency31.to=MyWorld
 dependency31.type=UsesDependency
-dependency32.from=Player
+dependency32.from=SpikedPlattform
-dependency32.to=Enemy
+dependency32.to=UnactiveSpike
 dependency32.type=UsesDependency
-dependency33.from=Player
+dependency33.from=TargetingProjectile
-dependency33.to=Spike
+dependency33.to=Player
 dependency33.type=UsesDependency
-dependency34.from=Healthbar
+dependency34.from=Button
-dependency34.to=Player
+dependency34.to=MyWorld
 dependency34.type=UsesDependency
-dependency35.from=Plattform
+dependency35.from=PowerUps
-dependency35.to=MyWorld
+dependency35.to=Player
 dependency35.type=UsesDependency
-dependency36.from=Plattform
+dependency36.from=JumpBoostItem
 dependency36.to=Player
 dependency36.type=UsesDependency
-dependency37.from=MovingPlattform
+dependency37.from=Enemy
-dependency37.to=MyWorld
+dependency37.to=Player
 dependency37.type=UsesDependency
-dependency38.from=MovingPlattform
+dependency38.from=Enemy
-dependency38.to=Player
+dependency38.to=EnemyProjectile
 dependency38.type=UsesDependency
-dependency39.from=SpikedPlattform
+dependency39.from=PlayerProjectile
-dependency39.to=Spike
+dependency39.to=Enemy
 dependency39.type=UsesDependency
-dependency4.from=MyWorld
+dependency4.from=PlayerTestWorld
-dependency4.to=Player
+dependency4.to=JumpBoostItem
 dependency4.type=UsesDependency
-dependency40.from=SpikedPlattform
+dependency5.from=StartWorld
-dependency40.to=GameOverWorld
+dependency5.to=Button
-dependency40.type=UsesDependency
-dependency41.from=SpikedPlattform
-dependency41.to=MyWorld
-dependency41.type=UsesDependency
-dependency42.from=SpikedPlattform
-dependency42.to=UnactiveSpike
-dependency42.type=UsesDependency
-dependency43.from=TargetingProjectile
-dependency43.to=Player
-dependency43.type=UsesDependency
-dependency44.from=PlayerProjectile
-dependency44.to=Enemy
-dependency44.type=UsesDependency
-dependency5.from=MyWorld
-dependency5.to=Score
 dependency5.type=UsesDependency
 dependency6.from=MyWorld
-dependency6.to=Plattform
+dependency6.to=Player
 dependency6.type=UsesDependency
 dependency7.from=MyWorld
-dependency7.to=Healthbar
+dependency7.to=Score
 dependency7.type=UsesDependency
 dependency8.from=MyWorld
-dependency8.to=MovingPlattform
+dependency8.to=Plattform
 dependency8.type=UsesDependency
 dependency9.from=MyWorld
-dependency9.to=BreakingPlattform
+dependency9.to=MovingPlattform
 dependency9.type=UsesDependency
 editor.fx.0.height=737
 editor.fx.0.width=814
-editor.fx.0.x=444
+editor.fx.0.x=754
-editor.fx.0.y=78
+editor.fx.0.y=45
 height=830
-package.numDependencies=44
+package.numDependencies=39
-package.numTargets=25
+package.numTargets=21
 project.charset=UTF-8
 publish.hasSource=false
 publish.locked=true
@@ -171,175 +153,147 @@ readme.x=10
 readme.y=10
 simulation.speed=50
 target1.height=70
-target1.name=MovingPlattform
+target1.name=Spike
 target1.showInterface=false
 target1.type=ClassTarget
 target1.width=120
 target1.x=0
 target1.y=0
 target10.height=70
-target10.name=PowerUps
+target10.name=StartWorld
 target10.showInterface=false
 target10.type=ClassTarget
 target10.width=120
 target10.x=0
 target10.y=0
 target11.height=70
-target11.name=Enemy
+target11.name=Plattform
 target11.showInterface=false
 target11.type=ClassTarget
 target11.width=120
 target11.x=0
 target11.y=0
 target12.height=70
-target12.name=MyWorld
+target12.name=TargetingProjectile
 target12.showInterface=false
 target12.type=ClassTarget
 target12.width=120
 target12.x=0
 target12.y=0
 target13.height=70
-target13.name=Spike
+target13.name=Projectile
 target13.showInterface=false
 target13.type=ClassTarget
 target13.width=120
 target13.x=0
 target13.y=0
 target14.height=70
-target14.name=Groundflower
+target14.name=Score
 target14.showInterface=false
 target14.type=ClassTarget
 target14.width=120
 target14.x=0
 target14.y=0
 target15.height=70
-target15.name=Player
+target15.name=Button
 target15.showInterface=false
 target15.type=ClassTarget
 target15.width=120
 target15.x=0
 target15.y=0
 target16.height=70
-target16.name=Healthbar
+target16.name=EnemyProjectile
 target16.showInterface=false
 target16.type=ClassTarget
 target16.width=120
 target16.x=0
 target16.y=0
 target17.height=70
-target17.name=BreakingPlattform
+target17.name=PowerUps
 target17.showInterface=false
 target17.type=ClassTarget
 target17.width=120
 target17.x=0
 target17.y=0
 target18.height=70
-target18.name=GameOverWorld
+target18.name=Enemy
 target18.showInterface=false
 target18.type=ClassTarget
 target18.width=120
 target18.x=0
 target18.y=0
 target19.height=70
-target19.name=StartWorld
+target19.name=PlayerProjectile
 target19.showInterface=false
 target19.type=ClassTarget
 target19.width=120
 target19.x=0
 target19.y=0
 target2.height=70
-target2.name=Ground
+target2.name=Player
 target2.showInterface=false
 target2.type=ClassTarget
 target2.width=120
 target2.x=0
 target2.y=0
 target20.height=70
-target20.name=Plattform
+target20.name=SpikedPlattform
 target20.showInterface=false
 target20.type=ClassTarget
 target20.width=120
 target20.x=0
 target20.y=0
 target21.height=70
-target21.name=Projectile
+target21.name=MyWorld
 target21.showInterface=false
 target21.type=ClassTarget
 target21.width=120
 target21.x=0
 target21.y=0
-target22.height=70
-target22.name=Score
-target22.showInterface=false
-target22.type=ClassTarget
-target22.width=120
-target22.x=0
-target22.y=0
-target23.height=70
-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=HealthItem
+target3.name=MovingPlattform
 target3.showInterface=false
 target3.type=ClassTarget
 target3.width=120
 target3.x=0
 target3.y=0
 target4.height=70
-target4.name=UnactiveSpike
+target4.name=Ground
 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=BreakingPlattform
 target7.showInterface=false
 target7.type=ClassTarget
 target7.width=120
 target7.x=0
 target7.y=0
 target8.height=70
-target8.name=TemporaryGround
+target8.name=GameOverWorld
 target8.showInterface=false
 target8.type=ClassTarget
 target8.width=120
 target8.x=0
 target8.y=0
 target9.height=70
-target9.name=Button
+target9.name=PlayerTestWorld
 target9.showInterface=false
 target9.type=ClassTarget
 target9.width=120