bioshogi 0.0.13 → 0.0.15

data/lib/bioshogi/formatter/sugatayaki_validator.rb

@@ -0,0 +1,96 @@
+module Bioshogi
+  module Formatter
+    class SugatayakiValidator
+      delegate :win_side_location, :container, to: :@skill_embed
+
+      def initialize(skill_embed)
+        @skill_embed = skill_embed
+      end
+
+      def call
+        if valid?
+          win_player.skill_set.list_push(tag)
+
+          # 最後の手にも入れておく
+          container.hand_logs.last&.then do |hand_log|
+            hand_log.skill_set.list_push(tag)
+          end
+
+          # tp info
+        end
+      end
+
+      def tag
+        Analysis::NoteInfo["穴熊の姿焼き"]
+      end
+
+      def info
+        {
+          "閾値"       => Piece::PieceScore.sure_victory_score,
+          "勝者の得点" => win_player.current_score,
+          "敗者の得点" => lose_player.current_score,
+          "得点差"     => win_player.current_score - lose_player.current_score,
+        }
+      end
+
+      def valid?
+        unless win_side_location # 勝ち負けがはっきりしているか？
+          return
+        end
+        unless anaguma_formation? # 相手が穴熊状態か？
+          return
+        end
+        # unless stronger_piece_completed? # 大駒コンプリートしている？ → overwhelming_score? の方が汎用的
+        #   return
+        # end
+        unless win_player.overwhelming_score? # 自分が圧倒的な戦力を持っているか？
+          return
+        end
+        true
+      end
+
+      # 左右どちらかに相手の穴熊が存在する？
+      def anaguma_formation?
+        sub_anaguma_formation?(false) || sub_anaguma_formation?(true)
+      end
+
+      # 角に相手の穴熊が存在する？
+      def sub_anaguma_formation?(flop)
+        true &&
+          lose_side_soldier_at("19", flop).try { piece.key == :king } && # 角に玉がある
+          lose_side_soldier_at("18", flop) &&
+          lose_side_soldier_at("29", flop) &&
+          lose_side_soldier_at("28", flop)
+      end
+
+      # 勝ったプレイヤー
+      def win_player
+        @win_player ||= container.player_at(win_side_location)
+      end
+
+      # 負けたプレイヤー
+      def lose_player
+        @lose_player ||= container.player_at(lose_side_location)
+      end
+
+      # 負けた側
+      def lose_side_location
+        @lose_side_location ||= win_side_location.flip
+      end
+
+      # 負けた方の盤上の駒を得る
+      def lose_side_soldier_at(place, flop)
+        place = Place[place]
+        if flop
+          place = place.flop
+        end
+        place = place.white_then_flip(lose_side_location)
+        if soldier = container.board[place]
+          if soldier.location == lose_side_location
+            soldier
+          end
+        end
+      end
+    end
+  end
+end

data/lib/bioshogi/hand/drop.rb

@@ -59,7 +59,7 @@ module Bioshogi
       end
 
       def type
-        "t_drop"
+        :t_drop
       end
 
       def to_akf(options = {})

data/lib/bioshogi/hand/move.rb

@@ -35,8 +35,8 @@ module Bioshogi
       end
 
       # 成れる状態だった？
-      def promotable?
-        origin_soldier.next_promotable?(soldier.place)
+      def state_where_it_can_become_promote?
+        origin_soldier.tsugini_nareru_on?(soldier.place)
       end
 
       # 人間には読みやすいがパースは大変
@@ -84,14 +84,14 @@ module Bioshogi
       end
 
       def type
-        if promotable?
+        if state_where_it_can_become_promote?
           if promote_trigger?
-            "t_promote_on"
+            :t_promote_on
           else
-            "t_promote_throw"
+            :t_promote_throw
           end
         else
-          "t_move"
+          :t_move
         end
       end
 

data/lib/bioshogi/input_adapter/ki2_adapter.rb

@@ -86,13 +86,13 @@ module Bioshogi
               if md = v.match(/[左右]/)
                 if piece.brave?
                   m = {"左" => :first, "右" => :last}.fetch(md.to_s)
-                  m = flip_if_white(m)
-                  list = list.sort_by { |e| e.place.x.value }.send(m, 1)
+                  m = white_then_flip(m)
+                  list = list.sort_by { |e| e.place.column.value }.send(m, 1)
                 else
                   m = {"左" => :>, "右" => :<}.fetch(md.to_s)
-                  m = flip_if_white(m)
+                  m = white_then_flip(m)
                   list = list.find_all do |e|
