hlockey 0.1 → 1

data/lib/data/season.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Season
+  NUMBER = 1
+  START_TIME = Time.utc(2022, 7, 4, 17).localtime.freeze
+  ELECTION = {
+    'Bribery': {
+      'Eat More RAM': 'Add an online interface to the league.',
+      'Weather': 'Move all the stadiums outdoors.',
+      'We Do A Little Losing': 'Recognize the losingest teams with an Underbracket.'
+    },
+    'Treasure': {
+      'Vengence': 'All your team\'s stats are boosted by your team\'s losses * 0.005.',
+      'Dave': 'The worst stat on your team is set to 4.5.',
+      'Nice': 'Boost your worst player by 0.69 in every stat.',
+      'Convenient Math Error': 'Your team starts the next season with 5 wins.'
+    },
+    'Coaching': {
+      'Player Swapping': 'Swap the positions of 2 players on your team.',
+      'Stat Swapping': 'Swap 2 stats of a player on your team.',
+      'Draft': 'Replace a player with a random new player.',
+      'Small Gamble': 'All your team\'s stats go up or down by 0.5 at random.',
+      'Big Gamble': 'All your team\'s stats go up or down by 1.0 at random.'
+    }
+  }.freeze
+  ELECTION_FORM = 'https://forms.gle/saLp3ucxg2ERsY9L7'
+end

data/lib/game.rb

@@ -1,16 +1,17 @@
-require_relative "./messages"
+# frozen_string_literal: true
+
+require_relative('./messages')
 
 class Game
-  attr_reader :home, :away, :stream, :in_progress
+  attr_reader(:home, :away, :stream, :in_progress)
 
-  def initialize home, away, prng
-    @home, @away, @prng = [home, away, prng]
+  def initialize(home, away, prng)
+    @home = home
+    @away = away
+    @prng = prng
     @stream = [Messages.StartOfGame(to_s)]
     @in_progress = true
-    @score = {
-      :home => 0,
-      :away => 0
-    }
+    @score = { home: 0, away: 0 }
     @actions = 0
     @period = 1
     @face_off = true
@@ -27,7 +28,7 @@ class Game
   def update
     return unless @in_progress
 
-    @stream << Messages.StartOfPeriod(@period) if @actions == 0
+    @stream << Messages.StartOfPeriod(@period) if @actions.zero?
     @actions += 1
 
     if @actions == 60
@@ -36,7 +37,7 @@ class Game
       @period += 1
       start_faceoff
 
-      if @period > 3 and not(@score[:home] == @score[:away] and @period < 12)
+      if @period > 3 && !(@score[:home] == @score[:away] && @period < 12)
         # Game is over
         @in_progress = false
 
@@ -50,12 +51,15 @@ class Game
     end
 
     if @face_off
-      if @puck_holder == nil
+      if @puck_holder.nil?
         # Pass opposite team to who wins the puck to switch_team_with_puck,
         # so @team_with_puck & @puckless_team are set to the correct values.
-        switch_team_with_puck(
-          action_succeeds?(@home.roster[:center].stats[:offense],
-                           @away.roster[:center].stats[:offense]) ? @away : @home)
+        switch_team_with_puck(if action_succeeds?(@home.roster[:center].stats[:offense],
+                                                  @away.roster[:center].stats[:offense])
+                                @away
+                              else
+                                @home
+                              end)
 
         @puck_holder = @team_with_puck.roster[:center]
         @stream << Messages.FaceOff(@puck_holder)
@@ -74,9 +78,9 @@ class Game
       @stream << Messages.Hit(@puck_holder, defender,
                               try_take_puck(defender, 0, :defense))
     else      # Shoot
-      unless @shooting_chance < 5 and
-          try_block_shot @puckless_team.roster[@prng.rand(2) == 0 ? :ldef : :rdef] or
-          try_block_shot @puckless_team.roster[:goalie]
+      unless @shooting_chance < 5 &&
+             try_block_shot(@puckless_team.roster[@prng.rand(2).zero? ? :ldef : :rdef]) ||
+             try_block_shot(@puckless_team.roster[:goalie])
         @score[@team_with_puck == @home ? :home : :away] += 1
 
         @stream << Messages.Shoot(@puck_holder,
@@ -85,13 +89,14 @@ class Game
                                   *@score.values)
 
         start_faceoff
