Merge remote-tracking branch 'origin/main'

# Conflicts: # SMIMS-Game/MyWorld.class # SMIMS-Game/Player.class # SMIMS-Game/Player.java # SMIMS-Game/project.greenfoot
2026-09-17 11:13:42 +02:00
parent aa07effa13 6ab5576115
commit b5bbd00cc1
7 changed files with 90 additions and 73 deletions
@@ -121,6 +121,13 @@ public class Player extends Actor
            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");
+                }
+            }
        }
    }

@@ -149,6 +156,11 @@ 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;