Final commit

Added menu, corrected upgrades.
arozans · Apr 6, 2016 · 570f28b · 570f28b
1 parent d02794c
commit 570f28b
Show file tree

Hide file tree

Showing 62 changed files with 529 additions and 167 deletions.
diff --git a/Arkanoid-Logo-New.png b/Arkanoid-Logo-New.png
diff --git a/Level_nr_1.ser b/Level_nr_1.ser
diff --git a/Level_nr_2.ser b/Level_nr_2.ser
diff --git a/Level_nr_3.ser b/Level_nr_3.ser
diff --git a/Level_nr_4.ser b/Level_nr_4.ser
diff --git a/Level_nr_5.ser b/Level_nr_5.ser
diff --git a/Results.ser b/Results.ser
diff --git a/arkanoid_logo.png b/arkanoid_logo.png
diff --git a/arkanoid_logo2.png b/arkanoid_logo2.png
diff --git a/arkanoid_logo3.png b/arkanoid_logo3.png
diff --git a/arkanoid_logo_small.png b/arkanoid_logo_small.png
diff --git a/bin/Controller/Controller.class b/bin/Controller/Controller.class
diff --git a/bin/Controller/InputController.class b/bin/Controller/InputController.class
diff --git a/bin/Model/Ball.class b/bin/Model/Ball.class
diff --git a/bin/Model/GameFactory.class b/bin/Model/GameFactory.class
diff --git a/bin/Model/Model.class b/bin/Model/Model.class
diff --git a/bin/Model/MovableObject.class b/bin/Model/MovableObject.class
diff --git a/bin/Model/Player.class b/bin/Model/Player.class
diff --git a/bin/Model/Upgrade/TemporaryUpgrade.class b/bin/Model/Upgrade/TemporaryUpgrade.class
diff --git a/bin/Model/Upgrade/Upgrade.class b/bin/Model/Upgrade/Upgrade.class
diff --git a/bin/Start.class b/bin/Start.class
diff --git a/bin/Utils/AppendingObjectOutputStream.class b/bin/Utils/AppendingObjectOutputStream.class
diff --git a/bin/Utils/Constants.class b/bin/Utils/Constants.class
diff --git a/bin/View/EditorView$3.class b/bin/View/EditorView$3.class
diff --git a/bin/View/EditorView.class b/bin/View/EditorView.class
diff --git a/bin/View/GlassPanel$3.class b/bin/View/GlassPanel$3.class
diff --git a/bin/View/GlassPanel$4.class b/bin/View/GlassPanel$4.class
diff --git a/bin/View/GlassPanel.class b/bin/View/GlassPanel.class
diff --git a/bin/View/LayeredPanel$1.class b/bin/View/LayeredPanel$1.class
diff --git a/bin/View/LayeredPanel$2.class b/bin/View/LayeredPanel$2.class
diff --git a/bin/View/LayeredPanel.class b/bin/View/LayeredPanel.class
diff --git a/bin/View/MenuView$1$1$1.class b/bin/View/MenuView$1$1$1.class
diff --git a/bin/View/MenuView$1$1.class b/bin/View/MenuView$1$1.class
diff --git a/bin/View/MenuView$1$2.class b/bin/View/MenuView$1$2.class
diff --git a/bin/View/MenuView$1$3.class b/bin/View/MenuView$1$3.class
diff --git a/bin/View/MenuView$1$4.class b/bin/View/MenuView$1$4.class
diff --git a/bin/View/MenuView$1$5.class b/bin/View/MenuView$1$5.class
diff --git a/bin/View/MenuView$1.class b/bin/View/MenuView$1.class
diff --git a/bin/View/MenuView.class b/bin/View/MenuView.class
diff --git a/bin/View/PlayerPanel.class b/bin/View/PlayerPanel.class
diff --git a/bin/View/View.class b/bin/View/View.class
diff --git a/blue_square.png b/blue_square.png
diff --git a/src/Controller/Controller.java b/src/Controller/Controller.java
@@ -1,5 +1,7 @@
 package Controller;
 
+import javax.swing.SwingUtilities;
+
 import Model.Model;
 import Utils.Constants;
 import Utils.FileManager;
@@ -149,10 +151,12 @@ public Controller(View view, Model model)
 		setOver(false);
 		setNextLevel(false);
 
-		getView().getLayeredPanel().getMainPanel().getPlayerPanel().setPlayer(getModel().getPlayer());
+		getView().getLayeredPanel().getMainPanel().getPlayerPanel()
+				.setPlayer(getModel().getPlayer());
 		getView().getEditorView().getEditorPanel()
 				.setListOfObjectsToRender(getModel().getEditorModel().getEditorObjects());
