Misc update

ginowangsh4 · Jun 14, 2018 · 06160e5 · 06160e5
1 parent 516d489
commit 06160e5
Show file tree

Hide file tree

Showing 48 changed files with 15 additions and 31 deletions.
diff --git a/bin/tsuro/APlayer$State.class b/bin/tsuro/APlayer$State.class
diff --git a/bin/tsuro/APlayer.class b/bin/tsuro/APlayer.class
diff --git a/bin/tsuro/Board.class b/bin/tsuro/Board.class
diff --git a/bin/tsuro/HPlayer.class b/bin/tsuro/HPlayer.class
diff --git a/bin/tsuro/IPlayer.class b/bin/tsuro/IPlayer.class
diff --git a/bin/tsuro/MPlayer$1.class b/bin/tsuro/MPlayer$1.class
diff --git a/bin/tsuro/MPlayer$State.class b/bin/tsuro/MPlayer$State.class
diff --git a/bin/tsuro/MPlayer$Strategy.class b/bin/tsuro/MPlayer$Strategy.class
diff --git a/bin/tsuro/MPlayer.class b/bin/tsuro/MPlayer.class
diff --git a/bin/tsuro/MPlayerKA.class b/bin/tsuro/MPlayerKA.class
diff --git a/bin/tsuro/MPlayerLeastSym.class b/bin/tsuro/MPlayerLeastSym.class
diff --git a/bin/tsuro/MPlayerMostSym.class b/bin/tsuro/MPlayerMostSym.class
diff --git a/bin/tsuro/MPlayerRandom.class b/bin/tsuro/MPlayerRandom.class
diff --git a/bin/tsuro/MPlayerTest.class b/bin/tsuro/MPlayerTest.class
diff --git a/bin/tsuro/PlayATurnAdapterTest.class b/bin/tsuro/PlayATurnAdapterTest.class
diff --git a/bin/tsuro/RemotePlayer.class b/bin/tsuro/RemotePlayer.class
diff --git a/bin/tsuro/SPlayer.class b/bin/tsuro/SPlayer.class
diff --git a/bin/tsuro/Server.class b/bin/tsuro/Server.class
diff --git a/bin/tsuro/ServerTest.class b/bin/tsuro/ServerTest.class
diff --git a/bin/tsuro/Tsuro.class b/bin/tsuro/Tsuro.class
diff --git a/bin/tsuro/admin/Admin.class b/bin/tsuro/admin/Admin.class
diff --git a/bin/tsuro/admin/AdminSocket.class b/bin/tsuro/admin/AdminSocket.class
diff --git a/bin/tsuro/admin/App.class b/bin/tsuro/admin/App.class
diff --git a/bin/tsuro/admin/EndGameController.class b/bin/tsuro/admin/EndGameController.class
diff --git a/bin/tsuro/admin/PlacePawnController.class b/bin/tsuro/admin/PlacePawnController.class
diff --git a/bin/tsuro/admin/PlayTurnController.class b/bin/tsuro/admin/PlayTurnController.class
diff --git a/bin/tsuro/admin/StartGameController.class b/bin/tsuro/admin/StartGameController.class
diff --git a/bin/tsuro/parser/BoardParser.class b/bin/tsuro/parser/BoardParser.class
diff --git a/image/board/0/0.png b/image/board/0/0.png
diff --git a/image/board/0/1.png b/image/board/0/1.png
diff --git a/image/board/0/2.png b/image/board/0/2.png
diff --git a/image/board/0/3.png b/image/board/0/3.png
diff --git a/image/board/1/0.png b/image/board/1/0.png
diff --git a/image/board/1/1.png b/image/board/1/1.png
diff --git a/image/board/1/2.png b/image/board/1/2.png
diff --git a/image/board/1/3.png b/image/board/1/3.png
diff --git a/image/board/2/0.png b/image/board/2/0.png
diff --git a/image/board/2/1.png b/image/board/2/1.png
diff --git a/image/board/2/2.png b/image/board/2/2.png
diff --git a/image/board/2/3.png b/image/board/2/3.png
diff --git a/image/board/board.png b/image/board/board.png
diff --git a/image/hand/0.png b/image/hand/0.png
diff --git a/image/hand/1.png b/image/hand/1.png
diff --git a/image/hand/2.png b/image/hand/2.png
diff --git a/src/admin/Admin.java b/src/admin/Admin.java
@@ -12,7 +12,7 @@
 // Localhost IP: "127.0.0.1"
 // Richie IP: "10.105.75.35"
 // Jin IP: "10.105.16.16"
-
+// Jennifer IP: "10.105.35.58"
 public class Admin {
     private static DocumentBuilder db;
     private static AdminSocket socket;
@@ -27,7 +27,7 @@ public class Admin {
     public static void main(String[] args) throws Exception {
         db = DocumentBuilderFactory.newInstance().newDocumentBuilder();
         parser = new Parser(db);
-        socket = new AdminSocket("127.0.0.1", Integer.parseInt(args[0]));
+        socket = new AdminSocket("localhost", Integer.parseInt(args[0]));
         if (args[2].equals("M")) {
             switch (args[3]) {
                 case "R":

diff --git a/src/main/Board.java b/src/main/Board.java
@@ -167,6 +167,18 @@ public static boolean posOffBoard(int[] position) {
         return position[0] < 0 || position[0] > 5 || position[1] < 0 || position[1] > 5;
     }
 
+    /**
+     * Find the token of a APlayer on a given board
+     */
+    public Token findMyToken(int color) {
+        for (SPlayer sp : getSPlayerList()) {
+            if (sp.getToken().getColor() == color) {
+                return sp.getToken();
+            }
+        }
+        throw new IllegalArgumentException("Cannot find token on board");
+    }
+
     /**
      * Simulate the path taken by a token given a board
      * @param token token that attempts making the move

diff --git a/src/main/HPlayer.java b/src/main/HPlayer.java
@@ -75,18 +75,6 @@ public void endGame(Board b, List<Integer> colors) throws Exception {
         out.println(winnerList.toString());
     }
 
-    /**
-     * Find the token of this HPlayer on a given board
-     */
-    private Token findMyToken(Board b) {
-        for (SPlayer sp : b.getSPlayerList()) {
-            if (sp.getToken().getColor() == color) {
-                return sp.getToken();
-            }
-        }
-        throw new IllegalArgumentException("Cannot find token on board");
-    }
-
     /**
      * Generate a token given inputs from UI
      * @param colorIndex color of this token
@@ -143,7 +131,7 @@ private Tile getTile(List<Tile> hand, int handIndex, int rotationIndex) {
     private void generateBoardAndTileImages(Board b, List<Tile> hand) throws Exception {
         Document boardXML = parser.boardParser.buildXML(b);
         generateBoardImage(boardXML, -1, -1);
-        Token token = findMyToken(b);
+        Token token = b.findMyToken(color);
         int[] location = Board.getAdjacentLocation(token);
         for (int i = 0; i < hand.size(); i++) {
             Tile copy = hand.get(i).copyTile();

diff --git a/src/main/MPlayerKA.java b/src/main/MPlayerKA.java