Add Settings feature

.github/workflows/maven.yml

@@ -0,0 +1,26 @@
+# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Java CI with Maven
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  build:
+
+    runs-on: windows-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 11
+      uses: actions/setup-java@v2
+      with:
+        java-version: '11'
+        distribution: 'adopt'
+        cache: maven
+    - name: Build with Maven
+      run: mvn -B package --file pom.xml

.gitignore

@@ -167,5 +167,7 @@ pip-log.txt
 #############
 
 log*
-*.ttf
-.checkstyle
+.checkstyle
+*.class
+.idea/
+out/

README.md

@@ -1,26 +1,33 @@
 Invaders
 =
-[Space Invaders](http://en.wikipedia.org/wiki/Space_Invaders) clone, written in Java.
 
-###Screenshots
-![](http://i.minus.com/ijt8HhaA8laZq.png)
+Welcome to our Space Invaders java project developed as part of our Software Development Practices class at Hanyang University. We were tasked with adding features onto a previously developed space invaders game.
 
-###Download
-[Dropbox](https://dl.dropboxusercontent.com/u/23829102/invaders.zip)
+### Team
 
-Mirror: [Mediafire](http://www.mediafire.com/download/kwv9s90j9i1o4kc/invaders.zip)
+Our team is called Team Aliens, it comprises of 5 members.
 
-###Installation
-After downloading the file above, unpack it and save it to an appropiate location.
+   * Elias - https://github.com/eliasb1
+   * Luca - https://github.com/56luca
+   * Janae - https://github.com/jfarinas96
+   * Sophie - https://github.com/sibylle221
+   * Josh - https://github.com/Josholeary
 
-Open the directory and double-click invaders.jar. In some systems (i.e. Ubuntu) you may need to select 'Open with OpenJDK 7 Runtime' or similar from the context menu.
+### Features
 
-If the Java path is not set correctly, you can also navigate to the directory from the command line and execute
+The following is a list of the features we added.
 
->java -jar invaders.jar
+    - Add dying effect (screen shake)
+    - Add SFX & BGM (background music and sound effects)
+    - Add various monsters (making higher hp monsters and different monster formations)
+    - Display HP Color (coordinating colours to reflect monster hp)
+    - Add Setting function (screen resizing, game speed selecting etc)
+    - Add game summary (controls/manual)
+    - Add pause function
 
-###System Requirements
-Requires Java 7 or better.
+ ### CI/CD
+We used Github Actions for CI/CD, these are the specific tools we are using for this project:
+
+    - Maven to build the project
+    - CodeFactor for code checking
 
-###Resources
-[Space Invaders Regular (font)](http://www.fonts2u.com/space-invaders-regular.font) - © kylemaoin 2010

pom.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.setb</groupId>
+    <artifactId>Invaders</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+            </resource>
+        </resources>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>5.8.2</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+    </properties>
+
+</project>

src/engine/Core.java → src/main/java/engine/Core.java

@@ -8,11 +8,7 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import screen.GameScreen;
-import screen.HighScoreScreen;
-import screen.ScoreScreen;
-import screen.Screen;
-import screen.TitleScreen;
+import screen.*;
 
 /**
  * Implements core game logic.
@@ -23,9 +19,9 @@
 public final class Core {
 
 	/** Width of current screen. */
-	private static final int WIDTH = 448;
+	private static int WIDTH = 448;
 	/** Height of current screen. */
-	private static final int HEIGHT = 520;
+	private static int HEIGHT = 520;
 	/** Max fps of current screen. */
 	private static final int FPS = 60;
 
@@ -59,7 +55,7 @@ public final class Core {
 			new GameSettings(8, 7, 2, 500);
 
 	/** Frame to draw the screen on. */
-	private static Frame frame;
+	public static Frame frame;
 	/** Screen currently shown. */
 	private static Screen currentScreen;
 	/** Difficulty settings list. */
@@ -114,13 +110,21 @@ public static void main(final String[] args) {
 
 		GameState gameState;
 
+		Sound.playMusic();
+
 		int returnCode = 1;
 		do {
 			gameState = new GameState(1, 0, MAX_LIVES, 0, 0);
 
 			switch (returnCode) {
 			case 1:
 				// Main menu.
+				frame.setVisible(false); // This makes the old window disappear
+				frame = new Frame(WIDTH, HEIGHT); // This creates a new window with new width & height values
+				DrawManager.getInstance().setFrame(frame);
+				width = frame.getWidth();
+				height = frame.getHeight();
+
 				currentScreen = new TitleScreen(width, height, FPS);
 				LOGGER.info("Starting " + WIDTH + "x" + HEIGHT
 						+ " title screen at " + FPS + " fps.");
@@ -172,6 +176,22 @@ public static void main(final String[] args) {
 				returnCode = frame.setScreen(currentScreen);
 				LOGGER.info("Closing high score screen.");
 				break;
+			case 4:
+				// Help.
+				currentScreen = new HelpScreen(width, height, FPS);
+				LOGGER.info("Starting " + WIDTH + "x" + HEIGHT
+						+ " help screen at " + FPS + " fps.");
+				returnCode = frame.setScreen(currentScreen);
+				LOGGER.info("Closing help screen.");
+				break;
+			case 5:
+				// Settings.
+				currentScreen = new SettingsScreen(width, height, FPS);
+				LOGGER.info("Starting " + WIDTH + "x" + HEIGHT
+						+ " settings screen at " + FPS + " fps.");
+				returnCode = frame.setScreen(currentScreen);
+				LOGGER.info("Closing settings screen.");
+				break;
 			default:
 				break;
 			}
@@ -250,4 +270,9 @@ public static Cooldown getVariableCooldown(final int milliseconds,
 			final int variance) {
 		return new Cooldown(milliseconds, variance);
 	}
+
+	public static void setSize(int width, int height) {
+		WIDTH = width;
+		HEIGHT = height;
+	}
 }