Merge featurecat#827 again for further fix

kaorahi · Nov 13, 2021 · 0c2eaab · 0c2eaab
2 parents c17c108 + 8dafe7d
commit 0c2eaab
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/main/java/featurecat/lizzie/gui/BoardRenderer.java b/src/main/java/featurecat/lizzie/gui/BoardRenderer.java
@@ -1912,9 +1912,9 @@ public void drawEstimateRect(ArrayList<Double> estimateArray, boolean isZen) {
         // KataGo's estimates are for player to move, not for black.
         if (!Lizzie.board.getHistory().isBlacksTurn()) estimate = -estimate;
       }
-      int[] c = Lizzie.board.getCoord(i);
-      int x = c[1];
-      int y = c[0];
+      int[] c = Lizzie.board.getCoordKataGo(i);
+      int x = c[0];
+      int y = c[1];
       int stoneX = scaledMarginWidth + squareWidth * x;
       int stoneY = scaledMarginHeight + squareHeight * y;
       // g.setColor(Color.BLACK);

diff --git a/src/main/java/featurecat/lizzie/rules/Board.java b/src/main/java/featurecat/lizzie/rules/Board.java
@@ -90,8 +90,14 @@ public static int getIndex(int x, int y) {
   }
 
   public static int[] getCoord(int index) {
-    int y = index % Board.boardWidth;
-    int x = (index - y) / Board.boardWidth;
+    int y = index % Board.boardHeight;
+    int x = (index - y) / Board.boardHeight;
+    return new int[] {x, y};
+  }
+
+  public static int[] getCoordKataGo(int index) {
+    int x = index % Board.boardWidth;
+    int y = (index - x) / Board.boardWidth;
     return new int[] {x, y};
   }