diff --git a/AutoTrackR2/App.xaml b/AutoTrackR2/App.xaml index 9df8cbc..3f3362f 100644 --- a/AutoTrackR2/App.xaml +++ b/AutoTrackR2/App.xaml @@ -181,7 +181,7 @@ <Setter Property="Template"> <Setter.Value> <ControlTemplate TargetType="Slider"> - <Grid Width="120" Height="30" HorizontalAlignment="Left" Margin="58,-6,0,0"> + <Grid Width="200" Height="30" HorizontalAlignment="Left" Margin="58,-6,0,0"> <!-- Track Background --> <Border Background="{DynamicResource BackgroundDarkBrush}" BorderBrush="{DynamicResource AccentBrush}" BorderThickness="2" CornerRadius="15" Margin="0,0,-5,-4" /> diff --git a/AutoTrackR2/Assets/BlightVeil.png b/AutoTrackR2/Assets/BlightVeil.png new file mode 100644 index 0000000..6346b10 Binary files /dev/null and b/AutoTrackR2/Assets/BlightVeil.png differ diff --git a/AutoTrackR2/Assets/RACKETEERS.png b/AutoTrackR2/Assets/RACKETEERS.png new file mode 100644 index 0000000..0159280 Binary files /dev/null and b/AutoTrackR2/Assets/RACKETEERS.png differ diff --git a/AutoTrackR2/AutoTrackR2.csproj b/AutoTrackR2/AutoTrackR2.csproj index b11a3bf..4d31b62 100644 --- a/AutoTrackR2/AutoTrackR2.csproj +++ b/AutoTrackR2/AutoTrackR2.csproj @@ -13,6 +13,7 @@ <ItemGroup> <None Remove="Assets\AVSQN.png" /> + <None Remove="Assets\BlightVeil.png" /> <None Remove="Assets\BOBGREL.png" /> <None Remove="Assets\chibifox.png" /> <None Remove="Assets\D3VL.png" /> @@ -22,13 +23,13 @@ <None Remove="Assets\MAMMON.png" /> <None Remove="Assets\NMOS.png" /> <None Remove="Assets\NW.png" /> + <None Remove="Assets\RACKETEERS.png" /> <None Remove="Assets\SHADOWMOSES.png" /> <None Remove="Assets\VOX.png" /> <None Remove="Assets\WRITH.png" /> <None Remove="config.ini" /> <None Remove="Fonts\Orbitron-Bold.ttf" /> <None Remove="Fonts\Roboto-Regular.ttf" /> - <None Remove="KillTrackR_MainScript.ps1" /> </ItemGroup> <ItemGroup> @@ -36,6 +37,9 @@ </ItemGroup> <ItemGroup> + <Resource Include="Assets\BlightVeil.png"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </Resource> <Resource Include="Assets\NMOS.png"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Resource> @@ -75,6 +79,9 @@ <Resource Include="Assets\NW.png"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Resource> + <Resource Include="Assets\RACKETEERS.png"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </Resource> <Resource Include="Assets\SHADOWMOSES.png"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Resource> @@ -91,9 +98,12 @@ <Resource Include="Fonts\Roboto-Regular.ttf"> <CopyToOutputDirectory>Always</CopyToOutputDirectory> </Resource> - <Resource Include="KillTrackR_MainScript.ps1"> + </ItemGroup> + + <ItemGroup> + <None Update="KillTrackR_MainScript.ps1"> <CopyToOutputDirectory>Always</CopyToOutputDirectory> - </Resource> + </None> </ItemGroup> </Project> diff --git a/AutoTrackR2/ConfigPage.xaml b/AutoTrackR2/ConfigPage.xaml index d7e9533..7f45e94 100644 --- a/AutoTrackR2/ConfigPage.xaml +++ b/AutoTrackR2/ConfigPage.xaml @@ -77,11 +77,11 @@ <TextBlock Text="Theme:" Foreground="{DynamicResource TextBrush}" FontSize="16" Margin="0,7,0,5"/> <Slider x:Name="ThemeSlider" Minimum="0" - Maximum="17" + Maximum="19" Value="0" TickFrequency="1" IsSnapToTickEnabled="True" - ValueChanged="ThemeSlider_ValueChanged" Width="200" + ValueChanged="ThemeSlider_ValueChanged" Width="447" Style="{StaticResource ThreePositionSlider}" /> </StackPanel> diff --git a/AutoTrackR2/ConfigPage.xaml.cs b/AutoTrackR2/ConfigPage.xaml.cs index 507341b..6200999 100644 --- a/AutoTrackR2/ConfigPage.xaml.cs +++ b/AutoTrackR2/ConfigPage.xaml.cs @@ -311,6 +311,26 @@ namespace AutoTrackR2 ); ChangeLogo("/Assets/NMOS.png", (Color)ColorConverter.ConvertFromString("#EAB787")); break; + case 18: // Rakk Theme + UpdateThemeColors( + (Color)ColorConverter.ConvertFromString("#FF00FF"), // Accent/Border - Magenta + (Color)ColorConverter.ConvertFromString("#1C1C1C"), // Button - Dark Gray + (Color)ColorConverter.ConvertFromString("#0A0A0A"), // Background - Nearly Black + (Color)ColorConverter.ConvertFromString("#E6E6E6"), // Text - Light Gray + (Color)ColorConverter.ConvertFromString("#00BFFF") // AltText - Deep Sky Blue + ); + ChangeLogo("/Assets/RACKETEERS.png", (Color)ColorConverter.ConvertFromString("#FF00FF")); + break; + case 19: // Blightveil Theme + UpdateThemeColors( + (Color)ColorConverter.ConvertFromString("#8B4AC6"), // Accent/Border - Purple from the logo border + (Color)ColorConverter.ConvertFromString("#2A2035"), // Button - Darker purple for buttons + (Color)ColorConverter.ConvertFromString("#1A1621"), // Background - Very dark purple/black + (Color)ColorConverter.ConvertFromString("#FFFFFF"), // Text - White like the logo text + (Color)ColorConverter.ConvertFromString("#FF3333") // AltText - Red like the eyes + ); + ChangeLogo("/Assets/Blightveil.png", (Color)ColorConverter.ConvertFromString("#8B4AC6")); + break; } }