diff --git a/SMIMS-Game/SpikedPlattform.java b/SMIMS-Game/SpikedPlattform.java index 85c1609..6f2a995 100644 --- a/SMIMS-Game/SpikedPlattform.java +++ b/SMIMS-Game/SpikedPlattform.java @@ -36,11 +36,6 @@ public class SpikedPlattform extends Plattform { this.spikeTheSurface(); } - if(isSpiked && this.PlayerOnPlattform()) - { - MyWorld world = (MyWorld) getWorld(); - Greenfoot.setWorld(new GameOverWorld(world.score)); - } super.act(); } diff --git a/SMIMS-Game/project.greenfoot b/SMIMS-Game/project.greenfoot index 572a9fe..27f35bf 100644 --- a/SMIMS-Game/project.greenfoot +++ b/SMIMS-Game/project.greenfoot @@ -1,6 +1,6 @@ #Greenfoot project file class.BreakingPlattform.image=Breaking1.png -class.Button.image=Start.png +class.Button.image=button-red.png class.Enemy.image=Enemy.png class.EnemyProjectile.image=EnemyProjectile.png class.GameOverWorld.image=JUMP\ \u2018N\u2019\ RUNj.png @@ -15,11 +15,8 @@ class.Plattform.image=Platform1.png class.Player.image=Player.png class.PlayerProjectile.image=PlayerProjectile.png class.Projectile.image=Projectile1.png -class.Score.image=Score1.png class.Spike.image=singleSpike.png class.SpikedPlattform.image=Spikes2.png -class.StartWorld.image=Startbild.png -class.SpikedPlattform.image=Spikes.png class.StartWorld.image=StartBackground.png class.TargetingProjectile.image=TargetProjectile.png class.TemporaryGround.image=Ground.png @@ -56,164 +53,109 @@ dependency18.to=Button dependency18.type=UsesDependency dependency19.from=GameOverWorld dependency19.to=Score -dependency19.from=StartWorld -dependency19.to=Button dependency19.type=UsesDependency dependency2.from=PlayerTestWorld dependency2.to=Player dependency2.type=UsesDependency dependency20.from=StartWorld dependency20.to=Button -dependency20.from=UnactiveSpike -dependency20.to=SpikedPlattform dependency20.type=UsesDependency dependency21.from=UnactiveSpike dependency21.to=SpikedPlattform -dependency21.from=UnactiveSpike -dependency21.to=MyWorld dependency21.type=UsesDependency dependency22.from=UnactiveSpike dependency22.to=MyWorld -dependency22.from=UnactiveSpike -dependency22.to=Spike dependency22.type=UsesDependency dependency23.from=UnactiveSpike dependency23.to=Spike -dependency23.from=Button -dependency23.to=MyWorld dependency23.type=UsesDependency -dependency24.from=PowerUps -dependency24.to=Player dependency24.from=Button dependency24.to=MyWorld dependency24.type=UsesDependency -dependency25.from=HealthItem dependency25.from=PowerUps dependency25.to=Player dependency25.type=UsesDependency -dependency26.from=JumpBoostItem dependency26.from=HealthItem dependency26.to=Player dependency26.type=UsesDependency -dependency27.from=Groundflower -dependency27.to=Player dependency27.from=JumpBoostItem dependency27.to=Player dependency27.type=UsesDependency -dependency28.from=Enemy -dependency28.to=Player dependency28.from=Groundflower dependency28.to=Player dependency28.type=UsesDependency dependency29.from=Enemy dependency29.to=Player -dependency29.from=Enemy -dependency29.to=EnemyProjectile dependency29.type=UsesDependency dependency3.from=PlayerTestWorld dependency3.to=JumpBoostItem dependency3.type=UsesDependency dependency30.from=Enemy dependency30.to=EnemyProjectile -dependency30.from=Spike -dependency30.to=MyWorld dependency30.type=UsesDependency dependency31.from=Spike dependency31.to=MyWorld -dependency31.from=Player -dependency31.to=GameOverWorld dependency31.type=UsesDependency dependency32.from=Player -dependency32.to=Plattform -dependency32.to=MyWorld +dependency32.to=GameOverWorld dependency32.type=UsesDependency dependency33.from=Player -dependency33.to=PlayerProjectile -dependency33.to=GameOverWorld +dependency33.to=Plattform dependency33.type=UsesDependency dependency34.from=Player -dependency34.to=Plattform -dependency34.to=TemporaryGround +dependency34.to=PlayerProjectile dependency34.type=UsesDependency dependency35.from=Player -dependency35.to=PlayerProjectile -dependency35.to=Projectile +dependency35.to=TemporaryGround dependency35.type=UsesDependency dependency36.from=Player -dependency36.to=TemporaryGround -dependency36.to=Enemy +dependency36.to=Projectile dependency36.type=UsesDependency dependency37.from=Player -dependency37.to=Projectile -dependency37.from=Player -dependency37.to=Spike +dependency37.to=Enemy dependency37.type=UsesDependency dependency38.from=Player -dependency38.to=Enemy -dependency38.from=Plattform -dependency38.to=MyWorld +dependency38.to=Spike dependency38.type=UsesDependency -dependency39.from=Player -dependency39.to=Spike dependency39.from=Plattform -dependency39.to=Player +dependency39.to=MyWorld dependency39.type=UsesDependency dependency4.from=MyWorld dependency4.to=Player dependency4.type=UsesDependency dependency40.from=Plattform -dependency40.to=MyWorld -dependency40.from=MovingPlattform -dependency40.to=MyWorld +dependency40.to=Player dependency40.type=UsesDependency -dependency41.from=Plattform dependency41.from=MovingPlattform -dependency41.to=Player +dependency41.to=MyWorld dependency41.type=UsesDependency -dependency42.from=TemporaryGround -dependency42.to=Player dependency42.from=MovingPlattform -dependency42.to=MyWorld +dependency42.to=Player dependency42.type=UsesDependency -dependency43.from=MovingPlattform +dependency43.from=TemporaryGround dependency43.to=Player -dependency43.from=SpikedPlattform -dependency43.to=Spike dependency43.type=UsesDependency -dependency44.from=TemporaryGround -dependency44.to=Player dependency44.from=SpikedPlattform -dependency44.to=GameOverWorld +dependency44.to=Spike dependency44.type=UsesDependency dependency45.from=SpikedPlattform -dependency45.to=MyWorld -dependency45.to=Spike +dependency45.to=GameOverWorld dependency45.type=UsesDependency dependency46.from=SpikedPlattform -dependency46.to=UnactiveSpike -dependency46.from=SpikedPlattform dependency46.to=MyWorld dependency46.type=UsesDependency -dependency47.from=TargetingProjectile -dependency47.to=Player dependency47.from=SpikedPlattform -dependency47.to=GameOverWorld +dependency47.to=UnactiveSpike dependency47.type=UsesDependency -dependency48.from=PlayerProjectile -dependency48.to=Enemy +dependency48.from=TargetingProjectile +dependency48.to=Player dependency48.type=UsesDependency -dependency48.from=SpikedPlattform -dependency48.to=UnactiveSpike -dependency48.type=UsesDependency -dependency49.from=TargetingProjectile -dependency49.to=Player +dependency49.from=PlayerProjectile +dependency49.to=Enemy dependency49.type=UsesDependency dependency5.from=MyWorld dependency5.to=Score dependency5.type=UsesDependency -dependency50.from=PlayerProjectile -dependency50.to=Enemy -dependency50.type=UsesDependency dependency6.from=MyWorld dependency6.to=Plattform dependency6.type=UsesDependency @@ -226,18 +168,12 @@ dependency8.type=UsesDependency dependency9.from=MyWorld dependency9.to=MovingPlattform dependency9.type=UsesDependency -editor.fx.0.height=0 -editor.fx.0.width=0 -editor.fx.0.x=0 -editor.fx.0.y=0 -height=1048 -package.numDependencies=48 -editor.fx.0.height=737 -editor.fx.0.width=808 -editor.fx.0.x=204 -editor.fx.0.y=64 +editor.fx.0.height=607 +editor.fx.0.width=1092 +editor.fx.0.x=223 +editor.fx.0.y=111 height=830 -package.numDependencies=50 +package.numDependencies=49 package.numTargets=25 project.charset=UTF-8 publish.hasSource=false @@ -252,7 +188,7 @@ readme.name=@README readme.width=49 readme.x=10 readme.y=10 -simulation.speed=51 +simulation.speed=50 target1.height=70 target1.name=Heart target1.showInterface=false @@ -432,4 +368,4 @@ version=3.1.0 width=1550 world.lastInstantiated=StartWorld xPosition=0 -yPosition=48 +yPosition=0