console-shogi 0.2.0 → 0.4.0

data/lib/console_shogi/terminal/display_area.rb

@@ -0,0 +1,122 @@
+module ConsoleShogi
+  module Terminal
+    class DisplayArea
+      OTHERS = :others
+      BOARD = :board
+      SENTE_KOMADAI = :sente_komadai
+      GOTE_KOMADAI = :gote_komadai
+
+      Position = Struct.new(:x, :y)
+
+      class << self
+        def fetch_area(x:, y:)
+          [Board, Komadai::Gote, Komadai::Sente, History::Back, History::Forward, History::Resume, Infomation].each do |klass|
+            return klass if klass.in?(x: x, y: y)
+          end
+
+          Others
+        end
+
+        def start_position
+          self::START_POSITION
+        end
+
+        def end_position
+          self::END_POSITION
+        end
+
+        def name
+          self::NAME
+        end
+
+        def board?
+          Board == self
+        end
+
+        def komadai?
+          [Komadai::Gote, Komadai::Sente].include?(self)
+        end
+
+        def history?
+          [History::Back, History::Forward, History::Resume].include?(self)
+        end
+
+        def outside?
+          [History::Back, History::Forward, History::Resume, Infomation, Others].include?(self)
+        end
+
+        def in?(x:, y:)
+          Range.new(start_position.x, end_position.x).include?(x) &&
+            Range.new(start_position.y, end_position.y).include?(y)
+        end
+      end
+
+      class Board < DisplayArea
+        START_POSITION = Position.new(x: 1, y: 1)
+        END_POSITION = Position.new(x: 18, y: 9)
+        NAME = :board
+      end
+
+      module Komadai
+        class Gote < DisplayArea
+          START_POSITION = Position.new(x: 21, y: 1)
+          END_POSITION = Position.new(x: 38, y: 3)
+          NAME = :gote_komadai
+        end
+
+        class Sente < DisplayArea
+          START_POSITION = Position.new(x: 21, y: 7)
+          END_POSITION = Position.new(x: 38, y: 9)
+          NAME = :sente_komadai
+        end
+      end
+
+      class History < DisplayArea
+        START_POSITION = Position.new(x: 1, y: 10)
+        END_POSITION = Position.new(x: 6, y: 10)
+        NAME = :history
+
+        class << self
+          def back?
+            self == Back
+          end
+
+          def forward?
+            self == Forward
+          end
+
+          def resume?
+            self == Resume
+          end
+        end
+
+        class Back < History
+          START_POSITION = Position.new(x: 1, y: 10)
+          END_POSITION = Position.new(x: 2, y: 10)
+        end
+
+        class Forward < History
+          START_POSITION = Position.new(x: 3, y: 10)
+          END_POSITION = Position.new(x: 4, y: 10)
+        end
+
+        class Resume < History
+          START_POSITION = Position.new(x: 5, y: 10)
+          END_POSITION = Position.new(x: 6, y: 10)
+        end
+      end
+
+      class Infomation < DisplayArea
+        START_POSITION = Position.new(x: 1, y: 11)
+        END_POSITION = Position.new(x: 18, y: 15)
+        NAME = :infomation
+      end
+
+      class Others < DisplayArea
+        START_POSITION = Position.new(x: nil, y: nil)
+        END_POSITION = Position.new(x: nil, y: nil)
+        NAME = :others
+      end
+    end
+  end
+end

data/lib/console_shogi/terminal/operator.rb

