diff --git a/SMIMS-Game/MovingPlattform.class b/SMIMS-Game/MovingPlattform.class index 074496b..6f8af43 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 ee1b3b7..1c05e0f 100644 --- a/SMIMS-Game/MovingPlattform.java +++ b/SMIMS-Game/MovingPlattform.java @@ -46,7 +46,7 @@ public class MovingPlattform extends Plattform Player DerSpieler = theWorld.getObjects(Player.class).get(0); if(DerSpieler!=null) { - DerSpieler.setLocation(DerSpieler.getX()+speed*3, DerSpieler.getY()); + DerSpieler.setLocation(DerSpieler.getX()+speed*2, DerSpieler.getY()); } } } diff --git a/SMIMS-Game/MyWorld.java b/SMIMS-Game/MyWorld.java index f40c30f..be1d08a 100644 --- a/SMIMS-Game/MyWorld.java +++ b/SMIMS-Game/MyWorld.java @@ -86,32 +86,28 @@ public class MyWorld extends World spawnItems(); if(PlattformCountdown==0) //Damit in regelmäßigen Abständen auf jeden Fall eine Plattform auftaucht { - addObject(new Plattform(), Greenfoot.getRandomNumber(400), 5); + addObject(new Plattform(), 1+Greenfoot.getRandomNumber(398), 5); PlattformCountdown=50; } PlattformCountdown--; if(Greenfoot.getRandomNumber(100000)>=99800) { - addObject(new Plattform(), Greenfoot.getRandomNumber(400), 5); + addObject(new Plattform(), 1+Greenfoot.getRandomNumber(398), 5); } if(Greenfoot.getRandomNumber(100000)>=99900) { - addObject(new MovingPlattform(2), Greenfoot.getRandomNumber(400), 6); //Nach Rechts bewegende Plattform + addObject(new MovingPlattform(1), 1+Greenfoot.getRandomNumber(398), 6); //Nach Rechts bewegende Plattform } if(Greenfoot.getRandomNumber(100000)>=99900) { - addObject(new MovingPlattform(-2), Greenfoot.getRandomNumber(400), 6); //Nach Links bewegende Plattform + addObject(new MovingPlattform(-1), 1+Greenfoot.getRandomNumber(398), 6); //Nach Links bewegende Plattform } if(Greenfoot.getRandomNumber(100000)>=99750) { - addObject(new BreakingPlattform(50), Greenfoot.getRandomNumber(400), 6); //Nach Links bewegende Plattform - } - if(Greenfoot.getRandomNumber(100000)>=99750) - { - addObject(new SpikedPlattform(100), Greenfoot.getRandomNumber(400), 6); //Nach Links bewegende Plattform + addObject(new BreakingPlattform(50), 1+Greenfoot.getRandomNumber(398), 6); //Nach Links bewegende Plattform } } - + public void spawnItems(){ itemTimer++; if (itemTimer >= 575){ diff --git a/SMIMS-Game/Plattform.class b/SMIMS-Game/Plattform.class index 870c595..59b11e1 100644 Binary files a/SMIMS-Game/Plattform.class and b/SMIMS-Game/Plattform.class differ diff --git a/SMIMS-Game/Plattform.java b/SMIMS-Game/Plattform.java index 64ea5f9..f721f34 100644 --- a/SMIMS-Game/Plattform.java +++ b/SMIMS-Game/Plattform.java @@ -40,10 +40,10 @@ public class Plattform extends Actor public boolean PlayerOnPlattform() { - Player Spieler= (Player) getOneIntersectingObject(Player.class); - if(this.isTouching(Player.class)) + Player Spieler= (Player) this.getWorld().getObjects(Player.class).get(0); + if(Spieler.getX()+(Spieler.getImage().getWidth()/2)>=this.getX()-(this.getImage().getWidth()/2) && Spieler.getX()-(Spieler.getImage().getWidth()/2)<=this.getX()+(this.getImage().getWidth()/2)) { - if(Spieler.getY()=this.getY()-(this.getImage().getHeight()/2)) { return true; } diff --git a/SMIMS-Game/project.greenfoot b/SMIMS-Game/project.greenfoot index bf5a778..454ce3e 100644 --- a/SMIMS-Game/project.greenfoot +++ b/SMIMS-Game/project.greenfoot @@ -1,10 +1,7 @@ #Greenfoot project file class.BreakingPlattform.image=Breaking1.png class.Button.image=button-red.png -class.Enemy.image=Enemy.png -class.EnemyProjectile.image=EnemyProjectile.png class.Enemy.image=bee.png -class.EnemyProjectile.image=yellow-draught.png class.GameOverWorld.image=GameOverBackground.png class.Ground.image=weave.jpg class.Groundflower.image=flower2.png @@ -20,11 +17,7 @@ class.Projectile.image=Projectile1.png class.Spike.image=singleSpike.png class.SpikedPlattform.image=Spikes2.png class.StartWorld.image=StartBackground.png -class.TargetingProjectile.image=TargetProjectile.png -class.TemporaryGround.image=Ground.png -class.UnactiveSpike.image=Spike_Copy.png class.TargetingProjectile.image=blue-draught.png -class.TemporaryGround.image=TemporaryGround.png class.UnactiveSpike.image=inactiveSpike.png dependency1.from=PlayerTestWorld dependency1.to=Ground @@ -39,205 +32,143 @@ dependency12.from=MyWorld dependency12.to=Groundflower dependency12.type=UsesDependency dependency13.from=MyWorld -dependency13.to=HealthItem +dependency13.to=Enemy dependency13.type=UsesDependency dependency14.from=MyWorld -dependency14.to=JumpBoostItem +dependency14.to=Projectile dependency14.type=UsesDependency dependency15.from=MyWorld -dependency15.to=Enemy +dependency15.to=TargetingProjectile dependency15.type=UsesDependency -dependency16.from=MyWorld -dependency16.to=Projectile +dependency16.from=GameOverWorld +dependency16.to=Button dependency16.type=UsesDependency -dependency17.from=MyWorld -dependency17.to=TargetingProjectile +dependency17.from=StartWorld +dependency17.to=Button dependency17.type=UsesDependency -dependency18.from=GameOverWorld -dependency18.to=Button -dependency18.from=StartWorld -dependency18.to=Button +dependency18.from=UnactiveSpike +dependency18.to=SpikedPlattform dependency18.type=UsesDependency -dependency19.from=StartWorld -dependency19.to=Button 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=SpikedPlattform -dependency20.to=MyWorld +dependency20.to=Spike dependency20.type=UsesDependency -dependency21.from=UnactiveSpike +dependency21.from=Button dependency21.to=MyWorld -dependency21.from=UnactiveSpike -dependency21.to=Spike dependency21.type=UsesDependency -dependency22.from=UnactiveSpike -dependency22.to=Spike -dependency22.from=Button -dependency22.to=MyWorld +dependency22.from=PowerUps +dependency22.to=Player dependency22.type=UsesDependency -dependency23.from=Button -dependency23.to=MyWorld -dependency23.from=PowerUps +dependency23.from=HealthItem dependency23.to=Player dependency23.type=UsesDependency -dependency24.from=PowerUps -dependency24.from=HealthItem +dependency24.from=JumpBoostItem dependency24.to=Player dependency24.type=UsesDependency -dependency25.from=HealthItem -dependency25.from=JumpBoostItem +dependency25.from=Groundflower dependency25.to=Player dependency25.type=UsesDependency -dependency26.from=JumpBoostItem -dependency26.from=Groundflower +dependency26.from=Enemy dependency26.to=Player dependency26.type=UsesDependency -dependency27.from=Groundflower -dependency27.to=Player dependency27.from=Enemy -dependency27.to=Player +dependency27.to=EnemyProjectile dependency27.type=UsesDependency -dependency28.from=Enemy -dependency28.to=Player -dependency28.from=Enemy -dependency28.to=EnemyProjectile +dependency28.from=Spike +dependency28.to=MyWorld dependency28.type=UsesDependency -dependency29.from=Enemy -dependency29.to=EnemyProjectile -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=Spike -dependency30.to=MyWorld dependency30.from=Player -dependency30.to=GameOverWorld +dependency30.to=Plattform dependency30.type=UsesDependency dependency31.from=Player -dependency31.to=GameOverWorld -dependency31.to=Plattform +dependency31.to=PlayerProjectile dependency31.type=UsesDependency dependency32.from=Player -dependency32.to=Plattform -dependency32.to=PlayerProjectile +dependency32.to=TemporaryGround dependency32.type=UsesDependency dependency33.from=Player -dependency33.to=PlayerProjectile -dependency33.to=TemporaryGround +dependency33.to=Projectile dependency33.type=UsesDependency dependency34.from=Player -dependency34.to=TemporaryGround -dependency34.to=Projectile +dependency34.to=Enemy dependency34.type=UsesDependency dependency35.from=Player -dependency35.to=Projectile -dependency35.to=Enemy +dependency35.to=Spike dependency35.type=UsesDependency dependency36.from=Player -dependency36.to=Enemy -dependency36.to=Spike +dependency36.to=Heart dependency36.type=UsesDependency -dependency37.from=Player -dependency37.to=Spike -dependency37.from=Player -dependency37.to=Heart +dependency37.from=Healthbar +dependency37.to=Player dependency37.type=UsesDependency -dependency38.from=Player -dependency38.to=Heart -dependency38.from=Healthbar -dependency38.to=Player +dependency38.from=Plattform +dependency38.to=MyWorld dependency38.type=UsesDependency -dependency39.from=Healthbar -dependency39.to=Player 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.from=MovingPlattform dependency40.to=MyWorld -dependency40.from=Plattform -dependency40.to=Player dependency40.type=UsesDependency -dependency41.from=Plattform -dependency41.to=Player dependency41.from=MovingPlattform -dependency41.to=MyWorld +dependency41.to=Player dependency41.type=UsesDependency -dependency42.from=MovingPlattform -dependency42.to=MyWorld -dependency42.from=MovingPlattform +dependency42.from=TemporaryGround dependency42.to=Player dependency42.type=UsesDependency -dependency43.from=MovingPlattform -dependency43.to=Player -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=Spike +dependency44.to=GameOverWorld dependency44.type=UsesDependency dependency45.from=SpikedPlattform -dependency45.to=Spike -dependency45.to=GameOverWorld +dependency45.to=MyWorld dependency45.type=UsesDependency dependency46.from=SpikedPlattform -dependency46.to=GameOverWorld -dependency46.to=MyWorld +dependency46.to=UnactiveSpike dependency46.type=UsesDependency -dependency47.from=SpikedPlattform -dependency47.to=MyWorld -dependency47.from=SpikedPlattform -dependency47.to=UnactiveSpike +dependency47.from=TargetingProjectile +dependency47.to=Player dependency47.type=UsesDependency -dependency48.from=SpikedPlattform -dependency48.to=UnactiveSpike -dependency48.from=TargetingProjectile -dependency48.to=Player +dependency48.from=PlayerProjectile +dependency48.to=Enemy dependency48.type=UsesDependency -dependency49.from=TargetingProjectile -dependency49.to=Player -dependency49.type=UsesDependency -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 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=668 -editor.fx.0.y=120 -editor.fx.0.x=444 -editor.fx.0.y=78 +editor.fx.0.x=386 +editor.fx.0.y=48 height=830 -package.numDependencies=50 -package.numDependencies=49 +package.numDependencies=48 package.numTargets=26 project.charset=UTF-8 publish.hasSource=false