Merge remote-tracking branch 'origin/main'

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

@@ -84,6 +84,7 @@ public class MyWorld extends World
         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);
@@ -111,6 +112,21 @@ public class MyWorld extends World
             addObject(new SpikedPlattform(100), 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++;

SMIMS-Game/Player.java

@@ -54,11 +54,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,15 +122,6 @@ 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");
-                }
-            }
         }
     }
 
@@ -157,11 +150,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;