diff --git a/AutoTrackR2/Assets/HEX.png b/AutoTrackR2/Assets/HEX.png new file mode 100644 index 0000000..bbb7dc0 Binary files /dev/null and b/AutoTrackR2/Assets/HEX.png differ diff --git a/AutoTrackR2/AutoTrackR2.csproj b/AutoTrackR2/AutoTrackR2.csproj index 188bda1..98bb475 100644 --- a/AutoTrackR2/AutoTrackR2.csproj +++ b/AutoTrackR2/AutoTrackR2.csproj @@ -15,6 +15,7 @@ <None Remove="Assets\AVSQN.png" /> <None Remove="Assets\D3VL.png" /> <None Remove="Assets\EMP.png" /> + <None Remove="Assets\HEX.png" /> <None Remove="Assets\HIT.png" /> <None Remove="Assets\NW.png" /> <None Remove="Assets\VOX.png" /> @@ -32,29 +33,30 @@ <ItemGroup> <Resource Include="Assets\AVSQN.png"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <CopyToOutputDirectory></CopyToOutputDirectory> </Resource> <Resource Include="Assets\D3VL.png"> - <CopyToOutputDirectory>Always</CopyToOutputDirectory> + <CopyToOutputDirectory></CopyToOutputDirectory> </Resource> <Resource Include="Assets\EMP.png"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <CopyToOutputDirectory></CopyToOutputDirectory> </Resource> <Resource Include="Assets\GN.png"> - <CopyToOutputDirectory>Always</CopyToOutputDirectory> + <CopyToOutputDirectory></CopyToOutputDirectory> </Resource> <Resource Include="Assets\AutoTrackR.png"> - <CopyToOutputDirectory>Always</CopyToOutputDirectory> + <CopyToOutputDirectory></CopyToOutputDirectory> </Resource> + <Resource Include="Assets\HEX.png" /> <Resource Include="Assets\HIT.png" /> <Resource Include="Assets\NW.png"> - <CopyToOutputDirectory>Always</CopyToOutputDirectory> + <CopyToOutputDirectory></CopyToOutputDirectory> </Resource> <Resource Include="Assets\VOX.png"> - <CopyToOutputDirectory>Always</CopyToOutputDirectory> + <CopyToOutputDirectory></CopyToOutputDirectory> </Resource> <Resource Include="Assets\WRITH.jpg"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <CopyToOutputDirectory></CopyToOutputDirectory> </Resource> <Resource Include="config.ini" /> <Resource Include="Fonts\Orbitron-Bold.ttf"> diff --git a/AutoTrackR2/ConfigPage.xaml b/AutoTrackR2/ConfigPage.xaml index e2cf52a..7872246 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="11" + Maximum="12" Value="0" TickFrequency="1" IsSnapToTickEnabled="True" diff --git a/AutoTrackR2/ConfigPage.xaml.cs b/AutoTrackR2/ConfigPage.xaml.cs index 136bd2f..49e3a67 100644 --- a/AutoTrackR2/ConfigPage.xaml.cs +++ b/AutoTrackR2/ConfigPage.xaml.cs @@ -251,6 +251,16 @@ namespace AutoTrackR2 ); ChangeLogo("/Assets/AVSQN.png", (Color)ColorConverter.ConvertFromString("#3fbcff")); break; + case 12: // HEX Theme + UpdateThemeColors( + (Color)ColorConverter.ConvertFromString("#39FF14"), // Accent/Border + (Color)ColorConverter.ConvertFromString("#535353"), // Button + (Color)ColorConverter.ConvertFromString("#000800"), // Background + (Color)ColorConverter.ConvertFromString("#FFFFFF"), // Text + (Color)ColorConverter.ConvertFromString("#CFFF04") // AltText + ); + ChangeLogo("/Assets/AVSQN.png", (Color)ColorConverter.ConvertFromString("#3fbcff")); + break; } } diff --git a/AutoTrackR2/KillTrackR_MainScript.ps1 b/AutoTrackR2/KillTrackR_MainScript.ps1 index 4edc7ee..1384ad4 100644 --- a/AutoTrackR2/KillTrackR_MainScript.ps1 +++ b/AutoTrackR2/KillTrackR_MainScript.ps1 @@ -96,7 +96,7 @@ $joinDatePattern = '<span class="label">Enlisted</span>\s*<strong class="value"> $ueePattern = '<p class="entry citizen-record">\s*<span class="label">UEE Citizen Record<\/span>\s*<strong class="value">#?(n\/a|\d+)<\/strong>\s*<\/p>' [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 - +$process = Get-Process | Where-Object {$_.Name -like "AutoTrackR2"} <# $enemyPilot = "feezydafox" $enemyShip = "AEGS_Gladius" @@ -255,7 +255,6 @@ function Read-LogEntry { $KillTime = (Get-Date).ToUniversalTime().ToString("d MMM yyyy H:mm 'UTC'") - # Get Enlisted Date if ($($page1.content) -match $joinDatePattern) { $joinDate = $matches[1] @@ -436,6 +435,7 @@ function Read-LogEntry { Write-Output "PlayerShip=$global:loadOut" } } + if ($process) } # Monitor the log file and process new lines as they are added