console-shogi 0.2.0 → 0.3.0

data/lib/console_shogi/terminal/operator.rb

@@ -0,0 +1,209 @@
+# frozen_string_literal: true
+
+require 'base64'
+require 'tty-prompt'
+
+module ConsoleShogi
+  module Terminal
+    class Operator
+      class << self
+        TEBAN = {
+          sente: '先手',
+          gote: '後手'
+        }
+
+        module EscapeSequence
+          RESET = "\e[0m"
+          RESET_CURSOR = "\e[1;1H"
+          SCREEN_CLEAR = "\e[2J"
+          SCREEN_CLEAR_AFTER_CURSOR = "\e[0J"
+          OUTSIDE_BOARD = "\e[10;1H"
+          CURRENT_POSITION = "\e[6n"
+          MOVE_RIGHT_2 = "\e[2C"
+        end
+
+        def cursor
+          @cursor ||= Cursor.new
+        end
+
+        def image_height
+          @image_height ||= calculate_fit_image_height
+        end
+
+        def clear_scrren
+          print EscapeSequence::SCREEN_CLEAR
+
+          print EscapeSequence::RESET_CURSOR
+        end
+
+        # TODO 駒台の表示方法も考える
+        def print_diff_board(previous_board:, board:, sente_komadai:, gote_komadai:)
+          print EscapeSequence::RESET_CURSOR
+
+          board.matrix.row_vectors.each_with_index do |vector, i|
+            vector.each_with_index do |piece, j|
+              if previous_board.matrix[i, j] == piece
+                print EscapeSequence::MOVE_RIGHT_2
+              else
+                print_image(image: piece.image, height: image_height)
+              end
+            end
+
+            print "#{EscapeSequence::RESET}\n"
+          end
+
+          # NOTE 駒台を表示
+          print_komadai(komadai: sente_komadai, **DisplayArea::Komadai::Sente::START_INDEX)
+          print_komadai(komadai: gote_komadai, **DisplayArea::Komadai::Gote::START_INDEX)
+
+          # NOTE back a cursor
+          back_to_cursor
+        end
+
+        def focus_piece(location:, cursor:)
+          piece = location.fetch_piece(x: cursor.squares_position.x, y: cursor.squares_position.y)
+
+          return if piece.nil?
+
+          print_image(image: piece.focused_image, height: image_height)
+
+          back_to_cursor
+        end
+
+        def deactive_piece(location:, previous_cursor:)
+          print "\e[#{previous_cursor.terminal_position.y};#{previous_cursor.terminal_position.x}H"
+
+          piece = location.fetch_piece(x: previous_cursor.squares_position.x, y: previous_cursor.squares_position.y)
+
+          print_image(image: piece.image, height: image_height) unless piece.nil?
+
+          back_to_cursor
+        end
+
+        def active_piece(location:, cursor:)
+          piece = location.fetch_piece(x: cursor.squares_position.x, y: cursor.squares_position.y)
+
+          return if piece.nil?
+
+          print_image(image: piece.active_image, height: image_height)
+
+          back_to_cursor
+        end
+
+        def select_promotion
+          print EscapeSequence::OUTSIDE_BOARD
+
+          prompt = TTY::Prompt.new
+
+          prompt.select('成りますか？', show_help: :never) {|menu|
+            menu.choice '成る', true
+            menu.choice '成らない', false
+          }
+        end
+
+        def print_winner(player)
+          print "\e[4;7H"
+
+          print_image(image: player.win_image, height: image_height * 3)
+
+          print EscapeSequence::OUTSIDE_BOARD
+        end
+
+        # TODO 見た目は後で直す
+        def print_teban(teban)
+          print EscapeSequence::OUTSIDE_BOARD
+          print EscapeSequence::SCREEN_CLEAR_AFTER_CURSOR
+
+          print "手番 : #{TEBAN[teban.to_sym]}"
+
+          back_to_cursor
+        end
+
+        private
+
+        IMAGE_HEIGHT_PIXEL = 240
+
+        # TODO 無理やりなので、実現方法を再考する
+        def calculate_fit_image_height
+          start_position = fetch_cursor_position_in_stdin
+          # NOTE NonePiece を選んでいることに意味はない
+          print_image(image: NonePiece.new.image)
+          end_position = fetch_cursor_position_in_stdin
+
+          fixed_height = IMAGE_HEIGHT_PIXEL / (end_position[1].to_i - start_position[1].to_i)
+
+          print EscapeSequence::SCREEN_CLEAR
+          # NOTE カーソルを1行1列に移動
+          print EscapeSequence::RESET_CURSOR
+
+          fixed_height
+        end
+
+        # TODO view 用の Player 作って整理する
+        def print_komadai(komadai:, x:, y:)
+          komadai.pieces.row_vectors.each_with_index do |row_pieces, i|
+            print "\e[#{y + i};#{x}H"
+
+            row_pieces.each do |p|
+              print_image(image: p.image, height: image_height)
+            end
+          end
+
+          print EscapeSequence::RESET
+        end
+
+        # TODO Cursor にも持っているので整理する
+        def fetch_cursor_position_in_stdin
+          stdout = ''
+
+          $stdin.raw do |stdin|
+            $stdout << EscapeSequence::CURRENT_POSITION
+            $stdout.flush
+
+            # NOTE \e[n;mR という形式で現在位置が返ってくる
+            while (c = stdin.getc) != 'R'
+              stdout += c
+            end
+          end
+
+          stdout.match /(\d+);(\d+)/
+        end
+
+        def back_to_cursor
+          print "\e[#{cursor.terminal_position.y};#{cursor.terminal_position.x}H"
+        end
+
+        # TODO 画像を表示するためのメソッド、場所検討
+        def print_image(image:, width: nil, height: nil)
+          encoded_image = Base64.strict_encode64(image)
+
+          print_osc
+          print "1337;File=inline=1"
+          print ";size=#{image.size}"
+          print ";name=#{encoded_image}"
+          print ";width=#{width}px" unless width.nil?
+          print ";height=#{height}px" unless height.nil?
+          print ":#{encoded_image}"
+          print_st
+        end
+
+        def print_osc
+          # NOTE \e] で始まるシーケンスは全てのターミナルで扱えるわけでは無い
+          if ENV['TERM'].start_with?('screen') || ENV['TERM'].start_with?('tmux')
+            print "\ePtmux;\e\e]"
+          else
+            print "\e]"
+          end
+        end
+
+        def print_st
+          if ENV['TERM'].start_with?('screen') || ENV['TERM'].start_with?('tmux')
+            print "\a\e\\"
+          else
+            print "\a"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/console_shogi/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ConsoleShogi
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/lib/console_shogi.rb

@@ -6,11 +6,16 @@ require_relative 'console_shogi/player'
 require_relative 'console_shogi/board'
 require_relative 'console_shogi/piece'
 require_relative 'console_shogi/komadai'
+require_relative 'console_shogi/teban'
+
+require_relative 'console_shogi/terminal/display_area'
+require_relative 'console_shogi/terminal/operator'
+require_relative 'console_shogi/terminal/cursor'
 
-require_relative 'console_shogi/terminal_operator'
 require_relative 'console_shogi/new_board_builder'
 require_relative 'console_shogi/piece_mover'
 require_relative 'console_shogi/piece_mover_on_komadai'
+require_relative 'console_shogi/piece_movement_checker'
 
 module ConsoleShogi
   class Error < StandardError; end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: console-shogi
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - pekepek
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-24 00:00:00.000000000 Z
+date: 2023-06-02 00:00:00.000000000 Z
 dependencies: []
 description: You can play the Shogi in terminal
 email:
@@ -24,50 +24,115 @@ files:
 - README.md
 - Rakefile
 - exe/console-shogi
-- images/gote/fu.png
-- images/gote/gin.png
-- images/gote/gyoku.png
-- images/gote/hisha.png
-- images/gote/kaku.png
-- images/gote/keima.png
-- images/gote/kin.png
-- images/gote/kyosha.png
-- images/gote/narigin.png
-- images/gote/narikei.png
-- images/gote/narikyo.png
-- images/gote/nonepiece.png
-- images/gote/ohsho.png
-- images/gote/ryu.png
-- images/gote/shori.png
-- images/gote/tokin.png
-- images/gote/uma.png
-- images/sente/fu.png
-- images/sente/gin.png
-- images/sente/gyoku.png
-- images/sente/hisha.png
-- images/sente/kaku.png
-- images/sente/keima.png
-- images/sente/kin.png
-- images/sente/kyosha.png
-- images/sente/narigin.png
-- images/sente/narikei.png
-- images/sente/narikyo.png
-- images/sente/nonepiece.png
-- images/sente/ohsho.png
-- images/sente/ryu.png
-- images/sente/shori.png
-- images/sente/tokin.png
-- images/sente/uma.png
+- images/active/gote/fu.png
+- images/active/gote/gin.png
+- images/active/gote/gyoku.png
+- images/active/gote/hisha.png
+- images/active/gote/kaku.png
+- images/active/gote/keima.png
+- images/active/gote/kin.png
+- images/active/gote/kyosha.png
+- images/active/gote/narigin.png
+- images/active/gote/narikei.png
+- images/active/gote/narikyo.png
+- images/active/gote/ohsho.png
+- images/active/gote/ryu.png
+- images/active/gote/tokin.png
+- images/active/gote/uma.png
+- images/active/nonepiece.png
+- images/active/sente/fu.png
+- images/active/sente/gin.png
+- images/active/sente/gyoku.png
+- images/active/sente/hisha.png
+- images/active/sente/kaku.png
+- images/active/sente/keima.png
+- images/active/sente/kin.png
+- images/active/sente/kyosha.png
+- images/active/sente/narigin.png
+- images/active/sente/narikei.png
+- images/active/sente/narikyo.png
+- images/active/sente/ohsho.png
+- images/active/sente/ryu.png
+- images/active/sente/tokin.png
+- images/active/sente/uma.png
+- images/focused/gote/fu.png
+- images/focused/gote/gin.png
+- images/focused/gote/gyoku.png
+- images/focused/gote/hisha.png
+- images/focused/gote/kaku.png
+- images/focused/gote/keima.png
+- images/focused/gote/kin.png
+- images/focused/gote/kyosha.png
+- images/focused/gote/narigin.png
+- images/focused/gote/narikei.png
+- images/focused/gote/narikyo.png
+- images/focused/gote/ohsho.png
+- images/focused/gote/ryu.png
+- images/focused/gote/tokin.png
+- images/focused/gote/uma.png
+- images/focused/nonepiece.png
+- images/focused/sente/fu.png
+- images/focused/sente/gin.png
+- images/focused/sente/gyoku.png
+- images/focused/sente/hisha.png
+- images/focused/sente/kaku.png
+- images/focused/sente/keima.png
+- images/focused/sente/kin.png
+- images/focused/sente/kyosha.png
+- images/focused/sente/narigin.png
+- images/focused/sente/narikei.png
+- images/focused/sente/narikyo.png
+- images/focused/sente/ohsho.png
+- images/focused/sente/ryu.png
+- images/focused/sente/tokin.png
+- images/focused/sente/uma.png
+- images/gote_shori.png
+- images/nomal/gote/fu.png
+- images/nomal/gote/gin.png
+- images/nomal/gote/gyoku.png
+- images/nomal/gote/hisha.png
+- images/nomal/gote/kaku.png
+- images/nomal/gote/keima.png
+- images/nomal/gote/kin.png
+- images/nomal/gote/kyosha.png
+- images/nomal/gote/narigin.png
+- images/nomal/gote/narikei.png
+- images/nomal/gote/narikyo.png
+- images/nomal/gote/ohsho.png
+- images/nomal/gote/ryu.png
+- images/nomal/gote/tokin.png
+- images/nomal/gote/uma.png
+- images/nomal/nonepiece.png
+- images/nomal/sente/fu.png
+- images/nomal/sente/gin.png
+- images/nomal/sente/gyoku.png
+- images/nomal/sente/hisha.png
+- images/nomal/sente/kaku.png
+- images/nomal/sente/keima.png
+- images/nomal/sente/kin.png
+- images/nomal/sente/kyosha.png
+- images/nomal/sente/narigin.png
+- images/nomal/sente/narikei.png
+- images/nomal/sente/narikyo.png
+- images/nomal/sente/ohsho.png
+- images/nomal/sente/ryu.png
+- images/nomal/sente/tokin.png
+- images/nomal/sente/uma.png
+- images/sente_shori.png
 - lib/console_shogi.rb
 - lib/console_shogi/board.rb
 - lib/console_shogi/game.rb
 - lib/console_shogi/komadai.rb
 - lib/console_shogi/new_board_builder.rb
 - lib/console_shogi/piece.rb