-                    place.x.value.send(m, e.place.x.value)
+                    place.column.value.send(m, e.place.column.value)
                   end
                 end
               end
@@ -103,9 +103,9 @@ module Bioshogi
             if v = up_down
               if md = v.match(/[上引]/)
                 m = {"上" => :<, "引" => :>}.fetch(md.to_s)
-                m = flip_if_white(m)
+                m = white_then_flip(m)
                 list = list.find_all do |e|
-                  place.y.value.send(m, e.place.y.value)
+                  place.row.value.send(m, e.place.row.value)
                 end
               end
             end
@@ -115,7 +115,7 @@ module Bioshogi
           if list.size >= 2
             if v = up_down
               if v.include?("寄")
-                list = list.find_all { |e| e.place.y == place.y }
+                list = list.find_all { |e| e.place.row == place.row }
               end
             end
           end
@@ -123,9 +123,9 @@ module Bioshogi
           # 真下にあるもの
           if list.size >= 2
             if one_up?
-              y = place.y.value + player.location.which_value(1, -1)
+              y = place.row.value + player.location.which_value(1, -1)
               list = list.find_all { |e|
-                e.place.x == place.x && e.place.y.value == y
+                e.place.column == place.column && e.place.row.value == y
               }
             end
           end
@@ -144,7 +144,7 @@ module Bioshogi
         !promoted && !suffix_exist? && candidate_soldiers.empty?
       end
 
-      def flip_if_white(key)
+      def white_then_flip(key)
         if player.location.key == :white
           key = self.class.flip_table[key]
         end

data/lib/bioshogi/input_adapter/shared_validation.rb

@@ -12,7 +12,7 @@ module Bioshogi
           end
 
           if move_hand.promote_trigger?
-            unless origin_soldier.next_promotable?(place)
+            unless origin_soldier.tsugini_nareru_on?(place)
               errors_add NotPromotable, "#{origin_soldier.place}から#{place}への移動では成れません"
             end
           end

data/lib/bioshogi/kanji_number.rb

@@ -1,7 +1,3 @@
-if $0 == __FILE__
-  require "active_support/core_ext/module/attribute_accessors"
-end
-
 module Bioshogi
   module KanjiNumber
     extend self
@@ -84,45 +80,4 @@ module Bioshogi
       s.scan(regexp, &block)
     end
   end
-
-  if $0 == __FILE__
-    KanjiNumber.kanji_to_number_string("")               # => ""
-    KanjiNumber.kanji_to_number_string("歩")             # => "歩"
-    KanjiNumber.kanji_to_number_string("歩〇")           # => "歩0"
-    KanjiNumber.kanji_to_number_string("歩九")           # => "歩9"
-    KanjiNumber.kanji_to_number_string("歩十")           # => "歩10"
-    KanjiNumber.kanji_to_number_string("歩十〇")         # => "歩10"
-    KanjiNumber.kanji_to_number_string("歩十一")         # => "歩11"
-    KanjiNumber.kanji_to_number_string("歩十九")         # => "歩19"
-    KanjiNumber.kanji_to_number_string("歩二十")         # => "歩20"
-    KanjiNumber.kanji_to_number_string("歩二十〇")       # => "歩20"
-    KanjiNumber.kanji_to_number_string("歩二十一")       # => "歩21"
-    KanjiNumber.kanji_to_number_string("歩百二十三")     # => "歩123"
-    KanjiNumber.kanji_to_number_string("歩千二百三十四") # => "歩1234"
-
-    KanjiNumber.kanji_to_number_string("歩十")           # => "歩10"
-    KanjiNumber.kanji_to_number_string("歩百")           # => "歩100"
-    KanjiNumber.kanji_to_number_string("歩千")           # => "歩1000"
-    KanjiNumber.kanji_to_number_string("歩1万")          # => "歩10000"
-    KanjiNumber.kanji_to_number_string("歩1憶")          # => "歩100000"
-    KanjiNumber.kanji_to_number_string("歩1兆")          # => "歩1000000"
-
-    KanjiNumber.number_to_kanji(0)                      # => "〇"
-    KanjiNumber.number_to_kanji(1)                      # => "一"
-    KanjiNumber.number_to_kanji(10)                     # => "十"
-    KanjiNumber.number_to_kanji(12)                     # => "十二"
-    KanjiNumber.number_to_kanji(2)                      # => "二"
-    KanjiNumber.number_to_kanji(23)                     # => "二十三"
-    KanjiNumber.number_to_kanji(123)                    # => "百二十三"
-    KanjiNumber.number_to_kanji(120)                    # => "百二十"
-    KanjiNumber.number_to_kanji(100)                    # => "百"
-    KanjiNumber.number_to_kanji(1000)                   # => "千"
-    KanjiNumber.number_to_kanji(10000)                  # => "一万"
-    KanjiNumber.number_to_kanji(100000)                 # => "一憶"
-    KanjiNumber.number_to_kanji(1000000)                # => "一兆"
-    KanjiNumber.number_to_kanji(1234.5678)              # => "千二百三十四"
-
-    KanjiNumber.extract("歩百二十三") # => ["百二十三"]
-    KanjiNumber.regexp                # => /[十百千万憶兆〇一二三四五六七八九]+/
-  end
 end

