priority

src/main/java/controller/game/GameController.java

@@ -104,9 +104,9 @@ public void processLogin(String userName, String robotName) {
     //    =====================================================ROOM START==================================
     public void processCreateRoom(String userName, String mapName) {
         /*
-             fetching the map name when the "Create room" button is pressed
-             creating a room for the user through API
-             */
+         fetching the map name when the "Create room" button is pressed
+         creating a room for the user through API
+         */
         RoomController roomController = new RoomController();
         JSONObject response = roomController.createRoom(userName, mapName);
         String roomNumberStr = response.get("room_number").toString();
@@ -360,8 +360,8 @@ private Timer invokeActivationPhaseTimer(GamePanel gamePanel) {
             int round = game.getCurrentRoundNum();
             int registerIndex = game.getCurrentRegisterNum();
             int currenPlayerIndex = game.getCurrentPlayerIndex();
-            if (registerIndex == 0 && currenPlayerIndex == 0) {
-                // the game starts
+            if (registerIndex == 0) {
+                // After all players executed the current register, reorder the players.
                 game.setParticipants(game.orderOfPlayers());
             }
             Player currentPlayer = game.getParticipants().get(currenPlayerIndex);
@@ -409,7 +409,7 @@ private Timer invokeActivationPhaseTimer(GamePanel gamePanel) {
                 gamePanel.getMatPanel().getLblDiscardCards().setText("Discard Pile: " + game.getUser().getDiscardPile().getDiscards().size());
             }
 
-            gamePanel.getInfoPanel().updateParticipantsInfo(registerIndex,currentPlayer);
+            gamePanel.getInfoPanel().updateParticipantsInfo(registerIndex, currentPlayer);
             for (Player player: game.getParticipants()){
                 gamePanel.getBoardPanel().getBoard()[player.getRobot().getPosition().getRow()][player.getRobot().getPosition().getCol()].setRobot(player.getRobot().getOrientation(), player);
             }

src/main/java/gui/login/LoginPanel.java

@@ -24,17 +24,17 @@ public LoginPanel() {
         JLabel lblUserName = new JLabel("Player name");
         JLabel lblRobot = new JLabel("Robot");
         this.lblChosenRobot = new JLabel();
-        Icon iconSquashBot = new ImageIcon(RobotImageEnum.SQUASH_BOT.getImage().getScaledInstance(105, 142, Image.SCALE_DEFAULT));
+        Icon iconSquashBot = new ImageIcon(RobotImageEnum.SQUASH_BOT.getImage().getScaledInstance(100, 130, Image.SCALE_DEFAULT));
         this.btSquashBot = new JToggleButton("", iconSquashBot);
-        Icon iconZoomBot = new ImageIcon(RobotImageEnum.ZOOM_BOT.getImage().getScaledInstance(105, 142, Image.SCALE_DEFAULT));
+        Icon iconZoomBot = new ImageIcon(RobotImageEnum.ZOOM_BOT.getImage().getScaledInstance(100, 130, Image.SCALE_DEFAULT));
         this.btZoomBot = new JToggleButton("", iconZoomBot);
-        Icon iconHammerBot = new ImageIcon(RobotImageEnum.HAMMER_BOT.getImage().getScaledInstance(105, 142, Image.SCALE_DEFAULT));
+        Icon iconHammerBot = new ImageIcon(RobotImageEnum.HAMMER_BOT.getImage().getScaledInstance(100, 130, Image.SCALE_DEFAULT));
         this.btHammerBot = new JToggleButton("", iconHammerBot);
-        Icon iconSpinBot = new ImageIcon(RobotImageEnum.SPIN_BOT.getImage().getScaledInstance(105, 142, Image.SCALE_DEFAULT));
+        Icon iconSpinBot = new ImageIcon(RobotImageEnum.SPIN_BOT.getImage().getScaledInstance(100, 130, Image.SCALE_DEFAULT));
         this.btSpinBot = new JToggleButton("", iconSpinBot);
-        Icon iconHulkX90 = new ImageIcon(RobotImageEnum.HULK_X90.getImage().getScaledInstance(105, 142, Image.SCALE_DEFAULT));
+        Icon iconHulkX90 = new ImageIcon(RobotImageEnum.HULK_X90.getImage().getScaledInstance(100, 130, Image.SCALE_DEFAULT));
         this.btHulkX90 = new JToggleButton("", iconHulkX90);
-        Icon iconTrundleBot = new ImageIcon(RobotImageEnum.TRUNDLE_BOT.getImage().getScaledInstance(105, 142, Image.SCALE_DEFAULT));
+        Icon iconTrundleBot = new ImageIcon(RobotImageEnum.TRUNDLE_BOT.getImage().getScaledInstance(100, 130, Image.SCALE_DEFAULT));
         this.btTrundleBot = new JToggleButton("", iconTrundleBot);
         JToggleButton btOk = new JToggleButton("Login");
         JToggleButton btCancel = new JToggleButton("Cancel");

src/main/java/model/Game.java

@@ -93,14 +93,14 @@ public ArrayList<Player> orderOfPlayers() {
         TreeMap<Integer, TreeMap<Integer, Player>> robotDistanceTree = new TreeMap<>();
         for (Player p : this.participants) {
             Integer dist = p.getRobot().distanceToAntenna();
-            Integer ycoord = p.getRobot().getPosition().getCol();
+            Integer row = p.getRobot().getPosition().getRow();
             if (robotDistanceTree.containsKey(dist)) {
-                robotDistanceTree.get(dist).put(ycoord, p);
+                robotDistanceTree.get(dist).put(row, p);
             } else {
-                // If two robots have the same distance to the antenna, the robot with larger ycoord has the priority.
-                TreeMap<Integer, Player> robotYcoordTree = new TreeMap<>(Comparator.reverseOrder());
-                robotYcoordTree.put(ycoord, p);
-                robotDistanceTree.put(dist, robotYcoordTree);
+                // If two robots have the same distance to the antenna, the robot with larger row has the priority.
+                TreeMap<Integer, Player> robotRowTree = new TreeMap<>(Comparator.reverseOrder());
+                robotRowTree.put(row, p);
+                robotDistanceTree.put(dist, robotRowTree);
             }
         }
         ArrayList<Player> order = new ArrayList<>();