diff --git a/SMIMS-Game/Healthbar.class b/SMIMS-Game/Healthbar.class deleted file mode 100644 index e21b03d..0000000 Binary files a/SMIMS-Game/Healthbar.class and /dev/null differ diff --git a/SMIMS-Game/Healthbar.ctxt b/SMIMS-Game/Healthbar.ctxt deleted file mode 100644 index e8b2d68..0000000 --- a/SMIMS-Game/Healthbar.ctxt +++ /dev/null @@ -1,8 +0,0 @@ -#BlueJ class context -comment0.target=Healthbar -comment0.text=\r\n\ Write\ a\ description\ of\ class\ Healthbar\ here.\r\n\ \r\n\ @author\ (your\ name)\ \r\n\ @version\ (a\ version\ number\ or\ a\ date)\r\n -comment1.params= -comment1.target=void\ act() -comment2.params= -comment2.target=void\ draw_health() -numComments=3 diff --git a/SMIMS-Game/Healthbar.java b/SMIMS-Game/Healthbar.java deleted file mode 100644 index bfac032..0000000 --- a/SMIMS-Game/Healthbar.java +++ /dev/null @@ -1,20 +0,0 @@ -import greenfoot.*; // (World, Actor, GreenfootImage, Greenfoot and MouseInfo) - -/** - * Write a description of class Healthbar here. - * - * @author (your name) - * @version (a version number or a date) - */ -public class Healthbar extends Actor -{ - public void act() - { - draw_health(); - } - - public void draw_health(){ - Player player = getWorld().getObjects(Player.class).get(0); - setImage(new GreenfootImage("Health:" + player.health, 24, Color.WHITE, Color.BLACK)); - } -} diff --git a/SMIMS-Game/MyWorld.class b/SMIMS-Game/MyWorld.class index 5119473..dd863af 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 7e3debd..1433875 100644 --- a/SMIMS-Game/MyWorld.java +++ b/SMIMS-Game/MyWorld.java @@ -108,6 +108,10 @@ public class MyWorld extends World { addObject(new BreakingPlattform(50), 1+Greenfoot.getRandomNumber(398), 6); //Nach Links bewegende Plattform } + if(Greenfoot.getRandomNumber(100000)>=99750) + { + addObject(new SpikedPlattform(100), 1+Greenfoot.getRandomNumber(398), 6); //Nach Links bewegende Plattform + } } public void spawnItems(){ diff --git a/SMIMS-Game/project.greenfoot b/SMIMS-Game/project.greenfoot index 454ce3e..89b2629 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.Button.image=Start.png class.Enemy.image=bee.png +class.EnemyProjectile.image=Projectile1.png class.GameOverWorld.image=GameOverBackground.png class.Ground.image=weave.jpg class.Groundflower.image=flower2.png @@ -12,13 +13,13 @@ 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.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=yellow-draught.png +class.TemporaryGround.image=TemporaryGround.png +class.UnactiveSpike.image=Spike_Copy.png dependency1.from=PlayerTestWorld dependency1.to=Ground dependency1.type=UsesDependency @@ -26,91 +27,91 @@ dependency10.from=MyWorld dependency10.to=BreakingPlattform dependency10.type=UsesDependency dependency11.from=MyWorld -dependency11.to=SpikedPlattform +dependency11.to=Groundflower dependency11.type=UsesDependency dependency12.from=MyWorld -dependency12.to=Groundflower +dependency12.to=HealthItem dependency12.type=UsesDependency dependency13.from=MyWorld -dependency13.to=Enemy +dependency13.to=JumpBoostItem dependency13.type=UsesDependency dependency14.from=MyWorld -dependency14.to=Projectile +dependency14.to=Enemy dependency14.type=UsesDependency dependency15.from=MyWorld -dependency15.to=TargetingProjectile +dependency15.to=Projectile dependency15.type=UsesDependency -dependency16.from=GameOverWorld -dependency16.to=Button +dependency16.from=MyWorld +dependency16.to=TargetingProjectile dependency16.type=UsesDependency -dependency17.from=StartWorld +dependency17.from=GameOverWorld dependency17.to=Button dependency17.type=UsesDependency -dependency18.from=UnactiveSpike -dependency18.to=SpikedPlattform +dependency18.from=StartWorld +dependency18.to=Button dependency18.type=UsesDependency dependency19.from=UnactiveSpike -dependency19.to=MyWorld +dependency19.to=SpikedPlattform dependency19.type=UsesDependency dependency2.from=PlayerTestWorld dependency2.to=Player dependency2.type=UsesDependency dependency20.from=UnactiveSpike -dependency20.to=Spike +dependency20.to=MyWorld dependency20.type=UsesDependency -dependency21.from=Button -dependency21.to=MyWorld +dependency21.from=UnactiveSpike +dependency21.to=Spike dependency21.type=UsesDependency -dependency22.from=PowerUps -dependency22.to=Player +dependency22.from=Button +dependency22.to=MyWorld dependency22.type=UsesDependency -dependency23.from=HealthItem +dependency23.from=PowerUps dependency23.to=Player dependency23.type=UsesDependency -dependency24.from=JumpBoostItem +dependency24.from=HealthItem dependency24.to=Player dependency24.type=UsesDependency -dependency25.from=Groundflower +dependency25.from=JumpBoostItem dependency25.to=Player dependency25.type=UsesDependency -dependency26.from=Enemy +dependency26.from=Groundflower dependency26.to=Player dependency26.type=UsesDependency dependency27.from=Enemy -dependency27.to=EnemyProjectile +dependency27.to=Player dependency27.type=UsesDependency -dependency28.from=Spike -dependency28.to=MyWorld +dependency28.from=Enemy +dependency28.to=EnemyProjectile dependency28.type=UsesDependency -dependency29.from=Player -dependency29.to=GameOverWorld +dependency29.from=Spike +dependency29.to=MyWorld dependency29.type=UsesDependency dependency3.from=PlayerTestWorld dependency3.to=JumpBoostItem dependency3.type=UsesDependency dependency30.from=Player -dependency30.to=Plattform +dependency30.to=GameOverWorld dependency30.type=UsesDependency dependency31.from=Player -dependency31.to=PlayerProjectile +dependency31.to=Plattform dependency31.type=UsesDependency dependency32.from=Player -dependency32.to=TemporaryGround +dependency32.to=PlayerProjectile dependency32.type=UsesDependency dependency33.from=Player -dependency33.to=Projectile +dependency33.to=TemporaryGround dependency33.type=UsesDependency dependency34.from=Player -dependency34.to=Enemy +dependency34.to=Projectile dependency34.type=UsesDependency dependency35.from=Player -dependency35.to=Spike +dependency35.to=Enemy dependency35.type=UsesDependency dependency36.from=Player -dependency36.to=Heart +dependency36.to=Spike dependency36.type=UsesDependency -dependency37.from=Healthbar -dependency37.to=Player +dependency37.from=Player +dependency37.to=Heart dependency37.type=UsesDependency dependency38.from=Plattform dependency38.to=MyWorld @@ -163,13 +164,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 +editor.fx.0.height=739 +editor.fx.0.width=816 +editor.fx.0.x=734 +editor.fx.0.y=336 +height=1048 package.numDependencies=48 -package.numTargets=26 +package.numTargets=25 project.charset=UTF-8 publish.hasSource=false publish.locked=true @@ -183,7 +184,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 @@ -241,21 +242,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 +270,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 +361,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