From 2b41ae5b05002ff66e7849829dd1ccc7a06e591c Mon Sep 17 00:00:00 2001 From: Nico B Date: Thu, 5 May 2022 14:03:00 +0200 Subject: [PATCH 1/4] added Level5 --- GameProject/src/playground/Level5.java | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 GameProject/src/playground/Level5.java diff --git a/GameProject/src/playground/Level5.java b/GameProject/src/playground/Level5.java new file mode 100644 index 0000000..740de95 --- /dev/null +++ b/GameProject/src/playground/Level5.java @@ -0,0 +1,7 @@ +package playground; + + + +public class Level5 extends SpaceInvadersLevel{ + +} From 928e7af2c38f5a10e8ffc79d71908258cfd50135 Mon Sep 17 00:00:00 2001 From: Nico B Date: Thu, 5 May 2022 14:08:02 +0200 Subject: [PATCH 2/4] added Level6 and Level7 class --- GameProject/src/playground/Level6.java | 7 +++++++ GameProject/src/playground/Level7.java | 5 +++++ 2 files changed, 12 insertions(+) create mode 100644 GameProject/src/playground/Level6.java create mode 100644 GameProject/src/playground/Level7.java diff --git a/GameProject/src/playground/Level6.java b/GameProject/src/playground/Level6.java new file mode 100644 index 0000000..9c5e937 --- /dev/null +++ b/GameProject/src/playground/Level6.java @@ -0,0 +1,7 @@ +package playground; + +import SpacInvadersLevel; + +public class Level6 extends SpacInvadersLevel { + +} diff --git a/GameProject/src/playground/Level7.java b/GameProject/src/playground/Level7.java new file mode 100644 index 0000000..8493067 --- /dev/null +++ b/GameProject/src/playground/Level7.java @@ -0,0 +1,5 @@ +package playground; + +public class Level7 extends SpaceInvadersLevel { + +} From 5b948a80243c3401d01880f8e3b9475b9875eece Mon Sep 17 00:00:00 2001 From: Nico B Date: Thu, 5 May 2022 14:56:06 +0200 Subject: [PATCH 3/4] Finished HA03 --- GameProject/src/base/MultiLevelGame.java | 19 ++++++++++++------ GameProject/src/playground/Level5.java | 21 +++++++++++++++++++- GameProject/src/playground/Level5to7.java | 21 ++++++++++++++++++++ GameProject/src/playground/Level6.java | 24 +++++++++++++++++++++-- GameProject/src/playground/Level7.java | 22 ++++++++++++++++++++- 5 files changed, 97 insertions(+), 10 deletions(-) create mode 100644 GameProject/src/playground/Level5to7.java diff --git a/GameProject/src/base/MultiLevelGame.java b/GameProject/src/base/MultiLevelGame.java index a389d37..8d564b8 100644 --- a/GameProject/src/base/MultiLevelGame.java +++ b/GameProject/src/base/MultiLevelGame.java @@ -4,26 +4,33 @@ import java.io.IOException; import playground.Level1; import playground.Level3; +import playground.Level5; +import playground.Level6; +import playground.Level7; import playground.LevelBoss; import playground.LevelHitTwice; public class MultiLevelGame extends GameLoop { public static void main(String[] args) throws IOException { - GameLoop gl = new MultiLevelGame(); + MultiLevelGame gl = new MultiLevelGame(); gl.runGame(args); // TODO Auto-generated method stub - } @Override void defineLevels( ) { - this.addLevel(new Level1()); - this.addLevel(new LevelHitTwice()); - this.addLevel(new Level3()); - this.addLevel(new LevelBoss()); + //this.addLevel(new Level1()); + //this.addLevel(new LevelHitTwice()); + //this.addLevel(new Level3()); + //this.addLevel(new LevelBoss()); + + this.addLevel(new Level5()); + this.addLevel(new Level6()); + this.addLevel(new Level7()); + } } diff --git a/GameProject/src/playground/Level5.java b/GameProject/src/playground/Level5.java index 740de95..0e705e4 100644 --- a/GameProject/src/playground/Level5.java +++ b/GameProject/src/playground/Level5.java @@ -2,6 +2,25 @@ package playground; -public class Level5 extends SpaceInvadersLevel{ +public class Level5 extends Level5to7{ + @Override + protected int calcNrEnemies() { + return 5; + } + + @Override + protected double calcEnemySpeedX() { + return 160; + } + + @Override + protected double calcEnemySpeedY() { + return 80; + } + + @Override + protected String getStartupMessage() { + return "Level5, get ready"; + } } diff --git a/GameProject/src/playground/Level5to7.java b/GameProject/src/playground/Level5to7.java new file mode 100644 index 0000000..316038e --- /dev/null +++ b/GameProject/src/playground/Level5to7.java @@ -0,0 +1,21 @@ +package playground; + +import java.awt.Color; + +import gameobjects.GameObject; + +public class Level5to7 extends SpaceInvadersLevel { + + @Override + void actionIfEnemyIsHit(GameObject e, GameObject shot) { + + super.actionIfEnemyIsHit(e, shot); + + + System.out.println("AUA!!"); + + } + + + +} diff --git a/GameProject/src/playground/Level6.java b/GameProject/src/playground/Level6.java index 9c5e937..583d212 100644 --- a/GameProject/src/playground/Level6.java +++ b/GameProject/src/playground/Level6.java @@ -1,7 +1,27 @@ package playground; -import SpacInvadersLevel; -public class Level6 extends SpacInvadersLevel { + +public class Level6 extends Level5to7 { + + protected int calcNrEnemies() { + return 12; + } + + @Override + protected double calcEnemySpeedX() { + return 480; + } + + @Override + protected double calcEnemySpeedY() { + return 80; + } + + @Override + protected String getStartupMessage() { + return "Level6, get ready"; + } + } diff --git a/GameProject/src/playground/Level7.java b/GameProject/src/playground/Level7.java index 8493067..66e8169 100644 --- a/GameProject/src/playground/Level7.java +++ b/GameProject/src/playground/Level7.java @@ -1,5 +1,25 @@ package playground; -public class Level7 extends SpaceInvadersLevel { +public class Level7 extends Level5to7{ + + protected int calcNrEnemies() { + return 21; + } + + @Override + protected double calcEnemySpeedX() { + return 800; + } + + @Override + protected double calcEnemySpeedY() { + return 140; + } + + @Override + protected String getStartupMessage() { + return "Level7, get ready"; + } + } From 54384d9e6f5d130bebc263da4caa2152d0dd08cc Mon Sep 17 00:00:00 2001 From: Nico B Date: Thu, 5 May 2022 15:25:26 +0200 Subject: [PATCH 4/4] HA03 done --- GameProject/src/playground/Level5.java | 11 ++++++++--- GameProject/src/playground/Level6.java | 10 +++++++--- GameProject/src/playground/Level7.java | 10 +++++++--- 3 files changed, 22 insertions(+), 9 deletions(-) diff --git a/GameProject/src/playground/Level5.java b/GameProject/src/playground/Level5.java index 0e705e4..f7c8c99 100644 --- a/GameProject/src/playground/Level5.java +++ b/GameProject/src/playground/Level5.java @@ -3,19 +3,24 @@ package playground; public class Level5 extends Level5to7{ + + protected static final double ENEMYSPEEDX = 160; + protected static final double ENEMYSPEEDY = 80; + protected static final int NR_ENEMIES = 5; + @Override protected int calcNrEnemies() { - return 5; + return NR_ENEMIES; } @Override protected double calcEnemySpeedX() { - return 160; + return ENEMYSPEEDX; } @Override protected double calcEnemySpeedY() { - return 80; + return ENEMYSPEEDY; } @Override diff --git a/GameProject/src/playground/Level6.java b/GameProject/src/playground/Level6.java index 583d212..3442045 100644 --- a/GameProject/src/playground/Level6.java +++ b/GameProject/src/playground/Level6.java @@ -4,18 +4,22 @@ package playground; public class Level6 extends Level5to7 { + protected static final double ENEMYSPEEDX = 480; + protected static final double ENEMYSPEEDY = 80; + protected static final int NR_ENEMIES = 12; + protected int calcNrEnemies() { - return 12; + return NR_ENEMIES; } @Override protected double calcEnemySpeedX() { - return 480; + return ENEMYSPEEDX; } @Override protected double calcEnemySpeedY() { - return 80; + return ENEMYSPEEDY; } @Override diff --git a/GameProject/src/playground/Level7.java b/GameProject/src/playground/Level7.java index 66e8169..02b5ea1 100644 --- a/GameProject/src/playground/Level7.java +++ b/GameProject/src/playground/Level7.java @@ -2,18 +2,22 @@ package playground; public class Level7 extends Level5to7{ + protected static final double ENEMYSPEEDX = 800; + protected static final double ENEMYSPEEDY = 140; + protected static final int NR_ENEMIES =21; + protected int calcNrEnemies() { - return 21; + return NR_ENEMIES; } @Override protected double calcEnemySpeedX() { - return 800; + return ENEMYSPEEDX; } @Override protected double calcEnemySpeedY() { - return 140; + return ENEMYSPEEDY; } @Override