diff --git a/AutoTrackR2/Assets/EMP.png b/AutoTrackR2/Assets/EMP.png
index 580ad66..29ae7fb 100644
Binary files a/AutoTrackR2/Assets/EMP.png and b/AutoTrackR2/Assets/EMP.png differ
diff --git a/AutoTrackR2/Assets/WRITH.png b/AutoTrackR2/Assets/WRAITH.png
similarity index 100%
rename from AutoTrackR2/Assets/WRITH.png
rename to AutoTrackR2/Assets/WRAITH.png
diff --git a/AutoTrackR2/AutoTrackR2.csproj b/AutoTrackR2/AutoTrackR2.csproj
index 4dbdb6e..b9db3ce 100644
--- a/AutoTrackR2/AutoTrackR2.csproj
+++ b/AutoTrackR2/AutoTrackR2.csproj
@@ -13,26 +13,6 @@
</PropertyGroup>
<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" />
- <None Remove="Assets\EMP.png" />
- <None Remove="Assets\Gankhub.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\RACKETEERS.png" />
- <None Remove="Assets\SHADOWMOSES.png" />
- <None Remove="Assets\VOX.png" />
- <None Remove="Assets\WRITH.png" />
- <None Remove="Assets\ZAP.png" />
- <None Remove="Assets\DMC.png" />
- <None Remove="Assets\BRTE.png" />
- <None Remove="Assets\FCU.png" />
<None Remove="config.ini" />
<None Remove="Fonts\Orbitron-Bold.ttf" />
<None Remove="Fonts\Roboto-Regular.ttf" />
@@ -46,79 +26,7 @@
</ItemGroup>
<ItemGroup>
- <Resource Include="Assets\BlightVeil.png">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Resource>
- <Resource Include="Assets\Gankhub.png">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Resource>
- <Resource Include="Assets\HEX.png">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Resource>
- <Resource Include="Assets\IP.png">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Resource>
- <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>
- <Resource Include="Assets\EMP.png">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Resource>
- <Resource Include="Assets\GN.png">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Resource>
- <Resource Include="Assets\AutoTrackR.png">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Resource>
- <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\RACKETEERS.png">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Resource>
- <Resource Include="Assets\SHADOWMOSES.png">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Resource>
- <Resource Include="Assets\VOX.png">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </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="Assets\DMC.png">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Resource>
- <Resource Include="Assets\BRTE.png">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Resource>
- <Resource Include="Assets\FCU.png">
+ <Resource Include="Assets\*.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
<Resource Include="config.ini" />
diff --git a/AutoTrackR2/MainWindow.xaml.cs b/AutoTrackR2/MainWindow.xaml.cs
index 1da0c4c..15f0722 100644
--- a/AutoTrackR2/MainWindow.xaml.cs
+++ b/AutoTrackR2/MainWindow.xaml.cs
@@ -35,25 +35,11 @@ namespace AutoTrackR2
// Create a pack URI for the resource
Uri uri = new Uri($"pack://application:,,,/AutoTrackR2;component{imagePath}", UriKind.Absolute);
- Debug.WriteLine($"Attempting to load logo from: {uri}");
-
- // Check if the resource exists
- var resourceInfo = Application.GetResourceStream(uri);
- if (resourceInfo == null)
- {
- Debug.WriteLine($"Resource not found: {uri}");
- return;
- }
-
Logo.Source = new BitmapImage(uri);
- Debug.WriteLine($"Successfully loaded logo: {uri}");
}
catch (Exception ex)
{
- // Log the error or handle it appropriately
Debug.WriteLine($"Error loading logo image: {ex.Message}");
- Debug.WriteLine($"Stack trace: {ex.StackTrace}");
- // Optionally set a default logo or handle the error
}
}
diff --git a/AutoTrackR2/themes.json b/AutoTrackR2/themes.json
index 7c92ef0..3badc04 100644
--- a/AutoTrackR2/themes.json
+++ b/AutoTrackR2/themes.json
@@ -8,7 +8,8 @@
"AltText": "#A88F2C"
},
"Logo": {
- "Path": "/Assets/AutoTrackR.png"
+ "Path": "/Assets/AutoTrackR.png",
+ "Primary": "#00A9E0"
}
},
"Green": {
@@ -20,7 +21,8 @@
"AltText": "#DCD6C4"
},
"Logo": {
- "Path": "/Assets/AutoTrackR.png"
+ "Path": "/Assets/AutoTrackR.png",
+ "Primary": "#1D9F00"
}
},
"Red": {
@@ -32,7 +34,8 @@
"AltText": "#A88F2C"
},
"Logo": {
- "Path": "/Assets/AutoTrackR.png"
+ "Path": "/Assets/AutoTrackR.png",
+ "Primary": "#D32F2F"
}
},
"Purple": {
@@ -44,7 +47,8 @@
"AltText": "#B3976E"
},
"Logo": {
- "Path": "/Assets/AutoTrackR.png"
+ "Path": "/Assets/AutoTrackR.png",
+ "Primary": "#32CD32"
}
},
"GN": {
@@ -95,7 +99,8 @@
"AltText": "#A88F2C"
},
"Logo": {
- "Path": "/Assets/HIT.png"
+ "Path": "/Assets/HIT.png",
+ "Primary": "#B92D2D"
}
},
"WRAITH": {
@@ -107,7 +112,7 @@
"AltText": "#8B0000"
},
"Logo": {
- "Path": "/Assets/WRITH.png",
+ "Path": "/Assets/WRAITH.png",
"Primary": "#ff0000"
}
},
@@ -127,14 +132,14 @@
"EMP": {
"Colors": {
"Accent": "#F5721C",
- "Button": "#535353",
+ "Button": "#1A1A1A",
"Background": "#080000",
"Text": "#FFFFFF",
- "AltText": "#CEA75B"
+ "AltText": "#F3BD9B"
},
"Logo": {
"Path": "/Assets/EMP.png",
- "Primary": "#F3BD9B"
+ "Primary": "#F5721C"
}
},
"AVS": {
@@ -256,14 +261,15 @@
},
"Gankhub": {
"Colors": {
- "Accent": "#ffa500",
- "Button": "#2C2C2C",
- "Background": "#1b1b1b",
- "Text": "#FFFFFF",
- "AltText": "#ffa500"
+ "Accent": "#FF8C00",
+ "Button": "#331400",
+ "Background": "#1A0A00",
+ "Text": "#FFB366",
+ "AltText": "#FF8C00"
},
"Logo": {
- "Path": "/Assets/Gankhub.png"
+ "Path": "/Assets/Gankhub.png",
+ "Primary": "#FF8C00"
}
},
"IronPoint": {