rubygoal-core 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03ea48a45147ab75f1cf9fd801c276abbc18ac2a
-  data.tar.gz: 193e95c0fe4a59656a0b92fccd47e9135ec921e5
+  metadata.gz: fb4de14541b186717e8da427436883b6bcd61fa2
+  data.tar.gz: fd4e5f7cf4bf87f91bb599ff7561f74f15f8964d
 SHA512:
-  metadata.gz: f76d25a6e2111f584d054bcc47f4bac863dd2ebbbeb36a925c3a2d9154861e685c8745ef08560d53a23a8d6ce19be896ac735fc6e3f27ca8d0b0970c3dcb481b
-  data.tar.gz: 90184605c4bb9a2fe4c17c89251f524fa53ed5ce3626d0f905e27913119acba3732e2b974b4ba7cd43ceed88320c9e52d76a3b3f4cca817dd84ff10d74eb3b23
+  metadata.gz: a01c77f8b4f15ab8551ebcfd8c186eafd504bc3f583b2cfad35c3d00e96ef4772dfb828f718af8c7c400ea6ba3c08a4edde08feb0fad540294232f18892a4c0a
+  data.tar.gz: 711b27ec77a42df529a30b583be786483e1a6f1eb3b598ad5972049baa0a8b8f92a3cf7fbb453222680c23f78653cdc7a47d25932f045267909c8c9dddd913c3

data/lib/rubygoal/ball.rb

@@ -5,6 +5,7 @@ require 'rubygoal/moveable'
 module Rubygoal
   class Ball
     include Moveable
+    attr_reader :last_kicker
 
     def initialize
       super
@@ -15,15 +16,17 @@ module Rubygoal
       Field.goal?(position)
     end
 
-    def move(direction, speed)
+    def move(direction, speed, kicker)
       self.velocity = Velocity.new(
         Util.offset_x(direction, speed),
         Util.offset_y(direction, speed)
       )
+      self.last_kicker = kicker
     end
 
     def reinitialize_position
       self.position = Field.center_position
+      self.last_kicker = nil
     end
 
     def update(elapsed_time)
@@ -35,13 +38,11 @@ module Rubygoal
 
     private
 
+    attr_writer :last_kicker
+
     def prevent_out_of_bounds
-      if Field.out_of_bounds_width?(position)
-        velocity.x *= -1
-      end
-      if Field.out_of_bounds_height?(position)
-        velocity.y *= -1
-      end
+      velocity.x *= -1 if Field.out_of_bounds_width?(position)
+      velocity.y *= -1 if Field.out_of_bounds_height?(position)
     end
 
     def decelerate(elapsed_time)

data/lib/rubygoal/configuration.rb

@@ -7,7 +7,8 @@ module Rubygoal
                   :deceleration_coef, :initial_player_positions, :game_time,
                   :average_lower_error, :average_upper_error, :average_speed,
                   :fast_lower_error, :fast_upper_error, :fast_speed,
-                  :captain_error, :captain_speed, :debug_output, :record_game
+                  :captain_error, :captain_speed, :debug_output, :record_game,
+                  :record_last_kicker
   end
 
   class << self
@@ -45,5 +46,6 @@ module Rubygoal
     config.game_time             = 120
     config.debug_output          = true
     config.record_game           = false
+    config.record_last_kicker    = false
   end
 end

data/lib/rubygoal/player.rb

@@ -11,15 +11,16 @@ module Rubygoal
 
     include Moveable
 
-    attr_reader :side, :type
+    attr_reader :side, :type, :name
     attr_accessor :coach_defined_position
 
-    def initialize(game, side)
+    def initialize(game, side, name)
       super()
 
       @time_to_kick_again = 0
       @side = side
       @player_movement = PlayerMovement.new(game, self)
+      @name = name
     end
 
     def can_kick?(ball)
@@ -30,7 +31,7 @@ module Rubygoal
       direction = random_direction(target)
       strength = random_strength
 
-      ball.move(direction, strength)
+      ball.move(direction, strength, name: name, side: side)
       reset_waiting_to_kick!
     end
 

data/lib/rubygoal/recorder.rb

