From 5b948a80243c3401d01880f8e3b9475b9875eece Mon Sep 17 00:00:00 2001
From: Nico B <nicooo349@gmail.com>
Date: Thu, 5 May 2022 14:56:06 +0200
Subject: [PATCH] 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";
+	  }
+
 
 }