1 files changed, 54 insertions, 24 deletions

diff --git a/src/ch/epfl/xblast/server/debug/GameStatePrinter.java b/src/ch/epfl/xblast/server/debug/GameStatePrinter.java
index ea8b360..575b09a 100644
--- a/src/ch/epfl/xblast/server/debug/GameStatePrinter.java
+++ b/src/ch/epfl/xblast/server/debug/GameStatePrinter.java
@@ -2,43 +2,75 @@ package ch.epfl.xblast.server.debug;
 
 import ch.epfl.xblast.Cell;
 import ch.epfl.xblast.server.Block;
-import ch.epfl.xblast.server.Board;
 import ch.epfl.xblast.server.GameState;
 import ch.epfl.xblast.server.Player;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Game state printer utility class that outputs the board to the terminal.
  *
  * @author EPFL
+ * @author Pacien TRAN-GIRARD (261948)
  */
 public final class GameStatePrinter {
 
+    private enum ANSIColor {
+        BLACK(0), RED(1), GREEN(2), YELLOW(3), BLUE(4), MAGENTA(5), CYAN(6), WHITE(7);
+
+        private static final String CSI = "\u001b[";
+        private static final String END = "m";
+        private static final int SET_COMMAND = 4;
+
+        private final int code;
+
+        ANSIColor(int code) {
+            this.code = code;
+        }
+
+        public String coloredText(String t) {
+            return String.format("%s%d%d%s%s%s%s", CSI, SET_COMMAND, this.code, END, t, CSI, END);
+        }
+    }
+
     private GameStatePrinter() {
     }
 
     public static void printGameState(GameState s) {
-        List<Player> ps = s.alivePlayers();
-        Board board = s.board();
+        printStats(s);
+        printBoard(s);
+    }
+
+    private static void printStats(GameState s) {
+        System.out.println(s);
+    }
+
+    private static void printBoard(GameState s) {
+        Map<Cell, List<Player>> playerMap = s.mapPlayersCells(s.alivePlayers());
 
         for (int y = 0; y < Cell.ROWS; ++y) {
-            xLoop:
-            for (int x = 0; x < Cell.COLUMNS; ++x) {
-                Cell c = new Cell(x, y);
-                for (Player p : ps) {
-                    if (p.position().containingCell().equals(c)) {
-                        System.out.print(stringForPlayer(p));
-                        continue xLoop;
-                    }
-                }
-                Block b = board.blockAt(c);
-                System.out.print(stringForBlock(b));
-            }
+            for (int x = 0; x < Cell.COLUMNS; ++x)
+                System.out.print(GameStatePrinter.stringForCellContent(s, new Cell(x, y), playerMap));
+
             System.out.println();
         }
     }
 
+    private static String stringForCellContent(GameState s, Cell c, Map<Cell, List<Player>> pl) {
+        if (s.bombedCells().containsKey(c))
+            return ANSIColor.RED.coloredText("@@");
+
+        Player p = s.resolvePlayerConflict(pl.get(c));
+        if (p != null)
+            return GameStatePrinter.stringForPlayer(p);
+
+        if (s.blastedCells().contains(c))
+            return ANSIColor.MAGENTA.coloredText("**");
+
+        return GameStatePrinter.stringForBlock(s.board().blockAt(c));
+    }
+
     private static String stringForPlayer(Player p) {
         StringBuilder b = new StringBuilder();
         b.append(p.id().ordinal() + 1);
@@ -56,25 +88,23 @@ public final class GameStatePrinter {
                 b.append('<');
                 break;
         }
-        return b.toString();
+        return ANSIColor.CYAN.coloredText(b.toString());
     }
 
     private static String stringForBlock(Block b) {
         switch (b) {
-            case FREE:
-                return "  ";
             case INDESTRUCTIBLE_WALL:
-                return "##";
+                return ANSIColor.BLACK.coloredText("##");
             case DESTRUCTIBLE_WALL:
-                return "??";
+                return ANSIColor.BLACK.coloredText("??");
             case CRUMBLING_WALL:
-                return "¿¿";
+                return ANSIColor.BLACK.coloredText("¿¿");
             case BONUS_BOMB:
-                return "+b";
+                return ANSIColor.GREEN.coloredText("+b");
             case BONUS_RANGE:
-                return "+r";
+                return ANSIColor.GREEN.coloredText("+r");
             default:
-                throw new Error();
+                return "  ";
         }
     }