hlockey 0 → 0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b75f6192f6a4e6fd12743a3cb723fbaeb1f89cc49e8be02efb5837be127fecf
-  data.tar.gz: 826ad54ed58f21c515e086387a8c3eceb94fcd1d8e08d83bbc6986a51a112513
+  metadata.gz: fd5809297e263857801bd4718a7ae81e286e48b29d55661a48e8f962977f4ebf
+  data.tar.gz: b1b317bcc5646676415e7ab2f4516f6150c0832e56925461521066ed354cff6e
 SHA512:
-  metadata.gz: c4da1e46f91f59315c72d4ab0788e85b1427b172c26d395f94975408f73b21cac9eb08d816ba74be9d19f46f2f1f2bbb64399f539b6f077ac63db91eaa66a8c6
-  data.tar.gz: '05803e28e89961782a6ed54a96826224adc1819aedf23640f8ecf643e5cc298f5880124463c8e0c85d23ee339dda1623803ff81be9fe7fcd10d17789f57d5573'
+  metadata.gz: 02bea157d0ffe8caf3dcdc8cc151deb530c637db571c1c3812585766c91df9ef0acba073fa0baf7ec3fe8558042c911f4d243d36123eb488d1402ef32ac37f46
+  data.tar.gz: c18f4122bf5ccfacd2ee25d3bc7afc41ecc7f8116e674d1be3c3014e95394ab02d8eb45d4c380affd4060dfc235eadc023cf849c1e53f81bc2f0a9f4fd208972

data/bin/hlockey

@@ -21,7 +21,7 @@ def menu_input_elem default, choices
   choices[i] unless i < 0
 end
 
-season = 0
+season = 0.1
 start_time = Time.utc(2022, 6, 27, 17).localtime
 league = League.new season, start_time
 
@@ -56,7 +56,7 @@ loop do
     end
   when 1 # Standings
     if league.champion_team
-      puts "Your season #{season} champions are the #{champion_team.name}!"
+      puts "Your season #{season} champions are the #{league.champion_team.name}!"
     elsif league.playoff_teams
       puts "Playoffs"
       league.playoff_teams.each &:print_win_loss

data/lib/game.rb

@@ -1,12 +1,12 @@
 require_relative "./messages"
 
 class Game
-  attr_reader :stream, :in_progress
+  attr_reader :home, :away, :stream, :in_progress
 
   def initialize home, away, prng
+    @home, @away, @prng = [home, away, prng]
     @stream = [Messages.StartOfGame(to_s)]
     @in_progress = true
-    @home, @away, @prng = [home, away, prng]
     @score = {
       :home => 0,
       :away => 0
@@ -21,7 +21,7 @@ class Game
   end
 
   def to_s
-    puts "#{home.emoji} #{home.name} vs #{away.name} #{away.emoji}"
+    "#{@home.emoji} #{@home.name} vs #{@away.name} #{@away.emoji}"
   end
 
   def update
@@ -30,6 +30,25 @@ class Game
     @stream << Messages.StartOfPeriod(@period) if @actions == 0
     @actions += 1
 
+    if @actions == 60
+      @stream << Messages.EndOfPeriod(@period, @home.name, @away.name, *@score.values)
+      @actions = 0
+      @period += 1
+      start_faceoff
+
+      if @period > 3 and not(@score[:home] == @score[:away] and @period < 12)
+        # Game is over
+        @in_progress = false
+
+        winner, loser = @score[:away] > @score[:home] ? [@away, @home] : [@home, @away]
+
+        @stream << Messages.EndOfGame(winner.name)
+        winner.wins += 1
+        loser.losses += 1
+      end
+      return
+    end
+
     if @face_off
       if @puck_holder == nil
         # Pass opposite team to who wins the puck to switch_team_with_puck,
@@ -39,7 +58,7 @@ class Game
                            @away.roster[:center].stats[:offense]) ? @away : @home)
 
         @puck_holder = @team_with_puck.roster[:center]
-        @stream << Messages.FaceOff(@puck_holder.name)
+        @stream << Messages.FaceOff(@puck_holder)
       else
         pass
         @face_off = false
@@ -52,50 +71,23 @@ class Game
       pass
     when 5..6 # Check
       defender = puckless_non_goalie
-      @stream << Messages.Hit(@puck_holder.name, defender.name,
-                              try_take_puck(defender), 0, :defense)
+      @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]
         @score[@team_with_puck == @home ? :home : :away] += 1
 
-        @stream << Messages.Shoot(shooter,
+        @stream << Messages.Shoot(@puck_holder,
                                   nil, false,
                                   @home.name, @away.name,
                                   *@score.values)
 
-        @shooting_chance = 0
-        @face_off = true
+        start_faceoff
         @actions = 60 if @period > 3 # Sudden death overtime
       end
     end
-
-    if @actions == 60
-      @stream << Messages.EndOfPeriod(@period, @home.name, @away.name, *@score.values)
-      @actions = 0
-      @period += 1
-      if @period > 3 and not(@score[:home] == @score[:away] and @period < 12)
-        # Game is over
-        @in_progress = false
-
-        winner, loser = case @score[:home] <=> @score[:away]
-                        when 1
-                          [@home, @away]
-                        when -1
-                          [@away, @home]
-                        else # Tie
-                          @stream << Messages.EndOfGame
-                          @home.losses += 1
-                          @away.losses += 1
-                          return
-                        end
-
-        @stream << Messages.EndOfGame(winner.name)
-        winner.wins += 1
-        loser.losses += 1
-      end
-    end
   end
 
   private
@@ -103,6 +95,12 @@ class Game
     @prng.rand(10) + helping_stat - hindering_stat > 4
   end
 
+  def start_faceoff
+    @shooting_chance = 0
+    @face_off = true
+    @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]
@@ -110,16 +108,16 @@ class Game
   end
 
   def pass
-    sender_name = @puck_holder.name
+    sender = @puck_holder
     receiver = puckless_non_goalie(@team_with_puck)
     interceptor = puckless_non_goalie
 
     if not @face_off and try_take_puck interceptor, 2 # Pass intercepted
-      @stream << Message.Pass(sender_name, receiver.name, interceptor)
+      @stream << Messages.Pass(sender, receiver, interceptor)
       return
     end
 
-    @stream << Message.Pass(sender_name, receiver.name)
+    @stream << Messages.Pass(sender, receiver)
     @puck_holder = receiver
     @shooting_chance += 1
   end
@@ -139,7 +137,7 @@ class Game
                                          @puck_holder.stats[:offense])
 
     @shooting_chance += 1
-    @stream << Message.Shoot(@puck_holder, blocker, try_take_puck(blocker))
+    @stream << Messages.Shoot(@puck_holder, blocker, try_take_puck(blocker))
 
     true
   end

data/lib/league.rb

@@ -61,7 +61,7 @@ class League
           update_games
         end
 
-        return if @champion_team
+        break if @champion_team
       end
 
       @last_update_time = now
@@ -86,7 +86,7 @@ class League
     case @day <=> 39
     when -1
       (@shuffled_teams.length / 2).times do |i|
-        pair = [@shuffled_teams[i], @shuffled_teams[-i]]
+        pair = [@shuffled_teams[i], @shuffled_teams[-i - 1]]
         @games << Game.new(*(@day > 19 ? pair : pair.reverse), @prng)
       end
 
@@ -95,7 +95,7 @@ class League
       @playoff_teams = Team.sort_teams(
         @divisions.values.map do |teams|
           Team.sort_teams(teams).first(2)
-        end.reduce(:+).map &:copy
+        end.reduce(:+).map &:clone
       )
 
       new_playoff_matchups
@@ -112,7 +112,7 @@ class League
   end
 
   def update_games
-    @games_in_progress = @games.select do |game| game.in_progress end
+    @games_in_progress = @games.select &:in_progress
     @games_in_progress.each do |game| game.update end
   end
 

data/lib/messages.rb

@@ -1,25 +1,27 @@
 class Messages
   def initialize event, fields, data
     @event = event
-    data_fields.zip data do |(f, d)|
-      instance_variable_set "@" + f, d
+    fields.zip data do |(f, d)|
+      instance_variable_set "@" + f.to_s, d
     end
   end
 
   private_class_method :new
 
-  [
-    [: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]
-  ].each do |event, *fields|
-    define_method event do |*data|
-      new event, fields, data
+  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]
+    ].each do |event, *fields|
+      define_method event do |*data|
+        new event, fields, data
+      end
     end
   end
 
@@ -34,9 +36,9 @@ class Messages
     when :EndOfPeriod
       "End" + of_period + score
     when :FaceOff
-      @winning_player + " wins the faceoff!"
+      "#{@winning_player} wins the faceoff!"
     when :Hit
-      "#{@defender} hits #{@puck_holder + takes}!"
+      "#{@defender} hits #{@puck_holder.to_s + takes}!"
     when :Pass
       "#{@sender} passes to #{@receiver}#{@interceptor ?
         "... intercepted by #{@interceptor}!" : "."}"

data/lib/player.rb

@@ -1,12 +1,12 @@
 require_relative "./data/names_markov_chain"
 
 class Player
-  attr_reader :name, :stats
+  attr_reader :stats, :to_s
 
   @@prng = Random.new 8010897121101114 # This never changes
 
   def initialize
-    @name = random_name + " " + random_name
+    @to_s = random_name + " " + random_name
     @stats = [:offense, :defense, :agility].each_with_object Hash.new do |stat, hash|
       hash[stat] = @@prng.rand * 5
     end

data/lib/team.rb

@@ -32,7 +32,7 @@ class Team
   def print_roster
     puts to_s
     @roster.each do |pos, player|
-      puts "  #{pos.to_s.ljust 6}: #{player.name}"
+      puts "  #{pos.to_s.ljust 6}: #{player}"
       player.stats.each do |stat, value|
         puts "    #{stat}: #{value.round 1}"
       end
@@ -40,7 +40,7 @@ class Team
   end
 
   def self.sort_teams teams
-    teams.sort do |a, b| a.wins - a.losses <=> b.wins - b.losses end
+    teams.sort do |a, b| b.wins - b.losses <=> a.wins - a.losses end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hlockey
 version: !ruby/object:Gem::Version
-  version: '0'
+  version: '0.1'
 platform: ruby
 authors:
 - Lavender Perry
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-21 00:00:00.000000000 Z
+date: 2022-06-26 00:00:00.000000000 Z
 dependencies: []
 description: Hockey sports sim.
 email: endie2@protonmail.com
@@ -47,5 +47,5 @@ requirements: []
 rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
-summary: Hlockey season 0.
+summary: Hlockey season 0.1.
 test_files: []