tf2_line_parser 0.5.2 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b29330a6fc24eb0ae42d3e5de61300fc75c892fccf9c2f9a04b8b361175c905
-  data.tar.gz: 1f8a4bcd5452ed7ba5ae257036f9e831ee3570844a48cacd3043d00424db9023
+  metadata.gz: d62fb60bbb31b6578bbf54b7f5101f8f7fc93689c432494a08679f3e9d48cdca
+  data.tar.gz: 9a94a4deffdcda33dddffd7efdaf4c08f3b8e97a17758fd5c46c705cf67ddb77
 SHA512:
-  metadata.gz: bf33e8f104485bbafc7cab96beabc7ddfa14979718317416563726587238e38f41bcde9cb80bc6933339e1a04065338b5796f42c0cfa92763aae9d9bce54e4d6
-  data.tar.gz: 85cac455f1a1a66cb9c2622daaebea9bf4fcbdc35e84b3e6337f745b987bd4287e87f16afd6905eff5a9760b36012b8b08792131365a02792d55832ccee4e16d
+  metadata.gz: 1f4c05bec771e0abc994ae0d83f63e6ccda3bd7cf3296defe2690603c1754cbd474836714de8abf45aa368251a974431663287077033f277a1ad1abf6154bf24
+  data.tar.gz: 190f40d4da42c17ef659af94bcba4d890e98f5fec17ca6f1e472f3095f9058e138a22bac59a710804343a9758f7c2f9d53336bf213ca55e5e25635731da62d6c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tf2_line_parser (0.5.2)
+    tf2_line_parser (0.6.1)
 
 GEM
   remote: https://rubygems.org/

data/lib/tf2_line_parser/events/airshot.rb

@@ -4,8 +4,8 @@ module TF2LineParser
   module Events
     class Airshot < Damage
       def self.regex
-        # Airshot can appear after weapon, with optional height at the end
-        @regex ||= /#{regex_time} #{regex_player} triggered "damage" #{regex_damage_against}\(damage "(?'value'\d+)"\)#{regex_realdamage}#{regex_weapon}#{regex_airshot}#{regex_height}/.freeze
+        # Airshot can appear after weapon, with optional crit/healing between weapon and airshot
+        @regex ||= /#{regex_time} #{regex_player} triggered "damage" #{regex_damage_against}\(damage "(?'value'\d+)"\)#{regex_realdamage}#{regex_weapon}#{regex_healing}#{regex_crit}#{regex_airshot}#{regex_height}/.freeze
       end
 
       def self.regex_airshot
@@ -17,7 +17,7 @@ module TF2LineParser
       end
 
       def self.attributes
-        @attributes ||= %i[time player_section target_section weapon airshot]
+        @attributes ||= %i[time player_section target_section realdamage weapon healing crit airshot]
       end
 
       def self.regex_results(matched_line)
@@ -25,7 +25,10 @@ module TF2LineParser
         player_section = matched_line['player_section']
         target_section = matched_line['target_section']
         value = matched_line['value']
+        realdamage = matched_line['realdamage']
         weapon = matched_line['weapon']
+        healing = matched_line['healing']
+        crit = matched_line['crit']
         airshot = matched_line['airshot']
 
         # Parse player section
@@ -37,18 +40,19 @@ module TF2LineParser
           target_name, target_uid, target_steamid, target_team = parse_target_section(target_section)
         end
 
-        [time, player_name, player_uid, player_steamid, player_team, target_name, target_uid, target_steamid, target_team, value, weapon, airshot]
+        [time, player_name, player_uid, player_steamid, player_team, target_name, target_uid, target_steamid, target_team, value, realdamage, weapon, healing, crit, airshot]
       end
 
-      def initialize(time, player_name, player_uid, player_steamid, player_team, target_name, target_uid, target_steamid, target_team, value, weapon, airshot)
+      def initialize(time, player_name, player_uid, player_steamid, player_team, target_name, target_uid, target_steamid, target_team, value, realdamage, weapon, healing, crit, airshot)
         @time = parse_time(time)
         @player = Player.new(player_name, player_uid, player_steamid, player_team)
         @target = Player.new(target_name, target_uid, target_steamid, target_team) if target_name
         @value = value.to_i
         @damage = @value
+        @realdamage = realdamage.to_i if realdamage && !realdamage.empty?
         @weapon = weapon
-        @healing = nil
-        @crit = nil
+        @healing = healing.to_i if healing
+        @crit = crit
         @headshot = nil
         @airshot = (airshot.to_i == 1)
       end

data/lib/tf2_line_parser/events/damage.rb

@@ -3,7 +3,7 @@
 module TF2LineParser
   module Events
     class Damage < Event
-      attr_reader :damage, :crit, :headshot, :healing
+      attr_reader :damage, :realdamage, :crit, :headshot, :healing
 
       def self.regex
         @regex ||= /#{regex_time} #{regex_player} triggered "damage" #{regex_damage_against}\(damage "(?'value'\d+)"\)#{regex_realdamage}#{regex_weapon}#{regex_healing}#{regex_crit}#{regex_headshot}/.freeze
@@ -34,7 +34,7 @@ module TF2LineParser
       end
 
       def self.attributes
-        @attributes ||= %i[time player_section target_section value weapon healing crit headshot]
+        @attributes ||= %i[time player_section target_section value realdamage weapon healing crit headshot]
       end
 
       def self.regex_results(matched_line)
@@ -42,6 +42,7 @@ module TF2LineParser
         player_section = matched_line['player_section']
         target_section = matched_line['target_section']
         value = matched_line['value']
+        realdamage = matched_line['realdamage']
         weapon = matched_line['weapon']
         healing = matched_line['healing']
         crit = matched_line['crit']
@@ -56,15 +57,16 @@ module TF2LineParser
           target_name, target_uid, target_steamid, target_team = parse_target_section(target_section)
         end
 
-        [time, player_name, player_uid, player_steamid, player_team, target_name, target_uid, target_steamid, target_team, value, weapon, healing, crit, headshot]
+        [time, player_name, player_uid, player_steamid, player_team, target_name, target_uid, target_steamid, target_team, value, realdamage, weapon, healing, crit, headshot]
       end
 
-      def initialize(time, player_name, player_uid, player_steamid, player_team, target_name, target_uid, target_steamid, target_team, value, weapon, healing, crit, headshot)
+      def initialize(time, player_name, player_uid, player_steamid, player_team, target_name, target_uid, target_steamid, target_team, value, realdamage, weapon, healing, crit, headshot)
         @time = parse_time(time)
         @player = Player.new(player_name, player_uid, player_steamid, player_team)
         @target = Player.new(target_name, target_uid, target_steamid, target_team) if target_name
         @value = value.to_i
         @damage = @value
+        @realdamage = realdamage.to_i if realdamage && !realdamage.empty?
         @weapon = weapon
         @healing = healing.to_i if healing
         @crit = crit

data/lib/tf2_line_parser/events/headshot_damage.rb

@@ -12,7 +12,7 @@ module TF2LineParser
       end
 
       def self.attributes
-        @attributes ||= %i[time player_section target_section value weapon healing crit headshot]
+        @attributes ||= %i[time player_section target_section value realdamage weapon healing crit headshot]
       end
 
       def self.regex_results(matched_line)
@@ -20,6 +20,7 @@ module TF2LineParser
         player_section = matched_line['player_section']
         target_section = matched_line['target_section']
         value = matched_line['value']
+        realdamage = matched_line['realdamage']
         weapon = matched_line['weapon']
         healing = matched_line['healing']
         crit = matched_line['crit']
@@ -34,15 +35,16 @@ module TF2LineParser
           target_name, target_uid, target_steamid, target_team = parse_target_section(target_section)
         end
 
-        [time, player_name, player_uid, player_steamid, player_team, target_name, target_uid, target_steamid, target_team, value, weapon, healing, crit, headshot]
+        [time, player_name, player_uid, player_steamid, player_team, target_name, target_uid, target_steamid, target_team, value, realdamage, weapon, healing, crit, headshot]
       end
 
-      def initialize(time, player_name, player_uid, player_steamid, player_team, target_name, target_uid, target_steamid, target_team, value, weapon, healing, crit, headshot)
+      def initialize(time, player_name, player_uid, player_steamid, player_team, target_name, target_uid, target_steamid, target_team, value, realdamage, weapon, healing, crit, headshot)
         @time = parse_time(time)
         @player = Player.new(player_name, player_uid, player_steamid, player_team)
         @target = Player.new(target_name, target_uid, target_steamid, target_team) if target_name
         @value = value.to_i
         @damage = @value
+        @realdamage = realdamage.to_i if realdamage && !realdamage.empty?
         @weapon = weapon
         @healing = healing.to_i if healing
         @crit = crit

data/lib/tf2_line_parser/events/point_capture.rb

@@ -3,19 +3,35 @@
 module TF2LineParser
   module Events
     class PointCapture < Event
+      CAPPERS_REGEX = /\(player\d+\s+"(?<player_section>[^"]*<[^>]*><[^>]*><[^>]*>)"\)/
+
+      attr_reader :cappers
+
       def self.regex
-        @regex ||= /#{regex_time} Team "(?'team'Red|Blue)" triggered "pointcaptured" \(cp "(?'cp_number'\d+)"\) \(cpname "(?'cp_name'.*)"\) \(numcappers/.freeze
+        @regex ||= /#{regex_time} Team "(?'team'Red|Blue)" triggered "pointcaptured" \(cp "(?'cp_number'\d+)"\) \(cpname "(?'cp_name'[^"]*)"\) \(numcappers "(?'numcappers'\d+)"\)(?'cappers_section'.*)/.freeze
       end
 
       def self.attributes
-        @attributes ||= %i[time team cp_number cp_name]
+        @attributes ||= %i[time team cp_number cp_name numcappers cappers_section]
       end
 
-      def initialize(time, team, cap_number, cap_name)
+      def initialize(time, team, cap_number, cap_name, _numcappers, cappers_section)
         @time = parse_time(time)
         @team = team
         @cap_number = cap_number
         @cap_name = cap_name
+        @cappers = parse_cappers(cappers_section)
+      end
+
+      private
+
+      def parse_cappers(section)
+        return [] unless section
+
+        section.scan(CAPPERS_REGEX).map do |match|
+          name, uid, steam_id, team = self.class.parse_player_section(match[0])
+          Player.new(name, uid, steam_id, team) if name
+        end.compact
       end
     end
   end

data/lib/tf2_line_parser/line.rb

@@ -157,7 +157,7 @@ module TF2LineParser
         if suffix.include?('(headshot "')
           [Events::HeadshotDamage]
         elsif suffix.include?('(airshot "')
-          [Events::Airshot]
+          [Events::Airshot, Events::Damage]
         else
           [Events::Damage]
         end

data/lib/tf2_line_parser/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TF2LineParser
-  VERSION = '0.5.2'
+  VERSION = '0.6.1'
 end

data/spec/fixtures/logs/airshot.log

@@ -5,3 +5,4 @@ L 12/18/2025 - 22:10:55: "fy<14><[U:1:442791013]><Blue>" triggered "damage" agai
 L 12/18/2025 - 22:12:57: "tantwo<17><[U:1:191375689]><Blue>" triggered "damage" against "keicam<9><[U:1:163231154]><Red>" (damage "105") (weapon "quake_rl") (airshot "1") (height "318")
 L 12/18/2025 - 22:12:58: "tantwo<17><[U:1:191375689]><Blue>" triggered "damage" against "keicam<9><[U:1:163231154]><Red>" (damage "99") (realdamage "9") (weapon "quake_rl") (airshot "1") (height "427")
 L 12/18/2025 - 22:15:21: "fy<14><[U:1:442791013]><Blue>" triggered "damage" against "gibusmain<19><[U:1:258908204]><Red>" (damage "109") (realdamage "66") (weapon "tf_projectile_rocket") (airshot "1") (height "228")
+L 03/21/2026 - 22:02:55: "Bass Windu<15><[U:1:156982175]><Blue>" triggered "damage" against "auto<14><[U:1:101982160]><Red>" (damage "152") (weapon "rocketlauncher_directhit") (crit "mini") (airshot "1") (height "242")

data/spec/lib/tf2_line_parser/parser_spec.rb

@@ -38,33 +38,29 @@ module TF2LineParser
         player_steam_id = 'STEAM_0:1:16347045'
         player_team = 'Red'
         value = '69'
+        realdamage = nil
         weapon = nil
         healing = nil
         crit = nil
         headshot = nil
         expect(Events::Damage).to receive(:new).with(anything, player_name, player_uid, player_steam_id, player_team, nil, nil,
-                                                     nil, nil, value, weapon, healing, crit, headshot)
+                                                     nil, nil, value, realdamage, weapon, healing, crit, headshot)
         parse(line)
       end
 
       it 'recognizes new steam id log lines with detailed damage' do
         line = new_log_lines[0]
-        player_name = 'iM yUKi intel @i52'
-        player_uid = '6'
-        player_steam_id = '[U:1:3825470]'
-        player_team = 'Blue'
-        target_name = 'mix^ enigma @ i52'
-        target_uid = '8'
-        target_steam_id = '[U:1:33652944]'
-        target_team = 'Red'
-        value = '78'
-        weapon = 'tf_projectile_rocket'
-        healing = nil
-        crit = nil
-        headshot = nil
-        expect(Events::Damage).to receive(:new).with(anything, player_name, player_uid, player_steam_id, player_team, target_name,
-                                                     target_uid, target_steam_id, target_team, value, weapon, healing, crit, headshot)
-        parse(line)
+        result = parse(line)
+        expect(result).to be_a(Events::Damage)
+        expect(result.player.name).to eq('iM yUKi intel @i52')
+        expect(result.player.steam_id).to eq('[U:1:3825470]')
+        expect(result.player.team).to eq('Blue')
+        expect(result.target.name).to eq('mix^ enigma @ i52')
+        expect(result.target.steam_id).to eq('[U:1:33652944]')
+        expect(result.target.team).to eq('Red')
+        expect(result.damage).to eq(78)
+        expect(result.realdamage).to eq(67)
+        expect(result.weapon).to eq('tf_projectile_rocket')
       end
 
       it 'recognizes detailed damage' do
@@ -78,12 +74,13 @@ module TF2LineParser
         target_steam_id = 'STEAM_0:0:43087158'
         target_team = 'Red'
         value = '102'
+        realdamage = nil
         weapon = 'tf_projectile_pipe'
         healing = nil
         crit = nil
         headshot = nil
         expect(Events::Damage).to receive(:new).with(anything, player_name, player_uid, player_steam_id, player_team, target_name,
-                                                     target_uid, target_steam_id, target_team, value, weapon, healing, crit, headshot)
+                                                     target_uid, target_steam_id, target_team, value, realdamage, weapon, healing, crit, headshot)
         parse(line)
       end
 
@@ -92,7 +89,7 @@ module TF2LineParser
         weapon = 'tf_projectile_rocket'
         airshot = '1'
         expect(Events::Airshot).to receive(:new).with(anything, anything, anything, anything, anything, anything, anything,
-                                                      anything, anything, anything, weapon, airshot)
+                                                      anything, anything, anything, nil, weapon, nil, nil, airshot)
         parse(line).inspect
       end
 
@@ -107,6 +104,7 @@ module TF2LineParser
         expect(result.target.steam_id).to eq('[U:1:468872526]')
         expect(result.target.team).to eq('Red')
         expect(result.damage).to eq(105)
+        expect(result.realdamage).to eq(88)
         expect(result.weapon).to eq('quake_rl')
         expect(result.airshot).to eq(true)
       end
@@ -117,10 +115,28 @@ module TF2LineParser
         expect(result).to be_a(Events::Airshot)
         expect(result.player.name).to eq('tantwo')
         expect(result.damage).to eq(105)
+        expect(result.realdamage).to be_nil
         expect(result.weapon).to eq('quake_rl')
         expect(result.airshot).to eq(true)
       end
 
+      it 'recognizes airshots with crit' do
+        line = airshot_log_lines[7]
+        result = parse(line)
+        expect(result).to be_a(Events::Airshot)
+        expect(result.player.name).to eq('Bass Windu')
+        expect(result.player.steam_id).to eq('[U:1:156982175]')
+        expect(result.player.team).to eq('Blue')
+        expect(result.target.name).to eq('auto')
+        expect(result.target.steam_id).to eq('[U:1:101982160]')
+        expect(result.target.team).to eq('Red')
+        expect(result.damage).to eq(152)
+        expect(result.realdamage).to be_nil
+        expect(result.weapon).to eq('rocketlauncher_directhit')
+        expect(result.crit).to eq('mini')
+        expect(result.airshot).to eq(true)
+      end
+
       it 'recognizes airshot heals (Crusader Crossbow mid-air)' do
         line = airshot_log_lines[2]
         result = parse(line)
@@ -160,28 +176,24 @@ module TF2LineParser
         crit = nil
         headshot = '1'
         expect(Events::HeadshotDamage).to receive(:new).with(anything, anything, anything, anything, anything, anything,
-                                                             anything, anything, anything, anything, weapon, healing, crit, headshot)
+                                                             anything, anything, anything, anything, anything, weapon, healing, crit, headshot)
         parse(line).inspect
       end
 
-      it 'ignores realdamage' do
+      it 'parses realdamage' do
         line = detailed_log_lines[65]
-        player_name = 'LittleLies'
-        player_uid = '16'
-        player_steam_id = 'STEAM_0:0:55031498'
-        player_team = 'Blue'
-        target_name = 'Aquila'
-        target_uid = '15'
-        target_steam_id = 'STEAM_0:0:43087158'
-        target_team = 'Red'
-        value = '98'
-        weapon = 'tf_projectile_pipe'
-        healing = nil
-        crit = nil
-        headshot = nil
-        expect(Events::Damage).to receive(:new).with(anything, player_name, player_uid, player_steam_id, player_team, target_name,
-                                                     target_uid, target_steam_id, target_team, value, weapon, healing, crit, headshot)
-        parse(line)
+        result = parse(line)
+        expect(result).to be_a(Events::Damage)
+        expect(result.damage).to eq(98)
+        expect(result.realdamage).to be_a(Integer)
+      end
+
+      it 'returns nil realdamage when not present' do
+        line = log_lines[1001]
+        result = parse(line)
+        expect(result).to be_a(Events::Damage)
+        expect(result.damage).to eq(69)
+        expect(result.realdamage).to be_nil
       end
 
       it 'recognizes damage with multiple optional fields' do
@@ -195,12 +207,13 @@ module TF2LineParser
         target_steam_id = 'STEAM_0:0:29650428'
         target_team = 'Blue'
         value = '150'
+        realdamage = '100'
         weapon = 'sniperrifle'
         healing = '25'
         crit = nil
         headshot = nil
         expect(Events::Damage).to receive(:new).with(anything, player_name, player_uid, player_steam_id, player_team, target_name,
-                                                     target_uid, target_steam_id, target_team, value, weapon, healing, crit, headshot)
+                                                     target_uid, target_steam_id, target_team, value, realdamage, weapon, healing, crit, headshot)
         parse(line)
       end
 
@@ -220,7 +233,7 @@ module TF2LineParser
         crit = 'crit'
         headshot = nil
         expect(Events::Damage).to receive(:new).with(anything, player_name, player_uid, player_steam_id, player_team, target_name,
-                                                     target_uid, target_steam_id, target_team, value, weapon, healing, crit, headshot)
+                                                     target_uid, target_steam_id, target_team, value, nil, weapon, healing, crit, headshot)
         parse(line)
       end
 
@@ -232,11 +245,16 @@ module TF2LineParser
 
       it 'recognizes a point capture' do
         line = log_lines[1360]
-        team = 'Blue'
-        cap_number = '2'
-        cap_name = '#Badlands_cap_cp3'
-        expect(Events::PointCapture).to receive(:new).with(anything, team, cap_number, cap_name)
-        parse(line)
+        result = parse(line)
+        expect(result).to be_a(Events::PointCapture)
+        expect(result.team).to eq('Blue')
+        expect(result.cap_number).to eq('2')
+        expect(result.cap_name).to eq('#Badlands_cap_cp3')
+        expect(result.cappers).to be_an(Array)
+        expect(result.cappers.length).to eq(4)
+        expect(result.cappers.first.name).to eq('broder Zebbosai')
+        expect(result.cappers.first.steam_id).to eq('STEAM_0:0:20805809')
+        expect(result.cappers.first.team).to eq('Blue')
       end
 
       it 'recognizes a round win' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: tf2_line_parser
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.1
 platform: ruby
 authors:
 - Arie
 bindir: bin
 cert_chain: []
-date: 2026-02-19 00:00:00.000000000 Z
+date: 2026-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coveralls_reborn