-        @actions = 60 if @period > 3 # Sudden death overtime
+        @actions = 59 if @period > 3 # Sudden death overtime
       end
     end
   end
 
   private
-  def action_succeeds? helping_stat, hindering_stat
+
+  def action_succeeds?(helping_stat, hindering_stat)
     @prng.rand(10) + helping_stat - hindering_stat > 4
   end
 
@@ -101,9 +106,12 @@ class Game
     @puck_holder = nil
   end
 
-  def switch_team_with_puck team_with_puck = @team_with_puck
-    @team_with_puck, @puckless_team = team_with_puck == @home ?
-      [@away, @home] : [@home, @away]
+  def switch_team_with_puck(team_with_puck = @team_with_puck)
+    @team_with_puck, @puckless_team = if team_with_puck == @home
+                                        [@away, @home]
+                                      else
+                                        [@home, @away]
+                                      end
     @shooting_chance = 0
   end
 
@@ -112,7 +120,7 @@ class Game
     receiver = puckless_non_goalie(@team_with_puck)
     interceptor = puckless_non_goalie
 
-    if not @face_off and try_take_puck interceptor, 2 # Pass intercepted
+    if !@face_off && try_take_puck(interceptor, 4) # Pass intercepted
       @stream << Messages.Pass(sender, receiver, interceptor)
       return
     end
@@ -122,7 +130,7 @@ class Game
     @shooting_chance += 1
   end
 
-  def try_take_puck player, dis = 0, stat = :agility
+  def try_take_puck(player, dis = 0, stat = :agility)
     return false unless action_succeeds?(player.stats[stat] - dis,
                                          @puck_holder.stats[stat])
 
@@ -132,7 +140,7 @@ class Game
     true
   end
 
-  def try_block_shot blocker
+  def try_block_shot(blocker)
     return false unless action_succeeds?(blocker.stats[:defense],
                                          @puck_holder.stats[:offense])
 
@@ -142,10 +150,9 @@ class Game
     true
   end
 
-  def puckless_non_goalie team = @puckless_team
+  def puckless_non_goalie(team = @puckless_team)
     team.roster.values.select do |p|
       p != team.roster[:goalie] and p != @puck_holder
-    end.sample random: @prng
+    end.sample(random: @prng)
   end
 end
-

data/lib/league.rb

@@ -1,48 +1,52 @@
-require_relative "./game"
-require_relative "./team"
+# frozen_string_literal: true
+
+require('yaml')
+require_relative('./game')
 
 class League
-  attr_reader :day, :divisions, :games_in_progress, :playoff_teams, :champion_team
+  attr_reader(:divisions, :day, :games_in_progress, :playoff_teams, :champion_team)
+
+  class Team
+    private_class_method(:new)
+
+    attr_accessor(:wins, :losses)
+    attr_reader(:name, :emoji, :roster)
+
+    def to_s
+      "#{@emoji} #{@name}"
+    end
+
+    def print_win_loss
+      puts("  #{to_s.ljust 26} #{@wins}-#{@losses}")
+    end
+
+    def print_roster
+      puts(to_s)
+      @roster.each do |pos, player|
+        puts("  #{pos.to_s.ljust(6)}: #{player}")
+        player.stats.each { |stat, value| puts("    #{stat}: #{value.round 1}") }
+      end
+    end
+
+    def self.sort(teams)
+      teams.sort { |a, b| b.wins - b.losses <=> a.wins - a.losses }
+    end
+  end
+
+  def initialize(season, start_time)
+    # The YAML file is included with the program,
+    # so this is as safe as anything else
+    @divisions = YAML.unsafe_load_file(File.expand_path('data/divisions.yaml',
+                                                        File.dirname(__FILE__)))
 
-  def initialize season, start_time
     @day = 0
