GuillaumeHemmen/AutoTrackR2
1
0
Fork 0
mirror of https://github.com/BubbaGumpShrump/AutoTrackR2.git synced 2025-06-19 04:59:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes.

Browse source
This commit is contained in:
Heavy Bob 2025-04-11 08:04:46 +10:00
parent 281f714ec4
commit f21fad999f
1 changed files with 17 additions and 12 deletions

29
AutoTrackR2/LogEventHandlers/ActorDeathEvent.cs
View file

@ -1,5 +1,6 @@
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using AutoTrackR2.Constants; using AutoTrackR2.Constants;
using AutoTrackR2;
namespace AutoTrackR2.LogEventHandlers; namespace AutoTrackR2.LogEventHandlers;
@ -17,9 +18,9 @@ public struct ActorDeathData
public class ActorDeathEvent : ILogEventHandler public class ActorDeathEvent : ILogEventHandler
{ {
public Regex Pattern { get; } public Regex Pattern { get; }
private Regex _cleanUpPattern = new Regex(@"^(.+?)_\d+$");
private Regex _shipManufacturerPattern; private Regex _shipManufacturerPattern;
private string _lastKillShip = string.Empty; private string _lastKillShip = string.Empty;
private Regex cleanUpPattern = new Regex(@"^(.+?)_\d+$");
public ActorDeathEvent() public ActorDeathEvent()
{ {
@ -29,12 +30,6 @@ public class ActorDeathEvent : ILogEventHandler
private bool IsValidShip(string shipName) private bool IsValidShip(string shipName)
{ {
// Clean up the ship name first
if (_cleanUpPattern.IsMatch(shipName))
{
shipName = _cleanUpPattern.Match(shipName).Groups[1].Value;
}
// A valid ship must start with a known manufacturer // A valid ship must start with a known manufacturer
return _shipManufacturerPattern.IsMatch(shipName); return _shipManufacturerPattern.IsMatch(shipName);
} }
@ -57,10 +52,10 @@ public class ActorDeathEvent : ILogEventHandler
Timestamp = match.Groups["Timestamp"].Value Timestamp = match.Groups["Timestamp"].Value
}; };
// Clean up weapon name // Check if the damage type is TakeDown or Melee
if (_cleanUpPattern.IsMatch(data.Weapon)) if (data.DamageType == "TakeDown" || data.DamageType == "Melee")
{ {
data.Weapon = _cleanUpPattern.Match(data.Weapon).Groups[1].Value; LocalPlayerData.PlayerShip = "Player";
} }
// First check if this is a valid ship // First check if this is a valid ship
@ -80,8 +75,18 @@ public class ActorDeathEvent : ILogEventHandler
_lastKillShip = data.VictimShip; _lastKillShip = data.VictimShip;
} }
} }
// Clean up ship and weapon names (only if not set to Player or Passenger)
if (data.VictimShip != "Player" && data.VictimShip != "Passenger" && cleanUpPattern.IsMatch(data.VictimShip))
{
data.VictimShip = cleanUpPattern.Match(data.VictimShip).Groups[1].Value;
}
if (cleanUpPattern.IsMatch(data.Weapon))
{
data.Weapon = cleanUpPattern.Match(data.Weapon).Groups[1].Value;
}
TrackREventDispatcher.OnActorDeathEvent(data); TrackREventDispatcher.OnActorDeathEvent(data);
} }
} }