diff --git a/SMIMS-Game/MovingPlattform.class b/SMIMS-Game/MovingPlattform.class index 39c1d00..074496b 100644 Binary files a/SMIMS-Game/MovingPlattform.class and b/SMIMS-Game/MovingPlattform.class differ diff --git a/SMIMS-Game/MovingPlattform.java b/SMIMS-Game/MovingPlattform.java index 7f6008c..ee1b3b7 100644 --- a/SMIMS-Game/MovingPlattform.java +++ b/SMIMS-Game/MovingPlattform.java @@ -9,7 +9,7 @@ import greenfoot.*; // (World, Actor, GreenfootImage, Greenfoot and MouseInfo) public class MovingPlattform extends Plattform { int speed; - + int temp=0; public MovingPlattform(int pSpeed) { speed= pSpeed; @@ -42,10 +42,11 @@ public class MovingPlattform extends Plattform { if(this.PlayerOnPlattform()) { - Actor DerSpieler = this.getOneObjectAtOffset(0, -40, Player.class); + World theWorld= this.getWorld(); + Player DerSpieler = theWorld.getObjects(Player.class).get(0); if(DerSpieler!=null) { - DerSpieler.setLocation(DerSpieler.getX()+speed, DerSpieler.getY()); + DerSpieler.setLocation(DerSpieler.getX()+speed*3, DerSpieler.getY()); } } } diff --git a/SMIMS-Game/project.greenfoot b/SMIMS-Game/project.greenfoot index dcc22de..01a5b8a 100644 --- a/SMIMS-Game/project.greenfoot +++ b/SMIMS-Game/project.greenfoot @@ -1,19 +1,12 @@ #Greenfoot project file class.BreakingPlattform.image=Unbenannt2.png -class.Button.image=button-red.png -class.GameOverWorld.image=GameOverBackground.png class.Ground.image=weave.jpg -class.JumpBoostItem.image=mushroom.png class.MovingPlattform.image=Unbenannt.png -class.MyWorld.image=GameBackground.png class.Plattform.image=Plattform.png class.Player.image=ppl2.png -class.Projectile.image=Projectile1.png class.Spike.image=Spike.png class.SpikedPlattform.image=SpikedPlattform.png -class.StartWorld.image=StartBackground.png -class.TargetingProjectile.image=blue-draught.png -class.UnactiveSpike.image=SpikeUnactive.png +class.UnactiveSpike.image=Spike_Copy.png dependency1.from=GameOverWorld dependency1.to=Button dependency1.type=UsesDependency @@ -21,62 +14,86 @@ dependency10.from=MyWorld dependency10.to=BreakingPlattform dependency10.type=UsesDependency dependency11.from=MyWorld -dependency11.to=Projectile +dependency11.to=SpikedPlattform dependency11.type=UsesDependency dependency12.from=MyWorld -dependency12.to=TargetingProjectile +dependency12.to=Projectile dependency12.type=UsesDependency -dependency13.from=Spike -dependency13.to=GameOverWorld +dependency13.from=MyWorld +dependency13.to=TargetingProjectile dependency13.type=UsesDependency dependency14.from=Spike -dependency14.to=Player +dependency14.to=GameOverWorld dependency14.type=UsesDependency -dependency15.from=Player -dependency15.to=GameOverWorld +dependency15.from=Spike +dependency15.to=MyWorld dependency15.type=UsesDependency -dependency16.from=Player -dependency16.to=Plattform +dependency16.from=Spike +dependency16.to=Player dependency16.type=UsesDependency dependency17.from=Player -dependency17.to=Projectile +dependency17.to=GameOverWorld dependency17.type=UsesDependency -dependency18.from=Plattform -dependency18.to=MyWorld +dependency18.from=Player +dependency18.to=Plattform dependency18.type=UsesDependency -dependency19.from=Plattform -dependency19.to=Player +dependency19.from=Player +dependency19.to=PlayerProjectile dependency19.type=UsesDependency dependency2.from=PlayerTestWorld dependency2.to=Ground dependency2.type=UsesDependency -dependency20.from=MovingPlattform -dependency20.to=MyWorld +dependency20.from=Player +dependency20.to=Projectile dependency20.type=UsesDependency -dependency21.from=SpikedPlattform -dependency21.to=Spike +dependency21.from=UnactiveSpike +dependency21.to=SpikedPlattform dependency21.type=UsesDependency -dependency22.from=SpikedPlattform -dependency22.to=GameOverWorld +dependency22.from=UnactiveSpike +dependency22.to=MyWorld dependency22.type=UsesDependency -dependency23.from=SpikedPlattform -dependency23.to=MyWorld +dependency23.from=UnactiveSpike +dependency23.to=Spike dependency23.type=UsesDependency -dependency24.from=TargetingProjectile -dependency24.to=Player +dependency24.from=Plattform +dependency24.to=MyWorld dependency24.type=UsesDependency -dependency25.from=Button -dependency25.to=MyWorld +dependency25.from=Plattform +dependency25.to=Player dependency25.type=UsesDependency -dependency26.from=PowerUps -dependency26.to=Player +dependency26.from=MovingPlattform +dependency26.to=MyWorld dependency26.type=UsesDependency -dependency27.from=JumpBoostItem +dependency27.from=MovingPlattform dependency27.to=Player dependency27.type=UsesDependency +dependency28.from=SpikedPlattform +dependency28.to=Spike +dependency28.type=UsesDependency +dependency29.from=SpikedPlattform +dependency29.to=GameOverWorld +dependency29.type=UsesDependency dependency3.from=PlayerTestWorld dependency3.to=Player dependency3.type=UsesDependency +dependency30.from=SpikedPlattform +dependency30.to=MyWorld +dependency30.type=UsesDependency +dependency31.from=SpikedPlattform +dependency31.to=UnactiveSpike +dependency31.type=UsesDependency +dependency32.from=TargetingProjectile +dependency32.to=Player +dependency32.type=UsesDependency +dependency33.from=Button +dependency33.to=MyWorld +dependency33.type=UsesDependency +dependency34.from=PowerUps +dependency34.to=Player +dependency34.type=UsesDependency +dependency35.from=JumpBoostItem +dependency35.to=Player +dependency35.type=UsesDependency dependency4.from=PlayerTestWorld dependency4.to=JumpBoostItem dependency4.type=UsesDependency @@ -95,13 +112,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=360 -editor.fx.0.y=26 -height=830 -package.numDependencies=27 -package.numTargets=18 +editor.fx.0.height=739 +editor.fx.0.width=816 +editor.fx.0.x=516 +editor.fx.0.y=224 +height=736 +package.numDependencies=35 +package.numTargets=19 project.charset=UTF-8 publish.hasSource=false publish.locked=true @@ -173,19 +190,26 @@ target16.width=120 target16.x=0 target16.y=0 target17.height=70 -target17.name=SpikedPlattform +target17.name=PlayerProjectile target17.showInterface=false target17.type=ClassTarget target17.width=120 target17.x=0 target17.y=0 target18.height=70 -target18.name=MyWorld +target18.name=SpikedPlattform target18.showInterface=false target18.type=ClassTarget target18.width=120 target18.x=0 target18.y=0 +target19.height=70 +target19.name=MyWorld +target19.showInterface=false +target19.type=ClassTarget +target19.width=120 +target19.x=0 +target19.y=0 target2.height=70 target2.name=Player target2.showInterface=false @@ -243,7 +267,7 @@ target9.width=120 target9.x=0 target9.y=0 version=3.1.0 -width=1550 -world.lastInstantiated=MyWorld -xPosition=0 -yPosition=0 +width=856 +world.lastInstantiated=StartWorld +xPosition=481 +yPosition=94