software_challenge_client 19.1.0 → 20.2.0

data/lib/software_challenge_client/game_state.rb

@@ -4,9 +4,7 @@
 require_relative './util/constants'
 require_relative 'player'
 require_relative 'board'
-require_relative 'move'
 require_relative 'condition'
-require_relative 'field_type'
 
 # Ein Spielzustand. Wird vom Server an die Computerspieler übermittelt und
 # enthält alles, was der Computerspieler wissen muss, um einen Zug zu machen.
@@ -25,6 +23,15 @@ class GameState
   # @return [PlayerColor] Die Farbe des Spielers, der den nächsten Zug machen
   #                       darf, der also gerade an der Reihe ist.
   attr_accessor :current_player_color
+
+  # @!attribute [r] undeployed_red_pieces
+  # @return [Player] Die nicht gesetzten Spielsteine des roten Spielers
+  attr_accessor :undeployed_red_pieces
+
+  # @!attribute [r] undeployed_blue_pieces
+  # @return [Player] Die nicht gesetzten Spielsteine des roten Spielers
+  attr_accessor :undeployed_blue_pieces
+
   # @!attribute [r] red
   # @return [Player] Der rote Spieler
   attr_reader :red
@@ -47,13 +54,30 @@ class GameState
   def field(x, y)
     board.field(x, y)
   end
+  def self.parse_pieces_string(string, color)
+    string.chars.map do |c|
+      case c
+      when 'Q'
+        Piece.new(color, PieceType::BEE)
+      when 'S'
+        Piece.new(color, PieceType::SPIDER)
+      when 'G'
+        Piece.new(color, PieceType::GRASSHOPPER)
+      when 'B'
+        Piece.new(color, PieceType::BEETLE)
+      when 'A'
+        Piece.new(color, PieceType::ANT)
+      end
+    end
+  end
 
-  # Erstellt einen neuen Spielzustand.
   def initialize
     @current_player_color = PlayerColor::RED
     @start_player_color = PlayerColor::RED
     @board = Board.new
     @turn = 0
+    @undeployed_red_pieces = GameState.parse_pieces_string(Constants::STARTING_PIECES, PlayerColor::RED)
+    @undeployed_blue_pieces = GameState.parse_pieces_string(Constants::STARTING_PIECES, PlayerColor::BLUE)
   end
 
   # Fügt einen Spieler zum Spielzustand hinzu.
@@ -89,6 +113,19 @@ class GameState
     turn / 2
   end
 
+  def undeployed_pieces(color)
+    case color
+    when PlayerColor::RED
+      undeployed_red_pieces
+    when PlayerColor::BLUE
+      undeployed_blue_pieces
+    end
+  end
+
+  def deployed_pieces(color)
+    board.deployed_pieces(color)
+  end
+
   # Führt einen Zug auf dem Spielzustand aus. Das Spielbrett wird entsprechend
   # modifiziert.
   #
@@ -122,7 +159,8 @@ class GameState
   # @return [Integer] Die Punkte des Spielers, entspricht der Anzahl der Fische
   #                   im größten Schwarm des Spielers.
   def points_for_player(player)
-    GameRuleLogic.swarm_size(board, player)
+    # TODO
+    -1
   end
 
   def ==(other)
@@ -139,7 +177,7 @@ class GameState
   # Erzeugt eine Kopie des Spielzustandes. Änderungen an dieser Kopie
   # beeinflussen den originalen Spielzustand nicht. Die Kopie kann also zum
   # testen von Spielzügen genutzt werden.
-  def deep_clone
+  def clone
     Marshal.load(Marshal.dump(self))
   end
 
@@ -150,16 +188,7 @@ class GameState
 
   # @return [Array<Field>] Alle Felder mit Fischen des Spielers, der gerade an der Reihe ist.
   def own_fields
-    board.fields_of_type(
-      PlayerColor.field_type(current_player_color)
-    )
-  end
-
-  # @return [Array<Move>] Alle regelkonformen Züge, die der aktuelle Spieler gerade machen könnte.
-  def possible_moves
-    own_fields.map do |f|
-      GameRuleLogic.possible_moves(board, f, current_player_color)
-    end.flatten
+    board.fields_of_color(current_player_color)
   end
 
 end

data/lib/software_challenge_client/has_hints.rb

@@ -0,0 +1,11 @@
+module HasHints
+
+  # @!attribute [r] hints
+  # @return [Array<DebugHint>] Hinweise, die an den Zug angeheftet werden sollen. Siehe {DebugHint}.
+  attr_reader :hints
+
+  # @param hint [DebugHint]
+  def add_hint(hint)
+    @hints.push(hint)
+  end
+end

