console-shogi 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44d942e8d1dbffb2bfae8c29d4154ea7b148484eaaa976d38e51a7c20779ea2a
-  data.tar.gz: 0c6fb8f9f65961284023eb6b5312a0df1240b1c3af0b3aa4d8de08e5640dbeea
+  metadata.gz: add4a4e51f593521d761a1afe000dfe184f8effe9d4f41d4822807465036a3cb
+  data.tar.gz: dbde9af4607ec797e9bdbea94d1a7ef64d7eb0cdbfbca8c9d5c601696e1f0785
 SHA512:
-  metadata.gz: a1c70713c4b868e5308f3643128b8a34579956cb5ba7aadf0170ed3142f2416efa40a4a69bb7f3939324a133c348a578a3c26a77ded659f59d6133cbe653a4a3
-  data.tar.gz: 95c8b78de329d1e66ec81f3c25a2efe281ad89733027b778d00c5b7ac59d726229634d2e5ca083d8783d7827700a70858abc2fec506000912cd2548f5ffb7079
+  metadata.gz: 85e7e5b136cfda4c6a31fa6e1cb9b380b0adfb3162b2f9c2ae154d831a1ee3e7302275c8e94f2da2ce7a2c6695280eedf26fb4df2f0a24b9775b606030d2d0a5
+  data.tar.gz: 5ea91665e1498809b9b59cc282e2ea22ac7c8dbd1ed2b5770f02bd29afbc18cb08c0ab074ef2a8a5b8aaa4e006513ced0f62a4f9b67bff31866a341b46d810b6

data/Gemfile.lock

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

data/README.md

@@ -1 +1,20 @@
 # console-shogi
+
+You can play the Shogi in your 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 copy
+      Board.new(pieces: pieces.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,13 +5,21 @@ 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
+
+      @previous_board = Board.new(pieces: [])
+      @from_cursor = nil
+      @selected_piece = false
+      @teban_player = @sente_player
     end
 
     def start
-      TerminalOperator.print_board(board: board, sente_komadai: sente_player.komadai, gote_komadai: gote_player.komadai)
+      Terminal::Operator.clear_scrren
+
+      Terminal::Operator.print_diff_board(previous_board: previous_board, board: board, sente_komadai: sente_player.komadai, gote_komadai: gote_player.komadai)
+      Terminal::Operator.print_teban(teban_player.teban)
 
       while key = STDIN.getch
         # NOTE Ctrl-C を押したら終了
@@ -21,29 +29,80 @@ module ConsoleShogi
         elsif key == "\e" && STDIN.getch == "["
           key = STDIN.getch
 
-          TerminalOperator.move_cursor(key)
+          cursor = Terminal::Operator.cursor
+          @previous_cursor_on_square = cursor.dup unless cursor.squares_position.location == :none
+
+          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
         # 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!
-          end
+          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
 
-          # TODO 描写に時間がかかるので、差分のみ表示できる様にする
-          TerminalOperator.print_board(board: board, sente_komadai: sente_player.komadai, gote_komadai: gote_player.komadai)
+            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)
+
+              @previous_board = board.copy
+              change_teban!
+
+              Terminal::Operator.print_teban(teban_player.teban)
+            else
+              deactive_piece(from_cursor)
+            end
+
+            @from_cursor = nil
+            @selected_piece = false
+          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
+
+            active_piece(cursor)
+
+            @from_cursor = cursor.dup
+            @selected_piece = true
+          end
 
           # TODO ひとまず動く物を作った。リファクタリングする
           [sente_player, gote_player].each do |player|
             next unless player.win?
 
-            TerminalOperator.print_winner(player.teban)
+            Terminal::Operator.print_winner(player)
             exit
           end
         end
@@ -52,6 +111,46 @@ module ConsoleShogi
 
     private
 
-    attr_reader :board, :sente_player, :gote_player
+    attr_reader :board, :sente_player, :gote_player, :selected_piece, :from_cursor, :teban_player, :previous_board, :previous_cursor_on_square
+
+    def change_teban!
+      @teban_player = teban_player == sente_player ? gote_player : sente_player
+    end
+
+    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
+    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
+    end
+
+    def focus_piece(cursor)
+      # TODO case で指定しないといけないのイケてないのでリファクタしたい
+      case cursor.squares_position.location
+      when :board
+        Terminal::Operator.focus_piece(location: board, cursor: cursor)
+      when :sente_komadai
+        Terminal::Operator.focus_piece(location: sente_player.komadai, cursor: cursor)
+      when :gote_komadai
+        Terminal::Operator.focus_piece(location: gote_player.komadai, cursor: cursor)
+      end
+    end
   end
 end

data/lib/console_shogi/komadai.rb

@@ -12,22 +12,16 @@ module ConsoleShogi
       @pieces = empty_pieces
     end
 
