Ticket #29: arend_7_8.10-owl_attack_node_count.diff

engine/dragon.c

@@ -222 +222 @@
         int acode = 0;
         int dcode = 0;
         int kworm = NO_MOVE;
+        int owl_nodes_before = get_owl_node_counter();
         start_timer(3);
         acode = owl_attack(str, &attack_point, 
                            &DRAGON2(str).owl_attack_certain, &kworm);
+        DRAGON2(str).owl_attack_node_count
+          = get_owl_node_counter() - owl_nodes_before;
         if (acode != 0) {
           DRAGON2(str).owl_attack_point = attack_point;
           DRAGON2(str).owl_attack_code = acode;

engine/liberty.h

@@ -899 +899 @@
   int owl_attack_point;    /* vital point for attack                         */
   int owl_attack_code;     /* ko result code                                 */
   int owl_attack_certain;  /* 0 if owl reading node limit is reached         */
+  int owl_attack_node_count;
   int owl_second_attack_point;/* if attacker gets both attack points, wins   */
   int owl_defense_point;   /* vital point for defense                        */
   int owl_defense_code;    /* ko result code                                 */

engine/value_moves.c

@@ -420 +420 @@
   else
     owl_node_limit *= 0.15;
 
-  if (verbose > 0)
-    verbose--;
+  if (DRAGON2(target).owl_attack_node_count < owl_node_limit) {
+    if (verbose > 0)
+      verbose--;
 
-  owl_nodes_before = get_owl_node_counter(); 
-  acode = owl_does_attack(pos, target, &kworm);
-  owl_nodes_used = get_owl_node_counter() - owl_nodes_before;
-  
-  if (acode >= DRAGON2(target).owl_attack_code
-      && acode == WIN) {
-    add_owl_attack_move(pos, target, kworm, acode);
-    DEBUG(DEBUG_LARGE_SCALE | DEBUG_MOVE_REASONS,
-          "Move at %1m owl-attacks %1m on a large scale(%s).\n", 
-          pos, target, result_to_string(acode));
+    owl_nodes_before = get_owl_node_counter(); 
+    acode = owl_does_attack(pos, target, &kworm);
+    owl_nodes_used = get_owl_node_counter() - owl_nodes_before;
+    
+    if (acode >= DRAGON2(target).owl_attack_code
+        && acode == WIN) {
+      add_owl_attack_move(pos, target, kworm, acode);
+      DEBUG(DEBUG_LARGE_SCALE | DEBUG_MOVE_REASONS,
+            "Move at %1m owl-attacks %1m on a large scale(%s).\n", 
+            pos, target, result_to_string(acode));
+    }
+    else
+      DEBUG(DEBUG_LARGE_SCALE,
+            "Move at %1m isn't a clean large scale attack on %1m (%s).\n",
+            pos, target, result_to_string(acode));
+    
+    DEBUG(DEBUG_LARGE_SCALE, "  owl nodes used = %d, dist = %d\n", 
+          owl_nodes_used, dist);
+    /* Restore settings. */
+    verbose = save_verbose;
   }
-  else
-    DEBUG(DEBUG_LARGE_SCALE,
-          "Move at %1m isn't a clean large scale attack on %1m (%s).\n",
-          pos, target, result_to_string(acode));
-  
-  DEBUG(DEBUG_LARGE_SCALE, "  owl nodes used = %d, dist = %d\n", 
-        owl_nodes_used, dist);
-  /* Restore settings. */
-  verbose = save_verbose;
   decrease_depth_values(); 
   owl_node_limit = save_owl_node_limit;
 }