bioshogi 0.0.15 → 0.0.17

data/lib/bioshogi/player/soldier_methods.rb

@@ -3,12 +3,18 @@
 module Bioshogi
   class Player
     module SoldierMethods
-      def soldiers
-        board.surface.values.find_all { |e| e.location == location }
+      def core_soldier(piece_key)
+        board.core_soldier_places_hash.dig(location.key, piece_key)
       end
 
       def king_soldier
-        soldiers.find { |e| e.piece.key == :king }
+        core_soldier(:king)
+      end
+
+      ################################################################################
+
+      def soldiers
+        board.surface.values.find_all { |e| e.location == location }
       end
 
       def to_s_soldiers
@@ -27,7 +33,7 @@ module Bioshogi
         end
       end
 
-      # 玉を除く駒が10毎以上相手陣に入っているか？
+      # 玉を除く駒が10枚以上相手陣に入っているか？
       def many_soliders_are_in_the_opponent_area?
         entered_soldiers.count >= Piece::EkScoreInfo::N_SOLIDIERS_IN_OPPONENT_AREA_WITHOUT_KING
       end

data/lib/bioshogi/player.rb

@@ -6,6 +6,7 @@ module Bioshogi
     include PieceBoxMethods
     include SoldierMethods
     include OtherMethods
+    include Analysis::PlayerMethods
     include PressureMethods
 
     attr_reader :location

data/lib/bioshogi/player_executor/base.rb

@@ -29,7 +29,7 @@ module Bioshogi
       end
 
       def perform_validations
-        unless container.params[:validate_enable]
+        unless container.params[:validate_feature]
           return
         end
 
@@ -48,12 +48,13 @@ module Bioshogi
         @drop_hand          = input.drop_hand
         @move_hand          = input.move_hand
         @candidate_soldiers = nil
-        if container.params[:candidate_enable]
+        if container.params[:ki2_function]
           @candidate_soldiers = input.candidate_soldiers
         end
 
         hand.execute(container)
         execute_after_process
+
         if captured_soldier
           piece_box_added(captured_soldier)
         end

data/lib/bioshogi/screen_image/color_theme_info.rb

@@ -5,11 +5,12 @@ module Bioshogi
     class ColorThemeInfo
       include ApplicationMemoryRecord
       memory_record [
-        { key: :is_color_theme_real,   },
-        { key: :is_color_theme_piyo,   },
-        { key: :is_color_theme_paper,  },
-        { key: :is_color_theme_shape,  },
-        { key: :is_color_theme_club24, },
+        { key: :is_color_theme_modern,  },
+        { key: :is_color_theme_real,    },
+        { key: :is_color_theme_piyo,    },
+        { key: :is_color_theme_paper,   },
+        { key: :is_color_theme_shape,   },
+        { key: :is_color_theme_club24,  },
       ]
 
       ################################################################################
@@ -22,11 +23,13 @@ module Bioshogi
         options = {
           verbose: false,
         }.merge(options)
+
         parser = Parser.parse(SFEN1)
         file = ASSETS_DIR.join("images/color_theme_preview/#{key}.png")
         bin = parser.to_png(color_theme_key: key, width: 1920, height: 1080)
         FileUtils.makedirs(file.dirname)
         file.write(bin)
+
         if options[:verbose]
           puts file
         end
@@ -34,11 +37,22 @@ module Bioshogi
 
       ################################################################################
 
+      def is_color_theme_modern
+        {
+          **piece_count_on_shadow_black_on_white,
+          **outer_frame_padding_enabled,
+          **shadow_disabled,
+          :canvas_bg_color        => "hsl(0,0%,30%)",            # 背景
+          :outer_frame_fill_color => "hsl(36.23,75.36%,58.63%)", # 盤の色
+          :piece_image_key        => "nureyon",
+        }
+      end
+
       def is_color_theme_real
         is_color_theme_shogi_extend.merge({
             :fg_file => ASSETS_DIR.join("images/board/board_a.png"),
             :bg_file => ASSETS_DIR.join("images/background/background_a.png"),
-            :piece_image_key => "Portella",
+            :piece_image_key    => "Portella",
           })
       end
 
