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 11455a4..0474ac3 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..9719a00 100644 --- a/SMIMS-Game/MyWorld.java +++ b/SMIMS-Game/MyWorld.java @@ -9,7 +9,7 @@ import greenfoot.*; // (World, Actor, GreenfootImage, Greenfoot and MouseInfo) public class MyWorld extends World { int PlattformCountdown; - int timer = 300; //Zeit, bevor das erste Projektil auftaucht + int timer = 600; //Zeit, bevor das erste Projektil auftaucht //kann später noch beliebig angepasst werden int targetTimer = 1000; int time = 0; @@ -57,8 +57,6 @@ public class MyWorld extends World plattform2.setLocation(320,367); plattform2.setLocation(312,371); plattform2.setLocation(308,382); - Healthbar healthbar = new Healthbar(); - addObject(healthbar,50,50); Heart heart = new Heart(); addObject(heart,371,27); Heart heart2 = new Heart(); @@ -131,7 +129,7 @@ public class MyWorld extends World if(timer == 0){ Projectile projectile = new Projectile(); addObject(projectile,Greenfoot.getRandomNumber(300)+50,0); - timer = 300; //zeitlicher Abstand + timer = 600; //zeitlicher Abstand } else{ timer = timer - 1; diff --git a/SMIMS-Game/TemporaryGround.class b/SMIMS-Game/TemporaryGround.class index d9c1db0..5c5d6ec 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 8709cc6..c7f3612 100644 --- a/SMIMS-Game/TemporaryGround.java +++ b/SMIMS-Game/TemporaryGround.java @@ -41,7 +41,7 @@ public class TemporaryGround extends Plattform public void warning() { - this.setImage("TemporaryIsBreaking.png"); + this.setImage("BreakingGround.png"); warningHasHappend=true; deWarningHasHappend=false; } diff --git a/SMIMS-Game/images/Breaking1.png b/SMIMS-Game/images/Breaking1.png index 6c93ee2..5827153 100644 Binary files a/SMIMS-Game/images/Breaking1.png and b/SMIMS-Game/images/Breaking1.png differ diff --git a/SMIMS-Game/images/BreakingGround.png b/SMIMS-Game/images/BreakingGround.png new file mode 100644 index 0000000..cd1bc03 Binary files /dev/null and b/SMIMS-Game/images/BreakingGround.png differ diff --git a/SMIMS-Game/images/EmptyTexture.png b/SMIMS-Game/images/EmptyTexture.png new file mode 100644 index 0000000..72dbab5 Binary files /dev/null and b/SMIMS-Game/images/EmptyTexture.png differ diff --git a/SMIMS-Game/images/Enemy.png b/SMIMS-Game/images/Enemy.png new file mode 100644 index 0000000..992058b Binary files /dev/null and b/SMIMS-Game/images/Enemy.png differ diff --git a/SMIMS-Game/images/EnemyProjectile.png b/SMIMS-Game/images/EnemyProjectile.png new file mode 100644 index 0000000..3e52be0 Binary files /dev/null and b/SMIMS-Game/images/EnemyProjectile.png differ diff --git a/SMIMS-Game/images/Ground.png b/SMIMS-Game/images/Ground.png new file mode 100644 index 0000000..f38e61a Binary files /dev/null and b/SMIMS-Game/images/Ground.png differ diff --git a/SMIMS-Game/images/PlayerProjectile.png b/SMIMS-Game/images/PlayerProjectile.png new file mode 100644 index 0000000..24bff07 Binary files /dev/null and b/SMIMS-Game/images/PlayerProjectile.png differ diff --git a/SMIMS-Game/images/TargetProjectile.png b/SMIMS-Game/images/TargetProjectile.png new file mode 100644 index 0000000..0132caf Binary files /dev/null and b/SMIMS-Game/images/TargetProjectile.png differ diff --git a/SMIMS-Game/project.greenfoot b/SMIMS-Game/project.greenfoot index 63df7cd..ad0de81 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.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,145 +13,140 @@ 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.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.TargetingProjectile.image=TargetProjectile.png +class.TemporaryGround.image=Ground.png +class.UnactiveSpike.image=Spike_Copy.png dependency1.from=PlayerTestWorld dependency1.to=Ground dependency1.type=UsesDependency dependency10.from=MyWorld -dependency10.to=MovingPlattform +dependency10.to=BreakingPlattform dependency10.type=UsesDependency dependency11.from=MyWorld -dependency11.to=BreakingPlattform +dependency11.to=SpikedPlattform dependency11.type=UsesDependency dependency12.from=MyWorld -dependency12.to=SpikedPlattform +dependency12.to=Groundflower dependency12.type=UsesDependency dependency13.from=MyWorld -dependency13.to=Groundflower +dependency13.to=Enemy dependency13.type=UsesDependency dependency14.from=MyWorld -dependency14.to=Enemy +dependency14.to=Projectile dependency14.type=UsesDependency dependency15.from=MyWorld -dependency15.to=Projectile +dependency15.to=TargetingProjectile dependency15.type=UsesDependency -dependency16.from=MyWorld -dependency16.to=TargetingProjectile +dependency16.from=GameOverWorld +dependency16.to=Button dependency16.type=UsesDependency -dependency17.from=GameOverWorld +dependency17.from=StartWorld dependency17.to=Button dependency17.type=UsesDependency -dependency18.from=StartWorld -dependency18.to=Button +dependency18.from=UnactiveSpike +dependency18.to=SpikedPlattform dependency18.type=UsesDependency 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=MyWorld +dependency20.to=Spike dependency20.type=UsesDependency -dependency21.from=UnactiveSpike -dependency21.to=Spike +dependency21.from=Button +dependency21.to=MyWorld dependency21.type=UsesDependency -dependency22.from=Button -dependency22.to=MyWorld +dependency22.from=PowerUps +dependency22.to=Player dependency22.type=UsesDependency -dependency23.from=PowerUps +dependency23.from=HealthItem dependency23.to=Player dependency23.type=UsesDependency -dependency24.from=HealthItem +dependency24.from=JumpBoostItem dependency24.to=Player dependency24.type=UsesDependency -dependency25.from=JumpBoostItem +dependency25.from=Groundflower dependency25.to=Player dependency25.type=UsesDependency -dependency26.from=Groundflower +dependency26.from=Enemy dependency26.to=Player dependency26.type=UsesDependency dependency27.from=Enemy -dependency27.to=Player +dependency27.to=EnemyProjectile dependency27.type=UsesDependency -dependency28.from=Enemy -dependency28.to=EnemyProjectile +dependency28.from=Spike +dependency28.to=MyWorld dependency28.type=UsesDependency -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=Player -dependency30.to=GameOverWorld +dependency30.to=Plattform dependency30.type=UsesDependency dependency31.from=Player -dependency31.to=Plattform +dependency31.to=PlayerProjectile dependency31.type=UsesDependency dependency32.from=Player -dependency32.to=PlayerProjectile +dependency32.to=TemporaryGround dependency32.type=UsesDependency dependency33.from=Player -dependency33.to=TemporaryGround +dependency33.to=Projectile dependency33.type=UsesDependency dependency34.from=Player -dependency34.to=Projectile +dependency34.to=Enemy dependency34.type=UsesDependency dependency35.from=Player -dependency35.to=Enemy +dependency35.to=Spike dependency35.type=UsesDependency dependency36.from=Player -dependency36.to=Spike +dependency36.to=Heart dependency36.type=UsesDependency -dependency37.from=Player -dependency37.to=Heart +dependency37.from=Plattform +dependency37.to=MyWorld dependency37.type=UsesDependency -dependency38.from=Healthbar +dependency38.from=Plattform dependency38.to=Player dependency38.type=UsesDependency -dependency39.from=Plattform +dependency39.from=MovingPlattform dependency39.to=MyWorld dependency39.type=UsesDependency dependency4.from=MyWorld dependency4.to=Player dependency4.type=UsesDependency -dependency40.from=Plattform +dependency40.from=MovingPlattform dependency40.to=Player dependency40.type=UsesDependency -dependency41.from=MovingPlattform -dependency41.to=MyWorld +dependency41.from=TemporaryGround +dependency41.to=Player dependency41.type=UsesDependency -dependency42.from=MovingPlattform -dependency42.to=Player +dependency42.from=SpikedPlattform +dependency42.to=Spike dependency42.type=UsesDependency -dependency43.from=TemporaryGround -dependency43.to=Player +dependency43.from=SpikedPlattform +dependency43.to=GameOverWorld dependency43.type=UsesDependency dependency44.from=SpikedPlattform -dependency44.to=Spike +dependency44.to=MyWorld dependency44.type=UsesDependency dependency45.from=SpikedPlattform -dependency45.to=GameOverWorld +dependency45.to=UnactiveSpike dependency45.type=UsesDependency -dependency46.from=SpikedPlattform -dependency46.to=MyWorld +dependency46.from=TargetingProjectile +dependency46.to=Player dependency46.type=UsesDependency -dependency47.from=SpikedPlattform -dependency47.to=UnactiveSpike +dependency47.from=PlayerProjectile +dependency47.to=Enemy dependency47.type=UsesDependency -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 @@ -158,21 +154,21 @@ 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=444 -editor.fx.0.y=78 -height=830 -package.numDependencies=49 -package.numTargets=26 +editor.fx.0.x=535 +editor.fx.0.y=44 +height=822 +package.numDependencies=47 +package.numTargets=25 project.charset=UTF-8 publish.hasSource=false publish.locked=true @@ -244,21 +240,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 @@ -272,54 +268,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 @@ -371,6 +360,6 @@ target9.x=0 target9.y=0 version=3.1.0 width=1550 -world.lastInstantiated=MyWorld +world.lastInstantiated=StartWorld xPosition=0 yPosition=0