Fixed SGF read branch

featurecat · Oct 25, 2018 · 4a84362 · 4a84362
1 parent 6a67d64
commit 4a84362
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/src/main/java/featurecat/lizzie/rules/Board.java b/src/main/java/featurecat/lizzie/rules/Board.java
@@ -335,7 +335,7 @@ public void place(int x, int y, Stone color, boolean newBranch) {
 
       // check to see if this coordinate is being replayed in history
       BoardData next = history.getNext();
-      if (next != null && next.lastMove != null && next.lastMove[0] == x && next.lastMove[1] == y) {
+      if (next != null && next.lastMove != null && next.lastMove[0] == x && next.lastMove[1] == y && !newBranch) {
         // this is the next coordinate in history. Just increment history so that we don't erase the
         // redo's
         history.next();

diff --git a/src/main/java/featurecat/lizzie/rules/BoardData.java b/src/main/java/featurecat/lizzie/rules/BoardData.java
@@ -20,7 +20,7 @@ public class BoardData {
   public int whiteCaptures;
 
   // Comment in the Sgf move
-  public String comment;
+  public String comment = "";
 
   // Node properties
   private final Map<String, String> properties = new HashMap<String, String>();
@@ -61,6 +61,9 @@ public BoardData(
    */
   public void addProperty(String key, String value) {
     SGFParser.addProperty(properties, key, value);
+    if ("N".equals(key) && comment.isEmpty()) {
+      comment = value;
+    }
   }
 
   /**

diff --git a/src/main/java/featurecat/lizzie/rules/SGFParser.java b/src/main/java/featurecat/lizzie/rules/SGFParser.java
@@ -119,6 +119,7 @@ private static boolean parse(String value) {
             subTreeDepth += 1;
             // Initialize the step count
             subTreeStepMap.put(subTreeDepth, 0);
+            addPassForAwAb = true;
           } else {
             if (i > 0) {
               // Allow the comment tag includes '('
@@ -197,6 +198,8 @@ private static boolean parse(String value) {
               // add to node properties
               Lizzie.board.addNodeProperty(tag, tagContent);
               if (addPassForAwAb) {
+                // Save the step count
+                subTreeStepMap.put(subTreeDepth, subTreeStepMap.get(subTreeDepth) + 1);
                 Lizzie.board.pass(color);
                 addPassForAwAb = false;
               }
@@ -233,6 +236,8 @@ private static boolean parse(String value) {
               } else if ("AE".equals(tag)) {
                 // remove a stone
                 if (addPassForAwAb) {
+                  // Save the step count
+                  subTreeStepMap.put(subTreeDepth, subTreeStepMap.get(subTreeDepth) + 1);
                   Lizzie.board.pass(tag.equals("AB") ? Stone.BLACK : Stone.WHITE);
                   addPassForAwAb = false;
                 }