data/lib/bioshogi/kifu_format_info.rb

@@ -2,14 +2,14 @@ module Bioshogi
   class KifuFormatInfo
     include ApplicationMemoryRecord
     memory_record [
-      { key: "kif",  },
-      { key: "ki2",  },
-      { key: "csa",  },
-      { key: "sfen", },
+      { key: :kif,  },
+      { key: :ki2,  },
+      { key: :csa,  },
+      { key: :sfen, },
     ]
 
     def name
-      @name ||= key.to_s.upcase
+      super.upcase
     end
   end
 end

data/lib/bioshogi/location.rb

@@ -12,8 +12,8 @@ module Bioshogi
   class Location
     include ApplicationMemoryRecord
     memory_record [
-      { key: :black, name: "▲", pentagon_mark: "☗", equality_name: "先手", handicap_name: "下手", equality_yomiage: "先手", handicap_yomiage: "したて", flip_mark: "▼", varrow: " ", csa_sign: "+", angle: 0,   other_match_chars: ["☗"], to_sfen: "b", normalize_key: :itself, value_sign: +1, checkmate_yomiage: "せめかた",  },
-      { key: :white, name: "△", pentagon_mark: "☖", equality_name: "後手", handicap_name: "上手", equality_yomiage: "後手", handicap_yomiage: "うわて", flip_mark: "▽", varrow: "v", csa_sign: "-", angle: 180, other_match_chars: ["☖"], to_sfen: "w", normalize_key: :flip,   value_sign: -1, checkmate_yomiage: "gyokugata", },
+      { key: :black, name: "▲", pentagon_mark: "☗", equality_name: "先手", handicap_name: "下手", equality_yomiage: "先手", handicap_yomiage: "したて", flip_mark: "▼", varrow: " ", csa_sign: "+", angle: 0,   other_match_chars: ["☗"], to_sfen: "b", normalize_key: :itself, sign_dir: +1, checkmate_yomiage: "せめかた",  },
+      { key: :white, name: "△", pentagon_mark: "☖", equality_name: "後手", handicap_name: "上手", equality_yomiage: "後手", handicap_yomiage: "うわて", flip_mark: "▽", varrow: "v", csa_sign: "-", angle: 180, other_match_chars: ["☖"], to_sfen: "w", normalize_key: :flip,   sign_dir: -1, checkmate_yomiage: "gyokugata", },
     ]
 
     class << self
@@ -118,6 +118,26 @@ module Bioshogi
       end
     end
 
+    ################################################################################
+
+    def top
+      Dimension::Row.top.white_then_flip(self)
+    end
+
+    def bottom
+      Dimension::Row.bottom.white_then_flip(self)
+    end
+
+    def left
+      Dimension::Column.left.white_then_flip(self)
+    end
+
+    def right
+      Dimension::Column.right.white_then_flip(self)
+    end
+
+    ################################################################################
+
     private
 
     def call_name_method_name(handicap)

data/lib/bioshogi/official_formatter.rb

@@ -40,7 +40,7 @@ module Bioshogi
         s << @options[:separator]
       end
 
-      if type == "t_drop"
+      if type == :t_drop
         s << piece_name
         # 日本将棋連盟 棋譜の表記方法
         # https://www.shogi.or.jp/faq/kihuhyouki.html
@@ -53,15 +53,15 @@ module Bioshogi
         if @options[:force_drop] || !candidate_soldiers.empty?
           s << kw("打")
         end
-      elsif type == "t_promote_on"
+      elsif type == :t_promote_on
         s << piece_name
         s << motion
         s << kw("成")
-      elsif type == "t_promote_throw"
+      elsif type == :t_promote_throw
         s << piece_name
         s << motion
         s << kw("不成") # or "生"
