console-shogi 0.2.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44d942e8d1dbffb2bfae8c29d4154ea7b148484eaaa976d38e51a7c20779ea2a
-  data.tar.gz: 0c6fb8f9f65961284023eb6b5312a0df1240b1c3af0b3aa4d8de08e5640dbeea
+  metadata.gz: bee75f732b33e177d7b2c15939508663a391bc2d593692273a1a1f47ae654543
+  data.tar.gz: d78846e34e4afbeea51dfd4558e9c076aee6625c6ad43129fb01cff9c36d41a7
 SHA512:
-  metadata.gz: a1c70713c4b868e5308f3643128b8a34579956cb5ba7aadf0170ed3142f2416efa40a4a69bb7f3939324a133c348a578a3c26a77ded659f59d6133cbe653a4a3
-  data.tar.gz: 95c8b78de329d1e66ec81f3c25a2efe281ad89733027b778d00c5b7ac59d726229634d2e5ca083d8783d7827700a70858abc2fec506000912cd2548f5ffb7079
+  metadata.gz: 2b0aeed55b0fcaedbe879703c3d7e20fc38a6fa5e2a0617d627ff6f873766aff6f4963dc117f032b64911021a46888ebb2229ed6d4a4231bd91d9ecbcf5a868a
+  data.tar.gz: 926eeda23c9e565c45ec8290c0ecf5ca607adfaea24c29f1a95c858f952af948b7e371ae8408f32512c3acd720bb3af5873dce62aa8ff435e0801d1cf2b1cc35

data/Gemfile.lock

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

data/README.md

@@ -1 +1,22 @@
 # console-shogi
+
+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
+
+```
+gem install console-shogi
+```
+
+## Start Game
+
+```
+console-shogi
+```
+
+## Commands
+
+* move a cursor : `direction keys` ←↓↑→
+* select and drop a piece : `Enter`

data/lib/console_shogi/board.rb

@@ -12,6 +12,10 @@ module ConsoleShogi
       @pieces
     end
 
+    def deep_copy
+      Board.new(pieces: pieces.map(&:dup).to_a)
+    end
+
     def within_range?(x:, y:)
       case {x: x, y: y}
       in x: 0..8, y: 0..8
@@ -34,16 +38,8 @@ module ConsoleShogi
     end
 
     def move_piece!(from:, to:)
-      from_piece = @pieces[from[:y], from[:x]]
+      @pieces[to[:y], to[:x]] = @pieces[from[:y], from[:x]]
       @pieces[from[:y], from[:x]] = NonePiece.new
-
-      to_piece = @pieces[to[:y], to[:x]]
-
-      # NOTE 駒を取る、リファクタする
-      #      from_piece.player で player 取るの違和感
-      from_piece.player.capture_piece!(to_piece) unless to_piece.none?
-
-      @pieces[to[:y], to[:x]] = from_piece
     end
 
     private

data/lib/console_shogi/game.rb

@@ -5,15 +5,25 @@ require 'io/console'
 module ConsoleShogi
   class Game
     def initialize
-      @sente_player = Player.new(teban: Player::Teban::SENTE)
-      @gote_player = Player.new(teban: Player::Teban::GOTE)
-      @board = NewBoardBuilder.build(sente_player: @sente_player, gote_player: @gote_player)
+      @sente_player = Player.new(teban: Teban::SENTE)
+      @gote_player = Player.new(teban: Teban::GOTE)
+      @board = NewBoardBuilder.build
+
+      @selected_cursor = nil
+      @teban_player = @sente_player
+
+      @game_histories = [{board: board.deep_copy, sente_komadai: sente_player.komadai.deep_copy, gote_komadai: gote_player.komadai.deep_copy}]
+
+      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
-      TerminalOperator.print_board(board: board, sente_komadai: sente_player.komadai, gote_komadai: gote_player.komadai)
-
       while key = STDIN.getch
+        cursor = Terminal::Operator.cursor
+
         # NOTE Ctrl-C を押したら終了
         if key == "\C-c"
           exit
@@ -21,30 +31,54 @@ module ConsoleShogi
         elsif key == "\e" && STDIN.getch == "["
           key = STDIN.getch
 
-          TerminalOperator.move_cursor(key)
+          @last_cursor_on_grid = cursor.dup unless cursor.grid_position.location.outside?
+
+          cursor.move(key)
+
+          # TODO 選択したピースは色を変えないようにしている。状態の持ち方を見直したい
+          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 にするかは要検討
-          index = TerminalOperator.squares_index
-
-          case index[:location]
-          when :board
-            PieceMover.new(board: board, from: index).move!
-          when :sente_komadai
-            PieceMoverOnKomadai.new(board: board, komadai: sente_player.komadai, from: index).drop!
-          when :gote_komadai
-            PieceMoverOnKomadai.new(board: board, komadai: gote_player.komadai, from: index).drop!
+          if cursor.grid_position.location.history?
+            GameHistory.new(game_histories: game_histories).start
+
+            next
           end
 
-          # TODO 描写に時間がかかるので、差分のみ表示できる様にする
-          TerminalOperator.print_board(board: board, sente_komadai: sente_player.komadai, gote_komadai: gote_player.komadai)
+          if selected_cursor.nil?
+            # TODO PieceMover の can_move? と分散してしまっている気もする
+            next if cursor.grid_position.location.outside?
+
+            active_piece(cursor)
 
-          # TODO ひとまず動く物を作った。リファクタリングする
-          [sente_player, gote_player].each do |player|
-            next unless player.win?
+            @selected_cursor = cursor.dup
+          else
+            next unless cursor.grid_position.location.board?
 
-            TerminalOperator.print_winner(player.teban)
-            exit
+            piece_mover = PieceMover.build(board: board, player: teban_player, from_cursor: selected_cursor, to_cursor: cursor)
+
+            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)
+
+              @game_histories << {board: board.deep_copy, sente_komadai: sente_player.komadai.deep_copy, gote_komadai: gote_player.komadai.deep_copy}
+
+              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
@@ -52,6 +86,46 @@ module ConsoleShogi
 
     private
 
-    attr_reader :board, :sente_player, :gote_player
+    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)
+      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)
+      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)
+      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
+        board
+      when :sente_komadai
+        sente_player.komadai
+      when :gote_komadai
+        gote_player.komadai
+      end
+    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,16 +8,12 @@ module ConsoleShogi
 
     attr_reader :pieces
 
-    def initialize
-      @pieces = empty_pieces
+    def initialize(pieces: empty_pieces)
+      @pieces = Matrix.rows(pieces)
     end
 
-    def expand!
-      @pieces = pieces.hstack(empty_pieces)
-    end
-
-    def have_space?
-      pieces.any?(&:none?)
+    def deep_copy
+      Komadai.new(pieces: pieces.map(&:dup).to_a)
     end
 
     def fetch_piece(x:, y:)
@@ -25,35 +21,43 @@ module ConsoleShogi
     end
 
     def put(piece:)
+      expand! unless have_space?
+
       index = pieces.index(&:none?)
 
-      raise NoSpaceError if index.nil?
+      piece = piece.original if piece.promoted?
 
       @pieces[*index] = piece
 
       @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
 
     private
 
+    def expand!
+      @pieces = pieces.hstack(empty_pieces)
+    end
+
+    def have_space?
+      pieces.any?(&:none?)
+    end
+
     def sort_pieces
       column_num = pieces.count / 3
       Matrix.rows(pieces.sort_by {|p| -p.number }.each_slice(column_num).to_a)
     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