diff --git a/AutoTrackR2/Assets/BOBGREL.png b/AutoTrackR2/Assets/BOBGREL.png new file mode 100644 index 0000000..aa66775 Binary files /dev/null and b/AutoTrackR2/Assets/BOBGREL.png differ diff --git a/AutoTrackR2/Assets/MAMMON.png b/AutoTrackR2/Assets/MAMMON.png new file mode 100644 index 0000000..93e5c02 Binary files /dev/null and b/AutoTrackR2/Assets/MAMMON.png differ diff --git a/AutoTrackR2/Assets/NMOS.png b/AutoTrackR2/Assets/NMOS.png new file mode 100644 index 0000000..bd5e76c Binary files /dev/null and b/AutoTrackR2/Assets/NMOS.png differ diff --git a/AutoTrackR2/Assets/SHADOWMOSES.png b/AutoTrackR2/Assets/SHADOWMOSES.png new file mode 100644 index 0000000..3826bab Binary files /dev/null and b/AutoTrackR2/Assets/SHADOWMOSES.png differ diff --git a/AutoTrackR2/Assets/chibifox.png b/AutoTrackR2/Assets/chibifox.png new file mode 100644 index 0000000..7c6c2d3 Binary files /dev/null and b/AutoTrackR2/Assets/chibifox.png differ diff --git a/AutoTrackR2/AutoTrackR2.csproj b/AutoTrackR2/AutoTrackR2.csproj index d49ceef..dcd9bac 100644 --- a/AutoTrackR2/AutoTrackR2.csproj +++ b/AutoTrackR2/AutoTrackR2.csproj @@ -13,11 +13,16 @@ <ItemGroup> <None Remove="Assets\AVSQN.png" /> + <None Remove="Assets\BOBGREL.png" /> + <None Remove="Assets\chibifox.png" /> <None Remove="Assets\D3VL.png" /> <None Remove="Assets\EMP.png" /> <None Remove="Assets\HEX.png" /> <None Remove="Assets\HIT.png" /> + <None Remove="Assets\MAMMON.png" /> + <None Remove="Assets\NMOS.png" /> <None Remove="Assets\NW.png" /> + <None Remove="Assets\SHADOWMOSES.png" /> <None Remove="Assets\VOX.png" /> <None Remove="Assets\WRITH.png" /> <None Remove="config.ini" /> @@ -30,10 +35,22 @@ <Content Include="AutoTrackR2.ico" /> </ItemGroup> + <ItemGroup> + <Resource Include="Assets\NMOS.png"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </Resource> + </ItemGroup> + <ItemGroup> <Resource Include="Assets\AVSQN.png"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Resource> + <Resource Include="Assets\BOBGREL.png"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </Resource> + <Resource Include="Assets\chibifox.png"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </Resource> <Resource Include="Assets\D3VL.png"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Resource> @@ -52,9 +69,15 @@ <Resource Include="Assets\HIT.png"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Resource> + <Resource Include="Assets\MAMMON.png"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </Resource> <Resource Include="Assets\NW.png"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Resource> + <Resource Include="Assets\SHADOWMOSES.png"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </Resource> <Resource Include="Assets\VOX.png"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Resource> diff --git a/AutoTrackR2/ConfigPage.xaml b/AutoTrackR2/ConfigPage.xaml index 7872246..d7e9533 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="12" + Maximum="17" Value="0" TickFrequency="1" IsSnapToTickEnabled="True" diff --git a/AutoTrackR2/ConfigPage.xaml.cs b/AutoTrackR2/ConfigPage.xaml.cs index 95e85f3..507341b 100644 --- a/AutoTrackR2/ConfigPage.xaml.cs +++ b/AutoTrackR2/ConfigPage.xaml.cs @@ -193,13 +193,13 @@ namespace AutoTrackR2 break; case 6: // D3VL Theme UpdateThemeColors( - (Color)ColorConverter.ConvertFromString("#4C1C1C"), // Accent/Border + (Color)ColorConverter.ConvertFromString("#AA0000"), // Accent/Border (Color)ColorConverter.ConvertFromString("#333333"), // Button - (Color)ColorConverter.ConvertFromString("#AAAAAA"), // Background + (Color)ColorConverter.ConvertFromString("#220000"), // Background (Color)ColorConverter.ConvertFromString("#FF0000"), // Text (Color)ColorConverter.ConvertFromString("#A88F2C") // AltText ); - ChangeLogo("/Assets/D3VL.png", (Color)ColorConverter.ConvertFromString("#000000")); + ChangeLogo("/Assets/D3VL.png", (Color)ColorConverter.ConvertFromString("#CC0000")); break; case 7: // HIT Theme UpdateThemeColors( @@ -214,10 +214,10 @@ namespace AutoTrackR2 case 8: // WRAITH Theme UpdateThemeColors( (Color)ColorConverter.ConvertFromString("#ff0000"), // Accent/Border - (Color)ColorConverter.ConvertFromString("#ce8946"), // Button - (Color)ColorConverter.ConvertFromString("#000000"), // Background - (Color)ColorConverter.ConvertFromString("#ce8946"), // Text - (Color)ColorConverter.ConvertFromString("#A88F2C") // AltText + (Color)ColorConverter.ConvertFromString("#2a2a2a"), // Button + (Color)ColorConverter.ConvertFromString("#0a0a0a"), // Background + (Color)ColorConverter.ConvertFromString("#DFDFDF"), // Text + (Color)ColorConverter.ConvertFromString("#8B0000") // AltText ); ChangeLogo("/Assets/WRITH.png", (Color)ColorConverter.ConvertFromString("#ff0000")); break; @@ -261,6 +261,56 @@ namespace AutoTrackR2 ); ChangeLogo("/Assets/HEX.png", (Color)ColorConverter.ConvertFromString("#39FF14")); break; + case 13: // Mammon Theme + UpdateThemeColors( + (Color)ColorConverter.ConvertFromString("#FFD700"), // Accent/Border - Royal Gold + (Color)ColorConverter.ConvertFromString("#2C2C2C"), // Button - Dark Gray + (Color)ColorConverter.ConvertFromString("#1A1A1A"), // Background - Rich Black + (Color)ColorConverter.ConvertFromString("#FFFFFF"), // Text - White + (Color)ColorConverter.ConvertFromString("#DAA520") // AltText - Golden Rod + ); + ChangeLogo("/Assets/MAMMON.png", (Color)ColorConverter.ConvertFromString("#FFD700")); + break; + case 14: // Shadow Moses Theme + UpdateThemeColors( + (Color)ColorConverter.ConvertFromString("#FF69B4"), // Accent/Border - Hot Pink + (Color)ColorConverter.ConvertFromString("#2C2C2C"), // Button - Dark Gray + (Color)ColorConverter.ConvertFromString("#2C1F28"), // Background - Dark Pink-Gray + (Color)ColorConverter.ConvertFromString("#E6E6E6"), // Text - Light Gray + (Color)ColorConverter.ConvertFromString("#FF1493") // AltText - Deep Pink + ); + ChangeLogo("/Assets/ShadowMoses.png", (Color)ColorConverter.ConvertFromString("#FF69B4")); + break; + case 15: // Mongrel Squad + 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 + ); + ChangeLogo("/Assets/Bobgrel.png", (Color)ColorConverter.ConvertFromString("#00BFFF")); + break; + case 16: // Feezy + UpdateThemeColors( + (Color)ColorConverter.ConvertFromString("#FFA500"), // Accent/Border - Orange + (Color)ColorConverter.ConvertFromString("#FFE4B5"), // Button - Moccasin + (Color)ColorConverter.ConvertFromString("#FFF8DC"), // Background - Cornsilk + (Color)ColorConverter.ConvertFromString("#8B4513"), // Text - Saddle Brown + (Color)ColorConverter.ConvertFromString("#FF7F50") // AltText - Coral + ); + ChangeLogo("/Assets/chibifox.png", (Color)ColorConverter.ConvertFromString("#FFA500")); + break; + case 17: // NMOS + UpdateThemeColors( + (Color)ColorConverter.ConvertFromString("#EAB787"), // Accent/Border + (Color)ColorConverter.ConvertFromString("#601C1B"), // Button + (Color)ColorConverter.ConvertFromString("#170402"), // Background + (Color)ColorConverter.ConvertFromString("#F6DBAD"), // Text + (Color)ColorConverter.ConvertFromString("#EBCAA0") // AltText + ); + ChangeLogo("/Assets/NMOS.png", (Color)ColorConverter.ConvertFromString("#EAB787")); + break; } }