Merge pull request RobertoIA#16 from BaeGayeon/dev

feat: Add restart function

Author: YusunPark

src/engine/DrawManager.java

@@ -345,19 +345,19 @@ public void drawMenu(final Screen screen, final int option) {
 	 */
 	public void drawPause(final Screen screen, final int option) {
 		String goMenuString = "Go to Menu";
-		String restartString = "Go to Restart";
+		String restartString = "Restart";
 
-		if (option == 1)
+		if (option == 7)
 			backBufferGraphics.setColor(Color.GREEN);
 		else
 			backBufferGraphics.setColor(Color.WHITE);
-		drawCenteredRegularString(screen, goMenuString,
+		drawCenteredRegularString(screen, restartString,
 				screen.getHeight() / 3 * 2);
-		if (option == 7)
+		if (option == 1)
 			backBufferGraphics.setColor(Color.GREEN);
 		else
 			backBufferGraphics.setColor(Color.WHITE);
-		drawCenteredRegularString(screen, restartString, screen.getHeight()
+		drawCenteredRegularString(screen, goMenuString, screen.getHeight()
 				/ 3 * 2 + fontRegularMetrics.getHeight() * 2);
 	}
 

src/screen/GameScreen.java

@@ -37,6 +37,9 @@ public class GameScreen extends Screen {
 	private static final int SCREEN_CHANGE_INTERVAL = 1500;
 	/** Height of the interface separation line. */
 	private static final int SEPARATION_LINE_HEIGHT = 40;
+	/** Difficulty settings for level 1. */
+	private static final GameSettings RESTART_SETTING =
+			new GameSettings(5, 4, 60, 2000);
 
 	/** Current game difficulty settings. */
 	private GameSettings gameSettings;
@@ -72,7 +75,7 @@ public class GameScreen extends Screen {
 	private boolean bonusLife;
 	/** Pause Screen */
 	private Screen pausescreen;
-
+	/** Title Screen */
 	private Screen titlescreen;
 	/** Check if game is pause */
 	private boolean isPause;
@@ -304,15 +307,26 @@ private void draw() {
 
 					if (this.returnCode == 1) {
 						return;
-						
 					}
-					
-					if (this.inputManager.isKeyDown(KeyEvent.VK_ESCAPE)){
+
+					else if (this.returnCode == 7) {
+						this.level = 1;
+						this.score = 0;
+						this.lives = 3;
+						this.bulletsShot = 0;
+						this.shipsDestroyed = 0;
+						this.gameSettings = RESTART_SETTING;
+						initialize();
+						this.logger.info("Restart");
+						this.isPause = false;
+						this.returnCode = 2;
+					}
+
+				if (this.inputManager.isKeyDown(KeyEvent.VK_ESCAPE)){
 						if (this.escCooldown.checkFinished()){
 							this.escCooldown.reset();
 							this.isPause = false;
 							this.returnCode = 2;
-							// System.out.println("Asdfasfd");
 						}
 					}
 

src/screen/PauseScreen.java

@@ -25,7 +25,7 @@ public class PauseScreen extends Screen {
 	 */
     public PauseScreen(final int width, final int height, final int fps) {
         super(width, height, fps);
-		this.returnCode = 1;
+		this.returnCode = 7;
 		this.selectionCooldown = Core.getCooldown(SELECTION_TIME);
 		this.selectionCooldown.reset();
     }
@@ -78,8 +78,8 @@ protected final void update() {
     }
 
     private void nextMenuItem() {
-		 if (this.returnCode == 1) {
-			this.returnCode = 7;
+		 if (this.returnCode == 7) {
+			this.returnCode = 1;
 		}	
 
 	}
@@ -88,8 +88,8 @@ private void nextMenuItem() {
 	 * Shifts the focus to the previous menu item.
 	 */
 	private void previousMenuItem() {
-		if (this.returnCode == 7) {
-			this.returnCode = 1;
+		if (this.returnCode == 1) {
+			this.returnCode = 7;
 		}	
 
 	}