diff --git a/SMIMS-Game/Enemy.class b/SMIMS-Game/Enemy.class new file mode 100644 index 0000000..77ba588 Binary files /dev/null and b/SMIMS-Game/Enemy.class differ diff --git a/SMIMS-Game/Enemy.ctxt b/SMIMS-Game/Enemy.ctxt new file mode 100644 index 0000000..214f50f --- /dev/null +++ b/SMIMS-Game/Enemy.ctxt @@ -0,0 +1,7 @@ +#BlueJ class context +comment0.target=Enemy +comment1.params= +comment1.target=void\ act() +comment2.params= +comment2.target=void\ shootAtPlayer() +numComments=3 diff --git a/SMIMS-Game/Enemy.java b/SMIMS-Game/Enemy.java new file mode 100644 index 0000000..26b2436 --- /dev/null +++ b/SMIMS-Game/Enemy.java @@ -0,0 +1,22 @@ +import greenfoot.*; // (World, Actor, GreenfootImage, Greenfoot and MouseInfo) + +public class Enemy extends Actor +{ + int shootTimer; + public void act() + { + shootAtPlayer(); + } + + + public void shootAtPlayer(){ + shootTimer++; + if (shootTimer >= 100){ + Player player = getWorld().getObjects(Player.class).get(0); + EnemyProjectile enemyProjectile = new EnemyProjectile(); + getWorld().addObject(enemyProjectile, getX(), getY()); + enemyProjectile.turnTowards(player.getX(), player.getY()); + shootTimer = 0; + } + } +} diff --git a/SMIMS-Game/EnemyProjectile.class b/SMIMS-Game/EnemyProjectile.class new file mode 100644 index 0000000..82e5ff2 Binary files /dev/null and b/SMIMS-Game/EnemyProjectile.class differ diff --git a/SMIMS-Game/EnemyProjectile.ctxt b/SMIMS-Game/EnemyProjectile.ctxt new file mode 100644 index 0000000..e2a02d2 --- /dev/null +++ b/SMIMS-Game/EnemyProjectile.ctxt @@ -0,0 +1,9 @@ +#BlueJ class context +comment0.target=EnemyProjectile +comment0.text=\r\n\ Write\ a\ description\ of\ class\ EnemyProjectile\ 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() +comment1.text=\r\n\ Act\ -\ do\ whatever\ the\ EnemyProjectile\ wants\ to\ do.\ This\ method\ is\ called\ whenever\r\n\ the\ 'Act'\ or\ 'Run'\ button\ gets\ pressed\ in\ the\ environment.\r\n +comment2.params= +comment2.target=boolean\ isProjectileOnScreen() +numComments=3 diff --git a/SMIMS-Game/EnemyProjectile.java b/SMIMS-Game/EnemyProjectile.java new file mode 100644 index 0000000..0d3d0e9 --- /dev/null +++ b/SMIMS-Game/EnemyProjectile.java @@ -0,0 +1,34 @@ +import greenfoot.*; // (World, Actor, GreenfootImage, Greenfoot and MouseInfo) + +/** + * Write a description of class EnemyProjectile here. + * + * @author (your name) + * @version (a version number or a date) + */ +public class EnemyProjectile extends Projectile +{ + /** + * Act - do whatever the EnemyProjectile wants to do. This method is called whenever + * the 'Act' or 'Run' button gets pressed in the environment. + */ + public void act() + { + move(10); + if (!isProjectileOnScreen()){ + getWorld().removeObject(this); + } + } + + public boolean isProjectileOnScreen(){ + //Check Y-Value + if (getY() <= 0 || getY() >= getWorld().getHeight()-1){ + return false; + } + //Check X-Value + if (getX() <= 0 || getX() >= getWorld().getHeight()-1){ + return false; + } + return true; + } +} diff --git a/SMIMS-Game/Player.class b/SMIMS-Game/Player.class index 54dffb6..f00f6aa 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 700b5b5..0fbc75f 100644 --- a/SMIMS-Game/Player.java +++ b/SMIMS-Game/Player.java @@ -107,7 +107,8 @@ public class Player extends Actor } public boolean collision(){ - if (getIntersectingObjects(Projectile.class).size()>0) + if (getIntersectingObjects(Projectile.class).size()>0 + || getIntersectingObjects(Enemy.class).size()>0) { Greenfoot.setWorld(new GameOverWorld()); return true; diff --git a/SMIMS-Game/PlayerProjectile.class b/SMIMS-Game/PlayerProjectile.class index 104b3f9..fd9d3b1 100644 Binary files a/SMIMS-Game/PlayerProjectile.class and b/SMIMS-Game/PlayerProjectile.class differ diff --git a/SMIMS-Game/PlayerProjectile.ctxt b/SMIMS-Game/PlayerProjectile.ctxt index a107553..7865df0 100644 --- a/SMIMS-Game/PlayerProjectile.ctxt +++ b/SMIMS-Game/PlayerProjectile.ctxt @@ -5,5 +5,7 @@ comment1.params= comment1.target=void\ act() comment1.text=\r\n\ Act\ -\ do\ whatever\ the\ PlayerProjectile\ wants\ to\ do.\ This\ method\ is\ called\ whenever\r\n\ the\ 'Act'\ or\ 'Run'\ button\ gets\ pressed\ in\ the\ environment.\r\n comment2.params= -comment2.target=boolean\ isProjectileOnScreen() -numComments=3 +comment2.target=void\ checkForEnemyCollision() +comment3.params= +comment3.target=boolean\ isProjectileOnScreen() +numComments=4 diff --git a/SMIMS-Game/PlayerProjectile.java b/SMIMS-Game/PlayerProjectile.java index 4332be1..616c9dc 100644 --- a/SMIMS-Game/PlayerProjectile.java +++ b/SMIMS-Game/PlayerProjectile.java @@ -18,6 +18,14 @@ public class PlayerProjectile extends Actor if (!isProjectileOnScreen()){ getWorld().removeObject(this); } + checkForEnemyCollision(); + } + + public void checkForEnemyCollision(){ + if (getOneIntersectingObject(Enemy.class) != null){ + getWorld().removeObject(getOneIntersectingObject(Enemy.class)); + getWorld().removeObject(this); + } } public boolean isProjectileOnScreen(){ diff --git a/SMIMS-Game/images/bee.png b/SMIMS-Game/images/bee.png new file mode 100644 index 0000000..3721979 Binary files /dev/null and b/SMIMS-Game/images/bee.png differ diff --git a/SMIMS-Game/images/yellow-draught.png b/SMIMS-Game/images/yellow-draught.png new file mode 100644 index 0000000..c1c75c4 Binary files /dev/null and b/SMIMS-Game/images/yellow-draught.png differ diff --git a/SMIMS-Game/project.greenfoot b/SMIMS-Game/project.greenfoot index dcc22de..23c58f3 100644 --- a/SMIMS-Game/project.greenfoot +++ b/SMIMS-Game/project.greenfoot @@ -1,6 +1,8 @@ #Greenfoot project file class.BreakingPlattform.image=Unbenannt2.png class.Button.image=button-red.png +class.Enemy.image=bee.png +class.EnemyProjectile.image=yellow-draught.png class.GameOverWorld.image=GameOverBackground.png class.Ground.image=weave.jpg class.JumpBoostItem.image=mushroom.png @@ -8,6 +10,7 @@ class.MovingPlattform.image=Unbenannt.png class.MyWorld.image=GameBackground.png class.Plattform.image=Plattform.png class.Player.image=ppl2.png +class.PlayerProjectile.image=beeper.png class.Projectile.image=Projectile1.png class.Spike.image=Spike.png class.SpikedPlattform.image=SpikedPlattform.png @@ -18,65 +21,77 @@ dependency1.from=GameOverWorld dependency1.to=Button dependency1.type=UsesDependency dependency10.from=MyWorld -dependency10.to=BreakingPlattform +dependency10.to=Enemy dependency10.type=UsesDependency dependency11.from=MyWorld -dependency11.to=Projectile +dependency11.to=MovingPlattform dependency11.type=UsesDependency dependency12.from=MyWorld -dependency12.to=TargetingProjectile +dependency12.to=BreakingPlattform dependency12.type=UsesDependency -dependency13.from=Spike -dependency13.to=GameOverWorld +dependency13.from=MyWorld +dependency13.to=Projectile dependency13.type=UsesDependency -dependency14.from=Spike -dependency14.to=Player +dependency14.from=MyWorld +dependency14.to=TargetingProjectile dependency14.type=UsesDependency -dependency15.from=Player +dependency15.from=Spike dependency15.to=GameOverWorld 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=Player +dependency21.to=Enemy dependency21.type=UsesDependency -dependency22.from=SpikedPlattform -dependency22.to=GameOverWorld +dependency22.from=Plattform +dependency22.to=MyWorld dependency22.type=UsesDependency -dependency23.from=SpikedPlattform -dependency23.to=MyWorld +dependency23.from=Plattform +dependency23.to=Player dependency23.type=UsesDependency -dependency24.from=TargetingProjectile -dependency24.to=Player +dependency24.from=MovingPlattform +dependency24.to=MyWorld dependency24.type=UsesDependency -dependency25.from=Button -dependency25.to=MyWorld +dependency25.from=SpikedPlattform +dependency25.to=Spike dependency25.type=UsesDependency -dependency26.from=PowerUps -dependency26.to=Player +dependency26.from=SpikedPlattform +dependency26.to=GameOverWorld dependency26.type=UsesDependency -dependency27.from=JumpBoostItem -dependency27.to=Player +dependency27.from=SpikedPlattform +dependency27.to=MyWorld dependency27.type=UsesDependency +dependency28.from=TargetingProjectile +dependency28.to=Player +dependency28.type=UsesDependency +dependency29.from=Button +dependency29.to=MyWorld +dependency29.type=UsesDependency dependency3.from=PlayerTestWorld dependency3.to=Player dependency3.type=UsesDependency +dependency30.from=PowerUps +dependency30.to=Player +dependency30.type=UsesDependency +dependency31.from=JumpBoostItem +dependency31.to=Player +dependency31.type=UsesDependency dependency4.from=PlayerTestWorld dependency4.to=JumpBoostItem dependency4.type=UsesDependency @@ -93,15 +108,15 @@ dependency8.from=MyWorld dependency8.to=Plattform dependency8.type=UsesDependency dependency9.from=MyWorld -dependency9.to=MovingPlattform +dependency9.to=JumpBoostItem 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 +package.numDependencies=31 +package.numTargets=21 project.charset=UTF-8 publish.hasSource=false publish.locked=true @@ -173,19 +188,26 @@ target16.width=120 target16.x=0 target16.y=0 target17.height=70 -target17.name=SpikedPlattform +target17.name=EnemyProjectile target17.showInterface=false target17.type=ClassTarget target17.width=120 target17.x=0 target17.y=0 target18.height=70 -target18.name=MyWorld +target18.name=Enemy target18.showInterface=false target18.type=ClassTarget target18.width=120 target18.x=0 target18.y=0 +target19.height=70 +target19.name=PlayerProjectile +target19.showInterface=false +target19.type=ClassTarget +target19.width=120 +target19.x=0 +target19.y=0 target2.height=70 target2.name=Player target2.showInterface=false @@ -193,6 +215,20 @@ target2.type=ClassTarget target2.width=120 target2.x=0 target2.y=0 +target20.height=70 +target20.name=SpikedPlattform +target20.showInterface=false +target20.type=ClassTarget +target20.width=120 +target20.x=0 +target20.y=0 +target21.height=70 +target21.name=MyWorld +target21.showInterface=false +target21.type=ClassTarget +target21.width=120 +target21.x=0 +target21.y=0 target3.height=70 target3.name=MovingPlattform target3.showInterface=false