From: beatles Date: Wed, 8 Oct 2008 13:54:27 +0000 (+0000) Subject: * [shogi-server] X-Git-Tag: 20170902~225 X-Git-Url: http://git.sourceforge.jp/view?p=shogi-server%2Fshogi-server.git;a=commitdiff_plain;h=e4189dd168a34df5460f782b824104d82276db96 * [shogi-server] - Ruby 1.8.7 (or later) must be used. Ruby 1.8.6 is not supported. - Daemon mode is available. - shogi_server/piece_ky.rb is again merged with shogi_server/piece.rb, then has been removed. - Added a test case, TC_usi.rb. --- diff --git a/changelog b/changelog index 6196aca..72e0bfb 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,12 @@ +2008-10-08 Daigo Moriwaki + + * [shogi-server] + - Ruby 1.8.7 (or later) must be used. Ruby 1.8.6 is not supported. + - Daemon mode is available. + - shogi_server/piece_ky.rb is again merged with + shogi_server/piece.rb, then has been removed. + - Added a test case, TC_usi.rb. + 2008-06-30 Daigo Moriwaki * [shogi-server] diff --git a/shogi_server.rb b/shogi_server.rb index 4b1b39a..3268222 100644 --- a/shogi_server.rb +++ b/shogi_server.rb @@ -34,7 +34,6 @@ require 'shogi_server/game' require 'shogi_server/league' require 'shogi_server/login' require 'shogi_server/piece' -require 'shogi_server/pieceky' require 'shogi_server/player' require 'shogi_server/timeout_queue' require 'shogi_server/usi' diff --git a/shogi_server/piece.rb b/shogi_server/piece.rb index 4275c0b..93d085f 100644 --- a/shogi_server/piece.rb +++ b/shogi_server/piece.rb @@ -203,6 +203,52 @@ class PieceFU < Piece end end +class PieceKY < Piece + def initialize(*arg) + @point = 1 + @normal_moves = [] + @promoted_moves = [[0, +1], [+1, +1], [-1, +1], [+1, +0], [-1, +0], [0, -1]] + @name = "KY" + @promoted_name = "NY" + super + end + def room_of_head?(x, y, name) + if (name == "KY") + if (@sente) + return false if (y == 1) + else + return false if (y == 9) + end + end + return true + end + def far_movable_grids + grids = Array::new + if (@promoted) + return [] + else + if (@sente) # up + cand_x = @x + cand_y = @y - 1 + while (jump_to?(cand_x, cand_y)) + grids.push([cand_x, cand_y]) + break if (! put_to?(cand_x, cand_y)) + cand_y = cand_y - 1 + end + else # down + cand_x = @x + cand_y = @y + 1 + while (jump_to?(cand_x, cand_y)) + grids.push([cand_x, cand_y]) + break if (! put_to?(cand_x, cand_y)) + cand_y = cand_y + 1 + end + end + return grids + end + end +end + class PieceKE < Piece def initialize(*arg) @point = 1 diff --git a/shogi_server/piece_ky.rb b/shogi_server/piece_ky.rb deleted file mode 100644 index f21c671..0000000 --- a/shogi_server/piece_ky.rb +++ /dev/null @@ -1,49 +0,0 @@ -module ShogiServer - -class PieceKY < Piece - def initialize(*arg) - @point = 1 - @normal_moves = [] - @promoted_moves = [[0, +1], [+1, +1], [-1, +1], [+1, +0], [-1, +0], [0, -1]] - @name = "KY" - @promoted_name = "NY" - super - end - def room_of_head?(x, y, name) - if (name == "KY") - if (@sente) - return false if (y == 1) - else - return false if (y == 9) - end - end - return true - end - def far_movable_grids - grids = Array::new - if (@promoted) - return [] - else - if (@sente) # up - cand_x = @x - cand_y = @y - 1 - while (jump_to?(cand_x, cand_y)) - grids.push([cand_x, cand_y]) - break if (! put_to?(cand_x, cand_y)) - cand_y = cand_y - 1 - end - else # down - cand_x = @x - cand_y = @y + 1 - while (jump_to?(cand_x, cand_y)) - grids.push([cand_x, cand_y]) - break if (! put_to?(cand_x, cand_y)) - cand_y = cand_y + 1 - end - end - return grids - end - end -end - -end diff --git a/shogi_server/pieceky.rb b/shogi_server/pieceky.rb deleted file mode 100644 index f21c671..0000000 --- a/shogi_server/pieceky.rb +++ /dev/null @@ -1,49 +0,0 @@ -module ShogiServer - -class PieceKY < Piece - def initialize(*arg) - @point = 1 - @normal_moves = [] - @promoted_moves = [[0, +1], [+1, +1], [-1, +1], [+1, +0], [-1, +0], [0, -1]] - @name = "KY" - @promoted_name = "NY" - super - end - def room_of_head?(x, y, name) - if (name == "KY") - if (@sente) - return false if (y == 1) - else - return false if (y == 9) - end - end - return true - end - def far_movable_grids - grids = Array::new - if (@promoted) - return [] - else - if (@sente) # up - cand_x = @x - cand_y = @y - 1 - while (jump_to?(cand_x, cand_y)) - grids.push([cand_x, cand_y]) - break if (! put_to?(cand_x, cand_y)) - cand_y = cand_y - 1 - end - else # down - cand_x = @x - cand_y = @y + 1 - while (jump_to?(cand_x, cand_y)) - grids.push([cand_x, cand_y]) - break if (! put_to?(cand_x, cand_y)) - cand_y = cand_y + 1 - end - end - return grids - end - end -end - -end diff --git a/showgame/controller/main.rb b/showgame/controller/main.rb index 0a86bdb..fc726e4 100644 --- a/showgame/controller/main.rb +++ b/showgame/controller/main.rb @@ -6,7 +6,6 @@ # this will force the controller to be mounted on: /otherurl require File.join(__DIR__, "..", "..", "shogi_server", "piece") -require File.join(__DIR__, "..", "..", "shogi_server", "piece_ky") require File.join(__DIR__, "..", "..", "shogi_server", "board") require File.join(__DIR__, "..", "..", "shogi_server", "usi") diff --git a/test/TC_board.rb b/test/TC_board.rb index 8001108..f55a83c 100644 --- a/test/TC_board.rb +++ b/test/TC_board.rb @@ -3,7 +3,6 @@ $:.unshift File.join(File.dirname(__FILE__), "..") require 'test/unit' require 'shogi_server' require 'shogi_server/board' -require 'shogi_server/piece_ky' require 'shogi_server/piece' module ShogiServer diff --git a/test/TC_usi.rb b/test/TC_usi.rb index 28ab8cf..360956c 100644 --- a/test/TC_usi.rb +++ b/test/TC_usi.rb @@ -3,7 +3,6 @@ $:.unshift File.join(File.dirname(__FILE__), "..") require 'test/unit' require 'shogi_server' require 'shogi_server/board' -require 'shogi_server/piece_ky' require 'shogi_server/piece' class TestUsi < Test::Unit::TestCase