Adds health & color (depending on health)

src/entity/EnemyShip.java

@@ -1,6 +1,7 @@
 package entity;
 
 import java.awt.Color;
+import java.util.HashMap;
 
 import engine.Cooldown;
 import engine.Core;
@@ -22,13 +23,22 @@ public class EnemyShip extends Entity {
 	private static final int C_TYPE_POINTS = 30;
 	/** Point value of a bonus enemy. */
 	private static final int BONUS_TYPE_POINTS = 100;
+	/** Different health values with their corresponding colors. */
+	private static final HashMap<Integer, Color> HEALTH_COLOR_CODES =
+ new HashMap<Integer, Color>(){{
+ put(1, Color.WHITE);
+ put(3, Color.GREEN);
+ put(5, Color.BLUE);
+ }};
 
 	/** Cooldown between sprite changes. */
 	private Cooldown animationCooldown;
 	/** Checks if the ship has been hit by a bullet. */
 	private boolean isDestroyed;
 	/** Values of the ship, in points, when destroyed. */
 	private int pointValue;
+	/** Health value of the ship, when spawned */
+	private int health;
 
 	/**
  * Constructor, establishes the ship's properties.
@@ -39,14 +49,17 @@ public class EnemyShip extends Entity {
  * Initial position of the ship in the Y axis.
  * @param spriteType
  * Sprite type, image corresponding to the ship.
+ * @param health
+ * Initial health of the ship.
  */
 	public EnemyShip(final int positionX, final int positionY,
- final SpriteType spriteType) {
- super(positionX, positionY, 12 * 2, 8 * 2, Color.WHITE);
+ final SpriteType spriteType, final int health) {
+ super(positionX, positionY, 12 * 2, 8 * 2, HEALTH_COLOR_CODES.get(health));
 
  this.spriteType = spriteType;
  this.animationCooldown = Core.getCooldown(500);
  this.isDestroyed = false;
+ this.health = health;
 
  switch (this.spriteType) {
  case EnemyShipA1:
@@ -141,6 +154,16 @@ public final void destroy() {
  this.spriteType = SpriteType.Explosion;
 	}
 
+	/**
+ * Reduces the health of the ship by 1 and changes the
+ * color of the ship when a specific health was reached.
+ */
+	public final void reduceHealth() {
+ this.health--;
+ if (HEALTH_COLOR_CODES.containsKey(this.health))
+ this.setColor(HEALTH_COLOR_CODES.get(this.health));
+	}
+
 	/**
  * Checks if the ship has been destroyed.
  * 
@@ -149,4 +172,13 @@ public final void destroy() {
 	public final boolean isDestroyed() {
  return this.isDestroyed;
 	}
-}
+
+	/**
+ * Returns the current remaining health.
+ *
+ * @return Integer value of the health field.
+ */
+	public final int getHealth() {
+ return this.health;
+	}
+}

src/entity/EnemyShipFormation.java

@@ -103,7 +103,7 @@ private enum Direction {
  LEFT,
  /** Movement to the bottom of the screen. */
  DOWN
-	};
+	}
 
 	/**
  * Constructor, sets the initial conditions.
@@ -149,7 +149,7 @@ else if (i / (float) this.nShipsHigh < PROPORTION_B
  column.add(new EnemyShip((SEPARATION_DISTANCE 
  * this.enemyShips.indexOf(column))
  + positionX, (SEPARATION_DISTANCE * i)
- + positionY, spriteType));
+ + positionY, spriteType, 1));
  this.shipCount++;
  }
  }

src/entity/Entity.java

@@ -57,6 +57,14 @@ public final Color getColor() {
  return color;
 	}
 
+	/**
+ * Setter for the color of the entity.
+ *
+ * @param color
+ * New color of the entity.
+ */
+	public final void setColor(Color color) { this.color = color; }
+
 	/**
  * Getter for the X axis position of the entity.
  * 

src/screen/GameScreen.java

@@ -82,7 +82,7 @@ public class GameScreen extends Screen {
  * Current game state.
  * @param gameSettings
  * Current game settings.
- * @param bonnusLife
+ * @param bonusLife
  * Checks if a bonus life is awarded this level.
  * @param width
  * Screen width.
@@ -318,9 +318,12 @@ private void manageCollisions() {
  for (EnemyShip enemyShip : this.enemyShipFormation)
  if (!enemyShip.isDestroyed()
  && checkCollision(bullet, enemyShip)) {
- this.score += enemyShip.getPointValue();
- this.shipsDestroyed++;
- this.enemyShipFormation.destroy(enemyShip);
+ enemyShip.reduceHealth();
+ if (enemyShip.getHealth() == 0) {
+ this.score += enemyShip.getPointValue();
+ this.shipsDestroyed++;
+ this.enemyShipFormation.destroy(enemyShip);
+ }
  recyclable.add(bullet);
  }
  if (this.enemyShipSpecial != null

test/entity/EnemyShipTest.java

@@ -0,0 +1,40 @@
+package entity;
+
+import engine.DrawManager.SpriteType;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.awt.*;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class EnemyShipTest {
+
+ EnemyShip testShip;
+
+ @BeforeEach
+ void setUp() {
+ // positionX, positionY and spriteType are just placeholders
+ // they are not necessary for our tests
+ testShip = new EnemyShip(0, 0, SpriteType.EnemyShipA1, 5);
+ }
+
+ @Test
+ void getHealth() {
+ assertEquals(5, testShip.getHealth());
+ }
+
+ @Test
+ void reduceHealthWithoutColorChange() {
+ testShip.reduceHealth();
+ assertEquals(4, testShip.getHealth());
+ }
+
+ @Test
+ void reduceHealthWithColorChange() {
+ testShip.reduceHealth();
+ testShip.reduceHealth();
+ assertEquals(3, testShip.getHealth());
+ assertEquals(Color.GREEN, testShip.getColor());
+ }
+}

test/entity/EntityTest.java

@@ -0,0 +1,31 @@
+package entity;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.awt.*;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class EntityTest {
+
+ Entity testEntity;
+
+ @BeforeEach
+ void setUp() {
+ // positionX, positionY, width and height are just placeholders
+ // they are not necessary for our tests
+ testEntity = new Entity(0,0,0,0, Color.WHITE);
+ }
+
+ @Test
+ void getColor() {
+ assertEquals(Color.WHITE, testEntity.getColor());
+ }
+
+ @Test
+ void setColor() {
+ testEntity.setColor(Color.GREEN);
+ assertEquals(Color.GREEN, testEntity.getColor());
+ }
+}

src/entity/EnemyShip.java

@@ -1,6 +1,7 @@
 package entity;
 
 import java.awt.Color;
+import java.util.HashMap;
 
 import engine.Cooldown;
 import engine.Core;
@@ -22,13 +23,22 @@ public class EnemyShip extends Entity {
 	private static final int C_TYPE_POINTS = 30;
 	/** Point value of a bonus enemy. */
 	private static final int BONUS_TYPE_POINTS = 100;
+	/** Different health values with their corresponding colors. */
+	private static final HashMap<Integer, Color> HEALTH_COLOR_CODES =
+ new HashMap<Integer, Color>(){{
+ put(1, Color.WHITE);
+ put(3, Color.GREEN);
+ put(5, Color.BLUE);
+ }};
 
 	/** Cooldown between sprite changes. */
 	private Cooldown animationCooldown;
 	/** Checks if the ship has been hit by a bullet. */
 	private boolean isDestroyed;
 	/** Values of the ship, in points, when destroyed. */
 	private int pointValue;
+	/** Health value of the ship, when spawned */
+	private int health;
 
 	/**
  * Constructor, establishes the ship's properties.
@@ -39,14 +49,17 @@ public class EnemyShip extends Entity {
  * Initial position of the ship in the Y axis.
  * @param spriteType
  * Sprite type, image corresponding to the ship.
+ * @param health
+ * Initial health of the ship.
  */
 	public EnemyShip(final int positionX, final int positionY,
- final SpriteType spriteType) {
- super(positionX, positionY, 12 * 2, 8 * 2, Color.WHITE);
+ final SpriteType spriteType, final int health) {
+ super(positionX, positionY, 12 * 2, 8 * 2, HEALTH_COLOR_CODES.get(health));
 
  this.spriteType = spriteType;
  this.animationCooldown = Core.getCooldown(500);
  this.isDestroyed = false;
+ this.health = health;
 
  switch (this.spriteType) {
  case EnemyShipA1:
@@ -141,6 +154,16 @@ public final void destroy() {
  this.spriteType = SpriteType.Explosion;
 	}
 
+	/**
+ * Reduces the health of the ship by 1 and changes the
+ * color of the ship when a specific health was reached.
+ */
+	public final void reduceHealth() {
+ this.health--;
+ if (HEALTH_COLOR_CODES.containsKey(this.health))
+ this.setColor(HEALTH_COLOR_CODES.get(this.health));
+	}
+
 	/**
  * Checks if the ship has been destroyed.
  * 
@@ -149,4 +172,13 @@ public final void destroy() {
 	public final boolean isDestroyed() {
  return this.isDestroyed;
 	}
-}
+
+	/**
+ * Returns the current remaining health.
+ *
+ * @return Integer value of the health field.
+ */
+	public final int getHealth() {
+ return this.health;
+	}
+}

src/entity/EnemyShipFormation.java

@@ -103,7 +103,7 @@ private enum Direction {
  LEFT,
  /** Movement to the bottom of the screen. */
  DOWN
-	};
+	}
 
 	/**
  * Constructor, sets the initial conditions.
@@ -149,7 +149,7 @@ else if (i / (float) this.nShipsHigh < PROPORTION_B
  column.add(new EnemyShip((SEPARATION_DISTANCE 
  * this.enemyShips.indexOf(column))
  + positionX, (SEPARATION_DISTANCE * i)
- + positionY, spriteType));
+ + positionY, spriteType, 1));
  this.shipCount++;
  }
  }

src/entity/Entity.java

@@ -57,6 +57,14 @@ public final Color getColor() {
  return color;
 	}
 
+	/**
+ * Setter for the color of the entity.
+ *
+ * @param color
+ * New color of the entity.
+ */
+	public final void setColor(Color color) { this.color = color; }
+
 	/**
  * Getter for the X axis position of the entity.
  * 

src/screen/GameScreen.java

@@ -82,7 +82,7 @@ public class GameScreen extends Screen {
  * Current game state.
  * @param gameSettings
  * Current game settings.
- * @param bonnusLife
+ * @param bonusLife
  * Checks if a bonus life is awarded this level.
  * @param width
  * Screen width.
@@ -318,9 +318,12 @@ private void manageCollisions() {
  for (EnemyShip enemyShip : this.enemyShipFormation)
  if (!enemyShip.isDestroyed()
  && checkCollision(bullet, enemyShip)) {
- this.score += enemyShip.getPointValue();
- this.shipsDestroyed++;
- this.enemyShipFormation.destroy(enemyShip);
+ enemyShip.reduceHealth();
+ if (enemyShip.getHealth() == 0) {
+ this.score += enemyShip.getPointValue();
+ this.shipsDestroyed++;
+ this.enemyShipFormation.destroy(enemyShip);
+ }
  recyclable.add(bullet);
  }
  if (this.enemyShipSpecial != null

test/entity/EnemyShipTest.java

@@ -0,0 +1,40 @@
+package entity;
+
+import engine.DrawManager.SpriteType;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.awt.*;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class EnemyShipTest {
+
+ EnemyShip testShip;
+
+ @BeforeEach
+ void setUp() {
+ // positionX, positionY and spriteType are just placeholders
+ // they are not necessary for our tests
+ testShip = new EnemyShip(0, 0, SpriteType.EnemyShipA1, 5);
+ }
+
+ @Test
+ void getHealth() {
+ assertEquals(5, testShip.getHealth());
+ }
+
+ @Test
+ void reduceHealthWithoutColorChange() {
+ testShip.reduceHealth();
+ assertEquals(4, testShip.getHealth());
+ }
+
+ @Test
+ void reduceHealthWithColorChange() {
+ testShip.reduceHealth();
+ testShip.reduceHealth();
+ assertEquals(3, testShip.getHealth());
+ assertEquals(Color.GREEN, testShip.getColor());
+ }
+}

test/entity/EntityTest.java

@@ -0,0 +1,31 @@
+package entity;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.awt.*;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class EntityTest {
+
+ Entity testEntity;
+
+ @BeforeEach
+ void setUp() {
+ // positionX, positionY, width and height are just placeholders
+ // they are not necessary for our tests
+ testEntity = new Entity(0,0,0,0, Color.WHITE);
+ }
+
+ @Test
+ void getColor() {
+ assertEquals(Color.WHITE, testEntity.getColor());
+ }
+
+ @Test
+ void setColor() {
+ testEntity.setColor(Color.GREEN);
+ assertEquals(Color.GREEN, testEntity.getColor());
+ }
+}

src/entity/EnemyShip.java

@@ -1,6 +1,7 @@
 package entity;
 
 import java.awt.Color;
+import java.util.HashMap;
 
 import engine.Cooldown;
 import engine.Core;
@@ -22,13 +23,22 @@ public class EnemyShip extends Entity {
 	private static final int C_TYPE_POINTS = 30;
 	/** Point value of a bonus enemy. */
 	private static final int BONUS_TYPE_POINTS = 100;
+	/** Different health values with their corresponding colors. */
+	private static final HashMap<Integer, Color> HEALTH_COLOR_CODES =
+ new HashMap<Integer, Color>(){{
+ put(1, Color.WHITE);
+ put(3, Color.GREEN);
+ put(5, Color.BLUE);
+ }};
 
 	/** Cooldown between sprite changes. */
 	private Cooldown animationCooldown;
 	/** Checks if the ship has been hit by a bullet. */
 	private boolean isDestroyed;
 	/** Values of the ship, in points, when destroyed. */
 	private int pointValue;
+	/** Health value of the ship, when spawned */
+	private int health;
 
 	/**
  * Constructor, establishes the ship's properties.
@@ -39,14 +49,17 @@ public class EnemyShip extends Entity {
  * Initial position of the ship in the Y axis.
  * @param spriteType
  * Sprite type, image corresponding to the ship.
+ * @param health
+ * Initial health of the ship.
  */
 	public EnemyShip(final int positionX, final int positionY,
- final SpriteType spriteType) {
- super(positionX, positionY, 12 * 2, 8 * 2, Color.WHITE);
+ final SpriteType spriteType, final int health) {
+ super(positionX, positionY, 12 * 2, 8 * 2, HEALTH_COLOR_CODES.get(health));
 
  this.spriteType = spriteType;
  this.animationCooldown = Core.getCooldown(500);
  this.isDestroyed = false;
+ this.health = health;
 
  switch (this.spriteType) {
  case EnemyShipA1:
@@ -141,6 +154,16 @@ public final void destroy() {
  this.spriteType = SpriteType.Explosion;
 	}
 
+	/**
+ * Reduces the health of the ship by 1 and changes the
+ * color of the ship when a specific health was reached.
+ */
+	public final void reduceHealth() {
+ this.health--;
+ if (HEALTH_COLOR_CODES.containsKey(this.health))
+ this.setColor(HEALTH_COLOR_CODES.get(this.health));
+	}
+
 	/**
  * Checks if the ship has been destroyed.
  * 
@@ -149,4 +172,13 @@ public final void destroy() {
 	public final boolean isDestroyed() {
  return this.isDestroyed;
 	}
-}
+
+	/**
+ * Returns the current remaining health.
+ *
+ * @return Integer value of the health field.
+ */
+	public final int getHealth() {
+ return this.health;
+	}
+}

src/entity/EnemyShipFormation.java

@@ -103,7 +103,7 @@ private enum Direction {
  LEFT,
  /** Movement to the bottom of the screen. */
  DOWN
-	};
+	}
 
 	/**
  * Constructor, sets the initial conditions.
@@ -149,7 +149,7 @@ else if (i / (float) this.nShipsHigh < PROPORTION_B
  column.add(new EnemyShip((SEPARATION_DISTANCE 
  * this.enemyShips.indexOf(column))
  + positionX, (SEPARATION_DISTANCE * i)
- + positionY, spriteType));
+ + positionY, spriteType, 1));
  this.shipCount++;
  }
  }

src/entity/Entity.java

@@ -57,6 +57,14 @@ public final Color getColor() {
  return color;
 	}
 
+	/**
+ * Setter for the color of the entity.
+ *
+ * @param color
+ * New color of the entity.
+ */
+	public final void setColor(Color color) { this.color = color; }
+
 	/**
  * Getter for the X axis position of the entity.
  * 

src/screen/GameScreen.java

@@ -82,7 +82,7 @@ public class GameScreen extends Screen {
  * Current game state.
  * @param gameSettings
  * Current game settings.
- * @param bonnusLife
+ * @param bonusLife
  * Checks if a bonus life is awarded this level.
  * @param width
  * Screen width.
@@ -318,9 +318,12 @@ private void manageCollisions() {
  for (EnemyShip enemyShip : this.enemyShipFormation)
  if (!enemyShip.isDestroyed()
  && checkCollision(bullet, enemyShip)) {
- this.score += enemyShip.getPointValue();
- this.shipsDestroyed++;
- this.enemyShipFormation.destroy(enemyShip);
+ enemyShip.reduceHealth();
+ if (enemyShip.getHealth() == 0) {
+ this.score += enemyShip.getPointValue();
+ this.shipsDestroyed++;
+ this.enemyShipFormation.destroy(enemyShip);
+ }
  recyclable.add(bullet);
  }
  if (this.enemyShipSpecial != null

test/entity/EnemyShipTest.java

@@ -0,0 +1,40 @@
+package entity;
+
+import engine.DrawManager.SpriteType;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.awt.*;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class EnemyShipTest {
+
+ EnemyShip testShip;
+
+ @BeforeEach
+ void setUp() {
+ // positionX, positionY and spriteType are just placeholders
+ // they are not necessary for our tests
+ testShip = new EnemyShip(0, 0, SpriteType.EnemyShipA1, 5);
+ }
+
+ @Test
+ void getHealth() {
+ assertEquals(5, testShip.getHealth());
+ }
+
+ @Test
+ void reduceHealthWithoutColorChange() {
+ testShip.reduceHealth();
+ assertEquals(4, testShip.getHealth());
+ }
+
+ @Test
+ void reduceHealthWithColorChange() {
+ testShip.reduceHealth();
+ testShip.reduceHealth();
+ assertEquals(3, testShip.getHealth());
+ assertEquals(Color.GREEN, testShip.getColor());
+ }
+}

test/entity/EntityTest.java

@@ -0,0 +1,31 @@
+package entity;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.awt.*;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class EntityTest {
+
+ Entity testEntity;
+
+ @BeforeEach
+ void setUp() {
+ // positionX, positionY, width and height are just placeholders
+ // they are not necessary for our tests
+ testEntity = new Entity(0,0,0,0, Color.WHITE);
+ }
+
+ @Test
+ void getColor() {
+ assertEquals(Color.WHITE, testEntity.getColor());
+ }
+
+ @Test
+ void setColor() {
+ testEntity.setColor(Color.GREEN);
+ assertEquals(Color.GREEN, testEntity.getColor());
+ }
+}

src/entity/EnemyShip.java

@@ -1,6 +1,7 @@
 package entity;
 
 import java.awt.Color;
+import java.util.HashMap;
 
 import engine.Cooldown;
 import engine.Core;
@@ -22,13 +23,22 @@ public class EnemyShip extends Entity {
 	private static final int C_TYPE_POINTS = 30;
 	/** Point value of a bonus enemy. */
 	private static final int BONUS_TYPE_POINTS = 100;
+	/** Different health values with their corresponding colors. */
+	private static final HashMap<Integer, Color> HEALTH_COLOR_CODES =
+ new HashMap<Integer, Color>(){{
+ put(1, Color.WHITE);
+ put(3, Color.GREEN);
+ put(5, Color.BLUE);
+ }};
 
 	/** Cooldown between sprite changes. */
 	private Cooldown animationCooldown;
 	/** Checks if the ship has been hit by a bullet. */
 	private boolean isDestroyed;
 	/** Values of the ship, in points, when destroyed. */
 	private int pointValue;
+	/** Health value of the ship, when spawned */
+	private int health;
 
 	/**
  * Constructor, establishes the ship's properties.
@@ -39,14 +49,17 @@ public class EnemyShip extends Entity {
  * Initial position of the ship in the Y axis.
  * @param spriteType
  * Sprite type, image corresponding to the ship.
+ * @param health
+ * Initial health of the ship.
  */
 	public EnemyShip(final int positionX, final int positionY,
- final SpriteType spriteType) {
- super(positionX, positionY, 12 * 2, 8 * 2, Color.WHITE);
+ final SpriteType spriteType, final int health) {
+ super(positionX, positionY, 12 * 2, 8 * 2, HEALTH_COLOR_CODES.get(health));
 
  this.spriteType = spriteType;
  this.animationCooldown = Core.getCooldown(500);
  this.isDestroyed = false;
+ this.health = health;
 
  switch (this.spriteType) {
  case EnemyShipA1:
@@ -141,6 +154,16 @@ public final void destroy() {
  this.spriteType = SpriteType.Explosion;
 	}
 
+	/**
+ * Reduces the health of the ship by 1 and changes the
+ * color of the ship when a specific health was reached.
+ */
+	public final void reduceHealth() {
+ this.health--;
+ if (HEALTH_COLOR_CODES.containsKey(this.health))
+ this.setColor(HEALTH_COLOR_CODES.get(this.health));
+	}
+
 	/**
  * Checks if the ship has been destroyed.
  * 
@@ -149,4 +172,13 @@ public final void destroy() {
 	public final boolean isDestroyed() {
  return this.isDestroyed;
 	}
-}
+
+	/**
+ * Returns the current remaining health.
+ *
+ * @return Integer value of the health field.
+ */
+	public final int getHealth() {
+ return this.health;
+	}
+}

src/entity/EnemyShipFormation.java

@@ -103,7 +103,7 @@ private enum Direction {
  LEFT,
  /** Movement to the bottom of the screen. */
  DOWN
-	};
+	}
 
 	/**
  * Constructor, sets the initial conditions.
@@ -149,7 +149,7 @@ else if (i / (float) this.nShipsHigh < PROPORTION_B
  column.add(new EnemyShip((SEPARATION_DISTANCE 
  * this.enemyShips.indexOf(column))
  + positionX, (SEPARATION_DISTANCE * i)
- + positionY, spriteType));
+ + positionY, spriteType, 1));
  this.shipCount++;
  }
  }

src/entity/Entity.java

@@ -57,6 +57,14 @@ public final Color getColor() {
  return color;
 	}
 
+	/**
+ * Setter for the color of the entity.
+ *
+ * @param color
+ * New color of the entity.
+ */
+	public final void setColor(Color color) { this.color = color; }
+
 	/**
  * Getter for the X axis position of the entity.
  * 

src/screen/GameScreen.java

@@ -82,7 +82,7 @@ public class GameScreen extends Screen {
  * Current game state.
  * @param gameSettings
  * Current game settings.
- * @param bonnusLife
+ * @param bonusLife
  * Checks if a bonus life is awarded this level.
  * @param width
  * Screen width.
@@ -318,9 +318,12 @@ private void manageCollisions() {
  for (EnemyShip enemyShip : this.enemyShipFormation)
  if (!enemyShip.isDestroyed()
  && checkCollision(bullet, enemyShip)) {
- this.score += enemyShip.getPointValue();
- this.shipsDestroyed++;
- this.enemyShipFormation.destroy(enemyShip);
+ enemyShip.reduceHealth();
+ if (enemyShip.getHealth() == 0) {
+ this.score += enemyShip.getPointValue();
+ this.shipsDestroyed++;
+ this.enemyShipFormation.destroy(enemyShip);
+ }
  recyclable.add(bullet);
  }
  if (this.enemyShipSpecial != null

test/entity/EnemyShipTest.java

@@ -0,0 +1,40 @@
+package entity;
+
+import engine.DrawManager.SpriteType;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.awt.*;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class EnemyShipTest {
+
+ EnemyShip testShip;
+
+ @BeforeEach
+ void setUp() {
+ // positionX, positionY and spriteType are just placeholders
+ // they are not necessary for our tests
+ testShip = new EnemyShip(0, 0, SpriteType.EnemyShipA1, 5);
+ }
+
+ @Test
+ void getHealth() {
+ assertEquals(5, testShip.getHealth());
+ }
+
+ @Test
+ void reduceHealthWithoutColorChange() {
+ testShip.reduceHealth();
+ assertEquals(4, testShip.getHealth());
+ }
+
+ @Test
+ void reduceHealthWithColorChange() {
+ testShip.reduceHealth();
+ testShip.reduceHealth();
+ assertEquals(3, testShip.getHealth());
+ assertEquals(Color.GREEN, testShip.getColor());
+ }
+}

test/entity/EntityTest.java

@@ -0,0 +1,31 @@
+package entity;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.awt.*;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class EntityTest {
+
+ Entity testEntity;
+
+ @BeforeEach
+ void setUp() {
+ // positionX, positionY, width and height are just placeholders
+ // they are not necessary for our tests
+ testEntity = new Entity(0,0,0,0, Color.WHITE);
+ }
+
+ @Test
+ void getColor() {
+ assertEquals(Color.WHITE, testEntity.getColor());
+ }
+
+ @Test
+ void setColor() {
+ testEntity.setColor(Color.GREEN);
+ assertEquals(Color.GREEN, testEntity.getColor());
+ }
+}

src/entity/EnemyShip.java

@@ -1,6 +1,7 @@
 package entity;
 
 import java.awt.Color;
+import java.util.HashMap;
 
 import engine.Cooldown;
 import engine.Core;
@@ -22,13 +23,22 @@ public class EnemyShip extends Entity {
 	private static final int C_TYPE_POINTS = 30;
 	/** Point value of a bonus enemy. */
 	private static final int BONUS_TYPE_POINTS = 100;
+	/** Different health values with their corresponding colors. */
+	private static final HashMap<Integer, Color> HEALTH_COLOR_CODES =
+ new HashMap<Integer, Color>(){{
+ put(1, Color.WHITE);
+ put(3, Color.GREEN);
+ put(5, Color.BLUE);
+ }};
 
 	/** Cooldown between sprite changes. */
 	private Cooldown animationCooldown;
 	/** Checks if the ship has been hit by a bullet. */
 	private boolean isDestroyed;
 	/** Values of the ship, in points, when destroyed. */
 	private int pointValue;
+	/** Health value of the ship, when spawned */
+	private int health;
 
 	/**
  * Constructor, establishes the ship's properties.
@@ -39,14 +49,17 @@ public class EnemyShip extends Entity {
  * Initial position of the ship in the Y axis.
  * @param spriteType
  * Sprite type, image corresponding to the ship.
+ * @param health
+ * Initial health of the ship.
  */
 	public EnemyShip(final int positionX, final int positionY,
- final SpriteType spriteType) {
- super(positionX, positionY, 12 * 2, 8 * 2, Color.WHITE);
+ final SpriteType spriteType, final int health) {
+ super(positionX, positionY, 12 * 2, 8 * 2, HEALTH_COLOR_CODES.get(health));
 
  this.spriteType = spriteType;
  this.animationCooldown = Core.getCooldown(500);
  this.isDestroyed = false;
+ this.health = health;
 
  switch (this.spriteType) {
  case EnemyShipA1:
@@ -141,6 +154,16 @@ public final void destroy() {
  this.spriteType = SpriteType.Explosion;
 	}
 
+	/**
+ * Reduces the health of the ship by 1 and changes the
+ * color of the ship when a specific health was reached.
+ */
+	public final void reduceHealth() {
+ this.health--;
+ if (HEALTH_COLOR_CODES.containsKey(this.health))
+ this.setColor(HEALTH_COLOR_CODES.get(this.health));
+	}
+
 	/**
  * Checks if the ship has been destroyed.
  * 
@@ -149,4 +172,13 @@ public final void destroy() {
 	public final boolean isDestroyed() {
  return this.isDestroyed;
 	}
-}
+
+	/**
+ * Returns the current remaining health.
+ *
+ * @return Integer value of the health field.
+ */
+	public final int getHealth() {
+ return this.health;
+	}
+}

src/entity/EnemyShipFormation.java

@@ -103,7 +103,7 @@ private enum Direction {
  LEFT,
  /** Movement to the bottom of the screen. */
  DOWN
-	};
+	}
 
 	/**
  * Constructor, sets the initial conditions.
@@ -149,7 +149,7 @@ else if (i / (float) this.nShipsHigh < PROPORTION_B
  column.add(new EnemyShip((SEPARATION_DISTANCE 
  * this.enemyShips.indexOf(column))
  + positionX, (SEPARATION_DISTANCE * i)
- + positionY, spriteType));
+ + positionY, spriteType, 1));
  this.shipCount++;
  }
  }

src/entity/Entity.java

@@ -57,6 +57,14 @@ public final Color getColor() {
  return color;
 	}
 
+	/**
+ * Setter for the color of the entity.
+ *
+ * @param color
+ * New color of the entity.
+ */
+	public final void setColor(Color color) { this.color = color; }
+
 	/**
  * Getter for the X axis position of the entity.
  * 

src/screen/GameScreen.java

@@ -82,7 +82,7 @@ public class GameScreen extends Screen {
  * Current game state.
  * @param gameSettings
  * Current game settings.
- * @param bonnusLife
+ * @param bonusLife
  * Checks if a bonus life is awarded this level.
  * @param width
  * Screen width.
@@ -318,9 +318,12 @@ private void manageCollisions() {
  for (EnemyShip enemyShip : this.enemyShipFormation)
  if (!enemyShip.isDestroyed()
  && checkCollision(bullet, enemyShip)) {
- this.score += enemyShip.getPointValue();
- this.shipsDestroyed++;
- this.enemyShipFormation.destroy(enemyShip);
+ enemyShip.reduceHealth();
+ if (enemyShip.getHealth() == 0) {
+ this.score += enemyShip.getPointValue();
+ this.shipsDestroyed++;
+ this.enemyShipFormation.destroy(enemyShip);
+ }
  recyclable.add(bullet);
  }
  if (this.enemyShipSpecial != null

test/entity/EnemyShipTest.java

@@ -0,0 +1,40 @@
+package entity;
+
+import engine.DrawManager.SpriteType;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.awt.*;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class EnemyShipTest {
+
+ EnemyShip testShip;
+
+ @BeforeEach
+ void setUp() {
+ // positionX, positionY and spriteType are just placeholders
+ // they are not necessary for our tests
+ testShip = new EnemyShip(0, 0, SpriteType.EnemyShipA1, 5);
+ }
+
+ @Test
+ void getHealth() {
+ assertEquals(5, testShip.getHealth());
+ }
+
+ @Test
+ void reduceHealthWithoutColorChange() {
+ testShip.reduceHealth();
+ assertEquals(4, testShip.getHealth());
+ }
+
+ @Test
+ void reduceHealthWithColorChange() {
+ testShip.reduceHealth();
+ testShip.reduceHealth();
+ assertEquals(3, testShip.getHealth());
+ assertEquals(Color.GREEN, testShip.getColor());
+ }
+}

test/entity/EntityTest.java

@@ -0,0 +1,31 @@
+package entity;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.awt.*;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class EntityTest {
+
+ Entity testEntity;
+
+ @BeforeEach
+ void setUp() {
+ // positionX, positionY, width and height are just placeholders
+ // they are not necessary for our tests
+ testEntity = new Entity(0,0,0,0, Color.WHITE);
+ }
+
+ @Test
+ void getColor() {
+ assertEquals(Color.WHITE, testEntity.getColor());
+ }
+
+ @Test
+ void setColor() {
+ testEntity.setColor(Color.GREEN);
+ assertEquals(Color.GREEN, testEntity.getColor());
+ }
+}

src/entity/EnemyShip.java

@@ -1,6 +1,7 @@
 package entity;
 
 import java.awt.Color;
+import java.util.HashMap;
 
 import engine.Cooldown;
 import engine.Core;
@@ -22,13 +23,22 @@ public class EnemyShip extends Entity {
 	private static final int C_TYPE_POINTS = 30;
 	/** Point value of a bonus enemy. */
 	private static final int BONUS_TYPE_POINTS = 100;
+	/** Different health values with their corresponding colors. */
+	private static final HashMap<Integer, Color> HEALTH_COLOR_CODES =
+ new HashMap<Integer, Color>(){{
+ put(1, Color.WHITE);
+ put(3, Color.GREEN);
+ put(5, Color.BLUE);
+ }};
 
 	/** Cooldown between sprite changes. */
 	private Cooldown animationCooldown;
 	/** Checks if the ship has been hit by a bullet. */
 	private boolean isDestroyed;
 	/** Values of the ship, in points, when destroyed. */
 	private int pointValue;
+	/** Health value of the ship, when spawned */
+	private int health;
 
 	/**
  * Constructor, establishes the ship's properties.
@@ -39,14 +49,17 @@ public class EnemyShip extends Entity {
  * Initial position of the ship in the Y axis.
  * @param spriteType
  * Sprite type, image corresponding to the ship.
+ * @param health
+ * Initial health of the ship.
  */
 	public EnemyShip(final int positionX, final int positionY,
- final SpriteType spriteType) {
- super(positionX, positionY, 12 * 2, 8 * 2, Color.WHITE);
+ final SpriteType spriteType, final int health) {
+ super(positionX, positionY, 12 * 2, 8 * 2, HEALTH_COLOR_CODES.get(health));
 
  this.spriteType = spriteType;
  this.animationCooldown = Core.getCooldown(500);
  this.isDestroyed = false;
+ this.health = health;
 
  switch (this.spriteType) {
  case EnemyShipA1:
@@ -141,6 +154,16 @@ public final void destroy() {
  this.spriteType = SpriteType.Explosion;
 	}
 
+	/**
+ * Reduces the health of the ship by 1 and changes the
+ * color of the ship when a specific health was reached.
+ */
+	public final void reduceHealth() {
+ this.health--;
+ if (HEALTH_COLOR_CODES.containsKey(this.health))
+ this.setColor(HEALTH_COLOR_CODES.get(this.health));
+	}
+
 	/**
  * Checks if the ship has been destroyed.
  * 
@@ -149,4 +172,13 @@ public final void destroy() {
 	public final boolean isDestroyed() {
  return this.isDestroyed;
 	}
-}
+
+	/**
+ * Returns the current remaining health.
+ *
+ * @return Integer value of the health field.
+ */
+	public final int getHealth() {
+ return this.health;
+	}
+}

src/entity/EnemyShipFormation.java

@@ -103,7 +103,7 @@ private enum Direction {
  LEFT,
  /** Movement to the bottom of the screen. */
  DOWN
-	};
+	}
 
 	/**
  * Constructor, sets the initial conditions.
@@ -149,7 +149,7 @@ else if (i / (float) this.nShipsHigh < PROPORTION_B
  column.add(new EnemyShip((SEPARATION_DISTANCE 
  * this.enemyShips.indexOf(column))
  + positionX, (SEPARATION_DISTANCE * i)
- + positionY, spriteType));
+ + positionY, spriteType, 1));
  this.shipCount++;
  }
  }

src/entity/Entity.java

@@ -57,6 +57,14 @@ public final Color getColor() {
  return color;
 	}
 
+	/**
+ * Setter for the color of the entity.
+ *
+ * @param color
+ * New color of the entity.
+ */
+	public final void setColor(Color color) { this.color = color; }
+
 	/**
  * Getter for the X axis position of the entity.
  * 

src/screen/GameScreen.java

@@ -82,7 +82,7 @@ public class GameScreen extends Screen {
  * Current game state.
  * @param gameSettings
  * Current game settings.
- * @param bonnusLife
+ * @param bonusLife
  * Checks if a bonus life is awarded this level.
  * @param width
  * Screen width.
@@ -318,9 +318,12 @@ private void manageCollisions() {
  for (EnemyShip enemyShip : this.enemyShipFormation)
  if (!enemyShip.isDestroyed()
  && checkCollision(bullet, enemyShip)) {
- this.score += enemyShip.getPointValue();
- this.shipsDestroyed++;
- this.enemyShipFormation.destroy(enemyShip);
+ enemyShip.reduceHealth();
+ if (enemyShip.getHealth() == 0) {
+ this.score += enemyShip.getPointValue();
+ this.shipsDestroyed++;
+ this.enemyShipFormation.destroy(enemyShip);
+ }
  recyclable.add(bullet);
  }
  if (this.enemyShipSpecial != null

test/entity/EnemyShipTest.java

@@ -0,0 +1,40 @@
+package entity;
+
+import engine.DrawManager.SpriteType;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.awt.*;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class EnemyShipTest {
+
+ EnemyShip testShip;
+
+ @BeforeEach
+ void setUp() {
+ // positionX, positionY and spriteType are just placeholders
+ // they are not necessary for our tests
+ testShip = new EnemyShip(0, 0, SpriteType.EnemyShipA1, 5);
+ }
+
+ @Test
+ void getHealth() {
+ assertEquals(5, testShip.getHealth());
+ }
+
+ @Test
+ void reduceHealthWithoutColorChange() {
+ testShip.reduceHealth();
+ assertEquals(4, testShip.getHealth());
+ }
+
+ @Test
+ void reduceHealthWithColorChange() {
+ testShip.reduceHealth();
+ testShip.reduceHealth();
+ assertEquals(3, testShip.getHealth());
+ assertEquals(Color.GREEN, testShip.getColor());
+ }
+}

test/entity/EntityTest.java

@@ -0,0 +1,31 @@
+package entity;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.awt.*;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class EntityTest {
+
+ Entity testEntity;
+
+ @BeforeEach
+ void setUp() {
+ // positionX, positionY, width and height are just placeholders
+ // they are not necessary for our tests
+ testEntity = new Entity(0,0,0,0, Color.WHITE);
+ }
+
+ @Test
+ void getColor() {
+ assertEquals(Color.WHITE, testEntity.getColor());
+ }
+
+ @Test
+ void setColor() {
+ testEntity.setColor(Color.GREEN);
+ assertEquals(Color.GREEN, testEntity.getColor());
+ }
+}

src/entity/EnemyShip.java

@@ -1,6 +1,7 @@
 package entity;
 
 import java.awt.Color;
+import java.util.HashMap;
 
 import engine.Cooldown;
 import engine.Core;
@@ -22,13 +23,22 @@ public class EnemyShip extends Entity {
 	private static final int C_TYPE_POINTS = 30;
 	/** Point value of a bonus enemy. */
 	private static final int BONUS_TYPE_POINTS = 100;
+	/** Different health values with their corresponding colors. */
+	private static final HashMap<Integer, Color> HEALTH_COLOR_CODES =
+ new HashMap<Integer, Color>(){{
+ put(1, Color.WHITE);
+ put(3, Color.GREEN);
+ put(5, Color.BLUE);
+ }};
 
 	/** Cooldown between sprite changes. */
 	private Cooldown animationCooldown;
 	/** Checks if the ship has been hit by a bullet. */
 	private boolean isDestroyed;
 	/** Values of the ship, in points, when destroyed. */
 	private int pointValue;
+	/** Health value of the ship, when spawned */
+	private int health;
 
 	/**
  * Constructor, establishes the ship's properties.
@@ -39,14 +49,17 @@ public class EnemyShip extends Entity {
  * Initial position of the ship in the Y axis.
  * @param spriteType
  * Sprite type, image corresponding to the ship.
+ * @param health
+ * Initial health of the ship.
  */
 	public EnemyShip(final int positionX, final int positionY,
- final SpriteType spriteType) {
- super(positionX, positionY, 12 * 2, 8 * 2, Color.WHITE);
+ final SpriteType spriteType, final int health) {
+ super(positionX, positionY, 12 * 2, 8 * 2, HEALTH_COLOR_CODES.get(health));
 
  this.spriteType = spriteType;
  this.animationCooldown = Core.getCooldown(500);
  this.isDestroyed = false;
+ this.health = health;
 
  switch (this.spriteType) {
  case EnemyShipA1:
@@ -141,6 +154,16 @@ public final void destroy() {
  this.spriteType = SpriteType.Explosion;
 	}
 
+	/**
+ * Reduces the health of the ship by 1 and changes the
+ * color of the ship when a specific health was reached.
+ */
+	public final void reduceHealth() {
+ this.health--;
+ if (HEALTH_COLOR_CODES.containsKey(this.health))
+ this.setColor(HEALTH_COLOR_CODES.get(this.health));
+	}
+
 	/**
  * Checks if the ship has been destroyed.
  * 
@@ -149,4 +172,13 @@ public final void destroy() {
 	public final boolean isDestroyed() {
  return this.isDestroyed;
 	}
-}
+
+	/**
+ * Returns the current remaining health.
+ *
+ * @return Integer value of the health field.
+ */
+	public final int getHealth() {
+ return this.health;
+	}
+}

src/entity/EnemyShipFormation.java

@@ -103,7 +103,7 @@ private enum Direction {
  LEFT,
  /** Movement to the bottom of the screen. */
  DOWN
-	};
+	}
 
 	/**
  * Constructor, sets the initial conditions.
@@ -149,7 +149,7 @@ else if (i / (float) this.nShipsHigh < PROPORTION_B
  column.add(new EnemyShip((SEPARATION_DISTANCE 
  * this.enemyShips.indexOf(column))
  + positionX, (SEPARATION_DISTANCE * i)
- + positionY, spriteType));
+ + positionY, spriteType, 1));
  this.shipCount++;
  }
  }

src/entity/Entity.java

@@ -57,6 +57,14 @@ public final Color getColor() {
  return color;
 	}
 
+	/**
+ * Setter for the color of the entity.
+ *
+ * @param color
+ * New color of the entity.
+ */
+	public final void setColor(Color color) { this.color = color; }
+
 	/**
  * Getter for the X axis position of the entity.
  * 

src/screen/GameScreen.java

@@ -82,7 +82,7 @@ public class GameScreen extends Screen {
  * Current game state.
  * @param gameSettings
  * Current game settings.
- * @param bonnusLife
+ * @param bonusLife
  * Checks if a bonus life is awarded this level.
  * @param width
  * Screen width.
@@ -318,9 +318,12 @@ private void manageCollisions() {
  for (EnemyShip enemyShip : this.enemyShipFormation)
  if (!enemyShip.isDestroyed()
  && checkCollision(bullet, enemyShip)) {
- this.score += enemyShip.getPointValue();
- this.shipsDestroyed++;
- this.enemyShipFormation.destroy(enemyShip);
+ enemyShip.reduceHealth();
+ if (enemyShip.getHealth() == 0) {
+ this.score += enemyShip.getPointValue();
+ this.shipsDestroyed++;
+ this.enemyShipFormation.destroy(enemyShip);
+ }
  recyclable.add(bullet);
  }
  if (this.enemyShipSpecial != null

test/entity/EnemyShipTest.java

@@ -0,0 +1,40 @@
+package entity;
+
+import engine.DrawManager.SpriteType;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.awt.*;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class EnemyShipTest {
+
+ EnemyShip testShip;
+
+ @BeforeEach
+ void setUp() {
+ // positionX, positionY and spriteType are just placeholders
+ // they are not necessary for our tests
+ testShip = new EnemyShip(0, 0, SpriteType.EnemyShipA1, 5);
+ }
+
+ @Test
+ void getHealth() {
+ assertEquals(5, testShip.getHealth());
+ }
+
+ @Test
+ void reduceHealthWithoutColorChange() {
+ testShip.reduceHealth();
+ assertEquals(4, testShip.getHealth());
+ }
+
+ @Test
+ void reduceHealthWithColorChange() {
+ testShip.reduceHealth();
+ testShip.reduceHealth();
+ assertEquals(3, testShip.getHealth());
+ assertEquals(Color.GREEN, testShip.getColor());
+ }
+}

test/entity/EntityTest.java

@@ -0,0 +1,31 @@
+package entity;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.awt.*;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class EntityTest {
+
+ Entity testEntity;
+
+ @BeforeEach
+ void setUp() {
+ // positionX, positionY, width and height are just placeholders
+ // they are not necessary for our tests
+ testEntity = new Entity(0,0,0,0, Color.WHITE);
+ }
+
+ @Test
+ void getColor() {
+ assertEquals(Color.WHITE, testEntity.getColor());
+ }
+
+ @Test
+ void setColor() {
+ testEntity.setColor(Color.GREEN);
+ assertEquals(Color.GREEN, testEntity.getColor());
+ }
+}

src/entity/EnemyShip.java

@@ -1,6 +1,7 @@
 package entity;
 
 import java.awt.Color;
+import java.util.HashMap;
 
 import engine.Cooldown;
 import engine.Core;
@@ -22,13 +23,22 @@ public class EnemyShip extends Entity {
 	private static final int C_TYPE_POINTS = 30;
 	/** Point value of a bonus enemy. */
 	private static final int BONUS_TYPE_POINTS = 100;
+	/** Different health values with their corresponding colors. */
+	private static final HashMap<Integer, Color> HEALTH_COLOR_CODES =
+ new HashMap<Integer, Color>(){{
+ put(1, Color.WHITE);
+ put(3, Color.GREEN);
+ put(5, Color.BLUE);
+ }};
 
 	/** Cooldown between sprite changes. */
 	private Cooldown animationCooldown;
 	/** Checks if the ship has been hit by a bullet. */
 	private boolean isDestroyed;
 	/** Values of the ship, in points, when destroyed. */
 	private int pointValue;
+	/** Health value of the ship, when spawned */
+	private int health;
 
 	/**
  * Constructor, establishes the ship's properties.
@@ -39,14 +49,17 @@ public class EnemyShip extends Entity {
  * Initial position of the ship in the Y axis.
  * @param spriteType
  * Sprite type, image corresponding to the ship.
+ * @param health
+ * Initial health of the ship.
  */
 	public EnemyShip(final int positionX, final int positionY,
- final SpriteType spriteType) {
- super(positionX, positionY, 12 * 2, 8 * 2, Color.WHITE);
+ final SpriteType spriteType, final int health) {
+ super(positionX, positionY, 12 * 2, 8 * 2, HEALTH_COLOR_CODES.get(health));
 
  this.spriteType = spriteType;
  this.animationCooldown = Core.getCooldown(500);
  this.isDestroyed = false;
+ this.health = health;
 
  switch (this.spriteType) {
  case EnemyShipA1:
@@ -141,6 +154,16 @@ public final void destroy() {
  this.spriteType = SpriteType.Explosion;
 	}
 
+	/**
+ * Reduces the health of the ship by 1 and changes the
+ * color of the ship when a specific health was reached.
+ */
+	public final void reduceHealth() {
+ this.health--;
+ if (HEALTH_COLOR_CODES.containsKey(this.health))
+ this.setColor(HEALTH_COLOR_CODES.get(this.health));
+	}
+
 	/**
  * Checks if the ship has been destroyed.
  * 
@@ -149,4 +172,13 @@ public final void destroy() {
 	public final boolean isDestroyed() {
  return this.isDestroyed;
 	}
-}
+
+	/**
+ * Returns the current remaining health.
+ *
+ * @return Integer value of the health field.
+ */
+	public final int getHealth() {
+ return this.health;
+	}
+}

src/entity/EnemyShipFormation.java

@@ -103,7 +103,7 @@ private enum Direction {
  LEFT,
  /** Movement to the bottom of the screen. */
  DOWN
-	};
+	}
 
 	/**
  * Constructor, sets the initial conditions.
@@ -149,7 +149,7 @@ else if (i / (float) this.nShipsHigh < PROPORTION_B
  column.add(new EnemyShip((SEPARATION_DISTANCE 
  * this.enemyShips.indexOf(column))
  + positionX, (SEPARATION_DISTANCE * i)
- + positionY, spriteType));
+ + positionY, spriteType, 1));
  this.shipCount++;
  }
  }

src/entity/Entity.java

@@ -57,6 +57,14 @@ public final Color getColor() {
  return color;
 	}
 
+	/**
+ * Setter for the color of the entity.
+ *
+ * @param color
+ * New color of the entity.
+ */
+	public final void setColor(Color color) { this.color = color; }
+
 	/**
  * Getter for the X axis position of the entity.
  * 

src/screen/GameScreen.java

@@ -82,7 +82,7 @@ public class GameScreen extends Screen {
  * Current game state.
  * @param gameSettings
  * Current game settings.
- * @param bonnusLife
+ * @param bonusLife
  * Checks if a bonus life is awarded this level.
  * @param width
  * Screen width.
@@ -318,9 +318,12 @@ private void manageCollisions() {
  for (EnemyShip enemyShip : this.enemyShipFormation)
  if (!enemyShip.isDestroyed()
  && checkCollision(bullet, enemyShip)) {
- this.score += enemyShip.getPointValue();
- this.shipsDestroyed++;
- this.enemyShipFormation.destroy(enemyShip);
+ enemyShip.reduceHealth();
+ if (enemyShip.getHealth() == 0) {
+ this.score += enemyShip.getPointValue();
+ this.shipsDestroyed++;
+ this.enemyShipFormation.destroy(enemyShip);
+ }
  recyclable.add(bullet);
  }
  if (this.enemyShipSpecial != null

test/entity/EnemyShipTest.java

@@ -0,0 +1,40 @@
+package entity;
+
+import engine.DrawManager.SpriteType;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.awt.*;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class EnemyShipTest {
+
+ EnemyShip testShip;
+
+ @BeforeEach
+ void setUp() {
+ // positionX, positionY and spriteType are just placeholders
+ // they are not necessary for our tests
+ testShip = new EnemyShip(0, 0, SpriteType.EnemyShipA1, 5);
+ }
+
+ @Test
+ void getHealth() {
+ assertEquals(5, testShip.getHealth());
+ }
+
+ @Test
+ void reduceHealthWithoutColorChange() {
+ testShip.reduceHealth();
+ assertEquals(4, testShip.getHealth());
+ }
+
+ @Test
+ void reduceHealthWithColorChange() {
+ testShip.reduceHealth();
+ testShip.reduceHealth();
+ assertEquals(3, testShip.getHealth());
+ assertEquals(Color.GREEN, testShip.getColor());
+ }
+}

test/entity/EntityTest.java

@@ -0,0 +1,31 @@
+package entity;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.awt.*;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class EntityTest {
+
+ Entity testEntity;
+
+ @BeforeEach
+ void setUp() {
+ // positionX, positionY, width and height are just placeholders
+ // they are not necessary for our tests
+ testEntity = new Entity(0,0,0,0, Color.WHITE);
+ }
+
+ @Test
+ void getColor() {
+ assertEquals(Color.WHITE, testEntity.getColor());
+ }
+
+ @Test
+ void setColor() {
+ testEntity.setColor(Color.GREEN);
+ assertEquals(Color.GREEN, testEntity.getColor());
+ }
+}