@@ -27,7 +27,7 @@ module Rubygoal
     attr_reader :game, :frames
 
     def frame_info
-      {
+      frame = {
         time: @game.time.round(0),
         score: [@game.score_home, @game.score_away],
         ball: [
@@ -37,6 +37,9 @@ module Rubygoal
         home: team_info(@game.team_home),
         away: team_info(@game.team_away)
       }
+      last_kicker_info(frame) if Rubygoal.configuration.record_last_kicker
+
+      frame
     end
 
     def team_info(team)
@@ -49,5 +52,14 @@ module Rubygoal
         ]
       end
     end
+
+    def last_kicker_info(frame)
+      if @game.ball.last_kicker
+        frame[:last_kicker] = [
+          @game.ball.last_kicker[:name],
+          @game.ball.last_kicker[:side]
+        ]
+      end
+    end
   end
 end

data/lib/rubygoal/team.rb

@@ -101,21 +101,21 @@ module Rubygoal
     end
 
     def initialize_players
-      @players = { goalkeeper: GoalKeeperPlayer.new(game, side) }
+      @players = { goalkeeper: GoalKeeperPlayer.new(game, side, :goalkeeper) }
 
       unless @coach.valid?
         puts @coach.errors
         raise "Invalid team definition: #{@coach.name}"
       end
 
-      @players[@coach.captain_player.name] = CaptainPlayer.new(game, side)
+      @players[@coach.captain_player.name] = CaptainPlayer.new(game, side, @coach.captain_player.name)
 
       @coach.players_by_type(:fast).each do |player_def|
-        @players[player_def.name] = FastPlayer.new(game, side)
+        @players[player_def.name] = FastPlayer.new(game, side, player_def.name)
       end
 
       @coach.players_by_type(:average).each do |player_def|
-        @players[player_def.name] = AveragePlayer.new(game, side)
+        @players[player_def.name] = AveragePlayer.new(game, side, player_def.name)
       end
 
       initialize_player_positions
@@ -140,12 +140,11 @@ module Rubygoal
       nearest_teammate = nil
 
       (players.values - [player]).each do |teammate|
-        if teammate_is_on_front?(player, teammate)
-          dist = player.distance(teammate.position)
-          if min_dist > dist
-            nearest_teammate = teammate
-            min_dist = dist
-          end
+        next unless teammate_is_on_front?(player, teammate)
+        dist = player.distance(teammate.position)
+        if min_dist > dist
+          nearest_teammate = teammate
+          min_dist = dist
         end
       end
 

data/lib/rubygoal/version.rb

@@ -1,3 +1,3 @@
 module Rubygoal
-  VERSION = Gem::Version.new '1.1.0'
+  VERSION = Gem::Version.new '1.2.0'
 end

data/test/player_test.rb

@@ -118,6 +118,20 @@ module Rubygoal
       assert_in_delta 20, velocity_strength, 1
     end
 
+    def test_kick_registered
+      assert_nil game.ball.last_kick
+
+      position = Position.new(100, 100)
+      game.ball.position = position
+      game.ball.velocity = Velocity.new(0, 0)
+      player.position = position
+
+      player.kick(game.ball, Position.new(300, 300))
+
+      assert_equal player.name, game.ball.last_kick[:name]
+      assert_equal player.side, game.ball.last_kick[:side]
+    end
+
     private
 
     attr_reader :game, :player

data/test/recorder_test.rb

@@ -108,6 +108,20 @@ module Rubygoal
       assert_in_delta 115, frames.last[:time], 0.001
     end
 
+    def test_recorded_frame_with_last_kick
+      Rubygoal.configuration.record_last_kicker = true
+      name, player = @game.team_home.players.first
+      player.position = @game.ball.position
+      player.kick(@game.ball, Position.new(100, 100))
+      @game.update
+
+      last_frame = recorder.to_hash[:frames].last
+
+      assert !last_frame[:last_kicker].nil?
+      assert_equal name, last_frame[:last_kicker][0]
+      assert_equal :home, last_frame[:last_kicker][1]
+    end
+
     private
 
     attr_reader :game, :recorder

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubygoal-core
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Jorge Bejar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-16 00:00:00.000000000 Z
+date: 2017-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -131,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Rubygoal core