-    @divisions = {
-      "Wet Warm": [
-        Team.new("Antalya Pirates", "🌊"),
-        Team.new("Baden Hallucinations", "🍄"),
-        Team.new("Kópavogur Seals", "🦭"),
-        Team.new("Lagos Soup", "🥣"),
-        Team.new("Pica Acid", "🧪")
-      ],
-      "Dry Warm": [
-        Team.new("Dawson City Impostors", "🔪"),
-        Team.new("Erlangen Ohms", "🇴"),
-        Team.new("Pompei Eruptions", "🌋"),
-        Team.new("Rio de Janeiro Directors", "🎦"),
-        Team.new("Wyrzysk Rockets", "🚀")
-      ],
-      "Wet Cool": [
-        Team.new("Cape Town Transplants", "🌱"),
-        Team.new("Manbij Fish", "🐠"),
-        Team.new("Nagqu Paint", "🎨"),
-        Team.new("Nice Backflippers", "🔄"),
-        Team.new("Orcadas Base Fog", "🌁")
-      ],
-      "Dry Cool": [
-        Team.new("Baghdad Abacuses", "🧮"),
-        Team.new("Jakarta Architects", "📐"),
-        Team.new("Kyoto Payphones", "📳"),
-        Team.new("Stony Brook Reapers", "💀"),
-        Team.new("Sydney Thinkers", "🤔")
-      ]
-    }
     @games_in_progress = []
     @games = []
     @champion_team = nil
     @last_update_time = start_time
     @passed_updates = 0
-    @prng = Random.new 69420 * season
-    @shuffled_teams = @divisions.values.reduce(:+).shuffle random: @prng
+    @prng = Random.new(69_420 * season)
+    @shuffled_teams = @divisions.values.reduce(:+).shuffle(random: @prng)
     @playoff_teams = nil
     @game_in_matchup = 3
   end
@@ -50,30 +54,31 @@ class League
   def update_state
     return if @champion_team
 
-    now = Time.now
-    five_sec_intervals = (now - @last_update_time).floor / 5
+    now = Time.at(Time.now.to_i)
+    five_sec_intervals = (now - @last_update_time).div(5)
 
-    if five_sec_intervals > 0
-      five_sec_intervals.times do |i|
-        if (i + @passed_updates) % 720 == 0
-          new_games
-        else
-          update_games
-        end
+    return unless five_sec_intervals.positive?
 
-        break if @champion_team
+    five_sec_intervals.times do |i|
+      if ((i + @passed_updates) % 720).zero?
+        new_games
+      else
+        update_games
       end
 
-      @last_update_time = now
-      @passed_updates += five_sec_intervals
+      break if @champion_team
     end
+
+    @last_update_time = now
+    @passed_updates += five_sec_intervals
   end
 
   private
+
   def new_games
     if @game_in_matchup != (@day > 38 ? 5 : 3)
       # New game in matchups
-      @games.map! do |game| Game.new(game.away, game.home, @prng) end
+      @games.map! { |game| Game.new(game.away, game.home, @prng) }
       @game_in_matchup += 1
       return
     end
@@ -92,15 +97,15 @@ class League
 
       @shuffled_teams.insert 1, @shuffled_teams.pop
     when 0
-      @playoff_teams = Team.sort_teams(
+      @playoff_teams = Team.sort(
         @divisions.values.map do |teams|
-          Team.sort_teams(teams).first(2)
-        end.reduce(:+).map &:clone
-      )
+          Team.sort(teams).first(2)
+        end.reduce(:+)
+      ).map(&:clone)
 
       new_playoff_matchups
     when 1
-      @playoff_teams = Team.sort_teams(@playoff_teams).first(@playoff_teams.length / 2)
+      @playoff_teams = Team.sort(@playoff_teams).first(@playoff_teams.length / 2)
 
       if @playoff_teams.length == 1
         @champion_team = @playoff_teams[0]
@@ -112,8 +117,8 @@ class League
   end
 
   def update_games
-    @games_in_progress = @games.select &:in_progress
-    @games_in_progress.each do |game| game.update end
+    @games_in_progress.each(&:update)
+    @games_in_progress = @games.select(&:in_progress)
   end
 
   def new_playoff_matchups
@@ -122,9 +127,14 @@ class League
       team.losses = 0
     end
 
-    (0...@playoff_teams.length).step 2 do |i|
+    (0...@playoff_teams.length).step(2) do |i|
       @games << Game.new(*@playoff_teams[i, 2], @prng)
     end
   end
-end
 
+  class Player
+    private_class_method(:new)
+
+    attr_reader(:stats, :to_s)
+  end
+end

data/lib/messages.rb

@@ -1,26 +1,28 @@
+# frozen_string_literal: true
+
 class Messages
-  def initialize event, fields, data
+  def initialize(event, fields, data)
     @event = event
-    fields.zip data do |(f, d)|
-      instance_variable_set "@" + f.to_s, d
+    fields.zip(data) do |(f, d)|
+      instance_variable_set("@#{f}", d)
     end
   end
 
-  private_class_method :new
+  private_class_method(:new)
 
   class << self
     [
-      [:StartOfGame, :title],
-      [:EndOfGame, :winning_team],
-      [:StartOfPeriod, :period],
-      [:EndOfPeriod, :period, :home, :away, :home_score, :away_score],
-      [:FaceOff, :winning_player],
-      [:Hit, :puck_holder, :defender, :puck_taken],
-      [:Pass, :sender, :receiver, :interceptor],
-      [:Shoot, :shooter, :blocker, :puck_taken, :home, :away, :home_score, :away_score]
+      %i[StartOfGame title],
+      %i[EndOfGame winning_team],
+      %i[StartOfPeriod period],
+      %i[EndOfPeriod period home away home_score away_score],
+      %i[FaceOff winning_player],
+      %i[Hit puck_holder defender puck_taken],
+      %i[Pass sender receiver interceptor],
+      %i[Shoot shooter blocker puck_taken home away home_score away_score]
     ].each do |event, *fields|
       define_method event do |*data|
-        new event, fields, data
+        new(event, fields, data)
       end
     end
   end
@@ -28,29 +30,28 @@ class Messages
   def to_s
     case @event
     when :StartOfGame
-      @title + "\nHocky!"
+      "#{@title}\nHocky!"
     when :EndOfGame
-      "Game over.\n#{@winning_team or "Nobody"} wins!"
+      "Game over.\n#{@winning_team} wins!"
     when :StartOfPeriod
-      "Start" + of_period
+      "Start#{of_period}"
     when :EndOfPeriod
-      "End" + of_period + score
+      "End#{of_period}#{score}"
     when :FaceOff
       "#{@winning_player} wins the faceoff!"
     when :Hit
       "#{@defender} hits #{@puck_holder.to_s + takes}!"
     when :Pass
-      "#{@sender} passes to #{@receiver}#{@interceptor ?
-        "... intercepted by #{@interceptor}!" : "."}"
+      "#{@sender} passes to #{@receiver}" +
+        (@interceptor ? "... intercepted by #{@interceptor}!" : '.')
     when :Shoot
-      "#{@shooter} takes a shot... #{@blocker ?
-        "#{@blocker} blocks the shot#{takes}!" : "and scores!" + score}" 
-    else
-      raise "Unknown message"
+      "#{@shooter} takes a shot... " +
+        (@blocker ? "#{@blocker} blocks the shot#{takes}!" : "and scores!#{score}")
     end
   end
 
   private
+
   def of_period
     " of period #{@period}."
   end
@@ -60,7 +61,6 @@ class Messages
   end
 
   def takes
-    @puck_taken ? " and takes the puck" : ""
+    @puck_taken ? ' and takes the puck' : ''
   end
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hlockey
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '1'
 platform: ruby
 authors:
 - Lavender Perry
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-26 00:00:00.000000000 Z
+date: 2022-07-03 00:00:00.000000000 Z
 dependencies: []
 description: Hockey sports sim.
 email: endie2@protonmail.com
@@ -18,12 +18,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/hlockey
-- lib/data/names_markov_chain.rb
+- lib/data/divisions.yaml
+- lib/data/season.rb
 - lib/game.rb
 - lib/league.rb
 - lib/messages.rb
-- lib/player.rb
-- lib/team.rb
 homepage: https://github.com/Lavender-Perry/hlockey
 licenses:
 - LicenseRef-LICENSE.md
@@ -47,5 +46,5 @@ requirements: []
 rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
-summary: Hlockey season 0.1.
+summary: Hlockey season 1.
 test_files: []