data/lib/software_challenge_client/invalid_move_exception.rb

@@ -1,14 +1,14 @@
 # encoding: utf-8
 
 # Exception, die geworfen wird, wenn ein ungültiger Zug ausgeführt wird.
-# @see Move#perform!
+# @see GameRuleLogic#perform_move
 class InvalidMoveException < StandardError
   def initialize(msg, move)
     @move = move
     super(msg)
   end
 
-  def message
+  def to_s
     "#{super}: #{@move}"
   end
 end

data/lib/software_challenge_client/network.rb

@@ -68,14 +68,12 @@ class Network
     sock_msg = ''
 
     line = ''
-    logger.debug 'reading'
     @socket.each_char do |char|
       line += char
       sock_msg += char
       line = '' if ['\n', ' '].include? char
       break if ['</room>', '</protocol>'].include? line
     end
-    logger.debug 'ended reading'
     if sock_msg != ''
       @receive_buffer.concat(sock_msg)
 

data/lib/software_challenge_client/piece.rb

@@ -0,0 +1,31 @@
+class Piece
+
+  # @!attribute [r] type
+  # @return [PieceType]
+  attr_reader :type
+
+  # @!attribute [r] color
+  # @return [PlayerColor]
+  attr_reader :color
+
+  def initialize(color, type)
+    @type = type
+    @color = color
+  end
+
+  def ==(other)
+    type == other.type && color == other.color
+  end
+
+  def owner
+    color
+  end
+
+  def to_s
+    color.value + type.value
+  end
+
+  def inspect
+    to_s
+  end
+end

data/lib/software_challenge_client/piece_type.rb

@@ -0,0 +1,18 @@
+# encoding: utf-8
+
+require 'typesafe_enum'
+# Der Typ eines Spielsteins. Es gibt folgende Typen:
+# - BEE
+# - BEETLE
+# - GRASSHOPPER
+# - SPIDER
+# - ANT
+#
+# Zugriff z.B. mit PieceType::BEE
+class PieceType < TypesafeEnum::Base
+  new :BEE, 'Q'
+  new :BEETLE, 'B'
+  new :GRASSHOPPER, 'G'
+  new :SPIDER, 'S'
+  new :ANT, 'A'
+end

data/lib/software_challenge_client/player_color.rb

@@ -2,11 +2,10 @@
 # player color constants
 require 'typesafe_enum'
 
-# Die Spielerfarben. RED, BLUE oder NONE.
+# Die Spielerfarben. RED oder BLUE
 class PlayerColor < TypesafeEnum::Base
-  new :NONE
-  new :RED
-  new :BLUE
+  new :RED, 'R'
+  new :BLUE, 'B'
 
   # @param color [PlayerColor]
   # @return [PlayerColor] Farbe des Gegenspielers
@@ -16,20 +15,11 @@ class PlayerColor < TypesafeEnum::Base
       PlayerColor::BLUE
     when PlayerColor::BLUE
       PlayerColor::RED
-    when PlayerColor::NONE
-      PlayerColor::NONE
     end
   end
 
-  # @param color [PlayerColor] Die Spielerfarbe, zu dem der Feldtyp ermittelt werden soll.
-  # @return [FieldType] Der zur Spielerfarbe gehörende Feldtyp, also FieldType::RED für PlayerColor::RED und FieldType::BLUE für PlayerColor::BLUE. In allen anderen Fällen nil.
-  # @see FieldType#player_color
-  def self.field_type(color)
-    case color
-    when PlayerColor::RED
-      FieldType::RED
-    when PlayerColor::BLUE
-      FieldType::BLUE
-    end
+  def opponent
+    PlayerColor.opponent_color(self)
   end
+
 end

data/lib/software_challenge_client/protocol.rb

@@ -2,7 +2,9 @@
 # frozen_string_literal: true
 require 'socket'
 require_relative 'board'
-require_relative 'move'
+require_relative 'set_move'
+require_relative 'drag_move'
+require_relative 'skip_move'
 require_relative 'player'
 require_relative 'network'
 require_relative 'client_interface'
@@ -40,7 +42,12 @@ class Protocol
   # @param text [String] the xml-string that will be parsed
   def process_string(text)
     logger.debug "Parse XML:\n#{text}\n----END XML"
