console-shogi 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: add4a4e51f593521d761a1afe000dfe184f8effe9d4f41d4822807465036a3cb
-  data.tar.gz: dbde9af4607ec797e9bdbea94d1a7ef64d7eb0cdbfbca8c9d5c601696e1f0785
+  metadata.gz: bee75f732b33e177d7b2c15939508663a391bc2d593692273a1a1f47ae654543
+  data.tar.gz: d78846e34e4afbeea51dfd4558e9c076aee6625c6ad43129fb01cff9c36d41a7
 SHA512:
-  metadata.gz: 85e7e5b136cfda4c6a31fa6e1cb9b380b0adfb3162b2f9c2ae154d831a1ee3e7302275c8e94f2da2ce7a2c6695280eedf26fb4df2f0a24b9775b606030d2d0a5
-  data.tar.gz: 5ea91665e1498809b9b59cc282e2ea22ac7c8dbd1ed2b5770f02bd29afbc18cb08c0ab074ef2a8a5b8aaa4e006513ced0f62a4f9b67bff31866a341b46d810b6
+  metadata.gz: 2b0aeed55b0fcaedbe879703c3d7e20fc38a6fa5e2a0617d627ff6f873766aff6f4963dc117f032b64911021a46888ebb2229ed6d4a4231bd91d9ecbcf5a868a
+  data.tar.gz: 926eeda23c9e565c45ec8290c0ecf5ca607adfaea24c29f1a95c858f952af948b7e371ae8408f32512c3acd720bb3af5873dce62aa8ff435e0801d1cf2b1cc35

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    console-shogi (0.2.0)
+    console-shogi (0.3.0)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -2,6 +2,8 @@
 
 You can play the Shogi in your terminal ☗☖
 
