diff --git a/SMIMS-Game/Player.class b/SMIMS-Game/Player.class index 1f9d2f1..6ff9dce 100644 Binary files a/SMIMS-Game/Player.class and b/SMIMS-Game/Player.class differ diff --git a/SMIMS-Game/Player.java b/SMIMS-Game/Player.java index 64455ac..bebf048 100644 --- a/SMIMS-Game/Player.java +++ b/SMIMS-Game/Player.java @@ -81,7 +81,7 @@ public class Player extends Actor java.util.List platforms = getIntersectingObjects(Plattform.class); boolean landed = false; for (Plattform platform : platforms) { - int groundTop = platform.getY() - platform.getImage().getHeight() / 2; + int groundTop = platform.getY()+5 - platform.getImage().getHeight() / 2; int characterBottom = getY() + getImage().getHeight() / 2; int oldCharacterBottom = oldY + getImage().getHeight() / 2; // Prüfen, ob der Spieler von oben auf diese Plattform fällt @@ -122,7 +122,11 @@ public class Player extends Actor getWorld().removeObjects(getIntersectingObjects(Spike.class)); if (getWorld().getObjects(Heart.class) != null){ - getWorld().removeObject(getWorld().getObjects(Heart.class).get(0)); + 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"); + } } } } @@ -152,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; diff --git a/SMIMS-Game/project.greenfoot b/SMIMS-Game/project.greenfoot index 63df7cd..454ce3e 100644 --- a/SMIMS-Game/project.greenfoot +++ b/SMIMS-Game/project.greenfoot @@ -23,134 +23,131 @@ dependency1.from=PlayerTestWorld dependency1.to=Ground dependency1.type=UsesDependency dependency10.from=MyWorld -dependency10.to=MovingPlattform +dependency10.to=BreakingPlattform dependency10.type=UsesDependency dependency11.from=MyWorld -dependency11.to=BreakingPlattform +dependency11.to=SpikedPlattform dependency11.type=UsesDependency dependency12.from=MyWorld -dependency12.to=SpikedPlattform +dependency12.to=Groundflower dependency12.type=UsesDependency dependency13.from=MyWorld -dependency13.to=Groundflower +dependency13.to=Enemy dependency13.type=UsesDependency dependency14.from=MyWorld -dependency14.to=Enemy +dependency14.to=Projectile dependency14.type=UsesDependency dependency15.from=MyWorld -dependency15.to=Projectile +dependency15.to=TargetingProjectile dependency15.type=UsesDependency -dependency16.from=MyWorld -dependency16.to=TargetingProjectile +dependency16.from=GameOverWorld +dependency16.to=Button dependency16.type=UsesDependency -dependency17.from=GameOverWorld +dependency17.from=StartWorld dependency17.to=Button dependency17.type=UsesDependency -dependency18.from=StartWorld -dependency18.to=Button +dependency18.from=UnactiveSpike +dependency18.to=SpikedPlattform dependency18.type=UsesDependency dependency19.from=UnactiveSpike -dependency19.to=SpikedPlattform +dependency19.to=MyWorld dependency19.type=UsesDependency dependency2.from=PlayerTestWorld dependency2.to=Player dependency2.type=UsesDependency dependency20.from=UnactiveSpike -dependency20.to=MyWorld +dependency20.to=Spike dependency20.type=UsesDependency -dependency21.from=UnactiveSpike -dependency21.to=Spike +dependency21.from=Button +dependency21.to=MyWorld dependency21.type=UsesDependency -dependency22.from=Button -dependency22.to=MyWorld +dependency22.from=PowerUps +dependency22.to=Player dependency22.type=UsesDependency -dependency23.from=PowerUps +dependency23.from=HealthItem dependency23.to=Player dependency23.type=UsesDependency -dependency24.from=HealthItem +dependency24.from=JumpBoostItem dependency24.to=Player dependency24.type=UsesDependency -dependency25.from=JumpBoostItem +dependency25.from=Groundflower dependency25.to=Player dependency25.type=UsesDependency -dependency26.from=Groundflower +dependency26.from=Enemy dependency26.to=Player dependency26.type=UsesDependency dependency27.from=Enemy -dependency27.to=Player +dependency27.to=EnemyProjectile dependency27.type=UsesDependency -dependency28.from=Enemy -dependency28.to=EnemyProjectile +dependency28.from=Spike +dependency28.to=MyWorld dependency28.type=UsesDependency -dependency29.from=Spike -dependency29.to=MyWorld +dependency29.from=Player +dependency29.to=GameOverWorld dependency29.type=UsesDependency dependency3.from=PlayerTestWorld dependency3.to=JumpBoostItem dependency3.type=UsesDependency dependency30.from=Player -dependency30.to=GameOverWorld +dependency30.to=Plattform dependency30.type=UsesDependency dependency31.from=Player -dependency31.to=Plattform +dependency31.to=PlayerProjectile dependency31.type=UsesDependency dependency32.from=Player -dependency32.to=PlayerProjectile +dependency32.to=TemporaryGround dependency32.type=UsesDependency dependency33.from=Player -dependency33.to=TemporaryGround +dependency33.to=Projectile dependency33.type=UsesDependency dependency34.from=Player -dependency34.to=Projectile +dependency34.to=Enemy dependency34.type=UsesDependency dependency35.from=Player -dependency35.to=Enemy +dependency35.to=Spike dependency35.type=UsesDependency dependency36.from=Player -dependency36.to=Spike +dependency36.to=Heart dependency36.type=UsesDependency -dependency37.from=Player -dependency37.to=Heart +dependency37.from=Healthbar +dependency37.to=Player dependency37.type=UsesDependency -dependency38.from=Healthbar -dependency38.to=Player +dependency38.from=Plattform +dependency38.to=MyWorld dependency38.type=UsesDependency dependency39.from=Plattform -dependency39.to=MyWorld +dependency39.to=Player dependency39.type=UsesDependency dependency4.from=MyWorld dependency4.to=Player dependency4.type=UsesDependency -dependency40.from=Plattform -dependency40.to=Player +dependency40.from=MovingPlattform +dependency40.to=MyWorld dependency40.type=UsesDependency dependency41.from=MovingPlattform -dependency41.to=MyWorld +dependency41.to=Player dependency41.type=UsesDependency -dependency42.from=MovingPlattform +dependency42.from=TemporaryGround dependency42.to=Player dependency42.type=UsesDependency -dependency43.from=TemporaryGround -dependency43.to=Player +dependency43.from=SpikedPlattform +dependency43.to=Spike dependency43.type=UsesDependency dependency44.from=SpikedPlattform -dependency44.to=Spike +dependency44.to=GameOverWorld dependency44.type=UsesDependency dependency45.from=SpikedPlattform -dependency45.to=GameOverWorld +dependency45.to=MyWorld dependency45.type=UsesDependency dependency46.from=SpikedPlattform -dependency46.to=MyWorld +dependency46.to=UnactiveSpike dependency46.type=UsesDependency -dependency47.from=SpikedPlattform -dependency47.to=UnactiveSpike +dependency47.from=TargetingProjectile +dependency47.to=Player dependency47.type=UsesDependency -dependency48.from=TargetingProjectile -dependency48.to=Player +dependency48.from=PlayerProjectile +dependency48.to=Enemy dependency48.type=UsesDependency -dependency49.from=PlayerProjectile -dependency49.to=Enemy -dependency49.type=UsesDependency dependency5.from=MyWorld dependency5.to=Score dependency5.type=UsesDependency @@ -158,20 +155,20 @@ dependency6.from=MyWorld dependency6.to=Plattform dependency6.type=UsesDependency dependency7.from=MyWorld -dependency7.to=Healthbar +dependency7.to=Heart dependency7.type=UsesDependency dependency8.from=MyWorld -dependency8.to=Heart +dependency8.to=TemporaryGround dependency8.type=UsesDependency dependency9.from=MyWorld -dependency9.to=TemporaryGround +dependency9.to=MovingPlattform dependency9.type=UsesDependency editor.fx.0.height=737 editor.fx.0.width=814 -editor.fx.0.x=444 -editor.fx.0.y=78 +editor.fx.0.x=386 +editor.fx.0.y=48 height=830 -package.numDependencies=49 +package.numDependencies=48 package.numTargets=26 project.charset=UTF-8 publish.hasSource=false @@ -371,6 +368,6 @@ target9.x=0 target9.y=0 version=3.1.0 width=1550 -world.lastInstantiated=MyWorld +world.lastInstantiated=StartWorld xPosition=0 yPosition=0