@@ -70,7 +84,7 @@ module Bioshogi
 
       def is_color_theme_piyo
         is_color_theme_shogi_extend.merge({
-            :canvas_bg_color             => "hsl(35,100% 85%)", # 背景
+            :canvas_bg_color             => "hsl(35,100%,85%)", # 背景
             :outer_frame_fill_color      => "hsl(37,73%,68%)",  # 盤の色
             :piece_pentagon_fill_color   => "hsl(52,76%,87%)",  # ☗の色
             :piece_pentagon_stroke_color => "hsl(36,78%,50%)",  # ☗の縁取り色
@@ -118,6 +132,7 @@ module Bioshogi
         {
           :piece_count_bg_scale        => 0.3,         # 駒数の背景の大きさ
           :piece_count_font_scale      => 0.25,        # 持駒数の大きさ
+          :piece_count_bold            => true,        # 太字にする
           :piece_count_position_adjust => {            # 駒数の位置
             :single                    => [0.7, 0.08], # 駒数1桁のとき。[0, 0] なら該当の駒の中央
             :double                    => [0.7, 0.08], # 駒数2桁のとき

data/lib/bioshogi/screen_image/core_methods.rb

@@ -25,15 +25,16 @@ module Bioshogi
                 :black => [0.0425, 0.07],
                 :white => [0.0,    0.01],
               },
+
               # 盤
-              :canvas_bg_color          => "hsla(0,0%,100%,1.0)",       # 部屋の色(必須)
-              :piece_font_color         => "hsla(0,0%,0%,0.8)",         # 駒の色(必須)
-              :lattice_stroke_width     => 1,                           # 格子の線の太さ
-              :inner_frame_stroke_width => 2,                           # 枠の線お太さ(nil なら lattice_stroke_width を代用)
-              :inner_frame_fill_color   => nil,                         # 基本透明とする(基本指定なしでよい)
+              :canvas_bg_color          => "hsla(0,0%,100%,1.0)",            # 部屋の色(必須)
+              :piece_font_color         => "hsla(0,0%,0%,0.8)",              # 駒の色(必須)
+              :lattice_stroke_width     => 1,                                # 格子の線の太さ
+              :inner_frame_stroke_width => 2,                                # 枠の線お太さ(nil なら lattice_stroke_width を代用)
+              :inner_frame_fill_color   => nil,                              # 基本透明とする(基本指定なしでよい)
               :dimension_w              => Dimension::Column.dimension_size, # 横のセル数
-              :dimension_h              => Dimension::Row.dimension_size, # 縦のセル数
-              :fg_file                  => nil,                         # 盤テクスチャ
+              :dimension_h              => Dimension::Row.dimension_size,    # 縦のセル数
+              :fg_file                  => nil,                              # 盤テクスチャ
 
               # optional
               :last_soldier_font_color    => nil,                     # *最後に動いた駒の色。基本指定しない。(nilなら piece_font_color を代用)
@@ -52,29 +53,30 @@ module Bioshogi
               :piece_move_cell_fill_color => "hsla(0,0%,0%,0.05)",        # 移動元と移動先のセルの背景色(nilなら描画しない)
               :normal_piece_color_map     => {},                          # 成ってない駒それぞれの色(nilなら piece_font_color を代用)
 
-              # font
-              :font_theme_key        => nil,                         # フォントの種類 noto_seif
+              # フォント駒
+              :font_theme_key        => nil,                                                  # フォントの種類 noto_seif
               :font_regular          => ASSETS_DIR.join("fonts/RictyDiminished-Regular.ttf"), # 駒のフォント(普通)
               :font_bold             => ASSETS_DIR.join("fonts/RictyDiminished-Bold.ttf"),    # 駒のフォント(太字) (shogi-extendから直接参照しているためnilにしてはいけない)
-              :soldier_font_bold     => false,                        # 太字を使うか？
-              :piece_font_weight_key             => :is_piece_font_weight_auto,               # 太字はおまかせ (つまり何もしない。nil でもよい)
+              :soldier_font_bold     => false,                                                # 太字を使うか？
+              :piece_font_weight_key => :is_piece_font_weight_auto,                           # 太字はおまかせ (つまり何もしない。nil でもよい)
 
-              # 駒
-              :piece_image_key               => nil, # リアルな駒を使うか？
+              # 画像駒
+              :piece_image_key   => nil, # どの画像駒を使うか？ (nil なら使わない)
+              :piece_image_scale => nil, # 画像駒の大きさ (nil なら PieceImageInfo の default_scale を使う)
 
               # other
-              :viewpoint                => "black", # 視点
-              :image_format             => "png",   # 出力する画像タイプ
-              :negate                   => false,   # 反転
-              :bg_file                  => nil,     # 背景ファイル
+              :viewpoint    => "black", # 視点
+              :image_format => "png",   # 出力する画像タイプ
+              :negate       => false,   # 反転
+              :bg_file      => nil,     # 背景ファイル
 
               # star
-              :star_size                => 0.03,    # 星のサイズ(割合)
-              :star_fill_color          => nil,     # *星の色(nilなら inner_frame_lattice_color を代用)
-              :star_step                => 3,       # 星はnセルごとに書く
+              :star_size       => 0.03, # 星のサイズ(割合)
+              :star_fill_color => nil,  # *星の色(nilなら inner_frame_lattice_color を代用)
+              :star_step       => 3,    # 星はnセルごとに書く
 
-              :color_theme_key          => "is_color_theme_real", # 色テーマ
-              :renderer_override_params => {},                            # 色テーマを上書きするパラメータ
+              :color_theme_key          => "is_color_theme_modern", # 色テーマ
+              :renderer_override_params => {},                      # 色テーマを上書きするパラメータ
             })
         end
       end
@@ -91,6 +93,12 @@ module Bioshogi
         @container = container
         @params = self.class.default_params.merge(params)
 
+        # 一つ一つのパラメータを設定するのは大変である
+        # そこで以下を設定するとまとまったパラメータを一気に設定する
+        # - color_theme_key
+        # - font_theme_key
+        # - piece_font_weight_key
+
         if e = ColorThemeInfo.lookup(@params[:color_theme_key])
           @params.update(e.to_params)
         end
@@ -103,6 +111,7 @@ module Bioshogi
           @params.update(e.to_params)
         end
 
+        # 最終的に調整したいときは renderer_override_params に指定するとすべてを上書きできる
         if v = @params[:renderer_override_params]
           @params.update(v)
         end
@@ -332,6 +341,11 @@ module Bioshogi
       def outer_rect
         outer_bottom_right - outer_top_left
       end
+
+      # portella, nureyon などの情報
+      def piece_image_info
+        @piece_image_info ||= PieceImageInfo.lookup(params[:piece_image_key])
+      end
     end
   end
 end

data/lib/bioshogi/screen_image/helper.rb

@@ -29,7 +29,7 @@ module Bioshogi
 
       # いったんファイル出力してから戻している時点で相当無駄があるが apng や mp4 の場合でも失敗しない
       def to_write_binary
-        Tempfile.open(["", ".#{ext_name}"]) do |t|
+        Tempfile.create(["", ".#{ext_name}"]) do |t|
           render.write(t.path)
           File.binread(t.path)
         end
@@ -37,7 +37,7 @@ module Bioshogi
 
       # PNG24 を強制する (for zip)
       def to_png24_binary
-        Tempfile.open(["", ".png"]) do |t|
+        Tempfile.create(["", ".png"]) do |t|
           render.write("PNG24:#{t.path}")
           File.binread(t.path)
         end

data/lib/bioshogi/screen_image/layer_methods.rb

@@ -51,11 +51,14 @@ module Bioshogi
 
       # フォントでの駒のときだけ駒レイヤーに影をつける
       def with_shadow_only_font_pice(layer)
-        if params[:piece_image_key]
-          layer
+        if piece_image_info
+          if piece_image_info.custom_shadow_support
+            layer = with_shadow(layer)
+          end
         else
-          with_shadow(layer)
+          layer = with_shadow(layer)
         end
+        layer
       end
 
       # 指定のレイヤーに影をつける

data/lib/bioshogi/screen_image/nureyon_image_info.rb

@@ -0,0 +1,43 @@
+module Bioshogi
+  module ScreenImage
+    class NureyonImageInfo
+      # include ApplicationMemoryRecord
+      # memory_record [
+      #   # black
+      #   { key: "BK0", real_texture: nil,  }, # 玉
+      #   { key: "BR0", real_texture: nil,  }, # 飛
+      #   { key: "BR1", real_texture: nil,  }, # 龍
+      #   { key: "BB0", real_texture: nil,  }, # 角
+      #   { key: "BB1", real_texture: nil,  }, # 馬
+      #   { key: "BG0", real_texture: nil,  }, # 金
+      #   { key: "BS0", real_texture: nil,  }, # 銀
+      #   { key: "BS1", real_texture: nil,  }, # 成銀
+      #   { key: "BN0", real_texture: nil,  }, # 桂
+      #   { key: "BN1", real_texture: nil,  }, # 成桂
+      #   { key: "BL0", real_texture: nil,  }, # 香
+      #   { key: "BL1", real_texture: nil,  }, # 成香
+      #   { key: "BP0", real_texture: nil,  }, # 歩
+      #   { key: "BP1", real_texture: nil,  }, # と
+      #   # white               nil,
+      #   { key: "WK0", real_texture: "BK0",  }, # 王
+      #   { key: "WR0", real_texture: "BR0",  }, # 飛
+      #   { key: "WR1", real_texture: "BR1",  }, # 龍
+      #   { key: "WB0", real_texture: "BB0",  }, # 角
+      #   { key: "WB1", real_texture: "BB1",  }, # 馬
+      #   { key: "WG0", real_texture: "BG0",  }, # 金
+      #   { key: "WS0", real_texture: "BS0",  }, # 銀
+      #   { key: "WS1", real_texture: "BS1",  }, # 成銀
+      #   { key: "WN0", real_texture: "BN0",  }, # 桂
+      #   { key: "WN1", real_texture: "BN1",  }, # 成桂
+      #   { key: "WL0", real_texture: "BL0",  }, # 香
+      #   { key: "WL1", real_texture: "BL1",  }, # 成香
+      #   { key: "WP0", real_texture: "BP0",  }, # 歩
+      #   { key: "WP1", real_texture: "BP1",  }, # と
+      # ]
+      #
+      # def texture_key
+      #   real_texture || key
+      # end
+    end
+  end
+end

data/lib/bioshogi/screen_image/piece_image_info.rb

@@ -0,0 +1,26 @@
+module Bioshogi
+  module ScreenImage
+    class PieceImageInfo
+      include ApplicationMemoryRecord
+      memory_record [
+        { key: :portella, name: "Portella", ext_name: "png", default_scale: 0.95, custom_shadow_support: false, },
+        { key: :nureyon,  name: "ぬれよん", ext_name: "png", default_scale: 0.80, custom_shadow_support: true,  },
+      ]
+
+      class << self
+        def lookup(v)
+          if v
+            v = v.downcase
+            super
+          end
+        end
+      end
+
+      # 駒の種類をプレフィクスにした駒の部分パスを返す
+      # "nureyon/BP0"
+      def piece_path(soldier)
+        "#{key}/#{soldier.image_basename}"
+      end
+    end
+  end
+end

data/lib/bioshogi/screen_image/soldier_methods.rb

@@ -6,7 +6,7 @@ module Bioshogi
       end
 
       def soldier_draw(soldier)
-        if params[:piece_image_key]
+        if piece_image_info
           soldier_draw_by_image(soldier)
         else
           soldier_draw_by_char(soldier)
@@ -43,22 +43,24 @@ module Bioshogi
 
       def soldier_draw_by_image(soldier)
         v = V[*soldier.place.to_xy]
-        piece_image_draw(v: v, location: soldier.location, piece: soldier.piece, promoted: soldier.promoted)
+        piece_image_draw(v: v, soldier: soldier)
       end
 
-      def piece_image_draw(v:, location:, piece:, promoted: false)
-        type = params[:piece_image_key]
-        key = [location.to_sfen, piece.sfen_char, promoted ? "1" : "0"].join.upcase
-        type_with_key = "#{type}/#{key}"
-        wh = cell_rect.collect(&:ceil)
-        cache_key = [type_with_key, wh].join("/")
+      def piece_image_draw(v:, soldier:)
+        piece_path = piece_image_info.piece_path(soldier)
+        scale = params[:piece_image_scale] || piece_image_info.default_scale
+        wh = (cell_rect * scale).collect(&:ceil)               # => [105, 114]
+        cache_key = [piece_path, wh.join("x")].join(",")       # => "nureyon/BP0,105x114"
+
         @piece_image_draw ||= {}
         image = @piece_image_draw[cache_key] ||= yield_self do
-          png_path = ASSETS_DIR.join("images/piece/#{type_with_key}.png")
-          image = Magick::Image.read(png_path).first
-          image.resize_to_fill(*wh)
+          full_path = ASSETS_DIR.join("images/piece/#{piece_path}.#{piece_image_info.ext_name}")
+          image = Magick::Image.read(full_path).first
+          image.resize_to_fill(*wh)                            # 描画領域の大きさに調整(縮小)させる
         end
-        @d_piece_layer.composite!(image, *px(v), Magick::OverCompositeOp)
+
+        top_left = V.one * (1.0 - scale) / 2 # スケールが 0.8 なら左上から右下方向に 0.1 の位置から描画すればセルの真ん中に配置できる
+        @d_piece_layer.composite!(image, *px(v + top_left), Magick::OverCompositeOp)
       end
 
       def soldier_move_cell_draw
@@ -101,7 +103,7 @@ module Bioshogi
 
       def soldier_name(soldier)
         if soldier.piece.key == :king && soldier.location.key == :white
-          "王"
+          "王"                  # FIXME: ハードコーディングすんな
         else
           soldier.any_name
         end

data/lib/bioshogi/screen_image/soldier_model_methods.rb

@@ -0,0 +1,14 @@
+module Bioshogi
+  module ScreenImage
+    concern :SoldierModelMethods do
+      # 対応する画像のファイル名を返す
+      def image_basename
+        [
+          location.to_sfen,     # B (Black)
+          piece.sfen_char,      # P (Pawn)
+          promoted ? "1" : "0", # 0 (不成)
+        ].join.upcase
+      end
+    end
+  end
+end

data/lib/bioshogi/screen_image/stand.rb

@@ -14,10 +14,11 @@ module Bioshogi
 
               # 持駒数
               :piece_count_bg_color        => "hsla(0,0%,100%,0.7)", # 駒数の背景
-              :piece_count_font_color      => "hsla(0,0%,  0%,0.9)", # *駒数の色(nilなら piece_font_color を代用)
+              :piece_count_font_color      => "hsla(0,0%,  0%,0.7)", # *駒数の色(nilなら piece_font_color を代用)
               :piece_count_font_scale      => 0.6,               # 持駒数の大きさ
               :piece_count_stroke_color    => nil,               # 持駒数の縁取り色
               :piece_count_stroke_width    => nil,               # 持駒数の縁取り太さ
+              :piece_count_bold            => nil,               # 持駒数のフォントを bold タイプにするか？
               :piece_count_position_adjust => {                  # 駒数の位置
                 :single                    => [0.7, 0.05],       # 駒数1桁のとき。[0, 0] なら該当の駒の中央
                 :double                    => [0.8, 0.05],       # 駒数2桁のとき
@@ -57,7 +58,8 @@ module Bioshogi
             piece = Piece.fetch(piece_key)
 
             if params[:piece_image_key]
-              piece_image_draw(v: v, location: location, piece: piece)
+              soldier = Soldier.create(location: location, piece: piece, promoted: false, place: Place.zero)
+              piece_image_draw(v: v, soldier: soldier)
             else
               # 持駒の影
               piece_pentagon_draw(v: v, location: location, piece: piece)
@@ -96,6 +98,7 @@ module Bioshogi
             :font_scale   => params[:piece_count_font_scale],
             :stroke_color => params[:piece_count_stroke_color],
             :stroke_width => params[:piece_count_stroke_width],
+            :bold         => params[:piece_count_bold],
             )
         end
       end

data/lib/bioshogi/soldier/technique_matcher_methods.rb

@@ -15,6 +15,12 @@ module Bioshogi
         (piece.key == :lance && normal?) || piece.key == :rook
       end
 
+      ################################################################################ for BoardPieceCountsMethods
+
+      # def location_with_piece
+      #   [location.key, piece.key]
+      # end
+
       ################################################################################
 
       # 駒の重さ(=価値) 常にプラス

data/lib/bioshogi/soldier.rb

@@ -56,6 +56,7 @@ module Bioshogi
 
     include SimpleModel
     include TechniqueMatcherMethods
+    include ScreenImage::SoldierModelMethods
 
     attr_accessor :piece
     attr_accessor :promoted

data/lib/bioshogi/version.rb

@@ -1,3 +1,3 @@
 module Bioshogi
-  VERSION = "0.0.15"
+  VERSION = "0.0.17"
 end

data/lib/bioshogi.rb

@@ -33,10 +33,11 @@ module Bioshogi
   TMP_DIR    = ROOT.join("../tmp")
 
   include ActiveSupport::Configurable
-  config_accessor(:analyzer_enable) { true }
+  config_accessor(:analysis_feature) { true }
   mattr_accessor(:run_counts) { Hash.new(0) }
 
   SFEN1 = "position sfen l+n1g1g1n+l/1ks2r1+r1/1pppp1bpp/p2+b+sp+p2/9/P1P1+SP1PP/1+P+BPP1P2/1BK1GR1+R1/+L+NSG3NL b R2B3G4S5N11L99Pr2b3g4s5n11l99p 1"
+  SFEN2 = "position sfen 1plnsgbrk/1+p+l+n+sgbrk/1+P+L+N+SGBRK/1PLNSGBRK/9/9/9/9/9 b - 1"
 
   ANALYSIS_VERSION = 3
 end