4.0 beta

asdfjkl · Oct 28, 2020 · 361efcb · 361efcb
1 parent 5e31d35
commit 361efcb
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/src/main/java/org/asdfjkl/jerryfx/gui/DialogAbout.java b/src/main/java/org/asdfjkl/jerryfx/gui/DialogAbout.java
@@ -42,7 +42,7 @@ public static void show() {
         Text txtJerry = new Text("JerryFX\n");
         txtJerry.setFont(Font.font("Verdana", FontWeight.BOLD, 14));
 
-        Text txtCopyright = new Text("Version 4.0\n" +
+        Text txtCopyright = new Text("Version 4.0 beta\n" +
                 "Copyright © 2014-2020\n" +
                 "Dominik Klein\n" +
                 "licensed under GNU GPL 2");

diff --git a/src/main/java/org/asdfjkl/jerryfx/gui/MoveView.java b/src/main/java/org/asdfjkl/jerryfx/gui/MoveView.java
@@ -117,8 +117,8 @@ private void createContextMenu(WebView webView) {
         Menu posAnnotation = new Menu("Position Annotation");
         MenuItem unclear = new MenuItem("∞ Unclear");
         MenuItem drawish = new MenuItem("= Drawish");
-        MenuItem slightAdvantageWhite = new MenuItem("+/= Slight Advantage White");
-        MenuItem slightAdvantageBlack = new MenuItem("=/+ Slight Advantage Black");
+        MenuItem slightAdvantageWhite = new MenuItem("⩲ Slight Advantage White");
+        MenuItem slightAdvantageBlack = new MenuItem("⩱ Slight Advantage Black");
         MenuItem advantageWhite = new MenuItem("+- Advantage White");
         MenuItem advantageBlack = new MenuItem("-+ Advantage Black");
         MenuItem noPosAnnotation = new MenuItem("No Position Annotation");
@@ -408,7 +408,7 @@ private void onAddSlightAdvantageWhiteNAG() {
         try {
             if(rightClickedNode >= 0) {
                 GameNode selectedNode = gameModel.getGame().findNodeById(rightClickedNode);
-                selectedNode.addNag(CONSTANTS.NAG_WHITE_MODERATE_ADVANTAGE);
+                selectedNode.addNag(CONSTANTS.NAG_WHITE_SLIGHT_ADVANTAGE);
                 gameModel.getGame().setTreeWasChanged(true);
                 gameModel.triggerStateChange();
             }
@@ -420,7 +420,7 @@ private void onAddSlightAdvantageBlackNAG() {
         try {
             if(rightClickedNode >= 0) {
                 GameNode selectedNode = gameModel.getGame().findNodeById(rightClickedNode);
-                selectedNode.addNag(CONSTANTS.NAG_BLACK_MODERATE_ADVANTAGE);
+                selectedNode.addNag(CONSTANTS.NAG_BLACK_SLIGHT_ADVANTAGE);
                 gameModel.getGame().setTreeWasChanged(true);
                 gameModel.triggerStateChange();
             }

diff --git a/src/main/java/org/asdfjkl/jerryfx/lib/CONSTANTS.java b/src/main/java/org/asdfjkl/jerryfx/lib/CONSTANTS.java
@@ -507,6 +507,8 @@ private CONSTANTS() {}
     public static int NAG_FORCED_MOVE = 7;
     public static final int NAG_DRAWISH_POSITION = 10;
     public static final int NAG_UNCLEAR_POSITION = 13;
+    public static final int NAG_WHITE_SLIGHT_ADVANTAGE = 14;
+    public static final int NAG_BLACK_SLIGHT_ADVANTAGE = 15;
     public static final int NAG_WHITE_MODERATE_ADVANTAGE = 16;
     public static final int NAG_BLACK_MODERATE_ADVANTAGE = 17;
     public static final int NAG_WHITE_DECISIVE_ADVANTAGE = 18;

diff --git a/src/main/java/org/asdfjkl/jerryfx/lib/GameNode.java b/src/main/java/org/asdfjkl/jerryfx/lib/GameNode.java
@@ -132,6 +132,15 @@ public boolean isLeaf() {
 
     public void addNag(int n) {
         if(!nags.contains(n)) {
+            // if move annotation, first remove
+            // old move annotation
+            if(n > 0 && n < 11) {
+                removeNagsInRange(1,10);
+            }
+            // same for position annotation
+            if(n > 12 && n < 20) {
+                removeNagsInRange(12,20);
+            }
             this.nags.add(n);
         }
     }