bioshogi 0.0.14 → 0.0.17

data/lib/bioshogi/extreme_validator.rb

@@ -10,7 +10,7 @@ module Bioshogi
     end
 
     def call
-      # Bioshogi.config[:analyzer_enable] = false
+      # Bioshogi.config[:analysis_feature] = false
 
       error_body.delete rescue nil
       result = Hash.new(0)

data/lib/bioshogi/formatter/animation/animation_mp4_builder.rb

@@ -101,28 +101,36 @@ module Bioshogi
                 @screen_image_renderer = ScreenImage.renderer(@container, params)
 
                 if factory_method_key == "is_factory_method_rmagick"
-                  @progress_cop = ProgressCop.new(1 + 1 + @formatter.pi.move_infos.size + 3 + 7, &params[:progress_callback])
+                  @progress_cop = ProgressCop.new(begin_pages + 1 + @formatter.pi.move_infos.size + end_pages + 7, &params[:progress_callback])
 
                   begin
                     list = Magick::ImageList.new
 
                     if v = params[:cover_text].presence
-                      @progress_cop.next_step("表紙描画")
-                      tob("表紙描画") { list << CoverImage.renderer(text: v, **params.slice(:bottom_text, :width, :height)).render }
+                      cover_image = CoverImage.renderer(text: v, **params.slice(:bottom_text, :width, :height)).render
+                      begin_pages.times do |i|
+                        @progress_cop.next_step("表紙描画 #{i}/#{begin_pages}")
+                        tob("表紙描画 #{i}/#{begin_pages}") { list << cover_image.copy }
+                      end
                     end
 
                     @progress_cop.next_step("初期配置")
                     list << @screen_image_renderer.next_build
+
+                    # 駒の動き
                     @formatter.pi.move_infos.each.with_index do |e, i|
                       @progress_cop.next_step("(#{i}/#{@formatter.pi.move_infos.size}) #{e[:input]}")
                       @container.execute(e[:input])
                       list << @screen_image_renderer.next_build
                       logger.info { "move: #{i} / #{@formatter.pi.move_infos.size}" } if i.modulo(10).zero?
                     end
+
+                    # 終了図
                     end_pages.times do |i|
                       @progress_cop.next_step("終了図 #{i}/#{end_pages}")
                       tob("終了図 #{i}/#{end_pages}") { list << @screen_image_renderer.last_rendered_image.copy }
                     end
+
                     @progress_cop.next_step("mp4 生成")
                     heavy_tob(:write) do
                       list.write("_output0.mp4") # staging ではここで例外も出さずに落ちることがある
@@ -143,23 +151,18 @@ module Bioshogi
                 end
 
                 if factory_method_key == "is_factory_method_ffmpeg"
-                  logger.info { "[TRACE] #{__FILE__}:#{__LINE__}" }
-                  @progress_cop = ProgressCop.new(1 + 1 + @formatter.pi.move_infos.size + end_pages + 1 + 6, &params[:progress_callback])
+                  @progress_cop = ProgressCop.new(begin_pages + 1 + @formatter.pi.move_infos.size + end_pages + 1 + 6, &params[:progress_callback])
 
-                  logger.info { "[TRACE] #{__FILE__}:#{__LINE__}" }
                   if v = params[:cover_text].presence
-                    logger.info { "[TRACE] #{__FILE__}:#{__LINE__}" }
-                    @progress_cop.next_step("表紙描画")
-                    logger.info { "[TRACE] #{__FILE__}:#{__LINE__}" }
-                    tob("表紙描画") { CoverImage.renderer(text: v, **params.slice(:bottom_text, :width, :height)).render.write(sfg.next) }
-                    logger.info { "[TRACE] #{__FILE__}:#{__LINE__}" }
+                    cover_image = CoverImage.renderer(text: v, **params.slice(:bottom_text, :width, :height)).render
+                    begin_pages.times do |i|
+                      @progress_cop.next_step("表紙描画 #{i}/#{begin_pages}")
+                      tob("表紙描画 #{i}/#{begin_pages}") { cover_image.write(sfg.next) }
+                    end
                   end
 
-                  logger.info { "[TRACE] #{__FILE__}:#{__LINE__}" }
                   @progress_cop.next_step("初期配置")
-                  logger.info { "[TRACE] #{__FILE__}:#{__LINE__}" }
                   tob("初期配置") { @screen_image_renderer.next_build.write(sfg.next) }
