bioshogi 0.0.15 → 0.0.17

data/lib/bioshogi/assets/images/piece/portella/convert.rb

@@ -0,0 +1,89 @@
+# convert backup/WG0.png -background none -gravity north -crop 249x245+0+11 +repage -extent 249x256 WG0.png
+
+require "rmagick"
+
+[
+  # black
+  { key: "0GY", output: "BK0", shift:   0, }, # 玉
+  { key: "0HI", output: "BR0", shift:   0, }, # 飛
+  { key: "0RY", output: "BR1", shift:   0, }, # 龍
+  { key: "0KA", output: "BB0", shift:   0, }, # 角
+  { key: "0UM", output: "BB1", shift:   0, }, # 馬
+  { key: "0KI", output: "BG0", shift:   0, }, # 金
+  { key: "0GI", output: "BS0", shift:   0, }, # 銀
+  { key: "0NG", output: "BS1", shift:   0, }, # 成銀
+  { key: "0KE", output: "BN0", shift:   0, }, # 桂
+  { key: "0NK", output: "BN1", shift:   0, }, # 成桂
+  { key: "0KY", output: "BL0", shift:   0, }, # 香
+  { key: "0NY", output: "BL1", shift:   0, }, # 成香
+  { key: "0FU", output: "BP0", shift:   0, }, # 歩
+  { key: "0TO", output: "BP1", shift:   0, }, # と
+  # white
+  { key: "1OU", output: "WK0", shift:   0, }, # 王
+  { key: "1HI", output: "WR0", shift:  -2, }, # 飛
+  { key: "1RY", output: "WR1", shift:  -2, }, # 龍
+  { key: "1KA", output: "WB0", shift:  -2, }, # 角
+  { key: "1UM", output: "WB1", shift:  -2, }, # 馬
+  { key: "1KI", output: "WG0", shift:  -7, }, # 金
+  { key: "1GI", output: "WS0", shift:  -8, }, # 銀
+  { key: "1NG", output: "WS1", shift:  -8, }, # 成銀
+  { key: "1KE", output: "WN0", shift: -10, }, # 桂
+  { key: "1NK", output: "WN1", shift: -10, }, # 成桂
+  { key: "1KY", output: "WL0", shift: -11, }, # 香
+  { key: "1NY", output: "WL1", shift: -11, }, # 成香
+  { key: "1FU", output: "WP0", shift: -15, }, # 歩
+  { key: "1TO", output: "WP1", shift: -15, }, # と
+].each do |e|
+  in_file = "original/#{e[:key]}.png"
+  # system "identify #{in_file}"
+
+  image = Magick::Image.read(in_file).first
+  image.background_color = "transparent"
+  w = image.columns
+  h = image.rows
+
+  if e[:shift].negative?
+    shift = -e[:shift]
+    image = image.crop(0, shift, w, h - shift)
+    image = image.extent(w, h, 0, shift)
+  end
+
+  if e[:shift].positive?
+    shift = e[:shift]
+    image = image.crop(0, 0, w, h - shift)
+    image = image.extent(w, h, 0, -shift)
+  end
+
+  output = "#{e[:output] || e[:key]}.png"
+  image.write(output)
+  system "identify #{output}"
+  # system "open #{output}"
+end
+# >> BK0.png PNG 249x256 249x256+0+0 8-bit sRGB 21394B 0.000u 0:00.000
+# >> BR0.png PNG 249x256 249x256+0+0 8-bit sRGB 21201B 0.000u 0:00.000
+# >> BR1.png PNG 249x256 249x256+0+0 8-bit sRGB 21088B 0.000u 0:00.000
+# >> BB0.png PNG 249x256 249x256+0+0 8-bit sRGB 20445B 0.000u 0:00.000
+# >> BB1.png PNG 249x256 249x256+0+0 8-bit sRGB 21050B 0.000u 0:00.000
+# >> BG0.png PNG 249x256 249x256+0+0 8-bit sRGB 18238B 0.000u 0:00.000
+# >> BS0.png PNG 249x256 249x256+0+0 8-bit sRGB 19030B 0.000u 0:00.000
+# >> BS1.png PNG 249x256 249x256+0+0 8-bit sRGB 18668B 0.000u 0:00.000
+# >> BN0.png PNG 249x256 249x256+0+0 8-bit sRGB 18237B 0.000u 0:00.000
+# >> BN1.png PNG 249x256 249x256+0+0 8-bit sRGB 17585B 0.000u 0:00.000
+# >> BL0.png PNG 249x256 249x256+0+0 8-bit sRGB 17442B 0.000u 0:00.000
+# >> BL1.png PNG 249x256 249x256+0+0 8-bit sRGB 16914B 0.000u 0:00.000
+# >> BP0.png PNG 249x256 249x256+0+0 8-bit sRGB 15925B 0.000u 0:00.000
+# >> BP1.png PNG 249x256 249x256+0+0 8-bit sRGB 14981B 0.000u 0:00.000
+# >> WK0.png PNG 249x256 249x256+0+0 8-bit sRGB 22284B 0.000u 0:00.000
+# >> WR0.png PNG 249x256 249x258+0+2 8-bit sRGB 23687B 0.000u 0:00.000
+# >> WR1.png PNG 249x256 249x258+0+2 8-bit sRGB 22756B 0.000u 0:00.000
+# >> WB0.png PNG 249x256 249x258+0+2 8-bit sRGB 22615B 0.000u 0:00.000
+# >> WB1.png PNG 249x256 249x258+0+2 8-bit sRGB 22748B 0.000u 0:00.000
+# >> WG0.png PNG 249x256 249x263+0+7 8-bit sRGB 20611B 0.000u 0:00.000
+# >> WS0.png PNG 249x256 249x264+0+8 8-bit sRGB 20354B 0.000u 0:00.000
+# >> WS1.png PNG 249x256 249x264+0+8 8-bit sRGB 20174B 0.000u 0:00.000
+# >> WN0.png PNG 249x256 249x266+0+10 8-bit sRGB 19168B 0.000u 0:00.000
+# >> WN1.png PNG 249x256 249x266+0+10 8-bit sRGB 18829B 0.000u 0:00.000
+# >> WL0.png PNG 249x256 249x267+0+11 8-bit sRGB 18242B 0.000u 0:00.000
+# >> WL1.png PNG 249x256 249x267+0+11 8-bit sRGB 18471B 0.000u 0:00.000
+# >> WP0.png PNG 249x256 249x272+0+15 8-bit sRGB 17312B 0.000u 0:00.000
+# >> WP1.png PNG 249x256 249x272+0+15 8-bit sRGB 15967B 0.000u 0:00.000

