hlockey 5 → 6

data/data/links.json

@@ -0,0 +1,5 @@
+{
+  "Website": "https://hlockey.gay",
+  "Source Code": "https://codeberg.org/LavenderPerry/hlockey",
+  "Discord": "https://discord.gg/2N8VN8Q69E"
+}

data/data/previous_election_results.json

@@ -0,0 +1,98 @@
+{
+  "vote_amt": 159,
+  "categories": {
+    "Bribery (49 votes)": {
+      "Winning bribe": {
+        "winner": "Mods Help (23 votes)"
+      }
+    },
+    "Treasure (83 votes)": {
+      "Dave": {
+        "winner": "Pica Acid (2 votes / 21 total)",
+        "most_votes": "Sydney Thinkers (6 votes)"
+      },
+      "Nice": {
+        "winner": "Nice Backflippers (2 votes / 15 total)",
+        "most_votes": "Dawson City Impostors (7 votes)"
+      },
+      "Vengabus": {
+        "winner": "Antalya Pirates (2 votes / 22 total)",
+        "most_votes": "Stony Brook Reapers (11 votes)"
+      },
+      "Unvengabus": {
+        "winner": "Rio de Janeiro Directors (Dry Warm) (0 votes / 0 total)"
+      },
+      "Shared Training": {
+        "winner": "Pompei Eruptions (Dry Warm) (4 votes / 16 total)"
+      },
+      "Theft": {
+        "winner": "Sydney Thinkers (8 votes / 9 total)"
+      },
+      "Hidden Treasure - Evolve": {
+        "winner": "Baden Hallucinations (0 votes / 0 total)"
+      }
+    },
+    "Coaching (27 votes)": {
+      "Antalya Pirates": {
+        "winner": "Draft (1 vote / 1 total)"
+      },
+      "Baden Hallucinations": {
+        "winner": "Draft (0 votes / 0 total)"
+      },
+      "Kópavogur Seals": {
+        "winner": "Big Gamble (0 votes / 0 total)"
+      },
+      "Lagos Soup": {
+        "winner": "Small Gamble (0 votes / 0 total)"
+      },
+      "Pica Acid": {
+        "winner": "Please Block Shots (2 votes / 2 total)"
+      },
+      "Dawson City Impostors": {
+        "winner": "Draft (4 votes / 4 total)"
+      },
+      "Erlangen Ohms": {
+        "winner": "Please Win Faceoffs (1 vote / 2 total)"
+      },
+      "Pompei Eruptions": {
+        "winner": "Please Win Faceoffs (0 votes / 0 total)"
+      },
+      "Rio de Janeiro Directors": {
+        "winner": "Please Win Faceoffs (1 vote / 1 total)"
+      },
+      "Wyrzysk Rockets": {
+        "winner": "Big Gamble (0 votes / 0 total)"
+      },
+      "Cape Town Transplants": {
+        "winner": "Draft (1 vote / 2 total)"
+      },
+      "Manbij Fish": {
+        "winner": "Draft (1 vote / 1 total)"
+      },
+      "Nagqu Paint": {
+        "winner": "Draft (1 vote / 1 total)"
+      },
+      "Nice Backflippers": {
+        "winner": "Draft (1 vote / 1 total)"
+      },
+      "Orcadas Base Fog": {
+        "winner": "Draft (2 votes / 2 total)"
+      },
+      "Baghdad Abacuses": {
+        "winner": "Clock Unwise (0 votes / 0 total)"
+      },
+      "Jakarta Architects": {
+        "winner": "Clock Wise (0 votes / 0 total)"
+      },
+      "Kyoto Payphones": {
+        "winner": "Small Gamble (1 vote / 2 total)"
+      },
+      "Stony Brook Reapers": {
+        "winner": "Please Win Faceoffs (1 vote / 1 total)"
+      },
+      "Sydney Thinkers": {
+        "winner": "Clock Wise (7 votes / 7 total)"
+      }
+    }
+  }
+}

data/lib/hlockey/actions.rb

@@ -0,0 +1,22 @@
+require("hlockey/constants")
+
+module Hlockey
+  ##
+  # For classes that deal with actions within a Hlockey game.
+  module Actions
+    private
+
+    # For an event that should happen randomly about a certain amount of times per game,
+    # returns if the event should happen or not. Should be called once per action.
+    # @param times [Integer] the approximate amount of times the event should occur
+    # @return [Boolean] if the event should occur
+    def random_event_occurs?(times = 1, prng: @prng) =
+      prng.rand(NON_OT_ACTIONS / times).zero?
+
+    # @param succeed_boost [Numeric] increases chance of action succeeding
+    # @param fail_boost [Numeric] decreases chance of action succeeding
+    # @return [Boolean] if the action succeeded
+    def action_succeeds?(succeed_boost, fail_boost, prng: @prng) =
+      prng.rand(20) + (succeed_boost - fail_boost) > 9
+  end
+end

data/lib/hlockey/data.rb

@@ -1,5 +1,4 @@
-require("hlockey/team") # Classes stored in league data
-require("yaml")
+require("json")
 
 module Hlockey
   ##
@@ -8,9 +7,11 @@ module Hlockey
     class << self
       data_dir = File.expand_path("../../data", __dir__)
 
-      Dir.glob("*.yaml", base: data_dir).each do |data_file|
-        category = File.basename(data_file, ".yaml")
-        define_method(category) { YAML.unsafe_load_file("#{data_dir}/#{data_file}") }
+      Dir.glob("*.json", base: data_dir).each do |data_file|
+        # @return [Hash] loaded data
+        define_method(File.basename(data_file, ".json")) do
+          JSON.parse(File.read("#{data_dir}/#{data_file}"), symbolize_names: true)
+        end
       end
     end
   end

data/lib/hlockey/game/fight.rb

@@ -1,4 +1,4 @@
-require("hlockey/game/actions")
+require("hlockey/actions")
 require("hlockey/message")
 
 module Hlockey
@@ -15,15 +15,21 @@ module Hlockey
       attr_reader(:score)
 
       # @param game [Game] the game the fight is a part of
-      def initialize(game)
+      def initialize(game, starting_player = nil)
         @home = game.home
         @away = game.away
         @prng = game.prng
         @actions = 0
-        @players = {
-          home: [@home.roster.values.sample(random: @prng)],
-          away: [@away.roster.values.sample(random: @prng)]
-        }
+        @players = { home: [], away: [] }
+        @players.each_key do |team|
+          add_player(if send(team).roster.value?(starting_player)
+                       starting_player
+                     else
+                       get_joining_player(team)
+                     end,
+                     team)
+        end
+
         @score = { home: 0, away: 0 }
       end
 
@@ -44,9 +50,7 @@ module Hlockey
             return attack if player_joining.nil?
           end
 
-          @players[team_joining] << player_joining
-
-          Message.PlayerJoinedFight(send(team_joining), player_joining)
+          add_player(player_joining, team_joining)
         else # fight ends
           Message.FightEnded
         end
@@ -75,21 +79,28 @@ module Hlockey
       end
 
       # @param team [:home, :away]
-      # @return [Player, nil]
-      def get_joining_player(team)
+      # @return [Team::Player, nil]
+      def get_joining_player(team) =
         (send(team).roster.values - @players[team]).sample(random: @prng)
+
+      # @param player [Team::Player]
+      # @param team [:home, :away]
+      # @return [Message] the join message
+      def add_player(player, team)
+        mods_res = player.mods_do(:on_join_fight)
+        player = mods_res if mods_res
+
+        @players[team] << player
+
+        Message.PlayerJoinedFight(player)
       end
 
       # @return [:home, :away] randomly selected based on amount of players in fight
-      def rand_team
-        rand_is_home? ? :home : :away
-      end
+      def rand_team = rand_is_home? ? :home : :away
 
       # @param team [:home, :away]
       # @return [:home, :away] :away if `team` is :home, :home if `team` is :away
-      def opposite(team)
-        team == :home ? :away : :home
-      end
+      def opposite(team) = team == :home ? :away : :home
 
       # @return [Boolean] if randomly selected team is home team
       def rand_is_home?

data/lib/hlockey/game/weather/audacity.rb

@@ -1,5 +1,5 @@
 require("hlockey/game/weather/weatherable")
-require("hlockey/game/actions")
+require("hlockey/actions")
 
 module Hlockey
   class Game

data/lib/hlockey/game/weather/chicken.rb

@@ -1,5 +1,5 @@
 require("hlockey/game/weather/weatherable")
-require("hlockey/game/actions")
+require("hlockey/actions")
 require("hlockey/message")
 
 module Hlockey

data/lib/hlockey/game/weather/sunset.rb

@@ -15,7 +15,7 @@ module Hlockey
 
         def on_goal(scoring_team)
           @score_amt[scoring_team] += 1
-          @game.score[scoring_team] -= @score_amt[scoring_team] * 0.2
+          @game.score[scoring_team] -= @score_amt[scoring_team] * 0.3
         end
       end
     end

data/lib/hlockey/game/weather/waves.rb

@@ -1,5 +1,5 @@
 require("hlockey/game/weather/weatherable")
-require("hlockey/game/actions")
+require("hlockey/actions")
 require("hlockey/message")
 
 module Hlockey
@@ -7,7 +7,7 @@ module Hlockey
     module Weather
       ##
       # Waves weather
-      # Swaps the worst roster player with a random shadow player permanently
+      # Swaps a roster player (worst most likely) with a random shadow player permanently
       class Waves
         include(Weatherable)
         include(Actions)
@@ -17,9 +17,15 @@ module Hlockey
 
           team_sym = rand_team
           team = @game.send(team_sym)
-          @game.stream << Message.WavesWashedAway(*swap(team_sym,
-                                                        team.worst_player_pos,
-                                                        @prng.rand(team.shadows.length)))
+          @game.stream << Message.WavesWashedAway(
+            *swap(team_sym,
+                  if @prng.rand(5).zero?
+                    team.roster.keys.sample(random: @prng)
+                  else
+                    team.worst_player_pos
+                  end,
+                  @prng.rand(team.shadows.length))
+          )
         end
       end
     end

data/lib/hlockey/game/weather/weatherable.rb

@@ -1,4 +1,5 @@
 require("hlockey/constants")
+require("hlockey/selfdescribable")
 
 module Hlockey
   class Game
@@ -7,6 +8,8 @@ module Hlockey
       # Module with needed methods for weathers, that every weather includes
       # All methods starting with "on" represent game events weathers may respond to
       module Weatherable
+        include(SelfDescribable)
+
         def initialize(game)
           @game = game
           @home = @game.home
@@ -14,10 +17,6 @@ module Hlockey
           @prng = @game.prng
         end
 
-        def to_s
-          self.class.to_s.split("::").last
-        end
-
         def on_game_start() end
 
         def on_game_end() end
@@ -34,7 +33,7 @@ module Hlockey
         # @param team_sym [:home, :away]
         # @param pos [Symbol] position of roster player swapped out
         # @param shadows_idx [Integer] index of shadows player swapped in
-        # @return [Array<Player>] the players that were swapped
+        # @return [Array<Team::Player>] the players that were swapped
         def swap(team_sym, pos, shadows_idx)
           team = @game.send(team_sym)
 
@@ -50,13 +49,14 @@ module Hlockey
             player_array[player_idx] = next_player unless player_idx.nil?
           end
 
+          prev_player.mods_do(:on_swap, false, shadows_idx, pos, @prng)
+          next_player.mods_do(:on_swap, true, pos, shadows_idx, @prng)
+
           [prev_player, next_player]
         end
 
         # @return [:home, :away]
-        def rand_team
-          @prng.rand(2).zero? ? :home : :away
-        end
+        def rand_team = @prng.rand(2).zero? ? :home : :away
       end
     end
   end

data/lib/hlockey/game.rb

@@ -1,6 +1,6 @@
-require("hlockey/game/actions")
 require("hlockey/game/fight")
 require("hlockey/game/weather")
+require("hlockey/actions")
 require("hlockey/constants")
 require("hlockey/message")
 require("hlockey/utils")
@@ -17,6 +17,9 @@ module Hlockey
     # @return [Random] should be the same as the league's
     attr_reader(:prng)
 
+    # @return [Hash<Symbol => Integer>] the score of each team
+    attr_reader(:score)
+
     # @return [Team::Stadium] the stadium this game is located at
     attr_reader(:stadium)
 
@@ -26,9 +29,6 @@ module Hlockey
     # @return [Array<Message>] messages about game events
     attr_reader(:stream)
 
-    # @return [Hash<Symbol => Integer>] the score of each team
-    attr_reader(:score)
-
     # @return [Boolean] if the game is still in progress
     attr_reader(:in_progress)
 
@@ -38,20 +38,29 @@ module Hlockey
     # @return [Fight, nil] the current fight, if there is any
     attr_reader(:fight)
 
+    # @return [Hash<Player => Hash<Symbol => Number>>] stats of players before changes
+    attr_reader(:pre_tmp_change_stats)
+
+    alias in_progress? in_progress
+
     # @param home [Team]
     # @param away [Team]
     # @param prng [Random] should be League#prng
-    def initialize(home, away, prng)
+    # @param weather [Class<Weatherable>]
+    def initialize(home, away, prng, weather = nil)
       @home = home
       @away = away
       @prng = prng
+
       @stadium = @home.stadium
-      @weather = Weather::WEATHERS.sample(random: prng).new(self)
-      @stream = [Message.StartOfGame]
+
+      weather ||= Weather::WEATHERS.sample(random: prng)
+      @weather = weather.new(self)
       @score = { home: 0, away: 0 }
       @in_progress = true
       @actions = 0
       @period = 1
+      @stream = [Message.StartOfGame]
       @faceoff = true
       @faceoff_won = false
       @team_with_puck = nil
@@ -60,16 +69,26 @@ module Hlockey
       @shooting_chance = 0
       @fight = nil
       @fight_chance = 0
-      @pre_morale_change_stats = {}
-      @partying_teams = [@home, @away].select { |t| t.status == :partying }
+      @pre_tmp_change_stats = {}
+      @partying_teams = [@home, @away].select { _1.status == :partying }
 
       @weather.on_game_start
     end
 
+    # @return [Hash]
+    def to_h = {
+      home: @home.name,
+      away: @away.name,
+      stadium: @stadium.to_s,
+      weather: @weather.to_s,
+      score: @score,
+      in_progress?: @in_progress,
+      period: @period,
+      stream: @stream.map { _1.to_s(do_color: false) }
+    }
+
     # @return [String]
-    def to_s
-      "#{Message.color(@home)} vs #{Message.color(@away)}"
-    end
+    def to_s = "#{Message.color(@home)} vs #{Message.color(@away)}"
 
     # Update the game state by one action
     def update
@@ -79,6 +98,14 @@ module Hlockey
       handle_parties
     end
 
+    # Starts a fight in the game
+    # @param starting_player [Player, nil] the player that started the fight (optional)
+    def start_fight(starting_player = nil)
+      @fight = Fight.new(self, starting_player)
+      @stream << Message.FightStarted(@fight.players[:home].first,
+                                      @fight.players[:away].first)
+    end
+
     private
 
     # Does an action in the game
@@ -87,6 +114,7 @@ module Hlockey
       @actions += 1
 
       @weather.on_action
+      (@home.roster.values + @away.roster.values).each { _1.mods_do(:on_action, self) }
 
       unless @fight.nil?
         fight_message = @fight.next_action
@@ -129,9 +157,9 @@ module Hlockey
         stat = player.stats.keys.sample(random: @prng)
         player.stats[stat] += 0.1
         @stream << Message.Partying(player)
-        next if @pre_morale_change_stats[player].nil?
+        next if @pre_tmp_change_stats[player].nil?
 
-        @pre_morale_change_stats[player][stat] += 0.1
+        @pre_tmp_change_stats[player][stat] += 0.1
       end
     end
 
@@ -159,9 +187,15 @@ module Hlockey
     def check
       defender_pos = defensive_pos
       defender = @puckless_team.roster[defender_pos]
-      @stream << Message.Hit(puck_holder, defender,
-                             try_take_puck(defender_pos), @team_with_puck,
+
+      mods_messages = puck_holder.mods.map { _1.on_got_hit(self, defender) }.compact
+
+      @stream << Message.Hit(puck_holder,
+                             defender,
+                             mods_messages.empty? && try_take_puck(defender_pos),
+                             @team_with_puck,
                              @shooting_chance)
+      @stream.concat(mods_messages)
       @fight_chance += 0.1
     end
 
@@ -172,10 +206,10 @@ module Hlockey
       return if @puck_holder_pos.nil?
 
       if @shooting_chance < 5 &&
-         try_block_shot(@prng.rand(2).zero? ? :ldef : :rdef, audacity: audacity)
+         try_block_shot(@prng.rand(2).zero? ? :ldef : :rdef, audacity:)
         return
       end
-      return if try_block_shot(:goalie, audacity: audacity)
+      return if try_block_shot(:goalie, audacity:)
 
       # Goal scored
 
@@ -201,7 +235,7 @@ module Hlockey
       if @period > NON_OT_PERIODS &&
          !(@score[:home] == @score[:away] && @period <= TOTAL_PERIODS)
         # Game is over
-        @pre_morale_change_stats.each { |player, stats| player.stats = stats }
+        @pre_tmp_change_stats.each { |player, stats| player.stats = stats }
         @weather.on_game_end
         @in_progress = false
         winner, loser = @score[:away] > @score[:home] ? [@away, @home] : [@home, @away]
@@ -279,20 +313,15 @@ module Hlockey
       true
     end
 
-    def start_fight
-      @fight = Fight.new(self)
-      @stream << Message.FightStarted(@fight.players[:home].first,
-                                      @fight.players[:away].first)
-    end
-
+    # Add amount to each stat of each player of team until the end of the game
     # @param team [Team]
     # @param amount [Numeric]
     def change_morale(team, amount)
       return if amount.zero?
 
       team.roster.each_value do |player|
-        if @pre_morale_change_stats[player].nil?
-          @pre_morale_change_stats[player] = player.stats.clone
+        if @pre_tmp_change_stats[player].nil?
+          @pre_tmp_change_stats[player] = player.stats.clone
         end
 
         player.stats.transform_values! { |stat| stat + amount }
@@ -302,9 +331,7 @@ module Hlockey
     end
 
     # @return [Player]
-    def puck_holder
-      @team_with_puck.roster[@puck_holder_pos]
-    end
+    def puck_holder = @team_with_puck.roster[@puck_holder_pos]
 
     # @return [Symbol]
     def pass_reciever
@@ -314,9 +341,7 @@ module Hlockey
     end
 
     # @return [Symbol]
-    def defensive_pos
-      Utils.weighted_random(weights(@shooting_chance < 3), @prng)
-    end
+    def defensive_pos = Utils.weighted_random(weights(@shooting_chance < 3), @prng)
 
     # @return [Hash<Symbol => Integer>]
     def weights(offensive)