tf2_line_parser 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ccca85756ff65c53f9ae713abb9b065ff9fbd5fc4141bd936c7f36726f35ddb
-  data.tar.gz: b791765db72f6cbb01c19ebe2ed85b408633359fe6ce463e713e914162ebf41c
+  metadata.gz: d62fb60bbb31b6578bbf54b7f5101f8f7fc93689c432494a08679f3e9d48cdca
+  data.tar.gz: 9a94a4deffdcda33dddffd7efdaf4c08f3b8e97a17758fd5c46c705cf67ddb77
 SHA512:
-  metadata.gz: 46b65da5de6c037e0b092149837f0dc8614a3c3f79ea64f82bda2ab0263e81b14763c86bd71d74feaaa15401d42538eb7bb3fd030848e811b09177492187471b
-  data.tar.gz: a77d21150501dff565387b89bbdb07017d5739705fb30e1e442aef90bcddfab79071da01a92e88011dec8997530cd73aa2e18875d3c7982767a0a44bdce6504a
+  metadata.gz: 1f4c05bec771e0abc994ae0d83f63e6ccda3bd7cf3296defe2690603c1754cbd474836714de8abf45aa368251a974431663287077033f277a1ad1abf6154bf24
+  data.tar.gz: 190f40d4da42c17ef659af94bcba4d890e98f5fec17ca6f1e472f3095f9058e138a22bac59a710804343a9758f7c2f9d53336bf213ca55e5e25635731da62d6c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tf2_line_parser (0.6.0)
+    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 realdamage weapon airshot]
+        @attributes ||= %i[time player_section target_section realdamage weapon healing crit airshot]
       end
 
       def self.regex_results(matched_line)
@@ -27,6 +27,8 @@ module TF2LineParser
         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
@@ -38,10 +40,10 @@ 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, realdamage, 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, realdamage, 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
@@ -49,8 +51,8 @@ module TF2LineParser
         @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/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.6.0'
+  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

@@ -89,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, nil, weapon, airshot)
+                                                      anything, anything, anything, nil, weapon, nil, nil, airshot)
         parse(line).inspect
       end
 
@@ -120,6 +120,23 @@ module TF2LineParser
         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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tf2_line_parser
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Arie