Apply CSA Protocol V1.2.1 for MAX_MOVES

diff --git a/shogi-server b/shogi-server
index d6695b7..8468b1f 100755 (executable)
--- a/shogi-server
+++ b/shogi-server
@@ -276,7 +276,7 @@ def check_command_line
   $options["max-moves"] ||= 256
   $options["max-moves"] = $options["max-moves"].to_i
 
-  $options["least-time-per-move"] ||= 1
+  $options["least-time-per-move"] ||= 0
   $options["least-time-per-move"] = $options["least-time-per-move"].to_i
 end
 

diff --git a/shogi_server/board.rb b/shogi_server/board.rb
index eb2efaa..bcf8887 100644 (file)
--- a/shogi_server/board.rb
+++ b/shogi_server/board.rb
@@ -626,7 +626,7 @@ EOF
   #   - :uchifuzume 
   #   - :oute_kaihimore 
   #   - (:outori will not be returned)
-  #   - :max_moves_draw
+  #   - :max_moves
   #
   def handle_one_move(str, sente=nil)
     if (str =~ /^([\+\-])(\d)(\d)(\d)(\d)([A-Z]{2})/)
@@ -719,7 +719,7 @@ EOF
     # When running test cases $options might be nil.
     if $options && $options["max-moves"] &&
        $options["max-moves"] > 0 && @move_count >= $options["max-moves"]
-      return :max_moves_draw
+      return :max_moves
     end
 
     return :normal

diff --git a/shogi_server/game.rb b/shogi_server/game.rb
index 4ddd121..f610a95 100644 (file)
--- a/shogi_server/game.rb
+++ b/shogi_server/game.rb
@@ -292,7 +292,7 @@ class Game
     elsif (move_status == :oute_kaihimore)
       # the current player losed
       @result = GameResultOuteKaihiMoreWin.new(self, @next_player, @current_player)
-    elsif (move_status == :max_moves_draw)
+    elsif (move_status == :max_moves)
       @result = GameResultMaxMovesDraw.new(self, @current_player, @next_player)
     else
       finish_flag = false

diff --git a/shogi_server/game_result.rb b/shogi_server/game_result.rb
index 20c5057..678ef3f 100644 (file)
--- a/shogi_server/game_result.rb
+++ b/shogi_server/game_result.rb
@@ -346,13 +346,13 @@ end
 class GameResultMaxMovesDraw < GameResultDraw
   def initialize(game, winner, loser)
     super
-    @log_summary_type = "max_moves_draw"
-    @result_type      = "#MAX_MOVES_DRAW"
+    @log_summary_type = "max_moves"
+    @result_type      = "#MAX_MOVES"
   end
 
   def process
     @players.each do |player|
-      player.write_safe("#MAX_MOVES_DRAW\n#DRAW\n")
+      player.write_safe("#MAX_MOVES\n#CENSORED\n")
     end
     # no log
     log_summary