-      elsif type == "t_move"
+      elsif type == :t_move
         s << soldier_name
         s << motion
       else
@@ -80,26 +80,26 @@ module Bioshogi
 
     def to_debug_hash
       {
-        :place_from     => place_from,
-        :place_to       => place_to,
-        :candidate_soldiers      => candidate_soldiers.collect(&:name),
-        :koreru_c       => koreru_c,
-        :_migi_idou     => _migi_idou?,
-        :_hidari_idou   => _hidari_idou?,
-        :_ue_idou       => _ue_idou?,
-        :_shita_idou    => _shita_idou?,
-        :_hidari_kara_c => _hidari_kara_c,
-        :_migi_kara_c   => _migi_kara_c,
-        :yoreru_c       => yoreru_c,
-        :agareru_c      => agareru_c,
-        :sagareru_c     => sagareru_c,
-        :shita_y        => shita_y,
-        :_tx            => _tx,
-        :_ty            => _ty,
-        :_ox            => _ox,
-        :_oy            => _oy,
-        :_xr            => _xr,
-        :_yr            => _yr,
+        :place_from         => place_from,
+        :place_to           => place_to,
+        :candidate_soldiers => candidate_soldiers.collect(&:name),
+        :koreru_c           => koreru_c,
+        :_migi_idou         => _migi_idou?,
+        :_hidari_idou       => _hidari_idou?,
+        :_ue_idou           => _ue_idou?,
+        :_shita_idou        => _shita_idou?,
+        :_hidari_kara_c     => _hidari_kara_c,
+        :_migi_kara_c       => _migi_kara_c,
+        :yoreru_c           => yoreru_c,
+        :agareru_c          => agareru_c,
+        :sagareru_c         => sagareru_c,
+        :shita_y            => shita_y,
+        :_tx                => _tx,
+        :_ty                => _ty,
+        :_ox                => _ox,
+        :_oy                => _oy,
+        :_xr                => _xr,
+        :_yr                => _yr,
       }
     end
 
@@ -281,37 +281,37 @@ module Bioshogi
 
     # 左からこれる駒の数
     def _hidari_kara_c
-      candidate_soldiers.count { |s| s.place.x.value < _tx }
+      candidate_soldiers.count { |s| s.place.column.value < _tx }
     end
 
     # 右からこれる駒の数
     def _migi_kara_c
-      candidate_soldiers.count { |s| s.place.x.value > _tx }
+      candidate_soldiers.count { |s| s.place.column.value > _tx }
     end
 
     # 水平に寄れる駒の数
     def yoreru_c
-      candidate_soldiers.count { |s| s.place.y.value == _ty }
+      candidate_soldiers.count { |s| s.place.row.value == _ty }
     end
 
     # 上がれる駒の数(移動先より下にある数)
     def agareru_c
-      candidate_soldiers.count { |s| s.place.y.value.send(_i(:>), _ty) }
+      candidate_soldiers.count { |s| s.place.row.value.send(_i(:>), _ty) }
     end
 
     # 下がれる駒の数(移動先より上にある数)
     def sagareru_c
-      candidate_soldiers.count { |s| s.place.y.value.send(_i(:<), _ty) }
+      candidate_soldiers.count { |s| s.place.row.value.send(_i(:<), _ty) }
     end
 
     # 移動先X
     def _tx
-      @_tx ||= place_to.x.value
+      @_tx ||= place_to.column.value
     end
 
     # 移動元Y
     def _ty
-      @_ty ||= place_to.y.value
+      @_ty ||= place_to.row.value
     end
 
     # プレイヤー視点から見た移動先の一つ下
@@ -326,31 +326,31 @@ module Bioshogi
 
     # 移動元X
     def _ox
-      @_ox ||= place_from.x.value
+      @_ox ||= place_from.column.value
     end
 
     # 移動先Y
     def _oy
-      @_oy ||= place_from.y.value
+      @_oy ||= place_from.row.value
     end
 
     # 候補手の座標範囲
     def _xr
-      @_xr ||= Range.new(*candidate_soldiers.collect { |e| e.place.x.value }.minmax)
+      @_xr ||= Range.new(*candidate_soldiers.collect { |e| e.place.column.value }.minmax)
     end
 
     def _yr
-      @_yr ||= Range.new(*candidate_soldiers.collect { |e| e.place.y.value }.minmax)
+      @_yr ||= Range.new(*candidate_soldiers.collect { |e| e.place.row.value }.minmax)
     end
 
     # 移動元で二つの龍が水平線上にいる？
     def idou_moto_no_ryu_ga_suihei_ni_iru?
