駒クラス修正完了

Author: kozakana

.bundle/config

@@ -1,2 +1,3 @@
 ---
 BUNDLE_PATH: vendor/bundle
+BUNDLE_DISABLE_SHARED_GEMS: '1'

board.rb

@@ -1,14 +1,25 @@
-require './pieces/piece'
+#Dir[File.expand_path('./pieces', __FILE__) << '/*.rb'].each do |file|
+#    require file
+#end
+
+require  './pieces/ou'
+require  './pieces/kin'
+require  './pieces/gin'
+require  './pieces/kei'
+require  './pieces/kyo'
+require  './pieces/fu'
+require  './pieces/hi'
+require  './pieces/kaku'
+require  './pieces/nil_piece'
 require 'singleton'
 
 class ExistPiece < StandardError; end
 class MissingPiece < StandardError; end
+class CannotMove < StandardError; end
 
 # TODO: 飛び駒の判定
 # TODO: 二歩判定
 # TODO: 観客は見るだけにする
-# TODO: 観客ステータス
-# TODO: 先後逆の駒は触れないようにする
 # TODO: ログ機能
 # TODO: 待った機能
 # TODO: 負けました機能
@@ -34,75 +45,75 @@ def init_board
     @order_first = true
 
     @data << [
-              Piece.new(:kyo, :second, false), Piece.new,
-              Piece.new(:fu, :second, false),  Piece.new, 
-              Piece.new,                       Piece.new,
-              Piece.new(:fu, :first, false),   Piece.new,
-              Piece.new(:kyo, :first, false)
+              Kyo.new(:second, false), NilPiece.new,
+              Fu.new(:second, false),  NilPiece.new, 
+              NilPiece.new,            NilPiece.new,
+              Fu.new(:first, false),   NilPiece.new,
+              Kyo.new(:first, false)
              ]
 
     @data << [
-              Piece.new(:kei, :second, false), Piece.new(:kaku, :second, false),
-              Piece.new(:fu, :second, false),  Piece.new,
-              Piece.new,                       Piece.new,
-              Piece.new(:fu, :first, false),   Piece.new(:hi, :first, false),
-              Piece.new(:kei, :first, false)
+              Kei.new(:second, false), Kaku.new(:second, false),
+              Fu.new(:second, false),  NilPiece.new,
+              NilPiece.new,            NilPiece.new,
+              Fu.new(:first, false),   Hi.new(:first, false),
+              Kei.new(:first, false)
              ]
 
     @data << [
-              Piece.new(:gin, :second, false), Piece.new,
-              Piece.new(:fu, :second, false),  Piece.new,
-              Piece.new,                       Piece.new,
-              Piece.new(:fu, :first, false),   Piece.new,
-              Piece.new(:gin, :first, false)
+              Gin.new(:second, false), NilPiece.new,
+              Fu.new(:second, false),  NilPiece.new,
+              NilPiece.new,            NilPiece.new,
+              Fu.new(:first, false),   NilPiece.new,
+              Gin.new(:first, false)
              ]
 
     @data << [
-              Piece.new(:kin, :second, false), Piece.new,
-              Piece.new(:fu, :second, false),  Piece.new,
-              Piece.new,                       Piece.new,
-              Piece.new(:fu, :first, false),   Piece.new,
-              Piece.new(:kin, :first, false)
+              Kin.new(:second, false), NilPiece.new,
+              Fu.new(:second, false),  NilPiece.new,
+              NilPiece.new,            NilPiece.new,
+              Fu.new(:first, false),   NilPiece.new,
+              Kin.new(:first, false)
              ]
 
     @data << [
-              Piece.new(:ou, :second,false),    Piece.new,
-              Piece.new(:fu, :second, false),   Piece.new,
-              Piece.new,                        Piece.new,
-              Piece.new(:fu, :first, false),    Piece.new,
-              Piece.new(:ou, :first, false)
+              Ou.new(:second,false),    NilPiece.new,
+              Fu.new(:second, false),   NilPiece.new,
+              NilPiece.new,             NilPiece.new,
+              Fu.new(:first, false),    NilPiece.new,
+              Ou.new(:first, false)
              ]
 
     @data << [
-              Piece.new(:kin, :second, false), Piece.new,
-              Piece.new(:fu, :second, false),  Piece.new,
-              Piece.new,                       Piece.new,
-              Piece.new(:fu, :first, false),   Piece.new,
-              Piece.new(:kin, :first, false)
+              Kin.new(:second, false), NilPiece.new,
+              Fu.new(:second, false),  NilPiece.new,
+              NilPiece.new,            NilPiece.new,
+              Fu.new(:first, false),   NilPiece.new,
+              Kin.new(:first, false)
              ]
 
     @data << [
-              Piece.new(:gin, :second, false), Piece.new,
-              Piece.new(:fu, :second, false),  Piece.new,
-              Piece.new,                       Piece.new,
-              Piece.new(:fu, :first, false),   Piece.new,
-              Piece.new(:gin, :first, false)
+              Gin.new(:second, false), NilPiece.new,
+              Fu.new(:second, false),  NilPiece.new,
+              NilPiece.new,            NilPiece.new,
+              Fu.new(:first, false),   NilPiece.new,
+              Gin.new(:first, false)
              ]
 
     @data << [
-              Piece.new(:kei, :second, false), Piece.new(:hi, :second, false),
-              Piece.new(:fu, :second, false),  Piece.new,
-              Piece.new,                       Piece.new,
-              Piece.new(:fu, :first, false),   Piece.new(:kaku, :first, false),
-              Piece.new(:kei, :first, false)
+              Kei.new(:second, false), Hi.new(:second, false),
+              Fu.new(:second, false),  NilPiece.new,
+              NilPiece.new,            NilPiece.new,
+              Fu.new(:first, false),   Kaku.new(:first, false),
+              Kei.new(:first, false)
              ]
 
     @data << [
-              Piece.new(:kyo, :second, false), Piece.new,
-              Piece.new(:fu, :second, false),  Piece.new,
-              Piece.new,                       Piece.new,
-              Piece.new(:fu, :first, false),   Piece.new,
-              Piece.new(:kyo, :first, false)
+              Kyo.new(:second, false),  NilPiece.new,
+              Fu.new(:second, false),   NilPiece.new,
+              NilPiece.new,             NilPiece.new,
+              Fu.new(:first, false),    NilPiece.new,
+              Kyo.new(:first, false)
              ]
   end
 