data/lib/bioshogi/board/basic.rb

@@ -18,7 +18,8 @@ module Bioshogi
       include TechniqueMatcherMethods
 
       prepend Analysis::BoardPillerMethods
-      prepend PieceCountsMethods
+      prepend Analysis::BoardPieceCountsMethods
+      prepend Analysis::CoreSoldierPlaceMethods
     end
   end
 end

data/lib/bioshogi/container/core_methods.rb

@@ -10,10 +10,10 @@ module Bioshogi
 
       def params
         @params ||= {
-          :analyzer_enable           => false,
-          :analyzer_technique_enable => false,
-          :candidate_enable               => true,
-          :validate_enable                => true,
+          :analysis_feature           => false,
+          :analysis_technique_feature => false,
+          :ki2_function               => true,
+          :validate_feature                => true,
           :board_class                    => Board,
         }
       end

data/lib/bioshogi/counter_hash.rb

@@ -0,0 +1,34 @@
+# frozen-string-literal: true
+#
+# h = CounterHash.new
+# h[:x]                           # => 0
+# h.increment(:x)                 # => 1
+# h.keys                          # => [:x]
+# h.decrement(:x)                 # => 0
+# h.keys                          # => []
+# h.count                         # => 0
+#
+module Bioshogi
+  class CounterHash < Hash
+    def initialize
+      super(0)
+    end
+
+    def increment(key)
+      self[key] += 1
+    end
+
+    def decrement(key)
+      self[key] -= 1
+      zero_then_delete(key)
+    end
+
+    private
+
+    def zero_then_delete(key)
+      if self[key].zero?
+        delete(key)
+      end
+    end
+  end
+end

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? # 自分が圧倒的な戦力を持っているか？

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
 

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

data/lib/bioshogi/piece.rb

@@ -97,14 +97,14 @@ module Bioshogi
 
     include ApplicationMemoryRecord
     memory_record [
-      { key: :king,   name: "玉", basic_alias: "王", promoted_name: nil,  promoted_formal_sheet_name: nil,    other_matched_promoted_names: nil,   sfen_char: "K", promotable: false, always_alive: true,  stronger: false, dengaku_target: true,  tatakare_target: true,  maesusumeru: true,  },
-      { key: :rook,   name: "飛", basic_alias: nil,  promoted_name: "龍", promoted_formal_sheet_name: nil,    other_matched_promoted_names: "竜",  sfen_char: "R", promotable: true,  always_alive: true,  stronger: true,  dengaku_target: true,  tatakare_target: true,  maesusumeru: true,  },
-      { key: :bishop, name: "角", basic_alias: nil,  promoted_name: "馬", promoted_formal_sheet_name: nil,    other_matched_promoted_names: nil,   sfen_char: "B", promotable: true,  always_alive: true,  stronger: true,  dengaku_target: true,  tatakare_target: false, maesusumeru: false, },
-      { key: :gold,   name: "金", basic_alias: nil,  promoted_name: nil,  promoted_formal_sheet_name: nil,    other_matched_promoted_names: nil,   sfen_char: "G", promotable: false, always_alive: true,  stronger: false, dengaku_target: false, tatakare_target: true,  maesusumeru: true,  },
-      { key: :silver, name: "銀", basic_alias: nil,  promoted_name: "全", promoted_formal_sheet_name: "成銀", other_matched_promoted_names: nil,   sfen_char: "S", promotable: true,  always_alive: true,  stronger: false, dengaku_target: false, tatakare_target: true,  maesusumeru: true,  },
-      { key: :knight, name: "桂", basic_alias: nil,  promoted_name: "圭", promoted_formal_sheet_name: "成桂", other_matched_promoted_names: "今",  sfen_char: "N", promotable: true,  always_alive: false, stronger: false, dengaku_target: false, tatakare_target: false, maesusumeru: false, },
-      { key: :lance,  name: "香", basic_alias: nil,  promoted_name: "杏", promoted_formal_sheet_name: "成香", other_matched_promoted_names: "仝",  sfen_char: "L", promotable: true,  always_alive: false, stronger: false, dengaku_target: false, tatakare_target: false, maesusumeru: true,  },
-      { key: :pawn,   name: "歩", basic_alias: nil,  promoted_name: "と", promoted_formal_sheet_name: nil,    other_matched_promoted_names: nil,   sfen_char: "P", promotable: true,  always_alive: false, stronger: false, dengaku_target: false, tatakare_target: false, maesusumeru: true,  },
+      { key: :king,   name: "玉", basic_alias: "王", promoted_name: nil,  promoted_formal_sheet_name: nil,    other_matched_promoted_names: nil,   sfen_char: "K", promotable: false, always_alive: true,  strong: false, core_piece: true,  dengaku_target: true,  tatakare_target: true,  maesusumeru: true,  },
+      { key: :rook,   name: "飛", basic_alias: nil,  promoted_name: "龍", promoted_formal_sheet_name: nil,    other_matched_promoted_names: "竜",  sfen_char: "R", promotable: true,  always_alive: true,  strong: true,  core_piece: true,  dengaku_target: true,  tatakare_target: true,  maesusumeru: true,  },
+      { key: :bishop, name: "角", basic_alias: nil,  promoted_name: "馬", promoted_formal_sheet_name: nil,    other_matched_promoted_names: nil,   sfen_char: "B", promotable: true,  always_alive: true,  strong: true,  core_piece: true,  dengaku_target: true,  tatakare_target: false, maesusumeru: false, },
+      { key: :gold,   name: "金", basic_alias: nil,  promoted_name: nil,  promoted_formal_sheet_name: nil,    other_matched_promoted_names: nil,   sfen_char: "G", promotable: false, always_alive: true,  strong: false, core_piece: false, dengaku_target: false, tatakare_target: true,  maesusumeru: true,  },
+      { key: :silver, name: "銀", basic_alias: nil,  promoted_name: "全", promoted_formal_sheet_name: "成銀", other_matched_promoted_names: nil,   sfen_char: "S", promotable: true,  always_alive: true,  strong: false, core_piece: false, dengaku_target: false, tatakare_target: true,  maesusumeru: true,  },
+      { key: :knight, name: "桂", basic_alias: nil,  promoted_name: "圭", promoted_formal_sheet_name: "成桂", other_matched_promoted_names: "今",  sfen_char: "N", promotable: true,  always_alive: false, strong: false, core_piece: false, dengaku_target: false, tatakare_target: false, maesusumeru: false, },
+      { key: :lance,  name: "香", basic_alias: nil,  promoted_name: "杏", promoted_formal_sheet_name: "成香", other_matched_promoted_names: "仝",  sfen_char: "L", promotable: true,  always_alive: false, strong: false, core_piece: false, dengaku_target: false, tatakare_target: false, maesusumeru: true,  },
+      { key: :pawn,   name: "歩", basic_alias: nil,  promoted_name: "と", promoted_formal_sheet_name: nil,    other_matched_promoted_names: nil,   sfen_char: "P", promotable: true,  always_alive: false, strong: false, core_piece: false, dengaku_target: false, tatakare_target: false, maesusumeru: true,  },
     ]
 
     class << self
@@ -129,6 +129,10 @@ module Bioshogi
       def promoted_group
         @promoted_group ||= inject({}) { |a, e| a.merge(e.promoted_names.collect { |key| [key, e] }.to_h) }
       end
+
+      def strong_pieces
+        @strong_pieces ||= find_all(&:strong)
+      end
     end
 
     def inspect
@@ -143,6 +147,10 @@ module Bioshogi
       promotable
     end
 
+    def core_piece?
+      core_piece
+    end
+
     concerning :NameMethods do
       class_methods do
         def all_names

data/lib/bioshogi/piller_cop.rb

@@ -0,0 +1,47 @@
+# frozen-string-literal: true
+#
+# 駒柱をなるべく高速に判定する
+#
+module Bioshogi
+  class PillerCop
+    attr_reader :counts
+    attr_accessor :active
+    
+    def initialize
+      reset
+    end
+
+    def active?
+      @active
+    end
+
+    def reset
+      @counts = Array.new(Dimension::Column.dimension_size, 0)
+      @active = false
+    end
+
+    def set(place)
+      index = place.column.value
+      count = @counts[index] + 1
+      if count > Dimension::Row.dimension_size
+        raise MustNotHappen, "#{place.column.hankaku_number}の列に#{count}個目の駒を配置しようとしています。棋譜を二重に読ませようとしていませんか？"
+      end
+      @counts[index] = count
+      if count == Dimension::Row.dimension_size
+        @active = true
+      end
+    end
+
+    def remove(place)
+      index = place.column.value
+      count = @counts[index] - 1
+      if count.negative?
+        raise MustNotHappen, "#{place.column.hankaku_number}の列の駒の数がマイナスになろうとしていています"
+      end
+      @counts[index] = count
+      if count == Dimension::Row.dimension_size - 1
+        @active = false
+      end
+    end
+  end
+end

data/lib/bioshogi/place.rb

@@ -64,6 +64,10 @@ module Bioshogi
         lookup(value)
       end
 
+      def zero
+        fetch([0, 0])
+      end
+
       def cache_clear
         if @cache
           @cache.each_value do |hv|

data/lib/bioshogi/player/other_methods.rb

@@ -3,48 +3,31 @@
 module Bioshogi
   class Player
     module OtherMethods
-      attr_writer :king_moved_counter
-      attr_accessor :king_place
-      attr_accessor :king_first_moved_turn # 玉が最初に動いた手数
-      attr_accessor :death_counter         # 駒が死んだ数
-
-      def king_moved_counter
-        @king_moved_counter ||= 0
-      end
-
-      def king_place
-        @king_place ||= king_soldier&.place
-      end
-
-      def king_place_update
-        @king_place = king_soldier&.place
-      end
-
-      def used_piece_counts
-        @used_piece_counts ||= Hash.new(0)
-      end
+      STRONG_PIECE_ALL_COUNT = Location.count * Piece.strong_pieces.count
 
       ################################################################################
 
       # 大駒コンプリートしている？
-      def stronger_piece_completed?
-        stronger_piece_have_count >= 4
+      def strong_piece_completed?
+        strong_piece_have_count >= STRONG_PIECE_ALL_COUNT
       end
 
       # 大駒の数
-      def stronger_piece_have_count
-        count = 0
-
-        # 持駒の大駒
-        count += piece_box[:rook] || 0
-        count += piece_box[:bishop] || 0
+      def strong_piece_have_count
+        Piece.strong_pieces.sum do |e|
+          piece_box.fetch(e.key, 0) + board.specific_piece_count_for(location.key, e.key)
+        end
+      end
 
-        # 盤上の大駒
-        key = location.key
-        count += board.piece_count_of(key, :rook)
-        count += board.piece_count_of(key, :bishop)
+      ################################################################################
 
-        count
+      def zengoma?
+        if board.location_piece_counts[opponent_player.location.key] == 1              # 盤上の相手の駒が1つ
+          if opponent_player.piece_box.empty?                                          # 相手の持駒がない
+            location = opponent_player.location                                        # 相手の側
+            board.soldiers.one? { |e| e.piece.key == :king && e.location == location } # 相手の残りの駒が玉か？ (最後に重い処理を持ってくる)
+          end
+        end
       end
 
       ################################################################################

data/lib/bioshogi/player/piece_box_methods.rb

@@ -9,7 +9,7 @@ module Bioshogi
         @piece_box ||= PieceBox.new
       end
 
-      def pieces_add(str = "歩9角飛香2桂2銀2金2玉")
+      def pieces_add(str = PieceBox::ONE_SIDE_PIECES)
         piece_box.add(Piece.s_to_h(str))
       end