software_challenge_client 21.1.0 → 21.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a08a78bd14dd02e33b72e6263f1b5f378490d29a3200d66b83664a6ee3eeeeb7
-  data.tar.gz: b5bb2bf9b10e457d9a3a187025435cdda90d7b6010a079f5c7587d0ae134fdec
+  metadata.gz: 679cfef66fc6ad4179d34801147b0640e79e2930c607069c3da6e52c5ff00862
+  data.tar.gz: bf3dc2f6e06ed94e72328b8babc4741faad2c0510e965f144dcd94b9a80c66ee
 SHA512:
-  metadata.gz: 99c7dfa3c94c0db8ff13448dc718502c15d98063c98a16ee8e9eb066a510f1405662a7b0e56d5323bc74e712f38690d3047fe096de192e387babd0318477aae2
-  data.tar.gz: 2f011d42e30b16f40827c1a3411ceae2923490291faf4cfe63a295dfce7bc606ed755c4b028639c9d8f09eec2b3fdebba82bb077233856c360f5686022fdcd63
+  metadata.gz: d99e60671de8a35ad5901c46c418bce5b49ab1ef91551cccc17284bbdf82272719a3049dac3338fcd660c48eea21bc2e2ad8262c3d6803da7eab5251e33664ee
+  data.tar.gz: 2ef1c173e01c84cfdc37cd882aea28e04af7151cad00276b1d4a8d4d3f26243fd0e2f8e01584dd6f007954715b2ac6af5fed961aeb5cc0c2982788df296456eb

data/RELEASES.md

@@ -1,3 +1,7 @@
+= 21.2.0
+
+Adjustments for Backend version 21.2.0
+
 = 21.1.0
 
 Pieces are now mutable and `==` of pieces considers rotated shapes which result in the same covered board fields as equal.

data/lib/software_challenge_client/game_rule_logic.rb

@@ -195,31 +195,30 @@ class GameRuleLogic
   #
   # @return ob der Zug zulässig ist
   def self.valid_set_move?(gamestate, move)
-    # Check whether the color's move is currently active
     return false if move.piece.color != gamestate.current_color
 
-    # Check whether the shape is valid
     if gamestate.is_first_move?
+      # on first turn, only the start piece is allowed
       return false if move.piece.kind != gamestate.start_piece
-    elsif !gamestate.undeployed_pieces(move.piece.color).include?(move.piece.kind)
-      return false
+      # and it may only be placed in a corner
+      return false if move.piece.coords.none? { |it| corner?(it) }
+    else
+      # in all other turns, only unused pieces may be placed
+      return false unless gamestate.undeployed_pieces(move.piece.color).include?(move.piece.kind)
+      # and it needs to be connected to another piece of the same color
+      return false if move.piece.coords.none? { |it| corners_on_color?(gamestate.board, it, move.piece.color) }
     end
 
-    # Check whether the piece can be placed
+    # all parts of the piece need to be
     move.piece.coords.each do |it|
+      # - on the board
       return false unless gamestate.board.in_bounds?(it)
+      # - on a empty field
       return false if obstructed?(gamestate.board, it)
+      # - not next to a field occupied by the same color
       return false if borders_on_color?(gamestate.board, it, move.piece.color)
     end
 
-    if gamestate.is_first_move?
-      # Check if it is placed correctly in a corner
-      return false if move.piece.coords.none? { |it| corner?(it) }
-    else
-      # Check if the piece is connected to at least one tile of same color by corner
-      return false if move.piece.coords.none? { |it| corners_on_color?(gamestate.board, it, move.piece.color) }
-    end
-
     true
   end
 
@@ -276,7 +275,6 @@ class GameRuleLogic
 
     if move.instance_of? SetMove
       gamestate.undeployed_pieces(move.piece.color).delete(move.piece)
-      # gamestate.deployed_pieces(move.piece.color).add(move.piece)
 
       # Apply piece to board
       move.piece.coords.each do |coord|

data/lib/software_challenge_client/game_state.rb

@@ -14,6 +14,7 @@ class GameState
   # @!attribute [rw] turn
   # @return [Integer] Aktuelle Zugnummer (von 0 beginnend)
   attr_accessor :turn
+
   # @!attribute [rw] round
   # @return [Integer] Aktuelle Rundennummer (von 1 beginnend)
   attr_accessor :round
@@ -21,11 +22,14 @@ class GameState
   # @!attribute [rw] startColor
   # @return [Color] Die Farbe, die zuerst legen darf
   attr_accessor :start_color
-  # @!attribute [rw] current_color_index
-  # @return [Color] Der jetzige Index in der Zug Reihenfolge der Farben.
-  attr_accessor :current_color_index
+
+  # @!attribute [rw] valid_colors
+  # @return [Array<Color>] Ein Array aller Farben die ziehen können in
+  #                        der Reihenfolge in der sie drankommen
+  attr_accessor :valid_colors
+
   # @!attribute [rw] ordered_colors
-  # @return [Array<Color>] Ein Array aller Farben die ziehen können in 
+  # @return [Array<Color>] Ein Array aller Farben in
   #                        der Reihenfolge in der sie drankommen
   attr_accessor :ordered_colors
 
@@ -48,19 +52,24 @@ class GameState
   # @!attribute [r] player_one
   # @return [Player] Der erste Spieler
   attr_reader :player_one
+
   # @!attribute [r] player_two
   # @return [Player] Der zweite Spieler
   attr_reader :player_two
+
   # @!attribute [rw] board
   # @return [Board] Das aktuelle Spielbrett
   attr_accessor :board
+
   # @!attribute [rw] startPiece
   # @return [PieceShape] Der Stein, der im ersten Zug von allen Farben gelegt werden muss
   attr_accessor :start_piece
