GuillaumeHemmen/AutoTrackR2
1
0
Fork 0
mirror of https://github.com/BubbaGumpShrump/AutoTrackR2.git synced 2025-06-19 04:59:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added new themes and refactor old themes

Browse source
This commit is contained in:
Heavy Bob 2025-04-07 14:01:50 +10:00
parent 1de9582eaf
commit 271afee9ad
7 changed files with 100 additions and 43 deletions

BIN
AutoTrackR2/Assets/ZAP.png Normal file
View file

Binary file not shown.
Side by side

After

(image error) Size: 16 KiB

BIN
AutoTrackR2/Assets/cinderborn.png Normal file
View file

Binary file not shown.
Side by side

After

(image error) Size: 114 KiB

BIN
AutoTrackR2/Assets/shadowguard.png Normal file
View file

Binary file not shown.
Side by side

After

(image error) Size: 5.3 MiB

10
AutoTrackR2/AutoTrackR2.csproj
View file

@ -29,6 +29,7 @@
<None Remove="Assets\SHADOWMOSES.png" /> <None Remove="Assets\SHADOWMOSES.png" />
<None Remove="Assets\VOX.png" /> <None Remove="Assets\VOX.png" />
<None Remove="Assets\WRITH.png" /> <None Remove="Assets\WRITH.png" />
<None Remove="Assets\ZAP.png" />
<None Remove="config.ini" /> <None Remove="config.ini" />
<None Remove="Fonts\Orbitron-Bold.ttf" /> <None Remove="Fonts\Orbitron-Bold.ttf" />
<None Remove="Fonts\Roboto-Regular.ttf" /> <None Remove="Fonts\Roboto-Regular.ttf" />
@ -99,6 +100,15 @@
<Resource Include="Assets\WRITH.png"> <Resource Include="Assets\WRITH.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource> </Resource>
<Resource Include="Assets\cinderborn.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\shadowguard.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\ZAP.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
<Resource Include="config.ini" /> <Resource Include="config.ini" />
<Resource Include="Fonts\Orbitron-Bold.ttf"> <Resource Include="Fonts\Orbitron-Bold.ttf">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>

2
AutoTrackR2/ConfigPage.xaml
View file

@ -207,7 +207,7 @@
Margin="0,7,0,5"/> Margin="0,7,0,5"/>
<Slider x:Name="ThemeSlider" <Slider x:Name="ThemeSlider"
Minimum="0" Minimum="0"
Maximum="21" Maximum="24"
Value="0" Value="0"
TickFrequency="1" TickFrequency="1"
IsSnapToTickEnabled="True" IsSnapToTickEnabled="True"

102
AutoTrackR2/ConfigPage.xaml.cs
View file

