Added "Last Move Highlight"

Author: EmilRiedeman

game/src/spaghetti/game/Board.java

@@ -39,6 +39,7 @@ public Point copy() {
     protected final BoardController[] controllers = new BoardController[2];
     protected boolean turn = false;
     protected int moveCount = 0;
+    protected Pair<Integer, Integer> lastMove = null;
     protected BoardState currentState = BoardState.PRE_START;
 
     public Board(int width, int height) {
@@ -77,6 +78,10 @@ public int getMoveCount() {
         return moveCount;
     }
 
+    public Pair<Integer, Integer> getLastMove() {
+        return lastMove;
+    }
+
     public boolean getTurn() {
         return turn;
     }
@@ -183,6 +188,7 @@ public void start(BoardListener startHandler, BoardController blue, BoardControl
     }
 
     private void privateStart(BoardController blue, BoardController red) {
+        lastMove = null;
         controllers[0] = blue;
         controllers[1] = red;
         if (!blue.isStartHandler()) blue.setSide(false);
@@ -216,6 +222,7 @@ public Move generatePreMove(Random rand) {
 
     public void play(Move move, BoardListener player) {
         moveCount++;
+        lastMove = new Pair<>(move.row, move.col);
         tiles[move.row][move.col].type = move.t;
 
         Position[] pos4 = new Position[4];

swing/src/spaghetti/gui/swing/GraphicalBoard.java

@@ -1,6 +1,7 @@
 package spaghetti.gui.swing;
 
 import spaghetti.game.*;
+import spaghetti.utils.Pair;
 
 import javax.swing.*;
 import javax.swing.event.MouseInputListener;
@@ -324,8 +325,9 @@ protected void drawTile(Graphics2D g2, int row, int col) {
         int x0 = x + gridLineWidth, y0 = y + gridLineWidth, s = tileSize - gridLineWidth * 2;
 
         Point p = new Point(row, col);
+        Pair<Integer, Integer> pos = new Pair<>(row, col);
         if (type != '\0') {
-            drawTileType(g2, type, x0, y0, s, color0, color1, parent.colorPalette.get(-1));
+            drawTileType(g2, type, x0, y0, s, color0, color1, parent.colorPalette.get(pos.equals(board.getLastMove())? 7: -1));
         } else if (p.equals(highlight)) {
             g2.setColor(parent.colorPalette.get(6));
             g2.fillRect(x, y, s + gridLineWidth * 2, s + gridLineWidth * 2);

swing/src/spaghetti/gui/swing/PlayerSelectionPage.java

@@ -2,8 +2,6 @@
 
 import spaghetti.game.Board;
 import spaghetti.game.BoardController;
-import spaghetti.game.BoardListener;
-import spaghetti.utils.Pair;
 
 import javax.swing.*;
 import java.awt.*;
@@ -128,7 +126,7 @@ private void onSubmit(ActionEvent actionEvent) {
         boolean human = selectors[0].isLocalHuman() && selectors[1].isLocalHuman();
         if (human) {
             try {
-                board = new Board(Math.min(Integer.parseInt(boardWidthField.getText()), 50), Math.min(Integer.parseInt(boardHeightField.getText()), 50));
+                board = new Board(Math.min(Integer.parseInt(boardWidthField.getText()), 26), Math.min(Integer.parseInt(boardHeightField.getText()), 26));
             } catch (Exception exception) {
                 board = new Board(7, 9);
             }

swing/src/spaghetti/gui/swing/SpaghettiInterface.java

@@ -1,9 +1,6 @@
 package spaghetti.gui.swing;
 
-import spaghetti.game.Board;
-
 import javax.swing.*;
-import javax.swing.plaf.ColorUIResource;
 import java.awt.*;
 import java.util.HashMap;
 import java.util.Map;
@@ -22,7 +19,7 @@ public class SpaghettiInterface extends JFrame {
         put(4, new Color(221, 136, 136));
         put(5, Color.GRAY);
         put(6, new Color(255, 255, 237)); // HIGHLIGHTED
-        put(7, new Color(170,238,170)); // TARGET HIGHLIGHTED
+        put(7, new Color(250, 250, 250)); // LAST MOVE HIGHLIGHT
         put(8, new Color(160, 160, 160)); // SAMPLE BACKGROUND 1
         put(9, new Color(170, 170, 170)); // SAMPLE BACKGROUND 2
     }};
@@ -36,7 +33,7 @@ public class SpaghettiInterface extends JFrame {
         put(4, new Color(221, 136, 136));
         put(5, Color.GRAY);
         put(6, new Color(200, 200, 205)); // HIGHLIGHTED
-        put(7, new Color(170,238,170)); // TARGET HIGHLIGHTED
+        put(7, new Color(150, 150, 150)); // LAST MOVE HIGHLIGHT
         put(8, new Color(43, 43, 44)); // SAMPLE BACKGROUND 1
         put(9, new Color(60, 63, 65)); // SAMPLE BACKGROUND 2
     }};