just_shogi 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: baa8a0c184b06f45745883501e31f89fb32382be0872a211f807cd92380c1910
-  data.tar.gz: 00d2bc98222f9a525535e51e25e17266bd65e0caee4546ed7a4171f471129113
+  metadata.gz: d31c70ff7ceddc45ee52b52d8538a37ac9b67abf63a5e8762a5b998ba4d7b9a1
+  data.tar.gz: 821eb7578d342a5333e710cf880eeffc501f3aa65772d870ab4461413d9b3398
 SHA512:
-  metadata.gz: 1bf5d7b03cb04995be193b191bf68e0e6302301e49c7fb5a4848b274c467b5e4384bd43c1ab74d107dc22168a03714beecca67f16cff0b413c2f8aa5bd107aa1
-  data.tar.gz: 4d2e75eeea5e9b124754cb0048a8fcff35920430ed1c84588340a1abcf462982321ea6d71cac4ec8015cd3c533bb523e48c47c19250b5a7bdb54e8e699ef1265
+  metadata.gz: 87f590e5099ee1914c6bfbd18901123df1a8b2cdb900ab0b139d1cb02d4562bccf16e39b931c639db8f0643ba6793f64aef1682cd98aa36e5890cf53e14d08d7
+  data.tar.gz: eb920e2eabf17564f29bb2dd25ce5663d6af76e82bd74f31299f76ad7bb45542f50e568156d8bb5b021ffd62f7dbd27dfacc5baba97e552b81913e4161a87f65

data/.gitignore

@@ -6,3 +6,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+*.swp

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    just_shogi (0.1.0)
+    just_shogi (0.1.1)
       board_game_grid (~> 0.1.6)
 
 GEM

data/lib/just_shogi/errors/no_legal_moves_error.rb

@@ -0,0 +1,22 @@
+require 'just_shogi/errors/error'
+
+module JustShogi
+
+  # = NoLegalMovesError 
+  #
+  # A no legal moves error with a message
+  class NoLegalMovesError < Error
+
+    # New no legal moves errors can be instantiated with
+    #
+    # @option [String] message
+    #   the message to display.
+    #
+    # ==== Example:
+    #   # Instantiates a new NoLegalMovesError 
+    #   JustShogi::NoLegalMovesError.new("Custom Message")
+    def initialize(message="Piece cannot move from that square.")
+      super
+    end
+  end
+end

data/lib/just_shogi/errors/square_occupied_error.rb

@@ -7,7 +7,7 @@ module JustShogi
   # A square occupied error with a message
   class SquareOccupiedError < Error
 
-    # New invalid promotion errors can be instantiated with
+    # New square occupied errors can be instantiated with
     #
     # @option [String] message
     #   the message to display.

data/lib/just_shogi/errors/two_fuhyou_in_file_error.rb

@@ -0,0 +1,22 @@
+require 'just_shogi/errors/error'
+
+module JustShogi
+
+  # = TwoFuhyouInFileError 
+  #
+  # A two fuhyou in file error with a message
+  class TwoFuhyouInFileError < Error
+
+    # New two fuhyou in file errors can be instantiated with
+    #
+    # @option [String] message
+    #   the message to display.
+    #
+    # ==== Example:
+    #   # Instantiates a new TwoFuhyouInFileError 
+    #   JustShogi::TwoFuhyouInFileError.new("Custom Message")
+    def initialize(message="Cannot place two fuhyou in the same file.")
+      super
+    end
+  end
+end

data/lib/just_shogi/game_state.rb

@@ -6,10 +6,13 @@ require 'just_shogi/errors/moved_into_check_error'
 require 'just_shogi/errors/invalid_promotion_error'
 require 'just_shogi/errors/piece_not_found_error'
 require 'just_shogi/errors/square_occupied_error'
+require 'just_shogi/errors/no_legal_moves_error'
+require 'just_shogi/errors/two_fuhyou_in_file_error'
 require 'just_shogi/errors/dropped_into_check_error'
 require 'just_shogi/square_set'
 require 'just_shogi/hand'
 require 'just_shogi/promotion_factory'
+require 'just_shogi/pieces/fuhyou'
 
 module JustShogi
 
@@ -228,6 +231,10 @@ module JustShogi
         @errors.push JustShogi::OffBoardError.new
       elsif square.occupied?
         @errors.push JustShogi::SquareOccupiedError.new
+      elsif !piece.has_legal_moves_from_y(square.y)
+        @errors.push JustShogi::NoLegalMovesError.new
+      elsif squares.where(x: square.x).occupied_by_piece(JustShogi::Fuhyou).occupied_by_player(player_number).any?
+        @errors.push JustShogi::TwoFuhyouInFileError.new
       else
         duplicate = self.clone
         duplicate.perform_complete_drop(player_number, piece_id, square_id)

data/lib/just_shogi/pieces/fuhyou.rb

@@ -19,5 +19,13 @@ module JustShogi
     def destinations(square, game_state)
       game_state.squares.in_range(square, 1).in_direction(square, forwards_direction).orthogonal(square).unoccupied_or_occupied_by_opponent(player_number).unblocked(square, game_state.squares)
     end
+
+    def has_legal_moves_from_y(y)
+      if player_number == 1
+        y != 0
+      else
+        y != 8
+      end
+    end
   end
 end

data/lib/just_shogi/pieces/keima.rb

@@ -19,5 +19,13 @@ module JustShogi
     def destinations(square, game_state)
       game_state.squares.in_direction(square, forwards_direction).ranks_away(square, 2).files_away(square, 1).unoccupied_or_occupied_by_opponent(player_number)
     end
+
+    def has_legal_moves_from_y(y)
+      if player_number == 1
+        y > 1
+      else
+        y < 7
+      end
+    end
   end
 end

data/lib/just_shogi/pieces/kyousha.rb

@@ -19,5 +19,13 @@ module JustShogi
     def destinations(square, game_state)
       game_state.squares.orthogonal(square).in_direction(square, forwards_direction).unoccupied_or_occupied_by_opponent(player_number).unblocked(square, game_state.squares)
     end
+
+    def has_legal_moves_from_y(y)
+      if player_number == 1
+        y != 0
+      else
+        y != 8
+      end
+    end
   end
 end

data/lib/just_shogi/pieces/piece.rb

@@ -14,5 +14,9 @@ module JustShogi
     def switch_player
       @player_number = opponent
     end
+
+    def has_legal_moves_from_y(_)
+      true 
+    end
   end
 end

data/lib/just_shogi/version.rb

@@ -1,3 +1,3 @@
 module JustShogi
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: just_shogi
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Mark Humphreys
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-20 00:00:00.000000000 Z
+date: 2020-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -91,11 +91,13 @@ files:
 - lib/just_shogi/errors/invalid_move_error.rb
 - lib/just_shogi/errors/invalid_promotion_error.rb
 - lib/just_shogi/errors/moved_into_check_error.rb
+- lib/just_shogi/errors/no_legal_moves_error.rb
 - lib/just_shogi/errors/no_piece_error.rb
 - lib/just_shogi/errors/not_players_turn_error.rb
 - lib/just_shogi/errors/off_board_error.rb
 - lib/just_shogi/errors/piece_not_found_error.rb
 - lib/just_shogi/errors/square_occupied_error.rb
+- lib/just_shogi/errors/two_fuhyou_in_file_error.rb
 - lib/just_shogi/game_state.rb
 - lib/just_shogi/hand.rb
 - lib/just_shogi/piece_factory.rb