-    def expand!
-      @pieces = pieces.hstack(empty_pieces)
-    end
-
-    def have_space?
-      pieces.any?(&:none?)
-    end
-
     def fetch_piece(x:, y:)
       pieces[y, x]
     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
 
@@ -41,6 +35,14 @@ module ConsoleShogi
 
     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)

data/lib/console_shogi/new_board_builder.rb

@@ -3,41 +3,41 @@
 module ConsoleShogi
   class NewBoardBuilder
     class << self
-      def build(sente_player: , gote_player:)
+      def build
         Board.new(
           pieces: [
             [
-              Kyosha.new(player: gote_player),
-              Keima.new(player: gote_player),
-              Gin.new(player: gote_player),
-              Kin.new(player: gote_player),
-              Ohsho.new(player: gote_player),
-              Kin.new(player: gote_player),
-              Gin.new(player: gote_player),
-              Keima.new(player: gote_player),
-              Kyosha.new(player: gote_player)
+              Kyosha.new(teban: Teban::GOTE),
+              Keima.new(teban: Teban::GOTE),
+              Gin.new(teban: Teban::GOTE),
+              Kin.new(teban: Teban::GOTE),
+              Ohsho.new(teban: Teban::GOTE),
+              Kin.new(teban: Teban::GOTE),
+              Gin.new(teban: Teban::GOTE),
+              Keima.new(teban: Teban::GOTE),
+              Kyosha.new(teban: Teban::GOTE)
             ],
             [
               NonePiece.new,
-              Hisha.new(player: gote_player),
+              Hisha.new(teban: Teban::GOTE),
               NonePiece.new,
               NonePiece.new,
               NonePiece.new,
               NonePiece.new,
               NonePiece.new,
-              Kaku.new(player: gote_player),
+              Kaku.new(teban: Teban::GOTE),
               NonePiece.new
             ],
             [
-              Fu.new(player: gote_player),
-              Fu.new(player: gote_player),
-              Fu.new(player: gote_player),
-              Fu.new(player: gote_player),
-              Fu.new(player: gote_player),
-              Fu.new(player: gote_player),
-              Fu.new(player: gote_player),
-              Fu.new(player: gote_player),
-              Fu.new(player: gote_player)
+              Fu.new(teban: Teban::GOTE),
+              Fu.new(teban: Teban::GOTE),
+              Fu.new(teban: Teban::GOTE),
+              Fu.new(teban: Teban::GOTE),
+              Fu.new(teban: Teban::GOTE),
+              Fu.new(teban: Teban::GOTE),
+              Fu.new(teban: Teban::GOTE),
+              Fu.new(teban: Teban::GOTE),
+              Fu.new(teban: Teban::GOTE)
             ],
             [
               NonePiece.new,
@@ -73,37 +73,37 @@ module ConsoleShogi
               NonePiece.new
             ],
             [
-              Fu.new(player: sente_player),
-              Fu.new(player: sente_player),
-              Fu.new(player: sente_player),
-              Fu.new(player: sente_player),
-              Fu.new(player: sente_player),
-              Fu.new(player: sente_player),
-              Fu.new(player: sente_player),
-              Fu.new(player: sente_player),
-              Fu.new(player: sente_player)
+              Fu.new(teban: Teban::SENTE),
+              Fu.new(teban: Teban::SENTE),
+              Fu.new(teban: Teban::SENTE),
+              Fu.new(teban: Teban::SENTE),
+              Fu.new(teban: Teban::SENTE),
+              Fu.new(teban: Teban::SENTE),
+              Fu.new(teban: Teban::SENTE),
+              Fu.new(teban: Teban::SENTE),
+              Fu.new(teban: Teban::SENTE)
             ],
             [
               NonePiece.new,
-              Kaku.new(player: sente_player),
+              Kaku.new(teban: Teban::SENTE),
               NonePiece.new,
               NonePiece.new,
               NonePiece.new,
               NonePiece.new,
               NonePiece.new,
-              Hisha.new(player: sente_player),
+              Hisha.new(teban: Teban::SENTE),
               NonePiece.new
             ],
             [
-              Kyosha.new(player: sente_player),
-              Keima.new(player: sente_player),
-              Gin.new(player: sente_player),
-              Kin.new(player: sente_player),
-              Ohsho.new(player: sente_player),
-              Kin.new(player: sente_player),
-              Gin.new(player: sente_player),
-              Keima.new(player: sente_player),
-              Kyosha.new(player: sente_player)
+              Kyosha.new(teban: Teban::SENTE),
+              Keima.new(teban: Teban::SENTE),
+              Gin.new(teban: Teban::SENTE),
+              Kin.new(teban: Teban::SENTE),
+              Ohsho.new(teban: Teban::SENTE),
+              Kin.new(teban: Teban::SENTE),
+              Gin.new(teban: Teban::SENTE),
+              Keima.new(teban: Teban::SENTE),
+              Kyosha.new(teban: Teban::SENTE)
             ]
           ]
         )