@@ -175,11 +186,15 @@ def move before, after, id
         p "観戦者は駒を動かす事は出来ません"
         return
       else
-        p "自分の駒以外は動かせません"
+        p "指定場所へ動かせません"
         return
       end
     end
 
+    unless orig_piece.move? before, after
+      raise CannotMove, "そこへは動かせません"
+    end
+
     if exist? after
       captured = @data[after[0]][after[1]]
       if captured.player == :first
@@ -194,10 +209,10 @@ def move before, after, id
     end
 
     @data[after[0]][after[1]]   = @data[before[0]][before[1]]
-    @data[before[0]][before[1]] = Piece.new
+    @data[before[0]][before[1]] = NilPiece.new
 
     if can_grow? after
-      if piece(after).can_next?(after)
+      if can_next? after
         status = {grow: :can}
       else
         status = {grow: :must}
@@ -240,7 +255,7 @@ def set pos, kind, id
       return
     end
 
-    piece = Piece.new(kind, order(id), false)
+    piece = piece_incetance(kind, order(id), false)
 
     if @piece_stand[order(id)].include?(piece)
       @piece_stand[order(id)].each_with_index do |p, i|
@@ -256,6 +271,27 @@ def set pos, kind, id
     @data[pos[0]][pos[1]] = piece
   end
 