-    REXML::Document.parse_stream(text, self)
+    begin
+      REXML::Document.parse_stream(text, self)
+    rescue REXML::ParseException => e
+      # to parse incomplete xml, ignore missing end tag exceptions
+      raise e unless e.message =~ /Missing end tag/
+    end
   end
 
 
@@ -113,29 +120,68 @@ class Protocol
     when 'board'
       logger.debug 'new board'
       @gamestate.board = Board.new
-      @context[:current_tile_index] = nil
-      @context[:current_tile_direction] = nil
     when 'field'
-      type = FieldType.find_by_key(attrs['state'].to_sym)
       x = attrs['x'].to_i
       y = attrs['y'].to_i
-      raise "unexpected field type: #{attrs['type']}. Known types are #{FieldType.map { |t| t.key.to_s }}" if type.nil?
-      @gamestate.board.add_field(Field.new(x, y, type))
+      obstructed = attrs['isObstructed'] == 'true'
+      field = Field.new(x, y, [], obstructed)
+      @gamestate.board.add_field(field)
+      @context[:piece_target] = :field
+      @context[:field] = field
+    when 'piece'
+      owner = PlayerColor.find_by_key(attrs['owner'].to_sym)
+      type = PieceType.find_by_key(attrs['type'].to_sym)
+      piece = Piece.new(owner, type)
+      case @context[:piece_target]
+      when :field
+        @context[:field].add_piece(piece)
+      when :undeployed_red_pieces
+        @gamestate.undeployed_red_pieces << piece
+      when :undeployed_blue_pieces
+        @gamestate.undeployed_blue_pieces << piece
+      when :last_move
+        @context[:last_move_piece] = piece
+      else
+        raise "unknown piece target #{@context[:piece_target]}"
+      end
+    when 'undeployedRedPieces'
+      @context[:piece_target] = :undeployed_red_pieces
+      @gamestate.undeployed_red_pieces = []
+    when 'undeployedBluePieces'
+      @context[:piece_target] = :undeployed_blue_pieces
+      @gamestate.undeployed_blue_pieces = []
     when 'lastMove'
-      direction = Direction.find_by_key(attrs['direction'].to_sym)
-      x = attrs['x'].to_i
-      y = attrs['y'].to_i
-      raise "unexpected direction: #{attrs['direction']}. Known directions are #{Direction.map { |d| d.key.to_s }}" if direction.nil?
-      @gamestate.last_move = Move.new(x, y, direction)
+      type = attrs['class']
+      if type == 'skipmove'
+        @gamestate.last_move = SkipMove.new
+      else
+        @context[:last_move_type] = type
+        @context[:piece_target] = :last_move
+      end
+    when 'start'
+      @context[:last_move_start] = CubeCoordinates.new(attrs['x'].to_i, attrs['y'].to_i, attrs['z'].to_i)
+    when 'destination'
+      destination = CubeCoordinates.new(attrs['x'].to_i, attrs['y'].to_i, attrs['z'].to_i)
+      case @context[:last_move_type]
+      when 'setmove'
+        @gamestate.last_move = SetMove.new(@context[:last_move_piece], destination)
+      when 'dragmove'
+        @gamestate.last_move = SetMove.new(@context[:last_move_start], destination)
+      end
     when 'winner'
-      winning_player = parsePlayer(attrs)
-      @gamestate.condition = Condition.new(winning_player, @gamestate.condition.reason)
+    # TODO
+      #winning_player = parsePlayer(attrs)
+      #@gamestate.condition = Condition.new(winning_player, @gamestate.condition.reason)
     when 'score'
+      # TODO
       # there are two score tags in the result, but reason attribute should be equal on both
-      @gamestate.condition = Condition.new(@gamestate.condition.winner, attrs['reason'])
+      #@gamestate.condition = Condition.new(@gamestate.condition.winner, attrs['reason'])
     when 'left'
       logger.debug 'got left event, terminating'
       @network.disconnect
+    when 'sc.protocol.responses.CloseConnection'
+      logger.debug 'got left close connection event, terminating'
+      @network.disconnect
     end
   end
 
@@ -180,9 +226,31 @@ class Protocol
     # class interface to supply a method which returns the XML
     # because XML-generation should be decoupled from internal data
     # structures.
