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.class b/SMIMS-Game/MyWorld.class index 11455a4..a24c92a 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 4e70578..b867707 100644 --- a/SMIMS-Game/MyWorld.java +++ b/SMIMS-Game/MyWorld.java @@ -86,34 +86,42 @@ public class MyWorld extends World targetingProjectile(); 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 + addObject(new BreakingPlattform(50), 1+Greenfoot.getRandomNumber(398), 6); //Nach Links bewegende Plattform } if(Greenfoot.getRandomNumber(100000)>=99750) { - addObject(new SpikedPlattform(100), Greenfoot.getRandomNumber(400), 6); //Nach Links bewegende Plattform + addObject(new SpikedPlattform(100), 1+Greenfoot.getRandomNumber(398), 6); //Nach Links bewegende Plattform } - if(Greenfoot.getRandomNumber(100000)>=99750) + if(Greenfoot.getRandomNumber(100000)>=99900) { - addObject(new Groundflower(), Greenfoot.getRandomNumber(400), 6); //Nach Links bewegende Plattform + addObject(new Groundflower(), 1+Greenfoot.getRandomNumber(398), 6); //Nach Links bewegende Plattform + } + if(Greenfoot.getRandomNumber(100000)>=99900) + { + addObject(new HealthItem(), 1+Greenfoot.getRandomNumber(398), 6); //Nach Links bewegende Plattform + } + if(Greenfoot.getRandomNumber(100000)>=99900) + { + addObject(new JumpBoostItem(), 1+Greenfoot.getRandomNumber(398), 6); //Nach Links bewegende Plattform } } 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/Player.class b/SMIMS-Game/Player.class index 38bfcc6..41d06fa 100644 Binary files a/SMIMS-Game/Player.class and b/SMIMS-Game/Player.class differ diff --git a/SMIMS-Game/Player.java b/SMIMS-Game/Player.java index d99b9e5..079e65f 100644 --- a/SMIMS-Game/Player.java +++ b/SMIMS-Game/Player.java @@ -121,7 +121,6 @@ public class Player extends Actor getWorld().removeObjects(getWorld().getObjects(Spike.class)); getWorld().removeObjects(getIntersectingObjects(Spike.class)); - getWorld().removeObject(getWorld().getObjects(Heart.class).get(0)); } } diff --git a/SMIMS-Game/project.greenfoot b/SMIMS-Game/project.greenfoot index 63df7cd..7c753c3 100644 --- a/SMIMS-Game/project.greenfoot +++ b/SMIMS-Game/project.greenfoot @@ -1,24 +1,16 @@ #Greenfoot project file class.BreakingPlattform.image=Breaking1.png -class.Button.image=button-red.png -class.Enemy.image=bee.png -class.GameOverWorld.image=GameOverBackground.png class.Ground.image=weave.jpg class.Groundflower.image=flower2.png class.HealthItem.image=Health.png -class.Heart.image=Health.png class.JumpBoostItem.image=mushroom.png -class.MovingPlattform.image=Platform1.png -class.MyWorld.image=GameBackground.png +class.MovingPlattform.image=Unbenannt.png class.Plattform.image=Platform1.png class.Player.image=Player.png -class.PlayerProjectile.image=beeper.png -class.Projectile.image=Projectile1.png -class.Spike.image=singleSpike.png -class.SpikedPlattform.image=Spikes2.png -class.StartWorld.image=StartBackground.png -class.TargetingProjectile.image=blue-draught.png -class.UnactiveSpike.image=inactiveSpike.png +class.Spike.image=Spike.png +class.SpikedPlattform.image=Spikes.png +class.TemporaryGround.image=TemporaryGround.png +class.UnactiveSpike.image=Spike_Copy.png dependency1.from=PlayerTestWorld dependency1.to=Ground dependency1.type=UsesDependency @@ -35,125 +27,128 @@ dependency13.from=MyWorld dependency13.to=Groundflower dependency13.type=UsesDependency dependency14.from=MyWorld -dependency14.to=Enemy +dependency14.to=HealthItem dependency14.type=UsesDependency dependency15.from=MyWorld -dependency15.to=Projectile +dependency15.to=JumpBoostItem dependency15.type=UsesDependency dependency16.from=MyWorld -dependency16.to=TargetingProjectile +dependency16.to=Enemy dependency16.type=UsesDependency -dependency17.from=GameOverWorld -dependency17.to=Button +dependency17.from=MyWorld +dependency17.to=Projectile dependency17.type=UsesDependency -dependency18.from=StartWorld -dependency18.to=Button +dependency18.from=MyWorld +dependency18.to=TargetingProjectile dependency18.type=UsesDependency -dependency19.from=UnactiveSpike -dependency19.to=SpikedPlattform +dependency19.from=GameOverWorld +dependency19.to=Button dependency19.type=UsesDependency dependency2.from=PlayerTestWorld dependency2.to=Player dependency2.type=UsesDependency -dependency20.from=UnactiveSpike -dependency20.to=MyWorld +dependency20.from=StartWorld +dependency20.to=Button dependency20.type=UsesDependency dependency21.from=UnactiveSpike -dependency21.to=Spike +dependency21.to=SpikedPlattform dependency21.type=UsesDependency -dependency22.from=Button +dependency22.from=UnactiveSpike dependency22.to=MyWorld dependency22.type=UsesDependency -dependency23.from=PowerUps -dependency23.to=Player +dependency23.from=UnactiveSpike +dependency23.to=Spike dependency23.type=UsesDependency -dependency24.from=HealthItem -dependency24.to=Player +dependency24.from=Button +dependency24.to=MyWorld dependency24.type=UsesDependency -dependency25.from=JumpBoostItem +dependency25.from=PowerUps dependency25.to=Player dependency25.type=UsesDependency -dependency26.from=Groundflower +dependency26.from=HealthItem dependency26.to=Player dependency26.type=UsesDependency -dependency27.from=Enemy +dependency27.from=JumpBoostItem dependency27.to=Player dependency27.type=UsesDependency -dependency28.from=Enemy -dependency28.to=EnemyProjectile +dependency28.from=Groundflower +dependency28.to=Player dependency28.type=UsesDependency -dependency29.from=Spike -dependency29.to=MyWorld +dependency29.from=Enemy +dependency29.to=Player dependency29.type=UsesDependency dependency3.from=PlayerTestWorld dependency3.to=JumpBoostItem dependency3.type=UsesDependency -dependency30.from=Player -dependency30.to=GameOverWorld +dependency30.from=Enemy +dependency30.to=EnemyProjectile dependency30.type=UsesDependency -dependency31.from=Player -dependency31.to=Plattform +dependency31.from=Spike +dependency31.to=MyWorld dependency31.type=UsesDependency dependency32.from=Player -dependency32.to=PlayerProjectile +dependency32.to=GameOverWorld dependency32.type=UsesDependency dependency33.from=Player -dependency33.to=TemporaryGround +dependency33.to=Plattform dependency33.type=UsesDependency dependency34.from=Player -dependency34.to=Projectile +dependency34.to=PlayerProjectile dependency34.type=UsesDependency dependency35.from=Player -dependency35.to=Enemy +dependency35.to=TemporaryGround dependency35.type=UsesDependency dependency36.from=Player -dependency36.to=Spike +dependency36.to=Projectile dependency36.type=UsesDependency dependency37.from=Player -dependency37.to=Heart +dependency37.to=Enemy dependency37.type=UsesDependency -dependency38.from=Healthbar -dependency38.to=Player +dependency38.from=Player +dependency38.to=Spike dependency38.type=UsesDependency -dependency39.from=Plattform -dependency39.to=MyWorld +dependency39.from=Healthbar +dependency39.to=Player dependency39.type=UsesDependency dependency4.from=MyWorld dependency4.to=Player dependency4.type=UsesDependency dependency40.from=Plattform -dependency40.to=Player +dependency40.to=MyWorld dependency40.type=UsesDependency -dependency41.from=MovingPlattform -dependency41.to=MyWorld +dependency41.from=Plattform +dependency41.to=Player dependency41.type=UsesDependency dependency42.from=MovingPlattform -dependency42.to=Player +dependency42.to=MyWorld dependency42.type=UsesDependency -dependency43.from=TemporaryGround +dependency43.from=MovingPlattform dependency43.to=Player dependency43.type=UsesDependency -dependency44.from=SpikedPlattform -dependency44.to=Spike +dependency44.from=TemporaryGround +dependency44.to=Player dependency44.type=UsesDependency dependency45.from=SpikedPlattform -dependency45.to=GameOverWorld +dependency45.to=Spike dependency45.type=UsesDependency dependency46.from=SpikedPlattform -dependency46.to=MyWorld +dependency46.to=GameOverWorld dependency46.type=UsesDependency dependency47.from=SpikedPlattform -dependency47.to=UnactiveSpike +dependency47.to=MyWorld dependency47.type=UsesDependency -dependency48.from=TargetingProjectile -dependency48.to=Player +dependency48.from=SpikedPlattform +dependency48.to=UnactiveSpike dependency48.type=UsesDependency -dependency49.from=PlayerProjectile -dependency49.to=Enemy +dependency49.from=TargetingProjectile +dependency49.to=Player 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 @@ -166,12 +161,12 @@ dependency8.type=UsesDependency dependency9.from=MyWorld dependency9.to=TemporaryGround dependency9.type=UsesDependency -editor.fx.0.height=737 -editor.fx.0.width=814 -editor.fx.0.x=444 -editor.fx.0.y=78 -height=830 -package.numDependencies=49 +editor.fx.0.height=739 +editor.fx.0.width=816 +editor.fx.0.x=734 +editor.fx.0.y=336 +height=1048 +package.numDependencies=50 package.numTargets=26 project.charset=UTF-8 publish.hasSource=false @@ -186,7 +181,7 @@ readme.name=@README readme.width=49 readme.x=10 readme.y=10 -simulation.speed=50 +simulation.speed=52 target1.height=70 target1.name=Heart target1.showInterface=false @@ -370,7 +365,7 @@ target9.width=120 target9.x=0 target9.y=0 version=3.1.0 -width=1550 -world.lastInstantiated=MyWorld +width=1936 +world.lastInstantiated=StartWorld xPosition=0 yPosition=0