diff --git a/AutoTrackR2/.vscode/launch.json b/AutoTrackR2/.vscode/launch.json new file mode 100644 index 0000000..01c6023 --- /dev/null +++ b/AutoTrackR2/.vscode/launch.json @@ -0,0 +1,26 @@ +{ + "version": "0.2.0", + "configurations": [ + { + // Use IntelliSense to find out which attributes exist for C# debugging + // Use hover for the description of the existing attributes + // For further information visit https://github.com/dotnet/vscode-csharp/blob/main/debugger-launchjson.md + "name": ".NET Core Launch (console)", + "type": "coreclr", + "request": "launch", + "preLaunchTask": "build", + // If you have changed target frameworks, make sure to update the program path. + "program": "${workspaceFolder}/bin/Debug/net9.0-windows/AutoTrackR2.dll", + "args": [], + "cwd": "${workspaceFolder}", + // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console + "console": "internalConsole", + "stopAtEntry": false + }, + { + "name": ".NET Core Attach", + "type": "coreclr", + "request": "attach" + } + ] +} \ No newline at end of file diff --git a/AutoTrackR2/.vscode/tasks.json b/AutoTrackR2/.vscode/tasks.json new file mode 100644 index 0000000..40ad6ea --- /dev/null +++ b/AutoTrackR2/.vscode/tasks.json @@ -0,0 +1,41 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "label": "build", + "command": "dotnet", + "type": "process", + "args": [ + "build", + "${workspaceFolder}/AutoTrackR2.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary;ForceNoAlign" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "publish", + "command": "dotnet", + "type": "process", + "args": [ + "publish", + "${workspaceFolder}/AutoTrackR2.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary;ForceNoAlign" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "watch", + "command": "dotnet", + "type": "process", + "args": [ + "watch", + "run", + "--project", + "${workspaceFolder}/AutoTrackR2.csproj" + ], + "problemMatcher": "$msCompile" + } + ] +} \ No newline at end of file diff --git a/AutoTrackR2/Assets/cinderborn.png b/AutoTrackR2/Assets/cinderborn.png new file mode 100644 index 0000000..b684f40 Binary files /dev/null and b/AutoTrackR2/Assets/cinderborn.png differ diff --git a/AutoTrackR2/Assets/shadowguard.png b/AutoTrackR2/Assets/shadowguard.png new file mode 100644 index 0000000..5b1c2d6 Binary files /dev/null and b/AutoTrackR2/Assets/shadowguard.png differ diff --git a/AutoTrackR2/AutoTrackR2.csproj b/AutoTrackR2/AutoTrackR2.csproj index 0ba95b7..3742d38 100644 --- a/AutoTrackR2/AutoTrackR2.csproj +++ b/AutoTrackR2/AutoTrackR2.csproj @@ -17,6 +17,7 @@ <None Remove="Assets\BlightVeil.png" /> <None Remove="Assets\BOBGREL.png" /> <None Remove="Assets\chibifox.png" /> + <None Remove="Assets\cinderborn.png" /> <None Remove="Assets\D3VL.png" /> <None Remove="Assets\EMP.png" /> <None Remove="Assets\Gankhub.png" /> @@ -26,6 +27,7 @@ <None Remove="Assets\NMOS.png" /> <None Remove="Assets\NW.png" /> <None Remove="Assets\RACKETEERS.png" /> + <None Remove="Assets\shadowguard.png" /> <None Remove="Assets\SHADOWMOSES.png" /> <None Remove="Assets\VOX.png" /> <None Remove="Assets\WRITH.png" /> @@ -42,6 +44,9 @@ <Resource Include="Assets\BlightVeil.png"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Resource> + <Resource Include="Assets\cinderborn.png"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </Resource> <Resource Include="Assets\Gankhub.png"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Resource> @@ -90,6 +95,9 @@ <Resource Include="Assets\RACKETEERS.png"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Resource> + <Resource Include="Assets\shadowguard.png"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </Resource> <Resource Include="Assets\SHADOWMOSES.png"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Resource> diff --git a/AutoTrackR2/ConfigPage.xaml.cs b/AutoTrackR2/ConfigPage.xaml.cs index 5e7f366..ec23dea 100644 --- a/AutoTrackR2/ConfigPage.xaml.cs +++ b/AutoTrackR2/ConfigPage.xaml.cs @@ -221,15 +221,15 @@ namespace AutoTrackR2 ); ChangeLogo("/Assets/WRITH.png", (Color)ColorConverter.ConvertFromString("#ff0000")); break; - case 9: // VOX Theme + case 9: // Cinderborn Theme UpdateThemeColors( - (Color)ColorConverter.ConvertFromString("#C0C0C0"), // Accent/Border + (Color)ColorConverter.ConvertFromString("#E4080A"), // Accent/Border (Color)ColorConverter.ConvertFromString("#1C1C1C"), // Button - (Color)ColorConverter.ConvertFromString("#424242"), // Background - (Color)ColorConverter.ConvertFromString("#FFD700"), // Text - (Color)ColorConverter.ConvertFromString("#817E79") // AltText + (Color)ColorConverter.ConvertFromString("#000000"), // Background + (Color)ColorConverter.ConvertFromString("#FE934C"), // Text + (Color)ColorConverter.ConvertFromString("#FE934C") // AltText ); - ChangeLogo("/Assets/VOX.png", (Color)ColorConverter.ConvertFromString("#FFD700")); + ChangeLogo("/Assets/cinderborn.png", (Color)ColorConverter.ConvertFromString("#DE5900")); break; case 10: // EMP Theme UpdateThemeColors( @@ -281,15 +281,15 @@ namespace AutoTrackR2 ); ChangeLogo("/Assets/ShadowMoses.png", (Color)ColorConverter.ConvertFromString("#FF69B4")); break; - case 15: // Mongrel Squad + case 15: // Shadow Guardian UpdateThemeColors( - (Color)ColorConverter.ConvertFromString("#00416A"), // Accent/Border - NyQuil Dark Blue - (Color)ColorConverter.ConvertFromString("#1B3F5C"), // Button - Midnight Blue - (Color)ColorConverter.ConvertFromString("#002E4D"), // Background - Deep NyQuil Blue - (Color)ColorConverter.ConvertFromString("#B0C4DE"), // Text - Light Steel Blue - (Color)ColorConverter.ConvertFromString("#4F94CD") // AltText - Steel Blue + (Color)ColorConverter.ConvertFromString("#AC9248"), // Accent/Border - NyQuil Dark Blue + (Color)ColorConverter.ConvertFromString("#000920"), // Button - Midnight Blue + (Color)ColorConverter.ConvertFromString("#000000"), // Background - Deep NyQuil Blue + (Color)ColorConverter.ConvertFromString("#B9B9B9"), // Text - Light Steel Blue + (Color)ColorConverter.ConvertFromString("#D20103") // AltText - Steel Blue ); - ChangeLogo("/Assets/Bobgrel.png", (Color)ColorConverter.ConvertFromString("#00BFFF")); + ChangeLogo("/Assets/shadowguard.png", (Color)ColorConverter.ConvertFromString("#E4080A")); break; case 16: // Feezy UpdateThemeColors( diff --git a/AutoTrackR2/KillTrackR_MainScript.ps1 b/AutoTrackR2/KillTrackR_MainScript.ps1 index 2fb1d52..6a0d83a 100644 --- a/AutoTrackR2/KillTrackR_MainScript.ps1 +++ b/AutoTrackR2/KillTrackR_MainScript.ps1 @@ -1,4 +1,4 @@ -$TrackRver = "2.07" +$TrackRver = "2.09" # Path to the config file $appName = "AutoTrackR2" @@ -363,6 +363,7 @@ function Read-LogEntry { # Create an object to hold the data $killData = [PSCustomObject]@{ + Kill = "Kill" KillTime = $killTime EnemyPilot = $enemyPilot EnemyShip = $enemyShip diff --git a/AutoTrackR2/UpdatePage.xaml.cs b/AutoTrackR2/UpdatePage.xaml.cs index 0d834fd..dc92638 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.08"; + private string currentVersion = "v2.09"; private string latestVersion; public UpdatePage()