rubygoal 2.0.0 → 2.1.0

data/lib/rubygoal/recorder.rb

@@ -0,0 +1,53 @@
+require 'rubygoal/game'
+
+module Rubygoal
+  class Recorder
+    def initialize(game)
+      @game   = game
+      @frames = []
+    end
+
+    def update
+      @frames << frame_info
+    end
+
+    def to_hash
+      {
+        teams: {
+          home: @game.coach_home.name,
+          away: @game.coach_away.name
+        },
+        score: [@game.score_home, @game.score_away],
+        frames: @frames
+      }
+    end
+
+    private
+
+    attr_reader :game, :frames
+
+    def frame_info
+      {
+        time: @game.time.round(0),
+        score: [@game.score_home, @game.score_away],
+        ball: [
+          @game.ball.position.x.round(0),
+          @game.ball.position.y.round(0)
+        ],
+        home: team_info(@game.team_home),
+        away: team_info(@game.team_away)
+      }
+    end
+
+    def team_info(team)
+      team.players.map do |_, player|
+        [
+          player.position.x.round(0),
+          player.position.y.round(0),
+          player.rotation.round(0),
+          player.type[0]
+        ]
+      end
+    end
+  end
+end

data/lib/rubygoal/simulator.rb

@@ -0,0 +1,33 @@
+require 'timecop'
+require 'json'
+require 'rubygoal/game'
+
+module Rubygoal
+  class Simulator
+    extend Forwardable
+    def_delegators :game, :recorded_game
+
+    def initialize
+      Rubygoal.configuration.record_game = true
+      @game = Rubygoal::Game.new(load_coach(:home), load_coach(:away))
+    end
+
+    def simulate
+      time = Time.now
+
+      while !game.ended? do
+        game.update
+        time += 1.0 / 60.0
+        Timecop.travel(time)
+      end
+    end
+
+    private
+
+    attr_reader :game
+
+    def load_coach(side)
+      CoachLoader.new(side).coach
+    end
+  end
+end

data/lib/rubygoal/team.rb

@@ -0,0 +1,198 @@
+require 'forwardable'
+
+require 'rubygoal/formation'
+require 'rubygoal/field'
+require 'rubygoal/players/average'
+require 'rubygoal/players/fast'
+require 'rubygoal/players/captain'
+require 'rubygoal/players/goalkeeper'
+require 'rubygoal/match_data'
+
+module Rubygoal
+  class Team
+    attr_reader :players, :side, :opponent_side, :coach, :formation
+    attr_accessor :goalkeeper
+
+    INFINITE = 100_000
+
+    extend Forwardable
+    def_delegators :coach, :name
+    def_delegators :game, :ball
+
+    def initialize(game, coach)
+      @game    = game
+      @players = {}
+      @coach   = coach
+
+      @match_data_factory = MatchData::Factory.new(game, side)
+
+      initialize_lineup_values
+      initialize_players
+      initialize_formation
+    end
+
+    def players_to_initial_position
+      match_data = match_data_factory.create
+      formation = coach.formation(match_data)
+      restart_player_positions_in_own_field(formation)
+    end
+
+    def update(elapsed_time)
+      match_data = match_data_factory.create
+      self.formation = coach.formation(match_data)
+
+      unless formation.valid?
+        puts formation.errors
+        raise "Invalid formation: #{coach.name}"
+      end
+
+      update_coach_defined_positions(formation)
+
+      player_to_move = nil
+      min_distance_to_ball = INFINITE
+      players_list.each do |player|
+        pass_or_shoot(player) if player.can_kick?(ball)
+
+        distance_to_ball = player.distance(ball.position)
+        if min_distance_to_ball > distance_to_ball
+          min_distance_to_ball = distance_to_ball
+          player_to_move = player
+        end
+      end
+
+      player_to_move.move_to(ball.position)
+
+      players.each do |name, player|
+        if name == :goalkeeper
+          if player != player_to_move
+            player.move_to_cover_goal(ball)
+            player.update(elapsed_time)
+            next
+          end
+        end
+
+        player.move_to_coach_position unless player == player_to_move
+        player.update(elapsed_time)
+      end
+    end
+
+    def players_list
+      players.values
+    end
+
+    def players_position
+      players.each_with_object({}) do |(name, player), hash|
+        hash[name] = Field.field_position(player.position, side)
+      end
+    end
+
+    private
+
+    attr_reader :game, :match_data_factory
+    attr_writer :formation
+
+    def initialize_lineup_values
+      @average_players_count = 6
+      @fast_players_count = 3
+    end
+
+    def initialize_formation
+      @formation = @coach.initial_formation
+    end
+
+    def initialize_players
+      @players = { goalkeeper: GoalKeeperPlayer.new(game, side) }
+
+      unless @coach.valid?
+        puts @coach.errors
+        raise "Invalid team definition: #{@coach.name}"
+      end
+
+      @players[@coach.captain_player.name] = CaptainPlayer.new(game, side)
+
+      @coach.players_by_type(:fast).each do |player_def|
+        @players[player_def.name] = FastPlayer.new(game, side)
+      end
+
+      @coach.players_by_type(:average).each do |player_def|
+        @players[player_def.name] = AveragePlayer.new(game, side)
+      end
+
+      initialize_player_positions
+    end
+
+    def pass_or_shoot(player)
+      # Kick straight to the goal whether the distance is short (200)
+      # or we don't have a better option
+      target = shoot_target
+
+      unless Field.close_to_goal?(player.position, opponent_side)
+        if teammate = nearest_forward_teammate(player)
+          target = teammate.position
+        end
+      end
+
+      player.kick(ball, target)
+    end
+
+    def nearest_forward_teammate(player)
+      min_dist = INFINITE
+      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
+        end
+      end
+
+      nearest_teammate
+    end
+
+    def shoot_target
+      # Do not kick always to the center, look for the sides of the goal
+      limit = Field::GOAL_HEIGHT / 2
+      offset = Random.rand(-limit..limit)
+
+      target = Field.goal_position(opponent_side)
+      target.y += offset
+      target
+    end
+
+    def initialize_player_positions
+      Field.default_player_field_positions.each_with_index do |pos, index|
+        players.values[index].position = lineup_to_position(pos)
+        players.values[index].coach_defined_position = lineup_to_position(pos)
+      end
+    end
+
+    def update_coach_defined_positions(formation)
+      formation.players_position.each do |player_name, pos|
+        players[player_name].coach_defined_position = lineup_to_position(pos)
+      end
+    end
+
+    def restart_player_positions_in_own_field(formation)
+      formation.players_position.each do |player_name, pos|
+        pos.x *= 0.5
+        pos = lineup_to_position(pos)
+
+        player = players[player_name]
+
+        player.coach_defined_position = pos
+        player.position = pos
+      end
+    end
+
+    def lineup_to_position(field_position)
+      Field.absolute_position(field_position, side)
+    end
+
+    def goalkeeper
+      players[:goalkeeper]
+    end
+  end
+end

data/lib/rubygoal/teams/away.rb

@@ -0,0 +1,15 @@
+require 'rubygoal/team'
+
+module Rubygoal
+  class AwayTeam < Team
+    def initialize(*args)
+      @side = :away
+      @opponent_side = :home
+      super
+    end
+
+    def teammate_is_on_front?(player, teammate)
+      teammate.position.x < player.position.x - 40
+    end
+  end
+end

data/lib/rubygoal/teams/home.rb

@@ -0,0 +1,15 @@
+require 'rubygoal/team'
+
+module Rubygoal
+  class HomeTeam < Team
+    def initialize(*args)
+      @side = :home
+      @opponent_side = :away
+      super
+    end
+
+    def teammate_is_on_front?(player, teammate)
+      teammate.position.x > player.position.x + 40
+    end
+  end
+end

data/lib/rubygoal/util.rb

@@ -0,0 +1,36 @@
+module Rubygoal
+  module Util
+    class << self
+      def offset_x(angle, distance)
+        distance * Math.cos(angle * Math::PI / 180.0)
+      end
+
+      def offset_y(angle, distance)
+        distance * Math.sin(angle * Math::PI / 180.0)
+      end
+
+      def distance(x1, y1, x2, y2)
+        Math.hypot(x2 - x1, y2 - y1)
+      end
+
+      def angle(x1, y1, x2, y2)
+        Math.atan2(y2 - y1, x2 - x1) / Math::PI * 180.0
+      end
+
+      def positive_angle(x1, y1, x2, y2)
+        angle = self.angle(x1, y1, x2, y2)
+        if angle < 0
+          360 + angle
+        else
+          angle
+        end
+      end
+
+      def y_intercept_with_line(x, pos1, pos2)
+        slope = (pos2.y - pos1.y) / (pos2.x - pos1.x)
+
+        Position.new(x, slope * (x - pos1.x) + pos1.y)
+      end
+    end
+  end
+end

data/lib/rubygoal/version.rb

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

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rubygoal
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Jorge Bejar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-01 00:00:00.000000000 Z
+date: 2017-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubygoal-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: gosu
   requirement: !ruby/object:Gem::Requirement
@@ -50,22 +50,34 @@ files:
 - README.md
 - bin/rubygoal
 - lib/rubygoal.rb
-- lib/rubygoal/gui.rb
-- lib/rubygoal/gui/ball.rb
-- lib/rubygoal/gui/field.rb
-- lib/rubygoal/gui/game.rb
-- lib/rubygoal/gui/goal.rb
-- lib/rubygoal/gui/players.rb
-- lib/rubygoal/gui/version.rb
-- media/average_away.png
-- media/average_home.png
-- media/background.png
-- media/ball.png
-- media/captain_away.png
-- media/captain_home.png
-- media/fast_away.png
-- media/fast_home.png
-- media/goal.png
+- lib/rubygoal/ball.rb
+- lib/rubygoal/coach.rb
+- lib/rubygoal/coach_definition.rb
+- lib/rubygoal/coach_loader.rb
+- lib/rubygoal/coaches/coach_definition_away.rb
+- lib/rubygoal/coaches/coach_definition_home.rb
+- lib/rubygoal/configuration.rb
+- lib/rubygoal/coordinate.rb
+- lib/rubygoal/field.rb
+- lib/rubygoal/formation.rb
+- lib/rubygoal/formation/formation_dsl.rb
+- lib/rubygoal/game.rb
+- lib/rubygoal/goal.rb
+- lib/rubygoal/match_data.rb
+- lib/rubygoal/moveable.rb
+- lib/rubygoal/player.rb
+- lib/rubygoal/players/average.rb
+- lib/rubygoal/players/captain.rb
+- lib/rubygoal/players/fast.rb
+- lib/rubygoal/players/goalkeeper.rb
+- lib/rubygoal/players/player_movement.rb
+- lib/rubygoal/recorder.rb
+- lib/rubygoal/simulator.rb
+- lib/rubygoal/team.rb
+- lib/rubygoal/teams/away.rb
+- lib/rubygoal/teams/home.rb
+- lib/rubygoal/util.rb
+- lib/rubygoal/version.rb
 homepage: https://github.com/wyeworks/rubygoal
 licenses:
 - Apache License 2.0
@@ -86,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Rubygoal Game - Soccer game for Rubysts