@@ -0,0 +1,249 @@
+# 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"
+          SCREEN_CLEAR = "\e[2J"
+          SCREEN_CLEAR_AFTER_CURSOR = "\e[0J"
+          SCREEN_CLEAR_NOW_LINE = "\e[2K"
+          MOVE_START_POINT = "\e[1;1H"
+          MOVE_HISTORY_AREA = "\e[#{DisplayArea::History.start_position.y};#{DisplayArea::History.start_position.x}H"
+          MOVE_INFOMATION_AREA = "\e[#{DisplayArea::Infomation.start_position.y};#{DisplayArea::Infomation.start_position.x}H"
+          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::MOVE_START_POINT
+        end
+
+        def print_board(board:, sente_komadai:, gote_komadai:)
+          print EscapeSequence::MOVE_START_POINT
+
+          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(komadai: sente_komadai, start_position: DisplayArea::Komadai::Sente.start_position)
+          print_komadai(komadai: gote_komadai, start_position: DisplayArea::Komadai::Gote.start_position)
+
+          back_to_cursor
+        end
+
+        # TODO 駒台の表示方法も考える
+        def print_diff_board(previous_board:, board:, sente_komadai:, gote_komadai:)
+          print EscapeSequence::MOVE_START_POINT
+
+          board.matrix.row_vectors.each_with_index do |vector, i|
+            vector.each_with_index do |piece, j|
+              if previous_board.matrix[i, j].nil? || previous_board.matrix[i, j].same?(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, start_position: DisplayArea::Komadai::Sente.start_position)
+          print_komadai(komadai: gote_komadai, start_position: DisplayArea::Komadai::Gote.start_position)
+
+          back_to_cursor
+        end
+
+        def print_start_history
+          print EscapeSequence::MOVE_INFOMATION_AREA
+          print EscapeSequence::SCREEN_CLEAR_AFTER_CURSOR
+
+          print '履歴モード'
+
+          back_to_cursor
+        end
+
+        def focus_piece(board:, cursor:)
+          piece = board.fetch_piece(x: cursor.grid_position.x, y: cursor.grid_position.y)
+
+          return if piece.nil?
+
+          print_image(image: piece.focused_image, height: image_height)
+
+          back_to_cursor
+        end
+
+        def deactive_piece(board:, previous_cursor:)
+          print "\e[#{previous_cursor.terminal_position.y};#{previous_cursor.terminal_position.x}H"
+
+          piece = board.fetch_piece(x: previous_cursor.grid_position.x, y: previous_cursor.grid_position.y)
+
+          print_image(image: piece.image, height: image_height) unless piece.nil?
+
+          back_to_cursor
+        end
+
+        def active_piece(board:, cursor:)
+          piece = board.fetch_piece(x: cursor.grid_position.x, y: cursor.grid_position.y)
+
+          return if piece.nil?
+
+          print_image(image: piece.active_image, height: image_height)
+
+          back_to_cursor
+        end
+
+        def select_promotion
+          print EscapeSequence::MOVE_INFOMATION_AREA
+
+          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::MOVE_INFOMATION_AREA
+        end
+
+        # TODO 見た目は後で直す
+        def print_teban(teban)
+          print EscapeSequence::MOVE_INFOMATION_AREA
+          print EscapeSequence::SCREEN_CLEAR_AFTER_CURSOR
+
+          print "手番 : #{TEBAN[teban.to_sym]}"
+
+          back_to_cursor
+        end
+
+        # TODO データの指定の仕方は後で整理する
+        def print_history_button
+          print EscapeSequence::MOVE_HISTORY_AREA
+          print EscapeSequence::SCREEN_CLEAR_NOW_LINE
+
+          print_image(image: File.read("images/history_button/left.png"), height: image_height)
+          print_image(image: File.read("images/history_button/right.png"), height: image_height)
+          print_image(image: File.read("images/history_button/play.png"), height: image_height)
+
+          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::MOVE_START_POINT
+
+          fixed_height
+        end
+
+        # TODO view 用の Player 作って整理する
+        def print_komadai(komadai:, start_position:)
+          komadai.pieces.row_vectors.each_with_index do |row_pieces, i|
+            print "\e[#{start_position.y + i};#{start_position.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.4.0'
 end

data/lib/console_shogi.rb

@@ -1,16 +1,24 @@
 # frozen_string_literal: true
 
 require_relative 'console_shogi/version'
-require_relative 'console_shogi/game'
 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/grid_position'
+
+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/game'
+require_relative 'console_shogi/game_history'
 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_mover_from_board'
+require_relative 'console_shogi/piece_mover_from_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.4.0
 platform: ruby
 authors:
 - pekepek
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-24 00:00:00.000000000 Z
+date: 2023-06-09 00:00:00.000000000 Z
 dependencies: []
 description: You can play the Shogi in terminal
 email:
@@ -24,50 +24,121 @@ 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/history_button/left.png
+- images/history_button/play.png
+- images/history_button/right.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/game_history.rb
+- lib/console_shogi/grid_position.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/piece_mover_from_board.rb
+- lib/console_shogi/piece_mover_from_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:
@@ -91,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.13
 signing_key:
 specification_version: 4
 summary: You can play the Shogi in terminal

data/lib/console_shogi/piece_mover_on_komadai.rb

@@ -1,65 +0,0 @@
-# frozen_string_literal: true
-
-module ConsoleShogi
-  class PieceMoverOnKomadai
-    def initialize(board:, komadai:, from:)
-      @board = board
-      @komadai = komadai
-      # 駒台の index に直す必要がある
-      @from_piece_index = from
-    end
-
-    def drop!
-      return if target_piece.nil? || target_piece.none?
-
-      while key = STDIN.getch
-        if key == "\e" && STDIN.getch == "["
-          key = STDIN.getch
-
-          TerminalOperator.move_cursor(key)
-        elsif key == "\r"
-          to_piece_index = TerminalOperator.squares_index
-
-          return if to_piece_index[:location] != :board
-          return unless can_drop?(piece: target_piece, to_piece_index: to_piece_index)
-
-          komadai.pick_up_piece!(from: from_piece_index)
-          board.put_piece!(piece: target_piece, to: to_piece_index)
-
-          return
-        end
-      end
-    end
-
-    private
-
-    attr_reader :board, :komadai, :from_piece_index
-
-    def target_piece
-      @target_piece ||= komadai.fetch_piece(x: from_piece_index[:x], y: from_piece_index[:y])
-    end
-
-    def can_drop?(piece:, to_piece_index:)
-      to_piece = board.fetch_piece(x: to_piece_index[:x], y: to_piece_index[:y])
-
-      return false unless to_piece.none?
-
-      return false if nifu?(piece, to_piece_index)
-
-      can_move_next_turn?(piece, to_piece_index)
-    end
-
-    def can_move_next_turn?(piece, to_piece_index)
-      piece_mover = PieceMover.new(board: board, from: to_piece_index)
-
-      piece.moves.any? {|m|
-        piece_mover.can_move?(piece: piece, to_piece_index: {x: to_piece_index[:x] + m[:x], y: to_piece_index[:y] + m[:y]})
-      }
-    end
-
-    def nifu?(piece, to_piece_index)
-      piece.fu? &&
-        board.matrix.column(to_piece_index[:x]).any? {|p| p.fu? && piece.player == p.player }
-    end
-  end
-end