+
   # @!attribute [rw] last_move
   # @return [Move] Der zuletzt gemachte Zug (ist nil vor dem ersten Zug, also
   #                bei turn == 0)
   attr_accessor :last_move
+
   # @!attribute [rw] condition
   # @return [Condition] Gewinner und Gewinngrund, falls das Spiel bereits
   #                     entschieden ist, sonst nil.
@@ -73,8 +82,7 @@ class GameState
 
   # Erstellt einen neuen leeren Spielstand.
   def initialize
-    @current_color = Color::RED
-    @start_color = Color::RED
+    @ordered_colors = [Color::BLUE, Color::YELLOW, Color::RED, Color::GREEN]
     @board = Board.new
     @turn = 0
     @undeployed_blue_pieces = PieceShape.to_a
@@ -82,27 +90,29 @@ class GameState
     @undeployed_red_pieces = PieceShape.to_a
     @undeployed_green_pieces = PieceShape.to_a
     @start_piece = GameRuleLogic.get_random_pentomino
+    @start_color = Color::BLUE
   end
 
   # Fügt einen Spieler zum Spielzustand hinzu.
   #
   # @param player [Player] Der hinzuzufügende Spieler.
   def add_player(player)
-    if player.type == PlayerType::ONE
+    case player.type
+    when PlayerType::ONE
       @player_one = player
-    elsif player.type == PlayerType::TWO
+    when PlayerType::TWO
       @player_two = player
     end
   end
 
   # @return [Player] Spieler, der gerade an der Reihe ist.
   def current_player
-    turn % 2 == 0 ? player_one : player_two
+    turn.even? ? player_one : player_two
   end
 
   # @return [Player] Spieler, der gerade nicht an der Reihe ist.
   def other_player
-    turn % 2 == 0 ? player_two : player_one
+    turn.even? ? player_two : player_one
   end
 
   # @return [PlayerType] Typ des Spielers, der gerade nicht an der Reihe ist.
@@ -110,11 +120,21 @@ class GameState
     other_player.type
   end
 
+  # @return [Color] Der jetzige Index in der Zug Reihenfolge der Farben.
+  def current_color_index
+    turn % 4
+  end
+
   # @return [Color] Farbe, der gerade an der Reihe ist.
   def current_color
     ordered_colors[current_color_index]
   end
 
+  # @return [Color] Farbe des aktuellen Spielers, die gerade nicht an der Reihe ist.
+  def other_color
+    Color.find_by_ord((current_color.ord + 2) % 4)
+  end
+
   # @return [Array<PieceShape>] Array aller Shapes, der gegebenen Farbe, die noch nicht gelegt wurden
   def undeployed_pieces(color)
     case color
@@ -153,7 +173,7 @@ class GameState
     !condition.nil?
   end
 
-  # Entfernt die jetzige Farbe aus der Farbrotation 
+  # Entfernt die jetzige Farbe aus der Farbrotation
   def remove_active_color
     ordered_colors.delete current_color
   end

data/lib/software_challenge_client/piece.rb

@@ -22,6 +22,8 @@ class Piece
   # @return [Coordinates]
   attr_reader :position
 
+  # @!attribute [r] Ein Array der Positionsdaten aller Bestandteile von dem Stein in Board Koordinaten, also schon ggf. gedreht und um position versetzt.
+  # return [Array<Coordinates>]
   attr_reader :coords
 
   # Erstellt einen neuen leeren Spielstein.
@@ -59,6 +61,11 @@ class Piece
     @coords = coords_priv
   end
 
+  # Gibt die Fläche der transformierten Steinform von diesem Stein zurück
+  def area()
+    CoordinateSet.new(coords).area
+  end
+
   def ==(other)
     color == other.color &&
       coords == other.coords

data/lib/software_challenge_client/protocol.rb

@@ -62,8 +62,8 @@ class Protocol
     when 'board'
       logger.debug @gamestate.board.to_s
     when 'color'
-      if @context[:color] == :ordered_colors
-        @gamestate.ordered_colors << Color.to_a.find {|s| s.key == @context[:last_text].to_sym }
+      if @context[:color] == :valid_colors
+        @gamestate.valid_colors << Color.to_a.find {|s| s.key == @context[:last_text].to_sym }
       end
     when 'shape'
       case @context[:piece_target] 
@@ -116,7 +116,6 @@ class Protocol
     when 'state'
       logger.debug 'new gamestate'
       @gamestate = GameState.new
-      @gamestate.current_color_index = attrs['currentColorIndex'].to_i
       @gamestate.turn = attrs['turn'].to_i
       @gamestate.round = attrs['round'].to_i
       @gamestate.start_piece = PieceShape.to_a.find {|s| s.key == attrs['startPiece'].to_sym }
@@ -133,9 +132,9 @@ class Protocol
       @gamestate.add_player(player)
       @context[:player] = player
       @context[:color] = :two
-    when 'orderedColors'
-      @context[:color] = :ordered_colors
-      @gamestate.ordered_colors = []
+    when 'validColors'
+      @context[:color] = :valid_colors
+      @gamestate.valid_colors = []
     when 'board'
       logger.debug 'new board'
       @gamestate.board = Board.new()

data/lib/software_challenge_client/version.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
 # frozen_string_literal: true
 module SoftwareChallengeClient
-  VERSION = '21.1.0'
+  VERSION = '21.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: software_challenge_client
 version: !ruby/object:Gem::Version
-  version: 21.1.0
+  version: 21.2.0
 platform: ruby
 authors:
 - 'kwollw '
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-03 00:00:00.000000000 Z
+date: 2020-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder