diff --git a/SMIMS-Game/MyWorld.class b/SMIMS-Game/MyWorld.class index 84d2f4b..3c0dfa4 100644 Binary files a/SMIMS-Game/MyWorld.class and b/SMIMS-Game/MyWorld.class differ diff --git a/SMIMS-Game/MyWorld.java b/SMIMS-Game/MyWorld.java index 22df2ce..be63965 100644 --- a/SMIMS-Game/MyWorld.java +++ b/SMIMS-Game/MyWorld.java @@ -109,7 +109,7 @@ public class MyWorld extends World } if(Greenfoot.getRandomNumber(100000)>=99750) { - addObject(new SpikedPlattform(100), 1+Greenfoot.getRandomNumber(398), 6); //Nach Links bewegende Plattform + addObject(new SpikedPlattform(40), 1+Greenfoot.getRandomNumber(398), 6); //Nach Links bewegende Plattform } } diff --git a/SMIMS-Game/SpikedPlattform.class b/SMIMS-Game/SpikedPlattform.class index 4ccb4ad..5a451d6 100644 Binary files a/SMIMS-Game/SpikedPlattform.class and b/SMIMS-Game/SpikedPlattform.class differ diff --git a/SMIMS-Game/SpikedPlattform.java b/SMIMS-Game/SpikedPlattform.java index 4b7ae8d..6f2a995 100644 --- a/SMIMS-Game/SpikedPlattform.java +++ b/SMIMS-Game/SpikedPlattform.java @@ -36,10 +36,6 @@ public class SpikedPlattform extends Plattform { this.spikeTheSurface(); } - if(isSpiked && this.PlayerOnPlattform()) - { - Greenfoot.setWorld(new GameOverWorld()); - } super.act(); } diff --git a/SMIMS-Game/project.greenfoot b/SMIMS-Game/project.greenfoot index 07a5f84..af1f224 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=button-red.png +class.Button.image=Start.png class.Enemy.image=Enemy.png class.EnemyProjectile.image=EnemyProjectile.png class.GameOverWorld.image=GameOverBackground.png @@ -15,8 +15,9 @@ 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.SpikedPlattform.image=Spikes.png class.StartWorld.image=StartBackground.png class.TargetingProjectile.image=TargetProjectile.png class.TemporaryGround.image=Ground.png @@ -34,119 +35,122 @@ dependency12.from=MyWorld dependency12.to=Groundflower dependency12.type=UsesDependency dependency13.from=MyWorld -dependency13.to=Enemy +dependency13.to=HealthItem dependency13.type=UsesDependency dependency14.from=MyWorld -dependency14.to=Projectile +dependency14.to=JumpBoostItem dependency14.type=UsesDependency dependency15.from=MyWorld -dependency15.to=TargetingProjectile +dependency15.to=Enemy dependency15.type=UsesDependency -dependency16.from=GameOverWorld -dependency16.to=Button +dependency16.from=MyWorld +dependency16.to=Projectile dependency16.type=UsesDependency -dependency17.from=StartWorld -dependency17.to=Button +dependency17.from=MyWorld +dependency17.to=TargetingProjectile dependency17.type=UsesDependency -dependency18.from=UnactiveSpike -dependency18.to=SpikedPlattform +dependency18.from=GameOverWorld +dependency18.to=Button dependency18.type=UsesDependency -dependency19.from=UnactiveSpike -dependency19.to=MyWorld +dependency19.from=StartWorld +dependency19.to=Button dependency19.type=UsesDependency dependency2.from=PlayerTestWorld dependency2.to=Player dependency2.type=UsesDependency dependency20.from=UnactiveSpike -dependency20.to=Spike +dependency20.to=SpikedPlattform dependency20.type=UsesDependency -dependency21.from=Button +dependency21.from=UnactiveSpike dependency21.to=MyWorld dependency21.type=UsesDependency -dependency22.from=PowerUps -dependency22.to=Player +dependency22.from=UnactiveSpike +dependency22.to=Spike dependency22.type=UsesDependency -dependency23.from=HealthItem -dependency23.to=Player +dependency23.from=Button +dependency23.to=MyWorld dependency23.type=UsesDependency -dependency24.from=JumpBoostItem +dependency24.from=PowerUps dependency24.to=Player dependency24.type=UsesDependency -dependency25.from=Groundflower +dependency25.from=HealthItem dependency25.to=Player dependency25.type=UsesDependency -dependency26.from=Enemy +dependency26.from=JumpBoostItem dependency26.to=Player dependency26.type=UsesDependency -dependency27.from=Enemy -dependency27.to=EnemyProjectile +dependency27.from=Groundflower +dependency27.to=Player dependency27.type=UsesDependency -dependency28.from=Spike -dependency28.to=MyWorld +dependency28.from=Enemy +dependency28.to=Player dependency28.type=UsesDependency -dependency29.from=Player -dependency29.to=GameOverWorld +dependency29.from=Enemy +dependency29.to=EnemyProjectile dependency29.type=UsesDependency dependency3.from=PlayerTestWorld dependency3.to=JumpBoostItem dependency3.type=UsesDependency -dependency30.from=Player -dependency30.to=Plattform +dependency30.from=Spike +dependency30.to=MyWorld dependency30.type=UsesDependency dependency31.from=Player -dependency31.to=PlayerProjectile +dependency31.to=GameOverWorld dependency31.type=UsesDependency dependency32.from=Player -dependency32.to=TemporaryGround +dependency32.to=Plattform dependency32.type=UsesDependency dependency33.from=Player -dependency33.to=Projectile +dependency33.to=PlayerProjectile dependency33.type=UsesDependency dependency34.from=Player -dependency34.to=Enemy +dependency34.to=TemporaryGround dependency34.type=UsesDependency dependency35.from=Player -dependency35.to=Spike +dependency35.to=Projectile dependency35.type=UsesDependency dependency36.from=Player -dependency36.to=Heart +dependency36.to=Enemy dependency36.type=UsesDependency -dependency37.from=Plattform -dependency37.to=MyWorld +dependency37.from=Player +dependency37.to=Spike dependency37.type=UsesDependency dependency38.from=Plattform -dependency38.to=Player +dependency38.to=MyWorld dependency38.type=UsesDependency -dependency39.from=MovingPlattform -dependency39.to=MyWorld +dependency39.from=Plattform +dependency39.to=Player dependency39.type=UsesDependency dependency4.from=MyWorld dependency4.to=Player dependency4.type=UsesDependency dependency40.from=MovingPlattform -dependency40.to=Player +dependency40.to=MyWorld dependency40.type=UsesDependency -dependency41.from=TemporaryGround +dependency41.from=MovingPlattform dependency41.to=Player dependency41.type=UsesDependency -dependency42.from=SpikedPlattform -dependency42.to=Spike +dependency42.from=TemporaryGround +dependency42.to=Player dependency42.type=UsesDependency dependency43.from=SpikedPlattform -dependency43.to=GameOverWorld +dependency43.to=Spike dependency43.type=UsesDependency dependency44.from=SpikedPlattform -dependency44.to=MyWorld +dependency44.to=GameOverWorld dependency44.type=UsesDependency dependency45.from=SpikedPlattform -dependency45.to=UnactiveSpike +dependency45.to=MyWorld dependency45.type=UsesDependency -dependency46.from=TargetingProjectile -dependency46.to=Player +dependency46.from=SpikedPlattform +dependency46.to=UnactiveSpike dependency46.type=UsesDependency -dependency47.from=PlayerProjectile -dependency47.to=Enemy +dependency47.from=TargetingProjectile +dependency47.to=Player dependency47.type=UsesDependency +dependency48.from=PlayerProjectile +dependency48.to=Enemy +dependency48.type=UsesDependency dependency5.from=MyWorld dependency5.to=Score dependency5.type=UsesDependency @@ -162,12 +166,12 @@ dependency8.type=UsesDependency dependency9.from=MyWorld dependency9.to=MovingPlattform dependency9.type=UsesDependency -editor.fx.0.height=737 -editor.fx.0.width=814 -editor.fx.0.x=535 -editor.fx.0.y=44 -height=408 -package.numDependencies=47 +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 package.numTargets=25 project.charset=UTF-8 publish.hasSource=false @@ -182,7 +186,7 @@ readme.name=@README readme.width=49 readme.x=10 readme.y=10 -simulation.speed=50 +simulation.speed=51 target1.height=70 target1.name=Heart target1.showInterface=false @@ -359,7 +363,7 @@ target9.width=120 target9.x=0 target9.y=0 version=3.1.0 -width=1550 +width=1936 world.lastInstantiated=StartWorld xPosition=0 -yPosition=48 +yPosition=0