-      candidate_soldiers.collect { |e| e.place.y.value }.uniq.size == 1
+      candidate_soldiers.collect { |e| e.place.row.value }.uniq.size == 1
     end
 
     # 移動先の水平線上よりすべて上 or すべて下
     # つまり、移動先のYが候補のYの範囲に含まれている
-    # だから candidate_soldiers.all?{|s|s.place.y.value < _ty} || candidate_soldiers.all?{|s|s.place.y.value > _ty} から !_yr.cover?(_ty) に変更できる
+    # だから candidate_soldiers.all?{|s|s.place.row.value < _ty} || candidate_soldiers.all?{|s|s.place.row.value > _ty} から !_yr.cover?(_ty) に変更できる
     def idousakino_suiheisenjou_yori_subete_ue_mataha_shita?
       !_yr.cover?(_ty)
     end

data/lib/bioshogi/order_info.rb

@@ -1,12 +1,14 @@
 # frozen-string-literal: true
 
-# ▲△とは関係がない
+# ▲△と混同しがちだが▲△は場所のことであって順番とは関係がない。
+# たとえば駒落ちの場合は△から指すため「△=後手」と解釈しているとおかしくなる。
+
 module Bioshogi
   class OrderInfo
     include ApplicationMemoryRecord
     memory_record [
-      { key: :sente, name: "先手"}, # 奇数回に指す側
-      { key: :gote,  name: "後手"}, # 偶数回に指す側
+      { key: :order_first,  name: "先手"}, # 奇数回に指す側
+      { key: :order_second, name: "後手"}, # 偶数回に指す側
     ]
   end
 end

data/lib/bioshogi/parser/base.rb

@@ -25,8 +25,8 @@ module Bioshogi
             #  skip: 棋譜には記さない
             # false: 例外を出す(デフォルト)
             :typical_error_case             => false,
-            :skill_monitor_enable           => true,
-            :skill_monitor_technique_enable => true,
+            :analyzer_enable           => true,
+            :analyzer_technique_enable => true,
             :candidate_enable               => true,  # ki2にしないのであれば指定するとかなり速くなる
 
             :validate_enable                => true,  # 将棋ウォーズの棋譜なら指定すると少し速くなる

data/lib/bioshogi/parser/pi.rb

@@ -40,6 +40,17 @@ module Bioshogi
       def clock_nothing?
         !clock_exist?
       end
+
+      # 勝ち負けがついた一般的な終わり方をしたか？
+      def win_player_collect_p
+        if last_action_params
+          if last_action_key = last_action_params[:last_action_key]
+            if last_action_info = Formatter::LastActionInfo[last_action_key]
+              last_action_info.win_player_collect_p
+            end
+          end
+        end
+      end
     end
   end
 end

data/lib/bioshogi/piece/piece_scale.rb

@@ -5,14 +5,15 @@ module Bioshogi
     class PieceScale
       include ApplicationMemoryRecord
       memory_record [
-        { key: :king,   scale: 1.00, },
-        { key: :rook,   scale: 1.00, },
-        { key: :bishop, scale: 1.00, },
-        { key: :gold,   scale: 0.97, },
-        { key: :silver, scale: 0.94, },
-        { key: :knight, scale: 0.91, },
-        { key: :lance,  scale: 0.88, },
-        { key: :pawn,   scale: 0.85, },
+        # http://kijishi.html.xdomain.jp/komanosize.htm
+        { key: :king,   scale: 1.00, }, # 王が一番大きい
+        { key: :rook,   scale: 0.99, }, # 飛車と角の大きさは同じでよい
+        { key: :bishop, scale: 0.99, },
+        { key: :gold,   scale: 0.98, }, # 金・銀の大きさは同じ
+        { key: :silver, scale: 0.98, },
+        { key: :knight, scale: 0.97, }, # 桂馬の香車の差は大きい
+        { key: :lance,  scale: 0.95, },
+        { key: :pawn,   scale: 0.94, },
       ]
     end
   end

data/lib/bioshogi/piece/piece_score.rb

@@ -15,6 +15,20 @@ module Bioshogi
         { key: :pawn,   basic_weight:   100, promoted_weight: 1200, hold_weight:   105, },
       ]
 