-		getView().getEditorView().getChoicePanel().createChoicePanel(getModel().getEditorModel().getMaxLevel());
+		getView().getEditorView().getChoicePanel()
+				.createChoicePanel(getModel().getEditorModel().getMaxLevel());
 	}
 
 	/**
@@ -166,10 +170,19 @@ public Controller(View view, Model model)
 	 *
 	 *
 	 */
-	public void startGame()
+	public void showMenu()
 	{
+
+		view.getMenuView().getMenuFrame().setVisible(true);
+
+	}
+
+	public void startGame()
+	{	
 		view.getMainFrame().setVisible(true);
+		model.loadNextLevel();
 		long delta = 0l;
+
 		while (!isOver())
 		{
 			while (isRunning())
@@ -182,8 +195,8 @@ public void startGame()
 					break;
 				long lastTime = System.nanoTime();
 
-				if (model.update())
-					view.render(getModel().getGameObjectList(), getModel().getPlayer());
+				 if (model.update())
+				view.render(getModel().getGameObjectList(), getModel().getPlayer());
 
 				delta = System.nanoTime() - lastTime;
 				if (delta < Constants.GAME_LOOP_TIME)
@@ -209,7 +222,8 @@ public void startGame()
 	 */
 	private void showNextLevelDialog()
 	{
-		getView().getLayeredPanel().getGlassPanel().startNextLevelDialog(getModel().getCurrentLevel());
+		getView().getLayeredPanel().getGlassPanel()
+				.startNextLevelDialog(getModel().getCurrentLevel());
 		FileManager.sleep(3000);
 		getView().getLayeredPanel().getGlassPanel().stopPause();
 		setNextLevel(false);
@@ -224,7 +238,7 @@ private void showNextLevelDialog()
 	public void endOfGame()
 	{
 		getView().getLayeredPanel().getGlassPanel().goodbye();
-		FileManager.sleep(3000);
+		FileManager.sleep(2000);
 		getView().getResultsView().endOfGame(getModel().getResultsModel().getPlayersList());
 	}
 }
diff --git a/src/Controller/InputController.java b/src/Controller/InputController.java
@@ -3,6 +3,8 @@
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
 
+import javax.swing.SwingUtilities;
+
 import Model.Model;
 import View.GlassPanel;
 import View.View;
@@ -16,11 +18,11 @@
 
 public class InputController
 {
-	/**
-	 * When true, blocks all functions. Changing when 'P' key is clicked.
-	 * 
-	 */
-	private boolean blockade;
+
+	private boolean blockade;// When true, blocks all functions. Changing when
+								// 'P' key is clicked.
+	private int pressedKeys;// counter for pressed arrow keys. When 2 and one of
+							// the keys are released, racket won't stop moving.
 	private Model model;
 	private View view;
 	private Controller controller;
@@ -86,6 +88,16 @@ public void setBlockade(boolean blockade)
 		this.blockade = blockade;
 	}
 
+	public int getPressedKeys()
+	{
+		return pressedKeys;
+	}
+
+	public void setPressedKeys(int pressedKeys)
+	{
+		this.pressedKeys = pressedKeys;
+	}
+
 	/**
 	 * Constructor of InputController.
 	 * 
@@ -102,6 +114,7 @@ public InputController(Model model, Controller controller, View view)
 		this.setController(controller);
 		this.view = view;
 		this.blockade = false;
+		this.pressedKeys = 0;
 	}
 
 	/**
@@ -153,14 +166,20 @@ public void handleInput(KeyEvent ke)
 		{
 			if (ke.getKeyCode() == KeyEvent.VK_RIGHT || ke.getKeyCode() == KeyEvent.VK_LEFT)
 			{
-
-				if (ke.getKeyCode() == KeyEvent.VK_RIGHT)
+				if (ke.getKeyCode() == KeyEvent.VK_RIGHT && !(getModel().getRacketDirection() == 1))
+				{
 					getModel().setRacketDirection(1);
-				else
+					setPressedKeys(getPressedKeys() + 1);
+				}
+				else if (ke.getKeyCode() == KeyEvent.VK_LEFT && !(getModel().getRacketDirection() == -1))
+				{
 					getModel().setRacketDirection(-1);
+					setPressedKeys(getPressedKeys() + 1);
+
+				}
 
 			}
-			if (ke.getKeyCode() == KeyEvent.VK_DOWN)
+			if (ke.getKeyCode() == KeyEvent.VK_UP)
 			{
 				getModel().shootBall();
 			}
@@ -172,11 +191,11 @@ public void handleInput(KeyEvent ke)
 			{
 				showEditor();
 			}
-			if (ke.getKeyCode() == KeyEvent.VK_UP)
+	/*		if (ke.getKeyCode() == KeyEvent.VK_UP)
 			{
 				getModel().setNewBall(true);
-			}
-			if (ke.getKeyCode() == KeyEvent.VK_S)
+			}*/
+			/*if (ke.getKeyCode() == KeyEvent.VK_S)
 			{
 				getModel().getPcs().firePropertyChange("AdditionalBallsUpgrade", false, true);
 			}
@@ -195,7 +214,7 @@ public void handleInput(KeyEvent ke)
 			if (ke.getKeyCode() == KeyEvent.VK_Q)
 			{
 				getModel().getPcs().firePropertyChange("MissilesUpgrade", false, true);
-			}
+			}*/
 			if (ke.getKeyCode() == KeyEvent.VK_SPACE)
 			{
 				getModel().fireMissile();
@@ -204,6 +223,24 @@ public void handleInput(KeyEvent ke)
 
 	}
 
+	/**
+	 * Function called when user stops pressing left or right arrow and
+	 * therefore racket should stop moving.
+	 */
+	public void keyReleased(KeyEvent ke)
+	{
+		if (ke.getKeyCode() == KeyEvent.VK_RIGHT || ke.getKeyCode() == KeyEvent.VK_LEFT)
+		{
+			setPressedKeys(getPressedKeys() - 1);
+			if (getPressedKeys() == 1 && ke.getKeyCode() == KeyEvent.VK_RIGHT)
+				getModel().setRacketDirection(-1);
+			else if (getPressedKeys() == 1 && ke.getKeyCode() == KeyEvent.VK_LEFT)
+				getModel().setRacketDirection(1);
+			else
+				getModel().setRacketDirection(0);
+		}
+	}
+
 	/**
 	 * Function called from EditorsView, when player enters his name in
 	 * TextField. It passes name to resultModel, where it is saved, and make
@@ -327,12 +364,13 @@ public void changeLevel(int selectedIndex)
 	}
 
 	/**
-	 * Function called when user stops pressing left or right arrow and
-	 * therefore racket should stop moving.
+	 * Processing main menu "Play" button
 	 */
-	public void keyReleased(KeyEvent ke)
+	public void menuPlay()
 	{
-		if (ke.getKeyCode() == KeyEvent.VK_RIGHT || ke.getKeyCode() == KeyEvent.VK_LEFT)
-			getModel().setRacketDirection(0);
+
+		getView().getMenuView().getMenuFrame().setVisible(false);
+		getController().startGame();
+
 	}
 }
diff --git a/src/Model/Ball.java b/src/Model/Ball.java
@@ -105,6 +105,7 @@ public void processCollision(GameObject go)
 				if (moreAtSide(go)) // if bigger part of ball is on the
 									// side
 				{
+
 					changeDirectionX(go);
 
 				}
@@ -119,7 +120,10 @@ public void processCollision(GameObject go)
 
 			}
 			else// only on the side
