diff --git a/SMIMS-Game/MyWorld.class b/SMIMS-Game/MyWorld.class index e01067f..6f9f297 100644 Binary files a/SMIMS-Game/MyWorld.class and b/SMIMS-Game/MyWorld.class differ diff --git a/SMIMS-Game/TemporaryGround.class b/SMIMS-Game/TemporaryGround.class index 947413f..00b5491 100644 Binary files a/SMIMS-Game/TemporaryGround.class and b/SMIMS-Game/TemporaryGround.class differ diff --git a/SMIMS-Game/TemporaryGround.java b/SMIMS-Game/TemporaryGround.java index c00b301..d91f291 100644 --- a/SMIMS-Game/TemporaryGround.java +++ b/SMIMS-Game/TemporaryGround.java @@ -64,7 +64,7 @@ public class TemporaryGround extends Plattform Player player= this.getWorld().getObjects(Player.class).get(0); if(this.intersects(player)) { - player.setLocation(player.getX(), this.getY()-this.getImage().getHeight()); + player.setLocation(player.getX(), this.getY()-this.getImage().getHeight()-5); } } } diff --git a/SMIMS-Game/project.greenfoot b/SMIMS-Game/project.greenfoot index 454ce3e..fa49f89 100644 --- a/SMIMS-Game/project.greenfoot +++ b/SMIMS-Game/project.greenfoot @@ -1,7 +1,8 @@ #Greenfoot project file class.BreakingPlattform.image=Breaking1.png -class.Button.image=button-red.png -class.Enemy.image=bee.png +class.Button.image=Start.png +class.Enemy.image=Enemy.png +class.EnemyProjectile.image=EnemyProjectile.png class.GameOverWorld.image=GameOverBackground.png class.Ground.image=weave.jpg class.Groundflower.image=flower2.png @@ -12,13 +13,15 @@ class.MovingPlattform.image=Platform1.png class.MyWorld.image=GameBackground.png class.Plattform.image=Platform1.png class.Player.image=Player.png -class.PlayerProjectile.image=beeper.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=blue-draught.png -class.UnactiveSpike.image=inactiveSpike.png +class.TargetingProjectile.image=TargetProjectile.png +class.TemporaryGround.image=Ground.png +class.UnactiveSpike.image=Spike_Copy.png dependency1.from=PlayerTestWorld dependency1.to=Ground dependency1.type=UsesDependency @@ -32,122 +35,125 @@ 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=Healthbar -dependency37.to=Player +dependency37.from=Player +dependency37.to=Spike dependency37.type=UsesDependency -dependency38.from=Plattform -dependency38.to=MyWorld +dependency38.from=Player +dependency38.to=Heart dependency38.type=UsesDependency dependency39.from=Plattform -dependency39.to=Player +dependency39.to=MyWorld dependency39.type=UsesDependency dependency4.from=MyWorld dependency4.to=Player dependency4.type=UsesDependency -dependency40.from=MovingPlattform -dependency40.to=MyWorld +dependency40.from=Plattform +dependency40.to=Player dependency40.type=UsesDependency dependency41.from=MovingPlattform -dependency41.to=Player +dependency41.to=MyWorld dependency41.type=UsesDependency -dependency42.from=TemporaryGround +dependency42.from=MovingPlattform dependency42.to=Player dependency42.type=UsesDependency -dependency43.from=SpikedPlattform -dependency43.to=Spike +dependency43.from=TemporaryGround +dependency43.to=Player dependency43.type=UsesDependency dependency44.from=SpikedPlattform -dependency44.to=GameOverWorld +dependency44.to=Spike dependency44.type=UsesDependency dependency45.from=SpikedPlattform -dependency45.to=MyWorld +dependency45.to=GameOverWorld dependency45.type=UsesDependency dependency46.from=SpikedPlattform -dependency46.to=UnactiveSpike +dependency46.to=MyWorld dependency46.type=UsesDependency -dependency47.from=TargetingProjectile -dependency47.to=Player +dependency47.from=SpikedPlattform +dependency47.to=UnactiveSpike dependency47.type=UsesDependency -dependency48.from=PlayerProjectile -dependency48.to=Enemy +dependency48.from=TargetingProjectile +dependency48.to=Player dependency48.type=UsesDependency +dependency49.from=PlayerProjectile +dependency49.to=Enemy +dependency49.type=UsesDependency dependency5.from=MyWorld dependency5.to=Score dependency5.type=UsesDependency @@ -163,13 +169,13 @@ 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=386 -editor.fx.0.y=48 -height=830 -package.numDependencies=48 -package.numTargets=26 +editor.fx.0.height=739 +editor.fx.0.width=816 +editor.fx.0.x=734 +editor.fx.0.y=336 +height=1048 +package.numDependencies=49 +package.numTargets=25 project.charset=UTF-8 publish.hasSource=false publish.locked=true @@ -183,7 +189,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 @@ -241,21 +247,21 @@ target16.width=120 target16.x=0 target16.y=0 target17.height=70 -target17.name=Healthbar +target17.name=BreakingPlattform target17.showInterface=false target17.type=ClassTarget target17.width=120 target17.x=0 target17.y=0 target18.height=70 -target18.name=BreakingPlattform +target18.name=GameOverWorld target18.showInterface=false target18.type=ClassTarget target18.width=120 target18.x=0 target18.y=0 target19.height=70 -target19.name=GameOverWorld +target19.name=StartWorld target19.showInterface=false target19.type=ClassTarget target19.width=120 @@ -269,54 +275,47 @@ target2.width=120 target2.x=0 target2.y=0 target20.height=70 -target20.name=StartWorld +target20.name=Plattform target20.showInterface=false target20.type=ClassTarget target20.width=120 target20.x=0 target20.y=0 target21.height=70 -target21.name=Plattform +target21.name=Projectile target21.showInterface=false target21.type=ClassTarget target21.width=120 target21.x=0 target21.y=0 target22.height=70 -target22.name=Projectile +target22.name=Score target22.showInterface=false target22.type=ClassTarget target22.width=120 target22.x=0 target22.y=0 target23.height=70 -target23.name=Score +target23.name=EnemyProjectile target23.showInterface=false target23.type=ClassTarget target23.width=120 target23.x=0 target23.y=0 target24.height=70 -target24.name=EnemyProjectile +target24.name=PlayerProjectile target24.showInterface=false target24.type=ClassTarget target24.width=120 target24.x=0 target24.y=0 target25.height=70 -target25.name=PlayerProjectile +target25.name=SpikedPlattform target25.showInterface=false target25.type=ClassTarget target25.width=120 target25.x=0 target25.y=0 -target26.height=70 -target26.name=SpikedPlattform -target26.showInterface=false -target26.type=ClassTarget -target26.width=120 -target26.x=0 -target26.y=0 target3.height=70 target3.name=Ground target3.showInterface=false @@ -367,7 +366,7 @@ target9.width=120 target9.x=0 target9.y=0 version=3.1.0 -width=1550 +width=1936 world.lastInstantiated=StartWorld xPosition=0 yPosition=0