+Maybe, you’ll hard to see if you don’t increase the font size of the terminal.
+
 ## Installation
 
 ```

data/lib/console_shogi/board.rb

@@ -12,8 +12,8 @@ module ConsoleShogi
       @pieces
     end
 
-    def copy
-      Board.new(pieces: pieces.to_a)
+    def deep_copy
+      Board.new(pieces: pieces.map(&:dup).to_a)
     end
 
     def within_range?(x:, y:)

data/lib/console_shogi/game.rb

@@ -9,19 +9,21 @@ module ConsoleShogi
       @gote_player = Player.new(teban: Teban::GOTE)
       @board = NewBoardBuilder.build
 
-      @previous_board = Board.new(pieces: [])
-      @from_cursor = nil
-      @selected_piece = false
+      @selected_cursor = nil
       @teban_player = @sente_player
-    end
 
-    def start
-      Terminal::Operator.clear_scrren
+      @game_histories = [{board: board.deep_copy, sente_komadai: sente_player.komadai.deep_copy, gote_komadai: gote_player.komadai.deep_copy}]
 
-      Terminal::Operator.print_diff_board(previous_board: previous_board, board: board, sente_komadai: sente_player.komadai, gote_komadai: gote_player.komadai)
+      Terminal::Operator.clear_scrren
+      Terminal::Operator.print_board(board: board, sente_komadai: sente_player.komadai, gote_komadai: gote_player.komadai)
+      Terminal::Operator.print_history_button
       Terminal::Operator.print_teban(teban_player.teban)
+    end
 
+    def start
       while key = STDIN.getch
+        cursor = Terminal::Operator.cursor
+
         # NOTE Ctrl-C を押したら終了
         if key == "\C-c"
           exit
@@ -29,81 +31,54 @@ module ConsoleShogi
         elsif key == "\e" && STDIN.getch == "["
           key = STDIN.getch
 
-          cursor = Terminal::Operator.cursor
-          @previous_cursor_on_square = cursor.dup unless cursor.squares_position.location == :none
+          @last_cursor_on_grid = cursor.dup unless cursor.grid_position.location.outside?
 
           cursor.move(key)
 
           # TODO 選択したピースは色を変えないようにしている。状態の持ち方を見直したい
-          deactive_piece(previous_cursor_on_square) unless selected_piece && from_cursor.squares_position == previous_cursor_on_square.squares_position
-          focus_piece(cursor) unless selected_piece && from_cursor.squares_position == cursor.squares_position
+          deactive_piece(last_cursor_on_grid) if selected_cursor&.grid_position != last_cursor_on_grid.grid_position
+          focus_piece(cursor) if selected_cursor&.grid_position != cursor.grid_position
         # NOTE Enter を押したら駒を移動
         elsif key == "\r"
-          # TODO このまま Hash にするかは要検討
-          cursor = Terminal::Operator.cursor
-
-          if selected_piece
-            next if cursor.squares_position.location != :board
-
-            piece_mover =
-              case from_cursor.squares_position.location
-              when :board
-                # TODO 後で index を統一的にどう扱うか整理する
-                PieceMover.new(
-                  board: board,
-                  player: teban_player,
-                  from: from_cursor.squares_position.to_h,
-                  to: cursor.squares_position.to_h
-                )
-              when :sente_komadai
-                PieceMoverOnKomadai.new(
-                  board: board,
-                  komadai: sente_player.komadai,
-                  from: from_cursor.squares_position.to_h,
-                  to: cursor.squares_position.to_h
-                )
-              when :gote_komadai
-                PieceMoverOnKomadai.new(
-                  board: board,
-                  komadai: gote_player.komadai,
-                  from: from_cursor.squares_position.to_h,
-                  to: cursor.squares_position.to_h
-                )
-              end
+          if cursor.grid_position.location.history?
+            GameHistory.new(game_histories: game_histories).start
 
-            piece_mover.move!
-
-            if piece_mover.moved_piece?
-              Terminal::Operator.print_diff_board(previous_board: previous_board, board: board, sente_komadai: sente_player.komadai, gote_komadai: gote_player.komadai)
+            next
+          end
 
-              @previous_board = board.copy
-              change_teban!
+          if selected_cursor.nil?
+            # TODO PieceMover の can_move? と分散してしまっている気もする
+            next if cursor.grid_position.location.outside?
 
-              Terminal::Operator.print_teban(teban_player.teban)
-            else
-              deactive_piece(from_cursor)
-            end
+            active_piece(cursor)
 
-            @from_cursor = nil
-            @selected_piece = false
+            @selected_cursor = cursor.dup
           else
-            # TODO PieceMover の can_move? と分散してしまっている気もする
-            next if cursor.squares_position.location == :none
-            next if teban_player.sente? && cursor.squares_position.location == :gote_komadai
-            next if teban_player.gote? && cursor.squares_position.location == :sente_komadai
+            next unless cursor.grid_position.location.board?
 
-            active_piece(cursor)
+            piece_mover = PieceMover.build(board: board, player: teban_player, from_cursor: selected_cursor, to_cursor: cursor)
 
-            @from_cursor = cursor.dup
-            @selected_piece = true
-          end
+            piece_mover.move!
+
+            if piece_mover.moved_piece?
+              Terminal::Operator.print_diff_board(previous_board: game_histories.last[:board], board: board, sente_komadai: sente_player.komadai, gote_komadai: gote_player.komadai)
 
-          # TODO ひとまず動く物を作った。リファクタリングする
-          [sente_player, gote_player].each do |player|
-            next unless player.win?
+              @game_histories << {board: board.deep_copy, sente_komadai: sente_player.komadai.deep_copy, gote_komadai: gote_player.komadai.deep_copy}
 
-            Terminal::Operator.print_winner(player)
-            exit
+              if teban_player.win?
+                Terminal::Operator.print_winner(teban_player)
+
+                exit
+              else
+                change_teban!
+
+                Terminal::Operator.print_teban(teban_player.teban)
+              end
+            else
+              deactive_piece(selected_cursor)
+            end
+
+            @selected_cursor = nil
           end
         end
       end
@@ -111,45 +86,45 @@ module ConsoleShogi
 
     private
 
-    attr_reader :board, :sente_player, :gote_player, :selected_piece, :from_cursor, :teban_player, :previous_board, :previous_cursor_on_square
+    attr_reader :board, :sente_player, :gote_player, :selected_cursor, :teban_player, :game_histories, :last_cursor_on_grid
 
     def change_teban!
       @teban_player = teban_player == sente_player ? gote_player : sente_player
     end
 
+    # TODO ここらへんイケてないのでリファクタしたい
     def active_piece(cursor)
-      # TODO case で指定しないといけないのイケてないのでリファクタしたい
-      case cursor.squares_position.location
-      when :board
-        Terminal::Operator.active_piece(location: board, cursor: cursor)
-      when :sente_komadai
-        Terminal::Operator.active_piece(location: sente_player.komadai, cursor: cursor)
-      when :gote_komadai
-        Terminal::Operator.active_piece(location: gote_player.komadai, cursor: cursor)
-      end
+      location = fetch_piece_location_object(cursor.grid_position.location)
+
+      return if location.nil?
+
+      Terminal::Operator.active_piece(board: location, cursor: cursor)
     end
 
     def deactive_piece(cursor)
-      # TODO case で指定しないといけないのイケてないのでリファクタしたい
-      case cursor.squares_position.location
-      when :board
-        Terminal::Operator.deactive_piece(location: board, previous_cursor: cursor)
-      when :sente_komadai
-        Terminal::Operator.deactive_piece(location: sente_player.komadai, previous_cursor: cursor)
-      when :gote_komadai
-        Terminal::Operator.deactive_piece(location: gote_player.komadai, previous_cursor: cursor)
-      end
+      location = fetch_piece_location_object(cursor.grid_position.location)
+
+      return if location.nil?
+
+      Terminal::Operator.deactive_piece(board: location, previous_cursor: cursor)
     end
 
     def focus_piece(cursor)
-      # TODO case で指定しないといけないのイケてないのでリファクタしたい
-      case cursor.squares_position.location
+      location = fetch_piece_location_object(cursor.grid_position.location)
+
+      return if location.nil?
+
+      Terminal::Operator.focus_piece(board: location, cursor: cursor)
+    end
+
+    def fetch_piece_location_object(cursor_location)
+      case cursor_location.name
       when :board
-        Terminal::Operator.focus_piece(location: board, cursor: cursor)
+        board
       when :sente_komadai
-        Terminal::Operator.focus_piece(location: sente_player.komadai, cursor: cursor)
+        sente_player.komadai
       when :gote_komadai
-        Terminal::Operator.focus_piece(location: gote_player.komadai, cursor: cursor)
+        gote_player.komadai
       end
     end
   end

data/lib/console_shogi/game_history.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require 'io/console'
+
+module ConsoleShogi
+  class GameHistory
+    def initialize(game_histories:)
+      @game_histories = game_histories
+      # TODO game_count という名前は分かりづらいので変える
+      @game_count = game_histories.count
+
+      Terminal::Operator.print_start_history
+    end
+
+    def start
+      while key = STDIN.getch
+        cursor = Terminal::Operator.cursor
+
+        # NOTE Ctrl-C を押したら終了
+        if key == "\C-c"
+          exit
+        # NOTE 矢印キーを押したらカーソルを移動
+        elsif key == "\e" && STDIN.getch == "["
+          key = STDIN.getch
+
+          cursor.move(key)
+        elsif key == "\r"
+          location = cursor.grid_position.location
+
+          next unless location.history?
+
+          if location.resume?
+            Terminal::Operator.clear_scrren
+
+            Terminal::Operator.print_board(board: game_histories.last[:board], sente_komadai: game_histories.last[:sente_komadai], gote_komadai: game_histories.last[:gote_komadai])
+            Terminal::Operator.print_history_button
+
+            return
+          elsif location.back?
+            next if game_count == 1
+
+            @game_count -= 1
+
+            Terminal::Operator.print_board(board: game_histories[game_count - 1][:board], sente_komadai: game_histories[game_count - 1][:sente_komadai], gote_komadai: game_histories[game_count - 1][:gote_komadai])
+          elsif location.forward?
+            next if game_count == game_histories.count
+
+            @game_count += 1
+
+            Terminal::Operator.print_board(board: game_histories[game_count - 1][:board], sente_komadai: game_histories[game_count - 1][:sente_komadai], gote_komadai: game_histories[game_count - 1][:gote_komadai])
+          end
+        end
+      end
+    end
+
+    private
+
+    attr_reader :game_histories, :game_count
+  end
+end

data/lib/console_shogi/grid_position.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module ConsoleShogi
+  class GridPosition < Struct.new(:x, :y, :location)
+  end
+end

data/lib/console_shogi/komadai.rb

@@ -8,8 +8,12 @@ module ConsoleShogi
 
     attr_reader :pieces
 
-    def initialize
-      @pieces = empty_pieces
+    def initialize(pieces: empty_pieces)
+      @pieces = Matrix.rows(pieces)
+    end
+
+    def deep_copy
+      Komadai.new(pieces: pieces.map(&:dup).to_a)
     end
 
     def fetch_piece(x:, y:)
@@ -28,8 +32,8 @@ module ConsoleShogi
       @pieces = sort_pieces
     end
 
-    def pick_up_piece!(from:)
-      @pieces[from[:y], from[:x]] = NonePiece.new
+    def pick_up_piece!(x:, y:)
+      @pieces[y, x] = NonePiece.new
       @pieces = sort_pieces
     end
 
@@ -49,13 +53,11 @@ module ConsoleShogi
     end
 
     def empty_pieces
-      Matrix.rows(
-        [
-          [NonePiece.new, NonePiece.new, NonePiece.new],
-          [NonePiece.new, NonePiece.new, NonePiece.new],
-          [NonePiece.new, NonePiece.new, NonePiece.new]
-        ]
-      )
+      [
+        [NonePiece.new, NonePiece.new, NonePiece.new],
+        [NonePiece.new, NonePiece.new, NonePiece.new],
+        [NonePiece.new, NonePiece.new, NonePiece.new]
+      ]
     end
   end
 end

data/lib/console_shogi/piece.rb

@@ -63,6 +63,11 @@ module ConsoleShogi
     def can_move_long_distance?
       [Kaku, Hisha, Kyosha, PromotedPiece::Uma, PromotedPiece::Ryu].include?(self::class)
     end
+
+    def same?(piece)
+      self::class == piece::class &&
+        self.teban == piece.teban
+    end
   end
 
   class NonePiece < Piece

data/lib/console_shogi/piece_mover.rb

@@ -2,12 +2,26 @@
 
 module ConsoleShogi
   class PieceMover
-    def initialize(board:, player:, from:, to:)
-      @board = board
-      @player = player
-      @from = from
-      @to = to
-      @moved_piece = false
+    class << self
+      def build(board:, player:, from_cursor:, to_cursor:)
+        location = from_cursor.grid_position.location
+
+        if location.board?
+          PieceMoverFromBoard.new(
+            board: board,
+            player: player,
+            from: from_cursor.grid_position,
+            to: to_cursor.grid_position
+          )
+        elsif location.komadai?
+          PieceMoverFromKomadai.new(
+            board: board,
+            player: player,
+            from: from_cursor.grid_position,
+            to: to_cursor.grid_position
+          )
+        end
+      end
     end
 
     def move!
@@ -17,49 +31,5 @@ module ConsoleShogi
     def moved_piece?
       @moved_piece
     end
-
-    private
-
-    attr_reader :board, :player, :from, :to
-
-    def from_piece
-      @from_piece ||= board.fetch_piece(x: from[:x], y: from[:y])
-    end
-
-    def move_piece!
-      return false if from_piece.nil? || from_piece.none?
-      return false if from_piece.teban != player.teban
-
-      return false unless piece_movement_checker.can_move?
-
-      to_piece = board.fetch_piece(x: to[:x], y: to[:y])
-      player.capture_piece!(to_piece) unless to_piece.none?
-
-      board.move_piece!(
-        from: {x: from[:x], y: from[:y]},
-        to: {x: to[:x], y: to[:y]}
-      )
-
-      # TODO とりあえずここに実装してしまっている。整理したい
-      return true unless can_promote?(from_piece, from, to)
-
-      board.promote_piece!(x: to[:x], y: to[:y]) if Terminal::Operator.select_promotion
-
-      true
-    end
-
-    def piece_movement_checker
-      PieceMovementChecker.new(board: board, from: from, to: to)
-    end
-
-    def can_promote?(piece, from, to)
-      return false unless piece.can_promote?
-
-      if piece.teban == Teban::SENTE
-        from[:y].between?(0, 2) || to[:y].between?(0, 2)
-      elsif piece.teban == Teban::GOTE
-        from[:y].between?(6, 8) || to[:y].between?(6, 8)
-      end
-    end
   end
 end

data/lib/console_shogi/piece_mover_from_board.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module ConsoleShogi
+  class PieceMoverFromBoard < PieceMover
+    def initialize(board:, player:, from:, to:)
+      @board = board
+      @player = player
+      @from = from
+      @to = to
+      @moved_piece = false
+    end
+
+    private
+
+    attr_reader :board, :player, :from, :to
+
+    def from_piece
+      @from_piece ||= board.fetch_piece(x: from.x, y: from.y)
+    end
+
+    def move_piece!
+      return false if from_piece.nil? || from_piece.none?
+      return false if from_piece.teban != player.teban
+
+      return false unless piece_movement_checker.can_move?
+
+      to_piece = board.fetch_piece(x: to.x, y: to.y)
+      player.capture_piece!(to_piece) unless to_piece.none?
+
+      board.move_piece!(
+        from: {x: from.x, y: from.y},
+        to: {x: to.x, y: to.y}
+      )
+
+      # TODO とりあえずここに実装してしまっている。整理したい
+      return true unless can_promote?(from_piece, from, to)
+
+      board.promote_piece!(x: to.x, y: to.y) if Terminal::Operator.select_promotion
+
+      true
+    end
+
+    def piece_movement_checker
+      PieceMovementChecker.new(board: board, from: from, to: to)
+    end
+
+    def can_promote?(piece, from, to)
+      return false unless piece.can_promote?
+
+      if piece.teban == Teban::SENTE
+        from.y.between?(0, 2) || to.y.between?(0, 2)
+      elsif piece.teban == Teban::GOTE
+        from.y.between?(6, 8) || to.y.between?(6, 8)
+      end
+    end
+  end
+end

data/lib/console_shogi/piece_mover_from_komadai.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module ConsoleShogi
+  class PieceMoverFromKomadai < PieceMover
+    def initialize(board:, player:, from:, to:)
+      @board = board
+      @komadai = player.komadai
+      @player = player
+      @from = from
+      @to = to
+      @moved_piece = false
+    end
+
+    private
+
+    attr_reader :board, :komadai, :player, :from, :to
+
+    def move_piece!
+      return false if from_piece.nil? || from_piece.none?
+      return false if from_piece.teban != player.teban
+
+      return false unless to.location.board?
+      return false unless can_drop?(piece: from_piece, to: to)
+
+      komadai.pick_up_piece!(x: from.x, y: from.y)
+      board.put_piece!(piece: from_piece, to: to)
+
+      true
+    end
+
+    def from_piece
+      @from_piece ||= komadai.fetch_piece(x: from.x, y: from.y)
+    end
+
+    def can_drop?(piece:, to:)
+      to_piece = board.fetch_piece(x: to.x, y: to.y)
+
+      return false unless to_piece.none?
+
+      return false if nifu?(piece, to)
+
+      # TODO 動かせない場所に打つことはできないようにする
+      true
+    end
+
+    def nifu?(piece, to)
+      piece.fu? &&
+        board.matrix.column(to.x).any? {|p| p.fu? && piece.teban == p.teban }
+    end
+  end
+end

data/lib/console_shogi/terminal/cursor.rb

@@ -1,25 +1,17 @@
 module ConsoleShogi
   module Terminal
     class Cursor
-      module Location
-        NONE = :none
-        BOARD = :board
-        SENTE_KOMADAI = :sente_komadai
-        GOTE_KOMADAI = :gote_komadai
-      end
-
       TerminalPosition = Struct.new(:x, :y)
-      SquaresPosition = Struct.new(:x, :y, :location)
 
       VERTICAL_DISTANCE = 1
       HORIZONTAL_DISTANCE = 2
       CURSOR_DIRECTIONS = %w(A B C D)
 
-      attr_reader :terminal_position, :squares_position
+      attr_reader :terminal_position, :grid_position
 
       def initialize(terminal_index_x: 1, terminal_index_y: 1)
         @terminal_position = TerminalPosition.new(x: 1, y: 1)
-        @squares_position = SquaresPosition.new(**calculate_squares_position)
+        @grid_position = GridPosition.new(**calculate_grid_position)
       end
 
       def move(direction)
@@ -44,19 +36,21 @@ module ConsoleShogi
         positions = fetch_cursor_position_in_stdin
 
         @terminal_position = TerminalPosition.new(x: positions[2].to_i, y: positions[1].to_i)
-        @squares_position = SquaresPosition.new(**calculate_squares_position)
+        @grid_position = GridPosition.new(**calculate_grid_position)
       end
 
-      def calculate_squares_position
-        case terminal_position.to_h
-        in x: 1..18, y: 1..9
-          {x: (terminal_position.x - 1) / HORIZONTAL_DISTANCE, y: terminal_position.y - 1, location: Location::BOARD}
-        in x: 21..38, y: 1..3
-          {x: (terminal_position.x - 21) / HORIZONTAL_DISTANCE, y: terminal_position.y - 1, location: Location::GOTE_KOMADAI}
-        in x: 21..38, y: 7..9
-          {x: (terminal_position.x - 21) / HORIZONTAL_DISTANCE, y: terminal_position.y - 7, location: Location::SENTE_KOMADAI}
+      def calculate_grid_position
+        area = DisplayArea.fetch_area(x: terminal_position.x, y: terminal_position.y)
+
+        # TODO history や infomation の扱いを整理する
+        if area.outside?
+          {x: nil, y: nil, location: area}
         else
-          {x: (terminal_position.x - 1) / HORIZONTAL_DISTANCE, y: terminal_position.y - 1, location: Location::NONE}
+          {
+            x: (terminal_position.x - area.start_position.x) / HORIZONTAL_DISTANCE,
+            y: terminal_position.y - area.start_position.y,
+            location: area
+          }
         end
       end
 

data/lib/console_shogi/terminal/display_area.rb

@@ -1,29 +1,121 @@
 module ConsoleShogi
   module Terminal
-    module DisplayArea
-      module Board
-        START_INDEX = {x: 1, y: 1}
-        END_INDEX = {x: 18, y: 9}
-        RANGE = {x: Range.new(START_INDEX[:x], END_INDEX[:x]), y: Range.new(START_INDEX[:y], END_INDEX[:y])}
+    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
-        module Gote
-          START_INDEX = {x: 21, y: 1}
-          END_INDEX = {x: 38, y: 3}
-          RANGE = {x: Range.new(START_INDEX[:x], END_INDEX[:x]), y: Range.new(START_INDEX[:y], END_INDEX[:y])}
+        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
 
-        module Sente
-          START_INDEX = {x: 21, y: 7}
-          END_INDEX = {x: 38, y: 9}
-          RANGE = {x: Range.new(START_INDEX[:x], END_INDEX[:x]), y: Range.new(START_INDEX[:y], END_INDEX[:y])}
+        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
 
-      module OutSide
-        START_INDEX = {x: 10, y: 1}
-        RANGE = {x: Range.new(START_INDEX[:x], nil), y: Range.new(START_INDEX[:y], nil)}
+      class Others < DisplayArea
+        START_POSITION = Position.new(x: nil, y: nil)
+        END_POSITION = Position.new(x: nil, y: nil)
+        NAME = :others
       end
     end
   end

data/lib/console_shogi/terminal/operator.rb

@@ -14,10 +14,12 @@ module ConsoleShogi
 
         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"
+          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
@@ -33,16 +35,34 @@ module ConsoleShogi
         def clear_scrren
           print EscapeSequence::SCREEN_CLEAR
 
-          print EscapeSequence::RESET_CURSOR
+          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::RESET_CURSOR
+          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] == piece
+              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)
@@ -53,15 +73,23 @@ module ConsoleShogi
           end
 
           # NOTE 駒台を表示
-          print_komadai(komadai: sente_komadai, **DisplayArea::Komadai::Sente::START_INDEX)
-          print_komadai(komadai: gote_komadai, **DisplayArea::Komadai::Gote::START_INDEX)
+          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 '履歴モード'
 
-          # 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)
+        def focus_piece(board:, cursor:)
+          piece = board.fetch_piece(x: cursor.grid_position.x, y: cursor.grid_position.y)
 
           return if piece.nil?
 
@@ -70,18 +98,18 @@ module ConsoleShogi
           back_to_cursor
         end
 
-        def deactive_piece(location:, previous_cursor:)
+        def deactive_piece(board:, 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)
+          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(location:, cursor:)
-          piece = location.fetch_piece(x: cursor.squares_position.x, y: cursor.squares_position.y)
+        def active_piece(board:, cursor:)
+          piece = board.fetch_piece(x: cursor.grid_position.x, y: cursor.grid_position.y)
 
           return if piece.nil?
 
@@ -91,7 +119,7 @@ module ConsoleShogi
         end
 
         def select_promotion
-          print EscapeSequence::OUTSIDE_BOARD
+          print EscapeSequence::MOVE_INFOMATION_AREA
 
           prompt = TTY::Prompt.new
 
@@ -106,12 +134,12 @@ module ConsoleShogi
 
           print_image(image: player.win_image, height: image_height * 3)
 
-          print EscapeSequence::OUTSIDE_BOARD
+          print EscapeSequence::MOVE_INFOMATION_AREA
         end
 
         # TODO 見た目は後で直す
         def print_teban(teban)
-          print EscapeSequence::OUTSIDE_BOARD
+          print EscapeSequence::MOVE_INFOMATION_AREA
           print EscapeSequence::SCREEN_CLEAR_AFTER_CURSOR
 
           print "手番 : #{TEBAN[teban.to_sym]}"
@@ -119,6 +147,18 @@ module ConsoleShogi
           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
@@ -134,15 +174,15 @@ module ConsoleShogi
 
           print EscapeSequence::SCREEN_CLEAR
           # NOTE カーソルを1行1列に移動
-          print EscapeSequence::RESET_CURSOR
+          print EscapeSequence::MOVE_START_POINT
 
           fixed_height
         end
 
         # TODO view 用の Player 作って整理する
-        def print_komadai(komadai:, x:, y:)
+        def print_komadai(komadai:, start_position:)
           komadai.pieces.row_vectors.each_with_index do |row_pieces, i|
-            print "\e[#{y + i};#{x}H"
+            print "\e[#{start_position.y + i};#{start_position.x}H"
 
             row_pieces.each do |p|
               print_image(image: p.image, height: image_height)

data/lib/console_shogi/version.rb

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

data/lib/console_shogi.rb

@@ -1,20 +1,23 @@
 # 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/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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: console-shogi
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - pekepek
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-02 00:00:00.000000000 Z
+date: 2023-06-09 00:00:00.000000000 Z
 dependencies: []
 description: You can play the Shogi in terminal
 email:
@@ -87,6 +87,9 @@ files:
 - 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
@@ -122,12 +125,15 @@ files:
 - 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/teban.rb
 - lib/console_shogi/terminal/cursor.rb
@@ -156,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,59 +0,0 @@
-# frozen_string_literal: true
-
-module ConsoleShogi
-  class PieceMoverOnKomadai
-    def initialize(board:, komadai:, from:, to:)
-      @board = board
-      @komadai = komadai
-      # 駒台の index に直す必要がある
-      @from = from
-      @to = to
-      @moved_piece = false
-    end
-
-    def move!
-      @moved_piece = move_piece!
-    end
-
-    def moved_piece?
-      @moved_piece
-    end
-
-    private
-
-    attr_reader :board, :komadai, :from, :to
-
-    def move_piece!
-      return false if from_piece.nil? || from_piece.none?
-
-      # TODO ここで location の key もってるの期待してるの酷い、修正する
-      return false if to[:location] != :board
-      return false unless can_drop?(piece: from_piece, to: to)
-
-      komadai.pick_up_piece!(from: from)
-      board.put_piece!(piece: from_piece, to: to)
-
-      true
-    end
-
-    def from_piece
-      @from_piece ||= komadai.fetch_piece(x: from[:x], y: from[:y])
-    end
-
-    def can_drop?(piece:, to:)
-      to_piece = board.fetch_piece(x: to[:x], y: to[:y])
-
-      return false unless to_piece.none?
-
-      return false if nifu?(piece, to)
-
-      # TODO 動かせない場所に打つことはできないようにする
-      true
-    end
-
-    def nifu?(piece, to)
-      piece.fu? &&
-        board.matrix.column(to[:x]).any? {|p| p.fu? && piece.teban == p.teban }
-    end
-  end
-end