+			{
 				changeDirectionX(go);
+
+			}
 		}
 		else// not on the side
 		{
@@ -147,11 +151,13 @@ public boolean moreAtSide(GameObject go)
 		Point stillObjectPoint;
 		Point ballCenterPoint = new Point(getX() + getRadius(), getY() + getRadius());
 		if (leftCollide(go))
-			stillObjectPoint = new Point((go.getX() + (go.getHeight() / 2)), (go.getY() + (go.getHeight() / 2)));
+			stillObjectPoint =
+					new Point((go.getX() + (go.getHeight() / 2)), (go.getY() + (go.getHeight() / 2)));
 		else
 			stillObjectPoint = new Point((go.getX() + go.getWidth() - (go.getHeight() / 2)),
 					(go.getY() + (go.getHeight() / 2)));
-		if (Math.abs(ballCenterPoint.x - stillObjectPoint.x) < Math.abs(ballCenterPoint.y - stillObjectPoint.y))
+		if (Math.abs(ballCenterPoint.x - stillObjectPoint.x) < Math
+				.abs(ballCenterPoint.y - stillObjectPoint.y))
 			return false;
 		else
 			return true;
@@ -194,7 +200,10 @@ public void propertyChange(PropertyChangeEvent evt)
 			else
 			{
 				setRampage(false);
-				setColor(Color.black);
+				int b = (int) (Math.random() * 145);
+				int r = (int) (Math.random() * 145);
+				int g = (int) (Math.random() * 145);
+				setColor(new Color(b, r, g));
 			}
 
 		}