@ -173,11 +173,11 @@ namespace AutoTrackR2
break; break;
case 4: // GN Theme case 4: // GN Theme
UpdateThemeColors( UpdateThemeColors(
(Color)ColorConverter.ConvertFromString("#FF0000"), // Accent/Border (Color)ColorConverter.ConvertFromString("#FF0000"), // Accent/Border - Pure red for maximum impact
(Color)ColorConverter.ConvertFromString("#1C1C1C"), // Button (Color)ColorConverter.ConvertFromString("#1A0000"), // Button - Deep black-red
(Color)ColorConverter.ConvertFromString("#000000"), // Background (Color)ColorConverter.ConvertFromString("#0A0000"), // Background - Near black
(Color)ColorConverter.ConvertFromString("#FBC603"), // Text (Color)ColorConverter.ConvertFromString("#FFD700"), // Text - Gold for high visibility
(Color)ColorConverter.ConvertFromString("#BFA8A6") // AltText (Color)ColorConverter.ConvertFromString("#FF4500") // AltText - Orange-red for contrast
); );
ChangeLogo("/Assets/GN.png", (Color)ColorConverter.ConvertFromString("#FF0000")); ChangeLogo("/Assets/GN.png", (Color)ColorConverter.ConvertFromString("#FF0000"));
break; break;
@ -221,15 +221,15 @@ namespace AutoTrackR2
); );
ChangeLogo("/Assets/WRITH.png", (Color)ColorConverter.ConvertFromString("#ff0000")); ChangeLogo("/Assets/WRITH.png", (Color)ColorConverter.ConvertFromString("#ff0000"));
break; break;
case 9: // VOX Theme case 9: // Cinderborn Theme
UpdateThemeColors( UpdateThemeColors(
(Color)ColorConverter.ConvertFromString("#C0C0C0"), // Accent/Border (Color)ColorConverter.ConvertFromString("#FF4500"), // Accent/Border - Bright fiery orange-red
(Color)ColorConverter.ConvertFromString("#1C1C1C"), // Button (Color)ColorConverter.ConvertFromString("#2A0A0A"), // Button - Deep blood red
(Color)ColorConverter.ConvertFromString("#424242"), // Background (Color)ColorConverter.ConvertFromString("#1A0000"), // Background - Darkest red-black
(Color)ColorConverter.ConvertFromString("#FFD700"), // Text (Color)ColorConverter.ConvertFromString("#FF8C42"), // Text - Warm orange
(Color)ColorConverter.ConvertFromString("#817E79") // AltText (Color)ColorConverter.ConvertFromString("#FF6B35") // AltText - Slightly darker orange
); );
ChangeLogo("/Assets/VOX.png", (Color)ColorConverter.ConvertFromString("#FFD700")); ChangeLogo("/Assets/cinderborn.png", (Color)ColorConverter.ConvertFromString("#FF4500"));
break; break;
case 10: // EMP Theme case 10: // EMP Theme
UpdateThemeColors( UpdateThemeColors(
@ -243,23 +243,23 @@ namespace AutoTrackR2
break; break;
case 11: // AVS Theme case 11: // AVS Theme
UpdateThemeColors( UpdateThemeColors(
(Color)ColorConverter.ConvertFromString("#3fbcff"), // Accent/Border (Color)ColorConverter.ConvertFromString("#00BFFF"), // Accent/Border - Deep Sky Blue
(Color)ColorConverter.ConvertFromString("#060606"), // Button (Color)ColorConverter.ConvertFromString("#001F3F"), // Button - Dark Navy
(Color)ColorConverter.ConvertFromString("#333333"), // Background (Color)ColorConverter.ConvertFromString("#000B1A"), // Background - Darker Navy
(Color)ColorConverter.ConvertFromString("#e8e8e8"), // Text (Color)ColorConverter.ConvertFromString("#FFFFFF"), // Text - Pure White
(Color)ColorConverter.ConvertFromString("#A88F2C") // AltText (Color)ColorConverter.ConvertFromString("#87CEEB") // AltText - Sky Blue
); );
ChangeLogo("/Assets/AVSQN.png", (Color)ColorConverter.ConvertFromString("#3fbcff")); ChangeLogo("/Assets/AVSQN.png", (Color)ColorConverter.ConvertFromString("#00BFFF"));
break; break;
case 12: // HEX Theme case 12: // HEX Theme
UpdateThemeColors( UpdateThemeColors(
(Color)ColorConverter.ConvertFromString("#39FF14"), // Accent/Border (Color)ColorConverter.ConvertFromString("#00FF00"), // Accent/Border - Bright Green
(Color)ColorConverter.ConvertFromString("#535353"), // Button (Color)ColorConverter.ConvertFromString("#001A00"), // Button - Deep Forest Green
(Color)ColorConverter.ConvertFromString("#000800"), // Background (Color)ColorConverter.ConvertFromString("#000D00"), // Background - Darker Forest Green
(Color)ColorConverter.ConvertFromString("#FFFFFF"), // Text (Color)ColorConverter.ConvertFromString("#FFFFFF"), // Text - Pure White
(Color)ColorConverter.ConvertFromString("#CFFF04") // AltText (Color)ColorConverter.ConvertFromString("#39FF14") // AltText - Neon Green
); );
ChangeLogo("/Assets/HEX.png", (Color)ColorConverter.ConvertFromString("#39FF14")); ChangeLogo("/Assets/HEX.png", (Color)ColorConverter.ConvertFromString("#00FF00"));
break; break;
case 13: // Mammon Theme case 13: // Mammon Theme
UpdateThemeColors( UpdateThemeColors(
@ -283,13 +283,13 @@ namespace AutoTrackR2
break; break;
case 15: // Mongrel Squad case 15: // Mongrel Squad
UpdateThemeColors( UpdateThemeColors(
(Color)ColorConverter.ConvertFromString("#00416A"), // Accent/Border - NyQuil Dark Blue (Color)ColorConverter.ConvertFromString("#00BFFF"), // Accent/Border - Deep Sky Blue
(Color)ColorConverter.ConvertFromString("#1B3F5C"), // Button - Midnight Blue (Color)ColorConverter.ConvertFromString("#003366"), // Button - Dark Navy
(Color)ColorConverter.ConvertFromString("#002E4D"), // Background - Deep NyQuil Blue (Color)ColorConverter.ConvertFromString("#001F3F"), // Background - Darker Navy
(Color)ColorConverter.ConvertFromString("#B0C4DE"), // Text - Light Steel Blue (Color)ColorConverter.ConvertFromString("#E6F3FF"), // Text - Light Sky Blue
(Color)ColorConverter.ConvertFromString("#4F94CD") // AltText - Steel Blue (Color)ColorConverter.ConvertFromString("#87CEEB") // AltText - Sky Blue
); );
ChangeLogo("/Assets/Bobgrel.png", (Color)ColorConverter.ConvertFromString("#00BFFF")); ChangeLogo("/Assets/BOBGREL.png", (Color)ColorConverter.ConvertFromString("#00BFFF"));
break; break;
case 16: // Feezy case 16: // Feezy
UpdateThemeColors( UpdateThemeColors(
@ -343,13 +343,43 @@ namespace AutoTrackR2
break; break;
case 21: // IronPoint case 21: // IronPoint
UpdateThemeColors( UpdateThemeColors(
(Color)ColorConverter.ConvertFromString("#C83300"), // Accent/Border (Color)ColorConverter.ConvertFromString("#FF0000"), // Accent/Border
(Color)ColorConverter.ConvertFromString("#2D2D2D"), // Button (Color)ColorConverter.ConvertFromString("#1C1C1C"), // Button
(Color)ColorConverter.ConvertFromString("#161515"), // Background (Color)ColorConverter.ConvertFromString("#000000"), // Background
(Color)ColorConverter.ConvertFromString("#ffffff"), // Text (Color)ColorConverter.ConvertFromString("#FFFFFF"), // Text
(Color)ColorConverter.ConvertFromString("#aaaaaa") // AltText (Color)ColorConverter.ConvertFromString("#A88F2C") // AltText
); );
ChangeLogo("/Assets/IP.png", (Color)ColorConverter.ConvertFromString("#3F1210")); ChangeLogo("/Assets/IP.png", (Color)ColorConverter.ConvertFromString("#FF0000"));
break;
case 22: // Shadow Guardian Theme
UpdateThemeColors(
(Color)ColorConverter.ConvertFromString("#8B0000"), // Accent/Border - Dark blood red
(Color)ColorConverter.ConvertFromString("#1A0000"), // Button - Deep black-red
(Color)ColorConverter.ConvertFromString("#0A0000"), // Background - Near black
(Color)ColorConverter.ConvertFromString("#D3D3D3"), // Text - Light silver
(Color)ColorConverter.ConvertFromString("#B22222") // AltText - Firebrick red
);
ChangeLogo("/Assets/shadowguard.png", (Color)ColorConverter.ConvertFromString("#8B0000"));
break;
case 23: // VOX Theme
UpdateThemeColors(
(Color)ColorConverter.ConvertFromString("#C0C0C0"), // Accent/Border
(Color)ColorConverter.ConvertFromString("#1C1C1C"), // Button
(Color)ColorConverter.ConvertFromString("#424242"), // Background
(Color)ColorConverter.ConvertFromString("#FFD700"), // Text
(Color)ColorConverter.ConvertFromString("#817E79") // AltText
);
ChangeLogo("/Assets/VOX.png", (Color)ColorConverter.ConvertFromString("#FFD700"));
break;
case 24: // Zap Theme
UpdateThemeColors(
(Color)ColorConverter.ConvertFromString("#FFD700"), // Accent/Border - Electric Yellow
(Color)ColorConverter.ConvertFromString("#1A1A1A"), // Button - Deep Black
(Color)ColorConverter.ConvertFromString("#0A0A0A"), // Background - Near Black
(Color)ColorConverter.ConvertFromString("#FFFFFF"), // Text - Pure White
(Color)ColorConverter.ConvertFromString("#FFA500") // AltText - Electric Orange
);
ChangeLogo("/Assets/ZAP.png", (Color)ColorConverter.ConvertFromString("#FFD700"));
break; break;
} }
} }

29
AutoTrackR2/MainWindow.xaml.cs
View file

@ -25,7 +25,24 @@ namespace AutoTrackR2
public void ChangeLogoImage(string imagePath) public void ChangeLogoImage(string imagePath)
{ {
Logo.Source = new BitmapImage(new Uri(imagePath, UriKind.RelativeOrAbsolute)); try
{
// Ensure the path starts with a forward slash for WPF resource paths
if (!imagePath.StartsWith("/"))
{
imagePath = "/" + imagePath;
}
// Create a pack URI for the resource
Uri uri = new Uri($"pack://application:,,,/AutoTrackR2;component{imagePath}", UriKind.Absolute);
Logo.Source = new BitmapImage(uri);
}
catch (Exception ex)
{
// Log the error or handle it appropriately
Debug.WriteLine($"Error loading logo image: {ex.Message}");
// Optionally set a default logo or handle the error
}
} }
public MainWindow() public MainWindow()
@ -181,11 +198,11 @@ namespace AutoTrackR2
public static int VideoRecord { get; set; } public static int VideoRecord { get; set; }
public static int OfflineMode { get; set; } public static int OfflineMode { get; set; }
public static int Theme { get; set; } public static int Theme { get; set; }
static ConfigManager() static ConfigManager()
{ {
LoadConfig(); LoadConfig();
// Set default values // Set default values
// AppData\Local\AutoTrackR2\Kill-log.csv // AppData\Local\AutoTrackR2\Kill-log.csv
KillHistoryFile = Path.Combine( KillHistoryFile = Path.Combine(
@ -193,12 +210,12 @@ namespace AutoTrackR2
"AutoTrackR2", "AutoTrackR2",
"Kill-log.csv" "Kill-log.csv"
); );
AHKScriptFolder = Path.Combine( AHKScriptFolder = Path.Combine(
Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
"AutoTrackR2" "AutoTrackR2"
); );
VisorWipeScript = "visorwipe.ahk"; VisorWipeScript = "visorwipe.ahk";
VideoRecordScript = "videorecord.ahk"; VideoRecordScript = "videorecord.ahk";
} }