+- lib/console_shogi/piece_movement_checker.rb
 - lib/console_shogi/piece_mover.rb
 - lib/console_shogi/piece_mover_on_komadai.rb
 - lib/console_shogi/player.rb
-- lib/console_shogi/terminal_operator.rb
+- lib/console_shogi/teban.rb
+- lib/console_shogi/terminal/cursor.rb
+- lib/console_shogi/terminal/display_area.rb
+- lib/console_shogi/terminal/operator.rb
 - lib/console_shogi/version.rb
 homepage: https://github.com/pekepek/console-shogi
 licenses:

data/lib/console_shogi/terminal_operator.rb

@@ -1,211 +0,0 @@
-# frozen_string_literal: true
-
-require 'base64'
-require 'tty-prompt'
-
-module ConsoleShogi
-  class TerminalOperator
-    class << self
-      CursorPosition = Struct.new(:x, :y)
-
-      HORIZONTAL_DISTANCE = 2
-
-      KOMADAI_START_X = 21
-      KOMADAI_GOTE_START_Y = 1
-      KOMADAI_SENTE_START_Y = 7
-
-      module EscapeSequence
-        RESET = "\e[0m"
-        RESET_CURSOR = "\e[1;1H"
-        BACKGROUND_COLOR_YELLOW = "\e[43m"
-        BACKGROUND_COLOR_GREEN = "\e[42m"
-        TEXT_COLOR_SENTE = "\e[37m"
-        TEXT_COLOR_GOTE = "\e[30m"
-      end
-
-      module Location
-        NONE = :none
-        BOARD = :board
-        SENTE_KOMADAI = :sente_komadai
-        GOTE_KOMADAI = :gote_komadai
-      end
-
-      def cursor_position
-        @cursor_position ||= CursorPosition.new(x: 1, y: 1)
-      end
-
-      def image_height
-        @image_height ||= calculate_fit_image_height
-      end
-
-      def print_board(board:, sente_komadai:, gote_komadai:)
-        # NOTE 画面をクリア
-        print "\e[2J"
-
-        # NOTE カーソルを1行1列に移動
-        print EscapeSequence::RESET_CURSOR
-
-        board.matrix.row_vectors.each_with_index do |vector, i|
-          vector.each_with_index do |piece, j|
-            print_image(image: piece.image, height: image_height)
-          end
-
-          print "#{EscapeSequence::RESET}\n"
-        end
-
-        # NOTE 駒台を表示
-        print_komadai(sente_komadai, KOMADAI_SENTE_START_Y, EscapeSequence::TEXT_COLOR_SENTE)
-        print_komadai(gote_komadai, KOMADAI_GOTE_START_Y, EscapeSequence::TEXT_COLOR_GOTE)
-
-        # NOTE back a cursor
-        back_to_cursor
-      end
-
-      def active_piece(board:, piece_index:)
-        back_to_cursor
-
-        board.fetch_piece(x: piece_index[:x], y: piece_index[:y])
-      end
-
-      def move_cursor(key)
-        return unless %w(A B C D).include?(key)
-
-        direction =
-          case key
-          when 'A', 'B'
-            key
-          when 'C', 'D'
-            "#{HORIZONTAL_DISTANCE}#{key}"
-          end
-
-        print "\e[#{direction}"
-
-        reload_cursor_position_in_stdin!
-      end
-
-      # TODO 駒台の大きさが変わるのをどうするか考える、メソッド名考える
-      def squares_index
-        case cursor_position
-        in x: 1..18, y: 1..9
-          {x: (cursor_position.x - 1) / HORIZONTAL_DISTANCE, y: cursor_position.y - 1, location: Location::BOARD}
-        in x: 21..38, y: 1..3
-          {x: (cursor_position.x - 21) / HORIZONTAL_DISTANCE, y: cursor_position.y - 1, location: Location::GOTE_KOMADAI}
-        in x: 21..38, y: 7..9
-          {x: (cursor_position.x - 21) / HORIZONTAL_DISTANCE, y: cursor_position.y - 7, location: Location::SENTE_KOMADAI}
-        else
-          {x: (cursor_position.x - 1) / HORIZONTAL_DISTANCE, y: cursor_position.y - 1, location: Location::NONE}
-        end
-      end
-
-      def select_promotion
-        print "\e[10;1H"
-
-        prompt = TTY::Prompt.new
-
-        prompt.select('成りますか？', show_help: :never) {|menu|
-          menu.choice '成る', true
-          menu.choice '成らない', false
-        }
-      end
-
-      def print_winner(teban)
-        print "\e[4;7H"
-
-        print_image(image: File.read("images/#{teban}/shori.png"), height: image_height * 3)
-
-        print "\e[10;1H"
-      end
-
-      private
-
-      IMAGE_HEIGHT_PIXEL = 240
-
-      # TODO 無理やりなので、実現方法を再考する
-      def calculate_fit_image_height
-        start_position = fetch_cursor_position_in_stdin
-        # NOTE NonePiece を選んでいることに意味はない
-        print_image(image: NonePiece.new.image)
-        end_position = fetch_cursor_position_in_stdin
-
-        fixed_height = IMAGE_HEIGHT_PIXEL / (end_position[1].to_i - start_position[1].to_i)
-
-        print "\e[2J"
-        # NOTE カーソルを1行1列に移動
-        print EscapeSequence::RESET_CURSOR
-
-        fixed_height
-      end
-
-      # TODO view 用の Player 作って整理する
-      def print_komadai(komadai, start_y, text_color)
-        komadai.pieces.row_vectors.each_with_index do |row_pieces, i|
-          print "\e[#{start_y + i};#{KOMADAI_START_X}H"
-          print EscapeSequence::BACKGROUND_COLOR_YELLOW
-          print text_color
-
-          row_pieces.each do |p|
-            print_image(image: p.image, height: image_height)
-          end
-
-          print EscapeSequence::RESET
-        end
-      end
-
-      def fetch_cursor_position_in_stdin
-        stdout = ''
-
-        $stdin.raw do |stdin|
-          $stdout << "\e[6n"
-          $stdout.flush
-
-          while (c = stdin.getc) != 'R'
-            stdout += c
-          end
-        end
-
-        stdout.match /(\d+);(\d+)/
-      end
-
-      def reload_cursor_position_in_stdin!
-        positions = fetch_cursor_position_in_stdin
-
-        @cursor_position = CursorPosition.new(x: positions[2].to_i, y: positions[1].to_i)
-      end
-
-      def back_to_cursor
-        print "\e[#{cursor_position.y};#{cursor_position.x}H"
-      end
-
-      # TODO 画像を表示するためのメソッド、場所検討
-      def print_image(image:, width: nil, height: nil)
-        encoded_image = Base64.strict_encode64(image)
-
-        print_osc
-        print "1337;File=inline=1"
-        print ";size=#{image.size}"
-        print ";name=#{encoded_image}"
-        print ";width=#{width}px" unless width.nil?
-        print ";height=#{height}px" unless height.nil?
-        print ":#{encoded_image}"
-        print_st
-      end
-
-      def print_osc
-        # NOTE \e] で始まるシーケンスは全てのターミナルで扱えるわけでは無い
-        if ENV['TERM'].start_with?('screen') || ENV['TERM'].start_with?('tmux')
-          print "\ePtmux;\e\e]"
-        else
-          print "\e]"
-        end
-      end
-
-      def print_st
-        if ENV['TERM'].start_with?('screen') || ENV['TERM'].start_with?('tmux')
-          print "\a\e\\"
-        else
-          print "\a"
-        end
-      end
-    end
-  end
-end