+  def piece_incetance kind, order, grow
+    case kind
+    when :ou
+      Ou.new(order, grow)
+    when :kin
+      Kin.new(order, grow)
+    when :gin
+      Gin.new(order, grow)
+    when :kei
+      Kei.new(order, grow)
+    when :kyo
+      Kyo.new(order, grow)
+    when :fu
+      Fu.new(order, grow)
+    when :hi
+      Hi.new(order, grow)
+    when :kaku
+      Kaku.new(order, grow)
+    end
+  end
+
   def exist? pos
     nil != @data[pos[0]][pos[1]].player
   end
@@ -276,6 +312,29 @@ def can_grow? pos
       true if pos[1] >= 6
     end
   end
+
+  def can_next? pos
+    pce = piece(pos)
+    return true if pce.grow == true
+    case pce.kind
+    when :kei
+      if pce.player == :first
+        false if pos[1] <= 1
+      else
+        false if pos[1] >= 7
+      end
+      true
+    when :kyo, :fu
+      if pce.player == :first
+        false if pos[1] <= 0
+      else
+        false if pos[1] >= 8
+      end
+      true
+    else
+      true
+    end
+  end
 
   def grow_piece pos
     piece(pos).grow = true

jcclient.rb

@@ -70,6 +70,8 @@ def command str
           puts "動かそうとする駒がありません"
         elsif e.message == "ExistPiece"
           puts "移動先に自分の駒があります"
+        elsif e.message == "CannotMove"
+          puts "指定場所へ動かせません"
         else
           p e
         end

pieces/fu.rb

@@ -1,6 +1,10 @@
 require './pieces/piece'
 
 class Fu < Piece
+  def kind
+    :fu
+  end
+
   def move? before, after
     if @grow == true
       return move_kin before, after
@@ -19,13 +23,4 @@ def move? before, after
   def to_s
     disp "歩"
   end
-
-  def can_next? pos
-    return true if @grow == true
-    if @player == :first
-      return false if pos[1] <= 0
-    else
-      return false if pos[1] >= 8
-    end
-  end
 end

pieces/gin.rb

@@ -1,6 +1,10 @@
 require './pieces/piece'
 
 class Gin < Piece
+  def kind
+    :gin
+  end
+
   def move? before, after
     if @grow == true
       return move_kin before, after

pieces/hi.rb

@@ -1,6 +1,10 @@
 require './pieces/piece'
 
 class Hi < Piece
+  def kind
+    :hi
+  end
+
   def move? before, after
     return true if before[0] == after[0]
     return true if before[1] == after[1]

pieces/kaku.rb

@@ -1,6 +1,10 @@
 require './pieces/piece'
 
 class Kaku < Piece
+  def kind
+    :kaku
+  end
+
   def move? before, after
     dist_x = before[0] - after[0]
     dist_y = before[1] - after[1]

pieces/kei.rb

@@ -1,6 +1,10 @@
 require './pieces/piece'
 
 class Kei < Piece
+  def kind
+    :kei
+  end
+
   def move? before, after
     if @grow == true
       return move_kin before, after

pieces/kin.rb

@@ -1,6 +1,10 @@
 require './pieces/piece'
 
 class Kin < Piece
+  def kind
+    :kin
+  end
+
   def move? before, after
     move_kin before, after
   end

pieces/kyo.rb

@@ -1,6 +1,10 @@
 require './pieces/piece'
 
 class Kyo < Piece
+  def kind
+    :kyo
+  end
+
   def move? before, after
     if @grow == true
       return move_kin before, after

pieces/nil_piece.rb

@@ -1,6 +1,11 @@
 require './pieces/piece'
 
 class NilPiece < Piece
+  def initialize
+    @player = nil
+    @grow   = false
+  end
+
   def ==(pce)
     pce.class == 'NilPiece'
   end

pieces/ou.rb

@@ -1,6 +1,9 @@
 require './pieces/piece'
 
 class Ou < Piece
+  def kind
+    :ou
+  end
 
   def move? before, after
     move_ou before, after
@@ -12,9 +15,9 @@ def grow status
 
   def to_s
     if @player == :first
-      "王"
+      disp "王"
     else
-      "玉"
+      disp "玉"
     end
   end
 end