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
2026-09-17 09:44:40 +02:00
parent c0c5151c41 236a363572
commit ddba231979
16 changed files with 148 additions and 139 deletions
@@ -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
+        }
    }