-                  logger.info { "[TRACE] #{__FILE__}:#{__LINE__}" }
 
                   @formatter.pi.move_infos.each.with_index do |e, i|
                     @progress_cop.next_step("(#{i}/#{@formatter.pi.move_infos.size}) #{e[:input]}")

data/lib/bioshogi/formatter/animation/ffmpeg_support.rb

@@ -15,8 +15,13 @@ module Bioshogi
             super.merge({
                 # 全体
                 :page_duration              => 1.0,    # 1手N秒 10000/60 = 166.666666667 なので 0.0166666666667 を指定すると 60 FPS になる
-                :end_duration               => 0,      # 終了図をN秒表示する
+
+                :begin_pages                => 1,      # 表紙を表示するフレーム数。空なら begin_duration / page_duration
+                :begin_duration             => nil,    # 表紙をN秒表示する (こちらを有効にするには同時に begin_pages を nil すること)
+
                 :end_pages                  => nil,    # 終了図追加フレーム数。空なら end_duration / page_duration
+                :end_duration               => 0,      # 終了図をN秒表示する
+
                 :progress_callback          => nil,    # 進捗通知用
                 :cover_text                 => nil,    # 表紙(nilなら作らない)
                 :bottom_text                => nil,    # 表紙の右下に小さく表示する1行
@@ -64,6 +69,14 @@ module Bioshogi
           end
         end
 
+        def begin_pages
+          if v = params[:begin_pages]
+            v.to_i
+          else
+            params[:begin_duration].fdiv(page_duration).ceil
+          end
+        end
+
         # 最後の局面を追加で足す回数
         # これを設定しても最終的な秒数は不明なため基本指定せず、指定した end_duration から算出した方がよい
         # |------------------+------------------------+-----------+-----+----------------|

data/lib/bioshogi/formatter/core.rb

@@ -76,10 +76,10 @@ module Bioshogi
       def container_new
         container_class.new.tap do |e|
           e.params.update(@parser_options.slice(*[
-                :analyzer_enable,
-                :analyzer_technique_enable,
-                :candidate_enable,
-                :validate_enable,
+                :analysis_feature,
+                :analysis_technique_feature,
+                :ki2_function,
+                :validate_feature,
                 :validate_double_pawn_skip,
                 :validate_warp_skip,
               ]))
@@ -90,10 +90,10 @@ module Bioshogi
       def container_for_image
         container = Container::Basic.new
         container.params.update({
-            :analyzer_enable           => false,
-            :analyzer_technique_enable => false,
-            :candidate_enable               => false,
-            :validate_enable                => false,
+            :analysis_feature           => false,
+            :analysis_technique_feature => false,
+            :ki2_function               => false,
+            :validate_feature                => false,
           })
         container_init(container) # FIXME: これ、必要ない SFEN を生成したりして遅い
         container
@@ -163,7 +163,7 @@ module Bioshogi
 
       def container_run_all(container)
         Runner.new(self, container).call
-        if @parser_options[:analyzer_enable]
+        if @parser_options[:analysis_feature]
           SkillEmbed.new(self, container).call
           StyleEmbed.new(self, container).call
         end

data/lib/bioshogi/formatter/skill_embed.rb

@@ -15,6 +15,9 @@ module Bioshogi
 
       def call
         miyakodume_check
+        tsurushikei_check
+        settintsume_check
+
         meijin_judgement        # 力戦より前
         rikisen_judgement
 
@@ -88,21 +91,15 @@ module Bioshogi
       end
 
       def miyakodume_check
-        if last_action_params = @xparser.pi.last_action_params
-          if last_action_key = last_action_params[:last_action_key]
-            if last_action_info = LastActionInfo[last_action_key]
-              if last_action_info.key == :TSUMI
-                if soldier = @container.board["55"]
-                  if soldier.piece.key == :king
-                    tag = Analysis::NoteInfo["都詰め"]
-                    if @container.lose_player.location == soldier.location
-                      @container.win_player.skill_set.list_push(tag)
-                      # 最後の手にも入れておく
-                      if hand_log = @container.hand_logs.last
-                        hand_log.skill_set.list_push(tag)
-                      end
-                    end
-                  end
+        if @xparser.pi.saigoha_tsumi_p
+          if soldier = @container.board["55"]
+            if soldier.piece.key == :king
+              if @container.lose_player.location == soldier.location
+                tag = Analysis::NoteInfo["都詰め"]
+                @container.win_player.skill_set.list_push(tag)
+                # 最後の手にも入れておく
+                if hand_log = @container.hand_logs.last
+                  hand_log.skill_set.list_push(tag)
                 end
               end
             end
@@ -110,6 +107,38 @@ module Bioshogi
         end
       end
 
+      def settintsume_check
+        if @xparser.pi.saigoha_tsumi_p
+          found = ["11", "91", "19", "99"].any? do |e|
+            if soldier = @container.board[e]
+              if soldier.piece.key == :king
+                @container.lose_player.location == soldier.location
+              end
+            end
+          end
+          if found
+            tag = Analysis::NoteInfo["雪隠詰め"]
+            @container.win_player.skill_set.list_push(tag)
+            # 最後の手にも入れておく
+            if hand_log = @container.hand_logs.last
+              hand_log.skill_set.list_push(tag)
+            end
+          end
+        end
+      end
+
+      def tsurushikei_check
+        if @xparser.pi.saigoha_tsumi_p
+          if hand_log = @container.hand_logs.last
+            tag = Analysis::NoteInfo["吊るし桂"]
+            if hand_log.soldier.piece.key == :knight
+              @container.win_player.skill_set.list_push(tag) # 勝者に入れておく
+              hand_log.skill_set.list_push(tag)              # 最後の手にも入れておく
+            end
+          end
+        end
+      end
+
       def ainyugyoku_judgement
         if @container.players.all? { |e| e.skill_set.has_skill?(Analysis::NoteInfo["入玉"]) }
           @container.players.each do |player|
@@ -181,7 +210,7 @@ module Bioshogi
         if @container.turn_info.display_turn >= MIN_TURN
           if win_side_location
             player = @container.player_at(win_side_location)
-            if player.stronger_piece_have_count.zero?                           # 最後の状態でも全ブッチ状態なら
+            if player.strong_piece_have_count.zero?                           # 最後の状態でも全ブッチ状態なら
               if player.skill_set.has_skill?(Analysis::NoteInfo["大駒全ブッチ"]) # 途中、大駒全ブッチしいて (←これがないと 相入玉.kif でも入ってしまう)
                 player.skill_set.list_push(Analysis::NoteInfo["背水の陣"])
               end

data/lib/bioshogi/formatter/sugatayaki_validator.rb

@@ -40,7 +40,7 @@ module Bioshogi
         unless anaguma_formation? # 相手が穴熊状態か？
           return
         end
-        # unless stronger_piece_completed? # 大駒コンプリートしている？ → overwhelming_score? の方が汎用的
+        # unless strong_piece_completed? # 大駒コンプリートしている？ → overwhelming_score? の方が汎用的
         #   return
         # end
         unless win_player.overwhelming_score? # 自分が圧倒的な戦力を持っているか？
@@ -84,7 +84,7 @@ module Bioshogi
         if flop
           place = place.flop
         end
-        place = place.flip_if_white(lose_side_location)
+        place = place.white_then_flip(lose_side_location)
         if soldier = container.board[place]
           if soldier.location == lose_side_location
             soldier

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/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

@@ -22,7 +22,7 @@ module Bioshogi
       @hand_log = hand_log
 
       unless candidate_soldiers
-        raise BioshogiError, "candidate_enable オプションが有効になっていないため KI2 の特殊な移動表記を作れません"
+        raise BioshogiError, "ki2_function オプションが有効になっていないため KI2 の特殊な移動表記を作れません"
       end
     end
 
@@ -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,11 +25,11 @@ module Bioshogi
             #  skip: 棋譜には記さない
             # false: 例外を出す(デフォルト)
             :typical_error_case             => false,
-            :analyzer_enable           => true,
-            :analyzer_technique_enable => true,
-            :candidate_enable               => true,  # ki2にしないのであれば指定するとかなり速くなる
+            :analysis_feature           => true,
+            :analysis_technique_feature => true,
+            :ki2_function               => true,  # ki2にしないのであれば指定するとかなり速くなる
 
-            :validate_enable                => true,  # 将棋ウォーズの棋譜なら指定すると少し速くなる
+            :validate_feature                => true,  # 将棋ウォーズの棋譜なら指定すると少し速くなる
             :validate_double_pawn_skip      => false, # 二歩を無視するか？
             :validate_warp_skip             => false, # 角ワープを無視するか？
           }

data/lib/bioshogi/parser/pi.rb

@@ -51,6 +51,17 @@ module Bioshogi
           end
         end
       end
+
+      # 詰みまで指したか？
+      def saigoha_tsumi_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.key == :TSUMI
+            end
+          end
+        end
+      end
     end
   end
 end