-    builder.data(class: 'move', x: move.x, y: move.y, direction: move.direction.key) do |data|
-      move.hints.each do |hint|
-        data.hint(content: hint.content)
+    case move
+    when SetMove
+      builder.data(class: 'setmove') do |data|
+        data.piece(owner: move.piece.owner.key, type: move.piece.type.key)
+        d = move.destination
+        data.destination(x: d.x, y: d.y, z: d.z)
+        move.hints.each do |hint|
+          data.hint(content: hint.content)
+        end
+      end
+    when DragMove
+      builder.data(class: 'dragmove') do |data|
+        s = move.start
+        data.start(x: s.x, y: s.y, z: s.z)
+        d = move.destination
+        data.destination(x: d.x, y: d.y, z: d.z)
+        move.hints.each do |hint|
+          data.hint(content: hint.content)
+        end
+      end
+    when SkipMove
+      builder.data(class: 'skipmove') do |data|
+        move.hints.each do |hint|
+          data.hint(content: hint.content)
+        end
       end
     end
     builder.target!

data/lib/software_challenge_client/set_move.rb

@@ -0,0 +1,15 @@
+require_relative 'has_hints'
+
+class SetMove
+
+  include HasHints
+
+  attr_reader :piece
+  attr_reader :destination
+
+  def initialize(piece, destination)
+    @piece = piece
+    @destination = destination
+    @hints = []
+  end
+end

data/lib/software_challenge_client/skip_move.rb

@@ -0,0 +1,8 @@
+require_relative 'has_hints'
+class SkipMove
+  include HasHints
+
+  def initialize
+    @hints = []
+  end
+end

data/lib/software_challenge_client/util/constants.rb

@@ -4,6 +4,8 @@
 # Konstanten zum aktuellen Spiel.
 module Constants
   ROUND_LIMIT = 30 # Rundenbegrenzung. Nach Ende der angegebenen Runde endet auch das Spiel.
-  SIZE = 10 # Die Größe des Spielbrettes (Breite und Höhe in Feldern).
-  GAME_IDENTIFIER = 'swc_2019_piranhas' # Der Identifikator des Spiels. Für die Kommunikation mit dem Spielserver.
+  GAME_IDENTIFIER = 'swc_2020_hive' # Der Identifikator des Spiels. Für die Kommunikation mit dem Spielserver.
+  STARTING_PIECES = 'QSSSGGBBAAA'
+  BOARD_SIZE = 11
+  SHIFT = ((BOARD_SIZE - 1) / 2)
 end

data/lib/software_challenge_client/version.rb

@@ -1,4 +1,4 @@
 # encoding: UTF-8
 module SoftwareChallengeClient
-  VERSION = "19.1.0"
+  VERSION = "20.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: software_challenge_client
 version: !ruby/object:Gem::Version
-  version: 19.1.0
+  version: 20.2.0
 platform: ruby
 authors:
 - 'kwollw '
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-20 00:00:00.000000000 Z
+date: 2019-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typesafe_enum
@@ -249,6 +249,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".ruby-version"
+- ".stickler.yml"
 - AUTHORS
 - CODE_OF_CONDUCT.md
 - Dockerfile
@@ -268,23 +269,26 @@ files:
 - lib/software_challenge_client/board.rb
 - lib/software_challenge_client/client_interface.rb
 - lib/software_challenge_client/condition.rb
-- lib/software_challenge_client/coordinates.rb
+- lib/software_challenge_client/cube_coordinates.rb
 - lib/software_challenge_client/debug_hint.rb
 - lib/software_challenge_client/direction.rb
+- lib/software_challenge_client/drag_move.rb
 - lib/software_challenge_client/field.rb
-- lib/software_challenge_client/field_type.rb
 - lib/software_challenge_client/game_rule_logic.rb
 - lib/software_challenge_client/game_state.rb
+- lib/software_challenge_client/has_hints.rb
 - lib/software_challenge_client/invalid_move_exception.rb
-- lib/software_challenge_client/line.rb
 - lib/software_challenge_client/line_direction.rb
 - lib/software_challenge_client/logging.rb
-- lib/software_challenge_client/move.rb
 - lib/software_challenge_client/network.rb
+- lib/software_challenge_client/piece.rb
+- lib/software_challenge_client/piece_type.rb
 - lib/software_challenge_client/player.rb
 - lib/software_challenge_client/player_color.rb
 - lib/software_challenge_client/protocol.rb
 - lib/software_challenge_client/runner.rb
+- lib/software_challenge_client/set_move.rb
+- lib/software_challenge_client/skip_move.rb
 - lib/software_challenge_client/util/constants.rb
 - lib/software_challenge_client/version.rb
 - release.sh
@@ -307,11 +311,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: This gem provides functions to build a client for the coding competition
   Software-Challenge 2017.
 test_files: []
-has_rdoc: