From 9387e0f8dab738c7834f4ba92e4077d6d386522a Mon Sep 17 00:00:00 2001
From: demassimo <87481244+demassimo@users.noreply.github.com>
Date: Fri, 10 Oct 2025 22:59:23 +0200
Subject: [PATCH] Fix combat log parsing for optional units

---
 frontend/assets/app.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/assets/app.js b/frontend/assets/app.js
index f1cb2e7..abd79d3 100644
--- a/frontend/assets/app.js
+++ b/frontend/assets/app.js
@@ -891,8 +891,8 @@
     return null;
   }
 
-  const COMBAT_LOG_HEADER_REGEX = /^\s*time\s+attacker\s+id\s+target\s+id\s+weapon\s+ammo\s+area\s+distance\s+old_hp\s+new_hp\s+info\s+hits\s+integrity\s+travel\s+mismatch\s+desync\s*$/i;
-  const COMBAT_LOG_ENTRY_REGEX = /^(?<time>-?\d+(?:\.\d+)?)s\s+(?<attacker>\S+)\s+(?<attackerId>-?\d+)\s+(?<target>\S+)\s+(?<targetId>-?\d+)\s+(?<weapon>\S+)\s+(?<ammo>\S+)\s+(?<area>\S+)\s+(?<distance>-?\d+(?:\.\d+)?)(?<distanceUnit>m)?\s+(?<oldHp>-?\d+(?:\.\d+)?)\s+(?<newHp>-?\d+(?:\.\d+)?)\s+(?<info>\S+)\s+(?<hits>-?\d+)\s+(?<integrity>-?\d+(?:\.\d+)?)\s+(?<travel>-?\d+(?:\.\d+)?)(?<travelUnit>s|m)?\s+(?<mismatch>-?\d+(?:\.\d+)?)(?<mismatchUnit>m|s)?\s+(?<desync>-?\d+(?:\.\d+)?)\s*$/i;
+  const COMBAT_LOG_HEADER_REGEX = /^\s*time\s+attacker\s+id\s+target\s+id\s+weapon\s+ammo\s+area\s+distance\s+old[_\s]*hp\s+new[_\s]*hp\s+info\s+hits\s+integrity\s+travel\s+mismatch\s+desync\s*$/i;
+  const COMBAT_LOG_ENTRY_REGEX = /^(?<time>-?\d+(?:\.\d+)?)s\s+(?<attacker>\S+)\s+(?<attackerId>-?\d+)\s+(?<target>\S+)\s+(?<targetId>-?\d+)\s+(?<weapon>\S+)\s+(?<ammo>\S+)\s+(?<area>\S+)\s+(?<distance>-?\d+(?:\.\d+)?)(?:\s*(?<distanceUnit>m))?\s+(?<oldHp>-?\d+(?:\.\d+)?)\s+(?<newHp>-?\d+(?:\.\d+)?)\s+(?:(?<info>\S+?)(?=\s+-?\d+\s))?\s*(?<hits>-?\d+)\s+(?<integrity>-?\d+(?:\.\d+)?)\s+(?<travel>-?\d+(?:\.\d+)?)(?:\s*(?<travelUnit>s|m))?\s+(?<mismatch>-?\d+(?:\.\d+)?)(?:\s*(?<mismatchUnit>m|s))?\s+(?<desync>-?\d+(?:\.\d+)?)\s*$/i;
 
   function parseKillRawLog(raw) {
     if (typeof raw !== 'string') return null;