+      class << self
+        # このスコア以上であれば必勝(姿焼き判定)とする
+        def sure_victory_score
+          @sure_victory_score ||= [
+            self[:king].basic_weight,      # 玉
+            self[:rook].promoted_weight,   # 龍
+            self[:bishop].promoted_weight, # 馬
+            self[:rook].hold_weight,       # 飛 (持駒)
+            self[:bishop].hold_weight,     # 角 (持駒)
+            self[:gold].basic_weight * 4,  # 金相当 * 4 (と金などを含む)
+          ].sum
+        end
+      end
+
       def piece
         Piece.fetch(key)
       end

data/lib/bioshogi/piece/piece_vector.rb

@@ -10,21 +10,27 @@ module Bioshogi
     class PieceVector
       include ApplicationMemoryRecord
       memory_record [
-        { key: :king,   basic_once_vectors: :pattern_king,       basic_repeat_vectors: nil,           promoted_once_vectors: nil,           promoted_repeat_vectors: nil,           },
-        { key: :rook,   basic_once_vectors: nil,                 basic_repeat_vectors: :pattern_plus, promoted_once_vectors: :pattern_x,    promoted_repeat_vectors: :pattern_plus, },
-        { key: :bishop, basic_once_vectors: nil,                 basic_repeat_vectors: :pattern_x,    promoted_once_vectors: :pattern_plus, promoted_repeat_vectors: :pattern_x,    },
-        { key: :gold,   basic_once_vectors: :pattern_gold,       basic_repeat_vectors: nil,           promoted_once_vectors: nil,           promoted_repeat_vectors: nil,           },
-        { key: :silver, basic_once_vectors: :pattern_silver,     basic_repeat_vectors: nil,           promoted_once_vectors: :pattern_gold, promoted_repeat_vectors: nil,           },
-        { key: :knight, basic_once_vectors: :pattern_knight,     basic_repeat_vectors: nil,           promoted_once_vectors: :pattern_gold, promoted_repeat_vectors: nil,           },
-        { key: :lance,  basic_once_vectors: nil,                 basic_repeat_vectors: :pattern_pawn, promoted_once_vectors: :pattern_gold, promoted_repeat_vectors: nil,           },
-        { key: :pawn,   basic_once_vectors: :pattern_pawn,       basic_repeat_vectors: nil,           promoted_once_vectors: :pattern_gold, promoted_repeat_vectors: nil,           },
+        { key: :king,   basic_once_vectors: :pattern_king,   basic_repeat_vectors: nil,           promoted_once_vectors: nil,           promoted_repeat_vectors: nil,           },
+        { key: :rook,   basic_once_vectors: nil,             basic_repeat_vectors: :pattern_plus, promoted_once_vectors: :pattern_x,    promoted_repeat_vectors: :pattern_plus, },
+        { key: :bishop, basic_once_vectors: nil,             basic_repeat_vectors: :pattern_x,    promoted_once_vectors: :pattern_plus, promoted_repeat_vectors: :pattern_x,    },
+        { key: :gold,   basic_once_vectors: :pattern_gold,   basic_repeat_vectors: nil,           promoted_once_vectors: nil,           promoted_repeat_vectors: nil,           },
+        { key: :silver, basic_once_vectors: :pattern_silver, basic_repeat_vectors: nil,           promoted_once_vectors: :pattern_gold, promoted_repeat_vectors: nil,           },
+        { key: :knight, basic_once_vectors: :pattern_knight, basic_repeat_vectors: nil,           promoted_once_vectors: :pattern_gold, promoted_repeat_vectors: nil,           },
+        { key: :lance,  basic_once_vectors: nil,             basic_repeat_vectors: :pattern_pawn, promoted_once_vectors: :pattern_gold, promoted_repeat_vectors: nil,           },
+        { key: :pawn,   basic_once_vectors: :pattern_pawn,   basic_repeat_vectors: nil,           promoted_once_vectors: :pattern_gold, promoted_repeat_vectors: nil,           },
+      ]
+
+      DELEGATE_METHODS = [
+        :brave?,
+        :all_vectors,
       ]
 
       def brave?
         attributes[:promoted_repeat_vectors]
       end
 
-      def all_vectors(promoted:, location:)
+      # すべてはこれで足りるので他のメソッドを public にするべからず
+      def all_vectors(location:, promoted: false)
         @all_vectors ||= {}
         @all_vectors[[promoted, location.key]] ||= yield_self do
           vectors = select_vectors(promoted)
@@ -49,7 +55,7 @@ module Bioshogi
       end
 
       def normalized_vectors(location, vectors)
-        vectors.collect { |e| e * location.value_sign }
+        vectors.collect { |e| e * location.sign_dir }
       end
 
       def basic_vectors