diff --git a/AutoTrackR2/Assets/HEX.png b/AutoTrackR2/Assets/HEX.png
index bdfee11..e3fa43c 100644
Binary files a/AutoTrackR2/Assets/HEX.png and b/AutoTrackR2/Assets/HEX.png differ
diff --git a/AutoTrackR2/Assets/IP.png b/AutoTrackR2/Assets/IP.png
new file mode 100644
index 0000000..99fa950
Binary files /dev/null and b/AutoTrackR2/Assets/IP.png differ
diff --git a/AutoTrackR2/AutoTrackR2.csproj b/AutoTrackR2/AutoTrackR2.csproj
index 7c2355c..0ba95b7 100644
--- a/AutoTrackR2/AutoTrackR2.csproj
+++ b/AutoTrackR2/AutoTrackR2.csproj
@@ -45,6 +45,12 @@
<Resource Include="Assets\Gankhub.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
+ <Resource Include="Assets\HEX.png">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Resource>
+ <Resource Include="Assets\IP.png">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Resource>
<Resource Include="Assets\NMOS.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
@@ -72,9 +78,6 @@
<Resource Include="Assets\AutoTrackR.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
- <Resource Include="Assets\HEX.png">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Resource>
<Resource Include="Assets\HIT.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
diff --git a/AutoTrackR2/ConfigPage.xaml b/AutoTrackR2/ConfigPage.xaml
index 605a79a..3b2016f 100644
--- a/AutoTrackR2/ConfigPage.xaml
+++ b/AutoTrackR2/ConfigPage.xaml
@@ -77,7 +77,7 @@
<TextBlock Text="Theme:" Foreground="{DynamicResource TextBrush}" FontSize="16" Margin="0,7,0,5"/>
<Slider x:Name="ThemeSlider"
Minimum="0"
- Maximum="20"
+ Maximum="21"
Value="0"
TickFrequency="1"
IsSnapToTickEnabled="True"
diff --git a/AutoTrackR2/ConfigPage.xaml.cs b/AutoTrackR2/ConfigPage.xaml.cs
index a20fdf7..5e7f366 100644
--- a/AutoTrackR2/ConfigPage.xaml.cs
+++ b/AutoTrackR2/ConfigPage.xaml.cs
@@ -341,6 +341,16 @@ namespace AutoTrackR2
);
ChangeLogo("/Assets/Gankhub.png");
break;
+ case 21: // IronPoint
+ UpdateThemeColors(
+ (Color)ColorConverter.ConvertFromString("#C83300"), // Accent/Border
+ (Color)ColorConverter.ConvertFromString("#2D2D2D"), // Button
+ (Color)ColorConverter.ConvertFromString("#161515"), // Background
+ (Color)ColorConverter.ConvertFromString("#ffffff"), // Text
+ (Color)ColorConverter.ConvertFromString("#aaaaaa") // AltText
+ );
+ ChangeLogo("/Assets/IP.png", (Color)ColorConverter.ConvertFromString("#3F1210"));
+ break;
}
}
diff --git a/AutoTrackR2/KillTrackR_MainScript.ps1 b/AutoTrackR2/KillTrackR_MainScript.ps1
index b6a5aa6..42bd176 100644
--- a/AutoTrackR2/KillTrackR_MainScript.ps1
+++ b/AutoTrackR2/KillTrackR_MainScript.ps1
@@ -89,9 +89,9 @@ $prefixes = @(
# Define the regex pattern to extract information
$killPattern = "<Actor Death> CActor::Kill: '(?<EnemyPilot>[^']+)' \[\d+\] in zone '(?<EnemyShip>[^']+)' killed by '(?<Player>[^']+)' \[[^']+\] using '(?<Weapon>[^']+)' \[Class (?<Class>[^\]]+)\] with damage type '(?<DamageType>[^']+)'"
-$puPattern = '<\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z> \[Notice\] <ContextEstablisherTaskFinished> establisher="CReplicationModel" message="CET completed" taskname="StopLoadingScreen" state=[^ ]+ status="Finished" runningTime=\d+\.\d+ numRuns=\d+ map="megamap" gamerules="SC_Default" sessionId="[a-f0-9\-]+" \[Team_Network\]\[Network\]\[Replication\]\[Loading\]\[Persistence\]'
-$acPattern = "ArenaCommanderFeature"
-$loadoutPattern = '\[InstancedInterior\] OnEntityLeaveZone - InstancedInterior \[(?<InstancedInterior>[^\]]+)\] \[\d+\] -> Entity \[(?<Entity>[^\]]+)\] \[\d+\] -- m_openDoors\[\d+\], m_managerGEID\[(?<ManagerGEID>\d+)\], m_ownerGEID\[(?<OwnerGEID>[^\[]+)\]'
+$puPattern = '<\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z> \[Notice\] <ContextEstablisherTaskFinished> establisher="CReplicationModel" message="CET completed" taskname="StopLoadingScreen" state=[^\s()]+\(\d+\) status="Finished" runningTime=\d+\.\d+ numRuns=\d+ map="megamap" gamerules="SC_Default" sessionId="[a-f0-9\-]+" \[Team_Network\]\[Network\]\[Replication\]\[Loading\]\[Persistence\]'
+$loadoutPattern = '<Jump Drive State Changed>.*.adam: (?<ShipName>.*.) in'
+$acPattern = "Requesting Mode Change" # "ArenaCommanderFeature"
$shipManPattern = "^(" + ($prefixes -join "|") + ")"
# $loginPattern = "\[Notice\] <AccountLoginCharacterStatus_Character> Character: createdAt [A-Za-z0-9]+ - updatedAt [A-Za-z0-9]+ - geid [A-Za-z0-9]+ - accountId [A-Za-z0-9]+ - name (?<Player>[A-Za-z0-9_-]+) - state STATE_CURRENT" # KEEP THIS INCASE LEGACY LOGIN IS REMOVED
$loginPattern = "\[Notice\] <Legacy login response> \[CIG-net\] User Login Success - Handle\[(?<Player>[A-Za-z0-9_-]+)\]"
@@ -148,19 +148,13 @@ Do {
}
# Get Loadout
if ($line -match $loadoutPattern) {
- $entity = $matches['Entity']
- $ownerGEID = $matches['OwnerGEID']
-
- If ($ownerGEID -eq $global:userName -and $entity -match $shipManPattern) {
- $tryloadOut = $entity
- If ($tryloadOut -match $cleanupPattern){
+ If ($matches['ShipName'] -match $cleanupPattern){
if ($null -ne $matches[1]){
$global:loadOut = $matches[1]
}
- }
- }
+ }
+ Write-Output "PlayerShip=$global:loadOut"
}
- Write-Output "PlayerShip=$global:loadOut"
If ($line -match $versionPattern){
$global:GameVersion = $matches['gameversion']
@@ -465,18 +459,15 @@ function Read-LogEntry {
}
#Set loadout
- if ($line -match $loadoutPattern) {
- $entity = $matches['Entity']
- $ownerGEID = $matches['OwnerGEID']
+ if ($line -match $loadoutPattern) {
+ If ($matches['ShipName'] -match $cleanupPattern){
+ if ($null -ne $matches[1]){
+ $global:loadOut = $matches[1]
+ }
+ }
+ Write-Output "PlayerShip=$global:loadOut"
+ }
- If ($ownerGEID -eq $global:userName -and $entity -match $shipManPattern) {
- $tryloadOut = $entity
- If ($tryloadOut -match $cleanupPattern){
- $global:loadOut = $matches[1]
- }
- Write-Output "PlayerShip=$global:loadOut"
- }
- }
}
diff --git a/AutoTrackR2/UpdatePage.xaml.cs b/AutoTrackR2/UpdatePage.xaml.cs
index 946fa27..0d834fd 100644
--- a/AutoTrackR2/UpdatePage.xaml.cs
+++ b/AutoTrackR2/UpdatePage.xaml.cs
@@ -9,7 +9,7 @@ namespace AutoTrackR2
{
public partial class UpdatePage : UserControl
{
- private string currentVersion = "v2.06-stable";
+ private string currentVersion = "v2.08";
private string latestVersion;
public UpdatePage()